From 8ad81a092a75f315468592f40a47535648a18e7c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 1 Oct 2019 16:19:54 +0200
Subject: [PATCH] Clean code

---
 htdocs/comm/propal/class/propal.class.php | 5 +++--
 htdocs/core/class/commonobject.class.php  | 4 +++-
 htdocs/webservices/server_order.php       | 3 ---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 60a423b530a..e9d969e5ab8 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -172,6 +172,7 @@ class Propal extends CommonObject
 
 	/**
      * @var int ID
+     * @deprecated
      */
 	public $fk_address;
 
@@ -1124,7 +1125,7 @@ class Propal extends CommonObject
 				}
 
 				// Set delivery address
-				if (! $error && $this->fk_delivery_address)
+				/*if (! $error && $this->fk_delivery_address)
 				{
 					$sql = "UPDATE ".MAIN_DB_PREFIX."propal";
 					$sql.= " SET fk_delivery_address = ".$this->fk_delivery_address;
@@ -1132,7 +1133,7 @@ class Propal extends CommonObject
 					$sql.= " AND entity = ".setEntity($this);
 
 					$result=$this->db->query($sql);
-				}
+				}*/
 
 				if (! $error)
 				{
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 8d27693d1e4..6e6bf58d6ed 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -294,8 +294,8 @@ abstract class CommonObject
 
 	/**
 	 * @var int Delivery address ID
-	 * @deprecated
 	 * @see setDeliveryAddress()
+	 * @deprecated
 	 */
 	public $fk_delivery_address;
 
@@ -425,6 +425,8 @@ abstract class CommonObject
 	public $date_validation;		// Date validation
 	public $date_modification;		// Date last change (tms field)
 
+	public $next_prev_filter;
+
 
 
 	// No constructor as it is an abstract class
diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php
index f6452af2835..099bfe3d3f2 100644
--- a/htdocs/webservices/server_order.php
+++ b/htdocs/webservices/server_order.php
@@ -209,7 +209,6 @@ $order_fields = array(
 	'cond_reglement_doc' => array('name'=>'cond_reglement_doc','type'=>'xsd:string'),
 
 	'date_livraison' => array('name'=>'date_livraison','type'=>'xsd:date'),
-	'fk_delivery_address' => array('name'=>'fk_delivery_address','type'=>'xsd:int'),
 	'demand_reason_id' => array('name'=>'demand_reason_id','type'=>'xsd:string'),
 
 	'lines' => array('name'=>'lines','type'=>'tns:LinesArray2')
@@ -467,7 +466,6 @@ function getOrder($authentication, $id = '', $ref = '', $ref_ext = '')
 					'mode_reglement' => $order->mode_reglement,
 
 					'date_livraison' => $order->date_livraison,
-					'fk_delivery_address' => $order->fk_delivery_address,
 
 					'demand_reason_id' => $order->demand_reason_id,
 					'demand_reason_code' => $order->demand_reason_code,
@@ -698,7 +696,6 @@ function createOrder($authentication, $order)
 		$newobject->statut=Commande::STATUS_DRAFT;	// We start with status draft
 		$newobject->billed=$order['billed'];
 		$newobject->fk_project=$order['project_id'];
-		$newobject->fk_delivery_address=$order['fk_delivery_address'];
 		$newobject->cond_reglement_id=$order['cond_reglement_id'];
 		$newobject->demand_reason_id=$order['demand_reason_id'];
 		$newobject->date_creation=$now;