Merge branch '2024_rc' into 2024

aspangaro · May 22, 2024 · 5a8c3de · 5a8c3de
2 parents 3f2ed1e + b87712b
commit 5a8c3de
Show file tree

Hide file tree

Showing 17 changed files with 125 additions and 72 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 ## Changelog ##
 
+### Version 3.0.2 - Compatibility 14.0.x - 20-alpha (2024/05/22)
+- Update ckeditor configuration
+- Fix deployment from another customdir 
+- Add some missing link on menu (Module skills & holiday)
+- Add some missing icons on menu (Module skills, knowledge management, builder, agenda)
+- Add translation for missing label recruitment in core
+
 ### Version 3.0.1 - Compatibility 14.0.x - 20-alpha (2024/04/29)
 - Fix problem with function Show company name in invert menu (Remove function for the moment)
 - Fix Access problem on custom CSS on public page
@@ -14,8 +21,8 @@
 
 ### Version 2.3.0 - Compatibility 14.0.x - 19-alpha (2023/11/12)
 - NEW Use a lot of new color variables for compatibility with DARK_MODE
-  - Add a lot of variables instead of hard coded values.
-  - Add SQL constants for updates
+- Add a lot of variables instead of hard coded values.
+- Add SQL constants for updates
 - NEW system of extensions for external modules
 
 ### Version 2.2.12 - Compatibility 14.0.x - 19-alpha (2024/07/01)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.0.1
+3.0.2
diff --git a/admin/about.php b/admin/about.php
@@ -57,7 +57,7 @@
 // Configuration header
 $head = oblyon_admin_prepare_head();
 
-print dol_get_fiche_head($head, 'about', $langs->trans("Module113900Name"), 0, "inovea@oblyon");
+print dol_get_fiche_head($head, 'about', $langs->trans("Module432573Name"), 0, "inovea@oblyon");
 
 $modClass = new modOblyon($db);
 $oblyonVersion = !empty($modClass->getVersion()) ? $modClass->getVersion() : 'NC';
@@ -77,7 +77,7 @@
 //print '<tr class="liste_titre"><td colspan="2">' . $langs->trans("Authors") . '</td>';
 //print '</tr>'."\n";
 
-// Easya Solutions
+// Inovea
 print '<tr>';
 print '<form id="ticket" method="POST" target="_blank" action="https://erp.inovea-conseil.com/public/ticket/create_ticket.php">';
 print '<input name=message type="hidden" value="'.$supportvalue.'" />';

diff --git a/admin/changelog.php b/admin/changelog.php
@@ -56,7 +56,7 @@
 // Configuration header
 $head = oblyon_admin_prepare_head();
 
-print dol_get_fiche_head($head, 'changelog', $langs->trans("Module113900Name"), 0, "inovea@oblyon");
+print dol_get_fiche_head($head, 'changelog', $langs->trans("Module432573Name"), 0, "inovea@oblyon");
 
 print '<div class="div-table-responsive-no-min">';
 print '<table summary="edit" class="noborder centpercent editmode tableforfield">';

diff --git a/admin/colors.php b/admin/colors.php
@@ -430,7 +430,7 @@
 
 	// Configuration header *************************
 	$head				= oblyon_admin_prepare_head();
-	print dol_get_fiche_head($head, 'colors', $langs->trans('Module113900Name'), 0, 'inovea@oblyon');
+	print dol_get_fiche_head($head, 'colors', $langs->trans('Module432573Name'), 0, 'inovea@oblyon');
 
 	// setup page goes here *************************
 	print '	<script type = "text/javascript">

diff --git a/admin/customcss.php b/admin/customcss.php
@@ -73,7 +73,7 @@
 
 // Configuration header *************************
 $head						= oblyon_admin_prepare_head();
-print dol_get_fiche_head($head, 'customcss', $langs->trans('Module113900Name'), 0, 'inovea@oblyon');
+print dol_get_fiche_head($head, 'customcss', $langs->trans('Module432573Name'), 0, 'inovea@oblyon');
 
 $form = new Form($db);
 $formfile = new FormFile($db);

