Resolved bug #1182: ODT company_country tag is htmlencoded
Fix: Missing special code into export
Merge remote-tracking branch 'origin/3.4' into 3.5

Conflicts:
	htdocs/core/modules/modFacture.class.php
Fix: Missing translation
Merge pull request #1341 from marcosgdf/bug-1182

Resolved bug #1182: ODT company_country tag is htmlencoded
Merge remote-tracking branch 'origin/3.4' into 3.5
Fix: fields too large