Remove duplicate code
Merge
Task # 862 : ODT templates on shipment
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop

Conflicts:
	htdocs/admin/system/perf.php
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862

Conflicts:
	htdocs/admin/system/perf.php
Merge branch 'develop' of github.com:atm-maxime/dolibarr into mko862

Conflicts:
	htdocs/admin/system/perf.php
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862

Conflicts:
	htdocs/core/class/html.formfile.class.php
Merge pull request #1092 from atm-maxime/mko862

Task 862 : ODT on shipment