From e84ea68218e5f82d9ed0170ffa1b03a3a8cbf680 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 15 Oct 2025 18:58:53 +0200 Subject: [PATCH 1/3] FIX wrong getEntiy element name (#35771) --- htdocs/core/boxes/box_last_knowledgerecord.php | 2 +- htdocs/core/boxes/box_last_modified_knowledgerecord.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/boxes/box_last_knowledgerecord.php b/htdocs/core/boxes/box_last_knowledgerecord.php index 9f4d98999ac..cc1b158f356 100644 --- a/htdocs/core/boxes/box_last_knowledgerecord.php +++ b/htdocs/core/boxes/box_last_knowledgerecord.php @@ -93,7 +93,7 @@ class box_last_knowledgerecord extends ModeleBoxes if ($user->hasRight('knowledgemanagement', 'knowledgerecord', 'read')) { $sql = 'SELECT k.rowid as id, k.date_creation, k.ref, k.lang, k.question, k.status as status'; $sql .= " FROM ".MAIN_DB_PREFIX."knowledgemanagement_knowledgerecord as k"; - $sql .= " WHERE k.entity IN (".getEntity('knowledgemanagement').")"; + $sql .= " WHERE k.entity IN (".getEntity('knowledgerecord').")"; if ($user->socid) { $sql .= " AND k.fk_soc= ".((int) $user->socid); diff --git a/htdocs/core/boxes/box_last_modified_knowledgerecord.php b/htdocs/core/boxes/box_last_modified_knowledgerecord.php index c41d141d5e8..cc8c47bf46a 100644 --- a/htdocs/core/boxes/box_last_modified_knowledgerecord.php +++ b/htdocs/core/boxes/box_last_modified_knowledgerecord.php @@ -93,7 +93,7 @@ class box_last_modified_knowledgerecord extends ModeleBoxes if ($user->hasRight('knowledgemanagement', 'knowledgerecord', 'read')) { $sql = 'SELECT k.rowid as id, k.date_creation, k.ref, k.lang, k.question, k.status as status'; $sql .= " FROM ".MAIN_DB_PREFIX."knowledgemanagement_knowledgerecord as k"; - $sql .= " WHERE k.entity IN (".getEntity('knowledgemanagement').")"; + $sql .= " WHERE k.entity IN (".getEntity('knowledgerecord').")"; if ($user->socid) { $sql .= " AND k.fk_soc= ".((int) $user->socid); From f85108b8aca1684ce9cec36cda09901adb322606 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 15 Oct 2025 18:59:33 +0200 Subject: [PATCH 2/3] FIX check if category module is enabled (#35770) --- .../core/modules/modKnowledgeManagement.class.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/htdocs/core/modules/modKnowledgeManagement.class.php b/htdocs/core/modules/modKnowledgeManagement.class.php index d7352647f24..a777585745b 100644 --- a/htdocs/core/modules/modKnowledgeManagement.class.php +++ b/htdocs/core/modules/modKnowledgeManagement.class.php @@ -300,9 +300,9 @@ class modKnowledgeManagement extends DolibarrModules 'langs' => 'knowledgemanagement', 'position' => 101, // Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. - 'enabled' => '$conf->knowledgemanagement->enabled', + 'enabled' => 'isModEnabled("knowledgemanagement")', // Use 'perms'=>'$user->rights->knowledgemanagement->level1->level2' if you want your menu with a permission rules - 'perms' => '$user->rights->knowledgemanagement->knowledgerecord->read', + 'perms' => '$user->hasRight("knowledgemanagement", "knowledgerecord", "read")', 'target' => '', // 0=Menu for internal users, 1=external users, 2=both 'user' => 2, @@ -320,9 +320,9 @@ class modKnowledgeManagement extends DolibarrModules 'langs' => 'knowledgemanagement', 'position' => 111, // Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. - 'enabled' => '$conf->knowledgemanagement->enabled', + 'enabled' => 'isModEnabled("knowledgemanagement")', // Use 'perms'=>'$user->rights->knowledgemanagement->level1->level2' if you want your menu with a permission rules - 'perms' => '$user->rights->knowledgemanagement->knowledgerecord->read', + 'perms' => '$user->hasRight("knowledgemanagement", "knowledgerecord", "read")', 'target' => '', // 0=Menu for internal users, 1=external users, 2=both 'user' => 2, @@ -340,7 +340,7 @@ class modKnowledgeManagement extends DolibarrModules 'langs' => 'knowledgemanagement', 'position' => 110, // Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. - 'enabled' => '$conf->knowledgemanagement->enabled', + 'enabled' => 'isModEnabled("knowledgemanagement")', // Use 'perms'=>'$user->rights->knowledgemanagement->level1->level2' if you want your menu with a permission rules 'perms' => '$user->hasRight("knowledgemanagement", "knowledgerecord", "write")', 'target' => '', @@ -355,8 +355,8 @@ class modKnowledgeManagement extends DolibarrModules 'url' => '/categories/index.php?type=13', 'langs' => 'knowledgemanagement', 'position' => 112, - 'enabled' => '$conf->knowledgemanagement->enabled', - 'perms' => '$user->rights->knowledgemanagement->knowledgerecord->read', + 'enabled' => 'isModEnabled("knowledgemanagement") && isModenabled("category")', + 'perms' => '$user->hasRight("knowledgemanagement", "knowledgerecord", "read")', 'target' => '', 'user' => 0 ); From c7a61226fb3d750cb91bc8aa29163bb6233ae035 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 17 Oct 2025 01:48:32 +0200 Subject: [PATCH 3/3] FIX #35784 --- htdocs/core/boxes/box_last_ticket.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/boxes/box_last_ticket.php b/htdocs/core/boxes/box_last_ticket.php index f251cd944bf..0703c3fd652 100644 --- a/htdocs/core/boxes/box_last_ticket.php +++ b/htdocs/core/boxes/box_last_ticket.php @@ -83,9 +83,9 @@ class box_last_ticket extends ModeleBoxes $sql .= " type.label as type_label, category.label as category_label, severity.label as severity_label,"; $sql .= " s.nom as company_name, s.email as socemail, s.client, s.fournisseur"; $sql .= " FROM ".MAIN_DB_PREFIX."ticket as t"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_code"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code=t.category_code"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code=t.severity_code"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code = t.type_code AND type.entity = t.entity"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code = t.category_code AND category.entity = t.entity"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code = t.severity_code AND severity.entity = t.entity"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=t.fk_soc"; $sql .= " WHERE t.entity IN (".getEntity('ticket').")"; // $sql.= " AND e.rowid = er.fk_event";