From 58a21ebf4fd247be5442a057a9bf61b821031395 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 10 May 2026 18:42:15 +0200
Subject: [PATCH 01/48] FIX selected default value ko on
 select_produits_fournisseurs_list()

---
 htdocs/core/class/html.form.class.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 1b5d1653f6e..dd33f542d62 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4234,9 +4234,12 @@ class Form
 				}
 
 				$optstart = '<option value="' . $outkey . '"';
-				if ($selected && $selected == $objp->idprodfournprice) {
+				if ($selected && preg_match('/^idprod_/', (string) $selected) && (string) $selected == 'idprod_'.$objp->rowid) {
+					$optstart .= ' selected';
+				} elseif ($selected && (string) $selected == (string) $objp->idprodfournprice) {
 					$optstart .= ' selected';
 				}
+
 				if (empty($objp->idprodfournprice) && empty($alsoproductwithnosupplierprice)) {
 					$optstart .= ' disabled';
 				}

From bef782ca09ae60a324b1b1b7fee86eb93dd8412a Mon Sep 17 00:00:00 2001
From: Sylvain Legrand <sylvain.legrand@infras.fr>
Date: Wed, 13 May 2026 13:34:57 +0300
Subject: [PATCH 02/48] Add message pdf generated on project (#38197)

---
 htdocs/projet/card.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 5745f8590ea..db00efbc520 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -505,6 +505,8 @@ if (empty($reshook)) {
 		if ($result <= 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = '';
+		} else {
+			setEventMessages($langs->trans("FileGenerated"), null, 'mesgs');
 		}
 	}
 

From f4fe44518b824847d170735052d88510cc53f7db Mon Sep 17 00:00:00 2001
From: Ni0rd <davidbillamboz@gmail.com>
Date: Wed, 13 May 2026 12:42:05 +0200
Subject: [PATCH 03/48] Fix #37962: TakePos credit note refund payment not
 recorded and invoice not set as paid (#37963)

For credit notes, getRemainToPay() returns a negative value. The previous
condition ($remaintopay > 0) skipped payment creation entirely, leaving the
credit note in an unpaid/open state after TakePos validation.
---
 htdocs/takepos/invoice.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index c07c9b6204d..87d611b8a57 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -319,7 +319,8 @@ if (empty($reshook)) {
 		// Add the payment
 		if (!$error && $res >= 0) {
 			$remaintopay = $invoice->getRemainToPay();
-			if ($remaintopay > 0) {
+			// Credit notes have negative remaintopay; regular invoices have positive
+			if (($remaintopay > 0 && $invoice->type != Facture::TYPE_CREDIT_NOTE) || ($remaintopay < 0 && $invoice->type == Facture::TYPE_CREDIT_NOTE)) {
 				$payment = new Paiement($db);
 
 				$payment->datepaye = $now;

From 1eba22f29b79a5c7fdf55183b95ee0f3ee29debe Mon Sep 17 00:00:00 2001
From: Joachim Kueter <priojk@users.noreply.github.com>
Date: Wed, 13 May 2026 14:36:36 +0200
Subject: [PATCH 04/48] Fix: skip approver "not enough days" warning for leave
 types that don't use the balance counter (#38213)

The validator notification email warned about insufficient balance regardless
of whether the leave type has affect=1 in c_holiday_types. For types like
overtime compensation or unpaid leave (affect=0), getCPforUser() always
returns 0 and the warning fires on every request.

Same getTypes(1, 1) filter that the balance display in the form uses.
---
 htdocs/holiday/card.php       | 10 +++++++---
 htdocs/holiday/card_group.php | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 982eacd19c4..dab043c9ee2 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -530,11 +530,15 @@ if (empty($reshook)) {
 				}
 
 				// option to notify the validator if the balance is less than the request
+				// (only for leave types that actually use the balance counter)
 				if (!getDolGlobalString('HOLIDAY_HIDE_APPROVER_ABOUT_NEGATIVE_BALANCE')) {
-					$nbopenedday = num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday);
+					$affectingtypes = $object->getTypes(1, 1);
+					if (!empty($affectingtypes[$object->fk_type])) {
+						$nbopenedday = num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday);
 
-					if ($nbopenedday > $object->getCPforUser($object->fk_user, $object->fk_type)) {
-						$message .= "<p>".$langs->transnoentities("HolidaysToValidateAlertSolde")."</p>\n";
+						if ($nbopenedday > $object->getCPforUser($object->fk_user, $object->fk_type)) {
+							$message .= "<p>".$langs->transnoentities("HolidaysToValidateAlertSolde")."</p>\n";
+						}
 					}
 				}
 
diff --git a/htdocs/holiday/card_group.php b/htdocs/holiday/card_group.php
index f6c3df2aadb..782d2b6e409 100644
--- a/htdocs/holiday/card_group.php
+++ b/htdocs/holiday/card_group.php
@@ -757,11 +757,15 @@ function sendMail($id, $cancreate, $now, $autoValidation)
 				}
 
 				// option to notify the validator if the balance is less than the request
+				// (only for leave types that actually use the balance counter)
 				if (!getDolGlobalString('HOLIDAY_HIDE_APPROVER_ABOUT_NEGATIVE_BALANCE')) {
-					$nbopenedday = num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday);
+					$affectingtypes = $object->getTypes(1, 1);
+					if (!empty($affectingtypes[$object->fk_type])) {
+						$nbopenedday = num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday);
 
-					if ($nbopenedday > $object->getCPforUser($object->fk_user, $object->fk_type)) {
-						$message .= "<p>".$langs->transnoentities("HolidaysToValidateAlertSolde")."</p>\n";
+						if ($nbopenedday > $object->getCPforUser($object->fk_user, $object->fk_type)) {
+							$message .= "<p>".$langs->transnoentities("HolidaysToValidateAlertSolde")."</p>\n";
+						}
 					}
 				}
 

From 8fa5e781dac8a5cf3bc69e917a34f6a7125fd47c Mon Sep 17 00:00:00 2001
From: Pichinov-Jose <jose.martinez@pichinov.com>
Date: Sun, 17 May 2026 21:24:23 +0200
Subject: [PATCH 05/48] Fix: ToolThirdParty inputSchema JSON Schema 2020-12
 compliance (#38290)

Several tool schemas in ToolThirdParty::getDefinitions() declared
'required' => true inside individual properties. This is not valid
JSON Schema draft 2020-12, which requires 'required' to be an array
of property names at the parent object level.

Strict validators (such as Anthropic's Claude API used by Claude
Desktop Custom Connectors and Claude Code) reject these schemas with
HTTP 400 'input_schema is invalid', causing the entire MCP connection
to fail before any tool can be called.

This patch:
- Moves 'required: true' flags from individual properties to a proper
  'required: [...]' array at the parent level
- Adds the missing parent-level required array to get_thirdparty_details
  (which previously had no way to mark id as required in a compliant manner)
- Fixes 5 tools in total: get_thirdparty_details, create_thirdparty,
  update_thirdparty, list_thirdparty_contacts, add_thirdparty_contact

Tested with:
- Claude Desktop Custom Connectors (BETA): tools/list now succeeds
- Claude Code CLI: 32 MCP tools load without 400 errors
---
 htdocs/ai/tools/thirdparty.class.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/ai/tools/thirdparty.class.php b/htdocs/ai/tools/thirdparty.class.php
index 2aea57b8137..2fa9541c612 100644
--- a/htdocs/ai/tools/thirdparty.class.php
+++ b/htdocs/ai/tools/thirdparty.class.php
@@ -72,8 +72,9 @@ class ToolThirdParty extends McpTool
 				"inputSchema" => [
 					"type" => "object",
 					"properties" => [
-						"id" => ["type" => "integer", "required" => true]
-					]
+						"id" => ["type" => "integer", "description" => "The unique numerical ID of the thirdparty."]
+					],
+					"required" => ["id"]
 				]
 			],
 			[
@@ -82,7 +83,7 @@ class ToolThirdParty extends McpTool
 				"inputSchema" => [
 					"type" => "object",
 					"properties" => [
-						"name" => ["type" => "string", "description" => "Name of the thirdparty", "required" => true],
+						"name" => ["type" => "string", "description" => "Name of the thirdparty"],
 						"type" => ["type" => "string", "enum" => ["customer", "prospect", "supplier", "both", "none"], "default" => "customer", "description" => "Type of thirdparty. 'none' means not a customer or prospect."],
 						"email" => ["type" => "string", "description" => "Email address"],
 						"phone" => ["type" => "string", "description" => "Phone number"],
@@ -105,7 +106,7 @@ class ToolThirdParty extends McpTool
 				"inputSchema" => [
 					"type" => "object",
 					"properties" => [
-						"id" => ["type" => "integer", "description" => "The ID of the thirdparty to update.", "required" => true],
+						"id" => ["type" => "integer", "description" => "The ID of the thirdparty to update."],
 						"name" => ["type" => "string", "description" => "The new name for the thirdparty."],
 						"email" => ["type" => "string", "description" => "The new email address."],
 						"phone" => ["type" => "string", "description" => "The new phone number."],
@@ -123,7 +124,7 @@ class ToolThirdParty extends McpTool
 				"inputSchema" => [
 					"type" => "object",
 					"properties" => [
-						"id" => ["type" => "integer", "description" => "The ID of the thirdparty.", "required" => true]
+						"id" => ["type" => "integer", "description" => "The ID of the thirdparty."]
 					],
 					"required" => ["id"]
 				]
@@ -136,11 +137,10 @@ class ToolThirdParty extends McpTool
 					"properties" => [
 						"thirdparty_identifier" => [
 							"type" => ["string", "integer"],
-							"description" => "The ID or name of the thirdparty to add the contact to.",
-							"required" => true
+							"description" => "The ID or name of the thirdparty to add the contact to."
 						],
-						"firstname" => ["type" => "string", "description" => "Contact's first name.", "required" => true],
-						"lastname" => ["type" => "string", "description" => "Contact's last name.", "required" => true],
+						"firstname" => ["type" => "string", "description" => "Contact's first name."],
+						"lastname" => ["type" => "string", "description" => "Contact's last name."],
 						"email" => ["type" => "string", "description" => "Contact's email address."],
 						"phone" => ["type" => "string", "description" => "Contact's phone number."],
 						"role" => ["type" => "string", "description" => "Contact's role or position within the company."]

From 5e3d1a86a06b7665746af357c26dc1aab8dd5f72 Mon Sep 17 00:00:00 2001
From: Pichinov-Jose <jose.martinez@pichinov.com>
Date: Sun, 17 May 2026 21:28:05 +0200
Subject: [PATCH 06/48] New: accept api_key in query string for header-less MCP
 clients (#38292)

The MCP server currently accepts the API key via X-API-Key or
Authorization: Bearer headers only. This works for most MCP clients
(Claude Code CLI, MCP Inspector, mcp-proxy, custom scripts) which let
users configure arbitrary headers.

However, Claude Desktop's "Custom Connectors" feature (currently in
public beta) only exposes OAuth credential fields in its UI. There is
no way for end users to pass a custom X-API-Key or Authorization
header from that client today.

Without a fallback, Claude Desktop users cannot connect to a Dolibarr
MCP server at all (HTTP 401 on every request), even though all other
prerequisites are met.

This patch adds a query-string fallback: ?api_key=XXX or ?key=XXX.
The header-based methods remain preferred and are tried first; the
query string is checked only when no valid header was provided.

Security considerations:
- Query-string credentials appear in webserver access logs and
  potentially in Referer headers. This is documented in an inline
  comment alongside the code.
- Administrators relying on the fallback should restrict access at
  the webserver level (IP allowlist, mTLS, etc.) and/or rotate
  AI_MCP_API_KEY regularly.
- Header-based auth remains the recommended path and is unchanged.

Tested with:
- Claude Desktop Custom Connectors (beta): connection now succeeds
- Claude Code CLI with --header: existing header path unchanged
- curl with both header and query-string: both work
---
 htdocs/ai/server/mcp_server.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/htdocs/ai/server/mcp_server.php b/htdocs/ai/server/mcp_server.php
index b7fd42c1821..10b58ff4399 100644
--- a/htdocs/ai/server/mcp_server.php
+++ b/htdocs/ai/server/mcp_server.php
@@ -76,12 +76,20 @@ $headers = array_change_key_case($headers, CASE_LOWER);
 
 $authHeader   = $headers['authorization'] ?? '';
 $apiKeyHeader = $headers['x-api-key'] ?? '';
+// Fallback: also accept the key in a query string parameter (?api_key=XXX or ?key=XXX).
+// Required for MCP clients that don't support custom auth headers in their connector UI
+// (e.g. Claude Desktop "Custom Connectors" in beta only exposes OAuth fields).
+// SECURITY NOTE: query-string keys appear in webserver access logs and possibly in Referer
+// headers. Header-based auth (X-API-Key / Authorization) remains preferred and is tried first.
+// Administrators relying on the fallback should restrict access at the webserver level
+// and/or rotate AI_MCP_API_KEY regularly.
+$apiKeyQuery  = $_GET['api_key'] ?? $_GET['key'] ?? '';
 $storedKey    = getDolGlobalString('AI_MCP_API_KEY');
 
 $valid = false;
 
 if (!empty($storedKey)) {
-	// X-API-Key
+	// X-API-Key header (preferred)
 	if (!empty($apiKeyHeader)) {
 		$valid = hash_equals($storedKey, $apiKeyHeader);
 	}
@@ -94,6 +102,11 @@ if (!empty($storedKey)) {
 			$valid = hash_equals($storedKey, $token);
 		}
 	}
+
+	// Query-string fallback (last resort for header-less clients)
+	if (!$valid && !empty($apiKeyQuery)) {
+		$valid = hash_equals($storedKey, $apiKeyQuery);
+	}
 }
 
 if (!$valid) {

From 34aa548ba73c393bd5a18965b5a5c95788dd25bd Mon Sep 17 00:00:00 2001
From: Pichinov-Jose <jose.martinez@pichinov.com>
Date: Sun, 17 May 2026 21:50:32 +0200
Subject: [PATCH 07/48] Fix: PDF.js text extraction for PDFs using custom CID
 fonts (TCPDF etc.) (#38297)

The local document parser in ai_assistant.js calls
getDocument({ data: arrayBuffer }) without cMapUrl and
standardFontDataUrl. As a consequence, PDFs that ship with custom
CID fonts referencing ToUnicode CMaps (which is the norm for files
produced by TCPDF, wkhtmltopdf, iText and most server-side
generators) cannot be decoded properly: PDF.js getTextContent()
returns raw glyph codes and the resulting "text" looks like garbled
base64.

This patch passes the two URLs to getDocument(), pointing them at
the jsdelivr CDN package (cdnjs, which is used elsewhere for the
pdf.js bundle itself, does not distribute the cmaps/ and
standard_fonts/ resource directories).

Tested with a TCPDF-generated invoice that previously returned
unreadable base64-like output. Text now extracts cleanly, including
French accented characters.
---
 htdocs/ai/js/ai_assistant.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/htdocs/ai/js/ai_assistant.js b/htdocs/ai/js/ai_assistant.js
index 9b00e48450d..3d3d088abf5 100644
--- a/htdocs/ai/js/ai_assistant.js
+++ b/htdocs/ai/js/ai_assistant.js
@@ -589,7 +589,20 @@ document.addEventListener('DOMContentLoaded', () => {
         try {
             const { getDocument } = await getPdfLib();
             const arrayBuffer = await file.arrayBuffer();
-            const pdf = await getDocument({ data: arrayBuffer }).promise;
+            // cMapUrl + standardFontDataUrl are REQUIRED for PDFs that ship with
+            // custom CID fonts referencing ToUnicode CMaps (extremely common with
+            // generators like TCPDF, wkhtmltopdf, iText, etc.). Without these,
+            // getTextContent() returns raw glyph codes that look like garbled
+            // base64. jsdelivr is used here because cdnjs (used elsewhere for the
+            // pdf.js bundle) does not distribute the cmaps/ and standard_fonts/
+            // resource directories.
+            const PDFJS_RES = 'https://cdn.jsdelivr.net/npm/pdfjs-dist@5.4.149';
+            const pdf = await getDocument({
+                data: arrayBuffer,
+                cMapUrl: PDFJS_RES + '/cmaps/',
+                cMapPacked: true,
+                standardFontDataUrl: PDFJS_RES + '/standard_fonts/',
+            }).promise;
 
             let fullText = "";
             const totalPages = pdf.numPages; // Get total pages

From 23e9dec86e6ac531b064a6775a23f687599d7930 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 17 May 2026 23:42:31 +0200
Subject: [PATCH 08/48] NEW UIUX Intervention - Merge two-step creation form
 into a single unified form (#38284)

* UIUX Intervention - Fix: Merge two-step creation form into a single unified form

* CI

* CI
---
 htdocs/fichinter/card.php | 392 ++++++++++++++++++--------------------
 1 file changed, 189 insertions(+), 203 deletions(-)

diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 869d6b0371a..94ba5059594 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -967,12 +967,14 @@ $help_url = 'EN:Module_Interventions|FR:Module_Fiches_d\'interventions';
 
 llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-fichinter page-card');
 
+// Create new intervention
 if ($action == 'create') {
-	// Create new intervention
-
 	$soc = new Societe($db);
+	if ($socid > 0) {
+		$soc->fetch($socid);
+	}
 
-	print load_fiche_titre($langs->trans("AddIntervention"), '', 'intervention');
+	print load_fiche_titre($langs->trans("NewIntervention"), '', 'intervention');
 
 	if ($error > 0) {
 		dol_htmloutput_errors($mesg);
@@ -980,10 +982,6 @@ if ($action == 'create') {
 		dol_htmloutput_mesg($mesg);
 	}
 
-	if ($socid) {
-		$res = $soc->fetch($socid);
-	}
-
 	if (GETPOST('origin', 'alphanohtml') && GETPOSTINT('originid')) {
 		// Parse element/subelement (ex: project_task)
 		$regs = array();
@@ -1036,6 +1034,8 @@ if ($action == 'create') {
 		}
 	} else {
 		$projectid = GETPOSTINT('projectid');
+		$note_private = GETPOST("note_private", "alpha");
+		$note_public = GETPOST("note_public", "alpha");
 	}
 
 	if (!$conf->global->FICHEINTER_ADDON) {
@@ -1051,206 +1051,192 @@ if ($action == 'create') {
 	//$modFicheinter = new $obj;
 	//$numpr = $modFicheinter->getNextValue($soc, $object);
 
+	print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="socid" value='.$soc->id.'>';
+	print '<input type="hidden" name="action" value="add">';
+	print '<input type="hidden" name="socid" value="'.$soc->id.'">'."\n";
+	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+
+	print dol_get_fiche_head([]);
+
+	print '<table class="border centpercent">';
+
+	// Ref
+	print '<tr><td class="fieldrequired">'.$langs->trans('Ref').'</td><td>'.$langs->trans("Draft").'</td></tr>';
+
+	// Ref customer
+	print '<tr class="field_ref_client"><td class="titlefieldcreate">'.$langs->trans('RefCustomer').'</td><td class="valuefieldcreate">';
+	print '<input type="text" name="ref_client" value="'.GETPOST('ref_client').'"></td>';
+	print '</tr>';
+
+	// Thirdparty
+	print '<tr>';
+	print '<td class="fieldrequired">'.$langs->trans('ThirdParty').'</td>';
 	if ($socid > 0) {
-		$soc = new Societe($db);
-		$soc->fetch($socid);
-
-		print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
-		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="socid" value='.$soc->id.'>';
-		print '<input type="hidden" name="action" value="add">';
-		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-
-		print dol_get_fiche_head([]);
-
-		print '<table class="border centpercent">';
-
-		print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("ThirdParty").'</td><td>'.$soc->getNomUrl(1).'</td></tr>';
-
-		// Ref
-		print '<tr><td class="fieldrequired">'.$langs->trans('Ref').'</td><td>'.$langs->trans("Draft").'</td></tr>';
-
-		// Ref customer
-		print '<tr class="field_ref_client"><td class="titlefieldcreate">'.$langs->trans('RefCustomer').'</td><td class="valuefieldcreate">';
-		print '<input type="text" name="ref_client" value="'.GETPOST('ref_client').'"></td>';
-		print '</tr>';
-
-		// Description (must be a textarea and not html must be allowed (used in list view)
-		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>';
 		print '<td>';
-		print '<textarea name="description" class="quatrevingtpercent" rows="'.ROWS_3.'">'.GETPOST('description').'</textarea>';
-		print '</td></tr>';
-
-		// Project
-		if (isModEnabled('project')) {
-			$formproject = new FormProjets($db);
-
-			$langs->load("project");
-
-			print '<tr><td>'.$langs->trans("Project").'</td><td>';
-			/* Fix: If a project must be linked to any companies (suppliers or not), project must be not be set as limited to customer but must be not linked to any particular thirdparty
-			if ($societe->fournisseur==1)
-				$numprojet=select_projects(-1, GETPOST("projectid", 'int'), 'projectid');
-			else
-				$numprojet=select_projects($societe->id, GETPOST("projectid", 'int'), 'projectid');
-				*/
-			$numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0, 'maxwidth500 widthcentpercentminusxx');
-			if ($numprojet == 0) {
-				print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddProject").'"></span></a>';
-			}
-			print '</td></tr>';
-		}
-
-		// Category
-		if (isModEnabled('category')) {
-			// Categories
-			print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
-			print $form->selectCategories(Categorie::TYPE_FICHINTER, 'categories', $object);
-			print "</td></tr>";
-		}
-
-		// Contract
-		if (isModEnabled('contract') && is_object($formcontract)) {
-			// This feature hang the application on large list of contracts, because the select component is not complete: it does not work like select of thirdparty or product to support large lists
-			// So we add a hidden option to avoid to have it used and the application locked, until the select_contract is fixed.
-			if (getDolGlobalString("CONTRACT_CAN_USE_THE_BUGGED_SELECT_COMPONENT")) {
-				$langs->load("contracts");
-				print '<tr><td>'.$langs->trans("Contract").'</td><td>';
-				$numcontrat = $formcontract->select_contract($soc->id, GETPOSTINT('contratid'), 'contratid', 0, 1, 1);
-				if ($numcontrat == 0) {
-					print ' &nbsp; <a href="'.DOL_URL_ROOT.'/contrat/card.php?socid='.$soc->id.'&action=create"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddContract").'"></span></a>';
-				}
-				print '</td></tr>';
-			}
-		}
-
-		// Model
-		$liste = ModelePDFFicheinter::liste_modeles($db);
-		if (count($liste) > 0) {
-			print '<tr>';
-			print '<td>'.$langs->trans("DefaultModel").'</td>';
-			print '<td>';
-			print $form->selectarray('model', $liste, getDolGlobalString('FICHEINTER_ADDON_PDF'));
-			print "</td></tr>";
-		}
-
-		// Public note
-		print '<tr>';
-		print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
-		print '<td>';
-		$doleditor = new DolEditor('note_public', (string) $note_public, '', 80, 'dolibarr_notes', 'In', false, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_3, '90%');
-		print $doleditor->Create(1);
-		//print '<textarea name="note_public" cols="80" rows="'.ROWS_3.'">'.$note_public.'</textarea>';
-		print '</td></tr>';
-
-		// Private note
-		if (empty($user->socid)) {
-			print '<tr>';
-			print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
-			print '<td>';
-			$doleditor = new DolEditor('note_private', (string) $note_private, '', 80, 'dolibarr_notes', 'In', false, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_3, '90%');
-			print $doleditor->Create(1);
-			//print '<textarea name="note_private" cols="80" rows="'.ROWS_3.'">'.$note_private.'</textarea>';
-			print '</td></tr>';
-		}
-
-		// Other attributes
-		$parameters = array();
-		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-		print $hookmanager->resPrint;
-		if (empty($reshook)) {
-			print $object->showOptionals($extrafields, 'create');
-		}
-
-		// Show link to origin object
-		if (!empty($origin) && !empty($originid) && is_object($objectsrc)) {
-			$newclassname = $classname;
-			if ($newclassname == 'Propal') {
-				$langs->load('propal');
-				$newclassname = 'CommercialProposal';
-			}
-			print '<tr><td>'.$langs->trans($newclassname).'</td><td colspan="2">'.$objectsrc->getNomUrl(1).'</td></tr>';
-
-			// Amount
-			/* Hide amount because we only copy services so amount may differ than source
-			print '<tr><td>' . $langs->trans('AmountHT') . '</td><td>' . price($objectsrc->total_ht) . '</td></tr>';
-			print '<tr><td>' . $langs->trans('AmountVAT') . '</td><td>' . price($objectsrc->total_tva) . "</td></tr>";
-			if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0) 		// Localtax1 RE
-			{
-				print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td><td>' . price($objectsrc->total_localtax1) . "</td></tr>";
-			}
-
-			if ($mysoc->localtax2_assuj == "1" || $objectsrc->total_localtax2 != 0) 		// Localtax2 IRPF
-			{
-				print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td><td>' . price($objectsrc->total_localtax2) . "</td></tr>";
-			}
-
-			print '<tr><td>' . $langs->trans('AmountTTC') . '</td><td>' . price($objectsrc->total_ttc) . "</td></tr>";
-
-			if (isModEnabled("multicurrency"))
-			{
-				print '<tr><td>' . $langs->trans('MulticurrencyAmountHT') . '</td><td>' . price($objectsrc->multicurrency_total_ht) . '</td></tr>';
-				print '<tr><td>' . $langs->trans('MulticurrencyAmountVAT') . '</td><td>' . price($objectsrc->multicurrency_total_tva) . "</td></tr>";
-				print '<tr><td>' . $langs->trans('MulticurrencyAmountTTC') . '</td><td>' . price($objectsrc->multicurrency_total_ttc) . "</td></tr>";
-			}
-			*/
-		}
-
-		print '</table>';
-
-		if (is_object($objectsrc)) {
-			print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
-			print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
-		} elseif ($origin == 'project' && !empty($projectid)) {
-			print '<input type="hidden" name="projectid" value="'.$projectid.'">';
-		}
-
-		print dol_get_fiche_end();
-
-		print $form->buttonsSaveCancel("CreateDraftIntervention");
-
-		// Show origin lines
-		if (!empty($origin) && !empty($originid) && is_object($objectsrc) && !getDolGlobalInt('FICHINTER_DISABLE_DETAILS')) {
-			$title = $langs->trans('Services');
-			print load_fiche_titre($title);
-
-			print '<div class="div-table-responsive-no-min">';
-			print '<table class="noborder centpercent">';
-
-			$objectsrc->printOriginLinesList(!getDolGlobalString('FICHINTER_PRINT_PRODUCTS') ? 'services' : ''); // Show only service, except if option FICHINTER_PRINT_PRODUCTS is on
-
-			print '</table>';
-			print '</div>';
-		}
-
-		print '</form>';
+		print $soc->getNomUrl(1);
+		print '<input type="hidden" name="socid" value="'.$soc->id.'">';
+		print '</td>';
 	} else {
-		print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
-		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="action" value="create">';		// We go back to create action
-		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-
-		print dol_get_fiche_head([]);
-
-		if (is_object($objectsrc)) {
-			print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
-			print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
-		} elseif ($origin == 'project' && !empty($projectid)) {
-			print '<input type="hidden" name="projectid" value="'.$projectid.'">';
-		}
-		print '<table class="border centpercent">';
-		print '<tr><td class="fieldrequired">'.$langs->trans("ThirdParty").'</td><td>';
-		print $form->select_company('', 'socid', '', 'SelectThirdParty', 1, 0, array(), 0, 'minwidth300');
-		print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&customer=3&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddThirdParty").'"></span></a>';
-		print '</td></tr>';
-		print '</table>';
-
-		print dol_get_fiche_end();
-
-		print $form->buttonsSaveCancel("CreateDraftIntervention");
-
-		print '</form>';
+		print '<td>';
+		print img_picto('', 'company', 'class="pictofixedwidth"');
+		print $form->select_company('', 'socid', '', 'SelectThirdParty', 1, 0, array(), 0, 'minwidth150 widthcentpercentminusxx maxwidth500');
+		print ' <a href="'.dolBuildUrl(DOL_URL_ROOT . '/societe/card.php', ['action' => 'create', 'customer' => 3, 'backtopage' => dolBuildUrl($_SERVER["PHP_SELF"], ['action' => 'create'])]).'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddThirdParty").'"></span></a>';
+		print '</td>';
 	}
+	print '</tr>'."\n";
+
+	// Description (must be a textarea and not html must be allowed (used in list view)
+	print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>';
+	print '<td>';
+	print '<textarea name="description" class="quatrevingtpercent" rows="'.ROWS_3.'">'.GETPOST('description').'</textarea>';
+	print '</td></tr>';
+
+	// Project
+	if (isModEnabled('project')) {
+		$formproject = new FormProjets($db);
+
+		$langs->load("project");
+
+		print '<tr><td>'.$langs->trans("Project").'</td><td>';
+		print img_picto('', 'project', 'class="pictofixedwidth"');
+		/* Fix: If a project must be linked to any companies (suppliers or not), project must be not be set as limited to customer but must be not linked to any particular thirdparty
+		if ($societe->fournisseur==1)
+			$numprojet=select_projects(-1, GETPOST("projectid", 'int'), 'projectid');
+		else
+			$numprojet=select_projects($societe->id, GETPOST("projectid", 'int'), 'projectid');
+		*/
+		$numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0, 'maxwidth500 widthcentpercentminusxx');
+		if ($numprojet == 0) {
+			print ' &nbsp; <a href="' . dolBuildUrl(DOL_URL_ROOT . '/projet/card.php', ['socid' => $soc->id, 'action' => 'create', 'status' => 1, 'backtopage' => dolBuildUrl($_SERVER["PHP_SELF"], ['action' => 'create', 'socid' => $soc->id])]) . '"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddProject").'"></span></a>';
+		}
+		print '</td></tr>';
+	}
+
+	// Category
+	if (isModEnabled('category')) {
+		// Categories
+		print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
+		print $form->selectCategories(Categorie::TYPE_FICHINTER, 'categories', $object);
+		print "</td></tr>";
+	}
+
+	// Contract
+	if (isModEnabled('contract') && is_object($formcontract)) {
+		// This feature hang the application on large list of contracts, because the select component is not complete: it does not work like select of thirdparty or product to support large lists
+		// So we add a hidden option to avoid to have it used and the application locked, until the select_contract is fixed.
+		if (getDolGlobalString("CONTRACT_CAN_USE_THE_BUGGED_SELECT_COMPONENT")) {
+			$langs->load("contracts");
+			print '<tr><td>'.$langs->trans("Contract").'</td><td>';
+			$numcontrat = $formcontract->select_contract($soc->id, GETPOSTINT('contratid'), 'contratid', 0, 1, 1);
+			if ($numcontrat == 0) {
+				print ' &nbsp; <a href="'.DOL_URL_ROOT.'/contrat/card.php?socid='.$soc->id.'&action=create"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddContract").'"></span></a>';
+			}
+			print '</td></tr>';
+		}
+	}
+
+	// Model
+	$liste = ModelePDFFicheinter::liste_modeles($db);
+	if (count($liste) > 0) {
+		print '<tr>';
+		print '<td>'.$langs->trans("DefaultModel").'</td>';
+		print '<td>';
+		print $form->selectarray('model', $liste, getDolGlobalString('FICHEINTER_ADDON_PDF'));
+		print "</td></tr>";
+	}
+
+	// Public note
+	print '<tr>';
+	print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
+	print '<td>';
+	$doleditor = new DolEditor('note_public', (string) $note_public, '', 80, 'dolibarr_notes', 'In', false, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_3, '90%');
+	print $doleditor->Create(1);
+	//print '<textarea name="note_public" cols="80" rows="'.ROWS_3.'">'.$note_public.'</textarea>';
+	print '</td></tr>';
+
+	// Private note
+	if (empty($user->socid)) {
+		print '<tr>';
+		print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
+		print '<td>';
+		$doleditor = new DolEditor('note_private', (string) $note_private, '', 80, 'dolibarr_notes', 'In', false, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_3, '90%');
+		print $doleditor->Create(1);
+		//print '<textarea name="note_private" cols="80" rows="'.ROWS_3.'">'.$note_private.'</textarea>';
+		print '</td></tr>';
+	}
+
+	// Other attributes
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	if (empty($reshook)) {
+		print $object->showOptionals($extrafields, 'create');
+	}
+
+	// Show link to origin object
+	if (!empty($origin) && !empty($originid) && is_object($objectsrc)) {
+		$newclassname = $classname;
+		if ($newclassname == 'Propal') {
+			$langs->load('propal');
+			$newclassname = 'CommercialProposal';
+		}
+		print '<tr><td>'.$langs->trans($newclassname).'</td><td colspan="2">'.$objectsrc->getNomUrl(1).'</td></tr>';
+
+		// Amount
+		/* Hide amount because we only copy services so amount may differ than source
+		print '<tr><td>' . $langs->trans('AmountHT') . '</td><td>' . price($objectsrc->total_ht) . '</td></tr>';
+		print '<tr><td>' . $langs->trans('AmountVAT') . '</td><td>' . price($objectsrc->total_tva) . "</td></tr>";
+		if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0) 		// Localtax1 RE
+		{
+			print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td><td>' . price($objectsrc->total_localtax1) . "</td></tr>";
+		}
+
+		if ($mysoc->localtax2_assuj == "1" || $objectsrc->total_localtax2 != 0) 		// Localtax2 IRPF
+		{
+			print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td><td>' . price($objectsrc->total_localtax2) . "</td></tr>";
+		}
+
+		print '<tr><td>' . $langs->trans('AmountTTC') . '</td><td>' . price($objectsrc->total_ttc) . "</td></tr>";
+
+		if (isModEnabled("multicurrency"))
+		{
+			print '<tr><td>' . $langs->trans('MulticurrencyAmountHT') . '</td><td>' . price($objectsrc->multicurrency_total_ht) . '</td></tr>';
+			print '<tr><td>' . $langs->trans('MulticurrencyAmountVAT') . '</td><td>' . price($objectsrc->multicurrency_total_tva) . "</td></tr>";
+			print '<tr><td>' . $langs->trans('MulticurrencyAmountTTC') . '</td><td>' . price($objectsrc->multicurrency_total_ttc) . "</td></tr>";
+		}
+		*/
+	}
+
+	print '</table>';
+
+	if (is_object($objectsrc)) {
+		print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
+		print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
+	} elseif ($origin == 'project' && !empty($projectid)) {
+		print '<input type="hidden" name="projectid" value="'.$projectid.'">';
+	}
+
+	print dol_get_fiche_end();
+
+	print $form->buttonsSaveCancel("CreateDraftIntervention");
+
+	// Show origin lines
+	if (!empty($origin) && !empty($originid) && is_object($objectsrc) && !getDolGlobalInt('FICHINTER_DISABLE_DETAILS')) {
+		$title = $langs->trans('Services');
+		print load_fiche_titre($title);
+
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder centpercent">';
+
+		$objectsrc->printOriginLinesList(!getDolGlobalString('FICHINTER_PRINT_PRODUCTS') ? 'services' : ''); // Show only service, except if option FICHINTER_PRINT_PRODUCTS is on
+
+		print '</table>';
+		print '</div>';
+	}
+
+	print '</form>';
 } elseif ($id > 0 || !empty($ref)) {
 	// View mode
 

From 95b57550d30c937105a408de64f27e1788d3c862 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 17 May 2026 23:55:13 +0200
Subject: [PATCH 09/48] Fix curl direct use is forbidden. Must use
 getUrlContent().

---
 htdocs/ai/class/llmadapter.class.php | 33 +++++++++++-----------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/htdocs/ai/class/llmadapter.class.php b/htdocs/ai/class/llmadapter.class.php
index b897f3d8402..4138e585d7d 100644
--- a/htdocs/ai/class/llmadapter.class.php
+++ b/htdocs/ai/class/llmadapter.class.php
@@ -195,29 +195,22 @@ class UniversalLLMAdapter
 	 */
 	private function curl(string $url, array $data, array $headers, bool $isClaude = false, bool $isGemini = false): ?string
 	{
-		$ch = curl_init($url);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt($ch, CURLOPT_POST, true);
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 
-		$payload = json_encode($data);
-		if ($payload === false) {
-			return "Error: Failed to encode JSON payload.";
+		// By default, we accept only external endpoints ($dolibarr_ai_allow_local_endpoints is not set).
+		// To allow local endpoints, we must set $dolibarr_ai_allow_local_endpoints to 1 or 2 in conf.php.
+		global $dolibarr_ai_allow_local_endpoints;
+		$localurl = $dolibarr_ai_allow_local_endpoints ?? 0;
+
+		$result = getURLContent($url, 'POST', json_encode($data), 1, $headers, array('http', 'https'), $localurl);
+
+		$this->lastResponse = (string) $result['content'];
+
+		if (!empty($result['curl_error_no'])) {
+			return "Error: " . $result['curl_error_msg'];
 		}
-		curl_setopt($ch, CURLOPT_POSTFIELDS, $payload);
-		curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-		curl_setopt($ch, CURLOPT_TIMEOUT, $this->timeout);
 
-		$res = curl_exec($ch);
-		$this->lastResponse = (string) $res;
-
-		if (curl_errno($ch)) {
-			$error = curl_error($ch);
-			curl_close($ch);
-			return "Error: " . $error;
-		}
-		curl_close($ch);
-
-		$json = json_decode((string) $res, true);
+		$json = json_decode((string) (string) $result['content'], true);
 
 		if ($json === null && json_last_error() !== JSON_ERROR_NONE) {
 			return "Error: Invalid JSON response from API.";

From f8fba7906338edc8f052484a1b750f1bf3cc76a1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 17 May 2026 23:57:26 +0200
Subject: [PATCH 10/48] Doc

---
 AGENTS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AGENTS.md b/AGENTS.md
index ae8314bd540..5ffcf545c57 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -13,6 +13,7 @@ This project is full sources of Dolibarr ERP and CRM application. Every modifica
 - ❌ Do not break compatibility of PHP functions and methods
 - ❌ Do not introduce external dependencies without validation
 - ❌ Separate page actions in the `/* Actions */` section of the PHP code and the rendering part in the `/* Views */` section
+- ❌ Never use PHP native curl functions to call a GET or POST URL, but use instead the Dolibarr function getURLContent()
 - ✅ Use Dolibarr hooks whenever possible
 - ✅ Respect existing naming conventions
 

From 8edded0e140709e08bf172cf522d8f2dd354a7d7 Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <github@jonb.dk>
Date: Sun, 17 May 2026 23:59:35 +0200
Subject: [PATCH 11/48] New show linked member status on Thirdparty card
 (#38308)

Co-authored-by: Jon Bendtsen <jonbendtsen@jonb.dk>
---
 htdocs/societe/card.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 4c28f86c02e..eee2f624182 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -3482,6 +3482,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				if ($result > 0) {
 					$adh->ref = $adh->getFullName($langs);
 					print $adh->getNomUrl(-1);
+					print ' &mdash; '.$adh->getLibStatut(0);
 				} else {
 					print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
 				}

From f9e3058145282fcbb3c0d9dba8bb9711d847d31c Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <github@jonb.dk>
Date: Mon, 18 May 2026 00:02:31 +0200
Subject: [PATCH 12/48] NEW add text field to search for label (#38306)

* NEW add text field to search for label

* PHAN fix #16134 - remove unused variable

---------

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

diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 381bedc23bf..e1e0e74454e 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -138,7 +138,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('socid' => isset($socid) ? $socid : null);
+$parameters = array('socid' => null);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -480,7 +480,7 @@ if (!empty($arrayfields['d.login']['checked'])) {
 
 if (!empty($arrayfields['c.note']['checked'])) {
 	print '<td class="liste_titre">';
-	print '';
+	print '<input class="flat maxwidth100" type="text" name="search_note" value="'.dol_escape_htmltag($search_note).'"></td>';
 	print '</td>';
 }
 

From 325000c398e5cbb9de567c99704deb10a03abbae Mon Sep 17 00:00:00 2001
From: Pichinov-Jose <jose.martinez@pichinov.com>
Date: Mon, 18 May 2026 00:04:14 +0200
Subject: [PATCH 13/48] Fix: get_sales_report respects the group_by parameter
 (#38303)

The get_sales_report tool declares a group_by parameter with enum
values [thirdparty, product, month] in its inputSchema, but the
implementation ignored $args['group_by'] entirely and always
returned a flat list of invoices.

Meanwhile getPurchaseReport() in the same class already implemented
the correct grouped pattern (s.nom or DATE_FORMAT date) -- this
patch ports that pattern to getSalesReport(), with three modes:

- With a socid: detailed invoice list for that customer (unchanged
  behavior, kept for backward compatibility).

- Without socid, group_by=thirdparty (default): aggregate by
  customer with COUNT and SUM(total_ttc) -> Top-customers report.

- Without socid, group_by=month: aggregate by DATE_FORMAT(datef,
  '%Y-%m') -> monthly revenue report.

- Without socid, group_by=product: aggregate by product reference
  via INNER JOIN on facturedet, with COALESCE(p.ref, fd.description)
  so free-text lines without a product link still appear under
  their description. SUM(fd.total_ttc) gives per-product revenue,
  COUNT(DISTINCT f.rowid) gives the number of invoices that
  contained the product.

Tested:
- group_by=thirdparty: top customers correctly ranked by total.
- group_by=month: 2026-04 and 2026-05 buckets correctly populated.
- group_by=product: top product (SAM-BIK3-CAS-1430-24-N) correctly
  ranked at 1 276 EUR over 5 invoices.
- With socid: unchanged detailed listing.

Note: the 'product' grouping is also missing from getPurchaseReport()
in the current code. That can be addressed in a follow-up patch on
the same pattern.
---
 htdocs/ai/tools/reports.class.php | 158 ++++++++++++++++++++----------
 1 file changed, 105 insertions(+), 53 deletions(-)

diff --git a/htdocs/ai/tools/reports.class.php b/htdocs/ai/tools/reports.class.php
index f795579b795..738eb244866 100644
--- a/htdocs/ai/tools/reports.class.php
+++ b/htdocs/ai/tools/reports.class.php
@@ -230,77 +230,129 @@ class ToolReports extends McpTool
 	{
 		global $langs;
 
-		$langs->loadLangs(array("main", "bills", "companies"));
+		$langs->loadLangs(array("main", "bills", "companies", "products"));
 
-		$limit = isset($args['limit']) ? (int) $args['limit'] : 50;
+		$limit     = isset($args['limit']) ? (int) $args['limit'] : 50;
 		$dateStart = dol_stringtotime($args['date_start']);
-		$dateEnd = dol_stringtotime($args['date_end']);
-		$socid = $this->resolveThirdparty($args);
-
-		$sql = "SELECT f.rowid, f.ref, f.total_ttc, f.fk_statut, f.paye, f.datef, s.nom
-				FROM " . MAIN_DB_PREFIX . "facture as f
-				LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON f.fk_soc = s.rowid
-				WHERE f.entity IN (" . getEntity('facture') . ")";
-
-		$sql .= " AND f.datef >= '" . $this->db->idate($dateStart) . "'";
-		$sql .= " AND f.datef <= '" . $this->db->idate($dateEnd) . "'";
+		$dateEnd   = dol_stringtotime($args['date_end']);
+		$socid     = $this->resolveThirdparty($args);
+		$groupBy   = isset($args['group_by']) ? (string) $args['group_by'] : 'thirdparty';
 
+		$list      = [];
+		$totalSum  = 0.0;
 		// Status Filter: Valid (1) and Paid (2). Exclude Draft (0) and Abandoned (3).
-		$sql .= " AND f.fk_statut IN (1, 2)";
+		$dateRange = " AND f.datef >= '" . $this->db->idate($dateStart)
+			. "' AND f.datef <= '" . $this->db->idate($dateEnd)
+			. "' AND f.fk_statut IN (1, 2)";
 
+		// CASE 1 -- Detailed list for a specific thirdparty.
 		if ($socid) {
-			$sql .= " AND f.fk_soc = " . (int) $socid;
-		}
+			$sql = "SELECT f.rowid, f.ref, f.total_ttc, f.fk_statut, f.paye, f.datef, s.nom FROM "
+				. MAIN_DB_PREFIX . "facture as f LEFT JOIN "
+				. MAIN_DB_PREFIX . "societe as s ON f.fk_soc = s.rowid WHERE f.entity IN ("
+				. getEntity('facture') . ")"
+				. $dateRange
+				. " AND f.fk_soc = " . (int) $socid
+				. " ORDER BY f.datef DESC LIMIT " . ((int) $limit);
 
-		$sql .= " ORDER BY f.datef DESC LIMIT " . ((int) $limit);
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				while ($r = $this->db->fetch_object($resql)) {
+					$totalSum += (float) $r->total_ttc;
 
-		$resql = $this->db->query($sql);
-		$list = [];
-		$totalSum = 0.0;
+					$statusLabel = $langs->transnoentitiesnoconv("Unknown");
+					if ($r->fk_statut == 1 && $r->paye == 0) {
+						$statusLabel = $langs->transnoentitiesnoconv("BillStatusNotPaid");
+					} elseif ($r->fk_statut == 1 && $r->paye == 1) {
+						$statusLabel = $langs->transnoentitiesnoconv("BillStatusStarted");
+					} elseif ($r->fk_statut == 2) {
+						$statusLabel = $langs->transnoentitiesnoconv("BillStatusPaid");
+					}
 
-		if ($resql) {
-			while ($r = $this->db->fetch_object($resql)) {
-				$totalSum += (float) $r->total_ttc;
+					$url     = DOL_URL_ROOT . "/compta/facture/card.php?id=" . $r->rowid;
+					$refHtml = '<a href="' . $url . '">' . $r->ref . '</a>';
 
-				// Determine Localized Status
-				$statusLabel = $langs->transnoentitiesnoconv("Unknown");
-				if ($r->fk_statut == 1 && $r->paye == 0) {
-					$statusLabel = $langs->transnoentitiesnoconv("BillStatusNotPaid");
-				} elseif ($r->fk_statut == 1 && $r->paye == 1) {
-					$statusLabel = $langs->transnoentitiesnoconv("BillStatusStarted");
-				} elseif ($r->fk_statut == 2) {
-					$statusLabel = $langs->transnoentitiesnoconv("BillStatusPaid");
+					$list[] = [
+						$langs->transnoentitiesnoconv("Ref")      => $refHtml,
+						$langs->transnoentitiesnoconv("Date")     => dol_print_date($this->db->jdate($r->datef), 'day'),
+						$langs->transnoentitiesnoconv("Customer") => $r->nom,
+						$langs->transnoentitiesnoconv("Amount")   => price($r->total_ttc),
+						$langs->transnoentitiesnoconv("Status")   => $statusLabel
+					];
 				}
-
-				// Build relative URL
-				$url = DOL_URL_ROOT . "/compta/facture/card.php?id=" . $r->rowid;
-
-				// Make Ref clickable
-				$refHtml = '<a href="' . $url . '">' . $r->ref . '</a>';
-
-				$list[] = [
-					$langs->transnoentitiesnoconv("Ref") => $refHtml,
-					$langs->transnoentitiesnoconv("Date") => dol_print_date($this->db->jdate($r->datef), 'day'),
-					$langs->transnoentitiesnoconv("Customer") => $r->nom,
-					$langs->transnoentitiesnoconv("Amount") => price($r->total_ttc),
-					$langs->transnoentitiesnoconv("Status") => $statusLabel
-				];
+				$this->db->free($resql);
+			}
+		} else {
+			// CASE 2 -- Global grouped report.
+			// Mirrors the pattern already used by getPurchaseReport(); previous implementation
+			// of getSalesReport() ignored $groupBy entirely and always returned a flat list.
+			$sanitizedSqlGroup = '';
+			$colName           = '';
+			$sqlJoin           = " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON f.fk_soc = s.rowid";
+
+			if ($groupBy === 'month') {
+				$sanitizedSqlGroup = "DATE_FORMAT(f.datef, '%Y-%m')";
+				$colName           = $langs->transnoentitiesnoconv("Month");
+			} elseif ($groupBy === 'product') {
+				// Aggregate on product line items. Lines without product_id fall back to their description.
+				$sanitizedSqlGroup = "COALESCE(p.ref, fd.description, '?')";
+				$colName           = $langs->transnoentitiesnoconv("Product");
+				$sqlJoin .= " INNER JOIN " . MAIN_DB_PREFIX . "facturedet as fd ON fd.fk_facture = f.rowid LEFT JOIN "
+					. MAIN_DB_PREFIX . "product as p ON fd.fk_product = p.rowid";
+			} else {
+				// Default: group by customer
+				$sanitizedSqlGroup = "s.nom";
+				$colName           = $langs->transnoentitiesnoconv("Customer");
+			}
+
+			// For product grouping we sum line totals (more accurate per-product);
+			// otherwise we sum the invoice total_ttc.
+			$amountExpr = ($groupBy === 'product') ? "SUM(fd.total_ttc)" : "SUM(f.total_ttc)";
+			$countExpr  = ($groupBy === 'product') ? "COUNT(DISTINCT f.rowid)" : "COUNT(f.rowid)";
+
+			$sql = "SELECT " . $sanitizedSqlGroup . " as group_key, "
+				. $amountExpr . " as total_amount, "
+				. $countExpr . " as count_inv FROM "
+				. MAIN_DB_PREFIX . "facture as f"
+				. $sqlJoin
+				. " WHERE f.entity IN (" . getEntity('facture') . ")"
+				. $dateRange
+				. " GROUP BY group_key ORDER BY total_amount DESC LIMIT "
+				. ((int) max(1, $limit));
+
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				while ($r = $this->db->fetch_object($resql)) {
+					$totalSum += (float) $r->total_amount;
+					$list[] = [
+						$colName                                  => $r->group_key ? $r->group_key : $langs->transnoentitiesnoconv('Unknown'),
+						$langs->transnoentitiesnoconv("Number")   => (int) $r->count_inv,
+						$langs->transnoentitiesnoconv("Amount")   => price($r->total_amount)
+					];
+				}
+				$this->db->free($resql);
 			}
-			$this->db->free($resql);
 		}
 
 		if (empty($list)) {
 			return [[$langs->transnoentitiesnoconv("Info") => $langs->transnoentitiesnoconv("NoRecordFound")]];
 		}
 
-		// Append Total Row
-		$list[] = [
-			$langs->transnoentitiesnoconv("Ref") => $langs->transnoentitiesnoconv("Total"),
-			$langs->transnoentitiesnoconv("Date") => "",
-			$langs->transnoentitiesnoconv("Customer") => "",
-			$langs->transnoentitiesnoconv("Amount") => price($totalSum),
-			$langs->transnoentitiesnoconv("Status") => ""
-		];
+		// Append Total Row (shape depends on detailed-vs-grouped path)
+		if ($socid) {
+			$list[] = [
+				$langs->transnoentitiesnoconv("Ref")      => $langs->transnoentitiesnoconv("Total"),
+				$langs->transnoentitiesnoconv("Date")     => "",
+				$langs->transnoentitiesnoconv("Customer") => "",
+				$langs->transnoentitiesnoconv("Amount")   => price($totalSum),
+				$langs->transnoentitiesnoconv("Status")   => ""
+			];
+		} else {
+			$list[] = [
+				$langs->transnoentitiesnoconv("Total")  => $langs->transnoentitiesnoconv("Total"),
+				$langs->transnoentitiesnoconv("Amount") => price($totalSum)
+			];
+		}
 
 		return $list;
 	}

From fd8d0e36464ddba0352da6eedb886ea463438e70 Mon Sep 17 00:00:00 2001
From: Pichinov-Jose <jose.martinez@pichinov.com>
Date: Mon, 18 May 2026 00:06:22 +0200
Subject: [PATCH 14/48] New: log MCP tools/call invocations to
 llx_ai_request_log (#38302)

The AI Assistant web UI (parse_intent.php) persists every request to
llx_ai_request_log via ai_log_request() in ai.lib.php. Administrators
can browse the resulting log via the existing Log Viewer
(htdocs/ai/admin/log_viewer.php).

The MCP HTTP server (mcp_server.php) does NOT call this helper. As a
result, external MCP client activity (Claude Desktop, Claude Code CLI,
MCP Inspector, custom scripts, etc.) is invisible to administrators
-- only dol_syslog() entries land in documents/dolibarr.log, which
is much harder to filter and audit.

This patch adds an mcp_log_request() helper alongside the existing
auth/dispatch logic in mcp_server.php. The helper:

- Persists every tools/call invocation to llx_ai_request_log
- Filters out lifecycle methods (initialize, ping,
  notifications/initialized, tools/list, ...) to avoid log spam
- Logs with provider='mcp' so administrators can filter MCP traffic
  in the Log Viewer
- Captures the tool name + arguments, success/error status, raw
  request payload and raw response payload
- Charges the elapsed time per-call (also per-call inside batches)

The helper is gated by the same AI_LOG_REQUESTS toggle that already
controls the web UI logging -- no new admin setting introduced.

Tested with: search_products, create_other_document, search_invoice,
get_sales_report from Claude Desktop and Claude Code CLI -- each
call appears as a new row in the Log Viewer with the right tool name,
status, payloads, and elapsed time.
---
 htdocs/ai/server/mcp_server.php | 74 +++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)

diff --git a/htdocs/ai/server/mcp_server.php b/htdocs/ai/server/mcp_server.php
index 10b58ff4399..854170c07f6 100644
--- a/htdocs/ai/server/mcp_server.php
+++ b/htdocs/ai/server/mcp_server.php
@@ -146,8 +146,74 @@ if ($userId > 0) {
 	exit;
 }
 
+// Load the AI request log helper so we can persist tools/call invocations to
+// llx_ai_request_log (same table the AI Assistant web UI logs to). This gives
+// administrators a single place to audit external MCP client activity.
+require_once DOL_DOCUMENT_ROOT . '/ai/lib/ai.lib.php';
+
+/**
+ * Persist an MCP tools/call invocation to the llx_ai_request_log table.
+ * Mirrors what parse_intent.php does for the web AI Assistant.
+ * Only tools/call is logged -- lifecycle methods (initialize, ping,
+ * notifications/initialized, tools/list, ...) are skipped to avoid noise.
+ *
+ * @param array<string,mixed> $req         The JSON-RPC request
+ * @param mixed               $resp        The JSON-RPC response (null for notifications)
+ * @param float               $tStart      microtime(true) captured before processing
+ * @param string              $rawInput    Raw request body
+ * @return void
+ */
+function mcp_log_request(array $req, $resp, float $tStart, string $rawInput): void
+{
+	global $db, $serviceUser;
+
+	$method = isset($req['method']) ? (string) $req['method'] : '';
+	if ($method !== 'tools/call' || !function_exists('ai_log_request')) {
+		return;
+	}
+
+	$params   = isset($req['params']) && is_array($req['params']) ? $req['params'] : [];
+	$toolName = isset($params['name']) ? (string) $params['name'] : '';
+	$toolArgs = isset($params['arguments']) ? $params['arguments'] : [];
+
+	$argsJson = is_string($toolArgs) ? $toolArgs : (string) json_encode($toolArgs);
+	$query    = '[MCP] ' . $toolName . ' ' . dol_substr($argsJson, 0, 1000);
+
+	$responseShape = ['tool' => $toolName, 'arguments' => $toolArgs];
+
+	$status   = 'Success';
+	$errorMsg = '';
+	if (is_array($resp) && isset($resp['error'])) {
+		$status   = 'Error';
+		$errorMsg = is_array($resp['error']) && isset($resp['error']['message'])
+			? (string) $resp['error']['message']
+			: (string) json_encode($resp['error']);
+	} elseif (is_array($resp) && isset($resp['result']['isError']) && $resp['result']['isError']) {
+		$status   = 'Error';
+		$errorMsg = is_array($resp['result']['content'] ?? null) ? (string) json_encode($resp['result']['content']) : '';
+	}
+
+	$rawResStr = is_string($resp) ? $resp : (string) json_encode($resp);
+
+	ai_log_request(
+		$db,
+		$serviceUser,
+		$query,
+		$responseShape,
+		'mcp',
+		microtime(true) - $tStart,
+		1.0,
+		$status,
+		$errorMsg,
+		$rawInput,
+		$rawResStr
+	);
+}
+
 // Request handling
 try {
+	$tStart = microtime(true);
+
 	// Basic payload size limit
 	$rawInput = file_get_contents('php://input');
 	if ($rawInput === false || strlen($rawInput) > 1024 * 1024) {
@@ -181,11 +247,15 @@ try {
 				continue;
 			}
 
+			$reqStart = microtime(true);
 			$res = $server->handleRequest($req);
 
 			if ($res !== null) {
 				$responses[] = $res;
 			}
+
+			// Log each tools/call separately so the admin log viewer shows them individually.
+			mcp_log_request($req, $res, $reqStart, (string) json_encode($req));
 		}
 
 		echo json_encode($responses);
@@ -200,6 +270,10 @@ try {
 		if ($response !== null) {
 			echo json_encode($response);
 		}
+
+		// Log this tools/call to llx_ai_request_log (no-op unless AI_LOG_REQUESTS is enabled
+		// and the method is tools/call).
+		mcp_log_request($request, $response, $tStart, $rawInput);
 	}
 } catch (Exception $e) {
 	dol_syslog(

From d0df12ab8116fba15bd831db86717555920944d6 Mon Sep 17 00:00:00 2001
From: Pichinov-Jose <jose.martinez@pichinov.com>
Date: Mon, 18 May 2026 00:08:47 +0200
Subject: [PATCH 15/48] Qual: preserve full tool descriptions for modern LLMs
 (#38301)

cleanToolSchemaForLLM() truncates each tool description to 3 words
whenever the schema has more than 20 tools. This heuristic likely
made sense for GPT-3.5 (4K context window) but is harmful with the
current crop of LLMs:

- Gemini 2.5 Flash: 1M token context
- GPT-4o: 128K
- Claude Sonnet: 1M

Three words per description is far too aggressive and actively
breaks tool selection. For example:

- create_other_document  -> "Create documents other"
- create_sales_order     -> "Create a CUSTOMER"
- add_line_item          -> "Add a single"

The LLM then has no way to know that create_other_document is what
should be used for supplier_invoice, or that add_line_item modifies
an EXISTING draft. We've observed Gemini concluding that
"supplier_invoice creation is not available" because the truncated
description didn't mention it.

Two complementary changes:

1. Raise the threshold from 20 to 100 -- this effectively disables
   compression for normal installs (~30 tools) while leaving a
   safety net for very large custom installs that register dozens
   of additional tools via the addMcpTools hook.

2. Even when compression IS active, never touch the tool-level
   description. Parameter-level compression (stripping defaults,
   descriptions of optional fields, collapsing complex objects)
   still applies and continues to save tokens. The right answer
   for truly oversized schemas is to filter the toolset upstream
   (which filterToolsProfessional() already does), not to mutilate
   each tool's description.

Tested with: a 30-tool schema sent in full now allows the LLM to
correctly select create_other_document with object_type
'supplier_invoice', 'proposal' and 'supplier_proposal' --
previously it returned a "feature not available" message.
---
 htdocs/ai/assistant/parse_intent.php | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/htdocs/ai/assistant/parse_intent.php b/htdocs/ai/assistant/parse_intent.php
index 897f524f110..1cfc8c9b762 100644
--- a/htdocs/ai/assistant/parse_intent.php
+++ b/htdocs/ai/assistant/parse_intent.php
@@ -270,7 +270,16 @@ try {
 		}
 
 		// If we are sending a lot of tools (Non-Latin or Fallback), we strip descriptions.
-		$isLargeSchema = count($toolsSchema) > 20;
+		// The 20-tool threshold was likely chosen for GPT-3.5 (4K context window). Modern
+		// LLMs handle the full schema trivially: Gemini 2.5 Flash has a 1M token context,
+		// GPT-4o has 128K, Claude Sonnet has 1M. Compression hurts more than it helps
+		// today because it also truncates tool *descriptions* (down to 3 words), which
+		// breaks tool selection (e.g. "create_other_document" becomes "Create documents
+		// other" -- the LLM then thinks supplier_invoice creation is not available).
+		// We raise the threshold to 100 to effectively disable compression for the
+		// default install (~30 tools), while still leaving a safety net for very large
+		// custom installs that register dozens of additional addMcpTools hooks.
+		$isLargeSchema = count($toolsSchema) > 100;
 		$toolsForLLM = cleanToolSchemaForLLM($toolsSchema, $isLargeSchema);
 
 		// Build System Prompt
@@ -727,12 +736,15 @@ function cleanToolSchemaForLLM(array $tools, bool $isLargeSchema = false)
 	$cleaned = [];
 
 	foreach ($tools as $tool) {
-		// Tool Description: Max 3 words
+		// Tool descriptions are how the LLM selects the right tool -- never truncate
+		// them, even when the schema is large. Truncating to 3 words ("Create documents
+		// other", "Add a single") breaks tool selection. If the schema really is too
+		// big for the chosen model, the right answer is to filter the toolset before
+		// it reaches the LLM (which is what filterToolsProfessional() already does
+		// upstream of this function), not to mutilate each tool's description.
+		// Parameter-level compression (stripping defaults, descriptions of optional
+		// fields, etc.) remains gated on $isLargeSchema below.
 		$desc = $tool['description'];
-		if ($isLargeSchema) {
-			$words = explode(' ', $desc);
-			$desc = implode(' ', array_slice($words, 0, 3));
-		}
 
 		// Get parameters
 		$toolParams = $tool['parameters'] ?? $tool['inputSchema'] ?? [];

From 5ae36d72bdfd6aa160a5e61305d2036cd4107dad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 18 May 2026 00:14:00 +0200
Subject: [PATCH 16/48] Trans

---
 htdocs/langs/en_US/admin.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 9bfda85b1d9..607c2517949 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2825,7 +2825,7 @@ ViewLogs=View Logs
 DisableMCPAI=Turn off to completely disable AI access to MCP server
 EnableMCPServer=Enable MCP Server
 EnableLogging=Enable Request Logging
-ObfuscatePIIData=Obfuscate PII Data
+ObfuscatePIIData=Obfuscate Prompt Data
 AIRequestLogs=AI Request Logs
 ErrorTableNotExists=Table %s does not exist
 PleaseRunSQLToEnableLogging=Please run the following SQL to enable logging

From 2cf81fe6361706c4695ec816bd4420aa3308e0dc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 18 May 2026 00:37:43 +0200
Subject: [PATCH 17/48] Debug v24

---
 htdocs/ai/admin/server_mcp.php | 37 ++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/htdocs/ai/admin/server_mcp.php b/htdocs/ai/admin/server_mcp.php
index b914d41676d..59827e32945 100644
--- a/htdocs/ai/admin/server_mcp.php
+++ b/htdocs/ai/admin/server_mcp.php
@@ -223,6 +223,7 @@ print ajax_constantonoff('AI_MCP_ENABLED', array(), null, 0, 0, 1);
 //print '</table>';
 print '</div>';
 
+print '<br>';
 print '<br>';
 
 if (getDolGlobalString('AI_MCP_ENABLED')) {
@@ -237,21 +238,22 @@ if (getDolGlobalString('AI_MCP_ENABLED')) {
 
 	// Input Mode
 	print '<tr class="oddeven">';
-	print '<td>Default Interface Mode</td>';
+	print '<td>';
+	print $form->textwithpicto('Default Interface', $langs->trans("InputMethodHelp"));
+	print '</td>';
 	print '<td>';
 	$input_modes = [
-		'text' => '💬 ' . $langs->trans('OptionTextOnly'),
-		'native' => '☁️ ' . $langs->trans('OptionCloudFast') . ' - ' . $langs->trans('OptionCloudFasthelp'),
-		'whisper' => '🔒 ' . $langs->trans('OptionWhisperLocal') . ' - ' . $langs->trans('OptionWhisperLocalhelp')
+		'text' => $langs->trans('OptionTextOnly'),
+		'native' => $langs->trans('OptionCloudFast') . ' - ' . $langs->trans('OptionCloudFasthelp'),
+		'whisper' => $langs->trans('OptionWhisperLocal') . ' - ' . $langs->trans('OptionWhisperLocalhelp')
 	];
 	print $form->selectarray('AI_DEFAULT_INPUT_MODE', $input_modes, getDolGlobalString('AI_DEFAULT_INPUT_MODE'), 0, 0, 0);
-	print '<br><span class="opacitymedium small">' . $langs->trans("InputMethodHelp") . '</span>';
 	print '</td>';
 	print '</tr>';
 
 	// Enhanced Privacy control
 	print '<tr class="oddeven">';
-	print '<td class="titlefield" width="30%">' . $langs->trans('ObfuscatePIIData') . '</td>';
+	print '<td>' . $langs->trans('ObfuscatePIIData') . '</td>';
 	print '<td>';
 	print ajax_constantonoff('AI_PRIVACY_REDACTION');
 	print ' <span class="opacitymedium">' . $langs->trans("RedactionHelp") . '</span>';
@@ -260,8 +262,7 @@ if (getDolGlobalString('AI_MCP_ENABLED')) {
 
 	// Confirmation Level
 	print '<tr class="oddeven">';
-	print '<td class="titlefield" width="30%">' . $langs->trans("AskConfirmation");
-	print ' <span class="fa fa-info-circle" title="' . $langs->trans("AskConfirmationHelp") . '"></span></td>';
+	print '<td>' . $form->textwithpicto($langs->trans("AskConfirmation"), $langs->trans("AskConfirmationHelp")).'</td>';
 	print '<td>';
 	$confirmation_options = [
 		'0' => $langs->trans("ConfirmNever"),
@@ -274,7 +275,7 @@ if (getDolGlobalString('AI_MCP_ENABLED')) {
 
 	// Logging
 	print '<tr class="oddeven">';
-	print '<td class="titlefield" width="30%">' . $langs->trans('EnableLogging') . '</td>';
+	print '<td>' . $langs->trans('EnableLogging') . '</td>';
 	print '<td>';
 	print ajax_constantonoff('AI_LOG_REQUESTS');
 	print ' <a href="' . DOL_URL_ROOT . '/ai/admin/log_viewer.php" target="_blank" class="button" style="padding-top: 4px; padding-bottom: 4px;">View Logs</a>';
@@ -283,7 +284,7 @@ if (getDolGlobalString('AI_MCP_ENABLED')) {
 
 	print '<tr class="oddeven">';
 	print '<td>' . $langs->trans("LogRetention") . '</td>';
-	print '<td><input type="number" name="AI_LOG_RETENTION" value="' . getDolGlobalInt('AI_LOG_RETENTION', 30) . '" size="5"> (0 = Forever)</td>';
+	print '<td><input class="width50" type="number" name="AI_LOG_RETENTION" value="' . getDolGlobalInt('AI_LOG_RETENTION', 30) . '"> (0 = Forever)</td>';
 	print '</tr>';
 
 	// System Prompt
@@ -302,6 +303,8 @@ if (getDolGlobalString('AI_MCP_ENABLED')) {
 	print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
 	print '</form>';
 
+	print '<br>';
+	print '<br>';
 
 
 	// AI Provider Config and Connection testing
@@ -332,11 +335,11 @@ if (getDolGlobalString('AI_MCP_ENABLED')) {
 
 		print '</div>';
 	}
-	print '</div>';
-	print '</form>';
+
+	print '<br><br>';
 
 	// External Access Configuration
-	print load_fiche_titre($langs->trans("AiMcpExternalAccess"), '', 'fas fa-lock-open text-danger');
+	print load_fiche_titre($langs->trans("AiMcpExternalAccess"), '', 'fas fa-lock-open');
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -362,11 +365,10 @@ if (getDolGlobalString('AI_MCP_ENABLED')) {
 	print '<td>';
 	if ($apiKey) {
 		print '<input type="text" id="apikey" value="'.$apiKey.'" readonly style="width:400px; padding:6px; background:#f4f4f4; border:1px solid #ccc; color:#555;">';
-		print ' <button type="button" class="button small" onclick="navigator.clipboard.writeText(document.getElementById(\'apikey\').value)">' . $langs->trans("Copy") . '</button>';
-		print ' <a class="button" href="'.$_SERVER["PHP_SELF"].'?action=generate_key&token='.newToken().'">Generate New Key</a>';
+		print ' <a class="button smallpaddingimp" href="'.$_SERVER["PHP_SELF"].'?action=generate_key&token='.newToken().'">Generate New Key</a>';
 	} else {
 		print '<span class="opacitymedium">' . $langs->trans("NoKeyWarning") . '</span>';
-		print ' <a class="button" href="' . $_SERVER["PHP_SELF"] . '?action=generate_key&token=' . newToken() . '">' . $langs->trans("GenerateKey") . '</a>';
+		print ' <a class="button smallpaddingimp" href="' . $_SERVER["PHP_SELF"] . '?action=generate_key&token=' . newToken() . '">' . $langs->trans("GenerateKey") . '</a>';
 	}
 	print '</td>';
 	print '</tr>';
@@ -390,7 +392,8 @@ if (getDolGlobalString('AI_MCP_ENABLED')) {
 	print '<div style="background:#fcfcfc; border:1px solid #eee; padding:15px; border-radius:5px;">';
 	print '<strong>' . $langs->trans("ClaudeDesktopConfig") . '</strong><br>';
 	print '<pre style="background:#333; color:#fff; padding:10px; border-radius:4px; overflow:auto; margin-top:10px;">';
-	echo htmlspecialchars('{
+	echo htmlspecialchars('
+	{
 	  "mcpServers": {
 	    "dolibarr": {
 	      "command": "node",

From 034647c6536f5c8f0dee544e8e314f23756759e8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 18 May 2026 01:00:27 +0200
Subject: [PATCH 18/48] NEW Add picto "AI assistant"

---
 htdocs/main.inc.php                | 7 +++++++
 htdocs/theme/eldy/dropdown.inc.php | 2 +-
 htdocs/theme/md/dropdown.inc.php   | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index e63b1517ff2..5b4efadbe7f 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2727,6 +2727,13 @@ function top_menu_quickadd()
 
 	$html = '';
 
+	if (isModEnabled('ai')) {
+		$html .= '<!-- div for quick ai link -->
+	    <div id="topmenu-tool" class="atoplogin dropdown inline-block">
+	        <a accesskey="i" class="nofocusvisible" href="'.DOL_URL_ROOT.'/ai/assistant/index.php" title="'.$langs->trans('AI').' ('.$conf->browser->stringforfirstkey.' i)"><i class="fa fa-magic"></i></a>
+	    </div>';
+	}
+
 	if (!empty($conf->use_javascript_ajax)) {
 		$html .= '<!-- div for quick add link -->
     <div id="topmenu-quickadd-dropdown" class="atoplogin dropdown inline-block">
diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php
index cdbc21f1acc..0022849ce7b 100644
--- a/htdocs/theme/eldy/dropdown.inc.php
+++ b/htdocs/theme/eldy/dropdown.inc.php
@@ -330,7 +330,7 @@ a.top-menu-dropdown-link {
 	border-radius: 0;
 }
 
-
+#topmenu-tool,
 #topmenu-global-search-dropdown,
 #topmenu-quickadd-dropdown,
 #topmenu-bookmark-dropdown,
diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php
index 1d30b792077..deaa85a8578 100644
--- a/htdocs/theme/md/dropdown.inc.php
+++ b/htdocs/theme/md/dropdown.inc.php
@@ -347,7 +347,7 @@ a.top-menu-dropdown-link {
 	border-radius: 0;
 }
 
-
+#topmenu-tool,
 #topmenu-login-dropdown,
 #topmenu-quickadd-dropdown,
 #topmenu-bookmark-dropdown,

From e735bed12426ebe66211831b29e1a0f52d5758e4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 18 May 2026 01:09:26 +0200
Subject: [PATCH 19/48] Add AI assistant in top menu #38307

---
 htdocs/main.inc.php              | 45 ++++++++++++++++++++++++--------
 htdocs/theme/md/dropdown.inc.php |  2 +-
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 5b4efadbe7f..e29f90b9f62 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2261,14 +2261,17 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 			$toprightmenu .= top_menu_search();
 		}
 
+		// Add AI picto
+		$toprightmenu .= top_menu_ai();
+
+		// Add bookmark dropdown
+		$toprightmenu .= top_menu_bookmark();
+
 		if (getDolGlobalString('MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN')) {
 			// Add the quick add object dropdown
 			$toprightmenu .= top_menu_quickadd();
 		}
 
-		// Add bookmark dropdown
-		$toprightmenu .= top_menu_bookmark();
-
 		if (getDolGlobalString('MAIN_USE_TOP_MENU_IMPORT_FILE')) {
 			// Add the import file link
 			$toprightmenu .= top_menu_importfile();
@@ -2710,6 +2713,33 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 	return $btnUser;
 }
 
+/**
+ * Build the tooltip on top menu quick add.
+ * Called when option MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN is set
+ *
+ * @return  string                  HTML content
+ */
+function top_menu_ai()
+{
+	global $conf, $langs;
+
+	// Button disabled on text browser
+	/*if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
+		return '';
+	}*/
+
+	$html = '';
+
+	if (isModEnabled('ai')) {
+		$html .= '<!-- div for quick ai link -->
+	    <div id="topmenu-tool" class="atoplogin dropdown inline-block">
+	        <a accesskey="a" class="nofocusvisible" href="'.DOL_URL_ROOT.'/ai/assistant/index.php" title="'.$langs->trans('AI').' ('.$conf->browser->stringforfirstkey.' a)"><i class="fa fa-magic"></i></a>
+	    </div>';
+	}
+
+	return $html;
+}
+
 /**
  * Build the tooltip on top menu quick add.
  * Called when option MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN is set
@@ -2727,17 +2757,10 @@ function top_menu_quickadd()
 
 	$html = '';
 
-	if (isModEnabled('ai')) {
-		$html .= '<!-- div for quick ai link -->
-	    <div id="topmenu-tool" class="atoplogin dropdown inline-block">
-	        <a accesskey="i" class="nofocusvisible" href="'.DOL_URL_ROOT.'/ai/assistant/index.php" title="'.$langs->trans('AI').' ('.$conf->browser->stringforfirstkey.' i)"><i class="fa fa-magic"></i></a>
-	    </div>';
-	}
-
 	if (!empty($conf->use_javascript_ajax)) {
 		$html .= '<!-- div for quick add link -->
     <div id="topmenu-quickadd-dropdown" class="atoplogin dropdown inline-block">
-        <a accesskey="a" class="dropdown-toggle login-dropdown-a nofocusvisible" data-toggle="dropdown" href="#" title="'.$langs->trans('QuickAdd').' ('.$conf->browser->stringforfirstkey.' a)"><i class="fa fa-plus-circle"></i></a>
+        <a accesskey="c" class="dropdown-toggle login-dropdown-a nofocusvisible" data-toggle="dropdown" href="#" title="'.$langs->trans('QuickAdd').' ('.$conf->browser->stringforfirstkey.' c)"><i class="fa fa-plus-circle"></i></a>
         <div class="dropdown-menu">'.printDropdownQuickadd().'</div>
     </div>';
 		if (!defined('JS_JQUERY_DISABLE_DROPDOWN')) {    // This may be set by some pages that use different jquery version to avoid errors
diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php
index deaa85a8578..8776970fd8d 100644
--- a/htdocs/theme/md/dropdown.inc.php
+++ b/htdocs/theme/md/dropdown.inc.php
@@ -51,7 +51,7 @@ button.dropdown-item.global-search-item {
 	display: block;
 }
 
-
+#topmenu-tool a,
 #topmenu-global-search-dropdown a.login-dropdown-a,
 #topmenu-quickadd-dropdown a.login-dropdown-a,
 #topmenu-bookmark-dropdown a.login-dropdown-a,

From dbae20fb5e29d67aeecce972531889872d01fcdd Mon Sep 17 00:00:00 2001
From: Pichinov-Jose <jose.martinez@pichinov.com>
Date: Mon, 18 May 2026 01:14:03 +0200
Subject: [PATCH 20/48] Fix: ToolCrudObjects header inputSchema JSON Schema
 compliance (#38299)

create_customer_invoice and create_other_document declare a 'header'
object whose schema has 'required: [socid]' but no 'properties'
entry. This is technically allowed by JSON Schema but stricter
validators flag it as suspicious: the 'required' array references a
property that is not declared in 'properties'.

Beyond compliance, the omission means LLMs (and human reviewers) have
no machine-readable description of which fields are actually accepted
in the 'header' object. The Dolibarr backend already accepts socid,
date, duree_validite, note_public, note_private and others -- this
patch documents the most useful ones explicitly so consumer tools
can produce richer payloads.

Tested with: create_other_document object_type=proposal accepting
a 'header' that contains all of socid + date + duree_validite +
note_public -> all four fields are correctly mapped to the Propal
object (Dolibarr already accepts unknown properties via dynamic
property assignment, so this is purely a schema-documentation change).
---
 htdocs/ai/tools/crud_objects.class.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/htdocs/ai/tools/crud_objects.class.php b/htdocs/ai/tools/crud_objects.class.php
index 7c57d92a11f..c8634bd3735 100644
--- a/htdocs/ai/tools/crud_objects.class.php
+++ b/htdocs/ai/tools/crud_objects.class.php
@@ -196,6 +196,12 @@ If user says 'order' without any qualifier, they mean a SALES ORDER - use this t
 						"header" => [
 							"type" => "object",
 							"description" => "Invoice header data. Must include 'socid' (Customer ID).",
+							"properties" => [
+								"socid" => ["type" => "integer", "description" => "Customer ID (Thirdparty ID)"],
+								"date" => ["type" => "string", "description" => "Invoice date (YYYY-MM-DD)"],
+								"note_public" => ["type" => "string", "description" => "Public note"],
+								"note_private" => ["type" => "string", "description" => "Private note"]
+							],
 							"required" => ["socid"]
 						],
 						"lines" => [
@@ -233,6 +239,13 @@ If user says 'order' without any qualifier, they mean a SALES ORDER - use this t
 						"header" => [
 							"type" => "object",
 							"description" => "Header data. Must include 'socid'.",
+							"properties" => [
+								"socid" => ["type" => "integer", "description" => "Thirdparty ID (Customer for proposal, Supplier for supplier_*)"],
+								"date" => ["type" => "string", "description" => "Document date (YYYY-MM-DD)"],
+								"duree_validite" => ["type" => "integer", "description" => "Validity in days (proposal only)"],
+								"note_public" => ["type" => "string", "description" => "Public note"],
+								"note_private" => ["type" => "string", "description" => "Private note"]
+							],
 							"required" => ["socid"]
 						],
 						"lines" => [

From 6ee5130f24954ae4e0db567f4cd922117abd717b Mon Sep 17 00:00:00 2001
From: Pichinov-Jose <jose.martinez@pichinov.com>
Date: Mon, 18 May 2026 01:15:23 +0200
Subject: [PATCH 21/48] Fix: parse_intent.php model resolution (array default
 and wrong constant) (#38300)

Two bugs combined to make UniversalLLMAdapter::__construct() crash with:

  TypeError: Argument #4 ($model) must be of type string, array given

at parse_intent.php line 301 when the user-configured model wasn't
properly read.

(1) Wrong shape assumption -- getListOfAIServices() declares model
defaults as a NESTED array of the form:

    $servicesList[$key]['textgeneration'] = ['default' => 'model-name']

The previous code read $servicesList[$key]['textgeneration'] (without
['default']) and got the inner array back. That array was then passed
as the $defModel fallback to a (string)-typed constructor argument.

(2) Wrong constant -- the admin UI ("Prompt and custom AI models" tab
in setup.php) stores the per-function model under
AI_API_<SERVICE>_MODEL_TEXT, matching the convention already used by
Ai::generateContent() for the same data. The previous code read
AI_API_<SERVICE>_MODEL (no _TEXT suffix), which is never written by
that form. So the user-configured model was silently ignored and we
fell back to the (array) default from bug #1.

Together these two bugs reliably reproduced the TypeError on any
default install of the AI module where the user had set a custom
text model via the admin UI.

This patch:

- Walks $servicesList[$key]['textgeneration'] correctly (extracting
  ['default'] when it's an array, accepting strings for backward
  compat).
- Tries AI_API_<SERVICE>_MODEL_TEXT first (the constant the admin
  UI writes), and falls back to the legacy AI_API_<SERVICE>_MODEL
  for compatibility with anyone who might have set it manually.
- Defensively coerces the final value to a string and falls back to
  the default if for any reason it's still not a string.

Tested with google (gemini-2.5-flash) and chatgpt configured via
the admin UI -> UniversalLLMAdapter receives a string and the
AI request goes through.
---
 htdocs/ai/assistant/parse_intent.php | 30 ++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/htdocs/ai/assistant/parse_intent.php b/htdocs/ai/assistant/parse_intent.php
index 1cfc8c9b762..cfb04707ad7 100644
--- a/htdocs/ai/assistant/parse_intent.php
+++ b/htdocs/ai/assistant/parse_intent.php
@@ -302,8 +302,34 @@ try {
 
 		$defUrl = $servicesList[$serviceKey]['url'] ?? '';
 		$url = getDolGlobalString('AI_API_' . strtoupper($serviceKey) . '_URL') ?: $defUrl;
-		$defModel = $servicesList[$serviceKey]['textgeneration'] ?? 'gpt-4o-mini';
-		$model = getDolGlobalString('AI_API_' . strtoupper($serviceKey) . '_MODEL') ?: $defModel;
+		// The model defaults declared in getListOfAIServices() are nested:
+		//   $servicesList[$key]['textgeneration'] = ['default' => 'model-name']
+		// Reading 'textgeneration' without ['default'] returns the inner array, which
+		// then fails the (string) type-hint of UniversalLLMAdapter's 4th argument with:
+		//   "Argument #4 ($model) must be of type string, array given"
+		//
+		// The admin UI (htdocs/ai/admin/setup.php "Prompt and custom AI models" tab) also
+		// stores the per-function model under AI_API_<SERVICE>_MODEL_TEXT (matching the
+		// convention already used by Ai::generateContent() for the same data). The
+		// previous lookup used AI_API_<SERVICE>_MODEL which is never written by that
+		// form, so the user-configured model was silently ignored.
+		$rawDefault = $servicesList[$serviceKey]['textgeneration'] ?? null;
+		if (is_array($rawDefault)) {
+			$defModel = $rawDefault['default'] ?? 'gpt-4o-mini';
+		} else {
+			$defModel = $rawDefault ?: 'gpt-4o-mini';
+		}
+		$prefix = 'AI_API_' . strtoupper($serviceKey);
+		$model = getDolGlobalString($prefix . '_MODEL_TEXT')
+			?: getDolGlobalString($prefix . '_MODEL')
+			?: $defModel;
+		// Defensive: coerce to string if anyone stored an array in this constant
+		if (is_array($model)) {
+			$model = $model['default'] ?? $defModel;
+		}
+		if (!is_string($model) || $model === '') {
+			$model = (string) $defModel;
+		}
 		$adapterType = $servicesList[$serviceKey]['adapter_type'] ?? 'openai';
 
 		if (!empty($apiKey)) {

From 0e591afe34ee27eac62ebdb2e45eea6917237222 Mon Sep 17 00:00:00 2001
From: Pichinov-Jose <jose.martinez@pichinov.com>
Date: Mon, 18 May 2026 01:16:01 +0200
Subject: [PATCH 22/48] Fix: allow free-text invoice/order/proposal lines when
 no product matches (#38298)

ToolCrudObjects::processAddLine() uses the line's 'description' as a
fallback product identifier when 'product' is not explicitly provided.
It then calls findProduct() to look up an existing Dolibarr product
by ref/barcode/label.

When no product matches (the common case for AI-generated lines that
describe a one-off service or a custom item), findProduct() returns
an error array and the function aborts WITHOUT ever calling addline().
The resulting document gets its header created but ends up with zero
lines and a 0.00 total.

This is contrary to standard Dolibarr behavior: free-text line items
(no product link, just a description and a price) are a first-class
feature of invoices, orders, and proposals.

This patch distinguishes between the two cases:

- Caller explicitly passed 'product': they wanted a specific product
  -> still abort with the original error if not found (unchanged).

- Caller only passed 'description': it's a free-text line ->
  silently fall through with $prod = null. Dolibarr then creates a
  free-text line with the user-provided description, qty, unit_price
  and vat_rate.

Tested with: create_other_document object_type=proposal containing
11 line items, none of which match existing product references ->
all 11 lines are now created with their correct totals (previously
the document was created with 0 lines and a 0.00 total).
---
 htdocs/ai/tools/crud_objects.class.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/htdocs/ai/tools/crud_objects.class.php b/htdocs/ai/tools/crud_objects.class.php
index c8634bd3735..9b5f25e1fda 100644
--- a/htdocs/ai/tools/crud_objects.class.php
+++ b/htdocs/ai/tools/crud_objects.class.php
@@ -552,8 +552,17 @@ If user says 'order' without any qualifier, they mean a SALES ORDER - use this t
 		if ($productIdentifier !== '') {
 			$findResult = $this->findProduct($productIdentifier);
 			if (is_array($findResult) && isset($findResult['error'])) {
-				// Ensure the return array matches the expected shape by adding 'success' => false
-				return array_merge(['success' => false], $findResult);
+				// Only abort if the caller EXPLICITLY asked for a product (via the 'product'
+				// argument). If they only provided a free-text 'description', we silently
+				// fall through with $prod = null so Dolibarr creates a free-text line item,
+				// which is a perfectly valid Dolibarr feature.
+				// Previous behaviour aborted ALL line creations whose description didn't
+				// match an existing product reference, which broke AI-driven creation of
+				// invoices/orders/proposals from one-off line descriptions.
+				if (isset($args['product'])) {
+					return array_merge(['success' => false], $findResult);
+				}
+				// fall through: $prod stays null
 			}
 			if (is_object($findResult)) {
 				$prod = $findResult;

From cdaff511478bb5eb28fa9feb03e6b502b9fb3e19 Mon Sep 17 00:00:00 2001
From: Pichinov-Jose <jose.martinez@pichinov.com>
Date: Mon, 18 May 2026 01:16:32 +0200
Subject: [PATCH 23/48] Fix: FactureFournisseur::addline parameter order in
 ToolCrudObjects (#38295)

Unlike Facture::addline() which takes ($desc, $pu, $qty, $txtva, ...),
FactureFournisseur::addline() uses a different parameter order:

  ($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty,
   $fk_product, $remise_percent, ...)

i.e. $qty is in position 6, not 3.

ToolCrudObjects::processAddLine() was calling
FactureFournisseur::addline() with the Facture order, which produced:

- our $qty (1) passed as $txtva  -> effective VAT rate 1%
- our $vat (20) passed as $txlocaltax1 -> wrong local tax
- a hardcoded 0 passed as $qty -> the line was inserted with
  qty=0 and silently dropped from the visible totals

The result: every supplier invoice created via create_other_document
ended up with the header correctly created but a 0.00 EUR total,
with no error returned (lines_added was reported as success).

This patch reorders the parameters to match the actual
FactureFournisseur::addline() signature and adds an inline comment
to warn future maintainers about this Dolibarr API quirk.

Other addline calls in the same switch (invoice/order/proposal,
supplier_order/supplier_proposal) use their respective correct
signatures already and are unaffected.

Tested with: create_other_document object_type=supplier_invoice
with one line (qty=1, unit_price=10, vat_rate=20) -> line now
appears with Total HT 10.00 EUR.
---
 htdocs/ai/tools/crud_objects.class.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/htdocs/ai/tools/crud_objects.class.php b/htdocs/ai/tools/crud_objects.class.php
index 9b5f25e1fda..61933736148 100644
--- a/htdocs/ai/tools/crud_objects.class.php
+++ b/htdocs/ai/tools/crud_objects.class.php
@@ -621,7 +621,14 @@ If user says 'order' without any qualifier, they mean a SALES ORDER - use this t
 			$res = $object->addline($desc, $price, $qty, $vat, 0, 0, $fkProduct, $discount, 'HT', 0, 0, $prodType);
 		} elseif ($docType === 'supplier_invoice') {
 			/** @var FactureFournisseur $object */
-			$res = $object->addline($desc, $price, $qty, $vat, 0, 0, $fkProduct, $discount, 0, 0, '', 0, 'HT', 0, $prodType);
+			// IMPORTANT: FactureFournisseur::addline() does NOT share the same signature
+			// as Facture::addline(). Its parameter order is:
+			//   ($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product, $remise_percent, ...)
+			// i.e. $qty is in position 6, not 3 (unlike customer Facture / Commande / Propal).
+			// The previous call passed our $qty as $txtva (-> a 1% VAT rate) and our $vat
+			// as $txlocaltax1, and position 6 ended up being a hardcoded 0 -> a line was
+			// inserted with qty=0, which Dolibarr silently dropped from the visible totals.
+			$res = $object->addline($desc, $price, $vat, 0, 0, $qty, $fkProduct, $discount, '', '', 0, 0, 'HT', $prodType);
 		} elseif ($docType === 'supplier_order') {
 			/** @var CommandeFournisseur $object */
 			$res = $object->addline($desc, $price, $qty, $vat, 0, 0, $fkProduct, $discount, 0, 0, 'HT', 0, '', '', $prodType);

From 5d851934d565afe9d9c65d1cff9b41577b935248 Mon Sep 17 00:00:00 2001
From: Pichinov-Jose <jose.martinez@pichinov.com>
Date: Mon, 18 May 2026 01:17:39 +0200
Subject: [PATCH 24/48] Fix: Ai::generateContent uses Google Gemini native API
 for google provider (#38296)

The Ai class currently builds every outbound request in OpenAI's
chat/completions shape, regardless of the configured provider.
This works for OpenAI-compatible backends (chatgpt, mistral, groq,
custom) but breaks the 'google' provider, whose native API differs
on all four key dimensions:

- URL path: /v1beta/models/<model>:generateContent
  (not /v1beta/chat/completions)
- Payload root: 'contents' / 'parts' / optional 'system_instruction'
  (not 'messages')
- Auth header: x-goog-api-key
  (not Authorization: Bearer)
- Response shape: candidates[0].content.parts[*].text
  (not choices[0].message.content)

As a result, every call to Gemini via Ai::generateContent() ended
with HTTP 404 (wrong path) or unparsed response data.

This patch makes Ai::generateContent() emit the native Gemini shape
when $this->apiService === 'google':

1. URL: after $model is resolved, suffix
   /models/<urlencoded model>:generateContent
   (and skip the /chat/completions suffix entirely for google)

2. Payload:
     {
       "contents": [
         {"role": "user", "parts": [{"text": <full prompt>}]}
       ],
       "system_instruction": {"parts": [{"text": <pre-prompt>}]}
     }

3. Header: x-goog-api-key: <key> (no Bearer)

4. Response parsing: concatenate
   candidates[0].content.parts[*].text

All other providers go through the existing OpenAI-compat branches
unchanged. No behavioral change for chatgpt, mistral, groq,
anthropic-compat, or custom endpoints.

Tested with: gemini-2.5-flash end-to-end via the AI Assistant web
UI (textgeneration). HTTP 200 with valid JSON output.
---
 htdocs/ai/class/ai.class.php | 69 ++++++++++++++++++++++++++++++------
 1 file changed, 58 insertions(+), 11 deletions(-)

diff --git a/htdocs/ai/class/ai.class.php b/htdocs/ai/class/ai.class.php
index 3bd792c5e5e..a5396347ec8 100644
--- a/htdocs/ai/class/ai.class.php
+++ b/htdocs/ai/class/ai.class.php
@@ -140,7 +140,14 @@ class Ai
 				$this->apiEndpoint .= (preg_match('/\/$/', $this->apiEndpoint) ? '' : '/').'threads';
 			} else {	// if $function == 'docparsing', 'text...', ...
 				$this->apiEndpoint = getDolGlobalString('AI_API_'.strtoupper($this->apiService).'_URL', $arrayofai[$this->apiService]['url']);
-				$this->apiEndpoint .= (preg_match('/\/$/', $this->apiEndpoint) ? '' : '/').'chat/completions';
+				if ($this->apiService == 'google') {
+					// Google Gemini native API: the /models/<model>:generateContent suffix is
+					// appended later (once $model has been resolved). The OpenAI-style
+					// /chat/completions does not exist on the native Gemini endpoint.
+					$this->apiEndpoint = rtrim($this->apiEndpoint, '/');
+				} else {
+					$this->apiEndpoint .= (preg_match('/\/$/', $this->apiEndpoint) ? '' : '/').'chat/completions';
+				}
 			}
 		}
 		if ($moreendpoint) {
@@ -170,6 +177,12 @@ class Ai
 			}
 		}
 
+		// Google Gemini: append /models/<model>:generateContent now that $model is resolved.
+		if ($this->apiService == 'google' && !in_array($function, array('file', 'assistant', 'thread'))
+			&& strpos($this->apiEndpoint, ':generateContent') === false) {
+			$this->apiEndpoint .= '/models/'.rawurlencode($model).':generateContent';
+		}
+
 		dol_syslog("Call API for apiKey=".substr($this->apiKey, 0, 5).'***********, apiEndpoint='.$this->apiEndpoint.", model=".$model.", format=".$format);
 		if (getDolGlobalString("AI_DEBUG")) {
 			if (@is_writable($dolibarr_main_data_root)) {	// Avoid fatal error on fopen with open_basedir
@@ -269,18 +282,33 @@ class Ai
 					"top_p": 0.95
 				}*/
 
-				$arrayforpayload = array(
-					'messages' => array(array('role' => 'user', 'content' => $fullInstructions)),
-					'model' => $model,
-				);
-
 				// Add a system message
 				$addDateTimeContext = false;
 				if ($addDateTimeContext) {		// @phpstan-ignore-line
 					$prePrompt = ($prePrompt ? $prePrompt.(preg_match('/[\.\!\?]$/', $prePrompt) ? '' : '.').' ' : '').'Today we are '.dol_print_date(dol_now(), 'dayhourtext');
 				}
-				if ($prePrompt) {
-					$arrayforpayload['messages'][] = array('role' => 'system', 'content' => $prePrompt);
+
+				if ($this->apiService == 'google') {
+					// Google Gemini native payload format (different from OpenAI's "messages").
+					$arrayforpayload = array(
+						'contents' => array(
+							array('role' => 'user', 'parts' => array(array('text' => $fullInstructions)))
+						)
+					);
+					if ($prePrompt) {
+						$arrayforpayload['system_instruction'] = array(
+							'parts' => array(array('text' => $prePrompt))
+						);
+					}
+				} else {
+					// OpenAI-compatible payload format (chatgpt, mistral, groq, anthropic-compat, custom, ...)
+					$arrayforpayload = array(
+						'messages' => array(array('role' => 'user', 'content' => $fullInstructions)),
+						'model' => $model,
+					);
+					if ($prePrompt) {
+						$arrayforpayload['messages'][] = array('role' => 'system', 'content' => $prePrompt);
+					}
 				}
 			}
 
@@ -296,9 +324,16 @@ class Ai
 				$payload = json_encode($arrayforpayload);
 			}
 
-			$headers = array(
-				'Authorization: Bearer ' . $this->apiKey,
-			);
+			if ($this->apiService == 'google') {
+				// Google Gemini uses the x-goog-api-key header (Bearer is not accepted by the native API).
+				$headers = array(
+					'x-goog-api-key: ' . $this->apiKey,
+				);
+			} else {
+				$headers = array(
+					'Authorization: Bearer ' . $this->apiKey,
+				);
+			}
 			if ($function != 'file') {
 				$headers[] = 'Content-Type: application/json';
 			}
@@ -388,6 +423,18 @@ class Ai
 				} else {
 					$generatedContent = var_export($decodedResponse['error'], true);
 				}
+			} elseif ($this->apiService == 'google') {
+				// Google Gemini response shape: candidates[0].content.parts[*].text
+				// (parts is an array because Gemini can return mixed-modality output;
+				// we concatenate the textual parts.)
+				$generatedContent = '';
+				if (!empty($decodedResponse['candidates'][0]['content']['parts'])) {
+					foreach ($decodedResponse['candidates'][0]['content']['parts'] as $part) {
+						if (isset($part['text'])) {
+							$generatedContent .= $part['text'];
+						}
+					}
+				}
 			} else {
 				$generatedContent = $decodedResponse['choices'][0]['message']['content'];
 			}

From a9fbc88b84ad852a9d600749ee94f544f8aa8cc7 Mon Sep 17 00:00:00 2001
From: Pichinov-Jose <jose.martinez@pichinov.com>
Date: Mon, 18 May 2026 01:18:27 +0200
Subject: [PATCH 25/48] Qual: enrich UniversalLLMAdapter::curl error
 diagnostics (#38304)

Rebased on top of upstream commit 95b57550d3 ("Fix curl direct use
is forbidden. Must use getUrlContent()") which replaced the raw
curl_* calls in this method with getURLContent(). The diagnostics
this patch adds are re-implemented on top of the new array shape
returned by getURLContent().

When the LLM API returns a non-JSON body, the previous code surfaced
only the generic message:

    "Error: Invalid JSON response from API."

with no clue about what really happened. Common real-world causes
are: HTTP 4xx/5xx with empty body, HTML error page from a proxy,
gateway timeout, model not found, etc. None of these are
distinguishable from each other in the admin Log Viewer, so admins
had to re-run with curl by hand to diagnose.

This patch:

- Reads $result['http_code'] and $result['url'] (both populated by
  getURLContent() via curl_getinfo()) and stores an enriched payload
  in $this->lastResponse so the admin Log Viewer shows HTTP code +
  effective URL + body length + body contents.
- Returns a descriptive error message when the body is not valid
  JSON: includes the HTTP code, body length, and a 500-char body
  snippet (with the '<empty>' placeholder for zero-length bodies).
- Adds the cURL error number ($result['curl_error_no']) alongside
  the cURL error message in the network-level error message, with
  the effective URL for context.
- Restores the LLM-specific response timeout that was lost in the
  getURLContent() refactor: $this->timeout is now passed as the
  10th argument ($timeoutresponse) so the configured value is
  honored instead of falling back to MAIN_USE_RESPONSE_TIMEOUT
  (default 30s). This also fixes the phpstan warning
  "Property UniversalLLMAdapter::$timeout is never read, only
  written." that the upstream refactor introduced.

No behavioral change for successful calls. Strictly improves the
error-path diagnostics surfaced to administrators, and restores
the per-LLM configurable timeout.

Tested with: a misconfigured Google Gemini URL that returns HTTP
404 with an empty body now produces:

    Error: Invalid JSON response from API (HTTP 404, 0 bytes).
    Body snippet: <empty>

instead of the previous opaque message.
---
 htdocs/ai/class/llmadapter.class.php | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/htdocs/ai/class/llmadapter.class.php b/htdocs/ai/class/llmadapter.class.php
index 4138e585d7d..b5bb2394f36 100644
--- a/htdocs/ai/class/llmadapter.class.php
+++ b/htdocs/ai/class/llmadapter.class.php
@@ -202,18 +202,35 @@ class UniversalLLMAdapter
 		global $dolibarr_ai_allow_local_endpoints;
 		$localurl = $dolibarr_ai_allow_local_endpoints ?? 0;
 
-		$result = getURLContent($url, 'POST', json_encode($data), 1, $headers, array('http', 'https'), $localurl);
+		// Pass $this->timeout as the response timeout so the LLM-specific value configured
+		// at construction time is honored (getURLContent's $timeoutresponse is the 10th arg;
+		// preceding args $ssl_verifypeer=-1 and $timeoutconnect=0 keep their defaults).
+		$result = getURLContent($url, 'POST', json_encode($data), 1, $headers, array('http', 'https'), $localurl, -1, 0, $this->timeout);
 
-		$this->lastResponse = (string) $result['content'];
+		$body         = (string) ($result['content'] ?? '');
+		$httpCode     = (int) ($result['http_code'] ?? 0);
+		$effectiveUrl = (string) ($result['url'] ?? $url);
+		// Store an enriched payload so the admin Log Viewer ("VIEW LOGS" in the AI Server
+		// MCP setup page) shows something actionable when something goes wrong, not just
+		// a bare "Invalid JSON response from API." with an empty body.
+		$this->lastResponse = "HTTP " . $httpCode . " from " . $effectiveUrl
+			. "\n--- body (" . strlen($body) . " bytes) ---\n"
+			. $body;
 
 		if (!empty($result['curl_error_no'])) {
-			return "Error: " . $result['curl_error_msg'];
+			return "Error: cURL #" . $result['curl_error_no'] . " " . $result['curl_error_msg'] . " (url=" . $effectiveUrl . ")";
 		}
 
-		$json = json_decode((string) (string) $result['content'], true);
+		$json = json_decode($body, true);
 
 		if ($json === null && json_last_error() !== JSON_ERROR_NONE) {
-			return "Error: Invalid JSON response from API.";
+			// Common real-world causes: HTTP 4xx/5xx with empty body, HTML error page
+			// from a proxy, gateway timeout, etc. Surface the HTTP code and a short
+			// body snippet so the admin can diagnose without re-running with curl.
+			$snippet = substr($body, 0, 500);
+			return "Error: Invalid JSON response from API (HTTP " . $httpCode . ", "
+				. strlen($body) . " bytes). Body snippet: "
+				. ($snippet !== '' ? $snippet : '<empty>');
 		}
 
 		if (isset($json['error'])) {

From af300a94678285a1c0a3f243480c2675f56c5063 Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <github@jonb.dk>
Date: Mon, 18 May 2026 01:19:12 +0200
Subject: [PATCH 26/48] New add notrigger to member->validate() function
 (#38293)

Co-authored-by: Jon Bendtsen <jonbendtsen@jonb.dk>
---
 htdocs/adherents/class/adherent.class.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 849516e3971..7dfe24e7e82 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -2181,9 +2181,10 @@ class Adherent extends CommonObject
 	 *		Function that validate a member
 	 *
 	 *		@param	User	$user		user adherent qui valide
+	 *		@param	int		$notrigger	1=disable trigger UPDATE (when called by create)
 	 *		@return	int					Return integer <0 if KO, 0 if nothing done, >0 if OK
 	 */
-	public function validate($user)
+	public function validate($user, $notrigger = 0)
 	{
 		global $langs, $conf;
 
@@ -2211,11 +2212,13 @@ class Adherent extends CommonObject
 			$this->status = self::STATUS_VALIDATED;
 
 			// Call trigger
-			$result = $this->call_trigger('MEMBER_VALIDATE', $user);
-			if ($result < 0) {
-				$error++;
-				$this->db->rollback();
-				return -1;
+			if (!$notrigger) {
+				$result = $this->call_trigger('MEMBER_VALIDATE', $user);
+				if ($result < 0) {
+					$error++;
+					$this->db->rollback();
+					return -1;
+				}
 			}
 			// End call triggers
 

From 8dfeb69148c513a56372fd282859e444412b8ed6 Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <github@jonb.dk>
Date: Mon, 18 May 2026 01:19:29 +0200
Subject: [PATCH 27/48] NEW Member subscription tooltip includes label (#38291)

* NEW Add label column to a members subscription list

* NEW add label to member subscription mouseover tooltip

* pre-commit fix by loading the correct language

---------

Co-authored-by: Jon Bendtsen <jonbendtsen@jonb.dk>
---
 htdocs/adherents/class/subscription.class.php | 2 ++
 htdocs/adherents/subscription.php             | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index 8dc2532b732..390cf90b213 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -440,12 +440,14 @@ class Subscription extends CommonObject
 		$result = '';
 
 		$langs->load("members");
+		$langs->load("main");
 
 		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Subscription").'</u>';
 		/*if (isset($this->statut)) {
 			$label .= ' '.$this->getLibStatut(5);
 		}*/
 		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->note_public;
 		if (!empty($this->dateh)) {
 			$label .= '<br><b>'.$langs->trans('DateStart').':</b> '.dol_print_date($this->dateh, 'day');
 		}
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index b56879b06b8..10ff978ec1f 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -717,7 +717,7 @@ if ($action != 'createsubscription' && $action != 'create_thirdparty') {
 	$sql = "SELECT d.rowid, d.firstname, d.lastname, d.societe, d.fk_adherent_type as type,";
 	$sql .= " c.rowid as crowid, c.subscription,";
 	$sql .= " c.datec, c.fk_type as cfk_type,";
-	$sql .= " c.dateadh as dateh,";
+	$sql .= " c.dateadh as dateh, c.note as clabel,";
 	$sql .= " c.datef,";
 	$sql .= " c.fk_bank,";
 	$sql .= " b.rowid as bid,";
@@ -744,6 +744,7 @@ if ($action != 'createsubscription' && $action != 'create_thirdparty') {
 		print_liste_field_titre('DateStart', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
 		print_liste_field_titre('DateEnd', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
 		print_liste_field_titre('Amount', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+		print_liste_field_titre('Label', $_SERVER["PHP_SELF"], 'clabel', '', $param, '', $sortfield, $sortorder);
 		if (isModEnabled('bank')) {
 			print_liste_field_titre('Account', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
 		}
@@ -762,6 +763,7 @@ if ($action != 'createsubscription' && $action != 'create_thirdparty') {
 
 			$subscriptionstatic->ref = $objp->crowid;
 			$subscriptionstatic->id = $objp->crowid;
+			$subscriptionstatic->note_public = $objp->clabel;
 
 			$typeid = $objp->cfk_type;
 			if ($typeid > 0) {
@@ -779,6 +781,7 @@ if ($action != 'createsubscription' && $action != 'create_thirdparty') {
 			print '<td class="center">'.dol_print_date($db->jdate($objp->dateh), 'day')."</td>\n";
 			print '<td class="center">'.dol_print_date($db->jdate($objp->datef), 'day')."</td>\n";
 			print '<td class="right amount">'.price($objp->subscription).'</td>';
+			print '<td class="left">'.$objp->clabel.'</td>';
 			if (isModEnabled('bank')) {
 				print '<td class="tdoverflowmax100 right">';
 				if ($objp->bid) {

From 0d5225d9c8ee35ce8508889737081e4036a866e3 Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <github@jonb.dk>
Date: Mon, 18 May 2026 01:20:02 +0200
Subject: [PATCH 28/48] NEW add label textline on massaction member
 subscription (#38288)

Co-authored-by: Jon Bendtsen <jonbendtsen@jonb.dk>
---
 htdocs/adherents/list.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 800ac22cf92..c2d23969900 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -356,6 +356,7 @@ if (empty($reshook)) {
 	if ($action == 'createsubscription_confirm' && $confirm == "yes" && $user->hasRight('adherent', 'creer')) {
 		$tmpmember = new Adherent($db);
 		$adht = new AdherentType($db);
+		$label = GETPOST("label");
 		$nbcreated = 0;
 		$now = dol_now();
 		$amount = price2num(GETPOST('amount', 'alpha'));
@@ -363,7 +364,7 @@ if (empty($reshook)) {
 		foreach ($toselect as $id) {
 			$res = $tmpmember->fetch($id);
 			if ($res > 0) {
-				$result = $tmpmember->subscription($now, (float) $amount);
+				$result = $tmpmember->subscription($now, (float) $amount, 0, '', $label);
 				if ($result < 0) {
 					$error++;
 				} else {
@@ -830,6 +831,7 @@ if ($massaction == 'createsubscription') {
 	$formquestion = array(
 		array('label' => $langs->trans("DateSubscription"), 'type' => 'other', 'value' => $date),
 		array('label' => $langs->trans("Amount"), 'type' => 'text', 'value' => price($amount, 0, '', 0), 'name' => 'amount'),
+		array('label' => $langs->trans("Label"), 'type' => 'text', 'value' => '', 'name' => 'label'),
 		array('type' => 'separator'),
 		array('label' => $langs->trans("MoreActions"), 'type' => 'other', 'value' => $langs->trans("None").' '.img_warning($langs->trans("WarningNoComplementaryActionDone"))),
 	);

From f0b6c2cc33fd09f0b6a2b0c467b78c543d64e0e8 Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <github@jonb.dk>
Date: Mon, 18 May 2026 01:25:13 +0200
Subject: [PATCH 29/48] NEW Add label column to a members subscription list
 (#38289)

Co-authored-by: Jon Bendtsen <jonbendtsen@jonb.dk>

From 6c342ef754d16ead229c451ca666983ae85a228c Mon Sep 17 00:00:00 2001
From: Joachim Kueter <priojk@users.noreply.github.com>
Date: Mon, 18 May 2026 01:34:28 +0200
Subject: [PATCH 30/48] Fix accountancy_code_*_general stores '-1' from empty
 dropdown option (#38282)

The empty option in the supplier/customer general account dropdown gets
value='-1' from Form::selectarray. When the form is submitted, GETPOST
returns '-1' and Societe::create()/update() stores it as a string because
the SQL builder's !empty() check accepts '-1' as truthy.

The bookkeeping export in purchasesjournal.php and sellsjournal.php then
uses '-1' as the account code (only bankjournal.php has a != '-1' guard)
and the transfer fails.

Normalize '-1' to '' next to the existing trim() in create() and update()
for both accountancy_code_customer_general and accountancy_code_supplier_general.
The existing SQL !empty() checks then write NULL as intended, and rows
that already contain '-1' self-heal on the next update.
---
 htdocs/societe/class/societe.class.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 95542880177..9bbf704564d 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1009,8 +1009,14 @@ class Societe extends CommonObject
 		$this->code_compta_client = trim($this->code_compta_client ?? '');
 
 		$this->accountancy_code_customer_general = trim($this->accountancy_code_customer_general ?? '');
+		if ($this->accountancy_code_customer_general === '-1') {
+			$this->accountancy_code_customer_general = '';
+		}
 		$this->accountancy_code_customer = trim((string) $this->code_compta_client);
 		$this->accountancy_code_supplier_general = trim($this->accountancy_code_supplier_general ?? '');
+		if ($this->accountancy_code_supplier_general === '-1') {
+			$this->accountancy_code_supplier_general = '';
+		}
 		$this->accountancy_code_supplier = trim((string) $this->code_compta_fournisseur);
 		$this->accountancy_code_buy = trim((string) $this->accountancy_code_buy);
 		$this->accountancy_code_sell = trim((string) $this->accountancy_code_sell);
@@ -1539,8 +1545,14 @@ class Societe extends CommonObject
 		}
 
 		$this->accountancy_code_customer_general = trim((string) $this->accountancy_code_customer_general);
+		if ($this->accountancy_code_customer_general === '-1') {
+			$this->accountancy_code_customer_general = '';
+		}
 		$this->code_compta_client = trim((string) $this->code_compta_client);
 		$this->accountancy_code_supplier_general = trim((string) $this->accountancy_code_supplier_general);
+		if ($this->accountancy_code_supplier_general === '-1') {
+			$this->accountancy_code_supplier_general = '';
+		}
 		$this->code_compta_fournisseur = trim((string) $this->code_compta_fournisseur);
 
 		// Check parameters. More tests are done later in the ->verify()

From 29aa7648e8a4a049f9a0880197f88ac2e8ad6e4f Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <github@jonb.dk>
Date: Mon, 18 May 2026 01:41:32 +0200
Subject: [PATCH 31/48] Fix api post member subscription returns negative one
 (#38280)

* Fix #38278 POST to API /members/{id}/subscriptions returns -1

* return the id of the new subscription

---------

Co-authored-by: Jon Bendtsen <jonbendtsen@jonb.dk>
---
 htdocs/adherents/class/api_members.class.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index 3fa27ce40fa..ce36fa37cef 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -655,6 +655,8 @@ class Members extends DolibarrApi
 	 *
 	 * @throws	RestException	403		Access denied
 	 * @throws	RestException	404		Member not found
+	 * @throws	RestException	422		Malformed data
+	 * @throws	RestException	500		server error
 	 */
 	public function createSubscription($id, $start_date, $end_date, $amount, $label = '')
 	{
@@ -664,6 +666,9 @@ class Members extends DolibarrApi
 		if (!is_numeric($start_date) || !is_numeric($end_date) || !is_numeric($amount)) {
 			throw new RestException(422, 'Malformed data: subscription start or end date, or subscription amount, is not numeric');
 		}
+		if ($start_date > $end_date) {
+			throw new RestException(422, 'Malformed data: subscription start is not larger than end date');
+		}
 
 		$member = new Adherent($this->db);
 		$result = $member->fetch($id);
@@ -671,7 +676,12 @@ class Members extends DolibarrApi
 			throw new RestException(404, 'member not found');
 		}
 
-		return $member->subscription((int) $start_date, (float) $amount, 0, '', $label, '', '', '', (int) $end_date);
+		$result =  $member->subscription((int) $start_date, (float) $amount, 0, '', $label, '', '', '', (int) $end_date);
+		if ($result < 1) {
+			throw new RestException(500, $member->error);
+		} else {
+			return $result;
+		}
 	}
 
 	/**

From 8754884a2455e31aea4cd2adc4520c769c1fb7b8 Mon Sep 17 00:00:00 2001
From: Yoan Mollard <ymollard@users.noreply.github.com>
Date: Mon, 18 May 2026 01:55:24 +0200
Subject: [PATCH 32/48] fix: Inverted logical condition for showing
 TVAIsNotUsed only in crabe template (#38271)

Fixes bug introduced in #8e005b19c02435817ecf8207064fd8340245dcd5
---
 htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 64226d9050e..6628920ea07 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1257,7 +1257,7 @@ class pdf_crabe extends ModelePDFFactures
 		if (in_array($this->emetteur->country_code, array('FR')) && empty($object->total_tva)) {
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
-			if (!empty($mysoc->tva_assuj)) {
+			if (empty($mysoc->tva_assuj)) {
 				if ($mysoc->forme_juridique_code == 92) {
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoiceAsso"), 0, 'L', false);
 				} else {

From 6f5bf5c935f5ccde758ceceecb9091a37e696d2c Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <github@jonb.dk>
Date: Mon, 18 May 2026 02:22:16 +0200
Subject: [PATCH 33/48] FIX #37327 There is no product description displayed in
 version 22 (#38267)

Co-authored-by: Jon Bendtsen <jonbendtsen@jonb.dk>
---
 htdocs/core/tpl/objectline_create.tpl.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 3226c49f6f5..ea928a8b05c 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -1145,7 +1145,8 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 
 
 			// Deal with supplier ref price (idprodfournprice = int)
-			if (jQuery('#idprodfournprice').val() > 0)
+			var supplierVal = jQuery('#idprodfournprice').val();
+			if (supplierVal && supplierVal !== '-1' && (supplierVal > 0 || supplierVal.indexOf('idprod_') === 0))
 			{
 				console.log("objectline_create.tpl #idprodfournprice is an ID > 0, so we set some properties into page");
 

From 4e01c0d16368d6defe363ed721546a70c19af332 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 18 May 2026 02:39:13 +0200
Subject: [PATCH 34/48] CI

---
 htdocs/langs/en_US/main.lang  | 1 +
 htdocs/langs/en_US/other.lang | 1 -
 htdocs/main.inc.php           | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 319f95574bf..745792cd4af 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1436,3 +1436,4 @@ Delay=Delay
 RefOfOnCustomerSide=Reference of %s on customer side
 RefOfOnVendorSide=Reference of %s on vendor side
 SeeDocumentation=See documentation
+AIAssistant=AI Assistant
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 966b980b345..fefc5b7c9af 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -419,7 +419,6 @@ AIWelcomeMessage=Hi! I'm your Dolibarr assistant. How can I help you today?
 ErrorThirdPartyNotFound=Error ThirdParty Not Found
 TotalValue=Total Value
 Expenses=Expenses
-AIAssistant=AI Assistant
 ClearChatHistoryTitle=Clear Chat History
 Clear=Clear
 OptionTextOnly=Text Only
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index e29f90b9f62..cd6dc55dc06 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2733,7 +2733,7 @@ function top_menu_ai()
 	if (isModEnabled('ai')) {
 		$html .= '<!-- div for quick ai link -->
 	    <div id="topmenu-tool" class="atoplogin dropdown inline-block">
-	        <a accesskey="a" class="nofocusvisible" href="'.DOL_URL_ROOT.'/ai/assistant/index.php" title="'.$langs->trans('AI').' ('.$conf->browser->stringforfirstkey.' a)"><i class="fa fa-magic"></i></a>
+	        <a accesskey="a" class="nofocusvisible" href="'.DOL_URL_ROOT.'/ai/assistant/index.php" title="'.$langs->trans('AIAssistant').' ('.$conf->browser->stringforfirstkey.' a)"><i class="fa fa-magic"></i></a>
 	    </div>';
 	}
 

From ad545b323c9c820c33771a4c0da476ec0dd0d90b Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <github@jonb.dk>
Date: Mon, 18 May 2026 02:40:27 +0200
Subject: [PATCH 35/48] Fix #38168 reception card supplier order errors
 (#38272)

* Fix reception card supplierorder errors

* Include subprice_ttc & multicurrency_subprice_ttc in the SQL because we assign them later, and that would give a PHP warning Undefined property

* Refactor origin handling in card.php

* Update card.php

---------

Co-authored-by: Jon Bendtsen <jonbendtsen@jonb.dk>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 .../class/fournisseur.orderline.class.php     |  4 +--
 htdocs/reception/card.php                     | 30 +++++++++++++++----
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.orderline.class.php b/htdocs/fourn/class/fournisseur.orderline.class.php
index 10b3449fd7b..9603c0f03a7 100644
--- a/htdocs/fourn/class/fournisseur.orderline.class.php
+++ b/htdocs/fourn/class/fournisseur.orderline.class.php
@@ -171,12 +171,12 @@ class CommandeFournisseurLigne extends CommonOrderLine
 	{
 		$sql = 'SELECT cd.rowid, cd.fk_commande, cd.fk_product, cd.product_type, cd.description, cd.qty, cd.tva_tx, cd.special_code,';
 		$sql .= ' cd.localtax1_tx, cd.localtax2_tx, cd.localtax1_type, cd.localtax2_type, cd.ref as ref_supplier,';
-		$sql .= ' cd.remise, cd.remise_percent, cd.subprice,';
+		$sql .= ' cd.remise, cd.remise_percent, cd.subprice, cd.subprice_ttc,';
 		$sql .= ' cd.info_bits, cd.total_ht, cd.total_tva, cd.total_ttc,';
 		$sql .= ' cd.total_localtax1, cd.total_localtax2,';
 		$sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc,';
 		$sql .= ' cd.date_start, cd.date_end, cd.fk_unit, cd.extraparams,';
-		$sql .= ' cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc,';
+		$sql .= ' cd.multicurrency_subprice, cd.multicurrency_subprice_ttc, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc,';
 		$sql .= ' c.fk_soc as socid';
 		$sql .= ' FROM '.$this->db->prefix().'commande_fournisseur as c, '.$this->db->prefix().'commande_fournisseurdet as cd';
 		$sql .= ' LEFT JOIN '.$this->db->prefix().'product as p ON cd.fk_product = p.rowid';
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index e023df29b7e..1d6e3cfef04 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -1612,7 +1612,27 @@ if ($action == 'create' && $permissiontoadd) {
 			if ($reshook < 0) {
 				setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 			} elseif (empty($reshook)) {
-				$dispatchLines = array_merge($dispatchLines, $hookmanager->resArray);
+				// Only merge if resArray is a valid, non-empty array
+				if (is_array($hookmanager->resArray) && !empty($hookmanager->resArray)) {
+					// Check if the merge would overwrite valid data with NULL
+					$tempMerged = array_merge($dispatchLines, $hookmanager->resArray);
+
+					// Sanity check: ensure our existing keys are still valid arrays
+					$corrupted = false;
+					foreach ($dispatchLines as $idx => $val) {
+						if (!is_array($tempMerged[$idx]) || !isset($tempMerged[$idx]['fk_commandefourndet'])) {
+							$corrupted = true;
+							break;
+						}
+					}
+
+					if (!$corrupted) {
+						$dispatchLines = $tempMerged;
+					} else {
+						// If merge corrupted data, ignore the hook result and keep original
+						error_log("WARNING: Hook dataProcessing returned invalid data, ignoring merge.");
+					}
+				}
 			} elseif ($reshook > 0) {
 				// $resArray starts from [0], we need $dispatchLines to start from [1], so we shift it
 				$dispatchLines = $hookmanager->resArray;
@@ -1622,7 +1642,7 @@ if ($action == 'create' && $permissiontoadd) {
 			}
 
 			print '<script type="text/javascript">
-            jQuery(document).ready(function() {
+			jQuery(document).ready(function() {
 	            jQuery("#autofill").click(function(event) {
 					event.preventDefault();';
 			$i = 1;
@@ -1639,8 +1659,8 @@ if ($action == 'create' && $permissiontoadd) {
 				$i++;
 			}
 			print '});
-        	});
-            </script>';
+			});
+			</script>';
 
 			print '<br>';
 
@@ -2526,7 +2546,7 @@ if ($action == 'create' && $permissiontoadd) {
 		// Get list of products already sent for same source object into $alreadysent
 		$alreadysent = array();
 
-		if (empty($origin)) {
+		if (empty($origin) || $origin == 'order_supplier') {
 			$origin = 'supplier_order';
 		}
 

From 33c7c1d0ad897228ca0cbe69b947da9d5bcc3242 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 18 May 2026 02:43:24 +0200
Subject: [PATCH 36/48] clean code (#38265)

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code
---
 htdocs/adherents/card.php                     |   3 +-
 htdocs/adherents/partnership.php              |  22 +-
 htdocs/adherents/stats/geo.php                | 295 +++++++++---------
 htdocs/asset/admin/asset_extrafields.php      |   1 -
 htdocs/asset/admin/assetmodel_extrafields.php |   1 -
 .../admin/availabilities_extrafields.php      |   1 -
 htdocs/bookcal/admin/calendar_extrafields.php |   1 -
 htdocs/comm/action/card.php                   |   3 +-
 htdocs/comm/action/list.php                   |  10 +-
 htdocs/comm/admin/propal_extrafields.php      |   9 +-
 htdocs/comm/admin/propaldet_extrafields.php   |   8 +-
 htdocs/comm/card.php                          |   4 +-
 htdocs/comm/mailing/advtargetemailing.php     |  22 +-
 htdocs/comm/mailing/card.php                  |   5 +-
 htdocs/comm/mailing/list.php                  |   6 +-
 htdocs/comm/mailing/note.php                  |  10 +-
 htdocs/comm/propal/card.php                   |  18 +-
 htdocs/commande/index.php                     |  16 +-
 htdocs/compta/bank/line.php                   |   4 +-
 .../compta/cashcontrol/cashcontrol_list.php   |   4 +-
 htdocs/compta/facture/card-rec.php            |   1 -
 htdocs/contact/agenda.php                     |   9 +-
 htdocs/contact/card.php                       |  22 +-
 htdocs/fourn/card.php                         |  22 +-
 .../template/stats/myobject_index.php         |  12 +-
 htdocs/ticket/stats/index.php                 |  34 +-
 26 files changed, 253 insertions(+), 290 deletions(-)

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 28d0c8744da..36a78c71e04 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2012		Marcos García				<marcosgdf@gmail.com>
  * Copyright (C) 2012-2020	Philippe Grand				<philippe.grand@atoo-net.com>
  * Copyright (C) 2015-2024	Alexandre Spangaro			<alexandre@inovea-conseil.com>
- * Copyright (C) 2018-2025  Frédéric France				<frederic.france@free.fr>
+ * Copyright (C) 2018-2026  Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2021		Waël Almoman				<info@almoman.com>
  * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  *
@@ -52,7 +52,6 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
diff --git a/htdocs/adherents/partnership.php b/htdocs/adherents/partnership.php
index 0ecb764e7fd..5fe0f54b655 100644
--- a/htdocs/adherents/partnership.php
+++ b/htdocs/adherents/partnership.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2017		Laurent Destailleur			<eldy@users.sourceforge.net>
  * Copyright (C) 2021		NextGestion					<contact@nextgestion.com>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
- * Copyright (C) 2024-2025  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2024-2026  Frédéric France         <frederic.france@free.fr>
  *
  * 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
@@ -26,6 +26,14 @@
 
 // Load Dolibarr environment
 require '../main.inc.php';
+/**
+ * @var Conf $conf
+ * @var DoliDB $db
+ * @var ExtraFields $extrafields
+ * @var HookManager $hookmanager
+ * @var Translate $langs
+ * @var User $user
+ */
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
@@ -34,13 +42,6 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership.class.php';
 require_once DOL_DOCUMENT_ROOT.'/partnership/lib/partnership.lib.php';
 
-/**
- * @var Conf $conf
- * @var DoliDB $db
- * @var HookManager $hookmanager
- * @var Translate $langs
- * @var User $user
- */
 
 // Load translation files required by the page
 $langs->loadLangs(array("companies","members","partnership", "other"));
@@ -62,9 +63,8 @@ if ($id > 0) {
 }
 
 // Initialize a technical objects
-$object 		= new Partnership($db);
-$extrafields 	= new ExtraFields($db);
-$adht 			= new AdherentType($db);
+$object = new Partnership($db);
+$adht = new AdherentType($db);
 $diroutputmassaction = $conf->partnership->dir_output.'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array('partnershipthirdparty', 'globalcard')); // Note that conf->hooks_modules contains array
 
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index 8449e366ee9..da8e9cbe670 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -2,7 +2,7 @@
 /* Copyright (c) 2004-2011  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2024-2025	MDW                     <mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Alexandre Spangaro		<alexandre@inovea-conseil.com>
- * Copyright (C) 2024-2025  Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2024-2026  Frédéric France			<frederic.france@free.fr>
  *
  * 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
@@ -98,139 +98,126 @@ $data = array();
 $tab = null;
 $label = '';
 
-if ($mode) {
-	// Define sql
-	$sql = null;
-	if ($mode == 'memberbycountry') {
-		$label = $langs->trans("Country");
-		$tab = 'statscountry';
+// Define sql
+$sql = null;
+if ($mode == 'memberbycountry') {
+	$label = $langs->trans("Country");
+	$tab = 'statscountry';
 
-		$sql = "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, c.code, c.label";
-		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c on d.country = c.rowid";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
-		$sql .= " WHERE d.entity IN (".getEntity('adherent').")";
-		$sql .= " AND d.statut <> ".Adherent::STATUS_DRAFT;
-		$sql .= " GROUP BY c.label, c.code";
-		//print $sql;
-	}
+	$sql = "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, c.code, c.label";
+	$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c on d.country = c.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
+	$sql .= " WHERE d.entity IN (".getEntity('adherent').")";
+	$sql .= " AND d.statut <> ".Adherent::STATUS_DRAFT;
+	$sql .= " GROUP BY c.label, c.code";
+} elseif ($mode == 'memberbystate') {
+	$label = $langs->trans("Country");
+	$label2 = $langs->trans("State");
+	$tab = 'statsstate';
 
-	if ($mode == 'memberbystate') {
-		$label = $langs->trans("Country");
-		$label2 = $langs->trans("State");
-		$tab = 'statsstate';
+	$data = array();
+	$sql = "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, co.code, co.label, c.nom as label2"; //
+	$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as c on d.state_id = c.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r on c.fk_region = r.code_region";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co on d.country = co.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
+	$sql .= " WHERE d.entity IN (".getEntity('adherent').")";
+	$sql .= " AND d.statut <> ".Adherent::STATUS_DRAFT;
+	$sql .= " GROUP BY co.label, co.code, c.nom";
+	//print $sql;
+} elseif ($mode == 'memberbyregion') {
+	$label = $langs->trans("Country");
+	$label2 = $langs->trans("Region"); //département
+	$tab = 'statsregion'; //onglet
 
-		$data = array();
-		$sql = "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, co.code, co.label, c.nom as label2"; //
-		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as c on d.state_id = c.rowid";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r on c.fk_region = r.code_region";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co on d.country = co.rowid";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
-		$sql .= " WHERE d.entity IN (".getEntity('adherent').")";
-		$sql .= " AND d.statut <> ".Adherent::STATUS_DRAFT;
-		$sql .= " GROUP BY co.label, co.code, c.nom";
-		//print $sql;
-	}
-	if ($mode == 'memberbyregion') { //
-		$label = $langs->trans("Country");
-		$label2 = $langs->trans("Region"); //département
-		$tab = 'statsregion'; //onglet
+	$data = array(); //tableau de donnée
+	$sql = "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, co.code, co.label, r.nom as label2";
+	$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as c on d.state_id = c.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r on c.fk_region = r.code_region";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co on d.country = co.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
+	$sql .= " WHERE d.entity IN (".getEntity('adherent').")";
+	$sql .= " AND d.statut <> ".Adherent::STATUS_DRAFT;
+	$sql .= " GROUP BY co.label, co.code, r.nom"; //+
+} elseif ($mode == 'memberbytown') {
+	$label = $langs->trans("Country");
+	$label2 = $langs->trans("Town");
+	$tab = 'statstown';
 
-		$data = array(); //tableau de donnée
-		$sql = "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, co.code, co.label, r.nom as label2";
-		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as c on d.state_id = c.rowid";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r on c.fk_region = r.code_region";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co on d.country = co.rowid";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
-		$sql .= " WHERE d.entity IN (".getEntity('adherent').")";
-		$sql .= " AND d.statut <> ".Adherent::STATUS_DRAFT;
-		$sql .= " GROUP BY co.label, co.code, r.nom"; //+
-		//print $sql;
-	}
-	if ($mode == 'memberbytown') {
-		$label = $langs->trans("Country");
-		$label2 = $langs->trans("Town");
-		$tab = 'statstown';
+	$data = array();
+	$sql = "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, c.code, c.label, d.town as label2";
+	$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c on d.country = c.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
+	$sql .= " WHERE d.entity IN (".getEntity('adherent').")";
+	$sql .= " AND d.statut <> ".Adherent::STATUS_DRAFT;
+	$sql .= " GROUP BY c.label, c.code, d.town";
+}
 
-		$data = array();
-		$sql = "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, c.code, c.label, d.town as label2";
-		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c on d.country = c.rowid";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
-		$sql .= " WHERE d.entity IN (".getEntity('adherent').")";
-		$sql .= " AND d.statut <> ".Adherent::STATUS_DRAFT;
-		$sql .= " GROUP BY c.label, c.code, d.town";
-		//print $sql;
-	}
+$langsen = new Translate('', $conf);
+$langsen->setDefaultLang('en_US');
+$langsen->load("dict");
+//print $langsen->trans("Country"."FI");exit;
 
-	$langsen = new Translate('', $conf);
-	$langsen->setDefaultLang('en_US');
-	$langsen->load("dict");
-	//print $langsen->trans("Country"."FI");exit;
-
-
-	// Define $data array
-	dol_syslog("Count member", LOG_DEBUG);
-	if ($sql != null) {
-		$resql = $db->query($sql);
-	} else {
-		$resql = false;
-		dol_syslog(__FILE__.":No SQL, invalid mode '$mode'", LOG_ERR);
-	}
-	if ($resql) {
-		$num = $db->num_rows($resql);
-		$i = 0;
-		while ($i < $num) {
-			$obj = $db->fetch_object($resql);
-			if ($mode == 'memberbycountry') {
-				$data[] = array(
-					'label' => (string) (($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? picto_from_langcode($obj->code, 'class="saturatemedium paddingrightonly"', 1).' '.$langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
-					'label_en' => (string) (($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
-					'code' => (string) $obj->code,
-					'nb' => (int) $obj->nb,
-					'lastdate' => $db->jdate($obj->lastdate),
-					'lastsubscriptiondate' => $db->jdate($obj->lastsubscriptiondate)
-				);
-			}
-			if ($mode == 'memberbyregion') { //+
-				$data[] = array(
-					'label' => (string) (($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? picto_from_langcode($obj->code, 'class="saturatemedium paddingrightonly"', 1).' '.$langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
-					'label_en' => (string) (($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
-					'label2' => ($obj->label2 ? $obj->label2 : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>'),
-					'nb' => (int) $obj->nb,
-					'lastdate' => $db->jdate($obj->lastdate),
-					'lastsubscriptiondate' => $db->jdate($obj->lastsubscriptiondate)
-				);
-			}
-			if ($mode == 'memberbystate') {
-				$data[] = array(
-					'label' => (string) (($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? picto_from_langcode($obj->code, 'class="saturatemedium paddingrightonly"', 1).' '.$langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
-					'label_en' => (string) (($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
-					'label2' => ($obj->label2 ? $obj->label2 : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>'),
-					'nb' => (int) $obj->nb,
-					'lastdate' => $db->jdate($obj->lastdate),
-					'lastsubscriptiondate' => $db->jdate($obj->lastsubscriptiondate)
-				);
-			}
-			if ($mode == 'memberbytown') {
-				$data[] = array(
-					'label' => (string) (($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? picto_from_langcode($obj->code, 'class="saturatemedium paddingrightonly"', 1).' '.$langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
-					'label_en' => (string) (($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
-					'label2' => (string) ($obj->label2 ? $obj->label2 : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>'),
-					'nb' => (int) $obj->nb,
-					'lastdate' => $db->jdate($obj->lastdate),
-					'lastsubscriptiondate' => $db->jdate($obj->lastsubscriptiondate)
-				);
-			}
-
-			$i++;
+// Define $data array
+dol_syslog("Count member", LOG_DEBUG);
+if ($sql != null) {
+	$resql = $db->query($sql);
+} else {
+	$resql = false;
+	dol_syslog(__FILE__.":No SQL, invalid mode '$mode'", LOG_ERR);
+}
+if ($resql) {
+	$num = $db->num_rows($resql);
+	$i = 0;
+	while ($i < $num) {
+		$obj = $db->fetch_object($resql);
+		if ($mode == 'memberbycountry') {
+			$data[] = array(
+				'label' => (string) (($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? picto_from_langcode($obj->code, 'class="saturatemedium paddingrightonly"', 1).' '.$langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
+				'label_en' => (string) (($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
+				'code' => (string) $obj->code,
+				'nb' => (int) $obj->nb,
+				'lastdate' => $db->jdate($obj->lastdate),
+				'lastsubscriptiondate' => $db->jdate($obj->lastsubscriptiondate)
+			);
+		} elseif ($mode == 'memberbyregion') { //+
+			$data[] = array(
+				'label' => (string) (($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? picto_from_langcode($obj->code, 'class="saturatemedium paddingrightonly"', 1).' '.$langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
+				'label_en' => (string) (($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
+				'label2' => ($obj->label2 ? $obj->label2 : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>'),
+				'nb' => (int) $obj->nb,
+				'lastdate' => $db->jdate($obj->lastdate),
+				'lastsubscriptiondate' => $db->jdate($obj->lastsubscriptiondate)
+			);
+		} elseif ($mode == 'memberbystate') {
+			$data[] = array(
+				'label' => (string) (($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? picto_from_langcode($obj->code, 'class="saturatemedium paddingrightonly"', 1).' '.$langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
+				'label_en' => (string) (($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
+				'label2' => ($obj->label2 ? $obj->label2 : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>'),
+				'nb' => (int) $obj->nb,
+				'lastdate' => $db->jdate($obj->lastdate),
+				'lastsubscriptiondate' => $db->jdate($obj->lastsubscriptiondate)
+			);
+		} elseif ($mode == 'memberbytown') {
+			$data[] = array(
+				'label' => (string) (($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? picto_from_langcode($obj->code, 'class="saturatemedium paddingrightonly"', 1).' '.$langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
+				'label_en' => (string) (($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
+				'label2' => (string) ($obj->label2 ? $obj->label2 : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>'),
+				'nb' => (int) $obj->nb,
+				'lastdate' => $db->jdate($obj->lastdate),
+				'lastsubscriptiondate' => $db->jdate($obj->lastsubscriptiondate)
+			);
 		}
-		$db->free($resql);
-	} else {
-		dol_print_error($db);
+
+		$i++;
 	}
+	$db->free($resql);
+} else {
+	dol_print_error($db);
 }
 
 
@@ -240,7 +227,7 @@ print dol_get_fiche_head($head, (string) $tab, '', -1, '');
 
 
 // Print title
-if ($mode && !count($data)) {
+if (!count($data)) {
 	print '<span class="opacitymedium">'.$langs->trans("NoValidatedMemberYet").'</span><br>';
 	print '<br>';
 } else {
@@ -316,35 +303,33 @@ if (getDolGlobalString("GOOGLE_SHOW_COUNTRY_GRAPH") && $mode == 'memberbycountry
 	print '<div class="center" id="'.$mode.'"></div>'."\n";
 }
 
-if ($mode) {
-	// Print array
-	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
-	print '<table class="liste centpercent noborder">';
-	print '<tr class="liste_titre">';
-	print '<th>'.$label.'</th>';
-	if (isset($label2)) {
-		print '<th class="center">'.$label2.'</th>';
-	}
-	print '<th class="right">'.$langs->trans("NbOfMembers").' <span class="opacitymedium">('.$langs->trans("AllTime").')</span></th>';
-	print '<th class="center">'.$langs->trans("LastMemberDate").'</th>';
-	print '<th class="center">'.$langs->trans("LatestSubscriptionDate").'</th>';
-	print '</tr>';
-
-	foreach ($data as $val) {
-		print '<tr class="oddeven">';
-		print '<td>'.$val['label'].'</td>';
-		if (isset($label2)) {
-			print '<td class="center">'.$val['label2'].'</td>';
-		}
-		print '<td class="right">'.$val['nb'].'</td>';
-		print '<td class="center">'.dol_print_date($val['lastdate'], 'dayhour', 'auto', null, false, 1).'</td>';
-		print '<td class="center">'.dol_print_date($val['lastsubscriptiondate'], 'dayhour', 'auto', null, false, 1).'</td>';
-		print '</tr>';
-	}
-
-	print '</table>';
-	print '</div>';
+// Print array
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
+print '<table class="liste centpercent noborder">';
+print '<tr class="liste_titre">';
+print '<th>'.$label.'</th>';
+if (isset($label2)) {
+	print '<th class="center">'.$label2.'</th>';
 }
+print '<th class="right">'.$langs->trans("NbOfMembers").' <span class="opacitymedium">('.$langs->trans("AllTime").')</span></th>';
+print '<th class="center">'.$langs->trans("LastMemberDate").'</th>';
+print '<th class="center">'.$langs->trans("LatestSubscriptionDate").'</th>';
+print '</tr>';
+
+foreach ($data as $val) {
+	print '<tr class="oddeven">';
+	print '<td>'.$val['label'].'</td>';
+	if (isset($label2)) {
+		print '<td class="center">'.$val['label2'].'</td>';
+	}
+	print '<td class="right">'.$val['nb'].'</td>';
+	print '<td class="center">'.dol_print_date($val['lastdate'], 'dayhour', 'auto', null, false, 1).'</td>';
+	print '<td class="center">'.dol_print_date($val['lastsubscriptiondate'], 'dayhour', 'auto', null, false, 1).'</td>';
+	print '</tr>';
+}
+
+print '</table>';
+print '</div>';
 
 
 print dol_get_fiche_end();
diff --git a/htdocs/asset/admin/asset_extrafields.php b/htdocs/asset/admin/asset_extrafields.php
index 5883ec96a91..2bd0658b338 100644
--- a/htdocs/asset/admin/asset_extrafields.php
+++ b/htdocs/asset/admin/asset_extrafields.php
@@ -40,7 +40,6 @@ require '../../main.inc.php';
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("assets", "admin", "companies"));
diff --git a/htdocs/asset/admin/assetmodel_extrafields.php b/htdocs/asset/admin/assetmodel_extrafields.php
index 6e0a320731f..57ae24740aa 100644
--- a/htdocs/asset/admin/assetmodel_extrafields.php
+++ b/htdocs/asset/admin/assetmodel_extrafields.php
@@ -40,7 +40,6 @@ require '../../main.inc.php';
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("assets", "admin", "companies"));
diff --git a/htdocs/bookcal/admin/availabilities_extrafields.php b/htdocs/bookcal/admin/availabilities_extrafields.php
index f72a1c04462..bcc14522aa0 100644
--- a/htdocs/bookcal/admin/availabilities_extrafields.php
+++ b/htdocs/bookcal/admin/availabilities_extrafields.php
@@ -37,7 +37,6 @@ require '../../main.inc.php';
  * @var Translate $langs
  * @var User $user
  */
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once '../lib/bookcal.lib.php';
 
 // Load translation files required by the page
diff --git a/htdocs/bookcal/admin/calendar_extrafields.php b/htdocs/bookcal/admin/calendar_extrafields.php
index 6a9c813ed67..3ee4bcc4eba 100644
--- a/htdocs/bookcal/admin/calendar_extrafields.php
+++ b/htdocs/bookcal/admin/calendar_extrafields.php
@@ -38,7 +38,6 @@ require '../../main.inc.php';
  * @var Translate $langs
  * @var User $user
  */
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once '../lib/bookcal.lib.php';
 
 // Load translation files required by the page
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index c1227aec42f..0128132d681 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -36,11 +36,11 @@ require '../../main.inc.php';
 /**
  * @var Conf $conf
  * @var DoliDB $db
+ * @var ExtraFields $extrafields
  * @var HookManager $hookmanager
  * @var Translate $langs
  * @var User $user
  */
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
@@ -131,7 +131,6 @@ $donotclearsession = GETPOST('donotclearsession') ? GETPOST('donotclearsession')
 $object = new ActionComm($db);
 $cactioncomm = new CActionComm($db);
 $contact = new Contact($db);
-$extrafields = new ExtraFields($db);
 $formfile = new FormFile($db);
 
 $form = new Form($db);
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 6e865812432..3e7e1bcb71d 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2004-2016	Laurent Destailleur			<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin				<regis.houssin@inodbox.com>
  * Copyright (C) 2017		Open-DSI					<support@open-dsi.fr>
- * Copyright (C) 2018-2025  Frédéric France				<frederic.france@free.fr>
+ * Copyright (C) 2018-2026  Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2020		Tobias Sekan				<tobias.sekan@startmail.com>
  * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
@@ -34,6 +34,7 @@ require '../../main.inc.php';
 /**
  * @var Conf $conf
  * @var DoliDB $db
+ * @var ExtraFields $extrafields
  * @var HookManager $hookmanager
  * @var Translate $langs
  * @var User $user
@@ -42,9 +43,8 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("users", "companies", "agenda", "commercial", "other", "orders", "bills"));
@@ -123,8 +123,6 @@ $search_categ_cus = GETPOST("search_categ_cus", "intcomma", 3) ? GETPOST("search
 $object = new ActionComm($db);
 $hookmanager->initHooks(array('agendalist'));
 
-$extrafields = new ExtraFields($db);
-
 // fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 
diff --git a/htdocs/comm/admin/propal_extrafields.php b/htdocs/comm/admin/propal_extrafields.php
index acc54325a48..7bc2b8c2810 100644
--- a/htdocs/comm/admin/propal_extrafields.php
+++ b/htdocs/comm/admin/propal_extrafields.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
  * Copyright (C) 2004-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2012		Regis Houssin			<regis.houssin@inodbox.com>
- * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2024-2026  Frédéric France         <frederic.france@free.fr>
  *
  * 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
@@ -27,21 +27,19 @@
 
 // Load Dolibarr environment
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-
 /**
  * @var Conf $conf
  * @var DoliDB $db
+ * @var ExtraFields $extrafields
  * @var HookManager $hookmanager
  * @var Translate $langs
  * @var User $user
  */
+require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'admin', 'propal'));
 
-$extrafields = new ExtraFields($db);
 $form = new Form($db);
 
 // List of supported format
@@ -63,7 +61,6 @@ if (!$user->admin) {
 require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
 
 
-
 /*
  * View
  */
diff --git a/htdocs/comm/admin/propaldet_extrafields.php b/htdocs/comm/admin/propaldet_extrafields.php
index 5f939d6edce..4f4463de61e 100644
--- a/htdocs/comm/admin/propaldet_extrafields.php
+++ b/htdocs/comm/admin/propaldet_extrafields.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2012		Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2013		Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
- * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2024-2026  Frédéric France         <frederic.france@free.fr>
  *
  * 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
@@ -30,21 +30,19 @@
 
 // Load Dolibarr environment
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-
 /**
  * @var Conf $conf
  * @var DoliDB $db
+ * @var ExtraFields $extrafields
  * @var HookManager $hookmanager
  * @var Translate $langs
  * @var User $user
  */
+require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
 
 // Load translation files required by the page
 $langs->loadlangs(array('admin', 'other', 'propal'));
 
-$extrafields = new ExtraFields($db);
 $form = new Form($db);
 
 // List of supported format
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 0969aeab7da..c22610350f9 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2008		Raphael Bertrand (Resultic)	<raphael.bertrand@resultic.fr>
  * Copyright (C) 2010-2020	Juanjo Menent				<jmenent@2byte.es>
  * Copyright (C) 2013-2024	Alexandre Spangaro			<alexandre@inovea-conseil.com>
- * Copyright (C) 2021-2025  Frédéric France				<frederic.france@free.fr>
+ * Copyright (C) 2021-2026  Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2015		Marcos García				<marcosgdf@gmail.com>
  * Copyright (C) 2020		Open-Dsi					<support@open-dsi.fr>
  * Copyright (C) 2022		Anthony Berton				<anthony.berton@bb2a.fr>
@@ -38,6 +38,7 @@ require '../main.inc.php';
 /**
  * @var Conf $conf
  * @var DoliDB $db
+ * @var ExtraFields $extrafields
  * @var HookManager $hookmanager
  * @var Societe $mysoc
  * @var Translate $langs
@@ -128,7 +129,6 @@ if (!$sortfield) {
 $cancel = GETPOST('cancel', 'alpha');
 
 $object = new Client($db);
-$extrafields = new ExtraFields($db);
 $formfile = new FormFile($db);
 
 // fetch optionals attributes and labels
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index 53f9006a026..48b5b839c0d 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2014 Florian Henry        <florian.henry@open-concept.pro>
  * Copyright (C) 2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2024 MDW                  <mdeweerd@users.noreply.github.com>
- * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2024-2026  Frédéric France         <frederic.france@free.fr>
  *
  * 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
@@ -27,6 +27,14 @@
 
 // Load Dolibarr environment
 require '../../main.inc.php';
+/**
+ * @var Conf $conf
+ * @var DoliDB $db
+ * @var ExtraFields $extrafields
+ * @var HookManager $hookmanager
+ * @var Translate $langs
+ * @var User $user
+ */
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmailing.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
@@ -39,14 +47,6 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-/**
- * @var Conf $conf
- * @var DoliDB $db
- * @var HookManager $hookmanager
- * @var Translate $langs
- * @var User $user
- */
-
 // Load translation files required by the page
 $langs->loadLangs(array('mails', 'admin', 'companies', 'categories'));
 
@@ -895,8 +895,6 @@ if ($object->fetch($id) >= 0) {
 			$socstatic = new Societe($db);
 			$elementtype = $socstatic->table_element;
 			// fetch optionals attributes and labels
-			require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
-			$extrafields = new ExtraFields($db);
 			$extrafields->fetch_name_optionals_label($elementtype);
 			foreach ($extrafields->attributes[$elementtype]['label'] as $key => $val) {
 				if ($key != 'ts_nameextra' && $key != 'ts_payeur') {
@@ -1086,8 +1084,6 @@ if ($object->fetch($id) >= 0) {
 			$contactstatic = new Contact($db);
 			$elementype = $contactstatic->table_element;
 			// fetch optionals attributes and labels
-			dol_include_once('/core/class/extrafields.class.php');
-			$extrafields = new ExtraFields($db);
 			$extrafields->fetch_name_optionals_label($elementype);
 			if (!empty($extrafields->attributes[$elementtype]['type'])) {
 				foreach ($extrafields->attributes[$elementtype]['type'] as $key => &$value) {
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index c1f742c2ab3..90c6cad64d8 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2021		Waël Almoman            <info@almoman.com>
  * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2025		Jon Bendtsen            <jon.bendtsen.github@jonb.dk>
- * Copyright (C) 2024-2025  Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2024-2026  Frédéric France			<frederic.france@free.fr>
  *
  * 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
@@ -36,6 +36,7 @@ require '../../main.inc.php';
 /**
  * @var Conf $conf
  * @var DoliDB $db
+ * @var ExtraFields $extrafields
  * @var HookManager $hookmanager
  * @var Translate $langs
  * @var User $user
@@ -49,7 +50,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
@@ -70,7 +70,6 @@ $backtopageforcancel = GETPOST('backtopageforcancel');
 
 // Initialize a technical objects
 $object = new Mailing($db);
-$extrafields = new ExtraFields($db);
 $hookmanager->initHooks(array('mailingcard', 'globalcard'));
 
 // Fetch optionals attributes and labels
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index 9bc73290dac..6cfe5abf85a 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -3,8 +3,8 @@
  * Copyright (C) 2005-2010	Regis Houssin				<regis.houssin@inodbox.com>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
- * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2025		Jon Bendtsen            <jon.bendtsen.github@jonb.dk>
+ * Copyright (C) 2024-2026  Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2025		Jon Bendtsen                <jon.bendtsen.github@jonb.dk>
  * Copyright (C) 2025       Josep Lluís Amador Teruel   <joseplluis@lliuretic.cat>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -32,6 +32,7 @@ require '../../main.inc.php';
 /**
  * @var Conf $conf
  * @var DoliDB $db
+ * @var ExtraFields $extrafields
  * @var HookManager $hookmanager
  * @var Translate $langs
  * @var User $user
@@ -82,7 +83,6 @@ $search_project = GETPOST('search_project', 'alpha');
 
 // Initialize a technical objects
 $object = new Mailing($db);
-$extrafields = new ExtraFields($db);
 if ($projectid > 0) {
 	$hookmanager->initHooks(array('projectmailing', 'globalcard'));
 } else {
diff --git a/htdocs/comm/mailing/note.php b/htdocs/comm/mailing/note.php
index b72bd4b87aa..ee87315edc3 100644
--- a/htdocs/comm/mailing/note.php
+++ b/htdocs/comm/mailing/note.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2007-2017  Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2024-2025  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2024-2026  Frédéric France         <frederic.france@free.fr>
  *
  * 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
@@ -24,17 +24,16 @@
 
 // Load Dolibarr environment
 require '../../main.inc.php';
-
-require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/emailing.lib.php';
-
 /**
  * @var Conf $conf
  * @var DoliDB $db
+ * @var ExtraFields $extrafields
  * @var HookManager $hookmanager
  * @var Translate $langs
  * @var User $user
  */
+require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/emailing.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("mails", "mailing", "companies"));
@@ -48,7 +47,6 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 // Initialize a technical objects
 $object = new Mailing($db);
-$extrafields = new ExtraFields($db);
 $diroutputmassaction = $conf->mailing->dir_output.'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array('mailingnote', 'globalcard')); // Note that conf->hooks_modules contains array
 // Fetch optionals attributes and labels
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 05f06514944..f98dcb8f0ec 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -45,6 +45,15 @@
 
 // Load Dolibarr environment
 require '../../main.inc.php';
+/**
+ * @var Conf $conf
+ * @var DoliDB $db
+ * @var ExtraFields $extrafields
+ * @var HookManager $hookmanager
+ * @var Societe $mysoc
+ * @var Translate $langs
+ * @var User $user
+ */
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
@@ -66,14 +75,6 @@ if (isModEnabled('variants')) {
 	require_once DOL_DOCUMENT_ROOT . '/variants/class/ProductCombination.class.php';
 }
 
-/**
- * @var Conf $conf
- * @var DoliDB $db
- * @var HookManager $hookmanager
- * @var Societe $mysoc
- * @var Translate $langs
- * @var User $user
- */
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'propal', 'compta', 'bills', 'orders', 'products', 'sendings', 'other'));
@@ -109,7 +110,6 @@ $hidedesc = (GETPOSTINT('hidedesc') ? GETPOSTINT('hidedesc') : (getDolGlobalStri
 $hideref = (GETPOSTINT('hideref') ? GETPOSTINT('hideref') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 $object = new Propal($db);
-$extrafields = new ExtraFields($db);
 
 // fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 036f898424d..cf33b2d22a5 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
- * Copyright (C) 2019-2024  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2019-2026  Frédéric France         <frederic.france@free.fr>
  *
  * 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
@@ -28,12 +28,6 @@
 
 // Load Dolibarr environment
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
-require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
-require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
-
 /**
  * @var Conf $conf
  * @var DoliDB $db
@@ -41,6 +35,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
  * @var Translate $langs
  * @var User $user
  */
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
+require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
+
 
 // Load translation files required by the page
 $langs->loadLangs(array('orders', 'bills'));
@@ -50,8 +50,6 @@ if (!$user->hasRight('commande', 'lire')) {
 	accessforbidden();
 }
 
-$hookmanager = new HookManager($db);
-
 // Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array
 $hookmanager->initHooks(array('ordersindex'));
 
diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index 42eba27e714..332e4dbcffd 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2015-2026 Alexandre Spangaro	<alexandre@inovea-conseil.com>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
  * Copyright (C) 2016      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2018-2025 Frédéric France      <frederic.france@free.fr>
+ * Copyright (C) 2018-2026  Frédéric France      <frederic.france@free.fr>
  * Copyright (C) 2021      Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2024-2026	MDW					<mdeweerd@users.noreply.github.com>
  *
@@ -36,6 +36,7 @@ require '../../main.inc.php';
 /**
  * @var Conf $conf
  * @var DoliDB $db
+ * @var ExtraFields $extrafields
  * @var HookManager $hookmanager
  * @var Translate $langs
  * @var User $user
@@ -90,7 +91,6 @@ if (!$user->hasRight('banque', 'lire') && !$user->hasRight('banque', 'consolidat
 }
 
 $object = new AccountLine($db);
-$extrafields = new ExtraFields($db);
 $extrafields->fetch_name_optionals_label($object->element);
 
 if ($id > 0) {
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index d2711e022b1..3429ccf7c4e 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2007-2024 	Laurent Destailleur  	<eldy@users.sourceforge.net>
- * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2024-2026  Frédéric France			<frederic.france@free.fr>
  * Copyright (C) 2025-2026	MDW						<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -28,6 +28,7 @@ require '../../main.inc.php';
 /**
  * @var Conf $conf
  * @var DoliDB $db
+ * @var ExtraFields $extrafields
  * @var HookManager $hookmanager
  * @var Translate $langs
  * @var User $user
@@ -73,7 +74,6 @@ $pagenext = $page + 1;
 
 // Initialize a technical objects
 $object = new CashControl($db);
-$extrafields = new ExtraFields($db);
 //$diroutputmassaction = $conf->mymodule->dir_output.'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array
 
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 9b57b35208e..85fcd2585db 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -52,7 +52,6 @@ if (isModEnabled('project')) {
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'companies', 'compta', 'admin', 'other', 'products', 'banks'));
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index 35e64572768..81660b7b294 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2013-2024	Alexandre Spangaro			<alexandre@inovea-conseil.com>
  * Copyright (C) 2014		Juanjo Menent				<jmenent@2byte.es>
  * Copyright (C) 2015		Jean-François Ferry			<jfefe@aternatik.fr>
- * Copyright (C) 2024-2025  Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2024-2026  Frédéric France			<frederic.france@free.fr>
  *
  * 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
@@ -35,6 +35,7 @@ require '../main.inc.php';
 /**
  * @var Conf $conf
  * @var DoliDB $db
+ * @var ExtraFields $extrafields
  * @var HookManager $hookmanager
  * @var Translate $langs
  * @var User $user
@@ -46,7 +47,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
@@ -61,8 +61,8 @@ $error = 0;
 $errors = array();
 
 // Get parameters
-$action		= (GETPOST('action', 'alpha') ? GETPOST('action', 'alpha') : 'view');
-$confirm	= GETPOST('confirm', 'alpha');
+$action = (GETPOST('action', 'alpha') ? GETPOST('action', 'alpha') : 'view');
+$confirm = GETPOST('confirm', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ09');
 
@@ -71,7 +71,6 @@ $socid = GETPOSTINT('socid');
 
 // Initialize objects
 $object = new Contact($db);
-$extrafields = new ExtraFields($db);
 
 // fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 9f30549754b..d45ffa78563 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2013-2024	Alexandre Spangaro			<alexandre@inovea-conseil.com>
  * Copyright (C) 2014		Juanjo Menent				<jmenent@2byte.es>
  * Copyright (C) 2015		Jean-François Ferry			<jfefe@aternatik.fr>
- * Copyright (C) 2018-2025  Frédéric France				<frederic.france@free.fr>
+ * Copyright (C) 2018-2026  Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2019		Josep Lluís Amador			<joseplluis@lliuretic.cat>
  * Copyright (C) 2020-2026	Open-Dsi					<support@open-dsi.fr>
  * Copyright (C) 2024-2026	MDW							<mdeweerd@users.noreply.github.com>
@@ -36,6 +36,15 @@
 
 // Load Dolibarr environment
 require '../main.inc.php';
+/**
+ * @var Conf $conf
+ * @var DoliDB $db
+ * @var ExtraFields $extrafields
+ * @var HookManager $hookmanager
+ * @var Societe $mysoc
+ * @var Translate $langs
+ * @var User $user
+ */
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php';
@@ -44,21 +53,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
-/**
- * @var Conf $conf
- * @var DoliDB $db
- * @var HookManager $hookmanager
- * @var Societe $mysoc
- * @var Translate $langs
- * @var User $user
- */
-
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'users', 'other', 'commercial'));
 
@@ -75,7 +74,6 @@ $socid = GETPOSTINT('socid');
 
 // Initialize a technical object
 $object = new Contact($db);
-$extrafields = new ExtraFields($db);
 
 // fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index a4e410e1dbe..5bb362af0a8 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2014		Jean Heimburger				<jean@tiaris.info>
  * Copyright (C) 2015		Marcos García				<marcosgdf@gmail.com>
  * Copyright (C) 2015		Raphaël Doursenaud			<rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2021-2025  Frédéric France				<frederic.france@free.fr>
+ * Copyright (C) 2021-2026  Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2024-2026	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
  *
@@ -33,6 +33,15 @@
 
 // Load Dolibarr environment
 require '../main.inc.php';
+/**
+ * @var Conf $conf
+ * @var DoliDB $db
+ * @var ExtraFields $extrafields
+ * @var HookManager $hookmanager
+ * @var Societe $mysoc
+ * @var Translate $langs
+ * @var User $user
+ */
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture-rec.class.php';
@@ -40,7 +49,6 @@ require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 if (isModEnabled('member')) {
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 }
@@ -49,15 +57,6 @@ if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 }
 
-/**
- * @var Conf $conf
- * @var DoliDB $db
- * @var HookManager $hookmanager
- * @var Societe $mysoc
- * @var Translate $langs
- * @var User $user
- */
-
 // Load translation files required by page
 $langs->loadLangs(array('accountancy', 'companies', 'suppliers', 'products', 'bills', 'orders', 'commercial'));
 
@@ -75,7 +74,6 @@ $hookmanager->initHooks(array('thirdpartysupplier', 'globalcard'));
 $result = restrictedArea($user, 'societe&fournisseur', $id, '&societe', '', 'rowid');
 
 $object = new Fournisseur($db);
-$extrafields = new ExtraFields($db);
 
 // fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
diff --git a/htdocs/modulebuilder/template/stats/myobject_index.php b/htdocs/modulebuilder/template/stats/myobject_index.php
index 55d542a7895..bb673216be3 100644
--- a/htdocs/modulebuilder/template/stats/myobject_index.php
+++ b/htdocs/modulebuilder/template/stats/myobject_index.php
@@ -174,8 +174,10 @@ $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbiny
 
 
 $px1 = new DolGraph();
+$displaypx1 = false;
 $mesg = $px1->isGraphKo();
 if (!$mesg) {
+	$displaypx1 = true;
 	$px1->SetData($data);
 	$i = $startyear;
 	$legend = array();
@@ -225,8 +227,10 @@ if (!$user->hasRight('societe', 'client', 'voir')) {
 }
 
 $px2 = new DolGraph();
+$displaypx2 = false;
 $mesg = $px2->isGraphKo();
 if (!$mesg) {
+	$displaypx2 = true;
 	$px2->SetData($data);
 	$i = $startyear;
 	$legend = array();
@@ -273,8 +277,10 @@ if (!$user->hasRight('societe', 'client', 'voir')) {
 }
 
 $px3 = new DolGraph();
+$displaypx3 = false;
 $mesg = $px3->isGraphKo();
 if (!$mesg) {
+	$displaypx3 = true;
 	$px3->SetData($data);
 	$i = $startyear;
 	$legend = array();
@@ -435,16 +441,16 @@ print '<table class="border centpercent"><tr class="pair nohover"><td align="cen
 if ($mesg) {
 	print $mesg;
 } else {
-	if (isset($px1)) {
+	if ($displaypx1) {
 		print $px1->show();
 		print "<br>\n";
 	}
 	/*
-	if (isset($px2)) {
+	if ($displaypx2) {
 		print $px2->show();
 		print "<br>\n";
 	}
-	if (isset($px2)) {
+	if ($displaypx3) {
 		print $px3->show();
 		print "<br>\n";
 	}
diff --git a/htdocs/ticket/stats/index.php b/htdocs/ticket/stats/index.php
index 37dd4c898bf..e4af4203f23 100644
--- a/htdocs/ticket/stats/index.php
+++ b/htdocs/ticket/stats/index.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2019 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2024-2025	MDW				<mdeweerd@users.noreply.github.com>
- * Copyright (C) 2024-2025  Frédéric France         <frederic.france@free.fr>
+/* Copyright (C) 2019       Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2024-2025	MDW				        <mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2026  Frédéric France         <frederic.france@free.fr>
  *
  * 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
@@ -25,10 +25,6 @@
 
 // Load Dolibarr environment
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/ticket/class/actions_ticket.class.php';
-require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticketstats.class.php';
-require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 /**
  * @var Conf $conf
  * @var DoliDB $db
@@ -36,6 +32,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
  * @var Translate $langs
  * @var User $user
  */
+require_once DOL_DOCUMENT_ROOT.'/ticket/class/actions_ticket.class.php';
+require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticketstats.class.php';
+require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 
 $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
 $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
@@ -85,16 +85,18 @@ $help_url = '';
 
 llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-ticket page-stats');
 
-$param = '';
-$mode = 'statistics';
-$url = DOL_URL_ROOT.'/ticket/card.php?action=create&mode=init'.($socid ? '&socid='.$socid : '');
+$params = [
+	'action' => 'create',
+	'mode' => 'init',
+];
 if (!empty($socid)) {
-	$url .= '&socid='.$socid;
+	$params += ['socid' => $socid];
 }
+$url = dolBuildUrl(DOL_URL_ROOT.'/ticket/card.php', $params);
 $newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/ticket/list.php?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', DOL_URL_ROOT.'/ticket/list.php?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('Statistics'), '', 'fa fa-chart-bar imgforviewmode', DOL_URL_ROOT.'/ticket/stats/index.php?mode=statistics&objecttype=ticket@ticket'.preg_replace('/(&|\?)*(mode|groupby)=[^&]+/', '', $param), '', ($mode == 'statistics' ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/ticket/list.php?mode=common', '', 1, array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', DOL_URL_ROOT.'/ticket/list.php?mode=kanban', '', 1, array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('Statistics'), '', 'fa fa-chart-bar imgforviewmode', DOL_URL_ROOT.'/ticket/stats/index.php?mode=statistics&objecttype=ticket@ticket', '', 2, array('morecss' => 'reposition'));
 $newcardbutton .= dolGetButtonTitleSeparator();
 $newcardbutton .= dolGetButtonTitle($langs->trans('NewTicket'), '', 'fa fa-plus-circle', $url, '', $user->hasRight('ticket', 'write'));
 
@@ -111,7 +113,6 @@ if ($object_status != '' && $object_status >= -1) {
 // Build graphic number of object
 $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 
-//var_dump($data);
 // $data = array(array('Lib',val1,val2,val3),...)
 
 
@@ -149,9 +150,8 @@ if (!$mesg) {
 
 // Build graphic amount of object
 $data = $stats->getAmountByMonthWithPrevYear($endyear, $startyear);
-//var_dump($data);
-// $data = array(array('Lib',val1,val2,val3),...)
 
+// $data = array(array('Lib',val1,val2,val3),...)
 
 // Show array
 $data = $stats->getAllByYear();

From 3e2830a5d8fd5ad102183d48fa4acd1728c1ef29 Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <github@jonb.dk>
Date: Mon, 18 May 2026 02:46:49 +0200
Subject: [PATCH 37/48] feat(eventorganization): Add database schema for
 participant capacity (#38248)

- Add 'max_participants' column to llx_actioncomm table (nullable)
- Add index 'idx_actioncomm_max_participants' for performance optimization
- Update table definition and key files for fresh installs
- Update migration script for existing installations

This column defines the maximum number of participants allowed for a session.
NULL means unlimited. This is used for events, meetings, and volunteer shifts.

This commit only contains database structure changes (SQL files).
PHP logic and UI implementation will follow in subsequent PRs.

Fixes #38247

Co-authored-by: Jon Bendtsen <jonbendtsen@jonb.dk>
---
 htdocs/install/mysql/migration/23.0.0-24.0.0.sql   | 2 ++
 htdocs/install/mysql/tables/llx_actioncomm.key.sql | 1 +
 htdocs/install/mysql/tables/llx_actioncomm.sql     | 1 +
 3 files changed, 4 insertions(+)

diff --git a/htdocs/install/mysql/migration/23.0.0-24.0.0.sql b/htdocs/install/mysql/migration/23.0.0-24.0.0.sql
index 1090814360f..7c354d7933c 100644
--- a/htdocs/install/mysql/migration/23.0.0-24.0.0.sql
+++ b/htdocs/install/mysql/migration/23.0.0-24.0.0.sql
@@ -530,4 +530,6 @@ ALTER TABLE llx_product_warehouse_properties ADD INDEX idx_product_warehouse_pro
 ALTER TABLE llx_product_warehouse_properties ADD CONSTRAINT fk_product_warehouse_properties_fk_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid);
 ALTER TABLE llx_product_warehouse_properties ADD CONSTRAINT fk_product_warehouse_properties_fk_entrepot FOREIGN KEY (fk_entrepot) REFERENCES llx_entrepot (rowid);
 
+ALTER TABLE llx_actioncomm ADD COLUMN max_participants integer DEFAULT NULL AFTER status;
+ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_max_participants (max_participants);
 -- end of migration
diff --git a/htdocs/install/mysql/tables/llx_actioncomm.key.sql b/htdocs/install/mysql/tables/llx_actioncomm.key.sql
index 452a81dbf21..bee117d626d 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm.key.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm.key.sql
@@ -30,5 +30,6 @@ ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_ref_ext (ref_ext);
 ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_percent (percent);
 
 ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_ref (ref, entity);
+ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_max_participants (max_participants);
 -- To test performance to get fast next num on actioncomm
 -- ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_entity_id (entity, id);
diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql
index aab0efb1090..dd220a17ec6 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm.sql
@@ -76,6 +76,7 @@ create table llx_actioncomm
   num_vote          integer DEFAULT NULL,          -- use for Event Organization module
   event_paid        smallint NOT NULL DEFAULT 0,    -- use for Event Organization module
   status            smallint NOT NULL DEFAULT 0,    -- use for Event Organization module for now, but could be use after for event global status
+  max_participants  integer DEFAULT NULL,           -- Maximum number of participants allowed for this action (event, meeting, shift)
 
   fk_element		integer DEFAULT NULL,			-- For link to an element (proposal, invoice, order, ...)
   elementtype		varchar(255) DEFAULT NULL,		-- For link to an element (proposal, invoice, order, ...)

From fe85114b37d385000b9f393a869fd80c4a52618d Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <github@jonb.dk>
Date: Mon, 18 May 2026 02:55:36 +0200
Subject: [PATCH 38/48] FIX #37453 AJAX tooltip for project tasks always shows
 "Access Forbidden" for restricted users (#38262)

Co-authored-by: Jon Bendtsen <jonbendtsen@jonb.dk>
---
 htdocs/core/lib/security.lib.php | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 4c7ac5b137c..49d587073ca 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -546,13 +546,20 @@ function restrictedArea(User $user, $features, $object = 0, $tableandshare = '',
 		$feature2 = 'evaluation';
 	}
 
-	// @todo check : project_task
-	// @todo possible ?
-	// elseif (substr($features, -3, 3) == 'det') {
-	// 	$features = substr($features, 0, -3);
-	// } elseif (substr($features, -4, 4) == '_det' || substr($features, -4, 4) == 'line') {
-	// 	$features = substr($features, 0, -4);
-	// }
+	// When the object is a task (element='project_task') and $feature2 is empty,
+	// $checkUserAccessToObject() falls into the $checkproject path and uses the task ID
+	// as project ID, which always fails. Setting $feature2='project_task' triggers the
+	// normalization at line 974 that redirects to the $checktask path, which correctly
+	// resolves $task->fk_project before calling getProjectsAuthorizedForUser().
+	if (is_object($object) && in_array($object->element, array('project_task', 'task'))
+		&& (empty($features) || in_array($features, array('projet', 'project')))
+		&& empty($feature2)) {
+		$features = 'projet';
+		$feature2 = 'project_task';
+		if (empty($tableandshare)) {
+			$tableandshare = 'projet_task';
+		}
+	}
 
 	// print $features.' - '.$tableandshare.' - '.$feature2.' - '.$dbt_select."\n";
 

From a74de0be974636dcf55e94918c6eb98944d55388 Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <github@jonb.dk>
Date: Mon, 18 May 2026 02:59:42 +0200
Subject: [PATCH 39/48] fix(action): map eventorganization permissions to
 projet for linked actions (#38253)

When creating or updating an action linked to an event organization element
(e.g., conferenceorboothattendee), the permission check was failing because
the module 'eventorganization' does not have its own 'read' right in the
standard permission matrix; it relies on the 'projet' (Project) module.

This change maps 'eventorganization' to 'projet' during the permission check,
aligning with how restrictedArea() handles this module.

Also refactors the existing 'productbatch' mapping to use a switch statement
for better readability and consistency across the three action blocks.

Co-authored-by: Jon Bendtsen <jonbendtsen@jonb.dk>
---
 htdocs/comm/action/card.php | 50 +++++++++++++++++++++++++++++++------
 1 file changed, 43 insertions(+), 7 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 0128132d681..ccefebf0843 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -419,11 +419,22 @@ if (empty($reshook) && $action == 'add' && $usercancreate) {
 			$elProp = getElementProperties(GETPOST("elementtype", 'alpha'));
 			$modulecodetouseforpermissioncheck = $elProp['module'];
 			// Keep permission check aligned with rights class aliases (see restrictedArea()).
-			if ($modulecodetouseforpermissioncheck == 'productbatch') {
-				$modulecodetouseforpermissioncheck = 'produit';
-			}
 			$submodulecodetouseforpermissioncheck = $elProp['subelement'];
 
+			switch ($modulecodetouseforpermissioncheck) {
+				case 'productbatch':
+					$modulecodetouseforpermissioncheck = 'produit';
+					break;
+				case 'eventorganization':
+					// Event organization relies on Project permissions
+					$modulecodetouseforpermissioncheck = 'projet';
+					$submodulecodetouseforpermissioncheck = ''; // Project doesn't use submodules for read
+					break;
+				default:
+					// No mapping needed, keep original values
+					break;
+			}
+
 			$hasPermissionOnLinkedObject = 0;
 			if ($user->hasRight($modulecodetouseforpermissioncheck, 'read')) {
 				$hasPermissionOnLinkedObject = 1;
@@ -1000,8 +1011,20 @@ if (empty($reshook) && $action == 'update' && $usercancreate) {
 			$elProp = getElementProperties(GETPOST("elementtype", 'alpha'));
 			$modulecodetouseforpermissioncheck = $elProp['module'];
 			// Keep permission check aligned with rights class aliases (see restrictedArea()).
-			if ($modulecodetouseforpermissioncheck == 'productbatch') {
-				$modulecodetouseforpermissioncheck = 'produit';
+			$submodulecodetouseforpermissioncheck = $elProp['subelement'];
+
+			switch ($modulecodetouseforpermissioncheck) {
+				case 'productbatch':
+					$modulecodetouseforpermissioncheck = 'produit';
+					break;
+				case 'eventorganization':
+					// Event organization relies on Project permissions
+					$modulecodetouseforpermissioncheck = 'projet';
+					$submodulecodetouseforpermissioncheck = ''; // Project doesn't use submodules for read
+					break;
+				default:
+					// No mapping needed, keep original values
+					break;
 			}
 
 			$hasPermissionOnLinkedObject = 0;
@@ -1868,9 +1891,22 @@ if ($action == 'create') {
 		$elProp = getElementProperties($origin);
 		$modulecodetouseforpermissioncheck = $elProp['module'];
 		// Keep permission check aligned with rights class aliases (see restrictedArea()).
-		if ($modulecodetouseforpermissioncheck == 'productbatch') {
-			$modulecodetouseforpermissioncheck = 'produit';
+		$submodulecodetouseforpermissioncheck = $elProp['subelement'];
+
+		switch ($modulecodetouseforpermissioncheck) {
+			case 'productbatch':
+				$modulecodetouseforpermissioncheck = 'produit';
+				break;
+			case 'eventorganization':
+				// Event organization relies on Project permissions
+				$modulecodetouseforpermissioncheck = 'projet';
+				$submodulecodetouseforpermissioncheck = ''; // Project doesn't use submodules for read
+				break;
+			default:
+				// No mapping needed, keep original values
+				break;
 		}
+
 		if ($user->hasRight($modulecodetouseforpermissioncheck, 'read') || $user->hasRight($modulecodetouseforpermissioncheck, $elProp['element'], 'read')) {
 			$hasPermissionOnLinkedObject = 1;
 		}

From 24bba6caa9a6cdd6a74987b9c01182a1271ad281 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 May 2026 03:01:50 +0200
Subject: [PATCH 40/48] Qual: Fix PHPStan for ldap, pgsql, odtphp (#38246)

# Qual: Fix PHPStan for ldap, pgsql, odtphp

- Adjust typing in ldap and pgsql class to fix PHPStan notices;
- Exclude all files for odtphp from analysis (external lib);
- Update PHPStan baseline.
---
 dev/build/phpstan/phpstan-baseline.neon   | 372 ----------------------
 dev/tools/phpstan/phpstan_v1_apstats.neon |   2 +-
 htdocs/core/class/ldap.class.php          |  15 +-
 htdocs/core/db/pgsql.class.php            |  10 +-
 phpstan.neon.dist                         |   2 +-
 5 files changed, 18 insertions(+), 383 deletions(-)

diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index d467bb26174..6cb58c24b51 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -2664,12 +2664,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/ajax/ajaxdirpreview.php
 
-		-
-			message: '#^Variable \$action might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/ajax/ajaxdirtree.php
-
 		-
 			message: '#^Variable \$original_file might not be defined\.$#'
 			identifier: variable.undefined
@@ -3306,144 +3300,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/class/interfaces.class.php
 
-		-
-			message: '#^If condition is always false\.$#'
-			identifier: if.alwaysFalse
-			count: 1
-			path: ../../../htdocs/core/class/ldap.class.php
-
-		-
-			message: '#^Negated boolean expression is always true\.$#'
-			identifier: booleanNot.alwaysTrue
-			count: 2
-			path: ../../../htdocs/core/class/ldap.class.php
-
-		-
-			message: '#^Parameter \#1 \$ldap of function ldap_add expects LDAP\\Connection, resource\|true given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/class/ldap.class.php
-
-		-
-			message: '#^Parameter \#1 \$ldap of function ldap_bind expects LDAP\\Connection, bool\|resource given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/class/ldap.class.php
-
-		-
-			message: '#^Parameter \#1 \$ldap of function ldap_delete expects LDAP\\Connection, resource\|true given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/class/ldap.class.php
-
-		-
-			message: '#^Parameter \#1 \$ldap of function ldap_errno expects LDAP\\Connection, bool\|resource given\.$#'
-			identifier: argument.type
-			count: 9
-			path: ../../../htdocs/core/class/ldap.class.php
-
-		-
-			message: '#^Parameter \#1 \$ldap of function ldap_errno expects LDAP\\Connection, resource\|true given\.$#'
-			identifier: argument.type
-			count: 3
-			path: ../../../htdocs/core/class/ldap.class.php
-
-		-
-			message: '#^Parameter \#1 \$ldap of function ldap_error expects LDAP\\Connection, bool\|resource given\.$#'
-			identifier: argument.type
-			count: 9
-			path: ../../../htdocs/core/class/ldap.class.php
-
-		-
-			message: '#^Parameter \#1 \$ldap of function ldap_error expects LDAP\\Connection, resource\|true given\.$#'
-			identifier: argument.type
-			count: 8
-			path: ../../../htdocs/core/class/ldap.class.php
-
-		-
-			message: '#^Parameter \#1 \$ldap of function ldap_first_entry expects LDAP\\Connection, bool\|resource given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/class/ldap.class.php
-
-		-
-			message: '#^Parameter \#1 \$ldap of function ldap_first_entry expects LDAP\\Connection, resource\|true given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/class/ldap.class.php
-
-		-
-			message: '#^Parameter \#1 \$ldap of function ldap_get_attributes expects LDAP\\Connection, resource\|true given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/class/ldap.class.php
-
-		-
-			message: '#^Parameter \#1 \$ldap of function ldap_get_entries expects LDAP\\Connection, bool\|resource given\.$#'
-			identifier: argument.type
-			count: 3
-			path: ../../../htdocs/core/class/ldap.class.php
-
-		-
-			message: '#^Parameter \#1 \$ldap of function ldap_get_option expects LDAP\\Connection, bool\|resource given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/class/ldap.class.php
-
-		-
-			message: '#^Parameter \#1 \$ldap of function ldap_get_values_len expects LDAP\\Connection, bool\|resource given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/class/ldap.class.php
-
-		-
-			message: '#^Parameter \#1 \$ldap of function ldap_mod_add expects LDAP\\Connection, resource\|true given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/class/ldap.class.php
-
-		-
-			message: '#^Parameter \#1 \$ldap of function ldap_mod_del expects LDAP\\Connection, resource\|true given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/class/ldap.class.php
-
-		-
-			message: '#^Parameter \#1 \$ldap of function ldap_mod_replace expects LDAP\\Connection, resource\|true given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/class/ldap.class.php
-
-		-
-			message: '#^Parameter \#1 \$ldap of function ldap_rename expects LDAP\\Connection, resource\|true given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/class/ldap.class.php
-
-		-
-			message: '#^Parameter \#1 \$ldap of function ldap_search expects array\|LDAP\\Connection, bool\|resource given\.$#'
-			identifier: argument.type
-			count: 6
-			path: ../../../htdocs/core/class/ldap.class.php
-
-		-
-			message: '#^Parameter \#1 \$ldap of function ldap_search expects array\|LDAP\\Connection, resource\|true given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/class/ldap.class.php
-
-		-
-			message: '#^Parameter \#1 \$ldap of function ldap_set_option expects LDAP\\Connection\|null, bool\|resource given\.$#'
-			identifier: argument.type
-			count: 3
-			path: ../../../htdocs/core/class/ldap.class.php
-
-		-
-			message: '#^Parameter \#1 \$ldap of function ldap_unbind expects LDAP\\Connection, resource given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/class/ldap.class.php
-
 		-
 			message: '#^Negated boolean expression is always true\.$#'
 			identifier: booleanNot.alwaysTrue
@@ -3600,48 +3456,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/db/mysqli.class.php
 
-		-
-			message: '#^Parameter \#1 \$result of function pg_affected_rows expects PgSql\\Result, bool\|resource given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/db/pgsql.class.php
-
-		-
-			message: '#^Parameter \#1 \$result of function pg_fetch_array expects PgSql\\Result, bool\|resource given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/db/pgsql.class.php
-
-		-
-			message: '#^Parameter \#1 \$result of function pg_fetch_object expects PgSql\\Result, bool\|resource given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/db/pgsql.class.php
-
-		-
-			message: '#^Parameter \#1 \$result of function pg_fetch_row expects PgSql\\Result, bool\|resource given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/db/pgsql.class.php
-
-		-
-			message: '#^Parameter \#1 \$result of function pg_free_result expects PgSql\\Result, resource given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/db/pgsql.class.php
-
-		-
-			message: '#^Parameter \#1 \$result of function pg_num_rows expects PgSql\\Result, resource\|true given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/db/pgsql.class.php
-
-		-
-			message: '#^Parameter \#1 \$resultset of method DoliDBPgsql\:\:fetch_row\(\) expects resource, PgSql\\Result given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/db/pgsql.class.php
-
 		-
 			message: '#^Variable \$conf might not be defined\.$#'
 			identifier: variable.undefined
@@ -4026,18 +3840,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/login/functions_ldap.php
 
-		-
-			message: '#^Parameter \#1 \$ldap of function ldap_errno expects LDAP\\Connection, resource given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/login/functions_ldap.php
-
-		-
-			message: '#^Parameter \#1 \$ldap of function ldap_error expects LDAP\\Connection, resource given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/login/functions_ldap.php
-
 		-
 			message: '#^If condition is always true\.$#'
 			identifier: if.alwaysTrue
@@ -5844,180 +5646,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/imports/import.php
 
-		-
-			message: '#^Class Segment implements generic interface IteratorAggregate but does not specify its types\: TKey, TValue$#'
-			identifier: missingType.generics
-			count: 1
-			path: ../../../htdocs/includes/odtphp/Segment.php
-
-		-
-			message: '#^Default value of the parameter \#3 \$encode \(true\) of method Segment\:\:setVars\(\) is incompatible with type string\.$#'
-			identifier: parameter.defaultValue
-			count: 1
-			path: ../../../htdocs/includes/odtphp/Segment.php
-
-		-
-			message: '#^Method Segment\:\:__call\(\) has parameter \$args with no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../../../htdocs/includes/odtphp/Segment.php
-
-		-
-			message: '#^Method Segment\:\:macroReplace\(\) has no return type specified\.$#'
-			identifier: missingType.return
-			count: 1
-			path: ../../../htdocs/includes/odtphp/Segment.php
-
-		-
-			message: '#^Parameter \#3 \$encode of method Segment\:\:setVars\(\) expects string, false given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/includes/odtphp/Segment.php
-
-		-
-			message: '#^Property Segment\:\:\$children has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/includes/odtphp/Segment.php
-
-		-
-			message: '#^Property Segment\:\:\$file has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/includes/odtphp/Segment.php
-
-		-
-			message: '#^Property Segment\:\:\$images has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/includes/odtphp/Segment.php
-
-		-
-			message: '#^Property Segment\:\:\$odf has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/includes/odtphp/Segment.php
-
-		-
-			message: '#^Property Segment\:\:\$vars has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/includes/odtphp/Segment.php
-
-		-
-			message: '#^Class SegmentIterator implements generic interface RecursiveIterator but does not specify its types\: TKey, TValue$#'
-			identifier: missingType.generics
-			count: 1
-			path: ../../../htdocs/includes/odtphp/SegmentIterator.php
-
-		-
-			message: '#^Method SegmentIterator\:\:__construct\(\) has parameter \$ref with no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../../../htdocs/includes/odtphp/SegmentIterator.php
-
-		-
-			message: '#^Method SegmentIterator\:\:getChildren\(\) return type with generic interface RecursiveIterator does not specify its types\: TKey, TValue$#'
-			identifier: missingType.generics
-			count: 1
-			path: ../../../htdocs/includes/odtphp/SegmentIterator.php
-
-		-
-			message: '#^Property SegmentIterator\:\:\$key has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/includes/odtphp/SegmentIterator.php
-
-		-
-			message: '#^Property SegmentIterator\:\:\$keys has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/includes/odtphp/SegmentIterator.php
-
-		-
-			message: '#^Property SegmentIterator\:\:\$ref has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/includes/odtphp/SegmentIterator.php
-
-		-
-			message: '#^Method Odf\:\:__construct\(\) has parameter \$config with no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../../../htdocs/includes/odtphp/odf.php
-
-		-
-			message: '#^Method Odf\:\:_getDataFromHtml\(\) return type has no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../../../htdocs/includes/odtphp/odf.php
-
-		-
-			message: '#^Method Odf\:\:_isHtmlTag\(\) is unused\.$#'
-			identifier: method.unused
-			count: 1
-			path: ../../../htdocs/includes/odtphp/odf.php
-
-		-
-			message: '#^Method Odf\:\:_replaceHtmlWithOdtTag\(\) has parameter \$customStyles with no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../../../htdocs/includes/odtphp/odf.php
-
-		-
-			message: '#^Method Odf\:\:_replaceHtmlWithOdtTag\(\) has parameter \$fontDeclarations with no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../../../htdocs/includes/odtphp/odf.php
-
-		-
-			message: '#^Method Odf\:\:_replaceHtmlWithOdtTag\(\) has parameter \$tags with no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../../../htdocs/includes/odtphp/odf.php
-
-		-
-			message: '#^Method Odf\:\:getConfig\(\) should return string but returns false\.$#'
-			identifier: return.type
-			count: 1
-			path: ../../../htdocs/includes/odtphp/odf.php
-
-		-
-			message: '#^Parameter \#1 \$prefix of function uniqid expects string, int\<0, max\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/includes/odtphp/odf.php
-
-		-
-			message: '#^Property Odf\:\:\$config has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/includes/odtphp/odf.php
-
-		-
-			message: '#^Property Odf\:\:\$images has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/includes/odtphp/odf.php
-
-		-
-			message: '#^Property Odf\:\:\$segments has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/includes/odtphp/odf.php
-
-		-
-			message: '#^Property Odf\:\:\$userdefined has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/includes/odtphp/odf.php
-
-		-
-			message: '#^Property Odf\:\:\$vars has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/includes/odtphp/odf.php
-
 		-
 			message: '#^Ternary operator condition is always true\.$#'
 			identifier: ternary.alwaysTrue
diff --git a/dev/tools/phpstan/phpstan_v1_apstats.neon b/dev/tools/phpstan/phpstan_v1_apstats.neon
index e434a36a4af..79299d145bc 100644
--- a/dev/tools/phpstan/phpstan_v1_apstats.neon
+++ b/dev/tools/phpstan/phpstan_v1_apstats.neon
@@ -32,7 +32,7 @@ parameters:
 		- htdocs/includes/mobiledetect/*
 		- htdocs/includes/nusoap/*
 		- htdocs/includes/OAuth/*
-		- htdocs/includes/odtphp/zip/*
+		- htdocs/includes/odtphp/*
 		- htdocs/includes/parsedown/*
 		- htdocs/includes/php-iban/*
 		- htdocs/includes/phpoffice/*
diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index 92f57ff1d31..054d05a469c 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -30,7 +30,7 @@
  *  Note:
  *  LDAP_ESCAPE_FILTER is to escape char  array('\\', '*', '(', ')', "\x00")
  *  LDAP_ESCAPE_DN is to escape char  array('\\', ',', '=', '+', '<', '>', ';', '"', '#')
- *  @phan-file-suppress PhanTypeMismatchArgumentInternal (notifications concern 'resource)
+ *  @phan-file-suppress PhanTypeMismatchArgumentInternal (notifications concern 'resource')
  */
 
 /**
@@ -242,7 +242,8 @@ class Ldap
 	public $ldapcharset = 'UTF-8';
 
 	/**
-	 * @var bool|resource	The internal LDAP connection handle. Was a resource before PHP 8.1 and is an object of class LDAP\Connection since PHP 8.1
+	 * @var false|resource	The internal LDAP connection handle. Was a resource before PHP 8.1 and is an object of class LDAP\Connection since PHP 8.1
+	 * @phpstan-var LDAP\Connection
 	 */
 	public $connection;
 
@@ -346,7 +347,7 @@ class Ldap
 		if (empty($this->error)) {
 			// Loop on each ldap server
 			foreach ($this->server as $host) {
-				if ($connected) {
+				if ($connected) {  // @phpstan-ignore if.alwaysFalse
 					break;
 				}
 				if (empty($host)) {
@@ -384,7 +385,7 @@ class Ldap
 					}
 				}
 
-				if (is_resource($this->connection) || is_object($this->connection)) {
+				if ($this->connection !== false) {
 					if ($ldapdebug) {
 						dol_syslog(get_class($this)."::connectBind this->connection is ok", LOG_DEBUG);
 					}
@@ -436,7 +437,7 @@ class Ldap
 							}
 						}
 						// Try in anonymous
-						if (!$this->bind) {
+						if (!$this->bind) {  // @phpstan-ignore booleanNot.alwaysTrue
 							dol_syslog(get_class($this)."::connectBind try bind anonymously on ".$host, LOG_DEBUG);
 							$result = $this->bind();
 							if ($result) {
@@ -451,7 +452,7 @@ class Ldap
 					}
 				}
 
-				if (!$connected) {
+				if (!$connected) {  // @phpstan-ignore booleanNot.alwaysTrue
 					$this->unbind();
 				}
 			}	// End loop on each server
@@ -540,7 +541,7 @@ class Ldap
 				}
 			}
 		} else {
-			if (is_resource($this->connection)) {
+			if ($this->connection !== false) {
 				// @phan-suppress-next-line PhanTypeMismatchArgumentInternalReal PhanTypeSuspiciousIndirectVariable
 				$this->result = @ldap_unbind($this->connection);
 			}
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 361037e705f..0aff98276ab 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -62,7 +62,9 @@ class DoliDBPgsql extends DoliDB
 	public $standard_conforming_strings = false;
 
 
-	/** @var resource|boolean Resultset of last query */
+	/**
+	 * @var false|resource|PgSql\Result Resultset of last query
+	 */
 	private $_results;
 
 
@@ -624,7 +626,8 @@ class DoliDBPgsql extends DoliDB
 	/**
 	 *	Return datas as an array
 	 *
-	 *	@param	resource	$resultset  Resultset of request
+	 *	@param	bool|resource	$resultset  Resultset of request
+	 *	@phpstan-param	bool|resource|PgSql\Result	$resultset
 	 *	@return	array<int,mixed>|null|int<0,0>	Array or null if KO or end of cursor or 0 if resultset is bool
 	 */
 	public function fetch_row($resultset)
@@ -634,6 +637,9 @@ class DoliDBPgsql extends DoliDB
 		if (!is_resource($resultset) && !is_object($resultset)) {
 			$resultset = $this->_results;
 		}
+		if (is_bool($resultset)) {
+			return 0;
+		}
 		return pg_fetch_row($resultset);  // @phan-suppress-current-line PhanTypeMismatchArgumentProbablyReal
 	}
 
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 325dc931c05..49d7457ddcc 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -34,7 +34,7 @@ parameters:
 		- htdocs/includes/mobiledetect/*
 		- htdocs/includes/nusoap/*
 		- htdocs/includes/OAuth/*
-		- htdocs/includes/odtphp/zip/*
+		- htdocs/includes/odtphp/*
 		- htdocs/includes/parsedown/*
 		- htdocs/includes/php-iban/*
 		- htdocs/includes/phpoffice/*

From 621f7394a1d38f3bb8c5c5ae1dad24b51948912f Mon Sep 17 00:00:00 2001
From: SINONIDRISSA <159597666+SINONIDRISSA@users.noreply.github.com>
Date: Mon, 18 May 2026 01:03:11 +0000
Subject: [PATCH 41/48] FIX install crash when loading subtotals module
 (#38244)

Co-authored-by: Layidu System <layidu@srv1003773.hstgr.cloud>
---
 htdocs/core/modules/modSubtotals.class.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/core/modules/modSubtotals.class.php b/htdocs/core/modules/modSubtotals.class.php
index bcf6635bdec..45e5826eacd 100644
--- a/htdocs/core/modules/modSubtotals.class.php
+++ b/htdocs/core/modules/modSubtotals.class.php
@@ -33,6 +33,10 @@
 include_once DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php";
 require_once DOL_DOCUMENT_ROOT.'/subtotals/class/commonsubtotal.class.php';
 
+if (!defined('SUBTOTALS_SPECIAL_CODE')) {
+	define('SUBTOTALS_SPECIAL_CODE', 81);
+}
+
 /**
  *		Description and activation class for module subtotals
  */

From 4932d5781fa468fb77dd856020cf9a8317a64297 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 18 May 2026 03:03:59 +0200
Subject: [PATCH 42/48] NEW #35052 Add social contributions for Switzerland
 (#38236)

---
 .../install/mysql/data/llx_c_chargesociales.sql  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/htdocs/install/mysql/data/llx_c_chargesociales.sql b/htdocs/install/mysql/data/llx_c_chargesociales.sql
index 95eb0daa3e6..f7ec00f70ba 100644
--- a/htdocs/install/mysql/data/llx_c_chargesociales.sql
+++ b/htdocs/install/mysql/data/llx_c_chargesociales.sql
@@ -59,6 +59,22 @@ insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code
 insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values (2, 220, 'Prime existence',    		1,1,'TAXBEPRIEXI');
 insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values (2, 230, 'Precompte immobilier',      1,1,'TAXBEPREIMMO');
 
+--
+-- Switzerland
+--
+
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values (6, 600, 'AVS / AI / APG (Basic social contributions grouped)',              1, 1, 'TAXCHBASE');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values (6, 601, 'Old-age insurance (AVS)',                                          1, 1, 'TAXCHAVS');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values (6, 602, 'Disability insurance (AI)',                                        1, 1, 'TAXCHAI');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values (6, 603, 'Income compensation allowance (APG)',                              1, 1, 'TAXCHAPG');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values (6, 604, 'Family allowances (CAF)',                                          1, 1, 'TAXCHAC');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values (6, 605, 'Unemployment insurance (AC)',                                      1, 1, 'TAXCHACHO');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values (6, 606, 'Occupational pension plan (LPP / 2nd pillar)',                     1, 1, 'TAXCHLPP');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values (6, 607, 'Occupational accident insurance (LAA - employer share)',           1, 1, 'TAXCHAA');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values (6, 608, 'Non-occupational accident insurance (LAA - employer share)',       1, 1, 'TAXCHAA-NP');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values (6, 609, 'Health insurance (LAMal - optional employer contribution)',        1, 1, 'TAXCHLAMAL');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values (6, 610, 'Withholding tax (employees taxed at source)',                      1, 1, 'TAXCHIS');
+
 --
 -- Austria
 --

From 4b191b12b474e09bd46fe989381040e9ee4b8e58 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 May 2026 03:05:44 +0200
Subject: [PATCH 43/48] Qual: Upgrade tool versions in pre-commit setup
 (#38233)

* Qual: Upgrade tool versions in pre-commit

* Qual: avoid codespell notice

* Qual: Fix spelling

* Qual: Fix spelling

* Qual: Add spelling exceptions

* Qual: whitespace/line-ending
---
 .pre-commit-config.yaml                       |  9 ++++++---
 ChangeLog                                     | 10 +++++-----
 .../codespell/codespell-lines-ignore.txt      | 17 ++++++++++++++++
 htdocs/ai/js/ai_assistant.js                  |  2 +-
 htdocs/core/class/html.form.class.php         |  2 +-
 htdocs/dav/dav.class.php                      | 20 +++++++++----------
 ...product_warehouse_properties-stock.key.sql |  2 +-
 7 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index e731200142e..58a120c29d0 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -41,6 +41,9 @@ repos:
         exclude_types: [markdown]
       # Fix the end of file
       - id: end-of-file-fixer
+        exclude: |
+          (?x)^(htdocs/public/includes/tinymce/.*
+               )$
       # Check that there are no completely merged file conflicts
       - id: check-merge-conflict
         stages: [pre-rebase, pre-commit, pre-merge-commit]
@@ -66,7 +69,7 @@ repos:
 
   # Check github actions
   - repo: https://github.com/rhysd/actionlint
-    rev: v1.7.11
+    rev: v1.7.12
     hooks:
       - id: actionlint
         stages: [manual]  # To run: pre-commit run -a --hook-stage=manual actionlint
@@ -218,7 +221,7 @@ repos:
 
   # Execute codespell to fix typo errors (setup of codespell into dev/tools/codespell/)
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.4.1
+    rev: v2.4.2
     hooks:
       - id: codespell
         # Due to a current limitation of configuration files,
@@ -269,7 +272,7 @@ repos:
 
   # Check sql file syntax
   - repo: https://github.com/sqlfluff/sqlfluff
-    rev: 4.0.4
+    rev: 4.2.0
     hooks:
       - id: sqlfluff-lint
         stages: [pre-commit, manual]  # manual needed for ci
diff --git a/ChangeLog b/ChangeLog
index 67e1fc2ebad..805f13a58fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1851,7 +1851,7 @@ FIX: PHP8 warning if $conf->reception is checked the old fashion way (#29697)
 FIX: PHP 8 warning on output of successful cronjob (#29922)
 FIX: PHP exception on getSpecialCode (#29646)
 FIX: php warning if cookie doesn’t exist (#29723)
-FIX: pos: invoice date incorrectly set because of timezome mismatches (reverts #36e91da) (#30184)
+FIX: pos: invoice date incorrectly set because of timezone mismatches (reverts #36e91da) (#30184)
 FIX: public project form return an error if SOCIETE_EMAIL_UNIQUE (#29942)
 FIX: REPLENISH MANY FOURN WHEN ORDER ALREADY CREATE (#29710)
 FIX: Supplier Order search on date valid (#30448)
@@ -1967,7 +1967,7 @@ FIX: navigation after filter in subaccount
 FIX: notification: error 500 in fixed emails due to a bad copy/paste (#29580)
 FIX: notification module: for supplier orders (any of the 3 triggers), user can choose an e-mail template in conf, but the conf is not used when sending the notification (#28216)
 FIX: not redirtect when error occurs on updating card (#29388)
-FIX: Not trancate the multicurrency rate shown on cards (even if the global MAIN_MAX_DECIMALS_SHOWN is set to 0) (#28211)
+FIX: Not truncate the multicurrency rate shown on cards (even if the global MAIN_MAX_DECIMALS_SHOWN is set to 0) (#28211)
 FIX: Oauth login
 FIX: Option MAIN_DOC_USE_TIMING can be a string with date format
 FIX: Payment on customer invoice - Remove accountid in url if empty for apply default value (#28156)
@@ -2070,7 +2070,7 @@ FIX: Fix create shipping with product who have negative stocks on warehouse but
 FIX: migration missing 2 columns in llx_resource and 1 in llx_user
 FIX: missing trans
 FIX: notification module: for supplier orders (any of the 3 triggers), user can choose an e-mail template in conf, but the conf is not used when sending the notification (#28216)
-FIX: Not trancate the multicurrency rate shown on cards (even if the global MAIN_MAX_DECIMALS_SHOWN is set to 0) (#28211)
+FIX: Not truncate the multicurrency rate shown on cards (even if the global MAIN_MAX_DECIMALS_SHOWN is set to 0) (#28211)
 FIX: Option MAIN_DOC_USE_TIMING can be a string with date format
 FIX: Payment on customer invoice - Remove accountid in url if empty for apply default value (#28156)
 FIX: Pb in redirect of a website page in USEDOLIBARRSERVER mode
@@ -2630,7 +2630,7 @@ FIX: notification: error 500 in fixed emails due to a bad copy/paste (#29580)
 FIX: notification module: for supplier orders (any of the 3 triggers), user can choose an e-mail template in conf, but the conf is not used when sending the notification (#28216)
 FIX: Not qualified lines for reception (#29473)
 FIX: not redirect when error occurs on updating card (#29388)
-FIX: Not trancate the multicurrency rate shown on cards (even if the global MAIN_MAX_DECIMALS_SHOWN is set to 0) (#28211)
+FIX: Not truncate the multicurrency rate shown on cards (even if the global MAIN_MAX_DECIMALS_SHOWN is set to 0) (#28211)
 FIX: on change ref for bank account attachment are lost (#30529)
 FIX: Option MAIN_DOC_USE_TIMING can be a string with date format
 FIX: orders to bill menu (#30179)
@@ -2642,7 +2642,7 @@ FIX: php8: Fatal when empty $tmpvat is an empty string (no silent conversion to
 FIX: PHP 8 warning on output of successful cronjob (#29922)
 FIX: PHP exception on getSpecialCode (#29646)
 FIX: php warning global conf (#29478)
-FIX: pos: invoice date incorrectly set because of timezome mismatches (reverts #36e91da) (#30184)
+FIX: pos: invoice date incorrectly set because of timezone mismatches (reverts #36e91da) (#30184)
 FIX: public project form return an error if SOCIETE_EMAIL_UNIQUE (#29942)
 FIX: purge files cron: php warnings when rest module enabled (#30919)
 FIX: PUT /thirdparties/{id} and PUT /contacts/{id} should throw exception if update returns < 0 (#29596)
diff --git a/dev/tools/codespell/codespell-lines-ignore.txt b/dev/tools/codespell/codespell-lines-ignore.txt
index feb1f084ef2..32cda44fd5d 100644
--- a/dev/tools/codespell/codespell-lines-ignore.txt
+++ b/dev/tools/codespell/codespell-lines-ignore.txt
@@ -16,6 +16,7 @@
 					jQuery("#mouvement option[value=1]").attr("selected","selected").trigger("change");
 					jQuery("#mouvement").trigger("change");
 				$action = 'transfert';
+				$currentpos = ftell($infp);
 				$date_liv = dol_mktime(GETPOSTINT('rehour'), GETPOSTINT('remin'), GETPOSTINT('resec'), GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
 				$newfiletmp = preg_replace('/\.od(s|t)/i', '', $newfile);
 				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
@@ -29,6 +30,7 @@
 				if (jQuery("#mouvement").val() == \'0\') jQuery("#unitprice").removeAttr("disabled");
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=transfert&token='.newToken().'">'.$langs->trans("TransferStock").'</a>';
 			$action = 'transfert';
+			$currentpos = ftell($infp);
 			$date_com = dol_mktime(GETPOSTINT('rehour'), GETPOSTINT('remin'), GETPOSTINT('resec'), GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 			$date_next_execution = dol_mktime($rehour, $remin, 0, $remonth, $reday, $reyear);
 			$datesubscription = dol_mktime(12, 0, 0, GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
@@ -87,6 +89,7 @@
 	$datepaye = dol_mktime(GETPOSTINT("rehour"), GETPOSTINT("remin"), GETPOSTINT("resec"), GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"), 'tzuserrel');
 	$ensemblereponses = $obj->reponses;
 	$head[$h][1] = $langs->trans('Referers');
+	$infp = fopen($infilename, "rt");
 	$inj += preg_match('/on(dblclick|drag|drop|durationchange|emptied|end|ended|error|focus|focusin|focusout|formdata|gotpointercapture|hashchange|input|invalid)[a-z]*\s*=/i', $val);
 	$opensurveysondage->mail_admin = $_SESSION['adresse'];
 	$pdf->SetXY($savx, $savy);
@@ -108,9 +111,12 @@
 	// Ligne de la periode d'analyse du rapport
 	// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
 	<strong>TaskItem(<em>pID, pName, pStart, pEnd, pColor, pLink, pMile, pRes, pComp, pGroup, pParent, pOpen, pDepend, pCaption, pNotes, pGantt</em>)</strong></p>
+	Issue summary: If a victim had access to a spoofed version of ckeditor.com via HTTP (e.g. due to DNS spoofing, using a hacked public network or mailicious hotspot), then when using a link to the ckeditor.com website it was possible for the attacker to change the current URL of the opening page, even if the opening page was protected with SSL.
+	fclose($infp);
 	if ($action == "transfert") {
 	if (GETPOST('reday')) {
 	if (GETPOSTINT("reyear") && GETPOSTINT("remonth") && GETPOSTINT("reday")) {
+	if (empty($infp)) {
 	print '<option value="1"'.(GETPOST('mouvement') ? ' selected="selected"' : '').'>'.$langs->trans("Delete").'</option>';
 	print '<select name="mouvement" id="mouvement" class="minwidth100 valignmiddle">';
 	print '<td class="left" width="25%">'.$langs->trans("Referers").'</td>';
@@ -127,10 +133,16 @@
 	public $childs = array();
 	public $periode;
 	unset($_SESSION["adresse"]);
+	while ($instr = fgets($infp)) {
           - creat,unitl,alltime,datas,referers
           - informations,medias,uptodate,reenable,crypted,developpers
           - ned
+     claim (excluding declatory judgment actions) against Initial Developer
+    waitFor: (name: string, state?: WaitState) => Promise<void>;
+  Corrected closure based memeory leak - there may be others?
+  Corrected table layout and tweaked display for more consisent presentation. Nice catch from Jonathan Pasquier.
  * Copyright (C) 2019		Cedric Ancelin			<icedo.anc@gmail.com>
+ * This solution does not work in IE, Edge and Safari due to upstream isues:
 $permissiontoadd = $user->hasRight('stock', 'mouvement', 'creer');
 $permissiontodelete = $user->hasRight('stock', 'mouvement', 'creer'); // There is no deletion permission for stock movement as we should never delete
 $permissiontoread = $user->hasRight('stock', 'mouvement', 'lire');
@@ -148,10 +160,15 @@ $usercandelete = (($user->hasRight('stock', 'mouvement', 'supprimer')));
 $usercanread = $user->hasRight('stock', 'mouvement', 'lire');
 $usercanread = (($user->hasRight('stock', 'mouvement', 'lire')));
 $usercanupdatestock = $user->hasRight('stock', 'mouvement', 'creer');
+* Completely reworked themeing via CSS sprites, resulting in only two files per theme
+* Fixed XSS vulnerability in the HTML parser reported by [Maco Cortes](https://www.facebook.com/Maaacoooo).
 * The private array ->status_short, ->statuts and ->status_long are now array ->labelStatusShort and ->labelStatus everywhere.
 - Fix: [ bug #485 ] Configurated amount for public auto-subscription form is not taken into account
 - New: Add proposals into referer page of thirdparty.
+.treeview li.collapsable, .treeview li.expandable { background-position: 0 -176px; }
+Lightweight and flexible transformation of an unordered list into an expandable and collapsable tree, great for unobtrusive navigation enhancements. Supports both location and cookie based persistence.
 NEW: ModuleBuilder: Checkin comments begin and end before each actions
+Takes an unordered list and makes all branches collapsable. The "treeview" class is added if not already present. To hide branches on first display, mark their li elements with the class "closed". If the "collapsed" option is used, mark initially open branches with class "open".
 Vous pouvez voir la progression du ticket en cliquant sur le lien
 for /F "tokens=2 delims=," %%i in ('tasklist /FI "IMAGENAME eq php.exe" /FO CSV /NH') do (
 function checkES($IentOfi, $InumCta)
diff --git a/htdocs/ai/js/ai_assistant.js b/htdocs/ai/js/ai_assistant.js
index 3d3d088abf5..ab175c42f2b 100644
--- a/htdocs/ai/js/ai_assistant.js
+++ b/htdocs/ai/js/ai_assistant.js
@@ -701,7 +701,7 @@ document.addEventListener('DOMContentLoaded', () => {
 
                 class SpeechPipeline {
                     static task = 'automatic-speech-recognition';
-                    static model = 'Xenova/whisper-small.en'; 
+                    static model = 'Xenova/whisper-small.en';
                     static instance = null;
 
                     static async getInstance(progress_callback = null) {
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 62822cfae36..7b9084f71f4 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1123,7 +1123,7 @@ class Form
 	/**
 	 *  Return a select list of country phone calling codes
 	 *
-	 *  @param	string		$selected			Pre-selected phone code value (e.g. "+33")
+	 *  @param	string		$selected			Preselected phone code value (e.g. "+33")
 	 *  @param	string		$htmlname			Name of HTML select element
 	 *  @param	string		$morecss			More CSS classes
 	 *  @param	int			$showempty			Show empty option (1) or not (0)
diff --git a/htdocs/dav/dav.class.php b/htdocs/dav/dav.class.php
index 1d528c9772b..906ead80db3 100644
--- a/htdocs/dav/dav.class.php
+++ b/htdocs/dav/dav.class.php
@@ -61,12 +61,12 @@ class CdavLib
 	/**
 	 * Base sql request for calendar events
 	 *
-	 * @param 	int 		$calid 			Calendar id
+	 * @param 	int 		$calendarId 	Calendar id
 	 * @param 	int|bool	$oid			Oid
 	 * @param	int|bool	$ouri			Ouri
 	 * @return string
 	 */
-	public function getSqlCalEvents($calid, $oid = false, $ouri = false)
+	public function getSqlCalEvents($calendarId, $oid = false, $ouri = false)
 	{
 		// TODO : replace GROUP_CONCAT by
 		$sql = 'SELECT
@@ -94,7 +94,7 @@ class CdavLib
 				FROM '.MAIN_DB_PREFIX.'actioncomm AS a';
 		$sql .= " LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON co.rowid = sp.fk_pays
 				LEFT JOIN '.MAIN_DB_PREFIX.'c_country as cos ON cos.rowid = s.fk_pays
-				WHERE 	a.id IN (SELECT ar.fk_actioncomm FROM '.MAIN_DB_PREFIX.'actioncomm_resources ar WHERE ar.element_type='user' AND ar.fk_element=".((int) $calid).")
+				WHERE 	a.id IN (SELECT ar.fk_actioncomm FROM '.MAIN_DB_PREFIX.'actioncomm_resources ar WHERE ar.element_type='user' AND ar.fk_element=".((int) $calendarId).")
 						AND a.code IN (SELECT cac.code FROM '.MAIN_DB_PREFIX.'c_actioncomm cac WHERE cac.type <> 'systemauto')
 						AND a.entity IN (".getEntity('societe', 1).")";
 		// TODO Restrict on external users
@@ -112,11 +112,11 @@ class CdavLib
 	/**
 	 * Convert calendar row to VCalendar string
 	 *
-	 * @param 	int		$calid		Calendar id
+	 * @param 	int		$calendarId	Calendar id
 	 * @param	Object	$obj		Object id
 	 * @return string
 	 */
-	public function toVCalendar($calid, $obj)
+	public function toVCalendar($calendarId, $obj)
 	{
 		/*$categ = array();
 		if($obj->soc_client)
@@ -169,7 +169,7 @@ class CdavLib
 		$caldata .= "LAST-MODIFIED:".gmdate('Ymd\THis', strtotime($obj->lastupd))."Z\n";
 		$caldata .= "DTSTAMP:".gmdate('Ymd\THis', strtotime($obj->lastupd))."Z\n";
 		if ($obj->sourceuid == '') {
-			$caldata .= "UID:".$obj->id.'-ev-'.$calid.'-cal-'.constant('CDAV_URI_KEY')."\n";
+			$caldata .= "UID:".$obj->id.'-ev-'.$calendarId.'-cal-'.constant('CDAV_URI_KEY')."\n";
 		} else {
 			$caldata .= "UID:".$obj->sourceuid."\n";
 		}
@@ -251,24 +251,24 @@ class CdavLib
 	 */
 	public function getFullCalendarObjects($calendarId, $bCalendarData)
 	{
-		$calid = (int) $calendarId;
+		$calendarId = (int) $calendarId;
 		$calevents = array();
 
 		if (!$this->user->rights->agenda->myactions->read) {
 			return $calevents;
 		}
 
-		if ($calid != $this->user->id && (!isset($this->user->rights->agenda->allactions->read) || !$this->user->rights->agenda->allactions->read)) {
+		if ($calendarId != $this->user->id && (!isset($this->user->rights->agenda->allactions->read) || !$this->user->rights->agenda->allactions->read)) {
 			return $calevents;
 		}
 
-		$sql = $this->getSqlCalEvents($calid);
+		$sql = $this->getSqlCalEvents($calendarId);
 
 		$result = $this->db->query($sql);
 
 		if ($result) {
 			while ($obj = $this->db->fetch_object($result)) {
-				$calendardata = $this->toVCalendar($calid, $obj);
+				$calendardata = $this->toVCalendar($calendarId, $obj);
 
 				if ($bCalendarData) {
 					$calevents[] = array(
diff --git a/htdocs/install/mysql/tables/llx_product_warehouse_properties-stock.key.sql b/htdocs/install/mysql/tables/llx_product_warehouse_properties-stock.key.sql
index 0f60c355e8b..7f0f91e3f75 100644
--- a/htdocs/install/mysql/tables/llx_product_warehouse_properties-stock.key.sql
+++ b/htdocs/install/mysql/tables/llx_product_warehouse_properties-stock.key.sql
@@ -20,4 +20,4 @@ ALTER TABLE llx_product_warehouse_properties ADD INDEX idx_product_warehouse_pro
 ALTER TABLE llx_product_warehouse_properties ADD INDEX idx_product_warehouse_properties_fk_entrepot (fk_entrepot);
 
 ALTER TABLE llx_product_warehouse_properties ADD CONSTRAINT fk_product_warehouse_properties_fk_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid);
-ALTER TABLE llx_product_warehouse_properties ADD CONSTRAINT fk_product_warehouse_properties_fk_entrepot FOREIGN KEY (fk_entrepot) REFERENCES llx_entrepot (rowid);
\ No newline at end of file
+ALTER TABLE llx_product_warehouse_properties ADD CONSTRAINT fk_product_warehouse_properties_fk_entrepot FOREIGN KEY (fk_entrepot) REFERENCES llx_entrepot (rowid);

From b4c025712caf9f92e6a0ded2b1418f550a0afce9 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 May 2026 03:08:39 +0200
Subject: [PATCH 44/48] Qual: Fix Phan notices observed in #38164 (#38231)

# Qual: Fix Phan notices observed in #38164

Notices appear in #38164 in unchanged files, probably because the analysis is more selective in PRs.
This fixes notices in the observed files
---
 ...terface_50_modAgenda_ActionsAuto.class.php | 228 +++++++++---------
 ...interface_50_modLdap_Ldapsynchro.class.php | 142 ++++++-----
 ...terface_50_modTicket_TicketEmail.class.php |  12 +-
 3 files changed, 195 insertions(+), 187 deletions(-)

diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index caafde041c8..0a27e200bd4 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2022		Ferran Marcet		<fmarcet@2byte.es>
  * Copyright (C) 2023-2024	William Mead		<william.mead@manchenumerique.fr>
  * Copyright (C) 2023       Christian Foellmann	<christian@foellmann.de>
- * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2026	MDW					<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2025       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -209,13 +209,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("ContractValidatedInDolibarr", (string) ($object->newref ? $object->newref : $object->ref));
+					$object->actionmsg2 = $langs->transnoentities("ContractValidatedInDolibarr", (string) ($object->newref ? $object->newref : (string) $object->ref));
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("ContractValidatedInDolibarr", (string) ($object->newref ? $object->newref : $object->ref));
+				$object->actionmsg = $langs->transnoentities("ContractValidatedInDolibarr", (string) ($object->newref ? $object->newref : (string) $object->ref));
 			}
 
 			$object->sendtoid = array();
@@ -244,13 +244,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("PropalValidatedInDolibarr", (string) ($object->newref ? $object->newref : $object->ref));
+					$object->actionmsg2 = $langs->transnoentities("PropalValidatedInDolibarr", (string) ($object->newref ? $object->newref : (string) $object->ref));
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("PropalValidatedInDolibarr", (string) ($object->newref ? $object->newref : $object->ref));
+				$object->actionmsg = $langs->transnoentities("PropalValidatedInDolibarr", (string) ($object->newref ? $object->newref : (string) $object->ref));
 			}
 
 			$object->sendtoid = array();
@@ -261,13 +261,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("PropalBackToDraftInDolibarr", (string) ($object->newref ? $object->newref : $object->ref));
+					$object->actionmsg2 = $langs->transnoentities("PropalBackToDraftInDolibarr", (string) ($object->newref ? $object->newref : (string) $object->ref));
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("PropalBackToDraftInDolibarr", (string) ($object->newref ? $object->newref : $object->ref));
+				$object->actionmsg = $langs->transnoentities("PropalBackToDraftInDolibarr", (string) ($object->newref ? $object->newref : (string) $object->ref));
 			}
 
 			$object->sendtoid = array();
@@ -347,13 +347,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("OrderValidatedInDolibarr", (string) ($object->newref ? $object->newref : $object->ref));
+					$object->actionmsg2 = $langs->transnoentities("OrderValidatedInDolibarr", (string) ($object->newref ? $object->newref : (string) $object->ref));
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("OrderValidatedInDolibarr", (string) ($object->newref ? $object->newref : $object->ref));
+				$object->actionmsg = $langs->transnoentities("OrderValidatedInDolibarr", (string) ($object->newref ? $object->newref : (string) $object->ref));
 			}
 
 			$object->sendtoid = array();
@@ -433,13 +433,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {	// Label
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+					$object->actionmsg2 = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : (string) $object->ref));
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {	// Description
-				$object->actionmsg = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+				$object->actionmsg = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : (string) $object->ref));
 			}
 
 			$object->sendtoid = array();
@@ -450,13 +450,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("InvoiceBackToDraftInDolibarr", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
+				$object->actionmsg = $langs->transnoentities("InvoiceBackToDraftInDolibarr", (string) $object->ref);
 			}
 
 			$object->sendtoid = array();
@@ -467,13 +467,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("InvoiceSentByEMail", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("InvoiceSentByEMail", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("InvoiceSentByEMail", $object->ref);
+				$object->actionmsg = $langs->transnoentities("InvoiceSentByEMail", (string) $object->ref);
 			}
 
 			// Parameters $object->sendtoid defined by caller
@@ -486,13 +486,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Values for this action can't be defined by caller.
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("InvoicePaidInDolibarr", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
+				$object->actionmsg = $langs->transnoentities("InvoicePaidInDolibarr", (string) $object->ref);
 			}
 
 			$object->sendtoid = array();
@@ -503,13 +503,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("InvoiceCanceledInDolibarr", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
+				$object->actionmsg = $langs->transnoentities("InvoiceCanceledInDolibarr", (string) $object->ref);
 			}
 
 			$object->sendtoid = array();
@@ -520,13 +520,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("InterventionCreatedInDolibarr", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("InterventionCreatedInDolibarr", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("InterventionCreatedInDolibarr", $object->ref);
+				$object->actionmsg = $langs->transnoentities("InterventionCreatedInDolibarr", (string) $object->ref);
 			}
 
 			$object->sendtoid = array();
@@ -539,13 +539,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("InterventionValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+					$object->actionmsg2 = $langs->transnoentities("InterventionValidatedInDolibarr", ($object->newref ? $object->newref : (string) $object->ref));
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("InterventionValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+				$object->actionmsg = $langs->transnoentities("InterventionValidatedInDolibarr", ($object->newref ? $object->newref : (string) $object->ref));
 			}
 
 			$object->sendtoid = array();
@@ -558,13 +558,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("InterventionModifiedInDolibarr", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("InterventionModifiedInDolibarr", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("InterventionModifiedInDolibarr", $object->ref);
+				$object->actionmsg = $langs->transnoentities("InterventionModifiedInDolibarr", (string) $object->ref);
 			}
 
 			$object->sendtoid = array();
@@ -577,13 +577,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("InterventionSentByEMail", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("InterventionSentByEMail", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("InterventionSentByEMail", $object->ref);
+				$object->actionmsg = $langs->transnoentities("InterventionSentByEMail", (string) $object->ref);
 			}
 
 			// Parameters $object->sendtoid defined by caller
@@ -595,13 +595,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("InterventionClassifiedBilledInDolibarr", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("InterventionClassifiedBilledInDolibarr", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("InterventionClassifiedBilledInDolibarr", $object->ref);
+				$object->actionmsg = $langs->transnoentities("InterventionClassifiedBilledInDolibarr", (string) $object->ref);
 			}
 
 			$object->sendtoid = array();
@@ -612,13 +612,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("InterventionClassifiedUnbilledInDolibarr", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("InterventionClassifiedUnbilledInDolibarr", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("InterventionClassifiedUnbilledInDolibarr", $object->ref);
+				$object->actionmsg = $langs->transnoentities("InterventionClassifiedUnbilledInDolibarr", (string) $object->ref);
 			}
 
 			$object->sendtoid = array();
@@ -629,13 +629,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("InterventionClosedInDolibarr", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("InterventionClosedInDolibarr", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("InterventionClosedInDolibarr", $object->ref);
+				$object->actionmsg = $langs->transnoentities("InterventionClosedInDolibarr", (string) $object->ref);
 			}
 
 			$object->sendtoid = array();
@@ -648,13 +648,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("InterventionDeletedInDolibarr", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("InterventionDeletedInDolibarr", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("InterventionDeletedInDolibarr", $object->ref);
+				$object->actionmsg = $langs->transnoentities("InterventionDeletedInDolibarr", (string) $object->ref);
 			}
 
 			$object->sendtoid = array();
@@ -667,13 +667,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("ShippingValidated", ($object->newref ? $object->newref : $object->ref));
+					$object->actionmsg2 = $langs->transnoentities("ShippingValidated", ($object->newref ? $object->newref : (string) $object->ref));
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("ShippingValidated", ($object->newref ? $object->newref : $object->ref));
+				$object->actionmsg = $langs->transnoentities("ShippingValidated", ($object->newref ? $object->newref : (string) $object->ref));
 			}
 
 			// Parameters $object->sendtoid defined by caller
@@ -685,13 +685,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("ShippingSentByEMail", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("ShippingSentByEMail", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("ShippingSentByEMail", $object->ref);
+				$object->actionmsg = $langs->transnoentities("ShippingSentByEMail", (string) $object->ref);
 			}
 
 			// Parameters $object->sendtoid defined by caller
@@ -704,13 +704,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("ReceptionValidated", ($object->newref ? $object->newref : $object->ref));
+					$object->actionmsg2 = $langs->transnoentities("ReceptionValidated", ($object->newref ? $object->newref : (string) $object->ref));
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("ReceptionValidated", ($object->newref ? $object->newref : $object->ref));
+				$object->actionmsg = $langs->transnoentities("ReceptionValidated", ($object->newref ? $object->newref : (string) $object->ref));
 			}
 
 			// Parameters $object->sendtoid defined by caller
@@ -723,13 +723,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("ReceptionSentByEMail", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("ReceptionSentByEMail", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("ReceptionSentByEMail", $object->ref);
+				$object->actionmsg = $langs->transnoentities("ReceptionSentByEMail", (string) $object->ref);
 			}
 
 			// Parameters $object->sendtoid defined by caller
@@ -741,13 +741,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+					$object->actionmsg2 = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : (string) $object->ref));
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+				$object->actionmsg = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : (string) $object->ref));
 			}
 
 			$object->sendtoid = array();
@@ -758,13 +758,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("ProposalSentByEMail", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("ProposalSentByEMail", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("ProposalSentByEMail", $object->ref);
+				$object->actionmsg = $langs->transnoentities("ProposalSentByEMail", (string) $object->ref);
 			}
 
 			// Parameters $object->sendtoid defined by caller
@@ -776,13 +776,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("PropalClosedSignedInDolibarr", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
+				$object->actionmsg = $langs->transnoentities("PropalClosedSignedInDolibarr", (string) $object->ref);
 			}
 
 			$object->sendtoid = array();
@@ -793,13 +793,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("PropalClosedRefusedInDolibarr", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
+				$object->actionmsg = $langs->transnoentities("PropalClosedRefusedInDolibarr", (string) $object->ref);
 			}
 
 			$object->sendtoid = array();
@@ -810,13 +810,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("OrderCreatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+					$object->actionmsg2 = $langs->transnoentities("OrderCreatedInDolibarr", ($object->newref ? $object->newref : (string) $object->ref));
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("OrderCreatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+				$object->actionmsg = $langs->transnoentities("OrderCreatedInDolibarr", ($object->newref ? $object->newref : (string) $object->ref));
 			}
 
 			$object->sendtoid = array();
@@ -827,13 +827,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+					$object->actionmsg2 = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : (string) $object->ref));
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+				$object->actionmsg = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : (string) $object->ref));
 			}
 
 			$object->sendtoid = array();
@@ -844,13 +844,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("OrderApprovedInDolibarr", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("OrderApprovedInDolibarr", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("OrderApprovedInDolibarr", $object->ref);
+				$object->actionmsg = $langs->transnoentities("OrderApprovedInDolibarr", (string) $object->ref);
 			}
 
 			$object->sendtoid = array();
@@ -861,13 +861,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("OrderRefusedInDolibarr", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("OrderRefusedInDolibarr", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("OrderRefusedInDolibarr", $object->ref);
+				$object->actionmsg = $langs->transnoentities("OrderRefusedInDolibarr", (string) $object->ref);
 			}
 
 			if (!empty($object->refuse_note)) {
@@ -883,13 +883,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("OrderCanceledInDolibarr", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("OrderCanceledInDolibarr", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("OrderCanceledInDolibarr", $object->ref);
+				$object->actionmsg = $langs->transnoentities("OrderCanceledInDolibarr", (string) $object->ref);
 			}
 
 			if (!empty($object->cancel_note)) {
@@ -905,13 +905,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("SupplierOrderSubmitedInDolibarr", ($object->newref ?: $object->ref), $object->getInputMethod());
+					$object->actionmsg2 = $langs->transnoentities("SupplierOrderSubmitedInDolibarr", ($object->newref ?: (string) $object->ref), $object->getInputMethod());
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("SupplierOrderSubmitedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+				$object->actionmsg = $langs->transnoentities("SupplierOrderSubmitedInDolibarr", ($object->newref ? $object->newref : (string) $object->ref));
 			}
 
 			if (!empty($object->context['comments'])) {
@@ -927,13 +927,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("SupplierOrderReceivedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+					$object->actionmsg2 = $langs->transnoentities("SupplierOrderReceivedInDolibarr", ($object->newref ? $object->newref : (string) $object->ref));
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("SupplierOrderReceivedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+				$object->actionmsg = $langs->transnoentities("SupplierOrderReceivedInDolibarr", ($object->newref ? $object->newref : (string) $object->ref));
 			}
 
 			$object->sendtoid = array();
@@ -944,13 +944,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("SupplierOrderSentByEMail", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("SupplierOrderSentByEMail", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("SupplierOrderSentByEMail", $object->ref);
+				$object->actionmsg = $langs->transnoentities("SupplierOrderSentByEMail", (string) $object->ref);
 			}
 
 			// Parameters $object->sendtoid defined by caller
@@ -962,13 +962,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("SupplierOrderClassifiedBilled", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("SupplierOrderClassifiedBilled", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("SupplierOrderClassifiedBilled", $object->ref);
+				$object->actionmsg = $langs->transnoentities("SupplierOrderClassifiedBilled", (string) $object->ref);
 			}
 
 			$object->sendtoid = array();
@@ -979,13 +979,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("InvoiceCreatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+					$object->actionmsg2 = $langs->transnoentities("InvoiceCreatedInDolibarr", ($object->newref ? $object->newref : (string) $object->ref));
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("InvoiceCreatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+				$object->actionmsg = $langs->transnoentities("InvoiceCreatedInDolibarr", ($object->newref ? $object->newref : (string) $object->ref));
 			}
 
 			$object->sendtoid = array();
@@ -996,13 +996,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+					$object->actionmsg2 = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : (string) $object->ref));
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+				$object->actionmsg = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : (string) $object->ref));
 			}
 
 			$object->sendtoid = array();
@@ -1013,13 +1013,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("InvoiceBackToDraftInDolibarr", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
+				$object->actionmsg = $langs->transnoentities("InvoiceBackToDraftInDolibarr", (string) $object->ref);
 			}
 
 			$object->sendtoid = array();
@@ -1030,13 +1030,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("SupplierInvoiceSentByEMail", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("SupplierInvoiceSentByEMail", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("SupplierInvoiceSentByEMail", $object->ref);
+				$object->actionmsg = $langs->transnoentities("SupplierInvoiceSentByEMail", (string) $object->ref);
 			}
 
 			// Parameters $object->sendtoid defined by caller
@@ -1048,13 +1048,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("InvoicePaidInDolibarr", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
+				$object->actionmsg = $langs->transnoentities("InvoicePaidInDolibarr", (string) $object->ref);
 			}
 
 			$object->sendtoid = array();
@@ -1064,13 +1064,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("InvoiceCanceledInDolibarr", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
+				$object->actionmsg = $langs->transnoentities("InvoiceCanceledInDolibarr", (string) $object->ref);
 			}
 
 			$object->sendtoid = array();
@@ -1191,13 +1191,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("MemberSubscriptionDeletedInDolibarr", $object->ref, $member->getFullName($langs));
+					$object->actionmsg2 = $langs->transnoentities("MemberSubscriptionDeletedInDolibarr", (string) $object->ref, $member->getFullName($langs));
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("MemberSubscriptionDeletedInDolibarr", $object->ref, $member->getFullName($langs));
+				$object->actionmsg = $langs->transnoentities("MemberSubscriptionDeletedInDolibarr", (string) $object->ref, $member->getFullName($langs));
 				$object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$member->getFullName($langs);
 				$object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->fk_type;
 				$object->actionmsg .= "\n".$langs->transnoentities("Amount").': '.$object->amount;
@@ -1273,14 +1273,14 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("ProjectCreatedInDolibarr", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("ProjectCreatedInDolibarr", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("ProjectCreatedInDolibarr", $object->ref);
-				$object->actionmsg .= "\n".$langs->transnoentities("Project").': '.$object->ref;
+				$object->actionmsg = $langs->transnoentities("ProjectCreatedInDolibarr", (string) $object->ref);
+				$object->actionmsg .= "\n".$langs->transnoentities("Project").': '.(string) $object->ref;
 			}
 
 			$object->sendtoid = array();
@@ -1291,14 +1291,14 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("ProjectValidatedInDolibarr", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("ProjectValidatedInDolibarr", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("ProjectValidatedInDolibarr", $object->ref);
-				$object->actionmsg .= "\n".$langs->transnoentities("Project").': '.$object->ref;
+				$object->actionmsg = $langs->transnoentities("ProjectValidatedInDolibarr", (string) $object->ref);
+				$object->actionmsg .= "\n".$langs->transnoentities("Project").': '.(string) $object->ref;
 			}
 
 			$object->sendtoid = array();
@@ -1309,13 +1309,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("ProjectModifiedInDolibarr", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("ProjectModifiedInDolibarr", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("ProjectModifiedInDolibarr", $object->ref);
+				$object->actionmsg = $langs->transnoentities("ProjectModifiedInDolibarr", (string) $object->ref);
 			}
 
 			//$object->actionmsg .= "\n".$langs->transnoentities("Task").': ???';
@@ -1331,13 +1331,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("ProjectSentByEMail", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("ProjectSentByEMail", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("ProjectSentByEMail", $object->ref);
+				$object->actionmsg = $langs->transnoentities("ProjectSentByEMail", (string) $object->ref);
 			}
 
 			// Parameters $object->sendtoid defined by caller
@@ -1348,9 +1348,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$langs->loadLangs(array("agenda", "other", "projects"));
 
 			if (empty($object->actionmsg2)) {
-				$object->actionmsg2 = $langs->transnoentities("ProjectDeletedInDolibarr", $object->ref);
+				$object->actionmsg2 = $langs->transnoentities("ProjectDeletedInDolibarr", (string) $object->ref);
 			}
-			$object->actionmsg = $langs->transnoentities("ProjectDeletedInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("ProjectDeletedInDolibarr", (string) $object->ref);
 
 			$object->sendtoid = array();
 		} elseif ($action == 'PROJECT_CLOSE' && $object instanceof Project) {
@@ -1359,13 +1359,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("ProjectClosedInDolibarr", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("ProjectClosedInDolibarr", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("ProjectClosedInDolibarr", $object->ref);
+				$object->actionmsg = $langs->transnoentities("ProjectClosedInDolibarr", (string) $object->ref);
 			}
 
 			$object->sendtoid = array();
@@ -1377,14 +1377,14 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("TaskCreatedInDolibarr", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("TaskCreatedInDolibarr", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("TaskCreatedInDolibarr", $object->ref);
-				$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
+				$object->actionmsg = $langs->transnoentities("TaskCreatedInDolibarr", (string) $object->ref);
+				$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.(string) $object->ref;
 			}
 
 			$object->sendtoid = array();
@@ -1395,14 +1395,14 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("TaskModifiedInDolibarr", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("TaskModifiedInDolibarr", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("TaskModifiedInDolibarr", $object->ref);
-				$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
+				$object->actionmsg = $langs->transnoentities("TaskModifiedInDolibarr", (string) $object->ref);
+				$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.(string) $object->ref;
 			}
 
 			$object->sendtoid = array();
@@ -1413,14 +1413,14 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("TaskDeletedInDolibarr", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("TaskDeletedInDolibarr", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("TaskDeletedInDolibarr", $object->ref);
-				$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
+				$object->actionmsg = $langs->transnoentities("TaskDeletedInDolibarr", (string) $object->ref);
+				$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.(string) $object->ref;
 			}
 
 			$object->sendtoid = array();
@@ -1431,13 +1431,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			if (empty($object->actionmsg2)) {
 				if (empty($object->context['actionmsg2'])) {
-					$object->actionmsg2 = $langs->transnoentities("TICKET_ASSIGNEDInDolibarr", $object->ref);
+					$object->actionmsg2 = $langs->transnoentities("TICKET_ASSIGNEDInDolibarr", (string) $object->ref);
 				} else {
 					$object->actionmsg2 = $object->context['actionmsg2'];
 				}
 			}
 			if (empty($object->actionmsg)) {
-				$object->actionmsg = $langs->transnoentities("TICKET_ASSIGNEDInDolibarr", $object->ref);
+				$object->actionmsg = $langs->transnoentities("TICKET_ASSIGNEDInDolibarr", (string) $object->ref);
 			}
 
 			if ($object->oldcopy->fk_user_assign > 0) {
@@ -1475,21 +1475,21 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			if (empty($object->actionmsg2)) {
 				// Load translation files required by the page
 				$langs->loadLangs(array("agenda", "other"));
-				if ($langs->transnoentities($action."InDolibarr", (empty($object->newref) ? $object->ref : $object->newref)) != $action."InDolibarr") {	// specific translation key
-					$object->actionmsg2 = $langs->transnoentities($action."InDolibarr", (empty($object->newref) ? $object->ref : $object->newref));
+				if ($langs->transnoentities($action."InDolibarr", (empty($object->newref) ? (string) $object->ref : $object->newref)) != $action."InDolibarr") {	// specific translation key
+					$object->actionmsg2 = $langs->transnoentities($action."InDolibarr", (empty($object->newref) ? (string) $object->ref : $object->newref));
 				} else {	// generic translation key
 					$tmp = explode('_', $action);
-					$object->actionmsg2 = $langs->transnoentities($tmp[count($tmp) - 1]."InDolibarr", (empty($object->newref) ? $object->ref : $object->newref));
+					$object->actionmsg2 = $langs->transnoentities($tmp[count($tmp) - 1]."InDolibarr", (empty($object->newref) ? (string) $object->ref : $object->newref));
 				}
 			}
 			if (empty($object->actionmsg)) {
 				// Load translation files required by the page
 				$langs->loadLangs(array("agenda", "other"));
-				if ($langs->transnoentities($action."InDolibarr", (empty($object->newref) ? $object->ref : $object->newref)) != $action."InDolibarr") {	// specific translation key
-					$object->actionmsg = $langs->transnoentities($action."InDolibarr", (empty($object->newref) ? $object->ref : $object->newref));
+				if ($langs->transnoentities($action."InDolibarr", (empty($object->newref) ? (string) $object->ref : $object->newref)) != $action."InDolibarr") {	// specific translation key
+					$object->actionmsg = $langs->transnoentities($action."InDolibarr", (empty($object->newref) ? (string) $object->ref : $object->newref));
 				} else {	// generic translation key
 					$tmp = explode('_', $action);
-					$object->actionmsg = $langs->transnoentities($tmp[count($tmp) - 1]."InDolibarr", (empty($object->newref) ? $object->ref : $object->newref));
+					$object->actionmsg = $langs->transnoentities($tmp[count($tmp) - 1]."InDolibarr", (empty($object->newref) ? (string) $object->ref : $object->newref));
 				}
 				if (isModEnabled('multicompany') && property_exists($object, 'entity') && $object->entity > 1) {
 					$object->actionmsg .= ' ('.$langs->trans("Entity").' '.$object->entity.')';
diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
index 019a1f6428b..1637a176edc 100644
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2005-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2021	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2014		Marcos García		<marcosgdf@gmail.com>
- * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2026	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2025       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -551,79 +551,83 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 						$object->oldcopy = clone $object;  // @phan-suppress-current-line PhanTypeMismatchProperty
 					}
 
-					if (!method_exists($object->oldcopy, '_load_ldap_info')) {
-						dol_syslog("Trigger ".$action." was called by a function that did not set previously the method ->_load_ldap_info onto object", LOG_WARNING);
-						$object->oldcopy = clone $object; // @phan-suppress-current-line PhanTypeMismatchProperty
-					}
+					$oldcopy = $object->oldcopy; // Copy for static analysis
 
-					$oldinfo = $object->oldcopy->_load_ldap_info();
-					$olddn = $object->oldcopy->_load_ldap_dn($oldinfo);
+					if (is_object($oldcopy)) {
+						if (!method_exists($oldcopy, '_load_ldap_info')) {
+							dol_syslog("Trigger ".$action." was called by a function that did not set previously the method ->_load_ldap_info onto object", LOG_WARNING);
+							$oldcopy = clone $object; // @phan-suppress-current-line PhanTypeMismatchProperty
+						}
 
-					// Verify if entry exist
-					$container = $object->oldcopy->_load_ldap_dn($oldinfo, 1);
-					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo, 2).")";
-					$records = $ldap->search($container, $search);
-					if (count($records) && $records['count'] == 0) {
-						$olddn = '';
-					}
-
-					$info = $object->_load_ldap_info();
-					$dn = $object->_load_ldap_dn($info);
-					$newrdn = $object->_load_ldap_dn($info, 2);
-					$newparent = $object->_load_ldap_dn($info, 1);
-
-					$result = $ldap->update($dn, $info, $user, $olddn, $newrdn, $newparent);
-
-					// For member type
-					if (getDolGlobalString('LDAP_MEMBER_TYPE_ACTIVE') && getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
-						require_once DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php";
-
-						/*
-						 * Change member info
-						 */
-						$newmembertype = new AdherentType($this->db);
-						$newmembertype->fetch($object->typeid);
-						$newmembertype->listMembersForMemberType('', 1);
-
-						$oldinfo = $newmembertype->_load_ldap_info();
-						$olddn = $newmembertype->_load_ldap_dn($oldinfo);
+						$oldinfo = $oldcopy->_load_ldap_info();
+						$olddn = $oldcopy->_load_ldap_dn($oldinfo);
 
 						// Verify if entry exist
-						$container = $newmembertype->_load_ldap_dn($oldinfo, 1);
-						$search = "(".$newmembertype->_load_ldap_dn($oldinfo, 2).")";
+						$container = $oldcopy->_load_ldap_dn($oldinfo, 1);
+						$search = "(".$oldcopy->_load_ldap_dn($oldinfo, 2).")";
 						$records = $ldap->search($container, $search);
 						if (count($records) && $records['count'] == 0) {
 							$olddn = '';
 						}
 
-						$info = $newmembertype->_load_ldap_info(); // Contains all members, included the new one (insert already done before trigger call)
-						$dn = $newmembertype->_load_ldap_dn($info);
+						$info = $object->_load_ldap_info();
+						$dn = $object->_load_ldap_dn($info);
+						$newrdn = $object->_load_ldap_dn($info, 2);
+						$newparent = $object->_load_ldap_dn($info, 1);
 
-						$result = $ldap->update($dn, $info, $user, $olddn);
+						$result = $ldap->update($dn, $info, $user, $olddn, $newrdn, $newparent);
+
+						// For member type
+						if (getDolGlobalString('LDAP_MEMBER_TYPE_ACTIVE') && getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
+							require_once DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php";
 
-						if ($object->oldcopy->typeid != $object->typeid) {
 							/*
-							 * Remove member in old member type
+							 * Change member info
 							 */
-							$oldmembertype = new AdherentType($this->db);
-							$oldmembertype->fetch($object->oldcopy->typeid);
-							$oldmembertype->listMembersForMemberType('', 1);
+							$newmembertype = new AdherentType($this->db);
+							$newmembertype->fetch($object->typeid);
+							$newmembertype->listMembersForMemberType('', 1);
 
-							$oldinfo = $oldmembertype->_load_ldap_info();
-							$olddn = $oldmembertype->_load_ldap_dn($oldinfo);
+							$oldinfo = $newmembertype->_load_ldap_info();
+							$olddn = $newmembertype->_load_ldap_dn($oldinfo);
 
 							// Verify if entry exist
-							$container = $oldmembertype->_load_ldap_dn($oldinfo, 1);
-							$search = "(".$oldmembertype->_load_ldap_dn($oldinfo, 2).")";
+							$container = $newmembertype->_load_ldap_dn($oldinfo, 1);
+							$search = "(".$newmembertype->_load_ldap_dn($oldinfo, 2).")";
 							$records = $ldap->search($container, $search);
 							if (count($records) && $records['count'] == 0) {
 								$olddn = '';
 							}
 
-							$info = $oldmembertype->_load_ldap_info(); // Contains all members, included the new one (insert already done before trigger call)
-							$dn = $oldmembertype->_load_ldap_dn($info);
+							$info = $newmembertype->_load_ldap_info(); // Contains all members, included the new one (insert already done before trigger call)
+							$dn = $newmembertype->_load_ldap_dn($info);
 
 							$result = $ldap->update($dn, $info, $user, $olddn);
+
+							if ($oldcopy->typeid != $object->typeid) {
+								/*
+								 * Remove member in old member type
+								 */
+								$oldmembertype = new AdherentType($this->db);
+								$oldmembertype->fetch($oldcopy->typeid);
+								$oldmembertype->listMembersForMemberType('', 1);
+
+								$oldinfo = $oldmembertype->_load_ldap_info();
+								$olddn = $oldmembertype->_load_ldap_dn($oldinfo);
+
+								// Verify if entry exist
+								$container = $oldmembertype->_load_ldap_dn($oldinfo, 1);
+								$search = "(".$oldmembertype->_load_ldap_dn($oldinfo, 2).")";
+								$records = $ldap->search($container, $search);
+								if (count($records) && $records['count'] == 0) {
+									$olddn = '';
+								}
+
+								$info = $oldmembertype->_load_ldap_info(); // Contains all members, included the new one (insert already done before trigger call)
+								$dn = $oldmembertype->_load_ldap_dn($info);
+
+								$result = $ldap->update($dn, $info, $user, $olddn);
+							}
 						}
 					}
 				}
@@ -766,25 +770,29 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 						$object->oldcopy = clone $object;  // @phan-suppress-current-line PhanTypeMismatchProperty
 					}
 
-					$object->oldcopy->listMembersForMemberType('', 1);
+					$oldcopy = $object->oldcopy;  // Local copy to help static analysis.
 
-					$oldinfo = $object->oldcopy->_load_ldap_info();
-					$olddn = $object->oldcopy->_load_ldap_dn($oldinfo);
+					if (is_object($oldcopy)) {
+						$oldcopy->listMembersForMemberType('', 1);
 
-					// Verify if entry exist
-					$container = $object->oldcopy->_load_ldap_dn($oldinfo, 1);
-					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo, 2).")";
-					$records = $ldap->search($container, $search);
-					if (count($records) && $records['count'] == 0) {
-						$olddn = '';
+						$oldinfo = $oldcopy->_load_ldap_info();
+						$olddn = $oldcopy->_load_ldap_dn($oldinfo);
+
+						// Verify if entry exist
+						$container = $oldcopy->_load_ldap_dn($oldinfo, 1);
+						$search = "(".$oldcopy->_load_ldap_dn($oldinfo, 2).")";
+						$records = $ldap->search($container, $search);
+						if (count($records) && $records['count'] == 0) {
+							$olddn = '';
+						}
+
+						$object->listMembersForMemberType('', 1);
+
+						$info = $object->_load_ldap_info();
+						$dn = $object->_load_ldap_dn($info);
+
+						$result = $ldap->update($dn, $info, $user, $olddn);
 					}
-
-					$object->listMembersForMemberType('', 1);
-
-					$info = $object->_load_ldap_info();
-					$dn = $object->_load_ldap_dn($info);
-
-					$result = $ldap->update($dn, $info, $user, $olddn);
 				}
 
 				if ($result <= 0) {
diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index 3dedad04378..ec68dc2300d 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2014-2016  Jean-François Ferry	<hello@librethic.io>
  * Copyright (C) 2016       Christophe Battarel <christophe@altairis.fr>
- * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2026	MDW					<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2025       Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2023-2025	Benjamin Falière	<benjamin@faliere.com>
  *
@@ -378,8 +378,8 @@ class InterfaceTicketEmail extends DolibarrTriggers
 		$appli = $mysoc->name;
 
 		/* Send email to admin */
-		$subject = '['.$appli.'] '.$langs->transnoentities($base_subject, $object->ref, $object->track_id);
-		$message_admin = $langs->transnoentities($body, $object->track_id).'<br>';
+		$subject = '['.$appli.'] '.$langs->transnoentities($base_subject, (string) $object->ref, (string) $object->track_id);
+		$message_admin = $langs->transnoentities($body, (string) $object->track_id).'<br>';
 		$message_admin .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
 		$message_admin .= '<li>'.$langs->trans('Type').' : '.$langs->getLabelFromKey($this->db, 'TicketTypeShort'.$object->type_code, 'c_ticket_type', 'code', 'label', $object->type_code).'</li>';
 		$message_admin .= '<li>'.$langs->trans('TicketCategory').' : '.$langs->getLabelFromKey($this->db, 'TicketCategoryShort'.$object->category_code, 'c_ticket_category', 'code', 'label', $object->category_code).'</li>';
@@ -449,7 +449,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 		$appli = $mysoc->name;
 
 		$subject = '['.$appli.'] '.$langs->transnoentities($base_subject);
-		$message_customer = $langs->transnoentities($body, $object->track_id).'<br>';
+		$message_customer = $langs->transnoentities($body, (string) $object->track_id).'<br>';
 		$message_customer .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
 		$message_customer .= '<li>'.$langs->trans('Type').' : '.$langs->getLabelFromKey($this->db, 'TicketTypeShort'.$object->type_code, 'c_ticket_type', 'code', 'label', $object->type_code).'</li>';
 		$message_customer .= '<li>'.$langs->trans('TicketCategory').' : '.$langs->getLabelFromKey($this->db, 'TicketCategoryShort'.$object->category_code, 'c_ticket_category', 'code', 'label', $object->category_code).'</li>';
@@ -490,7 +490,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 		$message_customer .= '<p>'.$langs->trans('Message').' : <br><br>'.$message.'</p><br>';
 
 		if (getDolGlobalInt('TICKET_ENABLE_PUBLIC_INTERFACE')) {
-			$url_public_ticket = getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE', dol_buildpath('/public/ticket/', 2)).'view.php?track_id='.urlencode($object->track_id);
+			$url_public_ticket = getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE', dol_buildpath('/public/ticket/', 2)).'view.php?track_id='.urlencode((string) $object->track_id);
 			$message_customer .= '<p>'.$langs->trans($see_ticket).' : <a href="'.$url_public_ticket.'">'.$url_public_ticket.'</a></p>';
 			$message_customer .= '<p>'.$langs->trans('TicketEmailPleaseDoNotReplyToThisEmail').'</p>';
 		} else {
@@ -547,7 +547,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 		$appli = $mysoc->name;
 
 		$subject = '['.$appli.'] '.$langs->transnoentities($base_subject);
-		$message = '<p>'.$langs->transnoentities($body, $object->track_id, dolGetFirstLastname($user->firstname, $user->lastname))."</p>";
+		$message = '<p>'.$langs->transnoentities($body, (string) $object->track_id, dolGetFirstLastname($user->firstname, $user->lastname))."</p>";
 		$message .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
 		$message .= '<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
 		$message .= '<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';

From ffae6a7de43308ecf1affb6827757cdeae894447 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 18 May 2026 03:16:32 +0200
Subject: [PATCH 45/48] NEW Contract - Add consolidated total (#38249)

* NEW Contract - Add consolidated total

* CI

* CI

* CI

* English
---
 htdocs/contrat/card.php                | 91 ++++++++++++++++++++++++--
 htdocs/contrat/class/contrat.class.php | 67 +++++++++++++++----
 2 files changed, 140 insertions(+), 18 deletions(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 7c384facac1..6d7325eb85f 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -9,11 +9,11 @@
  * Copyright (C) 2014-2020	Ferran Marcet				<fmarcet@2byte.es>
  * Copyright (C) 2014-2016	Marcos García				<marcosgdf@gmail.com>
  * Copyright (C) 2015		Jean-François Ferry			<jfefe@aternatik.fr>
- * Copyright (C) 2018-2026  Frédéric France				<frederic.france@free.fr>
- * Copyright (C) 2023		Charlene Benke				<charlene@patas-monkey.com>
+ * Copyright (C) 2018-2026	Frédéric France				<frederic.france@free.fr>
+ * Copyright (C) 2023-2026	Charlene Benke				<charlene@patas-monkey.com>
  * Copyright (C) 2023		Nick Fragoulis
  * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
- * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
+ * Copyright (C) 2024-2026	Alexandre Spangaro			<alexandre@inovea-conseil.com>
  * Copyright (C) 2025		William Mead				<william@m34d.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -1138,6 +1138,7 @@ llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-contrat page-card');
 
 $form = new Form($db);
 $formfile = new FormFile($db);
+$staticcontractline = new ContratLigne($db);
 if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
@@ -1525,10 +1526,10 @@ if ($action == 'create') {
 
 
 		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
 		print '<div class="underbanner clearboth"></div>';
 
-
-		print '<table class="border tableforfield" width="100%">';
+		print '<table class="border centpercent tableforfield">';
 
 		// Line info of thirdparty discounts
 		print '<tr><td class="titlefield">'.$langs->trans('Discount').'</td><td colspan="3">';
@@ -1560,6 +1561,86 @@ if ($action == 'create') {
 		print "</table>";
 
 		print '</div>';
+		print '<div class="fichehalfright">';
+
+		print '<!-- amounts -->'."\n";
+		print '<div class="underbanner clearboth"></div>';
+
+		print '<table class="border tableforfield centpercent">';
+
+		// Qty by service status
+		print '<tr><td class="titlefield">'."".'</td>';
+		print '<td class=right>'.$langs->trans('Total').'</td>';
+		print '<td class=right>'.$staticcontractline->LibStatut(0, 5, 0).'</td>';
+		print '<td class=right>'.$staticcontractline->LibStatut(4, 5, 0).'</td>';
+		print '<td class=right>'.$staticcontractline->LibStatut(4, 5, 1).'</td>';
+		print '<td class=right>'.$staticcontractline->LibStatut(5, 5, 0).'</td>';
+		print '</tr>';
+
+		$all= $object->getTotalizedLines(-1, 0);
+		$draft= $object->getTotalizedLines(0, 0);
+		$enabled= $object->getTotalizedLines(4, 0);
+		$expired= $object->getTotalizedLines(4, 1);
+		$close= $object->getTotalizedLines(5, 0);
+
+		print '<tr><td class="titlefield">'.$langs->trans("Qty").'</td>';
+		print '<td class="right nowrap">'.price2num($all['total_qty']).'</td>';
+		print '<td class="right">'.price2num($draft['total_qty']).'</td>';
+		print '<td class="right">'.price2num($enabled['total_qty']).'</td>';
+		print '<td class="right">'.price2num($expired['total_qty']).'</td>';
+		print '<td class="right">'.price2num($close['total_qty']).'</td>';
+		print '</tr>';
+
+		print '<tr><td class="titlefield">'.$langs->trans("TotalHT").'</td>';
+		print '<td class="nowraponall amountcard right">'.price($all['total_ht']).'</td>';
+		print '<td class="nowraponall amountcard right">'.price($draft['total_ht']).'</td>';
+		print '<td class="nowraponall amountcard right">'.price($enabled['total_ht']).'</td>';
+		print '<td class="nowraponall amountcard right">'.price($expired['total_ht']).'</td>';
+		print '<td class="nowraponall amountcard right">'.price($close['total_ht']).'</td>';
+		print '</tr>';
+
+		print '<tr><td class="titlefield">'.$langs->trans("TotalVAT").'</td>';
+		print '<td class="nowraponall amountcard right nowrap">'.price($all['total_tva']).'</td>';
+		print '<td class="nowraponall amountcard right">'.price($draft['total_tva']).'</td>';
+		print '<td class="nowraponall amountcard right">'.price($enabled['total_tva']).'</td>';
+		print '<td class="nowraponall amountcard right">'.price($expired['total_tva']).'</td>';
+		print '<td class="nowraponall amountcard right">'.price($close['total_tva']).'</td>';
+		print '</tr>';
+
+		if ($mysoc->localtax1_assuj == "1" || $all['total_localtax1'] != 0) {
+			print '<tr><td class="titlefield">' . $langs->trans("TotalLT1") . '</td>';
+			print '<td class="nowraponall amountcard right nowrap">' . price($all['total_localtax1']) . '</td>';
+			print '<td class="nowraponall amountcard right">' . price($draft['total_localtax1']) . '</td>';
+			print '<td class="nowraponall amountcard right">' . price($enabled['total_localtax1']) . '</td>';
+			print '<td class="nowraponall amountcard right">' . price($expired['total_localtax1']) . '</td>';
+			print '<td class="nowraponall amountcard right">' . price($close['total_localtax1']) . '</td>';
+			print '</tr>';
+		}
+
+		if ($mysoc->localtax2_assuj == "1" || $all['total_localtax2'] != 0) {
+			print '<tr><td class="titlefield">' . $langs->trans("TotalLT2") . '</td>';
+			print '<td class="nowraponall amountcard right nowrap">' . price($all['total_localtax2']) . '</td>';
+			print '<td class="nowraponall amountcard right">' . price($draft['total_localtax2']) . '</td>';
+			print '<td class="nowraponall amountcard right">' . price($enabled['total_localtax2']) . '</td>';
+			print '<td class="nowraponall amountcard right">' . price($expired['total_localtax2']) . '</td>';
+			print '<td class="nowraponall amountcard right">' . price($close['total_localtax2']) . '</td>';
+			print '</tr>';
+		}
+
+		print '<tr><td class="titlefield">'.$langs->trans("TotalTTC").'</td>';
+		print '<td class="nowraponall amountcard right nowrap">'.price($all['total_ttc']).'</td>';
+		print '<td class="nowraponall amountcard right">'.price($draft['total_ttc']).'</td>';
+		print '<td class="nowraponall amountcard right">'.price($enabled['total_ttc']).'</td>';
+		print '<td class="nowraponall amountcard right">'.price($expired['total_ttc']).'</td>';
+		print '<td class="nowraponall amountcard right">'.price($close['total_ttc']).'</td>';
+		print '</tr>';
+
+		print "</table>";
+
+		print '</div>';
+		print '</div>';
+
+		print '<div class="clearboth"></div><br>';
 
 		if ($object->status == $object::STATUS_DRAFT && $user->hasRight('contrat', 'creer')) {
 			print '</form>';
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 814e223449c..82ae9b8635c 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -1,18 +1,20 @@
 <?php
-/* Copyright (C) 2003		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012	Destailleur Laurent		<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2014	Regis Houssin			<regis.houssin@inodbox.com>
- * Copyright (C) 2006		Andre Cianfarani		<acianfa@free.fr>
- * Copyright (C) 2008		Raphael Bertrand		<raphael.bertrand@resultic.fr>
- * Copyright (C) 2010-2016	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2013		Christophe Battarel		<christophe.battarel@altairis.fr>
- * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
- * Copyright (C) 2014-2015	Marcos García			<marcosgdf@gmail.com>
- * Copyright (C) 2018   	Nicolas ZABOURI			<info@inovea-conseil.com>
+/* Copyright (C) 2003       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012  Destailleur Laurent     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2014  Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2006       Andre Cianfarani        <acianfa@free.fr>
+ * Copyright (C) 2008       Raphael Bertrand        <raphael.bertrand@resultic.fr>
+ * Copyright (C) 2010-2016  Juanjo Menent           <jmenent@2byte.es>
+ * Copyright (C) 2013       Christophe Battarel     <christophe.battarel@altairis.fr>
+ * Copyright (C) 2013       Florian Henry             <florian.henry@open-concept.pro>
+ * Copyright (C) 2014-2015  Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (C) 2018-2025  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2015-2018	Ferran Marcet			<fmarcet@2byte.es>
- * Copyright (C) 2024		William Mead			<william.mead@manchenumerique.fr>
- * Copyright (C) 2024-2026	MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2015-2018  Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2024       William Mead            <william.mead@manchenumerique.fr>
+ * Copyright (C) 2024-2026  MDW                     <mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2026       Charlene Benke          <charlene@patas-monkey.com>
+ * Copyright (C) 2026       Alexandre Spangaro      <alexandre@inovea-conseil.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
@@ -2951,6 +2953,45 @@ class Contrat extends CommonObject
 		return $return;
 	}
 
+	/**
+	 *  Return totalized lines
+	 *
+	 *  @param	int		$statut			Status of lines
+	 *  @param	int		$expired		1=expired, 0=not expired
+	 *  @return array<string,mixed>|int		Array of totalized lines or int if error
+	 */
+	public function getTotalizedLines($statut, int $expired)
+	{
+		$sql = "SELECT SUM(cd.qty) as total_qty, SUM(cd.total_ht) as total_ht, SUM(cd.total_tva) as total_tva, SUM(cd.total_ttc) as total_ttc,";
+		$sql .= " SUM(cd.total_localtax1) as total_localtax1, SUM(cd.total_localtax2) as total_localtax2";
+		$sql .= " FROM ".MAIN_DB_PREFIX."contratdet as cd";
+		$sql .= " WHERE cd.fk_contrat =".((int) $this->id);
+		if ($statut >= 0) {
+			$sql .= " AND cd.statut = ".((int) $statut);
+			if ($expired > 0) {
+				$sql .= " AND cd.date_fin_validite < '".$this->db->idate(dol_now())."'";
+			} else {
+				$sql .= " AND cd.date_fin_validite >= '".$this->db->idate(dol_now())."'";
+			}
+		}
+		$ret = $this->db->query($sql);
+		$response = array();
+		if ($ret) {
+			$obj = $this->db->fetch_object($ret);
+			$response['total_qty'] = $obj->total_qty;
+			$response['total_ht'] = $obj->total_ht;
+			$response['total_tva'] = $obj->total_tva;
+			$response['total_localtax1'] = $obj->total_localtax1;
+			$response['total_localtax2'] = $obj->total_localtax2;
+			$response['total_ttc'] = $obj->total_ttc;
+		} else {
+			dol_print_error($this->db);
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+		return $response;
+	}
+
 	// @Todo getLibSignedStatus, LibSignedStatus
 
 	/**

From e452584659d78859a323eda3cf746c08007f8651 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 18 May 2026 03:27:35 +0200
Subject: [PATCH 46/48] NEW - Various payments - Add extrafield (#38260)

* NEW - Various payments - Add extrafield

* Fix wrong path

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/admin/bank_payments_extrafields.php    |   2 -
 .../bank_various_payment_extrafields.php      | 109 ++++++++++++++++++
 .../bank/class/paymentvarious.class.php       |  25 +++-
 htdocs/compta/bank/various_payment/card.php   |  48 +++++---
 htdocs/compta/bank/various_payment/list.php   |  47 +++++---
 htdocs/core/lib/bank.lib.php                  |  25 ++--
 htdocs/core/modules/modBanque.class.php       |  17 ++-
 .../install/mysql/migration/23.0.0-24.0.0.sql |  11 ++
 .../llx_payment_various_extrafields.key.sql   |  21 ++++
 .../llx_payment_various_extrafields.sql       |  26 +++++
 htdocs/install/repair.php                     |  21 ++--
 11 files changed, 294 insertions(+), 58 deletions(-)
 create mode 100644 htdocs/admin/bank_various_payment_extrafields.php
 create mode 100644 htdocs/install/mysql/tables/llx_payment_various_extrafields.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_payment_various_extrafields.sql

diff --git a/htdocs/admin/bank_payments_extrafields.php b/htdocs/admin/bank_payments_extrafields.php
index cf69d6f2c8d..ccbcdf6fbb5 100644
--- a/htdocs/admin/bank_payments_extrafields.php
+++ b/htdocs/admin/bank_payments_extrafields.php
@@ -29,7 +29,6 @@
 
 // Load Dolibarr environment
 require '../main.inc.php';
-
 /**
  * @var Conf $conf
  * @var DoliDB $db
@@ -38,7 +37,6 @@ require '../main.inc.php';
  * @var Translate $langs
  * @var User $user
  */
-
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 
 // Load translation files required by the page
diff --git a/htdocs/admin/bank_various_payment_extrafields.php b/htdocs/admin/bank_various_payment_extrafields.php
new file mode 100644
index 00000000000..a81ff78d981
--- /dev/null
+++ b/htdocs/admin/bank_various_payment_extrafields.php
@@ -0,0 +1,109 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
+ * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2012		Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2024		Alexandre Spangaro		<alexandre@inovea-conseil.com>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2026		Solution Libre SAS		<contact@solution-libre.fr>
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/admin/bank_various_payment_extrafields.php
+ *  \ingroup    bank
+ *  \brief      Page to setup extra fields of various payments
+ */
+
+// Load Dolibarr environment
+require '../main.inc.php';
+/**
+ * @var Conf $conf
+ * @var DoliDB $db
+ * @var HookManager $hookmanager
+ * @var Translate $langs
+ * @var User $user
+ */
+require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("admin", "banks", "other"));
+
+$extrafields = new ExtraFields($db);
+$form = new Form($db);
+
+// List of supported format
+$type2label = ExtraFields::getListOfTypesLabels();
+
+$action = GETPOST('action', 'aZ09');
+$attrname = GETPOST('attrname', 'alpha');
+$elementtype = 'payment_various'; // Must match the table_element of PaymentVarious
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+
+/*
+ * Actions
+ */
+
+require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
+
+
+/*
+ * View
+ */
+
+$textobject = $langs->transnoentitiesnoconv("VariousPayments");
+
+llxHeader('', $langs->trans("BankSetupModule"));
+
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("BankSetupModule"), $linkback, 'title_setup');
+
+$head = bank_admin_prepare_head(null);
+
+print dol_get_fiche_head($head, 'bank_various_payment_extrafields', $langs->trans("BankSetupModule"), -1, '');
+
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
+
+print dol_get_fiche_end();
+
+
+// Buttons
+if ($action != 'create' && $action != 'edit') {
+	print '<div class="tabsAction">';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
+	print "</div>";
+}
+
+
+// Creation of an optional field
+if ($action == 'create') {
+	print '<br><div id="newattrib"></div>';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+}
+
+// Edition of an optional field
+if ($action == 'edit' && !empty($attrname)) {
+	print "<br>";
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index 5bdf7139c9d..e25edb535d7 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -1,7 +1,8 @@
 <?php
-/* Copyright (C) 2017-2021  Alexandre Spangaro      <aspangaro@open-dsi.fr>
- * Copyright (C) 2018-2025  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024-2026	MDW						<mdeweerd@users.noreply.github.com>
+/* Copyright (C) 2017-2021  Alexandre Spangaro          <alexandre@inovea-conseil.com>
+ * Copyright (C) 2018-2025  Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024-2026  MDW                         <mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2026       Solution Libre SAS          <contact@solution-libre.fr>
  *
  * 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
@@ -272,7 +273,13 @@ class PaymentVarious extends CommonObject
 			return -1;
 		}
 
-		if (!$notrigger) {
+		// Actions on extra fields
+		$result = $this->insertExtraFields();
+		if ($result < 0) {
+			$error++;
+		}
+
+		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('PAYMENT_VARIOUS_MODIFY', $user);
 			if ($result < 0) {
@@ -354,6 +361,10 @@ class PaymentVarious extends CommonObject
 				$this->rappro               = $obj->rappro;
 				$this->bank_num_releve      = $obj->bank_num_releve;
 			}
+
+			// Fetch extrafields
+			$this->fetch_optionals();
+
 			$this->db->free($resql);
 
 			return 1;
@@ -533,6 +544,12 @@ class PaymentVarious extends CommonObject
 			$this->ref = (string) $this->id;
 
 			if ($this->id > 0) {
+				// Insert extrafields
+				$result = $this->insertExtraFields();
+				if ($result < 0) {
+					$error++;
+				}
+
 				if (isModEnabled("bank") && !empty($this->amount)) {
 					// Insert into llx_bank
 					require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index b1414c13568..7b86b7b6984 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -1,9 +1,10 @@
 <?php
-/* Copyright (C) 2017-2026	Alexandre Spangaro		<alexandre@inovea-conseil.com>
- * Copyright (C) 2018-2025	Frédéric France			<frederic.france@free.fr>
- * Copyright (C) 2023		Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2023		Joachim Kueter			<git-jk@bloxera.com>
- * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
+/* Copyright (C) 2017-2026  Alexandre Spangaro      <alexandre@inovea-conseil.com>
+ * Copyright (C) 2018-2025  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2023       Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2023       Joachim Kueter          <git-jk@bloxera.com>
+ * Copyright (C) 2024-2025  MDW                     <mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2026		Solution Libre SAS      <contact@solution-libre.fr>
  *
  * 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
@@ -27,18 +28,6 @@
 
 // Load Dolibarr environment
 require '../../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
-if (isModEnabled('project')) {
-	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-}
 
 /**
  * @var Conf $conf
@@ -48,6 +37,20 @@ if (isModEnabled('project')) {
  * @var User $user
  */
 
+require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+if (isModEnabled('project')) {
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+}
+
 // Load translation files required by the page
 $langs->loadLangs(array("accountancy", "banks", "bills", "categories", "compta", "users"));
 
@@ -84,6 +87,9 @@ $result = restrictedArea($user, 'banque', '', '', '');
 
 $object = new PaymentVarious($db);
 
+$extrafields = new ExtraFields($db);
+$extrafields->fetch_name_optionals_label($object->table_element);
+
 $permissiontoadd = $user->hasRight('banque', 'modifier');
 $permissiontodelete = $user->hasRight('banque', 'modifier');
 
@@ -148,6 +154,12 @@ if (empty($reshook)) {
 		$object->sens = GETPOSTINT('sens');
 		$object->fk_project = GETPOSTINT('fk_project');
 
+		// Fill array 'array_options' with data from add form
+		$ret = $extrafields->setOptionalsFromPost(null, $object);
+		if ($ret < 0) {
+			$error++;
+		}
+
 		if (!checkGeneralAccountAllowsAuxiliary($db, $object->accountancy_code, $object->subledger_account)) {
 			setEventMessages($langs->trans("ErrorAccountNotCentralized"). ". " . $langs->trans("RemoveSubsidiaryAccountOrAdjustTheGeneralAccount"), null, 'errors');
 			$error++;
@@ -538,6 +550,8 @@ if ($action == 'create') {
 	}
 
 	// Other attributes
+	print $object->showOptionals($extrafields, 'create');
+
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index 492b35b55b1..23397c5ca4c 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -1,9 +1,10 @@
 <?php
-/* Copyright (C) 2017-2026	Alexandre Spangaro			<alexandre@inovea-conseil.com>
- * Copyright (C) 2017       Laurent Destailleur			<eldy@users.sourceforge.net>
- * Copyright (C) 2018-2024  Frédéric France				<frederic.france@free.fr>
- * Copyright (C) 2020       Tobias Sekan				<tobias.sekan@startmail.com>
- * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
+/* Copyright (C) 2017-2026  Alexandre Spangaro          <alexandre@inovea-conseil.com>
+ * Copyright (C) 2017       Laurent Destailleur         <eldy@users.sourceforge.net>
+ * Copyright (C) 2018-2024  Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2020       Tobias Sekan                <tobias.sekan@startmail.com>
+ * Copyright (C) 2024-2025  MDW                         <mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2026       Solution Libre SAS          <contact@solution-libre.fr>
  *
  * 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
@@ -27,6 +28,15 @@
 
 // Load Dolibarr environment
 require '../../../main.inc.php';
+
+/**
+ * @var Conf $conf
+ * @var DoliDB $db
+ * @var HookManager $hookmanager
+ * @var Translate $langs
+ * @var User $user
+ */
+
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
@@ -37,14 +47,6 @@ if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
-/**
- * @var Conf $conf
- * @var DoliDB $db
- * @var HookManager $hookmanager
- * @var Translate $langs
- * @var User $user
- */
-
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "banks", "bills", "accountancy"));
 
@@ -183,6 +185,9 @@ $arrayfields = array(
 	'credit'		=> array('label' => "Credit", 'checked' => '1', 'position' => 510),
 );
 
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
 // Security check
@@ -266,9 +271,19 @@ $sql = "SELECT v.rowid, v.sens, v.amount, v.label, v.datep as datep, v.datev as
 $sql .= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number as bank_account_number, ba.fk_accountancy_journal as accountancy_journal, ba.label as blabel,";
 $sql .= " pst.code as payment_code";
 
+// Add fields from extrafields
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');
+	}
+}
+
 $sqlfields = $sql; // $sql fields to remove for count total
 
 $sql .= " FROM ".MAIN_DB_PREFIX."payment_various as v";
+if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (v.rowid = ef.fk_object)";
+}
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON v.fk_typepayment = pst.id";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON v.fk_bank = b.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
@@ -600,6 +615,9 @@ if ($arrayfields['credit']['checked']) {
 	print '</td>';
 }
 
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
+
 if (!$conf->main_checkbox_left_column) {
 	print '<td class="liste_titre center maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons();
@@ -893,6 +911,9 @@ while ($i < $imaxinloop) {
 			print '</td>';
 		}
 
+		// Extra fields
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+
 		if (!$conf->main_checkbox_left_column) {
 			print '<td></td>';
 			if (!$i) {
diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
index cf11e59f5ff..d69f280395b 100644
--- a/htdocs/core/lib/bank.lib.php
+++ b/htdocs/core/lib/bank.lib.php
@@ -1,12 +1,13 @@
 <?php
-/* Copyright (C) 2006-2016	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2012		Regis Houssin			<regis.houssin@inodbox.com>
- * Copyright (C) 2015		Alexandre Spangaro		<aspangaro@open-dsi.fr>
- * Copyright (C) 2016		Juanjo Menent   		<jmenent@2byte.es>
- * Copyright (C) 2019	    Nicolas ZABOURI     	<info@inovea-conseil.com>
- * Copyright (C) 2021		Ferran Marcet			<fmarcet@2byte.es>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+/* Copyright (C) 2006-2016  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2012       Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2015       Alexandre Spangaro      <alexandre@inovea-conseil.com>
+ * Copyright (C) 2016       Juanjo Menent           <jmenent@2byte.es>
+ * Copyright (C) 2019       Nicolas ZABOURI         <info@inovea-conseil.com>
+ * Copyright (C) 2021       Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2024       MDW                     <mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024-2026  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2026       Solution Libre SAS      <contact@solution-libre.fr>
  *
  * 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
@@ -207,6 +208,7 @@ function bank_admin_prepare_head($object)
 	$extrafields->fetch_name_optionals_label('bank_account');
 	$extrafields->fetch_name_optionals_label('bank');
 	$extrafields->fetch_name_optionals_label('paiement');
+	$extrafields->fetch_name_optionals_label('payment_various');
 
 	$h = 0;
 	$head = array();
@@ -255,6 +257,15 @@ function bank_admin_prepare_head($object)
 	$head[$h][2] = 'bank_payments_extrafields';
 	$h++;
 
+	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/admin/bank_various_payment_extrafields.php');
+	$head[$h][1] = $langs->trans("ExtraFields").' ('.$langs->trans("VariousPayments").')';
+	$nbExtrafields = $extrafields->attributes['payment_various']['count'];
+	if ($nbExtrafields > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';
+	}
+	$head[$h][2] = 'bank_various_payment_extrafields';
+	$h++;
+
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank_admin', 'remove');
 
 	return $head;
diff --git a/htdocs/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php
index fd0adfd32e0..354cedc0663 100644
--- a/htdocs/core/modules/modBanque.class.php
+++ b/htdocs/core/modules/modBanque.class.php
@@ -1,9 +1,10 @@
 <?php
-/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
- * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
- * Copyright (C) 2008-2011 Regis Houssin        <regis.houssin@inodbox.com>
+/* Copyright (C) 2003-2005  Rodolphe Quiedeville        <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2008  Laurent Destailleur         <eldy@users.sourceforge.net>
+ * Copyright (C) 2004       Sebastien Di Cintio         <sdicintio@ressource-toi.org>
+ * Copyright (C) 2004       Benoit Mortier              <benoit.mortier@opensides.be>
+ * Copyright (C) 2008-2011  Regis Houssin               <regis.houssin@inodbox.com>
+ * Copyright (C) 2026       Solution Libre SAS          <contact@solution-libre.fr>
  *
  * 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
@@ -230,10 +231,16 @@ class modBanque extends DolibarrModules
 			'v.note'=>"payment", 'v.datec'=>"payment",
 			"p.ref"=>"project", "p.title"=>"project"
 		);
+		// Add extra fields
+		$keyforselect = 'payment_various';
+		$keyforelement = 'payment';
+		$keyforaliasextra = 'extra';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		$this->export_sql_start[$r] = 'SELECT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'payment_various as v';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX."projet as p ON v.fk_projet = p.rowid";
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX."c_paiement as cp ON v.fk_typepayment = cp.id";
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'payment_various_extrafields as extra ON v.rowid = extra.fk_object';
 		$this->export_sql_end[$r] .= ' WHERE v.entity IN ('.getEntity('payment_various').')';
 		$this->export_sql_order[$r] = ' ORDER BY v.datep';
 	}
diff --git a/htdocs/install/mysql/migration/23.0.0-24.0.0.sql b/htdocs/install/mysql/migration/23.0.0-24.0.0.sql
index 7c354d7933c..349fda9fa96 100644
--- a/htdocs/install/mysql/migration/23.0.0-24.0.0.sql
+++ b/htdocs/install/mysql/migration/23.0.0-24.0.0.sql
@@ -530,6 +530,17 @@ ALTER TABLE llx_product_warehouse_properties ADD INDEX idx_product_warehouse_pro
 ALTER TABLE llx_product_warehouse_properties ADD CONSTRAINT fk_product_warehouse_properties_fk_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid);
 ALTER TABLE llx_product_warehouse_properties ADD CONSTRAINT fk_product_warehouse_properties_fk_entrepot FOREIGN KEY (fk_entrepot) REFERENCES llx_entrepot (rowid);
 
+-- Add extrafields on various payment
+CREATE TABLE llx_payment_various_extrafields
+(
+	rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+	tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+	fk_object                 integer NOT NULL,
+	import_key                varchar(14)                          		-- import key
+) ENGINE=innodb;
+
+ALTER TABLE llx_payment_various_extrafields ADD UNIQUE INDEX uk_payment_various_extrafields (fk_object);
+
 ALTER TABLE llx_actioncomm ADD COLUMN max_participants integer DEFAULT NULL AFTER status;
 ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_max_participants (max_participants);
 -- end of migration
diff --git a/htdocs/install/mysql/tables/llx_payment_various_extrafields.key.sql b/htdocs/install/mysql/tables/llx_payment_various_extrafields.key.sql
new file mode 100644
index 00000000000..3760942ddce
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_payment_various_extrafields.key.sql
@@ -0,0 +1,21 @@
+-- ===================================================================
+-- Copyright (C) 2013		Jean-Francois FERRY			<jfefe@aternatik.fr>
+-- Copyright (C) 2026		Solution Libre SAS			<contact@solution-libre.fr>
+--
+-- 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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+
+ALTER TABLE llx_payment_various_extrafields ADD UNIQUE INDEX uk_payment_various_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_payment_various_extrafields.sql b/htdocs/install/mysql/tables/llx_payment_various_extrafields.sql
new file mode 100644
index 00000000000..187ac399885
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_payment_various_extrafields.sql
@@ -0,0 +1,26 @@
+-- ===================================================================
+-- Copyright (C) 2013		Jean-Francois FERRY			<jfefe@aternatik.fr>
+-- Copyright (C) 2026		Solution Libre SAS			<contact@solution-libre.fr>
+--
+-- 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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+CREATE TABLE llx_payment_various_extrafields
+(
+	rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+	tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+	fk_object                 integer NOT NULL,
+	import_key                varchar(14)                          		-- import key
+) ENGINE=innodb;
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 89eab5a6bcc..bd4d30bd477 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -1,13 +1,14 @@
 <?php
-/* Copyright (C) 2004		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
- * Copyright (C) 2015		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2021-2025  Frédéric France			<frederic.france@free.fr>
- * Copyright (C) 2023		Gauthier VERDOL			<gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2024-2026	MDW						<mdeweerd@users.noreply.github.com>
- * Copyright (C) 2024		Vincent de Grandpré		<vincent@de-grandpre.quebec>
- * Copyright (C) 2025		Alexandre Spangaro		<alexandre@inovea-conseil.com>
+/* Copyright (C) 2004       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2021-2025  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2023       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2024-2026  MDW                     <mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024       Vincent de Grandpré     <vincent@de-grandpre.quebec>
+ * Copyright (C) 2025       Alexandre Spangaro      <alexandre@inovea-conseil.com>
+ * Copyright (C) 2026       Solution Libre SAS      <contact@solution-libre.fr>
  *
  * 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
@@ -414,7 +415,7 @@ if ($ok && GETPOST('standard', 'alpha')) {
 				'fichinter' => 'fichinter', 'fichinterdet' => 'fichinterdet',
 				'inventory' => 'inventory',
 				'actioncomm' => 'actioncomm', 'bom_bom' => 'bom_bom', 'mrp_mo' => 'mrp_mo',
-				'adherent_type' => 'adherent_type', 'user' => 'user', 'partnership' => 'partnership', 'projet' => 'projet', 'projet_task' => 'projet_task', 'ticket' => 'ticket');
+				'adherent_type' => 'adherent_type', 'user' => 'user', 'partnership' => 'partnership', 'projet' => 'projet', 'projet_task' => 'projet_task', 'ticket' => 'ticket', 'payment_various' => 'payment_various');
 	//$listofmodulesextra = array('fichinter'=>'fichinter');
 
 	print '<tr><td colspan="2"><br>*** Check that fields into the extra table structure match the table of definition. If not, add column into table</td></tr>';

From 1b9402355079bf068e7bcb8b002a82176c37e401 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 May 2026 03:52:53 +0200
Subject: [PATCH 47/48] Qual: Better error message for missing translation
 (#38313)

# Qual: Better error message for missing translation

Update error message to include 'error - ' after the line:offset: text
to correspond to an emacs like error message recognized by logToCs
which allows it to appear as a github annotation
---
 dev/translation/sanity_check_trans_missing_unused.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/translation/sanity_check_trans_missing_unused.sh b/dev/translation/sanity_check_trans_missing_unused.sh
index b02a9a1da87..fbbd602c458 100755
--- a/dev/translation/sanity_check_trans_missing_unused.sh
+++ b/dev/translation/sanity_check_trans_missing_unused.sh
@@ -164,7 +164,7 @@ if [ -s "${MISSING_FILE}.grep" ] ; then
 
 	git grep -n --column -r -F -f "${MISSING_FILE}.grep" -- ':*.php' ':*.html' ':*.js' \
 		| sort -t: -k 4 \
-		| sed 's@^\([^:]*:[^:]*:[^:]*:\)\s*@\1 Missing translation; @' > "${MISSING_FILE}.result"
+		| sed 's@^\([^:]*:[^:]*:[^:]*:\)\s*@\1 error - Missing translation; @' > "${MISSING_FILE}.result"
 
 	if [ -s "${MISSING_FILE}.result" ] ; then
 		exit_code=1

From 40b4e8744f77c5f19b285e7f2df8beef5360e296 Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <github@jonb.dk>
Date: Mon, 18 May 2026 12:07:50 +0200
Subject: [PATCH 48/48] Fix #37675 API Post eventattendee sets ref to same as
 id (#38274)

* Fix #37675 API Post eventattendee sets ref to same as id

* Move empty ref check after fetch #38274

---------

Co-authored-by: Jon Bendtsen <jonbendtsen@jonb.dk>
---
 .../eventorganization/class/conferenceorboothattendee.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index dbec03466ae..a7c34d2243b 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -301,7 +301,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 		$result = $this->createCommon($user, $notrigger);
 		if ($result > 0) {
 			$result = $this->fetch($result);
-			if ($result > 0) {
+			if ($result > 0 && empty($this->ref)) {
 				$this->ref = (string) $this->id;
 				$result = $this->update($user);
 			}