Task # 862 : ODT templates on shipment
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
Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE
Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE
Merge pull request #1092 from atm-maxime/mko862

Task 862 : ODT on shipment
More complete example
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
Fix: alternative url were sometimes relative to server, sometimes to
DOL_URL_ROOT. Fix to be always relative to DOL_URL_ROOT.
Use reopen method to repoen proposal and fire trigger PROPAL_REOPEN
Better use of reopen method
Merge pull request #1093 from FHenry/develop

Use reopen method to repoen proposal and fire trigger PROPAL_REOPEN
New: Add option to exclude some thirdparties
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
eol
New: Add option excludethirdparties and onlythirdparties into merge pdf
scripts.
Fix: File name not complete
Fix: Bad string
Fix: Bad date ranges