[Dolibarr-git] [Dolibarr/dolibarr] caaffd: FIX #5044

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: caaffdb0c3b7553536fe8978571c78b023b3ea77
      
https://github.com/Dolibarr/dolibarr/commit/caaffdb0c3b7553536fe8978571c78b023b3ea77
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2016-06-05 (Sun, 05 Jun 2016)

  Changed paths:
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php

  Log Message:
  -----------
  FIX #5044


  Commit: fdfcc064dc063ae5f956df2c8f28c39a63ed7b1b
      
https://github.com/Dolibarr/dolibarr/commit/fdfcc064dc063ae5f956df2c8f28c39a63ed7b1b
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M htdocs/comm/mailing/cibles.php
    M htdocs/compta/facture/class/facture-rec.class.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/langs/en_US/accountancy.lang
    M htdocs/langs/en_US/main.lang

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop


  Commit: 1f934251932ae6b34b7d24698b5bd1eb93757856
      
https://github.com/Dolibarr/dolibarr/commit/1f934251932ae6b34b7d24698b5bd1eb93757856
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php

  Log Message:
  -----------
  Merge pull request #5308 from atm-maxime/develop

FIX #5044


Compare: 
https://github.com/Dolibarr/dolibarr/compare/52fefc2d025d...1f934251932a