From 5b245ba99b5232f288779005a23ee38bd018dacb Mon Sep 17 00:00:00 2001
From: kkhelifa-opendsi <kkhelifa@open-dsi.fr>
Date: Thu, 23 Apr 2026 18:38:29 +0200
Subject: [PATCH 01/15] FIX : calculate the files count on ECM when add
 multiple files in one time (#31866)

Calculate the files count on ECM when add multiple files in one time #19493, end fix will become in next PR
---
 htdocs/ecm/class/ecmdirectory.class.php | 27 ++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index d0c3657ca07..c02ff7ea0ba 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -296,12 +296,37 @@ class EcmDirectory extends CommonObject
 	 */
 	public function changeNbOfFiles($value)
 	{
+		global $conf;
+
+		if ($value == '+') {
+			$relativepath = $conf->ecm->dir_output . '/' . $this->getRelativePath(); // Ex: dir1/dir2/dir3/
+			$relativepath = preg_replace('/^' . preg_quote(DOL_DATA_ROOT, '/') . '/', '', $relativepath);
+			$relativepath = trim($relativepath, '/');
+
+			// Get nb file in relative path
+			$sql = "SELECT COUNT(*) AS nb";
+			$sql .= " FROM " . $this->db->prefix() . "ecm_files";
+			$sql .= " WHERE filepath = '" . $this->db->escape($relativepath) . "'";
+
+			dol_syslog(get_class($this) . "::changeNbOfFiles - Get nb file in relative path", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$this->error = "Error " . $this->db->lasterror();
+				return -1;
+			} else {
+				$value = 0;
+				if ($obj = $this->db->fetch_object($resql)) {
+					$value = (int) $obj->nb;
+				}
+			}
+		}
+
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."ecm_directories SET";
 		if (preg_match('/[0-9]+/', $value)) {
 			$sql .= " cachenbofdoc = ".(int) $value;
 		} else {
-			$sql .= " cachenbofdoc = cachenbofdoc ".$value." 1";
+			$sql .= " cachenbofdoc = cachenbofdoc " . preg_replace('/[^\-]/', '', $value) . " 1";
 		}
 		$sql .= " WHERE rowid = ".((int) $this->id);
 

From 75cce0b7b5a32512f7f8335b4c62adf1e57ed641 Mon Sep 17 00:00:00 2001
From: Eric - CAP-REL <1468823+rycks@users.noreply.github.com>
Date: Sun, 26 Apr 2026 22:47:09 +0200
Subject: [PATCH 02/15] next step for PR #31866 / Issue #19493 (#37988)

---
 htdocs/ecm/class/ecmdirectory.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index c02ff7ea0ba..45e47da86e1 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -291,14 +291,14 @@ class EcmDirectory extends CommonObject
 	/**
 	 *	Update cache of nb of documents into database
 	 *
-	 * 	@param	string	$value		'+' or '-' or new number
+	 * 	@param	string	$value		'+' (one more) or '-' (one less) or new number (like '5') or 'database' (recompute from database)
 	 *  @return int		         	<0 if KO, >0 if OK
 	 */
 	public function changeNbOfFiles($value)
 	{
 		global $conf;
 
-		if ($value == '+') {
+		if ($value == 'database') {
 			$relativepath = $conf->ecm->dir_output . '/' . $this->getRelativePath(); // Ex: dir1/dir2/dir3/
 			$relativepath = preg_replace('/^' . preg_quote(DOL_DATA_ROOT, '/') . '/', '', $relativepath);
 			$relativepath = trim($relativepath, '/');

From ab434beee48b18e2e666f62cffb8f9cb11e0f6a9 Mon Sep 17 00:00:00 2001
From: lvessiller-opendsi <lvessiller@open-dsi.fr>
Date: Tue, 28 Apr 2026 13:26:24 +0200
Subject: [PATCH 03/15] FIX autofill price with multicurrency on supplier doc
 (backport commit 391aca5) (#38028)

---
 htdocs/core/class/html.form.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index f9f83a238fa..3ec2663647b 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3692,7 +3692,7 @@ class Form
 					$optstart .= ' data-supplier-ref="' . dol_escape_htmltag($objp->ref_fourn) . '"';
 					if (isModEnabled('multicurrency')) {
 						$optstart .= ' data-multicurrency-code="' . dol_escape_htmltag($objp->multicurrency_code) . '"';
-						$optstart .= ' data-multicurrency-up="' . dol_escape_htmltag($objp->multicurrency_unitprice) . '"';
+						$optstart .= ' data-multicurrency-unitprice="' . dol_escape_htmltag(price2num($objp->multicurrency_unitprice)) . '"';	// the price with numeric international format
 					}
 				}
 				$optstart .= ' data-description="' . dol_escape_htmltag($objp->description, 0, 1) . '"';

From 10ed656ee082a0c04dd4701ab2aa462aaa84ebc5 Mon Sep 17 00:00:00 2001
From: atm-jonathan <146709163+atm-jonathan@users.noreply.github.com>
Date: Fri, 1 May 2026 23:16:22 +0200
Subject: [PATCH 04/15] FIX double transaction db begin (#38033)

* Limit standard on price list

* Remove redundant $db->begin() call that caused transaction mismatch.

---------

Co-authored-by: ATM-Lucas <lucas.mantegari@atm-consulting.fr>
---
 htdocs/ticket/class/ticket.class.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index bf17cc9f0bc..8e8806cebb2 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -1713,8 +1713,6 @@ class Ticket extends CommonObject
 
 			$this->status = Ticket::STATUS_READ;
 
-			$this->db->begin();
-
 			$sql = "UPDATE ".MAIN_DB_PREFIX."ticket";
 			$sql .= " SET fk_statut = ".((int) $this->status) .", date_read = '".$this->db->idate(dol_now())."'";
 			$sql .= " WHERE rowid = ".((int) $this->id);

From 25cfb56ec6aa49f25f4c96d2da0818b0f07b9a57 Mon Sep 17 00:00:00 2001
From: atm-lucas <121817516+atm-lucasmantegari@users.noreply.github.com>
Date: Fri, 1 May 2026 23:19:04 +0200
Subject: [PATCH 05/15]   Fix: normalize empty values for extrafield types
 mapping to INT columns (#38049)

---
 htdocs/core/class/commonobject.class.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 9e9e7eceed6..1635e00c429 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6702,10 +6702,17 @@ abstract class CommonObject
 
 				switch ($attributeType) {
 					case 'int':
+					case 'duration':
+					case 'stars':
 						if (!is_numeric($value) && $value != '') {
 							$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 							return -1;
-						} elseif ($value == '') {
+						} elseif ($value === '' || $value === false || $value === null) {
+							$new_array_options[$key] = null;
+						}
+						break;
+					case 'boolean':
+						if ($value === '' || $value === false || $value === null) {
 							$new_array_options[$key] = null;
 						}
 						break;
@@ -6796,6 +6803,10 @@ abstract class CommonObject
 						$new_array_options[$key] = $this->db->idate($this->array_options[$key], 'gmt');
 						break;
 					case 'link':
+						if ($value === '' || $value === false || $value === null) {
+							$new_array_options[$key] = null;
+							break;
+						}
 						$param_list = array_keys($attributeParam['options']);
 						// 0 : ObjectName
 						// 1 : classPath

From e142f7618a2f3c1c8b70c1f97212b1f3281bd4b1 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 4 May 2026 17:41:37 +0200
Subject: [PATCH 06/15] FIX #38054 Societe - Export - Problem on stcomm &
 typent (#38065)

* FIX Societe - Export - Problem on stcomm & typent

* remove mistake
---
 htdocs/core/modules/modSociete.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 43d8a9ac94b..c3ba6f08ec5 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -402,7 +402,7 @@ class modSociete extends DolibarrModules
 			's.code_compta' => "Text", 's.code_compta_fournisseur' => "Text",
 			's.client' => "Numeric", 's.fournisseur' => "Numeric",
 			's.address' => "Text", 's.zip' => "Text", 's.town' => "Text", 's.phone' => "Text", 's.email' => "Text",
-			't.code' => "List:c_stcomm:libelle:code",
+			't.code' => "List:c_typent:libelle:code",
 			'c.entity' => 'List:entity:label:rowid',
 			's.entity' => 'List:entity:label:rowid',
 		);

From be15e9f4012111f60046fcbefc25dc3cac5f6476 Mon Sep 17 00:00:00 2001
From: Eric Seigne <eric.seigne@cap-rel.fr>
Date: Thu, 7 May 2026 09:17:38 +0200
Subject: [PATCH 07/15] Prepare 18.0.10

---
 ChangeLog               | 10 ++++++++++
 htdocs/filefunc.inc.php |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 6db7b2e81f0..10e6c9589a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,16 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
+***** ChangeLog for 18.0.10 compared to 18.0.9 *****
+
+FIX: autofill price with multicurrency on supplier doc (backport commit 391aca5) (#38028)
+FIX: calculate the files count on ECM when add multiple files in one time (#31866)
+FIX: #GHSA-hq5j-39f9-qxcv (#37812)
+FIX: SQL Injection via Operator Injection in Contract Service List
+FIX: #GHSA-crgg-h74r-2m8r (#37636)
+FIX: do not print Extrafields in PDF if printable is 0
+FIX: a param must not come from end user entry.
+
 ***** ChangeLog for 18.0.9 compared to 18.0.8 *****
 100 files changed, 2283 insertions(+), 591 deletions(-)
 
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index c8d6878d597..d607eae2845 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -34,7 +34,7 @@ if (!defined('DOL_APPLICATION_TITLE')) {
 	define('DOL_APPLICATION_TITLE', 'Dolibarr');
 }
 if (!defined('DOL_VERSION')) {
-	define('DOL_VERSION', '18.0.9'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+	define('DOL_VERSION', '18.0.10'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 }
 
 if (!defined('EURO')) {

From c8ea651ca54ca1df8a0ebab33ee71e99124df817 Mon Sep 17 00:00:00 2001
From: Serhii Bondarenko <47003509+serhiilabs@users.noreply.github.com>
Date: Sun, 10 May 2026 16:09:20 +0300
Subject: [PATCH 08/15] FIX #38146 Honor tpl override on supplier contacts
 (#38150)

Signed-off-by: Serhii Bondarenko <serhiilabs@gmail.com>
---
 htdocs/fourn/commande/contact.php    | 11 +++++++++--
 htdocs/fourn/facture/contact.php     | 11 +++++++++--
 htdocs/supplier_proposal/contact.php | 11 +++++++++--
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index 67b436e308e..430c9c67432 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2017      Ferran Marcet       	 <fmarcet@2byte.es>
  * Copyright (C) 2023      Christian Foellmann  <christian@foellmann.de>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2026       Serhii Bondarenko       <serhiilabs@gmail.com>
  *
  * 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
@@ -187,8 +188,14 @@ if ($id > 0 || !empty($ref)) {
 
 		print dol_get_fiche_end();
 
-		// Contacts lines
-		include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
+		// Contacts lines (modules that overwrite templates must declare this into descriptor)
+		$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
+		foreach ($dirtpls as $reldir) {
+			$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
+			if ($res) {
+				break;
+			}
+		}
 	} else {
 		// Contact not found
 		print "ErrorRecordNotFound";
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index d15646059f3..3ff6c983bb9 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2017		Ferran Marcet       	<fmarcet@2byte.es>
  * Copyright (C) 2021-2024  Frédéric France			<frederic.france@free.fr>
  * Copyright (C) 2023       Christian Foellmann  <christian@foellmann.de>
+ * Copyright (C) 2026       Serhii Bondarenko    <serhiilabs@gmail.com>
  *
  * 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
@@ -269,8 +270,14 @@ if ($id > 0 || !empty($ref)) {
 		//print '<div class="clearboth"></div>';
 		//print '<br>';
 
-		// Contacts lines
-		include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
+		// Contacts lines (modules that overwrite templates must declare this into descriptor)
+		$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
+		foreach ($dirtpls as $reldir) {
+			$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
+			if ($res) {
+				break;
+			}
+		}
 	} else {
 		print "ErrorRecordNotFound";
 	}
diff --git a/htdocs/supplier_proposal/contact.php b/htdocs/supplier_proposal/contact.php
index 32fa86a340f..8e4aa7e0a6e 100644
--- a/htdocs/supplier_proposal/contact.php
+++ b/htdocs/supplier_proposal/contact.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2023		Christian Foellmann			<christian@foellmann.de>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2026       Serhii Bondarenko       <serhiilabs@gmail.com>
  *
  * 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
@@ -189,8 +190,14 @@ if ($id > 0 || !empty($ref)) {
 
 		print dol_get_fiche_end();
 
-		// Contacts lines
-		include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
+		// Contacts lines (modules that overwrite templates must declare this into descriptor)
+		$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
+		foreach ($dirtpls as $reldir) {
+			$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
+			if ($res) {
+				break;
+			}
+		}
 	} else {
 		// Contact not found
 		print "ErrorRecordNotFound";

From bc72abc9527143cdf7edd077bdb71b679d1b5e9f Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <github@jonb.dk>
Date: Mon, 18 May 2026 02:42:47 +0200
Subject: [PATCH 09/15] The basic issue is that using lowercase mm makes
 javascript dpChangeDay think minutes and not MONTH (#38266)

Co-authored-by: Jon Bendtsen <jonbendtsen@jonb.dk>
---
 htdocs/core/class/html.form.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index dd33f542d62..1969b5310e6 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7747,7 +7747,7 @@ class Form
 						$minYear = getDolGlobalInt('MIN_YEAR_SELECT_DATE', (idate('Y') - 100));
 						$maxYear = getDolGlobalInt('MAX_YEAR_SELECT_DATE', (idate('Y') + 100));
 
-						$retstring .= '<!-- datepicker usecalendar=eldy --><script nonce="' . getNonce() . '" type="text/javascript">';
+						$retstring .= '<!-- datepicker usecalendar='.$usecalendar.' --><script nonce="' . getNonce() . '" type="text/javascript">';
 						$retstring .= "$(function(){ $('#" . $prefix . "').datepicker({
 							dateFormat: '" . $langs->trans("FormatDateShortJQueryInput") . "',
 							autoclose: true,
@@ -7781,7 +7781,7 @@ class Form
 					$retstring .= '<input id="'.$prefix.'" name="'.$prefix.'" type="'.($usecalendar == 'html' ? "date" : "text").'" class="maxwidthdate center" maxlength="11" value="'.$formatted_date.'"';
 					$retstring .= ($disabled ? ' disabled' : '');
 					$retstring .= ($placeholder ? ' placeholder="' . dol_escape_htmltag($placeholder) . '"' : '');
-					$retstring .= ' onChange="dpChangeDay(\'' . dol_escape_js($prefix) . '\',\'' . dol_escape_js($usecalendar == 'html' ? 'yyyy-mm-dd' : $langs->trans("FormatDateShortJavaInput")) . '\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
+					$retstring .= ' onChange="dpChangeDay(\'' . dol_escape_js($prefix) . '\',\'' . dol_escape_js($usecalendar == 'html' ? 'yyyy-MM-dd' : $langs->trans("FormatDateShortJavaInput")) . '\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
 					$retstring .= ' autocomplete="off">';
 
 					// Icon calendar

From c0d303c19d2ef23ca10c9ec39a43ffd7cdd61fe3 Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <github@jonb.dk>
Date: Mon, 18 May 2026 02:44:08 +0200
Subject: [PATCH 10/15] Fix #38225 webportal member is only in top menu, not on
 front page (#38257)

Co-authored-by: Jon Bendtsen <jonbendtsen@jonb.dk>
---
 htdocs/public/webportal/tpl/home.tpl.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/htdocs/public/webportal/tpl/home.tpl.php b/htdocs/public/webportal/tpl/home.tpl.php
index 0f9594a7967..00336240c55 100644
--- a/htdocs/public/webportal/tpl/home.tpl.php
+++ b/htdocs/public/webportal/tpl/home.tpl.php
@@ -37,5 +37,11 @@ if (empty($context) || !is_object($context)) {
 				<?php print '<a class="home-links-card__link" href="' . $context->getControllerUrl('invoicelist') . '" title="' . $langs->trans('WebPortalInvoiceListDesc') . '">' . $langs->trans('WebPortalInvoiceListTitle') . '</a>'; ?>
 			</article>
 			<?php endif; ?>
+			<?php if (isModEnabled('member') && in_array(getDolGlobalString('WEBPORTAL_MEMBER_CARD_ACCESS'), ['visible', 'edit']) && $context->logged_member && $context->logged_member->id > 0) : ?>
+			<article class="home-links-card --membercard">
+				<div class="home-links-card__icon" ></div>
+				<?php print '<a class="home-links-card__link" href="' . $context->getControllerUrl('membercard') . '" title="' . $langs->trans('WebPortalMemberCardMenu') . '">' . $langs->trans('WebPortalMemberCardMenu') . '</a>'; ?>
+			</article>
+			<?php endif; ?>
 		</div>
 </main>

From 1ba11d24da2ffb55e2d2f190ea2375f79aa9121f Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <github@jonb.dk>
Date: Mon, 18 May 2026 03:24:07 +0200
Subject: [PATCH 11/15] =?UTF-8?q?Fix=20#37795=20supplier=5Fproposal:=20Pro?=
 =?UTF-8?q?ject=20assignment=20not=20saved=20=E2=80=93=20neither=20on=20cr?=
 =?UTF-8?q?eation=20nor=20after=20(#38263)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jon Bendtsen <jonbendtsen@jonb.dk>
---
 htdocs/supplier_proposal/card.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index e7d14037632..5a4e6cc5de7 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1412,7 +1412,11 @@ if ($action == 'create') {
 
 			print '<tr>';
 			print '<td>'.$langs->trans("Project").'</td><td colspan="2">';
-			print img_picto('', 'project', 'class="pictofixedwidth"').$formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
+			$canLinkAll = getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS');
+			$canLinkAll = ($canLinkAll === '' || $canLinkAll === false) ? 0 : $canLinkAll;
+			$currentSocId = ($object->id > 0) ? $object->socid : $socid;
+			$projectSocId = ((int) $canLinkAll == 1) ? -1 : $currentSocId;
+			print img_picto('', 'project', 'class="pictofixedwidth"').$formproject->select_projects($projectSocId, $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
 			print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
 
 			print '</td>';
@@ -1655,7 +1659,11 @@ if ($action == 'create') {
 			if ($action != 'classify') {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 			}
-			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+			$canLinkAll = getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS');
+			$canLinkAll = ($canLinkAll === '' || $canLinkAll === false) ? 0 : $canLinkAll;
+			$currentSocId = ($object->id > 0) ? $object->socid : $socid;
+			$projectSocId = ((int) $canLinkAll == 1) ? -1 : $currentSocId;
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $projectSocId, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);

From c8bfa410e6d7dd9494729354637fe63900f6d48c Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <github@jonb.dk>
Date: Mon, 18 May 2026 11:36:30 +0200
Subject: [PATCH 12/15] FIX #37356 Category Products not listed (#38264)

* FIX #37356 Category Products not listed

* Will now show product and service categories when 1 or both modules for products or services are enabled #38264

---------

Co-authored-by: Jon Bendtsen <jonbendtsen@jonb.dk>
---
 htdocs/categories/index.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index ee1a9e6d325..64cbd584026 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -80,11 +80,22 @@ llxHeader('', $title, '', '', 0, 0, '', '');
 // Get list of category type
 $arrayofcateg = array();
 foreach ($categstatic->MAP_ID as $key => $idtype) {
+	if ($key == 'product' && !isModEnabled("product")) {
+		continue;
+	}
+	if ($key == 'service' && !isModEnabled("service")) {
+		continue;
+	}
+
 	$arrayofcateg[$idtype] = array();
 	$arrayofcateg[$idtype]['key'] = $key;
 	$arrayofcateg[$idtype]['nb'] = 0;
 	$arrayofcateg[$idtype]['label'] = $langs->transnoentitiesnoconv($categstatic::$MAP_TYPE_TITLE_AREA[$key]);
 	$arrayofcateg[$idtype]['labelwithoutaccent'] = dol_string_unaccent($langs->transnoentitiesnoconv($categstatic::$MAP_TYPE_TITLE_AREA[$key]));
+	if ($key == 'product' || $key == 'service') {
+		$arrayofcateg[$idtype]['label'] = $langs->transnoentitiesnoconv("ProductsAndServices");
+		$arrayofcateg[$idtype]['labelwithoutaccent'] = dol_string_unaccent($langs->transnoentitiesnoconv("ProductsAndServices"));
+	}
 }
 $arrayofcateg = dol_sort_array($arrayofcateg, 'labelwithoutaccent', 'asc', 1, 0, 1);
 

From 8815996b9c5f4b64a3f5d52aa1291fbcac2ca28b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 18 May 2026 22:00:02 +0200
Subject: [PATCH 13/15] FIX #36777

---
 htdocs/societe/card.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 3fa0fad84a8..d1eb652bef2 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1490,6 +1490,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			$selectedcustomer = ((GETPOSTISSET('customer') && $action == 'create') ? GETPOSTINT('customer') : $selectedcustomer);
 			$selectedsupplier = ((GETPOSTISSET('supplier') && $action == 'create') ? GETPOSTINT('supplier') : $object->fournisseur);
 
+			if ($selectedprospect && $selectedcustomer && getDolGlobalString("SOCIETE_DISABLE_PROSPECTSCUSTOMERS")) {
+				// If both are not allowed, we reset $selectedcustomer
+				$selectedcustomer = 0;
+			}
+
 			print '<tr class="marginbottomlarge height50">';
 			if ($conf->browser->layout != 'phone') {
 				print '<td class="titlefieldcreate">'.$form->editfieldkey('', 'customerprospect', '', $object, 0, 'string', '', 0).'</td>';

From 03b9f9235985d69795437de8912c879cb4907ae7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 20 May 2026 16:51:10 +0200
Subject: [PATCH 14/15] Prepare 22.0.5

---
 htdocs/filefunc.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 99cf74ca3b7..f2ff7c66857 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -63,7 +63,7 @@ if (!defined('DOL_APPLICATION_TITLE')) {
 	define('DOL_APPLICATION_TITLE', 'Dolibarr');
 }
 if (!defined('DOL_VERSION')) {
-	define('DOL_VERSION', '22.0.4'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+	define('DOL_VERSION', '22.0.5'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 }
 
 if (!defined('EURO')) {

From 5efc5e85a9648f4538515a6c844f5ab03be58609 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 20 May 2026 17:29:46 +0200
Subject: [PATCH 15/15] Fix tags

---
 htdocs/categories/categorie_list.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/categories/categorie_list.php b/htdocs/categories/categorie_list.php
index 0bfb015485a..4303d753337 100644
--- a/htdocs/categories/categorie_list.php
+++ b/htdocs/categories/categorie_list.php
@@ -236,7 +236,11 @@ if (empty($reshook)) {
 $form = new Form($db);
 
 $title = $langs->trans("Categories");
-$title .= ' ('.$langs->trans(empty(Categorie::$MAP_TYPE_TITLE_AREA[$type]) ? ucfirst($type) : Categorie::$MAP_TYPE_TITLE_AREA[$type]).')';
+if ($type == 'product' || $type == 'service') {
+	$title .= ' ('.$langs->trans("ProductsOrServices").')';
+} else {
+	$title .= ' ('.$langs->trans(empty(Categorie::$MAP_TYPE_TITLE_AREA[$type]) ? ucfirst($type) : Categorie::$MAP_TYPE_TITLE_AREA[$type]).')';
+}
 //$help_url = "EN:Module_Categorie|FR:Module_Categorie_FR|ES:Módulo_Categorie";
 $help_url = '';
 $morejs = array();