diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php index b831a242bbf..baa9273e135 100644 --- a/htdocs/accountancy/admin/account.php +++ b/htdocs/accountancy/admin/account.php @@ -28,6 +28,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php'; +// Load translation files required by the page $langs->loadLangs(array("compta","bills","admin","accountancy","salaries")); $mesg = ''; diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php index f8a31b239bb..f024f54c41c 100644 --- a/htdocs/accountancy/admin/accountmodel.php +++ b/htdocs/accountancy/admin/accountmodel.php @@ -41,6 +41,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php'; +// Load translation files required by the page $langs->loadLangs(array("errors","admin","companies","resource","holiday","compta","accountancy","hrm")); $action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view'; diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php index 669283077d9..9643227da64 100644 --- a/htdocs/accountancy/admin/card.php +++ b/htdocs/accountancy/admin/card.php @@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php'; $error = 0; +// Load translation files required by the page $langs->loadLangs(array("bills","accountancy")); $mesg = ''; @@ -398,4 +399,4 @@ else if ($id > 0 || $ref) { llxFooter(); -$db->close(); \ No newline at end of file +$db->close(); diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php index 34a857d65d4..aec34469559 100644 --- a/htdocs/accountancy/admin/categories.php +++ b/htdocs/accountancy/admin/categories.php @@ -29,6 +29,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php'; $error = 0; +// Load translation files required by the page $langs->loadLangs(array("bills","accountancy")); $mesg = ''; diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php index 681030a179f..15a50e7b8e8 100644 --- a/htdocs/accountancy/admin/categories_list.php +++ b/htdocs/accountancy/admin/categories_list.php @@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php'; +// Load translation files required by the page $langs->loadLangs(array("errors","admin","companies","resource","holiday","accountancy","hrm")); $action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view'; diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php index 9d254338526..c33d4326836 100644 --- a/htdocs/accountancy/admin/defaultaccounts.php +++ b/htdocs/accountancy/admin/defaultaccounts.php @@ -34,6 +34,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php'; +// Load translation files required by the page $langs->loadLangs(array("compta","bills","admin","accountancy","salaries","loan")); // Security check diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php index 6845491d003..79588db5ac1 100644 --- a/htdocs/accountancy/admin/export.php +++ b/htdocs/accountancy/admin/export.php @@ -32,6 +32,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountancyexport.class.php'; +// Load translation files required by the page $langs->loadLangs(array("compta","bills","admin","accountancy")); // Security access diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php index 3910e1148b4..25223e70c68 100644 --- a/htdocs/accountancy/admin/fiscalyear.php +++ b/htdocs/accountancy/admin/fiscalyear.php @@ -39,6 +39,7 @@ $pagenext = $page + 1; if (! $sortfield) $sortfield="f.rowid"; // Set here default search field if (! $sortorder) $sortorder="ASC"; +// Load translation files required by the page $langs->loadLangs(array("admin","compta")); // Security check @@ -157,4 +158,4 @@ if ($result) llxFooter(); -$db->close(); \ No newline at end of file +$db->close(); diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php index db323881bdc..32df9afc932 100644 --- a/htdocs/accountancy/admin/fiscalyear_card.php +++ b/htdocs/accountancy/admin/fiscalyear_card.php @@ -26,6 +26,7 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/fiscalyear.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/fiscalyear.class.php'; +// Load translation files required by the page $langs->loadLangs(array("admin","compta")); // Security check diff --git a/htdocs/accountancy/admin/fiscalyear_info.php b/htdocs/accountancy/admin/fiscalyear_info.php index f8f0bd5668e..f16e3b9ca0e 100644 --- a/htdocs/accountancy/admin/fiscalyear_info.php +++ b/htdocs/accountancy/admin/fiscalyear_info.php @@ -26,6 +26,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/fiscalyear.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/fiscalyear.class.php'; +// Load translation files required by the page $langs->loadLangs(array("admin","compta")); // Security check diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php index 6e235bc183e..3af46eec1a4 100644 --- a/htdocs/accountancy/admin/importaccounts.php +++ b/htdocs/accountancy/admin/importaccounts.php @@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php'; -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("compta","bills","accountancy")); // Security check diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php index 64857fbfbb4..a9626ec9cfe 100644 --- a/htdocs/accountancy/admin/index.php +++ b/htdocs/accountancy/admin/index.php @@ -32,6 +32,7 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php'; +// Load translation files required by the page $langs->loadLangs(array("compta","bills","admin","accountancy")); // Security access diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php index f738f303b33..4a5e77a434b 100644 --- a/htdocs/accountancy/admin/journals_list.php +++ b/htdocs/accountancy/admin/journals_list.php @@ -30,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php'; +// Load translation files required by the page $langs->loadLangs(array("admin","compta","accountancy")); $action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view'; diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php index eb4d331f228..070e2f353c3 100644 --- a/htdocs/accountancy/admin/productaccount.php +++ b/htdocs/accountancy/admin/productaccount.php @@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php'; require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php'; require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php'; -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("companies","compta","accountancy","products")); // Security check @@ -496,4 +496,4 @@ if ($result) } llxFooter(); -$db->close(); \ No newline at end of file +$db->close(); diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php index d8a59a5ba43..f9cf6eec5e5 100644 --- a/htdocs/accountancy/bookkeeping/balance.php +++ b/htdocs/accountancy/bookkeeping/balance.php @@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountancyexport.class.php require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php'; -// Langs +// Load translation files required by the page $langs->loadLangs(array("accountancy")); $page = GETPOST("page"); diff --git a/htdocs/accountancy/bookkeeping/balancebymonth.php b/htdocs/accountancy/bookkeeping/balancebymonth.php index a433e19a09d..0010af17b34 100644 --- a/htdocs/accountancy/bookkeeping/balancebymonth.php +++ b/htdocs/accountancy/bookkeeping/balancebymonth.php @@ -29,7 +29,7 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php'; -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("bills","compta","accountancy","other")); // Filter @@ -126,4 +126,4 @@ if ($resql) { print "\n"; llxFooter(); -$db->close(); \ No newline at end of file +$db->close(); diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php index f0cc48a4878..10b3b5434fd 100644 --- a/htdocs/accountancy/bookkeeping/card.php +++ b/htdocs/accountancy/bookkeeping/card.php @@ -32,6 +32,7 @@ require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php'; require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php'; +// Load translation files required by the page $langs->loadLangs(array("accountancy", "bills", "compta")); $action = GETPOST('action','aZ09'); diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index 26a4cacf2c9..0e3d0df198b 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -32,6 +32,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php'; +// Load translation files required by the page $langs->loadLangs(array("accountancy")); $action = GETPOST('action', 'alpha'); diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php index 499865233db..02071b3963c 100644 --- a/htdocs/accountancy/bookkeeping/listbyaccount.php +++ b/htdocs/accountancy/bookkeeping/listbyaccount.php @@ -33,6 +33,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php'; +// Load translation files required by the page $langs->loadLangs(array("accountancy")); $page = GETPOST("page"); diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettrage.php b/htdocs/accountancy/bookkeeping/thirdparty_lettrage.php index 67d89bcda90..9bf287bf3c9 100644 --- a/htdocs/accountancy/bookkeeping/thirdparty_lettrage.php +++ b/htdocs/accountancy/bookkeeping/thirdparty_lettrage.php @@ -33,6 +33,7 @@ require_once DOL_DOCUMENT_ROOT . '/accountancy/class/lettering.class.php'; require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php'; +// Load translation files required by the page $langs->loadLangs(array("compta")); $action = GETPOST('action', 'aZ09'); diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php b/htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php index 96317a3a740..cf278c26903 100644 --- a/htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php +++ b/htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php @@ -35,6 +35,7 @@ require_once DOL_DOCUMENT_ROOT . '/accountancy/class/lettering.class.php'; require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php'; +// Load translation files required by the page $langs->loadLangs(array("compta")); $action = GETPOST('action', 'aZ09'); diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php index d0e5adc97fd..7e1387db951 100644 --- a/htdocs/accountancy/customer/card.php +++ b/htdocs/accountancy/customer/card.php @@ -27,6 +27,7 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php'; +// Load translation files required by the page $langs->loadLangs(array("bills","accountancy")); $action = GETPOST('action', 'alpha'); @@ -159,4 +160,4 @@ if (! empty($id)) { } llxFooter(); -$db->close(); \ No newline at end of file +$db->close(); diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php index 8b88d8f396b..277e2b59cb6 100644 --- a/htdocs/accountancy/customer/index.php +++ b/htdocs/accountancy/customer/index.php @@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php'; -// Langs +// Load translation files required by the page $langs->loadLangs(array("compta","bills","other","main","accountancy")); // Security check diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php index 7bc929a7e6b..4eccef67246 100644 --- a/htdocs/accountancy/customer/lines.php +++ b/htdocs/accountancy/customer/lines.php @@ -34,6 +34,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php'; +// Load translation files required by the page $langs->loadLangs(array("bills","compta","accountancy","productbatch")); $account_parent = GETPOST('account_parent'); diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php index f7485e701b7..06ac333b049 100644 --- a/htdocs/accountancy/customer/list.php +++ b/htdocs/accountancy/customer/list.php @@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php'; -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("bills","compta","accountancy","other","productbatch")); $action=GETPOST('action','alpha'); diff --git a/htdocs/accountancy/expensereport/card.php b/htdocs/accountancy/expensereport/card.php index 59237fd13b2..d9b2137157d 100644 --- a/htdocs/accountancy/expensereport/card.php +++ b/htdocs/accountancy/expensereport/card.php @@ -31,6 +31,7 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php'; +// Load translation files required by the page $langs->loadLangs(array("bills","accountancy","trips")); $action = GETPOST('action', 'alpha'); @@ -167,4 +168,4 @@ if (! empty($id)) { } llxFooter(); -$db->close(); \ No newline at end of file +$db->close(); diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php index 989024fa853..388cb88f780 100644 --- a/htdocs/accountancy/expensereport/index.php +++ b/htdocs/accountancy/expensereport/index.php @@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php'; -// Langs +// Load translation files required by the page $langs->loadLangs(array("compta","bills","other","main","accountancy")); // Security check diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php index 93073a62bd4..5aa83da4afa 100644 --- a/htdocs/accountancy/expensereport/lines.php +++ b/htdocs/accountancy/expensereport/lines.php @@ -33,6 +33,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php'; +// Load translation files required by the page $langs->loadLangs(array("compta","bills","other","accountancy","trips","productbatch")); $account_parent = GETPOST('account_parent','int'); diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php index 2abd3fdc776..50ea44291b5 100644 --- a/htdocs/accountancy/expensereport/list.php +++ b/htdocs/accountancy/expensereport/list.php @@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php'; -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("bills","compta","accountancy","other","trips","productbatch")); $action=GETPOST('action','alpha'); diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php index ba79f9ee78e..c1f0fb0572b 100644 --- a/htdocs/accountancy/index.php +++ b/htdocs/accountancy/index.php @@ -26,6 +26,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php'; +// Load translation files required by the page $langs->loadLangs(array("compta","bills","other","accountancy","loans","banks","admin","dict")); // Security check diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php index 3bb98e42727..acd06ac3c30 100644 --- a/htdocs/accountancy/journal/bankjournal.php +++ b/htdocs/accountancy/journal/bankjournal.php @@ -56,6 +56,7 @@ require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php'; require_once DOL_DOCUMENT_ROOT . '/loan/class/loan.class.php'; require_once DOL_DOCUMENT_ROOT . '/loan/class/paymentloan.class.php'; +// Load translation files required by the page $langs->loadLangs(array("companies","other","compta","banks","bills","donations","loan","accountancy","trips","salaries","hrm")); // Multi journal diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php index 27b627b4b98..5b62d11bc86 100644 --- a/htdocs/accountancy/journal/expensereportsjournal.php +++ b/htdocs/accountancy/journal/expensereportsjournal.php @@ -36,6 +36,7 @@ require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php'; require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php'; require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php'; +// Load translation files required by the page $langs->loadLangs(array("commercial", "compta","bills","other","accountancy","trips","errors")); $id_journal = GETPOST('id_journal', 'int'); diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php index 5eb20c8eecb..5de7e0e19d2 100644 --- a/htdocs/accountancy/journal/purchasesjournal.php +++ b/htdocs/accountancy/journal/purchasesjournal.php @@ -36,6 +36,7 @@ require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php'; require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.class.php'; require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php'; +// Load translation files required by the page $langs->loadLangs(array("commercial", "compta","bills","other","accountancy","errors")); $id_journal = GETPOST('id_journal', 'int'); diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php index 8882396d5fb..4733f1c7b16 100644 --- a/htdocs/accountancy/journal/sellsjournal.php +++ b/htdocs/accountancy/journal/sellsjournal.php @@ -39,6 +39,7 @@ require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT . '/societe/class/client.class.php'; require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php'; +// Load translation files required by the page $langs->loadLangs(array("commercial", "compta","bills","other","accountancy","errors")); $id_journal = GETPOST('id_journal', 'int'); diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php index 847181b79cb..f126d00f2e9 100644 --- a/htdocs/accountancy/supplier/card.php +++ b/htdocs/accountancy/supplier/card.php @@ -31,6 +31,7 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php'; +// Load translation files required by the page $langs->loadLangs(array("bills","accountancy")); $action = GETPOST('action', 'alpha'); @@ -162,4 +163,4 @@ if (! empty($id)) { } llxFooter(); -$db->close(); \ No newline at end of file +$db->close(); diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php index 1bba9a941e0..f14cb1092f2 100644 --- a/htdocs/accountancy/supplier/index.php +++ b/htdocs/accountancy/supplier/index.php @@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php'; -// Langs +// Load translation files required by the page $langs->loadLangs(array("compta","bills","other","main","accountancy")); // Security check diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php index a3e71cea0af..e449b270ef9 100644 --- a/htdocs/accountancy/supplier/lines.php +++ b/htdocs/accountancy/supplier/lines.php @@ -35,6 +35,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php'; +// Load translation files required by the page $langs->loadLangs(array("compta","bills","other","accountancy","productbatch")); $account_parent = GETPOST('account_parent'); diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php index 4a52cb9a0e4..b5ff870a83c 100644 --- a/htdocs/accountancy/supplier/list.php +++ b/htdocs/accountancy/supplier/list.php @@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php'; -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("bills","compta","accountancy","other","productbatch")); $action=GETPOST('action','alpha'); diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php index 268018d02e4..7e4108b470b 100644 --- a/htdocs/comm/action/rapport/index.php +++ b/htdocs/comm/action/rapport/index.php @@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/modules/action/rapport.pdf.php'; -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("agenda", "commercial")); $action=GETPOST('action','alpha'); diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php index 4d72b576429..f69cc85e026 100644 --- a/htdocs/core/ajax/ajaxdirpreview.php +++ b/htdocs/core/ajax/ajaxdirpreview.php @@ -93,7 +93,7 @@ if (empty($url)) else $url=DOL_URL_ROOT.'/ecm/index.php'; } -// Load traductions files +// Load translation files required by the page $langs->loadLangs(array("ecm","companies","other")); // Security check diff --git a/htdocs/core/ajax/ajaxdirtree.php b/htdocs/core/ajax/ajaxdirtree.php index 796ced332ab..59fe3385c61 100644 --- a/htdocs/core/ajax/ajaxdirtree.php +++ b/htdocs/core/ajax/ajaxdirtree.php @@ -53,6 +53,7 @@ else // For no ajax call if (empty($url)) $url=DOL_URL_ROOT.'/ecm/index.php'; } +// Load translation files required by the page $langs->load("ecm"); // Define fullpathselecteddir. diff --git a/htdocs/product/agenda.php b/htdocs/product/agenda.php index 166265ba247..9eee66664d9 100644 --- a/htdocs/product/agenda.php +++ b/htdocs/product/agenda.php @@ -33,6 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; +// Load translation files required by the page $langs->load("companies"); if (GETPOST('actioncode','array')) diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 84ba11bf624..34df9ae725c 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -55,8 +55,8 @@ if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/l if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php'; if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php'; -$langs->load("products"); -$langs->load("other"); +// Load translation files required by the page +$langs->loadLangs(array('products', 'other')); if (! empty($conf->stock->enabled)) $langs->load("stocks"); if (! empty($conf->facture->enabled)) $langs->load("bills"); if (! empty($conf->productbatch->enabled)) $langs->load("productbatch"); diff --git a/htdocs/product/document.php b/htdocs/product/document.php index 442eb3f53f3..34337218a62 100644 --- a/htdocs/product/document.php +++ b/htdocs/product/document.php @@ -37,8 +37,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL)) require_once DOL_DOCUMENT_ROOT.'/product/class/propalmergepdfproduct.class.php'; -$langs->load("other"); -$langs->load("products"); +// Load translation files required by the page +$langs->loadLangs(array('other', 'products')); $id = GETPOST('id', 'int'); $ref = GETPOST('ref', 'alpha'); diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index 21439a1ac8a..b2713d65304 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -37,10 +37,8 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_expression.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php'; -$langs->load("products"); -$langs->load("suppliers"); -$langs->load("bills"); -$langs->load("margins"); +// Load translation files required by the page +$langs->loadLangs(array('products', 'suppliers', 'bills', 'margins')); $id = GETPOST('id', 'int'); $ref = GETPOST('ref', 'alpha'); diff --git a/htdocs/product/index.php b/htdocs/product/index.php index 1254af2213b..9ea0176a553 100644 --- a/htdocs/product/index.php +++ b/htdocs/product/index.php @@ -39,8 +39,8 @@ if ($type=='0') $result=restrictedArea($user,'produit'); else if ($type=='1') $result=restrictedArea($user,'service'); else $result=restrictedArea($user,'produit|service'); -$langs->load("products"); -$langs->load("stocks"); +// Load translation files required by the page +$langs->loadLangs(array('products', 'stocks')); // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks $hookmanager->initHooks(array('productindex')); diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php index adf351e4013..ee914971857 100644 --- a/htdocs/product/inventory/card.php +++ b/htdocs/product/inventory/card.php @@ -26,7 +26,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; include_once DOL_DOCUMENT_ROOT.'/product/inventory/class/inventory.class.php'; include_once DOL_DOCUMENT_ROOT.'/product/inventory/lib/inventory.lib.php'; -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("stocks","other")); // Get parameters diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php index 07f0aaa89e3..3a483291a75 100644 --- a/htdocs/product/inventory/list.php +++ b/htdocs/product/inventory/list.php @@ -27,7 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/product/inventory/class/inventory.class.php'; -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("stocks","other")); $action = GETPOST('action','alpha')?GETPOST('action','alpha'):'view'; // The action 'add', 'create', 'edit', 'update', 'view', ... diff --git a/htdocs/product/list.php b/htdocs/product/list.php index 11be839aa4f..2d306a69ff4 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -39,10 +39,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; if (! empty($conf->categorie->enabled)) require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; -$langs->load("products"); -$langs->load("stocks"); -$langs->load("suppliers"); -$langs->load("companies"); +// Load translation files required by the page +$langs->loadLangs(array('products', 'stocks', 'suppliers', 'companies')); if (! empty($conf->productbatch->enabled)) $langs->load("productbatch"); $action=GETPOST('action','alpha'); diff --git a/htdocs/product/note.php b/htdocs/product/note.php index 5e73548579c..c0e9d77ea83 100644 --- a/htdocs/product/note.php +++ b/htdocs/product/note.php @@ -30,6 +30,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +// Load translation files required by the page $langs->load("companies"); $id = GETPOST('id', 'int'); diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php index 91a8f4f80a4..d6aa23fe2c0 100644 --- a/htdocs/product/popuprop.php +++ b/htdocs/product/popuprop.php @@ -29,6 +29,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +// Load translation files required by the page //Required to translate NbOfProposals $langs->load('propal'); diff --git a/htdocs/product/price.php b/htdocs/product/price.php index ad73b57d76f..b5ede482f99 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -45,9 +45,8 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { $prodcustprice = new Productcustomerprice($db); } -$langs->load("products"); -$langs->load("bills"); -$langs->load("companies"); +// Load translation files required by the page +$langs->loadLangs(array('products', 'bills', 'companies')); $mesg=''; $error=0; $errors=array(); diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php index 88b9f2080aa..4bade1db2cf 100644 --- a/htdocs/product/reassort.php +++ b/htdocs/product/reassort.php @@ -31,8 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; -$langs->load("products"); -$langs->load("stocks"); +// Load translation files required by the page +$langs->loadLangs(array('products', 'stocks')); // Security check if ($user->societe_id) $socid=$user->societe_id; diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php index 423d0f4015d..7b82408cfc0 100644 --- a/htdocs/product/reassortlot.php +++ b/htdocs/product/reassortlot.php @@ -33,9 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; -$langs->load("products"); -$langs->load("stocks"); -$langs->load("productbatch"); +// Load translation files required by the page +$langs->loadLangs(array('products', 'stocks', 'productbatch')); // Security check if ($user->societe_id) $socid=$user->societe_id; diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php index 3765bafff16..41e70a6fbf9 100644 --- a/htdocs/product/stock/card.php +++ b/htdocs/product/stock/card.php @@ -34,10 +34,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; -$langs->load("products"); -$langs->load("stocks"); -$langs->load("companies"); -$langs->load("categories"); +// Load translation files required by the page +$langs->loadLangs(array('products', 'stocks', 'companies', 'categories')); $action=GETPOST('action','aZ09'); $cancel=GETPOST('cancel','alpha'); diff --git a/htdocs/product/stock/fiche-valo.php b/htdocs/product/stock/fiche-valo.php index e05013cbe77..400c6183ca4 100644 --- a/htdocs/product/stock/fiche-valo.php +++ b/htdocs/product/stock/fiche-valo.php @@ -26,9 +26,8 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/stock.lib.php'; -$langs->load("products"); -$langs->load("stocks"); -$langs->load("companies"); +// Load translation files required by the page +$langs->loadLangs(array('products', 'stocks', 'companies')); $mesg = ''; // Security check diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php index a1414ab06ac..fd2c1d48168 100644 --- a/htdocs/product/stock/index.php +++ b/htdocs/product/stock/index.php @@ -27,8 +27,8 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; -$langs->load("stocks"); -$langs->load("productbatch"); +// Load translation files required by the page +$langs->loadLangs(array('stocks', 'productbatch')); // Security check $result=restrictedArea($user,'stock'); diff --git a/htdocs/product/stock/info.php b/htdocs/product/stock/info.php index 4d49a0c8514..4653a56495d 100644 --- a/htdocs/product/stock/info.php +++ b/htdocs/product/stock/info.php @@ -26,6 +26,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/stock.lib.php'; +// Load translation files required by the page $langs->load("stocks"); $id = GETPOST('id','int'); diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php index 3d01e7a9f06..c1b055bf5a9 100644 --- a/htdocs/product/stock/list.php +++ b/htdocs/product/stock/list.php @@ -27,6 +27,7 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; +// Load translation files required by the page $langs->load("stocks"); // Security check diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php index 270217b33f9..2197e9c76c1 100644 --- a/htdocs/product/stock/massstockmove.php +++ b/htdocs/product/stock/massstockmove.php @@ -31,10 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; -$langs->load("products"); -$langs->load("stocks"); -$langs->load("orders"); -$langs->load("productbatch"); +// Load translation files required by the page +$langs->loadLangs(array('products', 'stocks', 'orders', 'productbatch')); // Security check if ($user->societe_id) { diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index f21c509f188..02498dbe8ff 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -42,8 +42,8 @@ if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; } -$langs->load("products"); -$langs->load("stocks"); +// Load translation files required by the page +$langs->loadLangs(array('products', 'stocks')); if (! empty($conf->productbatch->enabled)) $langs->load("productbatch"); // Security check diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index bc4d6daaaa4..d867848345d 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -44,11 +44,8 @@ if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; } -$langs->load("products"); -$langs->load("orders"); -$langs->load("bills"); -$langs->load("stocks"); -$langs->load("sendings"); +// Load translation files required by the page +$langs->loadlangs(array('products', 'orders', 'bills', 'stocks', 'sendings')); if (! empty($conf->productbatch->enabled)) $langs->load("productbatch"); $backtopage=GETPOST('backtopage','alpha'); diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php index 90ca3a73cc9..4c614155042 100644 --- a/htdocs/product/stock/productlot_card.php +++ b/htdocs/product/stock/productlot_card.php @@ -24,25 +24,16 @@ * Initialy built by build_class_from_table on 2016-05-17 12:22 */ -// Change this following line to use the correct relative path (../, ../../, etc) -$res=0; -if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php'; // to work if your module directory is into dolibarr root htdocs directory -if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php'; // to work if your module directory is into a subdir of root htdocs directory -if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php'; // Used on dev env only -if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php'; // Used on dev env only -if (! $res) die("Include of main fails"); -// Change this following line to use the correct relative path from htdocs +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; -include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); -include_once(DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'); -include_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php'); +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; -dol_include_once('/product/stock/class/productlot.class.php'); +require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php'; -// Load traductions files requiredby by page -$langs->load("stock"); -$langs->load("other"); -$langs->load("productbatch"); +// Load translation files required by the page +$langs->loadLangs(array('stock', 'other', 'productbatch')); // Get parameters $id = GETPOST('id','int'); diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php index be93256858f..f79a0d74d98 100644 --- a/htdocs/product/stock/productlot_document.php +++ b/htdocs/product/stock/productlot_document.php @@ -29,22 +29,16 @@ * \brief Page des documents joints sur les lots produits */ -// Change this following line to use the correct relative path (../, ../../, etc) -$res=0; -if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php'; // to work if your module directory is into dolibarr root htdocs directory -if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php'; // to work if your module directory is into a subdir of root htdocs directory -if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php'; // Used on dev env only -if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php'; // Used on dev env only -if (! $res) die("Include of main fails"); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; -dol_include_once('/product/stock/class/productlot.class.php'); +require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php'; -$langs->load("other"); -$langs->load("products"); +// Load translation files required by the page +$langs->loadLangs(array('other', 'products')); $id = GETPOST('id', 'int'); $ref = GETPOST('ref', 'alpha'); diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php index c9ac6269dbd..5ea3df84839 100644 --- a/htdocs/product/stock/productlot_list.php +++ b/htdocs/product/stock/productlot_list.php @@ -23,25 +23,15 @@ * Initialy built by build_class_from_table on 2016-05-17 12:22 */ -// Change this following line to use the correct relative path (../, ../../, etc) -$res=0; -if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php'; // to work if your module directory is into dolibarr root htdocs directory -if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php'; // to work if your module directory is into a subdir of root htdocs directory -if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php'; // Used on dev env only -if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php'; // Used on dev env only -if (! $res) die("Include of main fails"); -// Change this following line to use the correct relative path from htdocs -require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; -dol_include_once('/product/stock/class/productlot.class.php'); +require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php'; -// Load traductions files requiredby by page -$langs->load("stocks"); -$langs->load("productbatch"); -$langs->load("other"); -$langs->load("users"); +// Load translation files required by the page +$langs->loadLangs(array('stocks', 'productbatch', 'other', 'users')); // Get parameters $id = GETPOST('id','int'); diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php index 360a12a7c69..336c5ce2e32 100644 --- a/htdocs/product/stock/replenish.php +++ b/htdocs/product/stock/replenish.php @@ -33,9 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; require_once './lib/replenishment.lib.php'; -$langs->load("products"); -$langs->load("stocks"); -$langs->load("orders"); +// Load translation files required by the page +$langs->loadLangs(array('products', 'stocks', 'orders')); // Security check if ($user->societe_id) { diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php index c10e1117024..942ca82bc04 100644 --- a/htdocs/product/stock/replenishorders.php +++ b/htdocs/product/stock/replenishorders.php @@ -32,9 +32,8 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/stock/lib/replenishment.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; -$langs->load("products"); -$langs->load("stocks"); -$langs->load("orders"); +// Load translation files required by the page +$langs->loadLangs(array('products', 'stocks', 'orders')); // Security check if ($user->societe_id) $socid=$user->societe_id; diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php index bfc7cd80a78..be8ee2d500e 100644 --- a/htdocs/product/stock/valo.php +++ b/htdocs/product/stock/valo.php @@ -26,6 +26,7 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; +// Load translation files required by the page $langs->load("stocks"); // Security check diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php index d0740f7cd71..e8900d51bb4 100644 --- a/htdocs/product/traduction.php +++ b/htdocs/product/traduction.php @@ -31,8 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; -$langs->load("products"); -$langs->load("languages"); +// Load translation files required by the page +$langs->loadLangs(array('products', 'languages')); $id = GETPOST('id', 'int'); $ref = GETPOST('ref', 'alpha'); diff --git a/htdocs/public/ticketsup/create_ticket.php b/htdocs/public/ticketsup/create_ticket.php index a6fc6778f96..4e6d5734f91 100644 --- a/htdocs/public/ticketsup/create_ticket.php +++ b/htdocs/public/ticketsup/create_ticket.php @@ -36,11 +36,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/ticketsup.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; -// Load traductions files requiredby by page -$langs->load("companies"); -$langs->load("other"); -$langs->load("mails"); -$langs->load("ticketsup"); +// Load translation files required by the page +$langs->loadLangs(array('companies', 'other', 'mails', 'ticketsup')); // Get parameters $id = GETPOST('id', 'int'); diff --git a/htdocs/public/ticketsup/index.php b/htdocs/public/ticketsup/index.php index a7649576275..968fad356f4 100644 --- a/htdocs/public/ticketsup/index.php +++ b/htdocs/public/ticketsup/index.php @@ -31,11 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formticketsup.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/ticketsup.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php'; -// Load traductions files requiredby by page -$langs->load("companies"); -$langs->load("other"); -$langs->load("ticketsup"); -$langs->load("errors"); +// Load translation files required by the page +$langs->loadLangs(array('companies', 'other', 'ticketsup', 'errors')); // Get parameters $track_id = GETPOST('track_id', 'alpha'); diff --git a/htdocs/public/ticketsup/list.php b/htdocs/public/ticketsup/list.php index 9a930bc78b0..aa304580017 100644 --- a/htdocs/public/ticketsup/list.php +++ b/htdocs/public/ticketsup/list.php @@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/ticketsup/class/actions_ticketsup.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formticketsup.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/ticketsup.lib.php'; -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("companies","other","ticketsup")); // Get parameters diff --git a/htdocs/public/ticketsup/view.php b/htdocs/public/ticketsup/view.php index 5f039d87ea5..f81ba85f56d 100644 --- a/htdocs/public/ticketsup/view.php +++ b/htdocs/public/ticketsup/view.php @@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/ticketsup/class/actions_ticketsup.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formticketsup.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/ticketsup.lib.php'; -// Load traductions files requiredby by page +// Load translation files required by the page $langs->loadLangs(array("companies","other","ticketsup")); // Get parameters diff --git a/htdocs/ticketsup/contact.php b/htdocs/ticketsup/contact.php index f6938b1a7fc..36091f9ef4e 100644 --- a/htdocs/ticketsup/contact.php +++ b/htdocs/ticketsup/contact.php @@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT . "/core/lib/company.lib.php"; require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php'; -// Load translation files required by page +// Load translation files required by the page $langs->loadLangs(array('companies', 'ticketsup')); // Get parameters diff --git a/htdocs/ticketsup/document.php b/htdocs/ticketsup/document.php index c6bc116dee4..33487fa878b 100644 --- a/htdocs/ticketsup/document.php +++ b/htdocs/ticketsup/document.php @@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/images.lib.php'; require_once DOL_DOCUMENT_ROOT . "/core/lib/company.lib.php"; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php'; -// Load translation files required by page +// Load translation files required by the page $langs->loadLangs(array("companies","other","ticketsup","mails")); $id = GETPOST('id', 'int'); diff --git a/htdocs/ticketsup/history.php b/htdocs/ticketsup/history.php index da08574aa3f..ff466da6ded 100644 --- a/htdocs/ticketsup/history.php +++ b/htdocs/ticketsup/history.php @@ -33,7 +33,7 @@ if (!class_exists('Contact')) { include DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php'; } -// Load translation files required by page +// Load translation files required by the page $langs->loadLangs(array('companies', 'other', 'ticketsup')); // Get parameters diff --git a/htdocs/ticketsup/index.php b/htdocs/ticketsup/index.php index dfd2455e74a..82e5826cc43 100644 --- a/htdocs/ticketsup/index.php +++ b/htdocs/ticketsup/index.php @@ -25,7 +25,7 @@ require_once DOL_DOCUMENT_ROOT . '/ticketsup/class/actions_ticketsup.class.php'; require_once DOL_DOCUMENT_ROOT . '/ticketsup/class/ticketsupstats.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/dolgraph.class.php'; -// Load translation files required by page +// Load translation files required by the page $langs->loadLangs(array('companies', 'other', 'ticketsup')); $WIDTH = DolGraph::getDefaultGraphSizeForStats('width'); diff --git a/htdocs/ticketsup/new.php b/htdocs/ticketsup/new.php index 6ab7d5ee560..5cb8dce2380 100644 --- a/htdocs/ticketsup/new.php +++ b/htdocs/ticketsup/new.php @@ -27,7 +27,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formticketsup.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/ticketsup.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php'; -// Load translation files required by page +// Load translation files required by the page $langs->loadLangs(array('companies', 'other', 'ticketsup')); // Get parameters