Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change order of rounding taxes in line items

This commit is contained in:
David Bomba 2024-12-05 20:26:37 +11:00
parent 98450f434d
commit 971b989e57
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Helpers/Invoice/InvoiceItemSum.php
View File

@ -242,11 +242,11 @@ class InvoiceItemSum
private function setDiscount() private function setDiscount()
{ {
if ($this->invoice->is_amount_discount) { if ($this->invoice->is_amount_discount) {
$this->setLineTotal($this->getLineTotal() - $this->formatValue($this->item->discount, $this->currency->precision)); $this->setLineTotal(round($this->getLineTotal() - $this->formatValue($this->item->discount, $this->currency->precision),2));
} else { } else {
$discount = ($this->item->line_total * ($this->item->discount / 100)); $discount = ($this->item->line_total * ($this->item->discount / 100));
$this->setLineTotal($this->formatValue(($this->getLineTotal() - $discount), $this->currency->precision)); $this->setLineTotal(round($this->formatValue(($this->getLineTotal() - $discount), $this->currency->precision),2));
} }
$this->item->is_amount_discount = $this->invoice->is_amount_discount; $this->item->is_amount_discount = $this->invoice->is_amount_discount;

4
app/Helpers/Invoice/InvoiceItemSumInclusive.php
View File

@ -177,9 +177,9 @@ class InvoiceItemSumInclusive
private function setDiscount() private function setDiscount()
{ {
if ($this->invoice->is_amount_discount) { if ($this->invoice->is_amount_discount) {
$this->setLineTotal($this->getLineTotal() - $this->formatValue($this->item->discount, $this->currency->precision)); $this->setLineTotal(round($this->getLineTotal() - $this->formatValue($this->item->discount, $this->currency->precision),2));
} else { } else {
$this->setLineTotal($this->getLineTotal() - $this->formatValue(($this->item->line_total * ($this->item->discount / 100)), $this->currency->precision)); $this->setLineTotal(round($this->getLineTotal() - $this->formatValue(($this->item->line_total * ($this->item->discount / 100)), $this->currency->precision),2));
} }
$this->item->is_amount_discount = $this->invoice->is_amount_discount; $this->item->is_amount_discount = $this->invoice->is_amount_discount;

3
tests/Unit/InvoiceTest.php
View File

@ -812,8 +812,7 @@ class InvoiceTest extends TestCase
$invoice = $invoice->calc()->getInvoice(); $invoice = $invoice->calc()->getInvoice();
nlog($invoice->amount); $this->assertEquals(99.99, $invoice->amount);
$this->assertEquals(100, $invoice->amount);
} }