Fixing style errors.
This commit is contained in:
parent
720a113125
commit
e1751d4bfb
@ -1457,15 +1457,15 @@ class Invoices extends DolibarrApi
|
|||||||
$this->db->rollback();
|
$this->db->rollback();
|
||||||
throw new RestException(404, 'Invoice ID '.$id.' not found');
|
throw new RestException(404, 'Invoice ID '.$id.' not found');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (($amountarray["amount"] == "remain" || $amountarray["amount"] > 0) && ($amountarray["multicurrency_amount"] == "remain" || $amountarray["multicurrency_amount"] > 0)) {
|
if (($amountarray["amount"] == "remain" || $amountarray["amount"] > 0) && ($amountarray["multicurrency_amount"] == "remain" || $amountarray["multicurrency_amount"] > 0)) {
|
||||||
$this->db->rollback();
|
$this->db->rollback();
|
||||||
throw new RestException(400, 'Payment in both currency '.$id.' ( amount: '.$amountarray["amount"].', multicurrency_amount: '.$amountarray["multicurrency_amount"].')');
|
throw new RestException(400, 'Payment in both currency '.$id.' ( amount: '.$amountarray["amount"].', multicurrency_amount: '.$amountarray["multicurrency_amount"].')');
|
||||||
}
|
}
|
||||||
|
|
||||||
$is_multicurrency = 0;
|
$is_multicurrency = 0;
|
||||||
$total_ttc = $this->invoice->total_ttc;
|
$total_ttc = $this->invoice->total_ttc;
|
||||||
|
|
||||||
if ($amountarray["multicurrency_amount"] > 0 || $amountarray["multicurrency_amount"] == "remain") {
|
if ($amountarray["multicurrency_amount"] > 0 || $amountarray["multicurrency_amount"] == "remain") {
|
||||||
$is_multicurrency = 1;
|
$is_multicurrency = 1;
|
||||||
$total_ttc = $this->invoice->multicurrency_total_ttc;
|
$total_ttc = $this->invoice->multicurrency_total_ttc;
|
||||||
@ -1476,21 +1476,21 @@ class Invoices extends DolibarrApi
|
|||||||
$totalcreditnotes = $this->invoice->getSumCreditNotesUsed($is_multicurrency);
|
$totalcreditnotes = $this->invoice->getSumCreditNotesUsed($is_multicurrency);
|
||||||
$totaldeposits = $this->invoice->getSumDepositsUsed($is_multicurrency);
|
$totaldeposits = $this->invoice->getSumDepositsUsed($is_multicurrency);
|
||||||
$amount = price2num($total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
|
$amount = price2num($total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
|
||||||
|
|
||||||
if (!$is_multicurrency && $amountarray["amount"] != 'remain')
|
if (!$is_multicurrency && $amountarray["amount"] != 'remain')
|
||||||
{
|
{
|
||||||
$amount = price2num($amountarray["amount"], 'MT');
|
$amount = price2num($amountarray["amount"], 'MT');
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($is_multicurrency && $amountarray["multicurrency_amount"] != 'remain')
|
if ($is_multicurrency && $amountarray["multicurrency_amount"] != 'remain')
|
||||||
{
|
{
|
||||||
$amount = price2num($amountarray["multicurrency_amount"], 'MT');
|
$amount = price2num($amountarray["multicurrency_amount"], 'MT');
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
|
if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
|
||||||
$amount = -$amount;
|
$amount = -$amount;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($is_multicurrency) {
|
if ($is_multicurrency) {
|
||||||
$amounts[$id] = null;
|
$amounts[$id] = null;
|
||||||
// Multicurrency
|
// Multicurrency
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user