From d38697d74b8cd3fad0c19b3edc91a4958856a0c5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 19 May 2022 08:46:50 +0200
Subject: [PATCH] Missing data in resource module

---
 htdocs/core/modules/modResource.class.php         | 12 ++++++------
 htdocs/install/mysql/data/llx_c_type_resource.sql |  4 ++--
 htdocs/install/mysql/migration/15.0.0-16.0.0.sql  |  3 +++
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php
index da1fdcbf016..b43ead29e7f 100644
--- a/htdocs/core/modules/modResource.class.php
+++ b/htdocs/core/modules/modResource.class.php
@@ -185,11 +185,11 @@ class modResource extends DolibarrModules
 
 		// Menus declaration
 		$this->menu[$r] = array(
-			'fk_menu'=>'fk_mainmenu=tools',
+			'fk_menu'=>'fk_mainmenu=agenda',
 			'type'=>'left',
 			'titre'=> 'MenuResourceIndex',
 			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth em92"'),
-			'mainmenu'=>'tools',
+			'mainmenu'=>'agenda',
 			'leftmenu'=> 'resource',
 			'url'=> '/resource/list.php',
 			'langs'=> 'resource',
@@ -201,10 +201,10 @@ class modResource extends DolibarrModules
 		$r++;
 
 		$this->menu[$r++] = array(
-			'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=resource', //On utilise les ancres définis dans le menu parent déclaré au dessus
+			'fk_menu'=>'fk_mainmenu=agenda,fk_leftmenu=resource', //On utilise les ancres définis dans le menu parent déclaré au dessus
 			'type'=> 'left', // Toujours un menu gauche
 			'titre'=> 'MenuResourceAdd',
-			'mainmenu'=> 'tools',
+			'mainmenu'=> 'agenda',
 			'leftmenu'=> 'resource_add',
 			'url'=> '/resource/card.php?action=create',
 			'langs'=> 'resource',
@@ -216,10 +216,10 @@ class modResource extends DolibarrModules
 		);
 
 		$this->menu[$r++] = array(
-			'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=resource', //On utilise les ancres définis dans le menu parent déclaré au dessus
+			'fk_menu'=>'fk_mainmenu=agenda,fk_leftmenu=resource', //On utilise les ancres définis dans le menu parent déclaré au dessus
 			'type'=> 'left', // Toujours un menu gauche
 			'titre'=> 'List',
-			'mainmenu'=> 'tools',
+			'mainmenu'=> 'agenda',
 			'leftmenu'=> 'resource_list',
 			'url'=> '/resource/list.php',
 			'langs'=> 'resource',
diff --git a/htdocs/install/mysql/data/llx_c_type_resource.sql b/htdocs/install/mysql/data/llx_c_type_resource.sql
index fb93d6ff68b..2ecb837ff15 100644
--- a/htdocs/install/mysql/data/llx_c_type_resource.sql
+++ b/htdocs/install/mysql/data/llx_c_type_resource.sql
@@ -30,6 +30,6 @@
 -- Type resources
 --
 
-insert into llx_c_type_resource (code,label,active) values ('RES_ROOMS', 'Rooms',  1);
-insert into llx_c_type_resource (code,label,active) values ('RES_CARS',  'Cars',  1);
+insert into llx_c_type_resource (code, label, active) values ('RES_ROOMS', 'Rooms',  1);
+insert into llx_c_type_resource (code, label, active) values ('RES_CARS',  'Cars',  1);
 
diff --git a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
index 501aa0fe751..b7f535f0850 100644
--- a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
+++ b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
@@ -34,6 +34,9 @@ ALTER TABLE llx_holiday ADD COLUMN nb_open_day double(24,8) DEFAULT NULL;
 
 -- Missing in v15 or lower
 
+insert into llx_c_type_resource (code, label, active) values ('RES_ROOMS', 'Rooms',  1);
+insert into llx_c_type_resource (code, label, active) values ('RES_CARS',  'Cars',  1);
+
 ALTER TABLE llx_c_actioncomm MODIFY COLUMN libelle varchar(128);
 ALTER TABLE llx_c_availability MODIFY COLUMN label varchar(128);
 ALTER TABLE llx_c_barcode_type MODIFY COLUMN libelle varchar(128);