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

[Laurent Destailleur]

  Branch: refs/heads/3.7
  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


  Commit: bfe9bf7a478c4eefe66af7c10d1e5c63c79183c3
      
https://github.com/Dolibarr/dolibarr/commit/bfe9bf7a478c4eefe66af7c10d1e5c63c79183c3
  Author: Juanjo Menent <address@hidden>
  Date:   2015-02-27 (Fri, 27 Feb 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/prelevement/class/bonprelevement.class.php

  Log Message:
  -----------
  Fix: Bad SEPA xml file creation


  Commit: 7ca8fdb20cd833d11ed1b693cadd36ffe521bca3
      
https://github.com/Dolibarr/dolibarr/commit/7ca8fdb20cd833d11ed1b693cadd36ffe521bca3
  Author: Juanjo Menent <address@hidden>
  Date:   2015-02-27 (Fri, 27 Feb 2015)

  Changed paths:
    M htdocs/compta/prelevement/class/bonprelevement.class.php

  Log Message:
  -----------
  PHP norms


  Commit: be033c1947798b59d1de39ec915b9ee45f704c04
      
https://github.com/Dolibarr/dolibarr/commit/be033c1947798b59d1de39ec915b9ee45f704c04
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-03-01 (Sun, 01 Mar 2015)

  Changed paths:
    M htdocs/opensurvey/card.php

  Log Message:
  -----------
  Fix bad position of html tags

Conflicts:
        htdocs/opensurvey/card.php


  Commit: 9b0dce2e347b1a8123e374ae76a418794bfe516b
      
https://github.com/Dolibarr/dolibarr/commit/9b0dce2e347b1a8123e374ae76a418794bfe516b
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-03-01 (Sun, 01 Mar 2015)

  Changed paths:
    M htdocs/compta/prelevement/class/bonprelevement.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.6' into 3.7

Conflicts:
        htdocs/compta/prelevement/class/bonprelevement.class.php
        htdocs/core/lib/agenda.lib.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/f8e9a38e5cec...9b0dce2e347b