Merge branch '2022.5.3_rc' into 2022.5.3

aspangaro · Sep 13, 2023 · b5b84d8 · b5b84d8
2 parents ff73871 + c16a88c
commit b5b84d8
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/htdocs/custom/oblyon/core/menus/standard/oblyon.lib.php b/htdocs/custom/oblyon/core/menus/standard/oblyon.lib.php
@@ -279,8 +279,12 @@ function print_oblyon_menu($db, $atarget, $type_user = 0, &$tabMenu, &$menu, $no
         $idsel='project';
 
 		if (empty($noout)) print_start_menu_entry($idsel,$itemsel,$showmode);
-		if (empty($noout)) print_text_menu_entry($langs->trans("MenuProjectsOpportunities"), $showmode, DOL_URL_ROOT.'/projet/index.php?mainmenu=project&amp;leftmenu=', $id, $idsel, $atarget);
-		if (empty($noout)) print_end_menu_entry($showmode);
+        if (!empty($conf->global->PROJECT_FORCE_LIST_ACCESS)) {
+            if (empty($noout)) print_text_menu_entry($langs->trans("MenuProjectsOpportunities"), $showmode, DOL_URL_ROOT . '/projet/list.php?mainmenu=project&amp;leftmenu=', $id, $idsel, $atarget);
+        } else {
+            if (empty($noout)) print_text_menu_entry($langs->trans("MenuProjectsOpportunities"), $showmode, DOL_URL_ROOT . '/projet/index.php?mainmenu=project&amp;leftmenu=', $id, $idsel, $atarget);
+        }
+        if (empty($noout)) print_end_menu_entry($showmode);
 		$title = $langs->trans("LeadsOrProjects");	// Leads and opportunities by default
 		$showmodel = $showmodep = $showmode;
 		if (empty($conf->global->PROJECT_USE_OPPORTUNITIES))