Fix: Substitution for external module at wrong place.
Qual: Removed useless function
Fix: Removed duplicate lines
Fix: Duplicate confirmation
Merge remote-tracking branch 'origin/3.5' into 3.6
Merge remote-tracking branch 'origin/3.6' into develop

Conflicts:
	htdocs/core/modules/societe/doc/doc_generic_odt.modules.php