Merge pull request #2 from Dolibarr/develop

Refresh

.gitignore

@@ -24,3 +24,4 @@ Thumbs.db
 htdocs/includes/autoload.php
 htdocs/includes/bin/
 htdocs/includes/composer/
+/.pydevproject

.travis.yml

@@ -293,7 +293,8 @@ script:
   # Ensure we catch errors
   set -e
   # Exclusions are defined in the ruleset.xml file
-  phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 .
+  #phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 .
+  phpcs -s -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .
   set +e
   echo
 

.tx/config

@@ -356,9 +356,9 @@ source_file = htdocs/langs/en_US/supplier_proposal.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.ticketsup]
+[dolibarr.ticket]
-file_filter = htdocs/langs/<lang>/ticketsup.lang
+file_filter = htdocs/langs/<lang>/ticket.lang
-source_file = htdocs/langs/en_US/ticketsup.lang
+source_file = htdocs/langs/en_US/ticket.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 

build/generate_filelist_xml.php

@@ -22,6 +22,8 @@
  * 		\brief      This script create a xml checksum file
  */
 
+if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1');	// Do not create database handler $db
+
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
 $path=dirname(__FILE__).'/';

dev/setup/codesniffer/ruleset.xml

@@ -10,6 +10,7 @@
 	<exclude-pattern type="relative">htdocs/conf.php</exclude-pattern>
 	<exclude-pattern type="relative">*/nltechno*</exclude-pattern>
 	<exclude-pattern type="relative">*/htdocs/includes</exclude-pattern>
+	<exclude-pattern type="relative">*.min.css</exclude-pattern>
 
 		<!-- List of all tests -->
 
@@ -82,7 +83,7 @@
 	<!-- Lines can be 85 chars long, but never show errors -->
 	<rule ref="Generic.Files.LineLength">
 		<properties>
-			<property name="lineLimit" value="1000" />
+			<property name="lineLimit" value="500" />
 			<property name="absoluteLineLimit" value="0" />
 		</properties>
 	</rule>

dev/translation/txpush.sh

@@ -15,7 +15,7 @@ then
 	echo "This push local files to transifex for project $project."
 	echo "Note:  If you push a language file (not source), file will be skipped if transifex file is newer."
 	echo "       Using -f will overwrite translation but not memory."
