Fix: [ bug #1405 ] Rouget PDF expedition incorrect when two expeditions under the same commande
Merge branch 'bug-1405' of github.com:marcosgdf/dolibarr into
marcosgdf-bug-1405

Conflicts:
	ChangeLog
Merge branch 'marcosgdf-bug-1405' into 3.5
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5