Merge pull request #9430 from grandoc/new_branch_07_09_2018

New branch 07 09 2018

htdocs/adherents/admin/adherent.php

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

htdocs/adherents/admin/adherent_emails.php

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

htdocs/adherents/admin/adherent_extrafields.php

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

htdocs/adherents/admin/adherent_type_extrafields.php

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

htdocs/adherents/admin/website.php

@@ -31,8 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 
-$langs->load("members");
-$langs->load("admin");
+// Load translation files required by the page
+$langs->loadLangs(array("admin","members"));
 
 $action=GETPOST('action', 'alpha');
 

htdocs/adherents/agenda.php

@@ -33,8 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 
-$langs->load("companies");
-$langs->load("members");
+// Load translation files required by the page
+$langs->loadLangs(array("companies","members"));
 
 $id = GETPOST('id','int')?GETPOST('id','int'):GETPOST('rowid','int');
 

htdocs/adherents/document.php

@@ -33,9 +33,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 
-$langs->load("members");
-$langs->load("companies");
-$langs->load('other');
+// Load translation files required by the page
+$langs->loadLangs(array("companies","members","other"));
+
 
 $id=GETPOST('id','int');
 $action=GETPOST('action','alpha');

htdocs/adherents/index.php

@@ -29,8 +29,8 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
 
-$langs->load("companies");
-$langs->load("members");
+// Load translation files required by the page
+$langs->loadLangs(array("companies","members"));
 
 // Security check
 $result=restrictedArea($user,'adherent');

htdocs/adherents/ldap.php

@@ -29,10 +29,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 
-$langs->load("companies");
-$langs->load("members");
-$langs->load("ldap");
-$langs->load("admin");
+// Load translation files required by the page
+$langs->loadLangs(array("companies","members","ldap","admin"));
 
 $rowid = GETPOST('id','int');
 $action = GETPOST('action','aZ09');

htdocs/adherents/note.php

@@ -28,9 +28,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 
-$langs->load("companies");
-$langs->load("members");
-$langs->load("bills");
+// Load translation files required by the page
+$langs->loadLangs(array("companies","members","bills"));
 
 $action=GETPOST('action','alpha');
 $id=GETPOST('id','int');

htdocs/adherents/stats/byproperties.php

@@ -44,8 +44,8 @@ $year = strftime("%Y", time());
 $startyear=$year-2;
 $endyear=$year;
 
-$langs->load("members");
-$langs->load("companies");
+// Load translation files required by the page
+$langs->loadLangs(array("companies","members"));
 
 
 /*

htdocs/adherents/stats/geo.php

@@ -45,8 +45,8 @@ $year = strftime("%Y", time());
 $startyear=$year-2;
 $endyear=$year;
 
-$langs->load("members");
-$langs->load("companies");
+// Load translation files required by the page
+$langs->loadLangs(array("companies","members"));
 
 
 /*

htdocs/adherents/stats/index.php

@@ -46,8 +46,8 @@ $year = strftime("%Y", time());
 $startyear=$year-2;
 $endyear=$year;
 
-$langs->load("members");
-$langs->load("companies");
+// Load translation files required by the page
+$langs->loadLangs(array("companies","members"));
 
 
 /*

htdocs/adherents/subscription/card.php

@@ -29,10 +29,8 @@ if (! empty($conf->banque->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 }
 
-$langs->load("companies");
-$langs->load("bills");
-$langs->load("members");
-$langs->load("users");
+// Load translation files required by the page
+$langs->loadLangs(array("companies","members","bills","users"));
 
 $adh = new Adherent($db);
 $object = new Subscription($db);

htdocs/adherents/subscription/info.php

@@ -28,10 +28,8 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
 
-$langs->load("companies");
-$langs->load("bills");
-$langs->load("members");
-$langs->load("users");
+// Load translation files required by the page
+$langs->loadLangs(array("companies","members","bills","users"));
 
 if (!$user->rights->adherent->lire)
 	accessforbidden();

htdocs/adherents/type_ldap.php

@@ -29,9 +29,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("members");
-$langs->load("admin");
-$langs->load("ldap");
+// Load translation files required by the page
+$langs->loadLangs(array("admin","members","ldap"));
 
 $id = GETPOST('rowid', 'int');
 $action = GETPOST('action','alpha');

htdocs/admin/menus/edit.php

@@ -28,9 +28,8 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
 
-
-$langs->load("admin");
-$langs->load('other');
+// Load translation files required by the page
+$langs->loadLangs(array("other","admin"));
 
 if (! $user->admin) accessforbidden();
 

htdocs/admin/menus/index.php

@@ -27,8 +27,8 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';
 
-$langs->load("other");
-$langs->load("admin");
+// Load translation files required by the page
+$langs->loadLangs(array("other","admin"));
 
 if (! $user->admin) accessforbidden();
 

htdocs/admin/menus/other.php

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

htdocs/admin/system/about.php

@@ -28,10 +28,8 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-$langs->load("admin");
-$langs->load("help");
-$langs->load("members");
-$langs->load("other");
+// Load translation files required by the page
+$langs->loadLangs(array("help","members","other","admin"));
 
 $action=GETPOST('action','alpha');
 
@@ -196,7 +194,7 @@ if ($showpromotemessage)
     {
         print '<br>';
         print '<br>';
-        
+
         if ((empty($tmp[2]) && (strpos($tmp[1], '0') === 0)) || (strpos($tmp[2], '0') === 0))
         {
             print $langs->trans("TitleExampleForMajorRelease").':<br>';

htdocs/admin/system/browser.php

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

htdocs/admin/system/constall.php

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

htdocs/admin/system/dolibarr.php

@@ -29,9 +29,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-$langs->load("admin");
-$langs->load("install");
-$langs->load("other");
+// Load translation files required by the page
+$langs->loadLangs(array("install","other","admin"));
 
 $action=GETPOST('action','alpha');
 

htdocs/admin/system/modules.php

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

htdocs/admin/system/perf.php

@@ -26,9 +26,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-$langs->load("admin");
-$langs->load("install");
-$langs->load("other");
+// Load translation files required by the page
+$langs->loadLangs(array("install","other","admin"));
 
 if (! $user->admin)
 	accessforbidden();

htdocs/asset/class/asset.class.php

@@ -109,16 +109,16 @@ class Asset extends CommonObject
 	public $entity;
 
 	/**
-     * @var string Asset label
-     */
-   	public $label;
+   * @var string Asset label
+   */
+  public $label;
 
 	public $amount;
 
 	/**
 	 * @var int Thirdparty ID
 	 */
