From c8e2343d56e86a30f4250ce1d4eecf40385c646c Mon Sep 17 00:00:00 2001 From: ThomasNgr-OpenDSI Date: Tue, 28 Apr 2026 14:00:45 +0200 Subject: [PATCH 01/11] FIX : use company default RIB when it is defined (#38016) Co-authored-by: Laurent Destailleur --- htdocs/compta/facture/prelevement.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index 83632e54288..a8116c7fed2 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -821,20 +821,21 @@ if ($object->id > 0) { print $langs->trans('CustomerIBAN').' '; // if societe rib in model invoice, we preselect it - $selectedRib = ''; + $selectedRibId = 0; if ($object->element == 'invoice' && $object->fk_fac_rec_source) { $facturerec = new FactureRec($db); $facturerec->fetch($object->fk_fac_rec_source); if ($facturerec->fk_societe_rib) { $companyBankAccount = new CompanyBankAccount($db); $res = $companyBankAccount->fetch($facturerec->fk_societe_rib); - $selectedRib = $companyBankAccount->id; + $selectedRibId = $companyBankAccount->id; } } - - $selectedRib = $form->selectRib($selectedRib, 'accountcustomerid', 'fk_soc='.$object->socid, 1, '', 1); - $defaultRibId = $object->thirdparty->getDefaultRib(); + if (empty($selectedRibId)) $selectedRibId = (int) $defaultRibId; + + $selectedRib = $form->selectRib($selectedRibId, 'accountcustomerid', 'fk_soc='.$object->socid, 1, '', 1); + if ($defaultRibId) { $companyBankAccount = new CompanyBankAccount($db); $res = $companyBankAccount->fetch($defaultRibId); From f830b997c6f901b581d4d6e8ef487d699304ea5c Mon Sep 17 00:00:00 2001 From: Joachim Kueter Date: Fri, 1 May 2026 23:14:46 +0200 Subject: [PATCH 02/11] Fix empty data-rowid on holiday list rows (#38050) --- htdocs/holiday/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php index 5ea2ef1dfe6..e39e0c7d88b 100644 --- a/htdocs/holiday/list.php +++ b/htdocs/holiday/list.php @@ -909,7 +909,7 @@ if ($id && !$user->hasRight('holiday', 'readall') && !in_array($id, $childids)) } else { // Show here line of result $j = 0; - print ''; + print ''; // Action column if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { print ''; From c24bb892bc0b262fc1f9208fb7c00f5c24974b5f Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 1 May 2026 23:27:26 +0200 Subject: [PATCH 03/11] FIX #36589 (#38037) --- htdocs/core/lib/functions.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 5f48b2803f9..662715f7019 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -14251,7 +14251,7 @@ function fetchObjectByElement($element_id, $element_type, $element_ref = '', $us //var_dump($element_prop); //var_dump($element_prop['module'].' '.$ismodenabled); if (is_array($element_prop) && (empty($element_prop['module']) || $ismodenabled)) { - if ($useCache === 1 + if ($useCache === 1 && $element_id > 0 && !empty($conf->cache['fetchObjectByElement'][$element_type]) && !empty($conf->cache['fetchObjectByElement'][$element_type][$element_id]) && is_object($conf->cache['fetchObjectByElement'][$element_type][$element_id]) From da4703812445e8d5de9f96947f4b3d4ca95aa829 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 5 May 2026 13:40:41 +0200 Subject: [PATCH 04/11] Fix alert on blacklisted module when no message provided --- htdocs/admin/modules.php | 2 +- htdocs/core/modules/DolibarrModules.class.php | 13 ++++++++----- htdocs/langs/en_US/errors.lang | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 3fbb0cb29d7..c651a1c4aaf 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -307,7 +307,7 @@ if ($action == 'install' && $allowonlineinstall) { } */ - // Check if module is in the remote malware list + // Check if module is in the remote malware blacklist (at URL DolibarrModules::URL_FOR_BLACKLISTED_MODULES) if (!$error) { if (GETPOST('checkforcompliance') == 'on') { try { diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php index 9eea62c01fd..1a1821ab76e 100644 --- a/htdocs/core/modules/DolibarrModules.class.php +++ b/htdocs/core/modules/DolibarrModules.class.php @@ -2765,11 +2765,14 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it $arrayoflines = preg_split("/[\n,]/", $result['content']); foreach ($arrayoflines as $line) { $tmpfieldsofline = explode(';', $line); - $modulekey = strtolower($tmpfieldsofline[0]); - $conf->cache['noncompliantmodules'][$modulekey]['name'] = $tmpfieldsofline[0]; - $conf->cache['noncompliantmodules'][$modulekey]['id'] = (isset($tmpfieldsofline[1]) ? $tmpfieldsofline[1] : ''); - $conf->cache['noncompliantmodules'][$modulekey]['signature'] = (isset($tmpfieldsofline[2]) ? $tmpfieldsofline[2] : ''); - $conf->cache['noncompliantmodules'][$modulekey]['message'] = $langs->trans(empty($tmpfieldsofline[3]) ? 'WarningModuleAffiliatedToAReportedCompany' : $tmpfieldsofline[3]); + $modulekey = strtolower(trim($tmpfieldsofline[0])); + if (empty($modulekey)) { + continue; + } + $conf->cache['noncompliantmodules'][$modulekey]['name'] = trim($tmpfieldsofline[0]); + $conf->cache['noncompliantmodules'][$modulekey]['id'] = (isset($tmpfieldsofline[1]) ? trim($tmpfieldsofline[1]) : ''); + $conf->cache['noncompliantmodules'][$modulekey]['signature'] = (isset($tmpfieldsofline[2]) ? trim($tmpfieldsofline[2]) : ''); + $conf->cache['noncompliantmodules'][$modulekey]['message'] = $langs->trans(empty(isset($tmpfieldsofline[3]) ? trim($tmpfieldsofline[3]) : '') ? 'WarningModuleAffiliatedToAReportedCompany' : trim($tmpfieldsofline[3])); if (!empty($tmpfieldsofline[4])) { $message2 = $langs->trans("WarningModuleAffiliatedToAPiratPlatform", '{s}'); $listofillegalurl = ''; diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index ac65607c9da..70f8fc0937d 100644 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -427,7 +427,7 @@ WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is a WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting. WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s) -WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware). +WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, GPL license violation, collecting data without your consent OR deploying malware). WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s WarningDNSServerNotAvailable=Warning, DNS server not available From 1933712fc751056b959d7f661fee350230fd1b55 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 5 May 2026 14:44:11 +0200 Subject: [PATCH 05/11] Fix value show in info page --- htdocs/admin/system/security.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php index aae653710b7..df8d958ebbf 100644 --- a/htdocs/admin/system/security.php +++ b/htdocs/admin/system/security.php @@ -629,7 +629,7 @@ print '
'; // File extension locked in upload by default print ''.$langs->trans("UploadExtensionRestriction").': '; -print implode(', ', explode(',', getDolGlobalString('MAIN_FILE_EXTENSION_UPLOAD_RESTRICTION'))); +print implode(', ', explode(',', getDolGlobalString('MAIN_FILE_EXTENSION_UPLOAD_RESTRICTION', implode(',', getExecutableContent())))); print '   ('.$langs->trans("Recommended").': '.implode(', ', getExecutableContent()).')'; print '
'; print '
'; From 3fa5112ca8e67538355e11385fdb1fa8a1967f5f Mon Sep 17 00:00:00 2001 From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com> Date: Wed, 6 May 2026 22:36:24 +0200 Subject: [PATCH 06/11] FIX #37649 (#38101) * Update fournisseur.orderline.class.php * Update fournisseur.commande.class.php * Update fournisseur.commande.class.php * Update fournisseur.commande.class.php * Update fournisseur.commande.class.php * Update fournisseur.commande.class.php * Update fournisseur.commande.class.php --- .../class/fournisseur.commande.class.php | 43 ++++++++++++------- .../class/fournisseur.orderline.class.php | 9 ++-- 2 files changed, 33 insertions(+), 19 deletions(-) diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 502a50a62b4..b1f56024031 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -17,6 +17,7 @@ * Copyright (C) 2024-2025 MDW * Copyright (C) 2024 William Mead * Copyright (C) 2025 NoĆ© Cendrier + * Copyright (C) 2026 Pierre Ardoin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1693,30 +1694,30 @@ class CommandeFournisseur extends CommonOrder // This include test on qty if option SUPPLIER_ORDER_WITH_NOPRICEDEFINED is not set $result = $this->addline( - $line->desc, - $line->subprice, - $line->qty, + (string) $line->desc, + (float) $line->subprice, + (float) $line->qty, $line->tva_tx, - $line->localtax1_tx, - $line->localtax2_tx, - $line->fk_product, + (float) $line->localtax1_tx, + (float) $line->localtax2_tx, + (int) $line->fk_product, 0, - $line->ref_supplier ? $line->ref_supplier : $line->ref_fourn, // $line->ref_fourn comes from field ref into table of lines. Value may be a ref that does not exists anymore, so we first try with value of product - $line->remise_percent, + (string) ($line->ref_supplier ? $line->ref_supplier : $line->ref_fourn), // $line->ref_fourn comes from field ref into table of lines. Value may be a ref that does not exists anymore, so we first try with value of product + (float) $line->remise_percent, 'HT', - 0, - $line->product_type, - $line->info_bits, + (float) $line->subprice_ttc, + (int) $line->product_type, + (int) $line->info_bits, 0, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, - $line->multicurrency_subprice, // pu_ht_devise - $line->origin, // origin - $line->origin_id, // origin_id - $line->rang, // rang - $line->special_code + (float) $line->multicurrency_subprice, // pu_ht_devise + (string) $line->origin, // origin + (int) $line->origin_id, // origin_id + (int) $line->rang, // rang + (int) $line->special_code ); if ($result < 0) { dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING); // do not use dol_print_error here as it may be a functional error @@ -2188,12 +2189,15 @@ class CommandeFournisseur extends CommonOrder $total_localtax1 = $tabprice[9]; $total_localtax2 = $tabprice[10]; $pu = $pu_ht = $tabprice[3]; + $pu_tva = $tabprice[4]; + $pu_ttc = $tabprice[5]; // MultiCurrency $multicurrency_total_ht = $tabprice[16]; $multicurrency_total_tva = $tabprice[17]; $multicurrency_total_ttc = $tabprice[18]; $pu_ht_devise = $tabprice[19]; + $multicurrency_pu_ttc = $tabprice[21]; $localtax1_type = empty($localtaxes_type[0]) ? '' : $localtaxes_type[0]; $localtax2_type = empty($localtaxes_type[2]) ? '' : $localtaxes_type[2]; @@ -2223,6 +2227,8 @@ class CommandeFournisseur extends CommonOrder $this->line->product_type = $product_type; $this->line->remise_percent = $remise_percent; $this->line->subprice = (float) $pu_ht; + $this->line->subprice_ttc = (float) $pu_ttc; + $this->line->rang = $rang; $this->line->info_bits = $info_bits; @@ -2246,6 +2252,7 @@ class CommandeFournisseur extends CommonOrder $this->line->fk_multicurrency = $this->fk_multicurrency; $this->line->multicurrency_code = $this->multicurrency_code; $this->line->multicurrency_subprice = (float) $pu_ht_devise; + $this->line->multicurrency_subprice_ttc = (float) $multicurrency_pu_ttc; $this->line->multicurrency_total_ht = (float) $multicurrency_total_ht; $this->line->multicurrency_total_tva = (float) $multicurrency_total_tva; $this->line->multicurrency_total_ttc = (float) $multicurrency_total_ttc; @@ -3178,6 +3185,7 @@ class CommandeFournisseur extends CommonOrder $multicurrency_total_tva = $tabprice[17]; $multicurrency_total_ttc = $tabprice[18]; $pu_ht_devise = $tabprice[19]; + $multicurrency_pu_ttc = $tabprice[21]; $localtax1_type = empty($localtaxes_type[0]) ? '' : $localtaxes_type[0]; $localtax2_type = empty($localtaxes_type[2]) ? '' : $localtaxes_type[2]; @@ -3219,6 +3227,7 @@ class CommandeFournisseur extends CommonOrder $this->line->localtax2_type = empty($localtaxes_type[2]) ? '' : $localtaxes_type[2]; $this->line->remise_percent = $remise_percent; $this->line->subprice = (float) $pu_ht; + $this->line->subprice_ttc = (float) $pu_ttc; $this->line->info_bits = $info_bits; $this->line->total_ht = (float) $total_ht; $this->line->total_tva = (float) $total_tva; @@ -3238,11 +3247,13 @@ class CommandeFournisseur extends CommonOrder $this->line->fk_multicurrency = $this->fk_multicurrency; $this->line->multicurrency_code = $this->multicurrency_code; $this->line->multicurrency_subprice = (float) $pu_ht_devise; + $this->line->multicurrency_subprice_ttc = (float) $multicurrency_pu_ttc; $this->line->multicurrency_total_ht = (float) $multicurrency_total_ht; $this->line->multicurrency_total_tva = (float) $multicurrency_total_tva; $this->line->multicurrency_total_ttc = (float) $multicurrency_total_ttc; $this->line->subprice = (float) $pu_ht; + $this->line->subprice_ttc = (float) $pu_ttc; $this->line->price = $this->line->subprice; $this->line->remise_percent = $remise_percent; diff --git a/htdocs/fourn/class/fournisseur.orderline.class.php b/htdocs/fourn/class/fournisseur.orderline.class.php index fd0e91b3556..2a05385a435 100644 --- a/htdocs/fourn/class/fournisseur.orderline.class.php +++ b/htdocs/fourn/class/fournisseur.orderline.class.php @@ -15,7 +15,8 @@ * Copyright (C) 2022 Gauthier VERDOL * Copyright (C) 2024 Solution Libre SAS * Copyright (C) 2024-2025 MDW - * Copyright (C) 2024 William Mead + * Copyright (C) 2024 William Mead + * Copyright (C) 2026 Pierre Ardoin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -194,6 +195,7 @@ class CommandeFournisseurLigne extends CommonOrderLine $this->ref_fourn = $objp->ref_supplier; $this->ref_supplier = $objp->ref_supplier; $this->subprice = $objp->subprice; + $this->subprice_ttc = $objp->subprice_ttc; $this->tva_tx = $objp->tva_tx; $this->localtax1_tx = $objp->localtax1_tx; $this->localtax2_tx = $objp->localtax2_tx; @@ -252,6 +254,7 @@ class CommandeFournisseurLigne extends CommonOrderLine $this->extraparams = !empty($objp->extraparams) ? (array) json_decode($objp->extraparams, true) : array(); $this->multicurrency_subprice = $objp->multicurrency_subprice; + $this->multicurrency_subprice_ttc = $objp->multicurrency_subprice_ttc; $this->multicurrency_total_ht = $objp->multicurrency_total_ht; $this->multicurrency_total_tva = $objp->multicurrency_total_tva; $this->multicurrency_total_ttc = $objp->multicurrency_total_ttc; @@ -347,7 +350,7 @@ class CommandeFournisseurLigne extends CommonOrderLine $sql = 'INSERT INTO '.$this->db->prefix().$this->table_element; $sql .= " (fk_commande, label, description, date_start, date_end,"; $sql .= " fk_product, product_type, special_code, rang,"; - $sql .= " qty, vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, remise_percent, subprice, ref,"; + $sql .= " qty, vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, remise_percent, subprice, subprice_ttc, ref,"; $sql .= " total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_unit,"; $sql .= " fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc,"; $sql .= " fk_parent_line)"; @@ -369,7 +372,7 @@ class CommandeFournisseurLigne extends CommonOrderLine $sql .= " ".price2num($this->localtax2_tx).","; $sql .= " '".$this->db->escape($this->localtax1_type)."',"; $sql .= " '".$this->db->escape($this->localtax2_type)."',"; - $sql .= " ".((float) $this->remise_percent).", ".price2num($this->subprice, 'MU').", '".$this->db->escape($this->ref_supplier)."',"; + $sql .= " ".((float) $this->remise_percent).", ".price2num($this->subprice, 'MU').", ".price2num($this->subprice_ttc, 'MU').", '".$this->db->escape($this->ref_supplier)."',"; $sql .= " ".price2num($this->total_ht).","; $sql .= " ".price2num($this->total_tva).","; $sql .= " ".price2num($this->total_localtax1).","; From b9507a980cfa3c7c2185fa3f116f44fef5d21688 Mon Sep 17 00:00:00 2001 From: Sylvain Legrand Date: Thu, 7 May 2026 11:04:41 +0300 Subject: [PATCH 07/11] Fix: scope file picker click to the just-shown attach-new-file form (#38114) In FormFile::list_of_documents(), when the user clicks the "+ New" button to reveal the upload form (showhideaddbutton), the JS handler triggers jQuery("input[type='file']").click(). This selector matches every on the page, opening the OS file picker once per match. Users with multiple file inputs in the DOM (e.g. another hidden upload form, an editor's media browser, modules with their own attachers) have to dismiss the file dialog several times before being able to drag-drop or browse normally. Fix: scope the selector to the form that was just shown: - jQuery("input[type='file']").click(); + jQuery(".divattachnewfile input[type='file']").first().click(); No regression on pages with a single .divattachnewfile. Reproduces on any *document.php tab where a hidden second is present. --- htdocs/core/class/html.formfile.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 2bce5a5b04d..1af0195dfea 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -1407,7 +1407,7 @@ class FormFile // Show title of list of existing files $morehtmlright = ''; if (!empty($moreoptions['showhideaddbutton']) && $conf->use_javascript_ajax) { - $tmpurlforbutton = 'javascript:console.log("open add file form");jQuery(".divattachnewfile").toggle(); if (!jQuery(".divattachnewfile").is(":hidden")) { jQuery("input[type=\'file\']").click();}void(0);'; + $tmpurlforbutton = 'javascript:console.log("open add file form");jQuery(".divattachnewfile").toggle(); if (!jQuery(".divattachnewfile").is(":hidden")) { jQuery(".divattachnewfile input[type=\'file\']").first().click();}void(0);'; // scope file picker click to the just-shown form to avoid triggering native file dialog twice when other input[type=file] exist on the page $morehtmlright .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', $tmpurlforbutton, '', $permtoeditline); } From 671f2fc9df47ca92c7ef6b3e9e429b1da355db11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Champlon?= <85104766+Kazimir42@users.noreply.github.com> Date: Thu, 7 May 2026 10:11:22 +0200 Subject: [PATCH 08/11] FIX : draft invoice paid when add absolute discount == remain to pay (#38104) * Fix set paid invoice on status draft when add absolute discount == remain to pay * fix --- htdocs/compta/facture/card.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index f3535de1d66..111ae3a6a40 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -676,9 +676,11 @@ if (empty($reshook)) { } if (!$error) { - $newremaintopay = $object->getRemainToPay(0); - if ($newremaintopay == 0) { - $object->setPaid($user); + if ($object->status == Facture::STATUS_VALIDATED) { + $newremaintopay = $object->getRemainToPay(0); + if ($newremaintopay == 0) { + $object->setPaid($user); + } } } } From eb5e550490ccdf4871556a75a73493955f4e841b Mon Sep 17 00:00:00 2001 From: atm-lucas <121817516+atm-lucasmantegari@users.noreply.github.com> Date: Thu, 7 May 2026 12:58:22 +0200 Subject: [PATCH 09/11] Fix: reset fk_code_ventilation on invoice clone (#38084) --- htdocs/compta/facture/class/facture.class.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index b999211d44c..c8fdda0d2e3 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1359,6 +1359,9 @@ class Facture extends CommonInvoice } $object->lines[$i]->ref_ext = ''; // Do not clone ref_ext + + // Do not clone accountancy ventilation: a cloned invoice must reappear in "to dispatch" list + $object->lines[$i]->fk_code_ventilation = 0; } // Create clone From c0fb6bf32256ca3650d7b3036c38ab96270adb8f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 7 May 2026 13:07:11 +0200 Subject: [PATCH 10/11] Fix typo (fix in different direction than #38094) --- htdocs/core/tpl/objectline_title.tpl.php | 2 +- htdocs/core/tpl/objectline_view.tpl.php | 2 +- htdocs/core/tpl/subtotal_view.tpl.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/tpl/objectline_title.tpl.php b/htdocs/core/tpl/objectline_title.tpl.php index 7d059684e29..8f9ecaf251a 100644 --- a/htdocs/core/tpl/objectline_title.tpl.php +++ b/htdocs/core/tpl/objectline_title.tpl.php @@ -116,7 +116,7 @@ print ''.$langs->trans('PriceUHT').'multicurrency_code != $conf->currency) { print ''.$langs->trans('PriceUHT'); - print ' ('.$langs->getCurrencySymbol($this->multicurrency_code).')'; + print ' ('.$langs->getCurrencySymbol($this->multicurrency_code).')'; } // Price TTC diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php index 2ab037ed6ca..387a86b0166 100644 --- a/htdocs/core/tpl/objectline_view.tpl.php +++ b/htdocs/core/tpl/objectline_view.tpl.php @@ -504,7 +504,7 @@ if ($line->special_code == 3) { print $tooltiponpriceend; print ''; if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency) { - print ''; + print ''; print $tooltiponpricemultiprice; print price($sign * $line->multicurrency_total_ht); print $tooltiponpriceendmultiprice; diff --git a/htdocs/core/tpl/subtotal_view.tpl.php b/htdocs/core/tpl/subtotal_view.tpl.php index cf1fe6fd56e..c8739156d72 100644 --- a/htdocs/core/tpl/subtotal_view.tpl.php +++ b/htdocs/core/tpl/subtotal_view.tpl.php @@ -161,7 +161,7 @@ if ($line->qty > 0) { ?> ?> multicurrency_code != $conf->currency) { ?> - + qty < 0) { // Base colspan if there is no module activated to display line correctly From d7bdd3256b5efa110adb23bbccc3f9c377402387 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 7 May 2026 13:19:07 +0200 Subject: [PATCH 11/11] Fix typo (fix in different direction than #38094) --- htdocs/core/tpl/objectline_title.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/tpl/objectline_title.tpl.php b/htdocs/core/tpl/objectline_title.tpl.php index 8f9ecaf251a..b3498241943 100644 --- a/htdocs/core/tpl/objectline_title.tpl.php +++ b/htdocs/core/tpl/objectline_title.tpl.php @@ -207,7 +207,7 @@ print ''.$langs->trans('TotalHTShort').''; // Multicurrency if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency) { print ''.$langs->trans('TotalHTShort'); - print ' ('.$langs->getCurrencySymbol($this->multicurrency_code).')'; + print ' ('.$langs->getCurrencySymbol($this->multicurrency_code).')'; } if ($outputalsopricetotalwithtax) {