fix merge

htdocs/accountancy/class/accountingaccount.class.php

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

htdocs/accountancy/class/accountingjournal.class.php

@@ -42,6 +42,10 @@ class AccountingJournal extends CommonObject
 	public $fk_element = '';
 
 	public $ismultientitymanaged = 0;	// 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';
 
 	/**

htdocs/adherents/class/adherent_type.class.php

@@ -36,13 +36,17 @@ class AdherentType extends CommonObject
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element = 'adherent_type';
-	
+
 	/**
 	 * @var string ID to identify managed object
 	 */
 	public $element = 'adherent_type';
-	
+
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'group';
+
 	public $ismultientitymanaged = 1;  // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
 	/**
@@ -51,19 +55,25 @@ class AdherentType extends CommonObject
 	 * @see label
 	 */
 	public $libelle;
+
 	/** @var string Label */
 	public $label;
+
 	/**
 	 * @var int Subsription required (0 or 1)
 	 * @since 5.0
 	 */
 	public $subscription;
+
 	/** @var string 	Public note */
 	public $note;
+
 	/** @var integer	Can vote */
 	public $vote;
+
 	/** @var string Email sent during validation */
 	public $mail_valid;
+
 	/** @var array Array of members */
 	public $members=array();
 

htdocs/adherents/class/subscription.class.php

@@ -36,21 +36,24 @@ class Subscription extends CommonObject
 	 * @var string ID to identify managed object
 	 */
 	public $element='subscription';
-	
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element='subscription';
-	
-    public $picto='payment';
 
-	var $datec;				// Date creation
-	var $datem;				// Date modification
-	var $dateh;				// Subscription start date (date subscription)
-	var $datef;				// Subscription end date
-	var $fk_adherent;
-	var $amount;
-	var $fk_bank;
+    /**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto='payment';
+
+	public $datec;				// Date creation
+	public $datem;				// Date modification
+	public $dateh;				// Subscription start date (date subscription)
+	public $datef;				// Subscription end date
+	public $fk_adherent;
+	public $amount;
+	public $fk_bank;
 
 
 	/**

htdocs/asset/class/asset_type.class.php

@@ -33,25 +33,34 @@ class AssetType extends CommonObject
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element = 'asset_type';
-	
+
 	/**
 	 * @var string ID to identify managed object
 	 */
 	public $element = 'asset_type';
-	
+
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'group';
+
 	public $ismultientitymanaged = 1;  // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
 	/** @var string Label */
 	public $label;
+
 	/** @var string Accountancy code asset */
 	public $accountancy_code_asset;
+
 	/** @var string Accountancy code depreciation asset */
 	public $accountancy_code_depreciation_asset;
+
 	/** @var string Accountancy code depreciation expense */
 	public $accountancy_code_depreciation_expense;
+
 	/** @var string 	Public note */
 	public $note;
+
 	/** @var array Array of asset */
 	public $asset=array();
 

htdocs/bookmarks/class/bookmark.class.php

@@ -39,7 +39,11 @@ class Bookmark extends CommonObject
     public $table_element='bookmark';
 
     public $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-    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,12 +60,12 @@ class Bookmark extends CommonObject
 	 */
 	public $fk_user;
 
-    var $datec;
-    var $url;
-    var $target;	// 0=replace, 1=new window
-    var $title;
-    var $position;
-    var $favicon;
+    public $datec;
+    public $url;
+    public $target;	// 0=replace, 1=new window
+    public $title;
+    public $position;
+    public $favicon;
 
 
     /**

htdocs/categories/class/categorie.class.php

@@ -51,8 +51,11 @@ class Categorie extends CommonObject
 	const TYPE_USER      = 'user';
 	const TYPE_PROJECT   = 'project';
 	const TYPE_ACCOUNT   = 'bank_account';
-    	const TYPE_BANK_LINE = 'bank_line';
+    const TYPE_BANK_LINE = 'bank_line';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'category';
 
 

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

@@ -45,7 +45,11 @@ class ActionComm extends CommonObject
     public $table_element = 'actioncomm';
 
     public $table_rowid = 'id';
-    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

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

@@ -54,7 +54,11 @@ class CActionComm
 
     public $active;
     public $color;
-    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/comm/mailing/class/mailing.class.php

@@ -35,39 +35,42 @@ class Mailing extends CommonObject
 	 * @var string ID to identify managed object
 	 */
 	public $element='mailing';
-	
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element='mailing';
-	
+
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto='email';
 
-	var $titre;
-	var $sujet;
-	var $body;
-	var $nbemail;
-	var $bgcolor;
-	var $bgimage;
+	public $titre;
+	public $sujet;
+	public $body;
+	public $nbemail;
+	public $bgcolor;
+	public $bgimage;
 
-	var $statut;       // Status 0=Draft, 1=Validated, 2=Sent partially, 3=Sent completely
+	public $statut;       // Status 0=Draft, 1=Validated, 2=Sent partially, 3=Sent completely
 
-	var $email_from;
-	var $email_replyto;
-	var $email_errorsto;
+	public $email_from;
+	public $email_replyto;
+	public $email_errorsto;
 
-	var $joined_file1;
-	var $joined_file2;
-	var $joined_file3;
-	var $joined_file4;
+	public $joined_file1;
+	public $joined_file2;
+	public $joined_file3;
+	public $joined_file4;
 
-	var $user_creat;
-	var $user_valid;
+	public $user_creat;
+	public $user_valid;
 
-	var $date_creat;
-	var $date_valid;
+	public $date_creat;
+	public $date_valid;
 
-	var $extraparams=array();
+	public $extraparams=array();
 
 	public $statut_dest=array();
 	public $statuts=array();

htdocs/comm/propal/class/propal.class.php

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