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

Merge pull request #9486 from grandoc/new_branch_12_09_2018

Browse Source 
New branch 12 09 2018
This commit is contained in:
Laurent Destailleur 2018-09-12 21:13:32 +02:00 committed by GitHub
commit b1d9846969
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
View File

@ -51,8 +51,8 @@ class doc_generic_product_odt extends ModelePDFProduct
{
global $conf,$langs,$mysoc;
$langs->load("main");
$langs->load("companies");
// Load translation files required by the page
$langs->loadLangs(array("main","companies"));
$this->db = $db;
$this->name = "ODT templates";
@ -96,8 +96,8 @@ class doc_generic_product_odt extends ModelePDFProduct
{
global $conf,$langs;
$langs->load("companies");
$langs->load("errors");
// Load translation files required by the page
$langs->loadLangs(array("errors","companies"));
$form = new Form($this->db);

4
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
View File

@ -361,8 +361,8 @@ class doc_generic_project_odt extends ModelePDFProjects
{
global $conf,$langs;
$langs->load("companies");
$langs->load("errors");
// Load translation files required by the page
$langs->loadLangs(array("companies","errors"));
$form = new Form($this->db);

4
htdocs/core/modules/project/mod_project_universal.php
View File

@ -45,8 +45,8 @@ class mod_project_universal extends ModeleNumRefProjects
{
global $conf,$langs;
$langs->load("projects");
$langs->load("admin");
// Load translation files required by the page
$langs->loadLangs(array("projects","admin"));
$form = new Form($this->db);

8
htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
View File

@ -69,8 +69,8 @@ class doc_generic_task_odt extends ModelePDFTask
{
global $conf,$langs,$mysoc;
$langs->load("main");
$langs->load("companies");
// Load translation files required by the page
$langs->loadLangs(array("main","companies"));
$this->db = $db;
$this->name = "ODT templates";
@ -321,8 +321,8 @@ class doc_generic_task_odt extends ModelePDFTask
{
global $conf,$langs;
$langs->load("companies");
$langs->load("errors");
// Load translation files required by the page
$langs->loadLangs(array("errors","companies"));
$form = new Form($this->db);

4
htdocs/core/modules/project/task/mod_task_universal.php
View File

@ -45,8 +45,8 @@ class mod_task_universal extends ModeleNumRefTask
{
global $conf,$langs;
$langs->load("projects");
$langs->load("admin");
// Load translation files required by the page
$langs->loadLangs(array("projects","admin"));
$form = new Form($this->db);

8
htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
View File

@ -52,8 +52,8 @@ class doc_generic_proposal_odt extends ModelePDFPropales
{
global $conf,$langs,$mysoc;
$langs->load("main");
$langs->load("companies");
// Load translation files required by the page
$langs->loadLangs(array("main","companies"));
$this->db = $db;
$this->name = "ODT templates";
@ -97,8 +97,8 @@ class doc_generic_proposal_odt extends ModelePDFPropales
{
global $conf,$langs;
$langs->load("companies");
$langs->load("errors");
// Load translation files required by the page
$langs->loadLangs(array("errors","companies"));
$form = new Form($this->db);

6
htdocs/core/modules/rapport/pdf_paiement.class.php
View File

@ -40,9 +40,9 @@ class pdf_paiement
function __construct($db)
{
global $langs,$conf;
$langs->load("bills");
$langs->load("compta");
$langs->load("main");
// Load translation files required by the page
$langs->loadLangs(array("bills","compta","main"));
$this->db = $db;
$this->description = $langs->transnoentities("ListOfCustomerPayments");

4
htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
View File

@ -48,8 +48,8 @@ class doc_generic_odt extends ModeleThirdPartyDoc
{
global $conf,$langs,$mysoc;
$langs->load("main");
$langs->load("companies");
// Load translation files required by the page
$langs->loadLangs(array("main","companies"));
$this->db = $db;
$this->name = "ODT templates";

4
htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
View File

@ -51,8 +51,8 @@ class doc_generic_stock_odt extends ModelePDFStock
{
global $conf,$langs,$mysoc;
$langs->load("main");
$langs->load("companies");
// Load translation files required by the page
$langs->loadLangs(array("main","companies"));
$this->db = $db;
$this->name = "ODT templates";

6
htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
View File

@ -2,7 +2,7 @@
/* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2013 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2013-2018 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2013 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2016 Alexandre Spangaro <aspangaro@zendsi.com>
*
@ -50,8 +50,8 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
{
global $conf,$langs;
$langs->load("bills");
$langs->load("admin");
// Load translation files required by the page
$langs->loadLangs(array("bills","admin"));
$form = new Form($this->db);