diff --git a/admin/dashboard.php b/admin/dashboard.php
@@ -91,7 +91,7 @@
 
 	// Configuration header *************************
 	$head						= oblyon_admin_prepare_head();
-	print dol_get_fiche_head($head, 'dashboard', $langs->trans('Module113900Name'), 0, 'inovea@oblyon');
+	print dol_get_fiche_head($head, 'dashboard', $langs->trans('Module432573Name'), 0, 'inovea@oblyon');
 
 	// setup page goes here *************************
 	print '	<script type = "text/javascript">

diff --git a/admin/icons.php b/admin/icons.php
@@ -65,7 +65,7 @@
 
 	// Configuration header *************************
 	$head									= oblyon_admin_prepare_head();
-	print dol_get_fiche_head($head, 'icons', $langs->trans('Module113900Name'), 0, 'inovea@oblyon');
+	print dol_get_fiche_head($head, 'icons', $langs->trans('Module432573Name'), 0, 'inovea@oblyon');
 
 	// setup page goes here *************************
 	print '	<form action = "'.$_SERVER['PHP_SELF'].'" method = "POST">

diff --git a/admin/menus.php b/admin/menus.php
@@ -77,7 +77,7 @@
 
 	// Configuration header *************************
 	$head						= oblyon_admin_prepare_head();
-	print dol_get_fiche_head($head, 'menus', $langs->trans('Module113900Name'), 0, 'inovea@oblyon');
+	print dol_get_fiche_head($head, 'menus', $langs->trans('Module432573Name'), 0, 'inovea@oblyon');
 
 	// setup page goes here *************************
 	// Alert

diff --git a/admin/options.php b/admin/options.php
@@ -70,7 +70,7 @@
 
 	// Configuration header *************************
 	$head						= oblyon_admin_prepare_head();
-	print dol_get_fiche_head($head, 'options', $langs->trans('Module113900Name'), 0, 'inovea@oblyon');
+	print dol_get_fiche_head($head, 'options', $langs->trans('Module432573Name'), 0, 'inovea@oblyon');
 
 	// setup page goes here *************************
 	$easyaVersion = (float) !empty($conf->global->EASYA_VERSION) ? $conf->global->EASYA_VERSION : '';

