[Dolibarr-git] [Dolibarr/dolibarr] fd18aa: Better fix for Bug #1825

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: fd18aa8717920b4e657fe6f2da630c7309586139
      
https://github.com/Dolibarr/dolibarr/commit/fd18aa8717920b4e657fe6f2da630c7309586139
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M htdocs/core/lib/agenda.lib.php

  Log Message:
  -----------
  Better fix for Bug #1825


  Commit: 3a917a0d1f319c4314f850386744d0b179b08039
      
https://github.com/Dolibarr/dolibarr/commit/3a917a0d1f319c4314f850386744d0b179b08039
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M ChangeLog
    M htdocs/comm/propal/list.php
    M htdocs/compta/bank/ligne.php
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/salaries/fiche.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/webservices/server_order.php
    M htdocs/webservices/server_productorservice.php

  Log Message:
  -----------
  Merge branch '3.6' into bug-1825


  Commit: 72da9b52afc582202157805861442b3e6cb61cac
      
https://github.com/Dolibarr/dolibarr/commit/72da9b52afc582202157805861442b3e6cb61cac
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M htdocs/core/lib/agenda.lib.php

  Log Message:
  -----------
  Merge pull request #2380 from marcosgdf/bug-1825

Better fix for bug 1825


Compare: 
https://github.com/Dolibarr/dolibarr/compare/d9ab05833f47...72da9b52afc5