From 30601accc36a8445b36a3abfbd2aa317849a1e20 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 18 Sep 2018 17:15:06 +0200 Subject: [PATCH] Standardize and update code --- .../pdf/pdf_muscadet.modules.php | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php index 629abfa0e4e..53636898fb9 100644 --- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -55,7 +55,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders */ public $description; -/** + /** * @var string document type */ public $type; @@ -121,9 +121,9 @@ class pdf_muscadet extends ModelePDFSuppliersOrders */ function __construct($db) { - global $conf,$langs,$mysoc; + global $conf, $langs, $mysoc; - // Translations + // Load translation files required by the page $langs->loadLangs(array("main", "bills")); $this->db = $db; @@ -217,12 +217,8 @@ class pdf_muscadet extends ModelePDFSuppliersOrders // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1'; - $outputlangs->load("main"); - $outputlangs->load("dict"); - $outputlangs->load("companies"); - $outputlangs->load("bills"); - $outputlangs->load("products"); - $outputlangs->load("orders"); + // Load translation files required by the page + $outputlangs->loadLangs(array("main", "orders", "companies", "bills", "dict", "products")); $nblignes = count($object->lines); @@ -1126,13 +1122,10 @@ class pdf_muscadet extends ModelePDFSuppliersOrders */ function _pagehead(&$pdf, $object, $showaddress, $outputlangs) { - global $langs,$conf,$mysoc; + global $langs, $conf, $mysoc; - $outputlangs->load("main"); - $outputlangs->load("bills"); - $outputlangs->load("orders"); - $outputlangs->load("companies"); - $outputlangs->load("sendings"); + // Load translation files required by the page + $outputlangs->loadLangs(array("main", "orders", "companies", "bills", "sendings")); $default_font_size = pdf_getPDFFontSize($outputlangs);