Fixes for invoice taxes - exclusive

This commit is contained in:
David Bomba 2019-10-17 19:43:42 +11:00
parent fbc03aa9f7
commit 52936f2307

View File

@ -120,19 +120,19 @@ class InvoiceSum
{ {
if($this->invoice->tax_rate1 > 0){ if($this->invoice->tax_rate1 > 0){
$tax = $this->taxer($this->total, $this->invoice->tax_rate1); $tax = $this->taxer($this->sub_total, $this->invoice->tax_rate1);
$this->total_taxes += $tax; $this->total_taxes += $tax;
$this->total_tax_map[] = ['name' => $this->invoice->tax_name1 . ' ' . $this->invoice->tax_rate1.'%', 'total' => $tax]; $this->total_tax_map[] = ['name' => $this->invoice->tax_name1 . ' ' . $this->invoice->tax_rate1.'%', 'total' => $tax];
} }
if($this->invoice->tax_rate2 > 0){ if($this->invoice->tax_rate2 > 0){
$tax = $this->taxer($this->total, $this->invoice->tax_rate2); $tax = $this->taxer($this->sub_total, $this->invoice->tax_rate2);
$this->total_taxes += $tax; $this->total_taxes += $tax;
$this->total_tax_map[] = ['name' => $this->invoice->tax_name2. ' ' . $this->invoice->tax_rate2.'%', 'total' => $tax]; $this->total_tax_map[] = ['name' => $this->invoice->tax_name2. ' ' . $this->invoice->tax_rate2.'%', 'total' => $tax];
} }
if($this->invoice->tax_rate3 > 0){ if($this->invoice->tax_rate3 > 0){
$tax = $this->taxer($this->total, $this->invoice->tax_rate3); $tax = $this->taxer($this->sub_total, $this->invoice->tax_rate3);
$this->total_taxes += $tax; $this->total_taxes += $tax;
$this->total_tax_map[] = ['name' => $this->invoice->tax_name3 . ' ' . $this->invoice->tax_rate3.'%', 'total' => $tax]; $this->total_tax_map[] = ['name' => $this->invoice->tax_name3 . ' ' . $this->invoice->tax_rate3.'%', 'total' => $tax];
} }