Minor fix on remisecheque display
Added missing trad on shipment + display calculated weight after true weight
Fix : shipment prices not related to qty shipped
Add good vars for odt generation
Update changelog
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop

Conflicts:
	ChangeLog
Merge pull request #1113 from atm-maxime/develop

Work on shipment