-	echo "Usage: ./dev/translation/txpush.sh (source|xx_XX|all) [-r ".$project.".file] [-f] [--no-interactive]"
+	echo "Usage: ./dev/translation/txpush.sh (source|xx_XX|all) [-r $project.file] [-f] [--no-interactive]"
 	exit
 fi
 

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 = '';

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';

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 = '';

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 = '';

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';

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

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

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

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

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

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

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

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';

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

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

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
@@ -71,7 +71,22 @@ if ($result) {
 $y = $year_current;
 
 print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre"><td width=150>' . $langs->trans("Label") . '</td><td align="center">' . $langs->trans("JanuaryMin") . '</td><td align="center">' . $langs->trans("FebruaryMin") . '</td><td align="center">' . $langs->trans("MarchMin") . '</td><td align="center">' . $langs->trans("AprilMin") . '</td><td align="center">' . $langs->trans("MayMin") . '</td><td align="center">' . $langs->trans("JuneMin") . '</td><td align="center">' . $langs->trans("JulyMin") . '</td><td align="center">' . $langs->trans("AugustMin") . '</td><td align="center">' . $langs->trans("SeptemberMin") . '</td><td align="center">' . $langs->trans("OctoberMin") . '</td><td align="center">' . $langs->trans("NovemberMin") . '</td><td align="center">' . $langs->trans("DecemberMin") . '</td><td align="center"><b>Total</b></td></tr>';
+print '<tr class="liste_titre">';
+print '<td width=150>' . $langs->trans("Label") . '</td>';
+print '<td align="center">' . $langs->trans("JanuaryMin") . '</td>';
+print '<td align="center">' . $langs->trans("FebruaryMin") . '</td>';
+print '<td align="center">' . $langs->trans("MarchMin") . '</td>';
+print '<td align="center">' . $langs->trans("AprilMin") . '</td>';
+print '<td align="center">' . $langs->trans("MayMin") . '</td>';
+print '<td align="center">' . $langs->trans("JuneMin") . '</td>';
+print '<td align="center">' . $langs->trans("JulyMin") . '</td>';
+print '<td align="center">' . $langs->trans("AugustMin") . '</td>';
+print '<td align="center">' . $langs->trans("SeptemberMin") . '</td>';
+print '<td align="center">' . $langs->trans("OctoberMin") . '</td>';
+print '<td align="center">' . $langs->trans("NovemberMin") . '</td>';
+print '<td align="center">' . $langs->trans("DecemberMin") . '</td>';
+print '<td align="center"><b>Total</b></td>';
+print '</tr>';
 
 $sql = "SELECT bk.numero_compte AS 'compte',";
 $sql .= "  ROUND(SUM(IF(MONTH(bk.doc_date)=1,bk.montant,0)),2) AS 'Janvier',";

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

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

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

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

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

htdocs/accountancy/class/accountingaccount.class.php

@@ -202,9 +202,9 @@ class AccountingAccount extends CommonObject
 		$sql .= ", " . (empty($this->pcg_type) ? 'NULL' : "'" . $this->db->escape($this->pcg_type) . "'");
 		$sql .= ", " . (empty($this->pcg_subtype) ? 'NULL' : "'" . $this->db->escape($this->pcg_subtype) . "'");
 		$sql .= ", " . (empty($this->account_number) ? 'NULL' : "'" . $this->db->escape($this->account_number) . "'");
-		$sql .= ", " . (empty($this->account_parent) ? 'NULL' : "'" . $this->db->escape($this->account_parent) . "'");
+		$sql .= ", " . (empty($this->account_parent) ? '0' : "'" . $this->db->escape($this->account_parent) . "'");
 		$sql .= ", " . (empty($this->label) ? 'NULL' : "'" . $this->db->escape($this->label) . "'");
-		$sql .= ", " . (empty($this->account_category) ? '0' : $this->db->escape($this->account_category));
+		$sql .= ", " . (empty($this->account_category) ? 0 : $this->db->escape($this->account_category));
 		$sql .= ", " . $user->id;
 		$sql .= ", " . (! isset($this->active) ? 'NULL' : $this->db->escape($this->active));
 		$sql .= ")";

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

htdocs/adherents/card.php

@@ -41,7 +41,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 
-// Load traductions files requiredby by page
+// Load translation files required by the page
 $langs->loadLangs(array("companies","bills","members","users","other"));
 
 $action=GETPOST('action','alpha');

htdocs/adherents/class/adherent.class.php

@@ -2417,6 +2417,34 @@ class Adherent extends CommonObject
 		}
 	}
 
