fix merge

2018-09-18 16:45:06 +02:00 · 2018-09-18 16:45:06 +02:00 · b4692f0812
commit b4692f0812
parent 4a15c7b158
1 changed files with 1 additions and 0 deletions
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@ -212,6 +212,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 		$sav_charset_output=$outputlangs->charset_output;
 		$outputlangs->charset_output='UTF-8';

+		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills"));

 		if ($conf->facture->dir_output)