diff --git a/htdocs/comm/propal/messaging.php b/htdocs/comm/propal/messaging.php
index f8818f53334..425abdd9a8d 100644
--- a/htdocs/comm/propal/messaging.php
+++ b/htdocs/comm/propal/messaging.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2005-2009 Regis Houssin            <regis.houssin@inodbox.com>
  * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2025       Grimal Valentin         <valentin.grimal@pichinov.com>
+ * Copyright (C) 2025       Valentin Grimal         <valentin.grimal@pichinov.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
@@ -21,8 +21,8 @@
 
 /**
  * \file       htdocs/comm/propal/messaging.php
- * \ingroup    order
- *		\brief      Page with events on order
+ * \ingroup    propal
+ *		\brief      Page with events on propal
  */
 
 // Load Dolibarr environment
@@ -42,7 +42,7 @@ require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
  */
 
 // Load translation files required by the page
-$langs->load("orders"); // Changed from projects
+$langs->load("propal");
 
 $id     = GETPOSTINT('id');
 $ref    = GETPOST('ref', 'alpha');
@@ -130,7 +130,7 @@ $title = $langs->trans('Events') . $agenda . ' - ' . $object->ref; // Removed $o
 if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/ordernamonly/', getDolGlobalString('MAIN_HTML_TITLE'))) { // Changed from projectnameonly
 	$title = $object->ref . ' - ' . $langs->trans("Info"); // Simplified title
 }
-$help_url = "EN:Module_Orders|FR:Module_Propals|ES:M&oacute;dulo_Pedidos"; // Changed help URL
+$help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos|DE:Modul_Angebote';
 
 llxHeader("", $title, $help_url, '', 0, 0, '', '', '', 'mod-propal page-card_messaging'); // Changed mod-project
 
@@ -191,7 +191,7 @@ print dol_get_fiche_end();
 $out = '';
 $permok = $user->hasRight('agenda', 'myactions', 'create');
 if ($permok) {
-	$out .= '&orderid=' . $object->id; // Changed from projectid
+	$out .= '&propalid=' . $object->id;
 }
 
 
@@ -239,7 +239,7 @@ if (!empty($object->id)) {
 	}
 
 	require_once DOL_DOCUMENT_ROOT . '/core/lib/memory.lib.php';
