From 5bf3ca419d0410845ffcf314c434a06bd2682b47 Mon Sep 17 00:00:00 2001 From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com> Date: Thu, 20 Feb 2025 14:21:38 +0100 Subject: [PATCH] NEW: cash control: add hidden setting to show total including taxed in detail by vat rate --- htdocs/compta/cashcontrol/report.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php index 4b9d33c32af..1b25c5ea143 100644 --- a/htdocs/compta/cashcontrol/report.php +++ b/htdocs/compta/cashcontrol/report.php @@ -452,8 +452,15 @@ if ($resql) { if (!empty($totalvatperrate) && is_array($totalvatperrate)) { print '

'.$langs->trans("TotalHT").'
'.$langs->trans("TotalVAT").'
'; + if (getDolGlobalInt('TAKEPOS_CASHCONTROL_REPORT_SHOW_TOTAL_INCLUDING_TAXES_COLUMN', 0) != 0) { + print '
'.$langs->trans("TotalTTC").'
'; + } foreach ($totalvatperrate as $keyrate => $valuerate) { - print '
'.$langs->trans("VATRate").' '.vatrate($keyrate, true).' :
'.price($totalhtperrate[$keyrate] ?? 0).'
'.price($valuerate).'
'; + print '
'.$langs->trans("VATRate").' '.vatrate($keyrate, true).' :
'.price($totalhtperrate[$keyrate] ?? 0).'
'.price($valuerate).'
'; + if (getDolGlobalInt('TAKEPOS_CASHCONTROL_REPORT_SHOW_TOTAL_INCLUDING_TAXES_COLUMN', 0) != 0) { + print '
'.price(($totalhtperrate[$keyrate] ?? 0) + $valuerate).'
'; + } + print '
'; } }