Merge branch 'develop' of github.com:grandoc/dolibarr into develop

htdocs/asset/class/asset.class.php

@@ -109,16 +109,16 @@ class Asset extends CommonObject
 	public $entity;
 
 	/**
-     * @var string Asset label
+   * @var string Asset label
-     */
+   */
-   	public $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
+	   * @var string ID to identify managed object
-	 */
+	   */
-	public $element='bookmark';
+	  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
+	   * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-	 */
+	   */
-	public $picto = 'bookmark';
+	  public $picto = 'bookmark';
 
     /**
      * @var DoliDB Database handler.
@@ -56,9 +56,9 @@ class Bookmark extends CommonObject
     public $id;
 
     /**
-	 * @var int User ID
+	   * @var int User ID
-	 */
+	   */
-	public $fk_user;
+	  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
+	   * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-	 */
+	   */
-	public $picto='action';
+	  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
+	   * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-	 */
+	   */
-	public $picto;
+	  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)
+	   * @var string Error code (or message)
-	 */
+	   */
-	public $error;
+	  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
+	   * @var int User ID Id utilisateur qui accorde la remise
-	 */
+	   */
-	public $fk_user;
+	  public $fk_user;
 
     /**
-	 * @var string description
+	   * @var string description
-	 */
+	   */
-	public $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

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