diff --git a/htdocs/core/boxes/box_last_knowledgerecord.php b/htdocs/core/boxes/box_last_knowledgerecord.php
index 325c8cb8683..41f9f847445 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);
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";
diff --git a/htdocs/core/modules/modKnowledgeManagement.class.php b/htdocs/core/modules/modKnowledgeManagement.class.php
index 97b7e45c542..a0f83e5b786 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/categorie_list.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
 		);