Standardize and update code

This commit is contained in:
Philippe GRAND 2018-09-18 17:15:06 +02:00
parent f28f3d12c2
commit 30601accc3

View File

@ -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);