tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clean up invoice calculations - exclusive taxes (#3000)

Browse source
This commit is contained in:
David Bomba 2019-10-17 23:09:39 +11:00 • committed by GitHub
parent e2284132ec
commit 03eb26a6db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Helpers/Invoice/InvoiceItemSum.php
View file

@ -256,7 +256,7 @@ class InvoiceItemSum
if($item_tax_rate3_total > 0)
$this->groupTax($this->item->tax_name3, $this->item->tax_rate3, $item_tax_rate3_total);
\Log::error($this->item->tax_name1. " ". $this->item->line_total." ". $this->invoice->discount." ". $this->sub_total. " ".$amount. " ". $item_tax);
//\Log::error($this->item->tax_name1. " ". $this->item->line_total." ". $this->invoice->discount." ". $this->sub_total. " ".$amount. " ". $item_tax);
}
$this->setTotalTaxes($item_tax);

7
app/Helpers/Invoice/InvoiceSum.php
View file

@ -173,7 +173,8 @@ class InvoiceSum
{
//Build invoice values here and return Invoice
$this->setCalculatedAttributes();
$this->invoice->save();
return $this->invoice;
}
@ -233,8 +234,8 @@ class InvoiceSum
public function setTaxMap()
{
// if($this->invoice->is_amount_discount == true)
// $this->invoice_items->calcTaxesWithAmountDiscount();
if($this->invoice->is_amount_discount == true)
$this->invoice_items->calcTaxesWithAmountDiscount();
$this->tax_map = collect();