+	/**
+	 *  Return number of mass Emailing received by this member with its email
+	 *
+	 *  @return       int     Number of EMailings
+	 */
+	function getNbOfEMailings()
+	{
+		$sql = "SELECT count(mc.email) as nb";
+		$sql.= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
+		$sql.= " WHERE mc.email = '".$this->db->escape($this->email)."'";
+		$sql.= " AND mc.statut NOT IN (-1,0)";      // -1 erreur, 0 non envoye, 1 envoye avec succes
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			$nb=$obj->nb;
+
+			$this->db->free($resql);
+			return $nb;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
+
 	/**
 	 * Sets object to supplied categories.
 	 *
@@ -2540,7 +2568,7 @@ class Adherent extends CommonObject
 
 			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 			$adherent = new Adherent($this->db);
-			$formmail=new FormMail($db);
+			$formmail = new FormMail($this->db);
 
 			$i=0;
 			$nbok = 0;

htdocs/admin/accountant.php

@@ -31,8 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 $action=GETPOST('action','aZ09');
 $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'adminaccoutant';   // To manage different context of search
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("companies");
+$langs->loadLangs(array('admin', 'companies'));
 
 if (! $user->admin) accessforbidden();
 
@@ -90,7 +90,7 @@ $formcompany=new FormCompany($db);
 
 $countrynotdefined='<font class="error">'.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')</font>';
 
-print $langs->trans("AccountantDesc")."<br>\n";
+print '<span class="opacitymedium">'.$langs->trans("AccountantDesc")."</span><br>\n";
 print "<br>\n";
 
 if ($action == 'edit' || $action == 'updateedit')

htdocs/admin/agenda.php

@@ -31,9 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
 if (!$user->admin)
     accessforbidden();
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("other");
+$langs->loadLangs(array('admin', 'other', 'agenda'));
-$langs->load("agenda");
 
 $action = GETPOST('action','alpha');
 $cancel = GETPOST('cancel','alpha');

htdocs/admin/agenda_extrafields.php

@@ -34,9 +34,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 if (!$user->admin)
 	accessforbidden();
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("other");
+$langs->loadLangs(array('admin', 'other', 'agenda'));
-$langs->load("agenda");
 
 $extrafields = new ExtraFields($db);
 $form = new Form($db);

htdocs/admin/agenda_extsites.php

@@ -34,9 +34,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 if (!$user->admin) accessforbidden();
 
-$langs->load("agenda");
+// Load translation files required by the page
-$langs->load("admin");
+$langs->loadLangs(array('agenda', 'admin', 'other'));
-$langs->load("other");
 
 $def = array();
 $actiontest=GETPOST('test','alpha');

htdocs/admin/agenda_other.php

@@ -34,9 +34,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 if (!$user->admin)
     accessforbidden();
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("other");
+$langs->loadLangs(array('admin', 'other', 'agenda'));
-$langs->load("agenda");
 
 $action = GETPOST('action','alpha');
 $value = GETPOST('value','alpha');

htdocs/admin/agenda_reminder.php

@@ -29,6 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 if (!$user->admin)
     accessforbidden();
 
+// Load translation files required by the page
 $langs->loadLangs(array("admin","other","agenda"));
 
 $action = GETPOST('action','alpha');

htdocs/admin/agenda_xcal.php

@@ -32,6 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
 if (!$user->admin)
     accessforbidden();
 
+// Load translation files required by the page
 $langs->loadLangs(array("admin","other","agenda"));
 
 $def = array();

htdocs/admin/bank.php

@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
 
-// Load traductions files requiredby by page
+// Load translation files required by the page
 $langs->loadLangs(array("admin","companies","bills","other","banks"));
 
 if (!$user->admin)

htdocs/admin/bank_extrafields.php

@@ -30,8 +30,8 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
-$langs->load("banks");
+// Load translation files required by the page
-$langs->load("admin");
+$langs->loadLangs(array('banks', 'admin'));
 
 $extrafields = new ExtraFields($db);
 $form = new Form($db);

htdocs/admin/barcode.php

@@ -28,6 +28,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
 
+// Load translation files required by the page
 $langs->load("admin");
 
 if (!$user->admin) accessforbidden();

htdocs/admin/boxes.php

@@ -28,8 +28,8 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
 include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("boxes");
+$langs->loadLangs(array('admin', 'boxes'));
 
 if (! $user->admin) accessforbidden();
 

htdocs/admin/chequereceipts.php

@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
 
-// Load traductions files requiredby by page
+// Load translation files required by the page
 $langs->loadLangs(array("admin","companies","bills","other","banks"));
 
 if (!$user->admin)

htdocs/admin/clicktodial.php

@@ -26,6 +26,7 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
+// Load translation files required by the page
 $langs->load("admin");
 
 if (!$user->admin) accessforbidden();

htdocs/admin/commande.php

@@ -36,10 +36,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("errors");
+$langs->loadLangs(array('admin', 'errors', 'orders', 'other'));
-$langs->load("orders");
-$langs->load('other');
 
 if (! $user->admin) accessforbidden();
 

htdocs/admin/company.php

@@ -40,8 +40,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 $action=GETPOST('action','aZ09');
 $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'admincompany';   // To manage different context of search
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("companies");
+$langs->loadLangs(array('admin', 'companies'));
 
 if (! $user->admin) accessforbidden();
 
@@ -300,7 +300,7 @@ $head = company_admin_prepare_head();
 
 dol_fiche_head($head, 'company', $langs->trans("Company"), -1, 'company');
 
-print $langs->trans("CompanyFundationDesc")."<br>\n";
+print '<span class="opacitymedium">'.$langs->trans("CompanyFundationDesc", $langs->transnoentities("Modify"), $langs->transnoentities("Save"))."</span><br>\n";
 print "<br>\n";
 
 if ($action == 'edit' || $action == 'updateedit')

htdocs/admin/compta.php

@@ -29,9 +29,8 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
-$langs->load('admin');
+// Load translation files required by the page
-$langs->load('compta');
+$langs->loadLangs(array('admin', 'compta', 'accountancy'));
-$langs->load('accountancy');
 
 if (!$user->admin)
 accessforbidden();

htdocs/admin/confexped.php

@@ -29,9 +29,8 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/expedition.lib.php';
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("sendings");
+$langs->loadLangs(array('admin', 'sendings', 'deliveries'));
-$langs->load("deliveries");
 
 if (!$user->admin)
   accessforbidden();

htdocs/admin/const.php

@@ -27,6 +27,7 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
+// Load translation files required by the page
 $langs->load("admin");
 
 if (! $user->admin)

htdocs/admin/contract.php

@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php';
 
-// Load traductions files requiredby by page
+// Load translation files required by the page
 $langs->loadLangs(array("admin","errors","contracts"));
 
 if (!$user->admin) accessforbidden();

htdocs/admin/dav.php

@@ -25,6 +25,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/dav/dav.lib.php';
 
+// Load translation files required by the page
 $langs->loadLangs(array("admin","other","agenda"));
 
 if (!$user->admin)

htdocs/admin/defaultvalues.php

@@ -26,12 +26,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 
-$langs->load("companies");
+// Load translation files required by the page
-$langs->load("products");
+$langs->loadLangs(array('companies', 'products', 'admin', 'sms', 'other', 'errors'));
-$langs->load("admin");
-$langs->load("sms");
-$langs->load("other");
-$langs->load("errors");
 
 if (!$user->admin) accessforbidden();
 

htdocs/admin/delais.php

@@ -27,6 +27,7 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
+// Load translation files required by the page
 $langs->load("admin");
 
 if (! $user->admin) accessforbidden();

htdocs/admin/dict.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","main","companies","resource","holiday","accountancy","hrm","orders","contracts","projects","propal","bills","interventions"));
 
 $action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view';

htdocs/admin/ecm.php

@@ -25,6 +25,7 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
+// Load translation files required by the page
 $langs->load("admin");
 
 if (! $user->admin) accessforbidden();

htdocs/admin/events.php

@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/events.class.php';
 if (!$user->admin)
 accessforbidden();
 
-// Load traductions files requiredby by page
+// Load translation files required by the page
 $langs->loadLangs(array("users","admin","other"));
 
 $action=GETPOST('action','aZ09');

htdocs/admin/expedition.php

@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/expedition.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 
-// Load traductions files requiredby by page
+// Load translation files required by the page
 $langs->loadLangs(array("admin", "sendings", "deliveries", "other"));
 
 if (! $user->admin)

htdocs/admin/expedition_extrafields.php

@@ -35,10 +35,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 if (!$user->admin)
 	accessforbidden();
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("other");
+$langs->loadLangs(array('admin', 'other', 'sendings', 'deliveries'));
-$langs->load("sendings");
-$langs->load("deliveries");
 
 
 $extrafields = new ExtraFields($db);

htdocs/admin/expeditiondet_extrafields.php

@@ -37,9 +37,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 if (!$user->admin)
 	accessforbidden();
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("other");
+$langs->loadLangs(array('admin', 'other', 'sendings'));
-$langs->load("sendings");
 
 $extrafields = new ExtraFields($db);
 $form = new Form($db);

htdocs/admin/expensereport.php

@@ -34,10 +34,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/expensereport.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("errors");
+$langs->loadLangs(array('admin', 'errors', 'trips', 'other'));
-$langs->load("trips");
-$langs->load('other');
 
 if (! $user->admin) accessforbidden();
 

htdocs/admin/expensereport_extrafields.php

@@ -33,10 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 if (!$user->admin)
 	accessforbidden();
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("errors");
+$langs->loadLangs(array('admin', 'errors', 'trips', 'other'));
-$langs->load("trips");
-$langs->load('other');
 
 $extrafields = new ExtraFields($db);
 $form = new Form($db);

htdocs/admin/expensereport_ik.php

@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/expensereport.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport_ik.class.php';
 
-// Load traductions files requiredby by page
+// Load translation files required by the page
 $langs->loadLangs(array("admin","trips","errors","other","dict"));
 
 if (!$user->admin) accessforbidden();

htdocs/admin/expensereport_rules.php

@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/expensereport.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport_rule.class.php';
 
-// Load traductions files requiredby by page
+// Load translation files required by the page
 $langs->loadLangs(array("admin","other","trips","errors","dict"));
 
 if (!$user->admin) accessforbidden();

htdocs/admin/export.php

@@ -31,9 +31,8 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
-
+// Load translation files required by the page
-$langs->load("admin");
+$langs->loadLangs(array('admin', 'exports'));
-$langs->load("exports");
 
 $langs->load('other');
 

htdocs/admin/external_rss.php

@@ -31,6 +31,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/rssparser.class.php';
 
+// Load translation files required by the page
 $langs->load("admin");
 
 // Security check

htdocs/admin/facture.php

@@ -33,10 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("errors");
+$langs->loadLangs(array('admin', 'errors', 'other', 'bills'));
-$langs->load('other');
-$langs->load('bills');
 
 if (! $user->admin) accessforbidden();
 

htdocs/admin/fckeditor.php

@@ -28,8 +28,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/doleditor.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("fckeditor");
+$langs->loadLangs(array('admin', 'fckeditor'));
 
 $action = GETPOST('action','alpha');
 // Possible modes are:

htdocs/admin/fichinter.php

@@ -34,10 +34,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("errors");
+$langs->loadLangs(array('admin', 'errors', 'interventions', 'other'));
-$langs->load("interventions");
-$langs->load('other');
 
 if (! $user->admin) accessforbidden();
 

htdocs/admin/geoipmaxmind.php

@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/dolgeoip.class.php';
 if (!$user->admin)
 accessforbidden();
 
-// Load traductions files requiredby by page
+// Load translation files required by the page
 $langs->loadLangs(array("admin","errors"));
 
 $action = GETPOST('action','aZ09');

htdocs/admin/ihm.php

@@ -32,16 +32,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("languages");
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'projects', 'hrm', 'agenda'));
-$langs->load("other");
-
-$langs->load("companies");
-$langs->load("products");
-$langs->load("members");
-$langs->load("projects");
-$langs->load("hrm");
-$langs->load("agenda");
 
 if (! $user->admin) accessforbidden();
 

htdocs/admin/index.php

@@ -24,8 +24,8 @@
 
 require '../main.inc.php';
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("companies");
+$langs->loadLangs(array('admin', 'companies'));
 
 if (!$user->admin) accessforbidden();
 

htdocs/admin/ldap.php

@@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php';
 
+// Load translation files required by the page
 $langs->load("admin");
 
 if (!$user->admin)

htdocs/admin/ldap_contacts.php

@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 
-// Load traductions files requiredby by page
+// Load translation files required by the page
 $langs->loadLangs(array("admin","errors"));
 
 if (!$user->admin)

htdocs/admin/ldap_groups.php

@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php';
 
-// Load traductions files requiredby by page
+// Load translation files required by the page
 $langs->loadLangs(array("admin","errors"));
 
 if (!$user->admin)

htdocs/admin/ldap_members.php

@@ -33,8 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php';
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("errors");
+$langs->loadLangs(array('admin', 'errors'));
 
 if (!$user->admin)
   accessforbidden();

htdocs/admin/ldap_members_types.php

@@ -33,8 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php';
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("errors");
+$langs->loadLangs(array('admin', 'errors'));
 
 if (!$user->admin)
 	accessforbidden();

htdocs/admin/ldap_users.php

@@ -33,8 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php';
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("errors");
+$langs->loadLangs(array('admin', 'errors'));
 
 if (!$user->admin)
   accessforbidden();

htdocs/admin/limits.php

@@ -26,9 +26,8 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-$langs->load("companies");
+// Load translation files required by the page
-$langs->load("products");
+$langs->loadLangs(array('companies', 'products', 'admin'));
-$langs->load("admin");
 
 if (! $user->admin) accessforbidden();
 

htdocs/admin/livraison.php

@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/expedition.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php';
 
-// Load traductions files requiredby by page
+// Load translation files required by the page
 $langs->loadLangs(array("admin", "sendings", "deliveries", "other"));
 
 if (!$user->admin) accessforbidden();

htdocs/admin/livraison_extrafields.php

@@ -35,10 +35,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 if (!$user->admin)
 	accessforbidden();
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("other");
+$langs->loadLangs(array('admin', 'other', 'sendings', 'deliveries'));
-$langs->load("sendings");
-$langs->load("deliveries");
 
 
 $extrafields = new ExtraFields($db);

htdocs/admin/livraisondet_extrafields.php

@@ -37,9 +37,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 if (!$user->admin)
 	accessforbidden();
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("other");
+$langs->loadLangs(array('admin', 'other', 'sendings'));
-$langs->load("sendings");
 
 $extrafields = new ExtraFields($db);
 $form = new Form($db);

htdocs/admin/loan.php

@@ -28,8 +28,8 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("loan");
+$langs->loadLangs(array('admin', 'loan'));
 
 // Security check
 if (!$user->admin)

htdocs/admin/mailing.php

@@ -27,7 +27,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 
-// Load traductions files requiredby by page
+// Load translation files required by the page
 $langs->loadLangs(array("admin", "mails"));
 
 if (!$user->admin) accessforbidden();

htdocs/admin/mailman.php

@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/mailmanspip.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
-// Load traductions files requiredby by page
+// Load translation files required by the page
 $langs->loadLangs(array("admin", "members", "mailmanspip"));
 
 if (! $user->admin) accessforbidden();