diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php index 6bc0b80316cf..b5afc076f092 100644 --- a/app/DataMapper/CompanySettings.php +++ b/app/DataMapper/CompanySettings.php @@ -663,6 +663,7 @@ class CompanySettings extends BaseSettings '$task.line_total', ], 'total_columns' => [ + '$net_subtotal', '$subtotal', '$discount', '$custom_surcharge1', diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php index 277b5adff860..f50fd27d5c4c 100644 --- a/app/Utils/HtmlEngine.php +++ b/app/Utils/HtmlEngine.php @@ -167,6 +167,7 @@ class HtmlEngine $data['$invoice.discount'] = ['value' => Number::formatMoney($this->entity_calc->getTotalDiscount(), $this->client) ?: ' ', 'label' => ctrans('texts.discount')]; $data['$discount'] = &$data['$invoice.discount']; $data['$subtotal'] = ['value' => Number::formatMoney($this->entity_calc->getSubTotal(), $this->client) ?: ' ', 'label' => ctrans('texts.subtotal')]; + $data['$net_subtotal'] = ['value' => Number::formatMoney(($this->entity_calc->getSubTotal() - $this->entity->total_taxes), $this->client) ?: ' ', 'label' => ctrans('texts.subtotal')]; $data['$invoice.subtotal'] = &$data['$subtotal']; if ($this->entity->partial > 0) {