lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean code

Browse Source
This commit is contained in:
Laurent Destailleur 2019-10-01 16:19:54 +02:00
parent 1ff8b879a8
commit 8ad81a092a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/comm/propal/class/propal.class.php
View File

@ -172,6 +172,7 @@ class Propal extends CommonObject
/** /**
* @var int ID * @var int ID
* @deprecated
*/ */
public $fk_address; public $fk_address;
@ -1124,7 +1125,7 @@ class Propal extends CommonObject
} }
// Set delivery address // Set delivery address
if (! $error && $this->fk_delivery_address) /*if (! $error && $this->fk_delivery_address)
{ {
$sql = "UPDATE ".MAIN_DB_PREFIX."propal"; $sql = "UPDATE ".MAIN_DB_PREFIX."propal";
$sql.= " SET fk_delivery_address = ".$this->fk_delivery_address; $sql.= " SET fk_delivery_address = ".$this->fk_delivery_address;
@ -1132,7 +1133,7 @@ class Propal extends CommonObject
$sql.= " AND entity = ".setEntity($this); $sql.= " AND entity = ".setEntity($this);
$result=$this->db->query($sql); $result=$this->db->query($sql);
} }*/
if (! $error) if (! $error)
{ {

4
htdocs/core/class/commonobject.class.php
View File

@ -294,8 +294,8 @@ abstract class CommonObject
/** /**
* @var int Delivery address ID * @var int Delivery address ID
* @deprecated
* @see setDeliveryAddress() * @see setDeliveryAddress()
* @deprecated
*/ */
public $fk_delivery_address; public $fk_delivery_address;
@ -425,6 +425,8 @@ abstract class CommonObject
public $date_validation; // Date validation public $date_validation; // Date validation
public $date_modification; // Date last change (tms field) public $date_modification; // Date last change (tms field)
public $next_prev_filter;
// No constructor as it is an abstract class // No constructor as it is an abstract class

3
htdocs/webservices/server_order.php
View File

@ -209,7 +209,6 @@ $order_fields = array(
'cond_reglement_doc' => array('name'=>'cond_reglement_doc','type'=>'xsd:string'), 'cond_reglement_doc' => array('name'=>'cond_reglement_doc','type'=>'xsd:string'),
'date_livraison' => array('name'=>'date_livraison','type'=>'xsd:date'), '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'), 'demand_reason_id' => array('name'=>'demand_reason_id','type'=>'xsd:string'),
'lines' => array('name'=>'lines','type'=>'tns:LinesArray2') 'lines' => array('name'=>'lines','type'=>'tns:LinesArray2')
@ -467,7 +466,6 @@ function getOrder($authentication, $id = '', $ref = '', $ref_ext = '')
'mode_reglement' => $order->mode_reglement, 'mode_reglement' => $order->mode_reglement,
'date_livraison' => $order->date_livraison, 'date_livraison' => $order->date_livraison,
'fk_delivery_address' => $order->fk_delivery_address,
'demand_reason_id' => $order->demand_reason_id, 'demand_reason_id' => $order->demand_reason_id,
'demand_reason_code' => $order->demand_reason_code, '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->statut=Commande::STATUS_DRAFT; // We start with status draft
$newobject->billed=$order['billed']; $newobject->billed=$order['billed'];
$newobject->fk_project=$order['project_id']; $newobject->fk_project=$order['project_id'];
$newobject->fk_delivery_address=$order['fk_delivery_address'];
$newobject->cond_reglement_id=$order['cond_reglement_id']; $newobject->cond_reglement_id=$order['cond_reglement_id'];
$newobject->demand_reason_id=$order['demand_reason_id']; $newobject->demand_reason_id=$order['demand_reason_id'];
$newobject->date_creation=$now; $newobject->date_creation=$now;