diff --git a/app/Helpers/Invoice/InvoiceItemSum.php b/app/Helpers/Invoice/InvoiceItemSum.php index 8866b99ae0b5..59da4f698944 100644 --- a/app/Helpers/Invoice/InvoiceItemSum.php +++ b/app/Helpers/Invoice/InvoiceItemSum.php @@ -134,21 +134,22 @@ class InvoiceItemSum $item_tax += $item_tax_rate1_total; - if($item_tax_rate1_total != 0) - $this->groupTax($this->item->tax_name1, $this->item->tax_rate1, $item_tax_rate1_total); + // if($item_tax_rate1_total != 0) + if (strlen($this->item->tax_name1) > 1) + $this->groupTax($this->item->tax_name1, $this->item->tax_rate1, $item_tax_rate1_total); $item_tax_rate2_total = $this->calcAmountLineTax($this->item->tax_rate2, $amount); $item_tax += $item_tax_rate2_total; - if($item_tax_rate2_total != 0) + if (strlen($this->item->tax_name2) > 1) $this->groupTax($this->item->tax_name2, $this->item->tax_rate2, $item_tax_rate2_total); $item_tax_rate3_total = $this->calcAmountLineTax($this->item->tax_rate3, $amount); $item_tax += $item_tax_rate3_total; - if($item_tax_rate3_total != 0) + if (strlen($this->item->tax_name3) > 1) $this->groupTax($this->item->tax_name3, $this->item->tax_rate3, $item_tax_rate3_total); $this->setTotalTaxes($this->formatValue($item_tax, $this->currency->precision)); diff --git a/app/Helpers/Invoice/InvoiceItemSumInclusive.php b/app/Helpers/Invoice/InvoiceItemSumInclusive.php index 7f4620ee54bc..a9d67b76b03c 100644 --- a/app/Helpers/Invoice/InvoiceItemSumInclusive.php +++ b/app/Helpers/Invoice/InvoiceItemSumInclusive.php @@ -119,21 +119,22 @@ class InvoiceItemSumInclusive $item_tax += $this->formatValue($item_tax_rate1_total, $this->currency->precision); - if($item_tax_rate1_total != 0) + // if($item_tax_rate1_total != 0) + if (strlen($this->item->tax_name1) > 1) $this->groupTax($this->item->tax_name1, $this->item->tax_rate1, $item_tax_rate1_total); $item_tax_rate2_total = $this->calcInclusiveLineTax($this->item->tax_rate2, $amount); $item_tax += $this->formatValue($item_tax_rate2_total, $this->currency->precision); - if($item_tax_rate2_total != 0) + if (strlen($this->item->tax_name2) > 1) $this->groupTax($this->item->tax_name2, $this->item->tax_rate2, $item_tax_rate2_total); $item_tax_rate3_total = $this->calcInclusiveLineTax($this->item->tax_rate3, $amount); $item_tax += $this->formatValue($item_tax_rate3_total, $this->currency->precision); - if($item_tax_rate3_total != 0) + if (strlen($this->item->tax_name3) > 1) $this->groupTax($this->item->tax_name3, $this->item->tax_rate3, $item_tax_rate3_total);