[Dolibarr-git] [Dolibarr/dolibarr] fa733c: Fix: [ bug #1405 ] Rouget PDF expedition incorrect...

[Laurent Destailleur]

  Branch: refs/heads/3.5
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: fa733c8ba4f7d58e2461101e6a4178bc1acef18c
      
https://github.com/Dolibarr/dolibarr/commit/fa733c8ba4f7d58e2461101e6a4178bc1acef18c
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-05-23 (Fri, 23 May 2014)

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

  Log Message:
  -----------
  Fix: [ bug #1405 ] Rouget PDF expedition incorrect when two expeditions under 
the same commande


  Commit: 07bc93311029694f4cf5256b2c95b3a1a93483bd
      
https://github.com/Dolibarr/dolibarr/commit/07bc93311029694f4cf5256b2c95b3a1a93483bd
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-23 (Fri, 23 May 2014)

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

  Log Message:
  -----------
  Merge branch 'bug-1405' of github.com:marcosgdf/dolibarr into
marcosgdf-bug-1405

Conflicts:
        ChangeLog


  Commit: 8840e28bc08c196a6b7f89be065bb3f03a97b01b
      
https://github.com/Dolibarr/dolibarr/commit/8840e28bc08c196a6b7f89be065bb3f03a97b01b
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-23 (Fri, 23 May 2014)

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

  Log Message:
  -----------
  Merge branch 'marcosgdf-bug-1405' into 3.5


  Commit: a63d085181b0582d9d94eebede97f9c4b87c7794
      
https://github.com/Dolibarr/dolibarr/commit/a63d085181b0582d9d94eebede97f9c4b87c7794
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-23 (Fri, 23 May 2014)

  Changed paths:
    M ChangeLog
    M htdocs/commande/fiche.php

  Log Message:
  -----------
  Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5


Compare: 
https://github.com/Dolibarr/dolibarr/compare/649fdd72dcfb...a63d085181b0