diff --git a/core/menus/standard/oblyon.lib.php b/core/menus/standard/oblyon.lib.php
@@ -1622,37 +1622,33 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 			if (!empty($conf->hrm->enabled)) {
 				$langs->load("hrm");
 
-				$newmenu->add("/user/list.php?mainmenu=hrm&leftmenu=hrm&mode=employee", $langs->trans("Employees"), 0, $user->rights->user->user->lire, '', $mainmenu, 'hrm', 0, '', '', '', img_picto('', 'user', 'class="pictofixedwidth"'));
+				$newmenu->add("/user/list.php?mainmenu=hrm&leftmenu=hrm&contextpage=employeelist", $langs->trans("Employees"), 0, $user->rights->user->user->lire, '', $mainmenu, 'hrm', 0, '', '', '', img_picto('', 'user', 'class="paddingright pictofixedwidth"'));
 				$newmenu->add("/user/card.php?mainmenu=hrm&leftmenu=hrm&action=create&employee=1", $langs->trans("NewEmployee"), 1, $user->rights->user->user->creer);
-				$newmenu->add("/user/list.php?mainmenu=hrm&leftmenu=hrm&mode=employee&contextpage=employeelist", $langs->trans("List"), 1, $user->rights->user->user->lire);
+				$newmenu->add("/user/list.php?mainmenu=hrm&leftmenu=hrm&contextpage=employeelist", $langs->trans("List"), 1, $user->rights->user->user->lire);
 
                 if ((float) DOL_VERSION >= 15.0) {
-                    $newmenu->add("/hrm/index.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("SkillsManagement"), 0, $user->rights->hrm->all->read, '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'user', 'class="pictofixedwidth"'));
-
-                    if (!empty($menu_invert)) $leftmenu = 'hrm_sm';
-
-                    if ($usemenuhider || empty($leftmenu) || $leftmenu == "hrm_sm") {
-                        // Skills
-                        $newmenu->add("/hrm/skill_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("Skills"), 1, $user->rights->hrm->all->read, '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'shapes', 'class="pictofixedwidth"'));
-                        //$newmenu->add("/hrm/skill_card.php?mainmenu=hrm&leftmenu=hrm_sm&action=create", $langs->trans("NewSkill"), 1, $user->rights->hrm->all->write);
-                        //$newmenu->add("/hrm/skill_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->rights->hrm->all->read);
-
-                        // Job (Description of work to do and skills required)
-                        $newmenu->add("/hrm/job_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("JobsPosition"), 1, $user->rights->hrm->all->read, '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'technic', 'class="pictofixedwidth"'));
-                        //$newmenu->add("/hrm/job_card.php?mainmenu=hrm&leftmenu=hrm_sm&action=create", $langs->transnoentities("NewObject", $langs->trans("Job")), 1, $user->rights->hrm->all->write);
-                        //$newmenu->add("/hrm/job_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->rights->hrm->all->read);
-
-                        // Position = Link job - user
-                        $newmenu->add("/hrm/position_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("EmployeePositions"), 1, $user->rights->hrm->all->read, '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'user-cog', 'class="pictofixedwidth"'));
-                        //$newmenu->add("/hrm/position.php?mainmenu=hrm&leftmenu=hrm_sm&action=create", $langs->transnoentities("NewObject", $langs->trans("Position")), 1, $user->rights->hrm->all->write);
-                        //$newmenu->add("/hrm/position_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->rights->hrm->all->read);
-
-                        // Evaluation
-                        $newmenu->add("/hrm/evaluation_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("Evalutions"), 1, $user->rights->hrm->evaluation->read, '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'user', 'class="pictofixedwidth"'));
-                        //$newmenu->add("/hrm/evaluation_card.php?mainmenu=hrm&leftmenu=hrm_sm&action=create", $langs->trans("NewEval"), 1, $user->rights->hrm->evaluation->write);
-                        //$newmenu->add("/hrm/evaluation_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->rights->hrm->evaluation->read);
-                        $newmenu->add("/hrm/compare.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("SkillComparison"), 1, $user->rights->hrm->evaluation->read || $user->rights->hrm->compare_advance->read);
-                    }
+                    $newmenu->add("/hrm/skill_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("SkillsManagement"), 0, $user->rights->hrm->all->read, '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'shapes', 'class="paddingright pictofixedwidth"'));
+
+                    // Skills
+                    $newmenu->add("/hrm/skill_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("Skills"), 1, $user->rights->hrm->all->read, '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'shapes', 'class="paddingright pictofixedwidth"'));
+                    //$newmenu->add("/hrm/skill_card.php?mainmenu=hrm&leftmenu=hrm_sm&action=create", $langs->trans("NewSkill"), 1, $user->rights->hrm->all->write);
+                    //$newmenu->add("/hrm/skill_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->rights->hrm->all->read);
+
+                    // Job (Description of work to do and skills required)
+                    $newmenu->add("/hrm/job_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("JobsProfiles"), 1, $user->rights->hrm->all->read, '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));
+                    //$newmenu->add("/hrm/job_card.php?mainmenu=hrm&leftmenu=hrm_sm&action=create", $langs->transnoentities("NewObject", $langs->trans("Job")), 1, $user->rights->hrm->all->write);
+                    //$newmenu->add("/hrm/job_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->rights->hrm->all->read);
+
+                    // Position = Link job - user
+                    $newmenu->add("/hrm/position_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("EmployeePositions"), 1, $user->rights->hrm->all->read, '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'user-cog', 'class="paddingright pictofixedwidth"'));
+                    //$newmenu->add("/hrm/position.php?mainmenu=hrm&leftmenu=hrm_sm&action=create", $langs->transnoentities("NewObject", $langs->trans("Position")), 1, $user->rights->hrm->all->write);
+                    //$newmenu->add("/hrm/position_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->rights->hrm->all->read);
+
+                    // Evaluation
+                    $newmenu->add("/hrm/evaluation_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("Evals"), 1, $user->rights->hrm->evaluation->read, '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'user', 'class="paddingright pictofixedwidth"'));
+                    //$newmenu->add("/hrm/evaluation_card.php?mainmenu=hrm&leftmenu=hrm_sm&action=create", $langs->trans("NewEval"), 1, $user->rights->hrm->evaluation->write);
+                    //$newmenu->add("/hrm/evaluation_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->rights->hrm->evaluation->read);
+                    $newmenu->add("/hrm/compare.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("SkillComparison"), 1, $user->rights->hrm->evaluation->read || $user->rights->hrm->compare_advance->read);
                 }
             }
 
@@ -1661,9 +1657,10 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 				// Load translation files required by the page
 				$langs->loadLangs(array("holiday", "trips"));
 
-				$newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("CPTitreMenu"), 0, $user->rights->holiday->read, '', $mainmenu, 'holiday', 0, '', '', '', img_picto('', 'holiday', 'class="pictofixedwidth"'));
+				$newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("CPTitreMenu"), 0, $user->rights->holiday->read, '', $mainmenu, 'holiday', 0, '', '', '', img_picto('', 'holiday', 'class="paddingright pictofixedwidth"'));
 				$newmenu->add("/holiday/card.php?mainmenu=hrm&leftmenu=holiday&action=create", $langs->trans("New"), 1, $user->rights->holiday->write, '',$mainmenu);
-				$newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("List"), 1, $user->rights->holiday->read, '',$mainmenu);
+                $newmenu->add("/holiday/card_group.php?mainmenu=hrm&leftmenu=holiday&action=create", $langs->trans("NewHolidayForGroup"), 1, $user->rights->holiday->writeall && $user->rights->holiday->readall, '', $mainmenu, 'holiday_sm');
+                $newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("List"), 1, $user->rights->holiday->read, '',$mainmenu);
 
 				if (! empty($menu_invert)) $leftmenu= 'holiday';
 

diff --git a/core/modules/modOblyon.class.php b/core/modules/modOblyon.class.php
@@ -43,7 +43,7 @@ function __construct($db)
 
 			$langs->loadLangs(array('oblyon@oblyon', 'inovea@oblyon'));
 			$this->db						= $db;
-			$this->numero					= 113900;											// Unique Id for module
+			$this->numero					= 432573;											// Unique Id for module
 			$this->name						= preg_replace('/^mod/i', '', get_class($this));	// Module label (no space allowed)
 			$this->editor_name				= '<b>Inovea Conseil</b>';
 			$this->editor_web				= 'https://www.inovea-conseil.com';
@@ -54,7 +54,7 @@ function __construct($db)
 			$this->family					= 'Inovea Conseil';									// used to group modules in module setup page
 			$this->module_position			= 10;
 			$this->module_position			= 1;
-			$this->description				= $langs->trans('Module113900Desc');				// Module description
+			$this->description				= $langs->trans('Module432573Desc');				// Module description
 			$this->version					= file_get_contents(__DIR__.'/../../VERSION');		// Version : 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
 			$this->const_name				= 'MAIN_MODULE_'.strtoupper($this->name);			// llx_const table to save module status enabled/disabled
 			$this->special					= 0;												// Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
@@ -110,8 +110,8 @@ function init($options = '')
 			$sql		= array();
 			$this->_load_tables('/'.$this->name.'/sql/');
 			oblyon_restore_module($this->name);
-			// Copy dir custom/oblyon/themeoblyon to theme/oblyon
-			$srcDir		= dol_buildpath('/custom/oblyon/themeoblyon');
+			// Copy dir oblyon/themeoblyon to theme/oblyon
+			$srcDir		= dol_buildpath('/oblyon/themeoblyon');
 			$destDir	= DOL_DOCUMENT_ROOT.'/theme/oblyon';
 			if (dol_is_dir($destDir)) {
 				$result	= dol_delete_dir_recursive($destDir);

diff --git a/langs/en_US/oblyon.lang b/langs/en_US/oblyon.lang
@@ -2,8 +2,8 @@
 # Copyright (C) 2015       Nicolas Rivera       <[email protected]>
 # Copyright (C) 2015-2024  Alexandre Spangaro   <[email protected]>
 #
-Module113900Name   = Oblyon
-Module113900Desc   = Options panel allows you to personalize the Oblyon theme
+Module432573Name   = Oblyon
+Module432573Desc   = Options panel allows you to personalize the Oblyon theme
 
 OblyonParamAction1  = Save / Restore all module parameters for
 OblyonParamAction2  = <br>(after a restore refresh the page (F5) to visualize the result)
@@ -22,6 +22,7 @@ BankColorizeMovementName1 = Background color for a debit movement
 BankColorizeMovementName2 = Background color for a credit movement
 MenuCatalog               = Catalog
 MenuVAT                   = VAT
+Recruitment               = Recruitment
 
 CustomCSS=Style CSS
 

diff --git a/langs/fr_FR/oblyon.lang b/langs/fr_FR/oblyon.lang
@@ -2,8 +2,8 @@
 # Copyright (C) 2015       Nicolas Rivera       <[email protected]>
 # Copyright (C) 2015-2024  Alexandre Spangaro   <[email protected]>
 #
-Module113900Name   = Oblyon
-Module113900Desc   = Panneau d'options qui vous permet de personnaliser le thème Oblyon
+Module432573Name   = Oblyon
+Module432573Desc   = Panneau d'options qui vous permet de personnaliser le thème Oblyon
 
 OblyonParamAction1  = Sauvegarder / Restaurer l'ensemble des paramètres du module
 OblyonParamAction2  = <br>(après une restauration rafraichissez la page (F5) pour visualiser le résultat)
@@ -22,6 +22,7 @@ BankColorizeMovementName1 = Couleur de fond pour un mouvement débiteur
 BankColorizeMovementName2 = Couleur de fond pour un mouvement créditeur
 MenuCatalog               = Catalogue
 MenuVAT                   = TVA
+Recruitment               = Recrutement
 
 CustomCSS=Style CSS
 

diff --git a/lib/oblyon.lib.php b/lib/oblyon.lib.php
@@ -263,7 +263,7 @@ function oblyon_print_backup_restore()
 		oblyon_print_colgroup($metas);
 		print '		<tr>
 						<td colspan="2" class="center" style = "font-size: 14px;">
-							<a href = "'.DOL_URL_ROOT.'/document.php?modulepart=oblyon&file=sql/update.'.$conf->entity.'">'.$langs->trans('OblyonParamAction1').' <b><span color = "#D51123">'.$langs->trans('Module113900Name').'</span></b> <span size = "2">'.$langs->trans('OblyonParamAction2').'</span></a>
+							<a href = "'.DOL_URL_ROOT.'/document.php?modulepart=oblyon&file=sql/update.'.$conf->entity.'">'.$langs->trans('OblyonParamAction1').' <b><span color = "#D51123">'.$langs->trans('Module432573Name').'</span></b> <span size = "2">'.$langs->trans('OblyonParamAction2').'</span></a>
 						</td>
 						<td class="center"><button class = "butActionBackup" type = "submit" value = "bkupParams" name = "action">'.$langs->trans('OblyonParamBkup').'</button></td>
 						<td class="center"><button class = "butActionBackup" type = "submit" value = "restoreParams" name = "action">'.$langs->trans('OblyonParamRestore').'</button></td>