From 87e6d267e6f7b1cd7452daa7c0c57f313730bef6 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Mon, 27 Jan 2025 16:47:39 +0100 Subject: [PATCH 1/2] fix php warning in dol_convertToWord when negative numbers --- htdocs/core/lib/functionsnumtoword.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/functionsnumtoword.lib.php b/htdocs/core/lib/functionsnumtoword.lib.php index f349368078a..b724ef34594 100644 --- a/htdocs/core/lib/functionsnumtoword.lib.php +++ b/htdocs/core/lib/functionsnumtoword.lib.php @@ -51,7 +51,7 @@ function dol_convertToWord($num, $langs, $currency = '', $centimes = false) } else { $TNum = explode('.', (string) $num); - $num = (int) $TNum[0]; + $num = abs((int) $TNum[0]); $words = array(); $list1 = array( '', From 9bb9ecd304ba00e5a52c0eeb43d5719597855a69 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Mon, 27 Jan 2025 17:20:55 +0100 Subject: [PATCH 2/2] fix: phpwarning version 8.0 for TVA calulation --- htdocs/compta/facture/card.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 6c670b38406..c8c5822bb19 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -875,11 +875,29 @@ if (empty($reshook)) { if ($line->product_type < 9 && $line->total_ht != 0) { // Remove lines with product_type greater than or equal to 9 and no need to create discount if amount is null $keyforvatrate = $line->tva_tx.($line->vat_src_code ? ' ('.$line->vat_src_code.')' : ''); + if (!isset($amount_ht[$keyforvatrate])) { + $amount_ht[$keyforvatrate]=0; + } $amount_ht[$keyforvatrate] += $line->total_ht; + if (!isset($amount_tva[$keyforvatrate])) { + $amount_tva[$keyforvatrate]=0; + } $amount_tva[$keyforvatrate] += $line->total_tva; + if (!isset($amount_ttc[$keyforvatrate])) { + $amount_ttc[$keyforvatrate]=0; + } $amount_ttc[$keyforvatrate] += $line->total_ttc; + if (!isset($multicurrency_amount_ht[$keyforvatrate])) { + $multicurrency_amount_ht[$keyforvatrate]=0; + } $multicurrency_amount_ht[$keyforvatrate] += $line->multicurrency_total_ht; + if (!isset($multicurrency_amount_tva[$keyforvatrate])) { + $multicurrency_amount_tva[$keyforvatrate]=0; + } $multicurrency_amount_tva[$keyforvatrate] += $line->multicurrency_total_tva; + if (!isset($multicurrency_amount_ttc[$keyforvatrate])) { + $multicurrency_amount_ttc[$keyforvatrate]=0; + } $multicurrency_amount_ttc[$keyforvatrate] += $line->multicurrency_total_ttc; $i++; }