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

update code

Browse Source
This commit is contained in:
Philippe GRAND 2018-06-30 11:45:49 +02:00
parent df96c5ca81
commit 640f7697e4
14 changed files with 69 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/modules/action/rapport.pdf.php
View File

@ -100,11 +100,8 @@ class CommActionRapport
// 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 traductions files requiredby by page
$outputlangs->load("dict"); $outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products"));
$outputlangs->load("companies");
$outputlangs->load("bills");
$outputlangs->load("products");
$dir = $conf->agenda->dir_temp."/"; $dir = $conf->agenda->dir_temp."/";
$file = $dir . "actions-".$this->month."-".$this->year.".pdf"; $file = $dir . "actions-".$this->month."-".$this->year.".pdf";

6
htdocs/core/modules/bank/doc/pdf_ban.modules.php
View File

@ -100,10 +100,8 @@ class pdf_ban extends ModeleBankAccountDoc
// 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 traductions files requiredby by page
$outputlangs->load("dict"); $outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
$outputlangs->load("companies");
$outputlangs->load("projects");
if ($conf->bank->dir_output) if ($conf->bank->dir_output)
{ {

15
htdocs/core/modules/cheque/doc/pdf_blochet.class.php
View File

@ -45,8 +45,8 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
{ {
global $conf,$langs,$mysoc; global $conf,$langs,$mysoc;
$langs->load("main"); // Load traductions files requiredby by page
$langs->load("bills"); $langs->loadLangs(array("main", "bills"));
$this->db = $db; $this->db = $db;
$this->name = "blochet"; $this->name = "blochet";
@ -92,11 +92,8 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
$sav_charset_output=$outputlangs->charset_output; $sav_charset_output=$outputlangs->charset_output;
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 traductions files requiredby by page
$outputlangs->load("companies"); $outputlangs->loadLangs(array("main", "companies", "bills", "products", "compta"));
$outputlangs->load("bills");
$outputlangs->load("products");
$outputlangs->load("compta");
$dir = $_dir . "/".get_exdir($number,0,1,0,$object,'cheque').$number; $dir = $_dir . "/".get_exdir($number,0,1,0,$object,'cheque').$number;
@ -214,8 +211,8 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
global $langs; global $langs;
$default_font_size = pdf_getPDFFontSize($outputlangs); $default_font_size = pdf_getPDFFontSize($outputlangs);
$outputlangs->load("compta"); // Load traductions files requiredby by page
$outputlangs->load("banks"); $outputlangs->loadLangs(array("compta", "banks""));
$title = $outputlangs->transnoentities("CheckReceipt"); $title = $outputlangs->transnoentities("CheckReceipt");
$pdf->SetFont('','B', $default_font_size); $pdf->SetFont('','B', $default_font_size);

6
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
View File

@ -496,10 +496,8 @@ class pdf_soleil extends ModelePDFFicheinter
global $conf,$langs; global $conf,$langs;
$default_font_size = pdf_getPDFFontSize($outputlangs); $default_font_size = pdf_getPDFFontSize($outputlangs);
$outputlangs->load("main"); // Load traductions files requiredby by page
$outputlangs->load("dict"); $outputlangs->loadLangs(array("main", "dict", "companies", "interventions"));
$outputlangs->load("companies");
$outputlangs->load("interventions");
pdf_pagehead($pdf,$outputlangs,$this->page_hauteur); pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);

7
htdocs/core/modules/member/doc/pdf_standard.class.php
View File

@ -324,11 +324,8 @@ class pdf_standard extends CommonStickerGenerator
// 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 traductions files requiredby by page
$outputlangs->load("dict"); $outputlangs->loadLangs(array("main", "dict", "companies", "admin", "members"));
$outputlangs->load("companies");
$outputlangs->load("admin");
$outputlangs->load("members");
if (empty($mode) || $mode == 'member') if (empty($mode) || $mode == 'member')
{ {

6
htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
View File

@ -255,10 +255,8 @@ class pdf_standardlabel extends CommonStickerGenerator
// 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 traductions files requiredby by page
$outputlangs->load("dict"); $outputlangs->loadLangs(array("main", "dict", "companies", "admin"));
$outputlangs->load("companies");
$outputlangs->load("admin");
$title=$outputlangs->transnoentities('Labels'); $title=$outputlangs->transnoentities('Labels');
$keywords=$title." ".$outputlangs->convToOutputCharset($mysoc->name); $keywords=$title." ".$outputlangs->convToOutputCharset($mysoc->name);

6
htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
View File

@ -296,10 +296,8 @@ class pdf_tcpdflabel extends CommonStickerGenerator
// 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 traductions files requiredby by page
$outputlangs->load("dict"); $outputlangs->loadLangs(array("main", "dict", "companies", "admin"));
$outputlangs->load("companies");
$outputlangs->load("admin");
$title=$outputlangs->transnoentities('Labels'); $title=$outputlangs->transnoentities('Labels');
$keywords=$title." ".$outputlangs->convToOutputCharset($mysoc->name); $keywords=$title." ".$outputlangs->convToOutputCharset($mysoc->name);

21
htdocs/core/modules/product/doc/pdf_standard.modules.php
View File

@ -88,8 +88,8 @@ class pdf_standard extends ModelePDFProduct
{ {
global $conf,$langs,$mysoc; global $conf,$langs,$mysoc;
$langs->load("main"); // Load traductions files requiredby by page
$langs->load("companies"); $langs->loadLangs(array("main", "companies"));
$this->db = $db; $this->db = $db;
$this->name = "standard"; $this->name = "standard";
@ -136,13 +136,8 @@ class pdf_standard extends ModelePDFProduct
// 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 traductions files requiredby by page
$outputlangs->load("dict"); $outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "orders", "deliveries"));
$outputlangs->load("companies");
$outputlangs->load("bills");
$outputlangs->load("products");
$outputlangs->load("orders");
$outputlangs->load("deliveries");
$nblignes = count($object->lines); $nblignes = count($object->lines);
@ -688,11 +683,9 @@ class pdf_standard extends ModelePDFProduct
{ {
global $conf,$langs,$hookmanager; global $conf,$langs,$hookmanager;
$outputlangs->load("main"); // Load traductions files requiredby by page
$outputlangs->load("bills"); $outputlangs->loadLangs(array("main", "propal", "companies", "bills", "orders"));
$outputlangs->load("propal");
$outputlangs->load("companies");
$outputlangs->load("orders");
$default_font_size = pdf_getPDFFontSize($outputlangs); $default_font_size = pdf_getPDFFontSize($outputlangs);
if ($object->type == 1) $titlekey='ServiceSheet'; if ($object->type == 1) $titlekey='ServiceSheet';

6
htdocs/core/modules/project/doc/pdf_baleine.modules.php
View File

@ -109,10 +109,8 @@ class pdf_baleine extends ModelePDFProjects
// 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 traductions files requiredby by page
$outputlangs->load("dict"); $outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
$outputlangs->load("companies");
$outputlangs->load("projects");
if ($conf->projet->dir_output) if ($conf->projet->dir_output)
{ {

6
htdocs/core/modules/project/doc/pdf_beluga.modules.php
View File

@ -127,10 +127,8 @@ class pdf_beluga extends ModelePDFProjects
// 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 traductions files requiredby by page
$outputlangs->load("dict"); $outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
$outputlangs->load("companies");
$outputlangs->load("projects");
if ($conf->projet->dir_output) if ($conf->projet->dir_output)
{ {

6
htdocs/core/modules/project/doc/pdf_timespent.modules.php
View File

@ -108,10 +108,8 @@ class pdf_timespent extends ModelePDFProjects
// 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 traductions files requiredby by page
$outputlangs->load("dict"); $outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
$outputlangs->load("companies");
$outputlangs->load("projects");
if ($conf->projet->dir_output) if ($conf->projet->dir_output)
{ {

14
htdocs/core/modules/propale/doc/pdf_azur.modules.php
View File

@ -161,12 +161,8 @@ class pdf_azur extends ModelePDFPropales
// 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 traductions files requiredby by page
$outputlangs->load("dict"); $outputlangs->loadLangs(array("main", "dict", "companies", "bills", "propal", "products"));
$outputlangs->load("companies");
$outputlangs->load("bills");
$outputlangs->load("propal");
$outputlangs->load("products");
$nblignes = count($object->lines); $nblignes = count($object->lines);
@ -1378,10 +1374,8 @@ class pdf_azur extends ModelePDFPropales
{ {
global $conf,$langs; global $conf,$langs;
$outputlangs->load("main"); // Load traductions files requiredby by page
$outputlangs->load("bills"); $outputlangs->loadLangs(array("main", "propal", "companies", "bills"));
$outputlangs->load("propal");
$outputlangs->load("companies");
$default_font_size = pdf_getPDFFontSize($outputlangs); $default_font_size = pdf_getPDFFontSize($outputlangs);

22
htdocs/core/modules/stock/doc/pdf_standard.modules.php
View File

@ -88,8 +88,8 @@ class pdf_standard extends ModelePDFStock
{ {
global $conf,$langs,$mysoc; global $conf,$langs,$mysoc;
$langs->load("main"); // Load traductions files requiredby by page
$langs->load("companies"); $langs->loadLangs(array("main", "companies"));
$this->db = $db; $this->db = $db;
$this->name = "standard"; $this->name = "standard";
@ -165,13 +165,8 @@ class pdf_standard extends ModelePDFStock
// 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 traductions files requiredby by page
$outputlangs->load("dict"); $outputlangs->loadLangs(array("main", "dict", "companies", "bills", "stocks", "orders", "deliveries"));
$outputlangs->load("companies");
$outputlangs->load("bills");
$outputlangs->load("stocks");
$outputlangs->load("orders");
$outputlangs->load("deliveries");
$nblignes = count($object->lines); $nblignes = count($object->lines);
@ -920,12 +915,9 @@ class pdf_standard extends ModelePDFStock
{ {
global $conf,$langs,$db,$hookmanager; global $conf,$langs,$db,$hookmanager;
$outputlangs->load("main"); // Load traductions files requiredby by page
$outputlangs->load("bills"); $outputlangs->loadLangs(array("main", "propal", "companies", "bills", "orders", "stocks"));
$outputlangs->load("propal");
$outputlangs->load("companies");
$outputlangs->load("orders");
$outputlangs->load("stocks");
$default_font_size = pdf_getPDFFontSize($outputlangs); $default_font_size = pdf_getPDFFontSize($outputlangs);
if ($object->type == 1) $titlekey='ServiceSheet'; if ($object->type == 1) $titlekey='ServiceSheet';

22
htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
View File

@ -89,8 +89,8 @@ class pdf_stdmovement extends ModelePDFMovement
{ {
global $conf,$langs,$mysoc; global $conf,$langs,$mysoc;
$langs->load("main"); // Load traductions files requiredby by page
$langs->load("companies"); $langs->loadLangs(array("main", "companies"));
$this->db = $db; $this->db = $db;
$this->name = "stdmouvement"; $this->name = "stdmouvement";
@ -168,13 +168,8 @@ class pdf_stdmovement extends ModelePDFMovement
// 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 traductions files requiredby by page
$outputlangs->load("dict"); $outputlangs->loadLangs(array("main", "dict", "companies", "bills", "stocks", "orders", "deliveries"));
$outputlangs->load("companies");
$outputlangs->load("bills");
$outputlangs->load("stocks");
$outputlangs->load("orders");
$outputlangs->load("deliveries");
/** /**
* TODO: get from object * TODO: get from object
@ -922,12 +917,9 @@ class pdf_stdmovement extends ModelePDFMovement
{ {
global $conf,$langs,$db,$hookmanager; global $conf,$langs,$db,$hookmanager;
$outputlangs->load("main"); // Load traductions files requiredby by page
$outputlangs->load("bills"); $outputlangs->loadLangs(array("main", "propal", "companies", "bills", "orders", "stocks"));
$outputlangs->load("propal");
$outputlangs->load("companies");
$outputlangs->load("orders");
$outputlangs->load("stocks");
$default_font_size = pdf_getPDFFontSize($outputlangs); $default_font_size = pdf_getPDFFontSize($outputlangs);
if ($object->type == 1) $titlekey='ServiceSheet'; if ($object->type == 1) $titlekey='ServiceSheet';