Remove deprecated code

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

@@ -490,7 +490,6 @@ class Propal extends CommonObject
 			$line->subprice = -$remise->amount_ht;
 			$line->fk_product = 0; // Id produit predefined
 			$line->qty = 1;
-			$line->remise = 0;
 			$line->remise_percent = 0;
 			$line->rang = -1;
 			$line->info_bits = 2;
@@ -736,7 +735,6 @@ class Propal extends CommonObject
 
 			// TODO deprecated
 			$this->line->price = $price;
-			$this->line->remise = $remise;
 
 			if (is_array($array_options) && count($array_options) > 0) {
 				$this->line->array_options = $array_options;
@@ -936,7 +934,6 @@ class Propal extends CommonObject
 
 			// TODO deprecated
 			$this->line->price = $price;
-			$this->line->remise = $remise;
 
 			if (is_array($array_options) && count($array_options) > 0) {
 				// We replace values in this->line->array_options only for entries defined into $array_options
@@ -4134,9 +4131,6 @@ class PropaleLigne extends CommonObjectLine
 		if (empty($this->rang)) {
 			$this->rang = 0;
 		}
-		if (empty($this->remise)) {
-			$this->remise = 0;
-		}
 		if (empty($this->remise_percent) || !is_numeric($this->remise_percent)) {
 			$this->remise_percent = 0;
 		}
@@ -4366,9 +4360,6 @@ class PropaleLigne extends CommonObjectLine
 		if (empty($this->price)) {
 			$this->price = 0; // TODO A virer
 		}
-		if (empty($this->remise)) {
-			$this->remise = 0; // TODO A virer
-		}
 		if (empty($this->remise_percent)) {
 			$this->remise_percent = 0;
 		}

htdocs/commande/class/commande.class.php

@@ -1666,7 +1666,6 @@ class Commande extends CommonOrder
 
 			// TODO Ne plus utiliser
 			$this->line->price = $price;
-			$this->line->remise = $remise;
 
 			if (is_array($array_options) && count($array_options) > 0) {
 				$this->line->array_options = $array_options;
@@ -2010,7 +2009,6 @@ class Commande extends CommonOrder
 			$line->price = -$remise->amount_ht;
 			$line->fk_product = 0; // Id produit predefini
 			$line->qty = 1;
-			$line->remise = 0;
 			$line->remise_percent = 0;
 			$line->rang = -1;
 			$line->info_bits = 2;
@@ -3264,7 +3262,6 @@ class Commande extends CommonOrder
 
 			// TODO deprecated
 			$this->line->price = $price;
-			$this->line->remise = $remise;
 
 			if (is_array($array_options) && count($array_options) > 0) {
 				// We replace values in this->line->array_options only for entries defined into $array_options
@@ -4406,9 +4403,6 @@ class OrderLine extends CommonOrderLine
 		if (empty($this->rang)) {
 			$this->rang = 0;
 		}
-		if (empty($this->remise)) {
-			$this->remise = 0;
-		}
 		if (empty($this->remise_percent)) {
 			$this->remise_percent = 0;
 		}
@@ -4581,9 +4575,6 @@ class OrderLine extends CommonOrderLine
 		if (empty($this->marge_tx)) {
 			$this->marge_tx = 0;
 		}
-		if (empty($this->remise)) {
-			$this->remise = 0;
-		}
 		if (empty($this->remise_percent)) {
 			$this->remise_percent = 0;
 		}

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

@@ -560,7 +560,6 @@ class Facture extends CommonInvoice
 
 			$this->array_options = $_facrec->array_options;
 
-			//if (! $this->remise) $this->remise = 0;
 			if (!$this->mode_reglement_id) {
 				$this->mode_reglement_id = 0;
 			}

htdocs/contrat/class/contrat.class.php

@@ -2991,7 +2991,6 @@ class ContratLigne extends CommonObjectLine
 				$this->localtax2_type = $obj->localtax2_type;
 				$this->qty = $obj->qty;
 				$this->remise_percent = $obj->remise_percent;
-				$this->remise = $obj->remise;
 				$this->fk_remise_except = $obj->fk_remise_except;
 				$this->subprice = $obj->subprice;
 				$this->price_ht = $obj->price_ht;
@@ -3049,7 +3048,6 @@ class ContratLigne extends CommonObjectLine
 		$this->localtax2_tx = trim($this->localtax2_tx);
 		$this->qty = trim($this->qty);
 		$this->remise_percent = trim($this->remise_percent);
-		$this->remise = trim($this->remise);
 		$this->fk_remise_except = (int) $this->fk_remise_except;
 		$this->subprice = price2num($this->subprice);
 		$this->price_ht = price2num($this->price_ht);

htdocs/core/class/commonobjectline.class.php

@@ -76,6 +76,16 @@ abstract class CommonObjectLine extends CommonObject
 
 	public $multilangs;
 
+	public $product_ref;
+	public $product_label;
+	public $product_type;
+	public $product_desc;
+	public $qty;
+	public $duree;
+	public $remise_percent;
+	public $info_bits;
+	public $special_code;
+
 
 
 	/**

htdocs/core/class/html.form.class.php

@@ -2755,7 +2755,6 @@ class Form
 							$objp->price = $objp2->price;
 							$objp->unitprice = $objp2->unitprice;
 							$objp->remise_percent = $objp2->remise_percent;
-							$objp->remise = $objp2->remise;
 
 							//$objp->tva_tx is not overwritten by $objp2 value
 							//$objp->default_vat_code is not overwritten by $objp2 value

htdocs/fichinter/class/fichinter.class.php

@@ -1420,6 +1420,8 @@ class FichinterLigne extends CommonObjectLine
 	 */
 	public $fk_element = 'fk_fichinter';
 
+
+
 	/**
 	 *  Constructor
 	 *

htdocs/fichinter/class/fichinterrec.class.php

@@ -401,10 +401,6 @@ class FichinterRec extends Fichinter
 				$line->special_code = $objp->special_code;
 				$line->fk_unit = $objp->fk_unit;
 
-				// Ne plus utiliser
-				$line->price = $objp->price;
-				$line->remise = $objp->remise;
-
 				$this->lines[$i] = $line;
 
 				$i++;

htdocs/fourn/class/fournisseur.commande.class.php

@@ -3751,9 +3751,6 @@ class CommandeFournisseurLigne extends CommonOrderLine
 		if (empty($this->rang)) {
 			$this->rang = 0;
 		}
-		if (empty($this->remise)) {
-			$this->remise = 0;
-		}
 		if (empty($this->remise_percent)) {
 			$this->remise_percent = 0;
 		}

htdocs/supplier_proposal/class/supplier_proposal.class.php

@@ -331,7 +331,6 @@ class SupplierProposal extends CommonObject
 			$supplier_proposalligne->subprice = -$remise->amount_ht;
 			$supplier_proposalligne->fk_product = 0; // Id produit predefini
 			$supplier_proposalligne->qty = 1;
-			$supplier_proposalligne->remise = 0;
 			$supplier_proposalligne->remise_percent = 0;
 			$supplier_proposalligne->rang = -1;
 			$supplier_proposalligne->info_bits = 2;
@@ -3006,9 +3005,6 @@ class SupplierProposalLine extends CommonObjectLine
 		if (empty($this->rang)) {
 			$this->rang = 0;
 		}
-		if (empty($this->remise)) {
-			$this->remise = 0;
-		}
 		if (empty($this->remise_percent)) {
 			$this->remise_percent = 0;
 		}