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

Solved some bugs in order creation and validation

Browse Source
This commit is contained in:
Cédric Salvador 2013-12-19 15:57:11 +01:00
parent f98838616e
commit 0a0ef548ef
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/webservices/server_order.php
View File

@ -637,7 +637,7 @@ function createOrder($authentication,$order)
$newobject->date_lim_reglement=dol_stringtotime($order['date_due'],'dayrfc'); $newobject->date_lim_reglement=dol_stringtotime($order['date_due'],'dayrfc');
$newobject->note_private=$order['note_private']; $newobject->note_private=$order['note_private'];
$newobject->note_public=$order['note_public']; $newobject->note_public=$order['note_public'];
$newobject->statut=$order['status']; $newobject->statut=0;
$newobject->facturee=$order['facturee']; $newobject->facturee=$order['facturee'];
$newobject->fk_project=$order['project_id']; $newobject->fk_project=$order['project_id'];
$newobject->cond_reglement_id=$order['cond_reglement_id']; $newobject->cond_reglement_id=$order['cond_reglement_id'];
@ -669,30 +669,36 @@ function createOrder($authentication,$order)
$db->begin(); $db->begin();
dol_syslog("Webservice server_order:: order creation start", LOG_DEBUG);
$result=$newobject->create($fuser,0,0); $result=$newobject->create($fuser);
dol_syslog('Webservice server_order:: order creation done with $result='.$result, LOG_DEBUG);
if ($result < 0) if ($result < 0)
{ {
dol_syslog("Webservice server_order:: order creation failed", LOG_ERR);
$error++; $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) if ($result < 0)
{ {
dol_syslog("Webservice server_order:: order validation failed", LOG_ERR);
$error++; $error++;
} }
} }
if (! $error) if ($result >= 0)
{ {
dol_syslog("Webservice server_order:: order creation & validation succeeded, commit", LOG_DEBUG);
$db->commit(); $db->commit();
$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref); $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
} }
else else
{ {
dol_syslog("Webservice server_order:: order creation or validation failed, rollback", LOG_ERR);
$db->rollback(); $db->rollback();
$error++; $error++;
$errorcode='KO'; $errorcode='KO';