-    public $fk_soc;
+  public $fk_soc;
 
 	/**
 	 * @var string description

htdocs/bookmarks/class/bookmark.class.php

@@ -29,9 +29,9 @@
 class Bookmark extends CommonObject
 {
     /**
-	 * @var string ID to identify managed object
-	 */
-	public $element='bookmark';
+	   * @var string ID to identify managed object
+	   */
+	  public $element='bookmark';
 
     /**
      * @var string Name of table without prefix where object is stored
@@ -41,9 +41,9 @@ class Bookmark extends CommonObject
     public $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
     /**
-	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-	 */
-	public $picto = 'bookmark';
+	   * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	   */
+	  public $picto = 'bookmark';
 
     /**
      * @var DoliDB Database handler.
@@ -56,9 +56,9 @@ class Bookmark extends CommonObject
     public $id;
 
     /**
-	 * @var int User ID
-	 */
-	public $fk_user;
+	   * @var int User ID
+	   */
+	  public $fk_user;
 
     public $datec;
     public $url;

htdocs/comm/action/class/actioncomm.class.php

@@ -47,9 +47,9 @@ class ActionComm extends CommonObject
     public $table_rowid = 'id';
 
     /**
-	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-	 */
-	public $picto='action';
+	   * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	   */
+	  public $picto='action';
 
     /**
      * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
@@ -67,7 +67,7 @@ class ActionComm extends CommonObject
      * Id of the event
      * @var int
      */
-	public $id;
+	  public $id;
 
     /**
      * Id of the event. Use $id as possible

htdocs/comm/action/class/cactioncomm.class.php

@@ -56,9 +56,9 @@ class CActionComm
     public $color;
 
     /**
-	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-	 */
-	public $picto;
+	   * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	   */
+	  public $picto;
 
     public $type_actions=array();
 

htdocs/core/class/discount.class.php

@@ -34,9 +34,9 @@ class DiscountAbsolute
     public $db;
 
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error;
+	   * @var string Error code (or message)
+	   */
+	  public $error;
 
 	/**
 	 * @var string[]	Array of error strings
@@ -48,9 +48,9 @@ class DiscountAbsolute
 	 */
 	public $id;
 
-    /**
-	 * @var int Thirdparty ID
-	 */
+   /**
+	  * @var int Thirdparty ID
+	  */
     public $fk_soc;
 
     public $discount_type;			// 0 => customer discount, 1 => supplier discount
@@ -60,14 +60,14 @@ class DiscountAbsolute
     public $tva_tx;				// Vat rate
 
     /**
-	 * @var int User ID Id utilisateur qui accorde la remise
-	 */
-	public $fk_user;
+	   * @var int User ID Id utilisateur qui accorde la remise
+	   */
+	  public $fk_user;
 
     /**
-	 * @var string description
-	 */
-	public $description;
+	   * @var string description
+	   */
+	  public $description;
 
     public $datec;					// Date creation
     public $fk_facture_line;  		// Id invoice line when a discount is used into an invoice line (for absolute discounts)

htdocs/core/lib/company.lib.php

@@ -1485,10 +1485,10 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
     {
         $delay_warning=$conf->global->MAIN_DELAY_ACTIONS_TODO*24*60*60;
 
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-        require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
         require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-        require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+	    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+	    require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 
         $formactions=new FormActions($db);
 

htdocs/product/class/productcustomerprice.class.php

@@ -46,7 +46,7 @@ class Productcustomerprice extends CommonObject
 	/**
 	 * @var int Thirdparty ID
 	 */
-    public $fk_soc;
+  public $fk_soc;
 
 	public $price;
 	public $price_ttc;
@@ -67,6 +67,7 @@ class Productcustomerprice extends CommonObject
 
 	public $lines = array ();
 
+
 	/**
 	 * Constructor
 	 *
@@ -983,7 +984,7 @@ class PriceByCustomerLine
 	/**
 	 * @var int Thirdparty ID
 	 */
-    public $fk_soc;
+  public $fk_soc;
 
 	public $price;
 	public $price_ttc;

htdocs/societe/class/companypaymentmode.class.php

@@ -127,7 +127,7 @@ class CompanyPaymentMode extends CommonObject
 	/**
 	 * @var int Thirdparty ID
 	 */
-    public $fk_soc;
+  public $fk_soc;
 
 	public $label;
 	public $bank;

htdocs/stripe/class/stripe.class.php

@@ -36,7 +36,7 @@ class Stripe extends CommonObject
 	/**
 	 * @var int Thirdparty ID
 	 */
-    public $fk_soc;
+  public $fk_soc;
 
 	public $fk_key;