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 11:02:18 +02:00
parent 2f06e58237
commit 72f906683f
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/lib/pdf.lib.php
View File

@ -2105,8 +2105,8 @@ function pdf_getLinkedObjects($object,$outputlangs)
} }
else if ($objecttype == 'shipping') else if ($objecttype == 'shipping')
{ {
$outputlangs->load('orders'); $outputlangs->loadLangs(array("orders", "sendings"));
$outputlangs->load('sendings');
foreach($objects as $x => $elementobject) foreach($objects as $x => $elementobject)
{ {
$order=null; $order=null;

13
htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
View File

@ -38,10 +38,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
*/ */
class doc_generic_order_odt extends ModelePDFCommandes class doc_generic_order_odt extends ModelePDFCommandes
{ {
var $emetteur; // Objet societe qui emet public $emetteur; // Objet societe qui emet
var $phpmin = array(5,2,0); // Minimum version of PHP required by module public $phpmin = array(5,4,0); // Minimum version of PHP required by module
var $version = 'dolibarr'; public $version = 'dolibarr';
/** /**
@ -51,7 +51,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
*/ */
function __construct($db) function __construct($db)
{ {
global $conf,$langs,$mysoc; global $conf, $langs, $mysoc;
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array("main","companies")); $langs->loadLangs(array("main","companies"));
@ -213,10 +213,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
$sav_charset_output=$outputlangs->charset_output; $sav_charset_output=$outputlangs->charset_output;
$outputlangs->charset_output='UTF-8'; $outputlangs->charset_output='UTF-8';
$outputlangs->load("main"); $outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
$outputlangs->load("dict");
$outputlangs->load("companies");
$outputlangs->load("bills");
if ($conf->commande->dir_output) if ($conf->commande->dir_output)
{ {