Fix: When creating an invoice, we must first create it as draft and then

after validate.
This commit is contained in:
Laurent Destailleur 2014-05-13 14:24:27 +02:00
parent b62c069967
commit 9b38857c9a
2 changed files with 9 additions and 9 deletions

View File

@ -515,7 +515,7 @@ function createInvoice($authentication,$invoice)
$newobject->date=dol_stringtotime($invoice['date'],'dayrfc'); $newobject->date=dol_stringtotime($invoice['date'],'dayrfc');
$newobject->note_private=$invoice['note_private']; $newobject->note_private=$invoice['note_private'];
$newobject->note_public=$invoice['note_public']; $newobject->note_public=$invoice['note_public'];
$newobject->statut=$invoice['status']; $newobject->statut=0; // We start with status draft
$newobject->fk_project=$invoice['project_id']; $newobject->fk_project=$invoice['project_id'];
$newobject->date_creation=$now; $newobject->date_creation=$now;
@ -551,7 +551,7 @@ function createInvoice($authentication,$invoice)
$error++; $error++;
} }
if ($newobject->statut == 1) // We want invoice validated if ($invoice['status'] == 1) // We want invoice to have status validated
{ {
$result=$newobject->validate($fuser); $result=$newobject->validate($fuser);
if ($result < 0) if ($result < 0)

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=0; $newobject->statut=0; // We start with status draft
$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'];
@ -679,7 +679,7 @@ function createOrder($authentication,$order)
} }
if ($order['status'] == 1) // We want order validated if ($order['status'] == 1) // We want order to have status validated
{ {
dol_syslog("Webservice server_order:: order validation start", LOG_DEBUG); dol_syslog("Webservice server_order:: order validation start", LOG_DEBUG);
$result=$newobject->valid($fuser); $result=$newobject->valid($fuser);