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

Merge pull request #10662 from frederic34/patch-17

Browse Source 
update api invoices
This commit is contained in:
Laurent Destailleur 2019-02-24 20:32:42 +01:00 committed by GitHub
commit 50f50e4477
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/compta/facture/class/api_invoices.class.php
View File

@ -940,8 +940,6 @@ class Invoices extends DolibarrApi
throw new RestException(401); throw new RestException(401);
} }
$this->db->begin();
$result = $this->invoice->fetch($id); $result = $this->invoice->fetch($id);
if( ! $result ) { if( ! $result ) {
throw new RestException(404, 'Invoice not found'); throw new RestException(404, 'Invoice not found');
@ -958,10 +956,14 @@ class Invoices extends DolibarrApi
if (! $this->invoice->paye) // protection against multiple submit if (! $this->invoice->paye) // protection against multiple submit
{ {
$this->db->begin();
$this->invoice->fetch_lines(); $this->invoice->fetch_lines();
// Loop on each vat rate // Loop on each vat rate
$i=0; $i=0;
$amount_ht = array();
$amount_tva = array();
$amount_ttc = array();
foreach($this->invoice->lines as $line) foreach($this->invoice->lines as $line)
{ {
$amount_ht[$line->tva_tx]+=$line->total_ht; $amount_ht[$line->tva_tx]+=$line->total_ht;
@ -1009,14 +1011,14 @@ class Invoices extends DolibarrApi
} }
else else
{ {
throw new RestException(500, 'Could not set paid');
$this->db->rollback(); $this->db->rollback();
throw new RestException(500, 'Could not set paid');
} }
} }
else else
{ {
throw new RestException(500, 'Discount creation error');
$this->db->rollback(); $this->db->rollback();
throw new RestException(500, 'Discount creation error');
} }
} }