Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

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");
+// Load translation files required by the page
-$langs->load("members");
+$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");
+// Load translation files required by the page
-$langs->load("members");
+$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");
+// Load translation files required by the page
-$langs->load("admin");
+$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");
+// Load translation files required by the page
-$langs->load("admin");
+$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");
+// Load translation files required by the page
-$langs->load("admin");
+$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");
+// Load translation files required by the page
-$langs->load("members");
+$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");
+// Load translation files required by the page
-$langs->load("companies");
+$langs->loadLangs(array("companies","members","other"));
-$langs->load('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");
+// Load translation files required by the page
-$langs->load("members");
+$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");
+// Load translation files required by the page
-$langs->load("members");
+$langs->loadLangs(array("companies","members","ldap","admin"));
-$langs->load("ldap");
-$langs->load("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");
+// Load translation files required by the page
-$langs->load("members");
+$langs->loadLangs(array("companies","members","bills"));
-$langs->load("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");
+// Load translation files required by the page
-$langs->load("companies");
+$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");
+// Load translation files required by the page
-$langs->load("companies");
+$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");
+// Load translation files required by the page
-$langs->load("companies");
+$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");
+// Load translation files required by the page
-$langs->load("bills");
+$langs->loadLangs(array("companies","members","bills","users"));
-$langs->load("members");
-$langs->load("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");
+// Load translation files required by the page
-$langs->load("bills");
+$langs->loadLangs(array("companies","members","bills","users"));
-$langs->load("members");
-$langs->load("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");
+// Load translation files required by the page
-$langs->load("admin");
+$langs->loadLangs(array("admin","members","ldap"));
-$langs->load("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';
 
-
+// Load translation files required by the page
-$langs->load("admin");
+$langs->loadLangs(array("other","admin"));
-$langs->load('other');
 
 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");
+// Load translation files required by the page
-$langs->load("admin");
+$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");
+// Load translation files required by the page
-$langs->load("admin");
+$langs->loadLangs(array("user","other","admin"));
-$langs->load("other");
 
 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");
+// Load translation files required by the page
-$langs->load("help");
+$langs->loadLangs(array("help","members","other","admin"));
-$langs->load("members");
-$langs->load("other");
 
 $action=GETPOST('action','alpha');
 

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");
+// Load translation files required by the page
-$langs->load("install");
+$langs->loadLangs(array("install","other","admin"));
-$langs->load("other");
 
 if (! $user->admin)
 	accessforbidden();

htdocs/admin/system/constall.php

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

htdocs/commande/class/commande.class.php

@@ -64,6 +64,9 @@ class Commande extends CommonOrder
 	 */
 	public $fk_element = 'fk_commande';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'order';
 
 	/**

htdocs/compta/bank/class/account.class.php

@@ -46,6 +46,9 @@ class Account extends CommonObject
 	 */
 	public $table_element = 'bank_account';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'account';
 
 	/**
@@ -1664,6 +1667,9 @@ class AccountLine extends CommonObject
 	 */
 	public $table_element='bank';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'generic';
 
 	/**

htdocs/compta/bank/class/bankcateg.class.php

@@ -30,6 +30,9 @@ class BankCateg // extends CommonObject
 {
 	//public $element='bank_categ';			//!< Id that identify managed objects
 	//public $table_element='bank_categ';	//!< Name of table without prefix where object is stored
+    /**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto='generic';
 
 	/**

htdocs/compta/bank/class/paymentvarious.class.php

@@ -40,6 +40,9 @@ class PaymentVarious extends CommonObject
 	 */
 	public $table_element='payment_various';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'bill';
 
 	/**

htdocs/compta/facture/class/facture-rec.class.php

@@ -59,6 +59,9 @@ class FactureRec extends CommonInvoice
 	 */
 	public $fk_element='fk_facture';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto='bill';
 
 	public $entity;

htdocs/compta/facture/class/facture.class.php

@@ -73,6 +73,9 @@ class Facture extends CommonInvoice
 	 */
 	public $fk_element = 'fk_facture';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto='bill';
 
 	/**

htdocs/compta/localtax/class/localtax.class.php

@@ -39,22 +39,25 @@ class Localtax extends CommonObject
 	 */
 	public $table_element='localtax';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto='payment';
 
-	var $ltt;
+	public $ltt;
-	var $tms;
+	public $tms;
-	var $datep;
+	public $datep;
-	var $datev;
+	public $datev;
-	var $amount;
+	public $amount;
 
 	/**
      * @var string local tax
      */
     public $label;
 
-	var $fk_bank;
+	public $fk_bank;
-	var $fk_user_creat;
+	public $fk_user_creat;
-	var $fk_user_modif;
+	public $fk_user_modif;
 
     /**
 	 *	Constructor

htdocs/compta/paiement/cheque/class/remisecheque.class.php

@@ -43,12 +43,15 @@ class RemiseCheque extends CommonObject
 	 */
 	public $table_element='bordereau_cheque';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'payment';
 
-	var $num;
+	public $num;
-	var $intitule;
+	public $intitule;
 	//! Numero d'erreur Plage 1024-1279
-	var $errno;
+	public $errno;
 
 	public $amount;
 	public $date_bordereau;

htdocs/compta/paiement/class/paiement.class.php

@@ -46,34 +46,40 @@ class Paiement extends CommonObject
 	 */
 	public $table_element='paiement';
 
+    /**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'payment';
 
-	var $facid;
+	public $facid;
-	var $datepaye;
+	public $datepaye;
+
 	/**
 	 * @deprecated
 	 * @see amount, amounts
 	 */
-    var $total;
+    public $total;
+
 	/**
 	 * @deprecated
 	 * @see amount, amounts
 	 */
-	var $montant;
+	public $montant;
-	var $amount;            // Total amount of payment
+
-	var $amounts=array();   // Array of amounts
+	public $amount;            // Total amount of payment
-	var $multicurrency_amounts=array();   // Array of amounts
+	public $amounts=array();   // Array of amounts
-	var $author;
+	public $multicurrency_amounts=array();   // Array of amounts
-	var $paiementid;	// Type de paiement. Stocke dans fk_paiement
+	public $author;
+	public $paiementid;	// Type de paiement. Stocke dans fk_paiement
 	// de llx_paiement qui est lie aux types de
 	//paiement de llx_c_paiement
-	var $num_paiement;	// Numero du CHQ, VIR, etc...
+	public $num_paiement;	// Numero du CHQ, VIR, etc...
-	var $num_payment;	// Numero du CHQ, VIR, etc...
+	public $num_payment;	// Numero du CHQ, VIR, etc...
-	var $bank_account;	// Id compte bancaire du paiement
+	public $bank_account;	// Id compte bancaire du paiement
-	var $bank_line;     // Id de la ligne d'ecriture bancaire
+	public $bank_line;     // Id de la ligne d'ecriture bancaire
 	// fk_paiement dans llx_paiement est l'id du type de paiement (7 pour CHQ, ...)
 	// fk_paiement dans llx_paiement_facture est le rowid du paiement
-    var $fk_paiement;    // Type of paiment
+    public $fk_paiement;    // Type of paiment
 
 
 	/**

htdocs/compta/prelevement/class/bonprelevement.class.php

@@ -49,27 +49,30 @@ class BonPrelevement extends CommonObject
 	 */
 	public $table_element='prelevement_bons';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'payment';
 
-	var $date_echeance;
+	public $date_echeance;
-	var $raison_sociale;
+	public $raison_sociale;
-	var $reference_remise;
+	public $reference_remise;
-	var $emetteur_code_guichet;
+	public $emetteur_code_guichet;
-	var $emetteur_numero_compte;
+	public $emetteur_numero_compte;
-	var $emetteur_code_banque;
+	public $emetteur_code_banque;
-	var $emetteur_number_key;
+	public $emetteur_number_key;
 
-	var $emetteur_iban;
+	public $emetteur_iban;
-	var $emetteur_bic;
+	public $emetteur_bic;
-	var $emetteur_ics;
+	public $emetteur_ics;
 
-	var $total;
+	public $total;
-	var $_fetched;
+	public $fetched;
-	var $statut;    // 0-Wait, 1-Trans, 2-Done
+	public $statut;    // 0-Wait, 1-Trans, 2-Done
-	var $labelstatut=array();
+	public $labelstatut=array();
 
-	var $invoice_in_error=array();
+	public $invoice_in_error=array();
-	var $thirdparty_in_error=array();
+	public $thirdparty_in_error=array();
 
 
 	/**
@@ -106,7 +109,7 @@ class BonPrelevement extends CommonObject
 
 		$this->methodes_trans[0] = "Internet";
 
-		$this->_fetched = 0;
+		$this->fetched = 0;
 	}
 
 	/**
@@ -312,7 +315,7 @@ class BonPrelevement extends CommonObject
 
 				$this->statut             = $obj->statut;
 
-				$this->_fetched = 1;
+				$this->fetched = 1;
 
 				return 1;
 			}
@@ -420,7 +423,7 @@ class BonPrelevement extends CommonObject
 
 		$error = 0;
 
-		if ($this->_fetched == 1)
+		if ($this->fetched == 1)
 		{
 			if ($date >= $this->date_trans)
 			{

htdocs/compta/salaries/class/paymentsalary.class.php

@@ -41,6 +41,9 @@ class PaymentSalary extends CommonObject
 	 */
 	public $table_element='payment_salary';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto='payment';
 
 	public $tms;

htdocs/compta/sociales/class/chargesociales.class.php

@@ -44,6 +44,9 @@ class ChargeSociales extends CommonObject
 	 */
 	public $table_element='chargesociales';
 
+    /**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'bill';
 
     /**
@@ -51,18 +54,18 @@ class ChargeSociales extends CommonObject
      */
     protected $table_ref_field = 'ref';
 
-    var $date_ech;
+    public $date_ech;
-    var $lib;
+    public $lib;
-    var $type;
+    public $type;
-    var $type_libelle;
+    public $type_libelle;
-    var $amount;
+    public $amount;
-    var $paye;
+    public $paye;
-    var $periode;
+    public $periode;
-    var $date_creation;
+    public $date_creation;
-    var $date_modification;
+    public $date_modification;
-    var $date_validation;
+    public $date_validation;
-    var $fk_account;
+    public $fk_account;
-	var $fk_project;
+	public $fk_project;
 
 
     /**

htdocs/compta/sociales/class/paymentsocialcontribution.class.php

@@ -41,17 +41,22 @@ class PaymentSocialContribution extends CommonObject
 	 */
 	public $table_element='paiementcharge';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'payment';
 
 	public $fk_charge;
 	public $datec='';
 	public $tms='';
 	public $datep='';
+
 	/**
 	 * @deprecated
 	 * @see amount
 	 */
 	public $total;
+
     public $amount;            // Total amount of payment
     public $amounts=array();   // Array of amounts
 	public $fk_typepaiement;

htdocs/compta/tva/class/tva.class.php

@@ -43,23 +43,26 @@ class Tva extends CommonObject
 	 */
 	public $table_element='tva';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto='payment';
 
-	var $tms;
+	public $tms;
-	var $datep;
+	public $datep;
-	var $datev;
+	public $datev;
-	var $amount;
+	public $amount;
-	var $type_payment;
+	public $type_payment;
-	var $num_payment;
+	public $num_payment;
 
 	/**
      * @var string label
      */
     public $label;
 
-	var $fk_bank;
+	public $fk_bank;
-	var $fk_user_creat;
+	public $fk_user_creat;
-	var $fk_user_modif;
+	public $fk_user_modif;
 
     /**
 	 *	Constructor

htdocs/contact/class/contact.class.php

@@ -48,6 +48,10 @@ class Contact extends CommonObject
 	public $table_element='socpeople';
 
 	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 = 'contact';
 
 

htdocs/contrat/class/contrat.class.php

@@ -61,6 +61,9 @@ class Contrat extends CommonObject
 	 */
 	public $fk_element='fk_contrat';
 
+    /**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto='contract';
 
     /**

htdocs/core/lib/company.lib.php

@@ -1485,9 +1485,9 @@ 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';
+        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/core/triggers/interface_20_all_Logevents.class.php

@@ -31,7 +31,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
  */
 class InterfaceLogevents extends DolibarrTriggers
 {
+	/**
+	 * @var string Image of the trigger
+	 */
 	public $picto = 'technic';
+
 	public $family = 'core';
 	public $description = "Triggers of this module allows to add security event records inside Dolibarr.";
 	public $version = self::VERSION_DOLIBARR;

htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php

@@ -32,7 +32,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
 
 class InterfaceWorkflowManager extends DolibarrTriggers
 {
+	/**
+	 * @var string Image of the trigger
+	 */
 	public $picto = 'technic';
+
 	public $family = 'core';
 	public $description = "Triggers of this module allows to manage workflows";
 	public $version = self::VERSION_DOLIBARR;

htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php

@@ -37,6 +37,10 @@ class InterfaceActionsAuto extends DolibarrTriggers
 	public $family = 'agenda';
 	public $description = "Triggers of this module add actions in agenda according to setup made in agenda setup.";
 	public $version = self::VERSION_DOLIBARR;
+
+	/**
+	 * @var string Image of the trigger
+	 */
 	public $picto = 'action';
 
 	/**

htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php

@@ -33,6 +33,10 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 	public $family = 'system';
 	public $description = "Triggers of this module add action for BlockedLog module.";
 	public $version = self::VERSION_DOLIBARR;
+
+	/**
+	 * @var string Image of the trigger
+	 */
 	public $picto = 'technic';
 
 	/**

htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php

@@ -34,6 +34,10 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 	public $family = 'ldap';
 	public $description = "Triggers of this module allows to synchronize Dolibarr toward a LDAP database.";
 	public $version = self::VERSION_DOLIBARR;
+
+	/**
+	 * @var string Image of the trigger
+	 */
 	public $picto = 'technic';
 
 	/**

htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php

@@ -32,6 +32,10 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
 	public $family = 'mailmanspip';
 	public $description = "Triggers of this module allows to synchronize Mailman an Spip.";
 	public $version = self::VERSION_DOLIBARR;
+
+	/**
+	 * @var string Image of the trigger
+	 */
 	public $picto = 'technic';
 
 	/**

htdocs/core/triggers/interface_50_modNotification_Notification.class.php

@@ -33,9 +33,13 @@ class InterfaceNotification extends DolibarrTriggers
 	public $family = 'notification';
 	public $description = "Triggers of this module send email notifications according to Notification module setup.";
 	public $version = self::VERSION_DOLIBARR;
+
+	/**
+	 * @var string Image of the trigger
+	 */
 	public $picto = 'email';
 
-	var $listofmanagedevents=array(
+	public $listofmanagedevents=array(
 		'BILL_VALIDATE',
 		'BILL_PAYED',
 		'ORDER_VALIDATE',

htdocs/cron/class/cronjob.class.php

@@ -40,6 +40,9 @@ class Cronjob extends CommonObject
 	 */
 	public $table_element='cronjob';
 
+    /**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'cron';
 
     /**

htdocs/don/class/don.class.php

@@ -50,6 +50,10 @@ class Don extends CommonObject
 	public $fk_element = 'fk_donation';
 
 	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 = 'generic';
 
     public $date;

htdocs/don/class/paymentdonation.class.php

@@ -39,6 +39,9 @@ class PaymentDonation extends CommonObject
 	 */
 	public $table_element='payment_donation';
 
+    /**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'payment';
 
 	/**

htdocs/ecm/class/ecmdirectory.class.php

@@ -37,6 +37,9 @@ class EcmDirectory // extends CommonObject
 	 */
 	//public $table_element='ecm_directories';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'dir';
 
 	/**

htdocs/ecm/class/ecmfiles.class.php

@@ -46,6 +46,9 @@ class EcmFiles extends CommonObject
 	 */
 	public $table_element = 'ecm_files';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'generic';
 
 	/**

htdocs/expedition/class/expedition.class.php

@@ -62,6 +62,10 @@ class Expedition extends CommonObject
 	public $table_element_line="expeditiondet";
 
 	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 = 'sending';
 
 	public $socid;

htdocs/expensereport/class/paymentexpensereport.class.php

@@ -40,24 +40,27 @@ class PaymentExpenseReport extends CommonObject
 	 */
 	public $table_element='payment_expensereport';
 
+    /**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'payment';
 
-	var $rowid;
+	public $rowid;
 
-	var $fk_expensereport;
+	public $fk_expensereport;
-	var $datec='';
+	public $datec='';
-	var $tms='';
+	public $tms='';
-	var $datep='';
+	public $datep='';
-    var $amount;            // Total amount of payment
+    public $amount;            // Total amount of payment
-    var $amounts=array();   // Array of amounts
+    public $amounts=array();   // Array of amounts
-	var $fk_typepayment;
+	public $fk_typepayment;
-	var $num_payment;
+	public $num_payment;
-	var $fk_bank;
+	public $fk_bank;
-	var $fk_user_creat;
+	public $fk_user_creat;
-	var $fk_user_modif;
+	public $fk_user_modif;
     //Unknow field
-    var $chid;
+    public $chid;
-    var $total;
+    public $total;
 
 	/**
 	 *	Constructor

htdocs/fichinter/class/fichinter.class.php

@@ -55,6 +55,9 @@ class Fichinter extends CommonObject
 	 */
 	public $table_element_line='fichinterdet';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'intervention';
 
 	/**

htdocs/holiday/class/holiday.class.php

@@ -946,53 +946,53 @@ class Holiday extends CommonObject
 		if ($mode == 0)
 		{
 			if ($statut == 1) return $langs->trans('DraftCP');
-			if ($statut == 2) return $langs->trans('ToReviewCP');
+			elseif ($statut == 2) return $langs->trans('ToReviewCP');
-			if ($statut == 3) return $langs->trans('ApprovedCP');
+			elseif ($statut == 3) return $langs->trans('ApprovedCP');
-			if ($statut == 4) return $langs->trans('CancelCP');
+			elseif ($statut == 4) return $langs->trans('CancelCP');
-			if ($statut == 5) return $langs->trans('RefuseCP');
+			elseif ($statut == 5) return $langs->trans('RefuseCP');
 		}
-		if ($mode == 2)
+		elseif ($mode == 2)
 		{
 			$pictoapproved='statut6';
 			if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
 			if ($statut == 1) return img_picto($langs->trans('DraftCP'),'statut0').' '.$langs->trans('DraftCP');				// Draft
-			if ($statut == 2) return img_picto($langs->trans('ToReviewCP'),'statut1').' '.$langs->trans('ToReviewCP');		// Waiting approval
+			elseif ($statut == 2) return img_picto($langs->trans('ToReviewCP'),'statut1').' '.$langs->trans('ToReviewCP');		// Waiting approval
-			if ($statut == 3) return img_picto($langs->trans('ApprovedCP'),$pictoapproved).' '.$langs->trans('ApprovedCP');
+			elseif ($statut == 3) return img_picto($langs->trans('ApprovedCP'),$pictoapproved).' '.$langs->trans('ApprovedCP');
-			if ($statut == 4) return img_picto($langs->trans('CancelCP'),'statut5').' '.$langs->trans('CancelCP');
+			elseif ($statut == 4) return img_picto($langs->trans('CancelCP'),'statut5').' '.$langs->trans('CancelCP');
-			if ($statut == 5) return img_picto($langs->trans('RefuseCP'),'statut5').' '.$langs->trans('RefuseCP');
+			elseif ($statut == 5) return img_picto($langs->trans('RefuseCP'),'statut5').' '.$langs->trans('RefuseCP');
 		}
-		if ($mode == 3)
+		elseif ($mode == 3)
 		{
 			$pictoapproved='statut6';
 			if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
 			if ($statut == 1) return img_picto($langs->trans('DraftCP'),'statut0');
-			if ($statut == 2) return img_picto($langs->trans('ToReviewCP'),'statut1');
+			elseif ($statut == 2) return img_picto($langs->trans('ToReviewCP'),'statut1');
-			if ($statut == 3) return img_picto($langs->trans('ApprovedCP'),$pictoapproved);
+			elseif ($statut == 3) return img_picto($langs->trans('ApprovedCP'),$pictoapproved);
-			if ($statut == 4) return img_picto($langs->trans('CancelCP'),'statut5');
+			elseif ($statut == 4) return img_picto($langs->trans('CancelCP'),'statut5');
-			if ($statut == 5) return img_picto($langs->trans('RefuseCP'),'statut5');
+			elseif ($statut == 5) return img_picto($langs->trans('RefuseCP'),'statut5');
 		}
-		if ($mode == 5)
+		elseif ($mode == 5)
 		{
 			$pictoapproved='statut6';
 			if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
 			if ($statut == 1) return $langs->trans('DraftCP').' '.img_picto($langs->trans('DraftCP'),'statut0');				// Draft
-			if ($statut == 2) return $langs->trans('ToReviewCP').' '.img_picto($langs->trans('ToReviewCP'),'statut1');		// Waiting approval
+			elseif ($statut == 2) return $langs->trans('ToReviewCP').' '.img_picto($langs->trans('ToReviewCP'),'statut1');		// Waiting approval
-			if ($statut == 3) return $langs->trans('ApprovedCP').' '.img_picto($langs->trans('ApprovedCP'),$pictoapproved);
+			elseif ($statut == 3) return $langs->trans('ApprovedCP').' '.img_picto($langs->trans('ApprovedCP'),$pictoapproved);
-			if ($statut == 4) return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'),'statut5');
+			elseif ($statut == 4) return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'),'statut5');
-			if ($statut == 5) return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'),'statut5');
+			elseif ($statut == 5) return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'),'statut5');
 		}
-		if ($mode == 6)
+		elseif ($mode == 6)
 		{
 			$pictoapproved='statut6';
 			if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
 			if ($statut == 1) return $langs->trans('DraftCP').' '.img_picto($langs->trans('DraftCP'),'statut0');				// Draft
-			if ($statut == 2) return $langs->trans('ToReviewCP').' '.img_picto($langs->trans('ToReviewCP'),'statut1');		// Waiting approval
+			elseif ($statut == 2) return $langs->trans('ToReviewCP').' '.img_picto($langs->trans('ToReviewCP'),'statut1');		// Waiting approval
-			if ($statut == 3) return $langs->trans('ApprovedCP').' '.img_picto($langs->trans('ApprovedCP'),$pictoapproved);
+			elseif ($statut == 3) return $langs->trans('ApprovedCP').' '.img_picto($langs->trans('ApprovedCP'),$pictoapproved);
-			if ($statut == 4) return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'),'statut5');
+			elseif ($statut == 4) return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'),'statut5');
-			if ($statut == 5) return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'),'statut5');
+			elseif ($statut == 5) return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'),'statut5');
 		}
 
-		return $statut;
+		else return $statut;
 	}
 
 

htdocs/product/class/productcustomerprice.class.php

@@ -67,6 +67,7 @@ class Productcustomerprice extends CommonObject
 
 	public $lines = array ();
 
+
 	/**
 	 * Constructor
 	 *