lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Standardize and update code

Browse Source
This commit is contained in:
Philippe GRAND 2018-09-18 17:24:10 +02:00
parent 30601accc3
commit d021a3d5af
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
View File

@ -121,7 +121,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
{ {
global $conf, $langs, $mysoc; global $conf, $langs, $mysoc;
// Translations // Load translation files required by the page
$langs->loadLangs(array("main", "bills")); $langs->loadLangs(array("main", "bills"));
$this->db = $db; $this->db = $db;
@ -197,12 +197,9 @@ class pdf_standard extends ModelePDFSuppliersPayments
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO // 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'; if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
$outputlangs->load("main"); // Load translation files required by the page
$outputlangs->load("dict"); $outputlangs->loadLangs(array("main", "suppliers", "companies", "bills", "dict", "products"));
$outputlangs->load("companies");
$outputlangs->load("bills");
$outputlangs->load("products");
$outputlangs->load("suppliers");
$object->factures = array(); $object->factures = array();
if ($conf->fournisseur->payment->dir_output) if ($conf->fournisseur->payment->dir_output)
@ -632,10 +629,9 @@ class pdf_standard extends ModelePDFSuppliersPayments
{ {
global $langs, $conf, $mysoc; global $langs, $conf, $mysoc;
$outputlangs->load("main"); // Load translation files required by the page
$outputlangs->load("bills"); $outputlangs->loadLangs(array("main", "orders", "companies", "bills"));
$outputlangs->load("orders");
$outputlangs->load("companies");
$default_font_size = pdf_getPDFFontSize($outputlangs); $default_font_size = pdf_getPDFFontSize($outputlangs);
// Do not add the BACKGROUND as this is for suppliers // Do not add the BACKGROUND as this is for suppliers