From aef314264c3631657082077278e05e88918026ba Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Fri, 3 Oct 2025 13:56:53 +0200 Subject: [PATCH 1/7] Fix CSS --- htdocs/compta/facture/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index a74e91323c8..9df0f4ef467 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -4186,7 +4186,7 @@ if ($action == 'create') { if (getDolGlobalString('INVOICE_USE_SITUATION')) { print '
'; $tmp = ' '; - $text = $tmp.' '; + $text = $tmp.' '; $desc = $form->textwithpicto($text, $langs->transnoentities("InvoiceFirstSituationDesc").'

'.$langs->trans("YouMustCreateInvoiceFromThird"), 1, 'help', 'nowraponall', 0, 3, 'firstsituationonsmartphone'); print $desc; print '
'."\n"; From 3b3c5a53d3a63f96a51cf7dbe44b0d6aa14b1120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Fri, 3 Oct 2025 16:06:54 +0200 Subject: [PATCH 2/7] fix example captcha (#35620) * fix example captcha * Update modCaptchaStandard.class.php --- .../core/modules/security/captcha/modCaptchaStandard.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/core/modules/security/captcha/modCaptchaStandard.class.php b/htdocs/core/modules/security/captcha/modCaptchaStandard.class.php index f64714385f7..cee48489969 100644 --- a/htdocs/core/modules/security/captcha/modCaptchaStandard.class.php +++ b/htdocs/core/modules/security/captcha/modCaptchaStandard.class.php @@ -82,6 +82,7 @@ class modCaptchaStandard extends ModeleCaptcha global $db, $conf, $langs, $user; $generator = new modGeneratePassStandard($db, $conf, $langs, $user); + $generator->length = '5'; $example = $generator->getExample(); if (function_exists("imagecreate") && function_exists("imagepng")) { @@ -89,7 +90,7 @@ class modCaptchaStandard extends ModeleCaptcha if (!$img) { return "Problem with GD creation"; } - //$background_color = imagecolorallocate($img, 250, 250, 250); + $background_color = imagecolorallocate($img, 250, 250, 250); // do not comment this line $ecriture_color = imagecolorallocate($img, 0, 0, 0); imagestring($img, 4, 15, 8, $example, $ecriture_color); From 404ad0e876b23dfc8ffc5bffcf5a2fb885505f24 Mon Sep 17 00:00:00 2001 From: kkhelifa-opendsi Date: Fri, 3 Oct 2025 19:01:10 +0200 Subject: [PATCH 3/7] FIX: substitutions on subject of the sent email reminder of the event (#35621) --- htdocs/comm/action/class/actioncomm.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 84dac8dacca..4e8779349e1 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -2725,6 +2725,7 @@ class ActionComm extends CommonObject //Topic $sendTopic = (!empty($arraymessage->topic)) ? $arraymessage->topic : html_entity_decode($langs->transnoentities('EventReminder')); + $sendTopic = make_substitutions($sendTopic, $substitutionarray); // Recipient $recipient = new User($this->db); From d7063122a291dd23c2940f78e18b1a8811c5ad5f Mon Sep 17 00:00:00 2001 From: Alexandre R Date: Fri, 3 Oct 2025 13:03:52 -0400 Subject: [PATCH 4/7] FIX invoices payments on multicurrencies being converted as int (#35622) * fix invoices payments on multicurrencies being converted as int * Update paiement.php --------- Co-authored-by: A.R Co-authored-by: Laurent Destailleur --- htdocs/compta/paiement.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index c471cf0d36f..b50cdebb051 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -179,7 +179,7 @@ if (empty($reshook)) { } } - $formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => GETPOSTINT($key)); + $formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => GETPOST($key)); } } From 67500e1b996aea3138f8bb40303d1a1cee3879cd Mon Sep 17 00:00:00 2001 From: PsyCrow <93346975+PsyCrow-code@users.noreply.github.com> Date: Sat, 4 Oct 2025 05:28:04 -0600 Subject: [PATCH 5/7] Update list.php (#35630) Fix #35629 PHP Warning: Undefined array key "f.total_localtax2" in linst.php $totalarray['val']['f.total_localtax2'] not initialized --- htdocs/fourn/facture/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index d746699db86..e818c87f9fb 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -1550,7 +1550,7 @@ $totalarray['val'] = array(); $totalarray['val']['f.total_ht'] = 0; $totalarray['val']['f.total_vat'] = 0; $totalarray['val']['f.total_localtax1'] = 0; -$totalarray['val']['f.total_localtax1'] = 0; +$totalarray['val']['f.total_localtax2'] = 0; $totalarray['val']['f.total_ttc'] = 0; $totalarray['val']['totalam'] = 0; $totalarray['val']['rtp'] = 0; From 5342cb87ea498028851d18229305cfd482b892ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 5 Oct 2025 18:16:17 +0200 Subject: [PATCH 6/7] remove subtotal from .gitignore (#35647) --- htdocs/.gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/.gitignore b/htdocs/.gitignore index d0fe62f2e73..82c0ea2accb 100644 --- a/htdocs/.gitignore +++ b/htdocs/.gitignore @@ -21,7 +21,6 @@ /cabinetmed* /webmail* /conf/conf.php -/subtotal* /abricot* /nomenclature* /of/ From 56fed15f5b11b606af03724db06e22ab43f6a4e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Mon, 6 Oct 2025 01:33:51 +0200 Subject: [PATCH 7/7] fix CI v22 (#35648) * Update price_parser.class.php * Update price_parser.class.php * Update list.php already set before the loop --- htdocs/fourn/facture/list.php | 3 --- htdocs/product/dynamic_price/class/price_parser.class.php | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index e818c87f9fb..f9dc8e8da4f 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -1964,9 +1964,6 @@ while ($i < $imaxinloop) { $totalarray['nbfield']++; $totalarray['pos'][$totalarray['nbfield']] = 'totalam'; } - if (empty($totalarray['val']['totalam'])) { - $totalarray['val']['totalam'] = 0; // avoid PHP Warning: Undefined array key "totalam" on line 1891 - } $totalarray['val']['totalam'] += $totalpay; } diff --git a/htdocs/product/dynamic_price/class/price_parser.class.php b/htdocs/product/dynamic_price/class/price_parser.class.php index 9aa6a91d7c0..94400097a4e 100644 --- a/htdocs/product/dynamic_price/class/price_parser.class.php +++ b/htdocs/product/dynamic_price/class/price_parser.class.php @@ -117,13 +117,13 @@ class PriceParser if (in_array($code, array(9, 14, 19, 20))) { //Errors which have 0 arg return $langs->trans("ErrorPriceExpression".$code); } elseif (in_array($code, array(1, 2, 3, 4, 5, 8, 10, 11, 17, 21, 22))) { //Errors which have 1 arg - return $langs->trans("ErrorPriceExpression".$code, $info); + return $langs->trans("ErrorPriceExpression".$code, (string) $info); } elseif (in_array($code, array(6, 23))) { //Errors which have 2 args return $langs->trans("ErrorPriceExpression".$code, $info[0], $info[1]); } elseif (in_array($code, array(7, 12, 13, 15, 16, 18))) { //Internal errors - return $langs->trans("ErrorPriceExpressionInternal", $code); + return $langs->trans("ErrorPriceExpressionInternal", (string) $code); } else { //Unknown errors - return $langs->trans("ErrorPriceExpressionUnknown", $code); + return $langs->trans("ErrorPriceExpressionUnknown", (string) $code); } }