From b4692f0812374433359b1374d5323e7c49be8baa Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 18 Sep 2018 16:45:06 +0200 Subject: [PATCH] fix merge --- .../core/modules/facture/doc/doc_generic_invoice_odt.modules.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php index df80b63ecfb..ddd2df87b93 100644 --- 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)