-	$cachekey = 'count_events_order_' . $object->id; // Changed from project
+	$cachekey = 'count_events_propal_' . $object->id;
 	$nbEvent = dol_getcache($cachekey);
 
 	$titlelist = $langs->trans("ActionsOnPropal") . (is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">(' . $nbEvent . ')</span>' : ''); // Changed from ActionsOnProject
diff --git a/htdocs/commande/agenda.php b/htdocs/commande/agenda.php
index bfc474204a2..9a98571fa13 100644
--- a/htdocs/commande/agenda.php
+++ b/htdocs/commande/agenda.php
@@ -43,7 +43,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
  */
 
 // Load translation files required by the page
-$langs->loadLangs(array("order", "other")); // Changed from "projects" to "order"
+$langs->loadLangs(array("order", "other"));
 
 $id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
@@ -95,7 +95,7 @@ if ($user->socid > 0) {
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, 'commande', $id, '', '', 'fk_soc', 'rowid', $isdraft);
 
-if (!$user->hasRight('commande', 'lire')) { // Changed from projet
+if (!$user->hasRight('commande', 'lire')) {
 	accessforbidden();
 }
 
@@ -105,7 +105,7 @@ if (!$user->hasRight('commande', 'lire')) { // Changed from projet
  * Actions
  */
 
-$object = new Commande($db); // Changed from Project
+$object = new Commande($db); //
 
 if ($id > 0 || !empty($ref)) {
 	$object->fetch($id, $ref);
@@ -137,27 +137,27 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 
 $form = new Form($db);
 $agenda = (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) ? '/' . $langs->trans("Agenda") : '';
-$title = $langs->trans('Events') . $agenda . ' - ' . $object->ref; // Changed from $object->ref.' '.$object->name;
+$title = $langs->trans('Events') . $agenda . ' - ' . $object->ref;
 
-if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/ordernamonly/', getDolGlobalString('MAIN_HTML_TITLE')) && $object->ref) { // Changed from projectnameonly
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/ordernamonly/', getDolGlobalString('MAIN_HTML_TITLE')) && $object->ref) {
 	$title = $object->ref . ' - ' . $langs->trans("Info"); // Simplified title
 }
-$help_url = "EN:Module_Orders|FR:Module_Commandes|ES:M&oacute;dulo_Pedidos"; // Changed help URL
-llxHeader("", $title, $help_url, '', 0, 0, '', '', '', 'mod-order page-card_agenda'); // Changed mod-project
+$help_url = "EN:Module_Orders|FR:Module_Commandes|ES:M&oacute;dulo_Pedidos";
+llxHeader("", $title, $help_url, '', 0, 0, '', '', '', 'mod-order page-card_agenda');
 
-$head = commande_prepare_head($object); // Changed from project_prepare_head
+$head = commande_prepare_head($object);
 
 print dol_get_fiche_head($head, 'agenda', $langs->trans("Order"), -1, $object->picto);
 
 
 // Order card
 
-if (!empty($_SESSION['pageforbacktolist']) && !empty($_SESSION['pageforbacktolist']['order'])) { // Changed from project
-	$tmpurl = $_SESSION['pageforbacktolist']['order']; // Changed from project
+if (!empty($_SESSION['pageforbacktolist']) && !empty($_SESSION['pageforbacktolist']['order'])) {
+	$tmpurl = $_SESSION['pageforbacktolist']['order'];
 	$tmpurl = preg_replace('/__SOCID__/', (string) $object->socid, $tmpurl);
 	$linkback = '<a href="' . $tmpurl . (preg_match('/\?/', $tmpurl) ? '&' : '?') . 'restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>';
 } else {
-	$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php?restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>'; // Changed from projet
+	$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php?restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>';
 }
 
 $morehtmlref = '<div class="refidno">';
@@ -214,7 +214,7 @@ print dol_get_fiche_end();
 $out = '';
 $permok = $user->hasRight('agenda', 'myactions', 'create');
 if ($permok) {
-	$out .= '&orderid=' . $object->id; // Changed from projectid
+	$out .= '&orderid=' . $object->id;
 }
 
 
@@ -228,12 +228,12 @@ if (!empty($object->id)) {
 	$morehtmlright = '';
 
 	// Show link to change view in message
-	$messagingUrl = DOL_URL_ROOT . '/commande/messaging.php?id=' . $object->id; // Changed from projet
+	$messagingUrl = DOL_URL_ROOT . '/commande/messaging.php?id=' . $object->id;
 	$morehtmlright .= dolGetButtonTitle($langs->trans('ShowAsConversation'), '', 'fa fa-comments imgforviewmode', $messagingUrl, '', 1); // Status 1 for "not current page"
 
 
 	// Show link to change view in agenda
-	$messagingUrl = DOL_URL_ROOT . '/commande/agenda.php?id=' . $object->id; // Changed from projet
+	$messagingUrl = DOL_URL_ROOT . '/commande/agenda.php?id=' . $object->id;
 	$morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-bars imgforviewmode', $messagingUrl, '', 2); // Status 2 for "current page"
 
 	// Show link to add event
@@ -251,10 +251,10 @@ if (!empty($object->id)) {
 	}
 
 	require_once DOL_DOCUMENT_ROOT . '/core/lib/memory.lib.php';
-	$cachekey = 'count_events_commande_' . $object->id; // Changed from project
+	$cachekey = 'count_events_commande_' . $object->id;
 	$nbEvent = dol_getcache($cachekey);
 
-	$titlelist = $langs->trans("ActionsOnOrder") . (is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">(' . $nbEvent . ')</span>' : ''); // Changed from ActionsOnProject
+	$titlelist = $langs->trans("ActionsOnOrder") . (is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">(' . $nbEvent . ')</span>' : '');
 	if (!empty($conf->dol_optimize_smallscreen)) {
 		$titlelist = $langs->trans("Actions") . (is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">(' . $nbEvent . ')</span>' : '');
 	}
diff --git a/htdocs/commande/messaging.php b/htdocs/commande/messaging.php
index 5ae6624d6ec..6a1b732c4ec 100644
--- a/htdocs/commande/messaging.php
+++ b/htdocs/commande/messaging.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2025       Grimal Valentin         <valentin.grimal@pichinov.com>
+ * Copyright (C) 2025       Valentin Grimal         <valentin.grimal@pichinov.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
@@ -28,8 +28,8 @@
 // Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php'; // Changed from project.class.php
-require_once DOL_DOCUMENT_ROOT . '/core/lib/order.lib.php'; // Changed from project.lib.php
+require_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/order.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
 
 /**
@@ -41,7 +41,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
  */
 
 // Load translation files required by the page
-$langs->load("orders"); // Changed from projects
+$langs->load("orders");
 
 $id     = GETPOSTINT('id');
 $ref    = GETPOST('ref', 'alpha');
@@ -95,7 +95,7 @@ if ($user->socid > 0) {
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, 'commande', $id, '', '', 'fk_soc', 'rowid', $isdraft);
 
-if (!$user->hasRight('commande', 'lire')) { // Changed from projet
+if (!$user->hasRight('commande', 'lire')) {
 	accessforbidden();
 }
 
@@ -105,7 +105,7 @@ if (!$user->hasRight('commande', 'lire')) { // Changed from projet
  * Actions
  */
 
-$object = new Commande($db); // Changed from Project
+$object = new Commande($db);
 
 if ($id > 0 || !empty($ref)) {
 	$object->fetch($id, $ref);
@@ -139,30 +139,30 @@ $form = new Form($db);
 
 $agenda = (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) ? '/' . $langs->trans("Agenda") : '';
 $title = $langs->trans('Events') . $agenda . ' - ' . $object->ref; // Removed $object->name as orders typically don't have it
-if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/ordernamonly/', getDolGlobalString('MAIN_HTML_TITLE'))) { // Changed from projectnameonly
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/ordernamonly/', getDolGlobalString('MAIN_HTML_TITLE'))) {
 	$title = $object->ref . ' - ' . $langs->trans("Info"); // Simplified title
 }
-$help_url = "EN:Module_Orders|FR:Module_Commandes|ES:M&oacute;dulo_Pedidos"; // Changed help URL
-llxHeader("", $title, $help_url, '', 0, 0, '', '', '', 'mod-order page-card_messaging'); // Changed mod-project
+$help_url = "EN:Module_Orders|FR:Module_Commandes|ES:M&oacute;dulo_Pedidos";
+llxHeader("", $title, $help_url, '', 0, 0, '', '', '', 'mod-order page-card_messaging');
 
-$head = commande_prepare_head($object); // Changed from project_prepare_head
+$head = commande_prepare_head($object);
 
 print dol_get_fiche_head($head, 'agenda', $langs->trans("Order"), -1, $object->picto);
 
 
 // Order card
 
-if (!empty($_SESSION['pageforbacktolist']) && !empty($_SESSION['pageforbacktolist']['order'])) { // Changed from project
-	$tmpurl = $_SESSION['pageforbacktolist']['order']; // Changed from project
+if (!empty($_SESSION['pageforbacktolist']) && !empty($_SESSION['pageforbacktolist']['order'])) {
+	$tmpurl = $_SESSION['pageforbacktolist']['order'];
 	$tmpurl = preg_replace('/__SOCID__/', (string) $object->socid, $tmpurl);
 	$linkback = '<a href="' . $tmpurl . (preg_match('/\?/', $tmpurl) ? '&' : '?') . 'restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>';
 } else {
-	$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php?restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>'; // Changed from projet
+	$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php?restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>';
 }
 
 $morehtmlref = '<div class="refidno">';
 // Title
-$morehtmlref .= $object->ref; // Changed from $object->title as orders typically use ref for main identification
+$morehtmlref .= $object->ref;
 // Thirdparty
 if (!empty($object->thirdparty->id) && $object->thirdparty->id > 0) {
 	$morehtmlref .= '<br>' . $object->thirdparty->getNomUrl(1, 'order');
@@ -170,7 +170,7 @@ if (!empty($object->thirdparty->id) && $object->thirdparty->id > 0) {
 $morehtmlref .= '</div>';
 
 // Define a complementary filter for search of next/prev ref.
-if (!$user->hasRight('commande', 'all', 'lire')) { // Changed from projet
+if (!$user->hasRight('commande', 'all', 'lire')) {
 	// This part needs a function specific to orders, e.g., getOrdersAuthorizedForUser
 	// For now, it's left as a placeholder or requires a custom implementation in Commande class
 	// $objectsListId = $object->getOrdersAuthorizedForUser($user, 0, 0); // Assuming such a method exists or will be created
@@ -198,7 +198,7 @@ print dol_get_fiche_end();
 $out = '';
 $permok = $user->hasRight('agenda', 'myactions', 'create');
 if ($permok) {
-	$out .= '&orderid=' . $object->id; // Changed from projectid
+	$out .= '&orderid=' . $object->id;
 }
 
 
@@ -213,11 +213,11 @@ if (!empty($object->id)) {
 
 
 	// Show link to change view in message
-	$messagingUrl = DOL_URL_ROOT . '/commande/messaging.php?id=' . $object->id; // Changed from projet
+	$messagingUrl = DOL_URL_ROOT . '/commande/messaging.php?id=' . $object->id;
 	$morehtmlright .= dolGetButtonTitle($langs->trans('ShowAsConversation'), '', 'fa fa-comments imgforviewmode', $messagingUrl, '', 2);
 
 	// Show link to change view in agenda
-	$messagingUrl = DOL_URL_ROOT . '/commande/agenda.php?id=' . $object->id; // Changed from projet
+	$messagingUrl = DOL_URL_ROOT . '/commande/agenda.php?id=' . $object->id;
 	$morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-bars imgforviewmode', $messagingUrl, '', 1);
 
 
@@ -246,10 +246,10 @@ if (!empty($object->id)) {
 	}
 
 	require_once DOL_DOCUMENT_ROOT . '/core/lib/memory.lib.php';
-	$cachekey = 'count_events_order_' . $object->id; // Changed from project
+	$cachekey = 'count_events_order_' . $object->id;
 	$nbEvent = dol_getcache($cachekey);
 
-	$titlelist = $langs->trans("ActionsOnOrder") . (is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">(' . $nbEvent . ')</span>' : ''); // Changed from ActionsOnProject
+	$titlelist = $langs->trans("ActionsOnOrder") . (is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">(' . $nbEvent . ')</span>' : '');
 	if (!empty($conf->dol_optimize_smallscreen)) {
 		$titlelist = $langs->trans("Actions") . (is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">(' . $nbEvent . ')</span>' : '');
 	}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 69207d09bd7..a424f1af525 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -9169,7 +9169,7 @@ function dol_string_onlythesehtmlattributes($stringtoclean, $allowed_attributes
 
 	if (class_exists('DOMDocument') && !empty($stringtoclean)) {
 		//$stringtoclean = '<?xml encoding="UTF-8"><html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body>'.$stringtoclean.'</body></html>';
-		$stringtoclean = '<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body>'.$stringtoclean.'</body></html>';
+		$stringtoclean = '<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body>' . $stringtoclean . '</body></html>';
 
 		// Warning: loadHTML does not support HTML5 on old libxml versions.
 		$dom = new DOMDocument('', 'UTF-8');
@@ -9226,8 +9226,8 @@ function dol_string_onlythesehtmlattributes($stringtoclean, $allowed_attributes
 		//$return = '<html><body>aaaa</p>bb<p>ssdd</p>'."\n<p>aaa</p>aa<p>bb</p>";
 
 		//$return = preg_replace('/^'.preg_quote('<?xml encoding="UTF-8">', '/').'/', '', $return);
-		$return = preg_replace('/^'.preg_quote('<html><head><', '/').'[^<>]*'.preg_quote('></head><body>', '/').'/', '', $return);
-		$return = preg_replace('/'.preg_quote('</body></html>', '/').'$/', '', trim($return));
+		$return = preg_replace('/^' . preg_quote('<html><head><', '/') . '[^<>]*' . preg_quote('></head><body>', '/') . '/', '', $return);
+		$return = preg_replace('/' . preg_quote('</body></html>', '/') . '$/', '', trim($return));
 
 		return trim($return);
 	} else {
@@ -9402,11 +9402,11 @@ function dol_htmlwithnojs($stringtoencode, $nouseofiframesandbox = 0, $check = '
 					// I don't know what the xml encoding is the trick for
 					if (dol_textishtml($out)) {
 						//$out = '<?xml encoding="UTF-8"><html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body><div class="tricktoremove">'.$out.'</div></body></html>';
-						$out = '<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body><div class="tricktoremove">'.$out.'</div></body></html>';
+						$out = '<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body><div class="tricktoremove">' . $out . '</div></body></html>';
 						//$out = '<html><head><meta charset="utf-8"></head><body><div class="tricktoremove">'.$out.'</div></body></html>';
 					} else {
 						//$out = '<?xml encoding="UTF-8"><html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body><div class="tricktoremove">'.dol_nl2br($out).'</div></body></html>';
-						$out = '<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body><div class="tricktoremove">'.dol_nl2br($out).'</div></body></html>';
+						$out = '<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body><div class="tricktoremove">' . dol_nl2br($out) . '</div></body></html>';
 						//$out = '<html><head><meta charset="utf-8"></head><body><div class="tricktoremove">'.dol_nl2br($out).'</div></body></html>';
 					}
 
@@ -9418,8 +9418,8 @@ function dol_htmlwithnojs($stringtoencode, $nouseofiframesandbox = 0, $check = '
 
 					// Remove the trick added to solve pb with text in utf8 and text without parent tag
 					//$out = preg_replace('/^'.preg_quote('<?xml encoding="UTF-8">', '/').'/', '', $out);
-					$out = preg_replace('/^'.preg_quote('<html><head><', '/').'[^<>]+'.preg_quote('></head><body><div class="tricktoremove">', '/').'/', '', $out);
-					$out = preg_replace('/'.preg_quote('</div></body></html>', '/').'$/', '', trim($out));
+					$out = preg_replace('/^' . preg_quote('<html><head><', '/') . '[^<>]+' . preg_quote('></head><body><div class="tricktoremove">', '/') . '/', '', $out);
+					$out = preg_replace('/' . preg_quote('</div></body></html>', '/') . '$/', '', trim($out));
 					//                  $out = preg_replace('/^<\?xml encoding="UTF-8"><div class="tricktoremove">/', '', $out);
 					//                  $out = preg_replace('/<\/div>$/', '', $out);
 					//                  var_dump('rrrrrrrrrrrrrrrrrrrrrrrrrrrrr'.$out);
diff --git a/htdocs/expedition/agenda.php b/htdocs/expedition/agenda.php
index c2d454d858c..2a5642c35ae 100644
--- a/htdocs/expedition/agenda.php
+++ b/htdocs/expedition/agenda.php
@@ -33,10 +33,10 @@ require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/modules/expedition/modules_expedition.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/sendings.lib.php';
 
-require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; // Keep if you use project linking in expedition
+require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/expedition.lib.php'; // Changed from order.lib.php
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php'; // Added for form->form_project
+require_once DOL_DOCUMENT_ROOT . '/core/lib/expedition.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php';
 
 /**
  * @var Conf $conf
@@ -82,16 +82,15 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$hookmanager->initHooks(array('shippingagenda', 'globalcard')); // Changed from orderagenda
+$hookmanager->initHooks(array('shippingagenda', 'globalcard'));
 
 // Security check
 $id = GETPOSTINT("id");
 $socid = 0;
 //if ($user->socid > 0) $socid = $user->socid;
-// Shipping module doesn't typically have a draft status like orders, so simplified restrictedArea
-$result = restrictedArea($user, 'expedition', $id, 'expedition&shipping'); // Changed from commande and order
+$result = restrictedArea($user, 'expedition', $id, 'expedition&shipping');
 
-if (!$user->hasRight('expedition', 'lire')) { // Changed from commande
+if (!$user->hasRight('expedition', 'lire')) {
 	accessforbidden();
 }
 
@@ -100,7 +99,7 @@ if (!$user->hasRight('expedition', 'lire')) { // Changed from commande
  * Actions
  */
 
-$object = new Expedition($db); // Changed from Commande
+$object = new Expedition($db);
 
 if ($id > 0 || !empty($ref)) {
 	$object->fetch($id, $ref);
@@ -132,8 +131,8 @@ $title = $langs->trans('Events') . $agenda . ' - ' . $object->ref; // Shipping u
 if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/shippingrefonly/', getDolGlobalString('MAIN_HTML_TITLE')) && $object->ref) { // New constant or fallback
 	$title = $object->ref . ' - ' . $langs->trans("Info");
 }
-$help_url = "EN:Module_Shippings|FR:Module_Expeditions|ES:M&oacute;dulo_Expediciones"; // Changed help URL
-llxHeader("", $title, $help_url, '', 0, 0, '', '', '', 'mod-shipping page-card_agenda'); // Changed mod-order
+$help_url = "EN:Module_Shippings|FR:Module_Expeditions|ES:M&oacute;dulo_Expediciones";
+llxHeader("", $title, $help_url, '', 0, 0, '', '', '', 'mod-shipping page-card_agenda');
 
 $head = shipping_prepare_head($object);
 print dol_get_fiche_head($head, 'shipping', $langs->trans("Shipment"), -1, $object->picto);
@@ -141,8 +140,8 @@ print dol_get_fiche_head($head, 'shipping', $langs->trans("Shipment"), -1, $obje
 
 // Shipping card
 
-if (!empty($_SESSION['pageforbacktolist']) && !empty($_SESSION['pageforbacktolist']['expedition'])) { // Changed from order
-	$tmpurl = $_SESSION['pageforbacktolist']['expedition']; // Changed from order
+if (!empty($_SESSION['pageforbacktolist']) && !empty($_SESSION['pageforbacktolist']['expedition'])) {
+	$tmpurl = $_SESSION['pageforbacktolist']['expedition'];
 	$tmpurl = preg_replace('/__SOCID__/', (string) $object->socid, $tmpurl);
 	$linkback = '<a href="' . $tmpurl . (preg_match('/\?/', $tmpurl) ? '&' : '?') . 'restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>';
 } else {
@@ -154,7 +153,7 @@ $morehtmlref = '<div class="refidno">';
 $morehtmlref .= $object->ref;
 // Thirdparty
 if (!empty($object->thirdparty->id) && $object->thirdparty->id > 0) {
-	$morehtmlref .= '<br>' . $object->thirdparty->getNomUrl(1, 'shipping'); // Changed from order
+	$morehtmlref .= '<br>' . $object->thirdparty->getNomUrl(1, 'shipping');
 }
 // Project - Keep as is if shipping can be linked to projects
 if (isModEnabled('project')) {
@@ -193,7 +192,7 @@ print dol_get_fiche_end();
 $out = '';
 $permok = $user->hasRight('agenda', 'myactions', 'create');
 if ($permok) {
-	$out .= '&shippingid=' . $object->id; // Changed from orderid
+	$out .= '&shippingid=' . $object->id;
 }
 
 
@@ -203,11 +202,11 @@ if (!empty($object->id)) {
 	$morehtmlright = '';
 
 	// Show link to change view in message
-	$messagingUrl = DOL_URL_ROOT . '/expedition/messaging.php?id=' . $object->id; // Changed from commande
+	$messagingUrl = DOL_URL_ROOT . '/expedition/messaging.php?id=' . $object->id;
 	$morehtmlright .= dolGetButtonTitle($langs->trans('ShowAsConversation'), '', 'fa fa-comments imgforviewmode', $messagingUrl, '', 1);
 
 	// Show link to change view in agenda
-	$messagingUrl = DOL_URL_ROOT . '/expedition/agenda.php?id=' . $object->id; // Changed from commande
+	$messagingUrl = DOL_URL_ROOT . '/expedition/agenda.php?id=' . $object->id;
 	$morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-bars imgforviewmode', $messagingUrl, '', 2);
 
 
@@ -226,10 +225,10 @@ if (!empty($object->id)) {
 	}
 
 	require_once DOL_DOCUMENT_ROOT . '/core/lib/memory.lib.php';
-	$cachekey = 'count_events_expedition_' . $object->id; // Changed from commande
+	$cachekey = 'count_events_expedition_' . $object->id;
 	$nbEvent = dol_getcache($cachekey);
 
-	$titlelist = $langs->trans("ActionsOnShipping") . (is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">(' . $nbEvent . ')</span>' : ''); // Changed from ActionsOnOrder
+	$titlelist = $langs->trans("ActionsOnShipping") . (is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">(' . $nbEvent . ')</span>' : '');
 	if (!empty($conf->dol_optimize_smallscreen)) {
 		$titlelist = $langs->trans("Actions") . (is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">(' . $nbEvent . ')</span>' : '');
 	}
diff --git a/htdocs/expedition/messaging.php b/htdocs/expedition/messaging.php
index d6c94f606cd..32f0b7c75c8 100644
--- a/htdocs/expedition/messaging.php
+++ b/htdocs/expedition/messaging.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2024       MDW                 <mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2025       Grimal Valentin         <valentin.grimal@pichinov.com>
+ * Copyright (C) 2025       Valentin Grimal         <valentin.grimal@pichinov.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
@@ -28,8 +28,8 @@
 // Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php'; // Changed from commande.class.php
-require_once DOL_DOCUMENT_ROOT . '/core/lib/expedition.lib.php'; // Changed from order.lib.php
+require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/expedition.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/sendings.lib.php';
 
@@ -43,7 +43,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/sendings.lib.php';
  */
 
 // Load translation files required by the page
-$langs->load("deliveries"); // Changed from "orders" to "deliveries"
+$langs->load("deliveries");
 
 $id     = GETPOSTINT('id');
 $ref    = GETPOST('ref', 'alpha');
@@ -78,15 +78,15 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$hookmanager->initHooks(array('shippingcardinfo')); // Changed from ordercardinfo
+$hookmanager->initHooks(array('shippingcardinfo'));
 
 // Security check
 $id = GETPOSTINT("id");
 $socid = 0;
 // Shipping module doesn't typically have a draft status, so simplified restrictedArea
-$result = restrictedArea($user, 'expedition', $id, 'expedition&shipping'); // Changed from commande and order
+$result = restrictedArea($user, 'expedition', $id, 'expedition&shipping');
 
-if (!$user->hasRight('expedition', 'lire')) { // Changed from commande
+if (!$user->hasRight('expedition', 'lire')) {
 	accessforbidden();
 }
 
@@ -96,7 +96,7 @@ if (!$user->hasRight('expedition', 'lire')) { // Changed from commande
  * Actions
  */
 
-$object = new Expedition($db); // Changed from Commande
+$object = new Expedition($db);
 
 if ($id > 0 || !empty($ref)) {
 	$object->fetch($id, $ref);
@@ -129,22 +129,22 @@ $title = $langs->trans('Events') . $agenda . ' - ' . $object->ref; // Shipping u
 if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/shippingrefonly/', getDolGlobalString('MAIN_HTML_TITLE')) && $object->ref) { // New constant or fallback
 	$title = $object->ref . ' - ' . $langs->trans("Info");
 }
-$help_url = "EN:Module_Shippings|FR:Module_Expeditions|ES:M&oacute;dulo_Expediciones"; // Changed help URL
-llxHeader("", $title, $help_url, '', 0, 0, '', '', '', 'mod-shipping page-card_messaging'); // Changed mod-order
+$help_url = "EN:Module_Shippings|FR:Module_Expeditions|ES:M&oacute;dulo_Expediciones";
+llxHeader("", $title, $help_url, '', 0, 0, '', '', '', 'mod-shipping page-card_messaging');
 
-$head = shipping_prepare_head($object); // Changed from commande_prepare_head (This function might need to be defined in expedition.lib.php if it doesn't exist)
+$head = shipping_prepare_head($object);
 
 print dol_get_fiche_head($head, 'agenda', $langs->trans("Shipment"), -1, $object->picto);
 
 
 // Shipping card
 
-if (!empty($_SESSION['pageforbacktolist']) && !empty($_SESSION['pageforbacktolist']['expedition'])) { // Changed from order
-	$tmpurl = $_SESSION['pageforbacktolist']['expedition']; // Changed from order
+if (!empty($_SESSION['pageforbacktolist']) && !empty($_SESSION['pageforbacktolist']['expedition'])) {
+	$tmpurl = $_SESSION['pageforbacktolist']['expedition'];
 	$tmpurl = preg_replace('/__SOCID__/', (string) $object->socid, $tmpurl);
 	$linkback = '<a href="' . $tmpurl . (preg_match('/\?/', $tmpurl) ? '&' : '?') . 'restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>';
 } else {
-	$linkback = '<a href="' . DOL_URL_ROOT . '/expedition/list.php?restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>'; // Changed from commande
+	$linkback = '<a href="' . DOL_URL_ROOT . '/expedition/list.php?restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>';
 }
 
 $morehtmlref = '<div class="refidno">';
@@ -152,7 +152,7 @@ $morehtmlref = '<div class="refidno">';
 $morehtmlref .= $object->ref;
 // Thirdparty
 if (!empty($object->thirdparty->id) && $object->thirdparty->id > 0) {
-	$morehtmlref .= '<br>' . $object->thirdparty->getNomUrl(1, 'shipping'); // Changed from order
+	$morehtmlref .= '<br>' . $object->thirdparty->getNomUrl(1, 'shipping');
 }
 $morehtmlref .= '</div>';
 
@@ -179,7 +179,7 @@ print dol_get_fiche_end();
 $out = '';
 $permok = $user->hasRight('agenda', 'myactions', 'create');
 if ($permok) {
-	$out .= '&shippingid=' . $object->id; // Changed from orderid
+	$out .= '&shippingid=' . $object->id;
 }
 
 
@@ -190,11 +190,11 @@ if (!empty($object->id)) {
 	$morehtmlright = '';
 
 	// Show link to change view in message
-	$messagingUrl = DOL_URL_ROOT . '/expedition/messaging.php?id=' . $object->id; // Changed from commande
+	$messagingUrl = DOL_URL_ROOT . '/expedition/messaging.php?id=' . $object->id;
 	$morehtmlright .= dolGetButtonTitle($langs->trans('ShowAsConversation'), '', 'fa fa-comments imgforviewmode', $messagingUrl, '', 2); // Status 2 for "current page"
 
 	// Show link to change view in agenda
-	$messagingUrl = DOL_URL_ROOT . '/expedition/agenda.php?id=' . $object->id; // Changed from commande
+	$messagingUrl = DOL_URL_ROOT . '/expedition/agenda.php?id=' . $object->id;
 	$morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-bars imgforviewmode', $messagingUrl, '', 1); // Status 1 for "not current page"
 
 
@@ -213,10 +213,10 @@ if (!empty($object->id)) {
 	}
 
 	require_once DOL_DOCUMENT_ROOT . '/core/lib/memory.lib.php';
-	$cachekey = 'count_events_expedition_' . $object->id; // Changed from commande
+	$cachekey = 'count_events_expedition_' . $object->id;
 	$nbEvent = dol_getcache($cachekey);
 
-	$titlelist = $langs->trans("ActionsOnShipping") . (is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">(' . $nbEvent . ')</span>' : ''); // Changed from ActionsOnOrder
+	$titlelist = $langs->trans("ActionsOnShipping") . (is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">(' . $nbEvent . ')</span>' : '');
 	if (!empty($conf->dol_optimize_smallscreen)) {
 		$titlelist = $langs->trans("Actions") . (is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">(' . $nbEvent . ')</span>' : '');
 	}
diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php
index ae7eee143a3..6067b931dbf 100644
--- a/htdocs/fourn/commande/info.php
+++ b/htdocs/fourn/commande/info.php
@@ -29,12 +29,12 @@
 
 // Load Dolibarr environment
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/fourn.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.commande.class.php';
 if (isModEnabled('project')) {
-	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
 }
 
 /**
@@ -131,9 +131,9 @@ if ($id > 0 || !empty($ref)) {
 	$object->info($object->id);
 }
 
-$title = $object->ref.' - '.$langs->trans('Info').' - '.$object->ref.' '.$object->name;
+$title = $object->ref . ' - ' . $langs->trans('Info') . ' - ' . $object->ref . ' ' . $object->name;
 if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/projectnameonly/', getDolGlobalString('MAIN_HTML_TITLE')) && $object->name) {
-	$title = $object->ref.' '.$object->name.' - '.$langs->trans("Info");
+	$title = $object->ref . ' ' . $object->name . ' - ' . $langs->trans("Info");
 }
 $help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
 llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-supplier-order page-info');
@@ -142,20 +142,18 @@ $now = dol_now();
 
 $head = ordersupplier_prepare_head($object);
 
-
 print dol_get_fiche_head($head, 'info', $langs->trans("SupplierOrder"), -1, 'order');
 
-
 // Supplier order card
 
-$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/commande/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+$linkback = '<a href="' . DOL_URL_ROOT . '/fourn/commande/list.php' . (!empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
 $morehtmlref = '<div class="refidno">';
 // Ref supplier
 $morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
 $morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
 // Thirdparty
-$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
+$morehtmlref .= '<br>' . $object->thirdparty->getNomUrl(1);
 // Project
 if (isModEnabled('project')) {
 	$langs->load("projects");
@@ -163,16 +161,16 @@ if (isModEnabled('project')) {
 	if (0) {	// @phpstan-ignore-line
 		$morehtmlref .= img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth"');
 		if ($action != 'classify' && $caneditproject) {  // Always false @phpstan-ignore-line
-			$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
+			$morehtmlref .= '<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token=' . newToken() . '&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> ';
 		}
-		$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+		$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 	} else {
 		if (!empty($object->fk_project)) {
 			$proj = new Project($db);
 			$proj->fetch($object->fk_project);
 			$morehtmlref .= $proj->getNomUrl(1);
 			if ($proj->title) {
-				$morehtmlref .= '<span class="opacitymedium"> - '.dol_escape_htmltag($proj->title).'</span>';
+				$morehtmlref .= '<span class="opacitymedium"> - ' . dol_escape_htmltag($proj->title) . '</span>';
 			}
 		}
 	}
@@ -181,7 +179,6 @@ $morehtmlref .= '</div>';
 
 dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-
 print '<div class="fichecenter">';
 print '<div class="underbanner clearboth"></div>';
 
@@ -193,41 +190,53 @@ print '<div class="clearboth"></div>';
 
 print dol_get_fiche_end();
 
-
-
-
 // Actions buttons
 
 $out = '';
 $permok = $user->hasRight('agenda', 'myactions', 'create');
 if ($permok) {
-	$out .= '&originid='.$object->id.'&origin=order_supplier';
+	$out .= '&originid=' . $object->id . '&origin=order_supplier';
 }
 
+// print '<div class="tabsAction">';
 
-print '<div class="tabsAction">';
+// if (isModEnabled('agenda')) {
+// 	if ($user->hasRight('agenda', 'myactions', 'create') || $user->hasRight('agenda', 'allactions', 'create')) {
+// 		print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">'.$langs->trans("AddAction").'</a>';
+// 	} else {
+// 		print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
+// 	}
+// }
 
-if (isModEnabled('agenda')) {
-	if ($user->hasRight('agenda', 'myactions', 'create') || $user->hasRight('agenda', 'allactions', 'create')) {
-		print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">'.$langs->trans("AddAction").'</a>';
-	} else {
-		print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
-	}
-}
-
-print '</div>';
+// print '</div>';
 
 
 if (!empty($object->id)) {
-	$param = '&id='.$object->id;
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
-		$param .= '&contextpage='.$contextpage;
-	}
-	if ($limit > 0 && $limit != $conf->liste_limit) {
-		$param .= '&limit='.$limit;
+	$morehtmlright = '';
+
+	// Show link to change view in message
+	$messagingUrl = DOL_URL_ROOT . '/fourn/commande/messaging.php?id=' . $object->id;
+	$morehtmlright .= dolGetButtonTitle($langs->trans('ShowAsConversation'), '', 'fa fa-comments imgforviewmode', $messagingUrl, '', 1); // Status 1 for "not current page"
+
+	// Show link to change view in agenda
+	$messagingUrl = DOL_URL_ROOT . '/fourn/commande/info.php?id=' . $object->id;
+	$morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-bars imgforviewmode', $messagingUrl, '', 2); // Status 2 for "current page"
+
+	// Show link to add event
+	if (isModEnabled('agenda')) {
+		$addActionBtnRight = $user->hasRight('agenda', 'myactions', 'create') || $user->hasRight('agenda', 'allactions', 'create');
+		$morehtmlright .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT . '/comm/action/card.php?action=create' . $out . '&socid=' . $object->socid . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?id=' . $object->id), '', (int) $addActionBtnRight);
 	}
 
-	print load_fiche_titre($langs->trans("ActionsOnOrder"), '', '');
+	$param = '&id=' . $object->id;
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+		$param .= '&contextpage=' . $contextpage;
+	}
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit=' . $limit;
+	}
+
+	// print load_fiche_titre($langs->trans("ActionsOnOrder"), '', '');
 
 	// List of actions on element
 	/*include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
@@ -240,7 +249,18 @@ if (!empty($object->id)) {
 	// List of done actions
 	//show_actions_done($conf,$langs,$db,$object,null,0,$actioncode, '', $filters, $sortfield, $sortorder);
 
-	// List of all actions
+	require_once DOL_DOCUMENT_ROOT . '/core/lib/memory.lib.php';
+	$cachekey = 'count_events_commande_' . $object->id;
+	$nbEvent = dol_getcache($cachekey);
+
+
+	$titlelist = $langs->trans("ActionsOnOrder") . (is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">(' . $nbEvent . ')</span>' : '');
+	if (!empty($conf->dol_optimize_smallscreen)) {
+		$titlelist = $langs->trans("Actions") . (is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">(' . $nbEvent . ')</span>' : '');
+	}
+
+	print_barre_liste($titlelist, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 0);
+
 	$filters = array();
 	$filters['search_agenda_label'] = $search_agenda_label;
 	$filters['search_rowid'] = $search_rowid;
diff --git a/htdocs/fourn/commande/messaging.php b/htdocs/fourn/commande/messaging.php
new file mode 100644
index 00000000000..cba1527503b
--- /dev/null
+++ b/htdocs/fourn/commande/messaging.php
@@ -0,0 +1,269 @@
+<?php
+/* Copyright (C) 2005-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025       Valentin Grimal         <valentin.grimal@pichinov.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
+ * 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/fourn/commande/messaging.php
+ * \ingroup    order
+ *		\brief      Page with events on order
+ */
+
+// Load Dolibarr environment
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/fourn.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.commande.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/company.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("suppliers", "orders", "companies", "stocks"));
+
+$id     = GETPOSTINT('id');
+$ref    = GETPOST('ref', 'alpha');
+$socid  = GETPOSTINT('socid');
+$action = GETPOST('action', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ09');
+
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", "aZ09comma");
+$sortorder = GETPOST("sortorder", 'aZ09comma');
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
+$page = is_numeric($page) ? $page : 0;
+$page = $page == -1 ? 0 : $page;
+if (!$sortfield) {
+	$sortfield = "a.datep,a.id";
+}
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
+if (GETPOST('actioncode', 'array')) {
+	$actioncode = GETPOST('actioncode', 'array', 3);
+	if (!count($actioncode)) {
+		$actioncode = '0';
+	}
+} else {
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
+}
+$search_rowid = GETPOST('search_rowid');
+$search_agenda_label = GETPOST('search_agenda_label');
+
+$hookmanager->initHooks(array('orderagenda', 'globalcard'));
+
+// Initialize a technical objects
+$object = new CommandeFournisseur($db);
+$hookmanager->initHooks(array('orderagenda', 'globalcard'));
+
+// Load object
+include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->order->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity] . "/" . $object->id;
+}
+
+// Security check
+if ($user->socid > 0) {
+	$socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of order and assignment.
+}
+$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
+restrictedArea($user, 'fournisseur', $id, 'commande_fournisseur', 'commande', 'fk_soc', 'rowid', $isdraft);
+
+if (!$user->hasRight("fournisseur", "commande", "lire")) {
+	accessforbidden();
+}
+
+
+
+/*
+ * Actions
+ */
+
+$object = new CommandeFournisseur($db);
+
+if ($id > 0 || !empty($ref)) {
+	$object->fetch($id, $ref);
+	$object->fetch_thirdparty();
+	// Note: Commande class might not have fetchComments. You may need to implement this
+	// if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($object, 'fetchComments') && empty($object->comments)) {
+	// 	$object->fetchComments();
+	// }
+	$object->info($object->id);
+}
+
+$parameters = array('id' => $socid);
+$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');
+}
+
+// Purge search criteria
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
+	$actioncode = '';
+	$search_agenda_label = '';
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$agenda = (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) ? '/' . $langs->trans("Agenda") : '';
+$title = $langs->trans('Events') . $agenda . ' - ' . $object->ref; // Removed $object->name as orders typically don't have it
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/ordernamonly/', getDolGlobalString('MAIN_HTML_TITLE'))) {
+	$title = $object->ref . ' - ' . $langs->trans("Info"); // Simplified title
+}
+$help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
+llxHeader("", $title, $help_url, '', 0, 0, '', '', '', 'mod-order page-card_messaging');
+
+$head = ordersupplier_prepare_head($object);
+
+print dol_get_fiche_head($head, 'agenda', $langs->trans("Order"), -1, $object->picto);
+
+if (!empty($_SESSION['pageforbacktolist']) && !empty($_SESSION['pageforbacktolist']['order'])) {
+	$tmpurl = $_SESSION['pageforbacktolist']['order'];
+	$tmpurl = preg_replace('/__SOCID__/', (string) $object->socid, $tmpurl);
+	$linkback = '<a href="' . $tmpurl . (preg_match('/\?/', $tmpurl) ? '&' : '?') . 'restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>';
+} else {
+	$linkback = '<a href="' . DOL_URL_ROOT . '/fourn/commande/list.php?restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>';
+}
+
+$morehtmlref = '<div class="refidno">';
+// Title
+$morehtmlref .= $object->ref;
+// Thirdparty
+if (!empty($object->thirdparty->id) && $object->thirdparty->id > 0) {
+	$morehtmlref .= '<br>' . $object->thirdparty->getNomUrl(1, 'order');
+}
+$morehtmlref .= '</div>';
+
+// Define a complementary filter for search of next/prev ref.
+if (!$user->hasRight('commande', 'all', 'lire')) {
+	// This part needs a function specific to orders, e.g., getOrdersAuthorizedForUser
+	// For now, it's left as a placeholder or requires a custom implementation in Commande class
+	// $objectsListId = $object->getOrdersAuthorizedForUser($user, 0, 0); // Assuming such a method exists or will be created
+	// $object->next_prev_filter = "rowid:IN:".$db->sanitize(count($objectsListId) ? implode(',', array_keys($objectsListId)) : '0');
+	$object->next_prev_filter = ''; // Placeholder if getOrdersAuthorizedForUser is not available
+}
+
+dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+
+print '<div class="fichecenter">';
+print '<div class="underbanner clearboth"></div>';
+
+dol_print_object_info($object, 1);
+
+print '</div>';
+
+print '<div class="clearboth"></div>';
+
+print dol_get_fiche_end();
+
+
+// Actions buttons
+
+$out = '';
+$permok = $user->hasRight('agenda', 'myactions', 'create');
+if ($permok) {
+	$out .= '&orderid=' . $object->id;
+}
+
+
+
+//print '</div>';
+
+if (!empty($object->id)) {
+	print '<br>';
+
+	//print '<div class="tabsAction">';
+	$morehtmlright = '';
+
+
+	// Show link to change view in message
+	$messagingUrl = DOL_URL_ROOT . '/fourn/commande/messaging.php?id=' . $object->id;
+	$morehtmlright .= dolGetButtonTitle($langs->trans('ShowAsConversation'), '', 'fa fa-comments imgforviewmode', $messagingUrl, '', 2);
+
+	// Show link to change view in agenda
+	$messagingUrl = DOL_URL_ROOT . '/fourn/commande/info.php?id=' . $object->id;
+	$morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-bars imgforviewmode', $messagingUrl, '', 1);
+
+
+	// // Show link to send an email (if read and not closed)
+	// $btnstatus = $object->status < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage";
+	// $url = 'card.php?track_id='.$object->track_id.'&action=presend_addmessage&mode=init&private_message=0&send_email=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?track_id='.$object->track_id).'#formmailbeforetitle';
+	// $morehtmlright .= dolGetButtonTitle($langs->trans('SendMail'), '', 'fa fa-paper-plane', $url, 'email-title-button', $btnstatus);
+
+	// // Show link to add a private message (if read and not closed)
+	// $btnstatus = $object->status < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage";
+	// $url = 'card.php?track_id='.$object->track_id.'&action=presend_addmessage&mode=init&backtopage='.urlencode($_SERVER["PHP_SELF"].'?track_id='.$object->track_id).'#formmailbeforetitle';
+	// $morehtmlright .= dolGetButtonTitle($langs->trans('TicketAddMessage'), '', 'fa fa-comment-dots', $url, 'add-new-ticket-title-button', $btnstatus);
+
+	// Show link to add event
+	if (isModEnabled('agenda')) {
+		$addActionBtnRight = $user->hasRight('agenda', 'myactions', 'create') || $user->hasRight('agenda', 'allactions', 'create');
+		$morehtmlright .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT . '/comm/action/card.php?action=create' . $out . '&socid=' . $object->socid . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?id=' . $object->id), '', (int) $addActionBtnRight);
+	}
+
+	$param = '&id=' . $object->id;
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+		$param .= '&contextpage=' . urlencode($contextpage);
+	}
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit=' . ((int) $limit);
+	}
+
+	require_once DOL_DOCUMENT_ROOT . '/core/lib/memory.lib.php';
+	$cachekey = 'count_events_order_' . $object->id;
+	$nbEvent = dol_getcache($cachekey);
+
+	$titlelist = $langs->trans("ActionsOnOrder") . (is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">(' . $nbEvent . ')</span>' : '');
+	if (!empty($conf->dol_optimize_smallscreen)) {
+		$titlelist = $langs->trans("Actions") . (is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">(' . $nbEvent . ')</span>' : '');
+	}
+
+	print_barre_liste($titlelist, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 0);
+
+	// List of all actions
+	$filters = array();
+	$filters['search_agenda_label'] = $search_agenda_label;
+	$filters['search_rowid'] = $search_rowid;
+
+	// This function needs to be able to handle an 'order' object. You might need to adapt it or create a new one.
+	show_actions_messaging($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
+}
+
+// End of page
+llxFooter();
+$db->close();