Qual : PHP Code_Sniffer
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/opensurvey/fonctions.php
	htdocs/opensurvey/public/choix_date.php
	htdocs/opensurvey/public/create_survey.php
	htdocs/opensurvey/public/exportcsv.php
	htdocs/public/paybox/paymentko.php

Change-Id: I57468f3a0f6bb1115bd48b84517060432102c2ea
Qual : PHP Code Sniffer
Qual : php code sniffer
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
Quel : indentation
Remove require_once from odf.php because it cause regression.
Add hook for substitution
Add subtitution inside header and fotter document
Merge pull request #822 from FHenry/develop

Qual : PHP Code_Sniffer