Merge pull request #23978 from frederic34/commonobjectline

doc

htdocs/core/class/commonobjectline.class.php

@@ -79,8 +79,20 @@ abstract class CommonObjectLine extends CommonObject
 	public $product_type;		// type in line
 	public $fk_product;			// product id in line (when line is linked to a product)
 
+	/**
+	 * Description of the line
+	 * @var string
+	 */
 	public $desc;
 
+	/**
+	 * Description of the line
+	 * @var string
+	 * @deprecated
+	 * @see $desc
+	 */
+	public $description;
+
 	public $product;			// To store full product object after a fetch_product() on a line
 	public $product_ref;		// ref in product table
 	public $product_label;		// label in product table

htdocs/core/class/commonorder.class.php

@@ -167,12 +167,6 @@ abstract class CommonOrderLine extends CommonObjectLine
 	 */
 	public $product_type = 0;
 
-	/**
-	 * Description of the line
-	 * @var string
-	 */
-	public $desc;
-
 	/**
 	 * Id of corresponding product
 	 * @var int