Merge branch 'develop' into develop

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.class.php

@@ -53,66 +53,69 @@ class Adherent extends CommonObject
 
 	public $ismultientitymanaged = 1;  // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
-	var $mesgs;
+	public $mesgs;
 
-	var $login;
+	public $login;
 
 	//! Clear password in memory
-	var $pass;
+	public $pass;
 	//! Clear password in database (defined if DATABASE_PWD_ENCRYPTED=0)
-	var $pass_indatabase;
+	public $pass_indatabase;
 	//! Encrypted password in database (always defined)
-	var $pass_indatabase_crypted;
+	public $pass_indatabase_crypted;
 
-	var $societe;
-	var $company;
-	var $address;
-	var $zip;
-	var $town;
+	public $societe;
+	public $company;
+	public $address;
+	public $zip;
+	public $town;
 
-	var $state_id;              // Id of department
-	var $state_code;            // Code of department
-	var $state;                 // Label of department
+	public $state_id;              // Id of department
+	public $state_code;            // Code of department
+	public $state;                 // Label of department
 
-	var $email;
-	var $skype;
-	var $phone;
-	var $phone_perso;
-	var $phone_mobile;
+	public $email;
+	public $skype;
+	public $phone;
+	public $phone_perso;
+	public $phone_mobile;
 
-	var $morphy;
-	var $public;
-	var $statut;			// -1:brouillon, 0:resilie, >=1:valide,paye
-	var $photo;
+	public $morphy;
+	public $public;
+	public $statut;			// -1:brouillon, 0:resilie, >=1:valide,paye
+	public $photo;
 
-	var $datec;
-	var $datem;
-	var $datefin;
-	var $datevalid;
-	var $birth;
+	public $datec;
+	public $datem;
+	public $datefin;
+	public $datevalid;
+	public $birth;
 
-	var $note_public;
-	var $note_private;
+	public $note_public;
+	public $note_private;
 
-	var $typeid;			// Id type adherent
-	var $type;				// Libelle type adherent
-	var $need_subscription;
+	public $typeid;			// Id type adherent
+	public $type;				// Libelle type adherent
+	public $need_subscription;
 
-	var $user_id;
-	var $user_login;
+	public $user_id;
+	public $user_login;
 
-	var $fk_soc;
+	/**
+	 * @var int Thirdparty ID
+	 */
+    public $fk_soc;
 
 	// Fields loaded by fetch_subscriptions()
-	var $first_subscription_date;
-	var $first_subscription_amount;
-	var $last_subscription_date;
-	var $last_subscription_date_start;
-	var $last_subscription_date_end;
-	var $last_subscription_amount;
-	var $subscriptions=array();
+	public $first_subscription_date;
+	public $first_subscription_amount;
+	public $last_subscription_date;
+	public $last_subscription_date_start;
+	public $last_subscription_date_end;
+	public $last_subscription_amount;
+	public $subscriptions=array();
 
-	var $oldcopy;		// To contains a clone of this when we need to save old properties of object
+	public $oldcopy;		// To contains a clone of this when we need to save old properties of object
 
 	/**
 	 * @var int Entity

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.class.php

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

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

@@ -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
@@ -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.
@@ -52,16 +56,16 @@ class Bookmark extends CommonObject
     public $id;
 
     /**
-	 * @var int User ID
-	 */
-	public $fk_user;
+	   * @var int User ID
+	   */
+	  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
@@ -63,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

@@ -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';
 
 	/**

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,7 +48,11 @@ class DiscountAbsolute
 	 */
 	public $id;
 
+   /**
+	  * @var int Thirdparty ID
+	  */
     public $fk_soc;
+
     public $discount_type;			// 0 => customer discount, 1 => supplier discount
     public $amount_ht;				//
     public $amount_tva;			//
@@ -56,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/product/class/productcustomerprice.class.php

@@ -38,29 +38,35 @@ class Productcustomerprice extends CommonObject
 	 */
 	public $table_element = 'product_customer_price';
 
-	var $entity;
-	var $datec = '';
-	var $tms = '';
-	var $fk_product;
-	var $fk_soc;
-	var $price;
-	var $price_ttc;
-	var $price_min;
-	var $price_min_ttc;
-	var $price_base_type;
-	var $tva_tx;
-	var $recuperableonly;
-	var $localtax1_type;
-	var $localtax1_tx;
-	var $localtax2_type;
-	var $localtax2_tx;
+	public $entity;
+	public $datec = '';
+	public $tms = '';
+	public $fk_product;
+
+	/**
+	 * @var int Thirdparty ID
+	 */
+  public $fk_soc;
+
+	public $price;
+	public $price_ttc;
+	public $price_min;
+	public $price_min_ttc;
+	public $price_base_type;
+	public $tva_tx;
+	public $recuperableonly;
+	public $localtax1_type;
+	public $localtax1_tx;
+	public $localtax2_type;
+	public $localtax2_tx;
 
 	/**
 	 * @var int User ID
 	 */
 	public $fk_user;
 
-	var $lines = array ();
+	public $lines = array ();
+
 
 	/**
 	 * Constructor
@@ -974,7 +980,12 @@ class PriceByCustomerLine
 	public $datec = '';
 	public $tms = '';
 	public $fk_product;
-	public $fk_soc;
+
+	/**
+	 * @var int Thirdparty ID
+	 */
+  public $fk_soc;
+
 	public $price;
 	public $price_ttc;
 	public $price_min;

htdocs/societe/class/companypaymentmode.class.php

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

htdocs/societe/class/societeaccount.class.php

@@ -111,7 +111,12 @@ class SocieteAccount extends CommonObject
 	public $pass_encoding;
 	public $pass_crypted;
 	public $pass_temp;
-	public $fk_soc;
+
+	/**
+	 * @var int Thirdparty ID
+	 */
+    public $fk_soc;
+
 	public $site;
 	public $date_last_login;
 	public $date_previous_login;

htdocs/stripe/class/stripe.class.php

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

htdocs/ticket/class/actions_ticket.class.php

@@ -68,6 +68,10 @@ class ActionsTicket
 	public $description;
 
     public $fk_statut;
+
+    /**
+	 * @var int Thirdparty ID
+	 */
     public $fk_soc;
 
     /**

htdocs/ticket/class/ticket.class.php

@@ -2502,8 +2502,8 @@ class TicketsLine
     public $track_id;
 
     /**
-	 * Thirdparty ID
-	*/
+	 * @var int Thirdparty ID
+	 */
     public $fk_soc;
 
     /**