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:10:47 +02:00
parent ac3efe1d5b
commit f28f3d12c2
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
View File

@ -51,7 +51,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
*/ */
public $description; public $description;
/** /**
* @var string document type * @var string document type
*/ */
public $type; public $type;
@ -118,9 +118,9 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
*/ */
function __construct($db) function __construct($db)
{ {
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;
@ -209,11 +209,8 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
// 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", "dict", "companies", "bills", "products"));
$outputlangs->load("companies");
$outputlangs->load("bills");
$outputlangs->load("products");
if ($conf->fournisseur->facture->dir_output) if ($conf->fournisseur->facture->dir_output)
{ {
@ -1033,12 +1030,11 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
*/ */
function _pagehead(&$pdf, $object, $showaddress, $outputlangs) function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
{ {
global $langs,$conf,$mysoc; global $langs, $conf, $mysoc;
// Load translation files required by the page
$outputlangs->loadLangs(array("main", "orders", "companies", "bills"));
$outputlangs->load("main");
$outputlangs->load("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