From 0a0ef548ef0eb26805d187149e9550d2c91deb70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Salvador?= Date: Thu, 19 Dec 2013 15:57:11 +0100 Subject: [PATCH] Solved some bugs in order creation and validation --- htdocs/webservices/server_order.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php index 8b3d4569dbf..f77af335e2e 100644 --- a/htdocs/webservices/server_order.php +++ b/htdocs/webservices/server_order.php @@ -637,7 +637,7 @@ function createOrder($authentication,$order) $newobject->date_lim_reglement=dol_stringtotime($order['date_due'],'dayrfc'); $newobject->note_private=$order['note_private']; $newobject->note_public=$order['note_public']; - $newobject->statut=$order['status']; + $newobject->statut=0; $newobject->facturee=$order['facturee']; $newobject->fk_project=$order['project_id']; $newobject->cond_reglement_id=$order['cond_reglement_id']; @@ -669,30 +669,36 @@ function createOrder($authentication,$order) $db->begin(); - - $result=$newobject->create($fuser,0,0); + dol_syslog("Webservice server_order:: order creation start", LOG_DEBUG); + $result=$newobject->create($fuser); + dol_syslog('Webservice server_order:: order creation done with $result='.$result, LOG_DEBUG); if ($result < 0) { + dol_syslog("Webservice server_order:: order creation failed", LOG_ERR); $error++; } - if ($newobject->statut == 1) // We want order validated + if ($order['status'] == 1) // We want order validated { - $result=$newobject->validate($fuser); + dol_syslog("Webservice server_order:: order validation start", LOG_DEBUG); + $result=$newobject->valid($fuser); if ($result < 0) { + dol_syslog("Webservice server_order:: order validation failed", LOG_ERR); $error++; } } - if (! $error) + if ($result >= 0) { + dol_syslog("Webservice server_order:: order creation & validation succeeded, commit", LOG_DEBUG); $db->commit(); $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref); } else { + dol_syslog("Webservice server_order:: order creation or validation failed, rollback", LOG_ERR); $db->rollback(); $error++; $errorcode='KO';