--- /tmp/dsg/dolibarr/htdocs/core/menus/standard/github_19.0.3_auguria.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/menus/standard/client_auguria.lib.php
@@ -2 +2 @@
-/* Copyright (C) 2010-2022	Laurent Destailleur	<eldy@users.sourceforge.net>

+/* Copyright (C) 2010-2013	Laurent Destailleur	<eldy@users.sourceforge.net>

@@ -49 +49 @@
-	$listofmodulesforexternal = explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL'));

+	$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);

@@ -57,3 +57 @@
-	if (empty($noout)) {

-		print_start_menu_array_auguria();

-	}

+	if (empty($noout)) print_start_menu_array_auguria();

@@ -64,7 +62,8 @@
-	// Show/Hide vertical menu. The hamburger icon for .menuhider action.

-	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {

-		$showmode = 1;

-		$classname = 'class="tmenu menuhider nohover"';

-		$idsel = 'menu';

-

-		$menu->add('#', (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 1 ? '<span class="fa fa-bars"></span>' : ''), 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);

+    // Show/Hide vertical menu. The hamburger icon for .menuhider action.

+    if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))

+	{

+	    $showmode = 1;

+	    $classname = 'class="tmenu menuhider"';

+	    $idsel = 'menu';

+

+	    $menu->add('#', (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE) ? '<span class="fa fa-bars"></span>' : ''), 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);

@@ -74,2 +73,2 @@
-	for ($i = 0; $i < $num; $i++) {

-		//var_dump($type_user.' '.$newTabMenu[$i]['url'].' '.$showmode.' '.$newTabMenu[$i]['perms']);

+	for ($i = 0; $i < $num; $i++)

+	{

@@ -78,2 +76,0 @@
-		$shorturl = '';

-

@@ -81 +78,2 @@
-		if ($showmode == 1) {

+		if ($showmode == 1)

+		{

@@ -84 +81,0 @@
-			// url = url from host, shorturl = relative path into dolibarr sources

@@ -86,2 +83,4 @@
-			if (!preg_match("/^(http:\/\/|https:\/\/)/i", $newTabMenu[$i]['url'])) {	// Do not change url content for external links

-				$tmp = explode('?', $newTabMenu[$i]['url'], 2);

+

+			if (!preg_match("/^(http:\/\/|https:\/\/)/i", $newTabMenu[$i]['url']))

+			{

+			    $tmp = explode('?', $newTabMenu[$i]['url'], 2);

@@ -92,6 +91,8 @@
-				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && !empty($newTabMenu[$i]['url'])) {

-					$param .= ($param ? '&' : '').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=';

-				}

-				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && empty($newTabMenu[$i]['url'])) {

-					$param .= ($param ? '&' : '').'leftmenu=';

-				}

+			    if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && !empty($newTabMenu[$i]['url']))

+			    {

+			        $param .= ($param ? '&' : '').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=';

+			    }

+			    if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && empty($newTabMenu[$i]['url']))

+			    {

+			        $param .= ($param ? '&' : '').'leftmenu=';

+			    }

@@ -103,3 +104 @@
-				if (DOL_URL_ROOT) {

-					$shorturl = preg_replace('/^'.preg_quote(DOL_URL_ROOT, '/').'/', '', $shorturl);

-				}

+				if (DOL_URL_ROOT) $shorturl = preg_replace('/^'.preg_quote(DOL_URL_ROOT, '/').'/', '', $shorturl);

@@ -109,7 +108,5 @@
-			if (preg_match('/search_project_user=__search_project_user__/', $shorturl)) {

-				$search_project_user = GETPOST('search_project_user', 'int');

-				if ($search_project_user) {

-					$shorturl = preg_replace('/search_project_user=__search_project_user__/', 'search_project_user='.$search_project_user, $shorturl);

-				} else {

-					$shorturl = preg_replace('/search_project_user=__search_project_user__/', '', $shorturl);

-				}

+			if (preg_match('/search_project_user=__search_project_user__/', $shorturl))

+			{

+			    $search_project_user = GETPOST('search_project_user', 'int');

+			    if ($search_project_user) $shorturl = preg_replace('/search_project_user=__search_project_user__/', 'search_project_user='.$search_project_user, $shorturl);

+			    else $shorturl = preg_replace('/search_project_user=__search_project_user__/', '', $shorturl);

@@ -119,14 +116,7 @@
-			if (!empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) {

-				$classname = 'class="tmenusel"';

-			} elseif (!empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) {

-				$classname = 'class="tmenusel"';

-			} else {

-				$classname = 'class="tmenu"';

-			}

-		} elseif ($showmode == 2) {

-			$classname = 'class="tmenu"';

-		} else {

-			$classname = '';

-		}

-

-		$menu->add($shorturl, $newTabMenu[$i]['titre'], 0, $showmode, ($newTabMenu[$i]['target'] ? $newTabMenu[$i]['target'] : $atarget), ($newTabMenu[$i]['mainmenu'] ? $newTabMenu[$i]['mainmenu'] : $newTabMenu[$i]['rowid']), ($newTabMenu[$i]['leftmenu'] ? $newTabMenu[$i]['leftmenu'] : ''), $newTabMenu[$i]['position'], $id, $idsel, $classname, $newTabMenu[$i]['prefix']);

+			if (!empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) $classname = 'class="tmenusel"';

+			elseif (!empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname = 'class="tmenusel"';

+			else $classname = 'class="tmenu"';

+		}

+		elseif ($showmode == 2) $classname = 'class="tmenu"';

+

+		$menu->add($shorturl, $newTabMenu[$i]['titre'], 0, $showmode, ($newTabMenu[$i]['target'] ? $newTabMenu[$i]['target'] : $atarget), ($newTabMenu[$i]['mainmenu'] ? $newTabMenu[$i]['mainmenu'] : $newTabMenu[$i]['rowid']), ($newTabMenu[$i]['leftmenu'] ? $newTabMenu[$i]['leftmenu'] : ''), $newTabMenu[$i]['position'], $id, $idsel, $classname);

@@ -140 +130,2 @@
-	if (!getDolGlobalString('MAIN_MENU_INVERT') && empty($noout) && getDolGlobalString('MAIN_SHOW_LOGO') && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {

+	if (empty($conf->global->MAIN_MENU_INVERT) && empty($noout) && !empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))

+	{

@@ -142 +133 @@
-		$mysoc->logo_squarred_mini = (!getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI') ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI);

+		$mysoc->logo_squarred_mini = (empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI) ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI);

@@ -145 +136 @@
-		if (getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_NO_BACKGROUND')) {

+		if (!empty($conf->global->MAIN_INFO_SOCIETE_LOGO_NO_BACKGROUND)) {

@@ -149 +140,2 @@
-		if (!empty($mysoc->logo_squarred_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini)) {

+		if (!empty($mysoc->logo_squarred_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini))

+		{

@@ -151,5 +143,7 @@
-			/*} elseif (!empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))

-			{

-			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_mini);

-			}*/

-		} else {

+		}

+		/*elseif (! empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))

+		 {

+		 $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_mini);

+		 }*/

+		else

+		{

@@ -173,2 +167,2 @@
-			print_text_menu_entry_auguria($menuval['titre'], $menuval['enabled'], ($menuval['url'] != '#' ? DOL_URL_ROOT : '').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget), $menuval);

-			print_end_menu_entry_auguria($menuval['enabled']);

+	    	print_text_menu_entry_auguria($menuval['titre'], $menuval['enabled'], ($menuval['url'] != '#' ?DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));

+		    print_end_menu_entry_auguria($menuval['enabled']);

@@ -196 +190 @@
-	global $conf;

+    global $conf;

@@ -199 +193 @@
-	print '<ul role="navigation" class="tmenu"'.(!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '' : ' title="Top menu"').'>';

+	print '<ul role="navigation" class="tmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Top menu"').'>';

@@ -212 +206,2 @@
-	if ($showmode) {

+	if ($showmode)

+	{

@@ -222,8 +217,7 @@
- * @param	string	$text			Text

- * @param	int		$showmode		0 = hide, 1 = allowed or 2 = not allowed

- * @param	string	$url			Url

- * @param	string	$id				Id

- * @param	string	$idsel			Id sel

- * @param	string	$classname		Class name

- * @param	string	$atarget		Target

- * @param	array	$menuval		All the $menuval array

+ * @param	string	$text		Text

+ * @param	int		$showmode	0 = hide, 1 = allowed or 2 = not allowed

+ * @param	string	$url		Url

+ * @param	string	$id			Id

+ * @param	string	$idsel		Id sel

+ * @param	string	$classname	Class name

+ * @param	string	$atarget	Target

@@ -232,6 +226,3 @@
-function print_text_menu_entry_auguria($text, $showmode, $url, $id, $idsel, $classname, $atarget, $menuval = array())

-{

-	global $langs, $conf;

-

-	$classnameimg = str_replace('class="', 'class="tmenuimage ', $classname);

-	$classnametxt = str_replace('class="', 'class="tmenulabel ', $classname);

+function print_text_menu_entry_auguria($text, $showmode, $url, $id, $idsel, $classname, $atarget)

+{

+	global $langs;

@@ -240,11 +231,2 @@
-		print '<a '.$classnameimg.' tabindex="-1" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').' title="'.dol_escape_htmltag($text).'">';

-		print '<div class="'.$id.' '.$idsel.' topmenuimage">';

-

-		if (!empty($menuval['prefix']) && strpos($menuval['prefix'], '<span') === 0) {

-			print $menuval['prefix'];

-		} elseif (!empty($menuval['prefix']) && strpos($menuval['prefix'], 'fa-') === 0) {

-			print '<span class="'.$id.' '.$menuval['prefix'].'" id="mainmenuspan_'.$idsel.'"></span>';

-		} else {

-			print '<span class="'.$id.' tmenuimageforpng" id="mainmenuspan_'.$idsel.'"></span>';

-		}

-		print '</div>';

+		print '<a class="tmenuimage" tabindex="-1" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').' title="'.dol_escape_htmltag($text).'">';

+		print '<div class="'.$id.' '.$idsel.' topmenuimage"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';

@@ -252,7 +234,5 @@
-		if (!getDolGlobalString('THEME_TOPMENU_DISABLE_TEXT')) {

-			print '<a '.$classnametxt.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').' title="'.dol_escape_htmltag($text).'">';

-			print '<span class="mainmenuaspan">';

-			print $text;

-			print '</span>';

-			print '</a>';

-		}

+		print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').' title="'.dol_escape_htmltag($text).'">';

+		print '<span class="mainmenuaspan">';

+		print $text;

+		print '</span>';

+		print '</a>';

@@ -260,16 +240,6 @@
-		print '<div '.$classnameimg.' title="'.dol_escape_htmltag($text.' - '.$langs->trans("NotAllowed")).'">';

-		print '<div class="'.$id.' '.$idsel.' topmenuimage tmenudisabled">';

-		if (!empty($menuval['prefix']) && strpos($menuval['prefix'], '<span') === 0) {

-			print $menuval['prefix'];

-		} else {

-			print '<span class="'.$id.' tmenuimageforpng tmenudisabled" id="mainmenuspan_'.$idsel.'"></span>';

-		}

-		print '</div>';

-		print '</div>';

-		if (!getDolGlobalString('THEME_TOPMENU_DISABLE_TEXT')) {

-			print '<span '.$classnametxt.' id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($text.' - '.$langs->trans("NotAllowed")).'">';

-			print '<span class="mainmenuaspan">';

-			print $text;

-			print '</span>';

-			print '</span>';

-		}

+		print '<div class="'.$id.' '.$idsel.' topmenuimage tmenudisabled"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';

+		print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';

+		print '<span class="mainmenuaspan">';

+		print $text;

+		print '</span>';

+		print '</a>';

@@ -287 +257,2 @@
-	if ($showmode) {

+	if ($showmode)

+	{

@@ -320 +290,0 @@
- * @param 	int			$type_user     		0=Menu for backoffice, 1=Menu for front office

@@ -323,4 +293,3 @@
-function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$tabMenu, &$menu, $noout = 0, $forcemainmenu = '', $forceleftmenu = '', $moredata = null, $type_user = 0)

-{

-	global $user, $conf, $langs, $hookmanager;

-	global $dolibarr_main_db_name, $mysoc;

+function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$tabMenu, &$menu, $noout = 0, $forcemainmenu = '', $forceleftmenu = '', $moredata = null)

+{

+	global $user, $conf, $langs, $dolibarr_main_db_name, $mysoc;

@@ -336,16 +305,18 @@
-	if (is_array($moredata) && !empty($moredata['searchform'])) {	// searchform can contains select2 code or link to show old search form or link to switch on search page

-		print "\n";

-		print "<!-- Begin SearchForm -->\n";

-		print '<div id="blockvmenusearch" class="blockvmenusearch">'."\n";

-		print $moredata['searchform'];

-		print '</div>'."\n";

-		print "<!-- End SearchForm -->\n";

-	}

-

-	if (is_array($moredata) && !empty($moredata['bookmarks'])) {

-		print "\n";

-		print "<!-- Begin Bookmarks -->\n";

-		print '<div id="blockvmenubookmarks" class="blockvmenubookmarks">'."\n";

-		print $moredata['bookmarks'];

-		print '</div>'."\n";

-		print "<!-- End Bookmarks -->\n";

+	if (is_array($moredata) && !empty($moredata['searchform']))	// searchform can contains select2 code or link to show old search form or link to switch on search page

+	{

+        print "\n";

+        print "<!-- Begin SearchForm -->\n";

+        print '<div id="blockvmenusearch" class="blockvmenusearch">'."\n";

+        print $moredata['searchform'];

+        print '</div>'."\n";

+        print "<!-- End SearchForm -->\n";

+	}

+

+	if (is_array($moredata) && !empty($moredata['bookmarks']))

+	{

+	    print "\n";

+	    print "<!-- Begin Bookmarks -->\n";

+	    print '<div id="blockvmenubookmarks" class="blockvmenubookmarks">'."\n";

+	    print $moredata['bookmarks'];

+	    print '</div>'."\n";

+	    print "<!-- End Bookmarks -->\n";

@@ -361,2 +332,3 @@
-	if (isModEnabled('banque') && $user->hasRight('banque', 'lire') && $mainmenu == 'bank') {	// Entry for each bank account

-		include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Required for to get Account::TYPE_CASH for example

+	if ($conf->banque->enabled && $user->rights->banque->lire && $mainmenu == 'bank')	// Entry for each bank account

+	{

+	    include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Required for to get Account::TYPE_CASH for example

@@ -371 +343,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -375,5 +348,4 @@
-			if ($numr > 0) {

-				$newmenu->add('/compta/bank/list.php', $langs->trans("BankAccounts"), 0, $user->hasRight('banque', 'lire'));

-			}

-

-			while ($i < $numr) {

+			if ($numr > 0) 	$newmenu->add('/compta/bank/list.php', $langs->trans("BankAccounts"), 0, $user->rights->banque->lire);

+

+			while ($i < $numr)

+			{

@@ -381,3 +353,4 @@
-				$newmenu->add('/compta/bank/card.php?id='.$objp->rowid, $objp->label, 1, $user->hasRight('banque', 'lire'));

-				if ($objp->rappro && $objp->courant != Account::TYPE_CASH && empty($objp->clos)) {  // If not cash account and not closed and can be reconciliate

-					$newmenu->add('/compta/bank/bankentries_list.php?id='.$objp->rowid, $langs->trans("Conciliate"), 2, $user->hasRight('banque', 'consolidate'));

+				$newmenu->add('/compta/bank/card.php?id='.$objp->rowid, $objp->label, 1, $user->rights->banque->lire);

+				if ($objp->rappro && $objp->courant != Account::TYPE_CASH && empty($objp->clos))  // If not cash account and not closed and can be reconciliate

+				{

+					$newmenu->add('/compta/bank/bankentries_list.php?id='.$objp->rowid, $langs->trans("Conciliate"), 2, $user->rights->banque->consolidate);

@@ -387,3 +360,2 @@
-		} else {

-			dol_print_error($db);

-		}

+		}

+		else dol_print_error($db);

@@ -393,2 +365,3 @@
-	if (isModEnabled('accounting') && $user->hasRight('accounting', 'comptarapport', 'lire') && $mainmenu == 'accountancy') { 	// Entry in accountancy journal for each bank account

-		$newmenu->add('', $langs->trans("RegistrationInAccounting"), 1, $user->hasRight('accounting', 'comptarapport', 'lire'), '', 'accountancy', 'accountancy_journal', 10);

+	if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') 	// Entry in accountancy journal for each bank account

+	{

+		$newmenu->add('', $langs->trans("RegistrationInAccounting"), 1, $user->rights->accounting->comptarapport->lire, '', 'accountancy', 'accountancy', 10);

@@ -404 +377,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -408,2 +382,4 @@
-			if ($numr > 0) {

-				while ($i < $numr) {

+			if ($numr > 0)

+			{

+				while ($i < $numr)

+				{

@@ -415,2 +391,12 @@
-					if ($objp->nature == 2 && isModEnabled('facture') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_SALES')) {

-						$nature = "sells";

+					if ($objp->nature == 2 && ! empty($conf->facture->enabled)) $nature="sells";

+					if ($objp->nature == 3 && (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled))) $nature="purchases";

+					if ($objp->nature == 4 && ! empty($conf->banque->enabled)) $nature="bank";

+					if ($objp->nature == 5 && ! empty($conf->expensereport->enabled)) $nature="expensereports";

+					if ($objp->nature == 1) $nature="various";

+					if ($objp->nature == 8) $nature="inventory";

+					if ($objp->nature == 9) $nature="hasnew";

+

+					// To enable when page exists

+					if (empty($conf->global->ACCOUNTANCY_SHOW_DEVELOP_JOURNAL))

+					{

+						if ($nature == 'various' || $nature == 'hasnew' || $nature == 'inventory') $nature = '';

@@ -418,32 +404,6 @@
-					if ($objp->nature == 3

-						&& isModEnabled('supplier_invoice')

-						&& !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_PURCHASES')) {

-						$nature = "purchases";

-					}

-					if ($objp->nature == 4 && isModEnabled('banque')) {

-						$nature = "bank";

-					}

-					if ($objp->nature == 5 && isModEnabled('expensereport') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS')) {

-						$nature = "expensereports";

-					}

-					if ($objp->nature == 1) {

-						$nature = "various";

-					}

-					if ($objp->nature == 8) {

-						$nature = "inventory";

-					}

-					if ($objp->nature == 9) {

-						$nature = "hasnew";

-					}

-

-					// To enable when page exists

-					if (!getDolGlobalString('ACCOUNTANCY_SHOW_DEVELOP_JOURNAL')) {

-						if ($nature == 'hasnew' || $nature == 'inventory') {

-							$nature = '';

-						}

-					}

-

-					if ($nature) {

-						$langs->load('accountancy');

-						$journallabel = $langs->transnoentities($objp->label); // Labels in this table are set by loading llx_accounting_abc.sql. Label can be 'ACCOUNTING_SELL_JOURNAL', 'InventoryJournal', ...

-						$newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $journallabel, 2, $user->hasRight('accounting', 'comptarapport', 'lire'));

+

+					if ($nature)

+					{

+                        $langs->load('accountancy');

+                        $journallabel = $langs->transnoentities($objp->label); // Labels in this table are set by loading llx_accounting_abc.sql. Label can be 'ACCOUNTING_SELL_JOURNAL', 'InventoryJournal', ...

+                        $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $journallabel, 2, $user->rights->accounting->comptarapport->lire);

@@ -453 +413,3 @@
-			} else {

+			}

+			else

+			{

@@ -455,5 +417,4 @@
-				$newmenu->add('', $langs->trans("NoJournalDefined"), 2, $user->hasRight('accounting', 'comptarapport', 'lire'));

-			}

-		} else {

-			dol_print_error($db);

-		}

+				$newmenu->add('', $langs->trans("NoJournalDefined"), 2, $user->rights->accounting->comptarapport->lire);

+			}

+		}

+		else dol_print_error($db);

@@ -463 +424,2 @@
-	if (isModEnabled('ftp') && $mainmenu == 'ftp') {	// Entry for FTP

+	if (!empty($conf->ftp->enabled) && $mainmenu == 'ftp')	// Entry for FTP

+	{

@@ -466 +428,2 @@
-		while ($i <= $MAXFTP) {

+		while ($i <= $MAXFTP)

+		{

@@ -469 +432,2 @@
-			if (!empty($conf->global->$paramkey)) {

+			if (!empty($conf->global->$paramkey))

+			{

@@ -483,6 +447,2 @@
-	if (is_array($menu_array_before)) {

-		$menu_array = array_merge($menu_array_before, $menu_array);

-	}

-	if (is_array($menu_array_after)) {

-		$menu_array = array_merge($menu_array, $menu_array_after);

-	}

+	if (is_array($menu_array_before)) $menu_array = array_merge($menu_array_before, $menu_array);

+	if (is_array($menu_array_after))  $menu_array = array_merge($menu_array, $menu_array_after);

@@ -490,26 +450 @@
-	if (!is_array($menu_array)) {

-		return 0;

-	}

-

-	// Allow the $menu_array of the menu to be manipulated by modules

-	$parameters = array(

-		'mainmenu' => $mainmenu,

-	);

-	$hook_items = $menu_array;

-	$reshook = $hookmanager->executeHooks('menuLeftMenuItems', $parameters, $hook_items); // Note that $action and $object may have been modified by some hooks

-

-	if (is_numeric($reshook)) {

-		if ($reshook == 0 && !empty($hookmanager->results)) {

-			$menu_array[] = $hookmanager->results; // add

-		} elseif ($reshook == 1) {

-			$menu_array = $hookmanager->results; // replace

-		}

-

-		// @todo Sort menu items by 'position' value

-		//      $position = array();

-		//      foreach ($menu_array as $key => $row) {

-		//          $position[$key] = $row['position'];

-		//      }

-		//		$array1_sort_order = SORT_ASC;

-		//      array_multisort($position, $array1_sort_order, $menu_array);

-	}

+	if (!is_array($menu_array)) return 0;

@@ -518,5 +453,4 @@
-	$invert = !getDolGlobalString('MAIN_MENU_INVERT') ? "" : "invert";

-	if (empty($noout)) {

-		$altok = 0;

-		$blockvmenuopened = false;

-		$lastlevel0 = '';

+	$invert = empty($conf->global->MAIN_MENU_INVERT) ? "" : "invert";

+	if (empty($noout))

+	{

+		$altok = 0; $blockvmenuopened = false; $lastlevel0 = '';

@@ -524 +458,2 @@
-		for ($i = 0; $i < $num; $i++) {     // Loop on each menu entry

+		for ($i = 0; $i < $num; $i++)     // Loop on each menu entry

+		{

@@ -526,3 +461 @@
-			if (getDolGlobalString('MAIN_MENU_HIDE_UNAUTHORIZED') && empty($menu_array[$i]['enabled'])) {

-				$showmenu = false;

-			}

+			if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) 	$showmenu = false;

@@ -531 +464,2 @@
-			if (empty($menu_array[$i]['level']) && $showmenu) {

+			if (empty($menu_array[$i]['level']) && $showmenu)

+			{

@@ -535,6 +469,6 @@
-				for ($j = ($i + 1); $j < $num; $j++) {

-					if (empty($menu_array[$j]['level'])) {

-						$lastopened = false;

-					}

-				}

-				if ($altok % 2 == 0) {

+				for ($j = ($i + 1); $j < $num; $j++)

+				{

+				    if (empty($menu_array[$j]['level'])) $lastopened = false;

+				}

+				if ($altok % 2 == 0)

+				{

@@ -542 +476,3 @@
-				} else {

+				}

+				else

+				{

@@ -550,2 +486,4 @@
-			if ($tabul > 0) {

-				for ($j = 0; $j < $tabul; $j++) {

+			if ($tabul > 0)

+			{

+				for ($j = 0; $j < $tabul; $j++)

+				{

@@ -561 +499,2 @@
-			if (!preg_match("/^(http:\/\/|https:\/\/)/i", $menu_array[$i]['url'])) {

+			if (!preg_match("/^(http:\/\/|https:\/\/)/i", $menu_array[$i]['url']))

+			{

@@ -567 +506,2 @@
-				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && !empty($menu_array[$i]['mainmenu'])) {

+				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && !empty($menu_array[$i]['mainmenu']))

+				{

@@ -570 +510,2 @@
-				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && empty($menu_array[$i]['mainmenu'])) {

+				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && empty($menu_array[$i]['mainmenu']))

+				{

@@ -580 +521 @@
-			print '<!-- Process menu entry with mainmenu='.$menu_array[$i]['mainmenu'].', leftmenu='.$menu_array[$i]['leftmenu'].', level='.$menu_array[$i]['level'].' enabled='.$menu_array[$i]['enabled'].', position='.$menu_array[$i]['position'].' prefix='.$menu_array[$i]['prefix'].' -->'."\n";

+			print '<!-- Process menu entry with mainmenu='.$menu_array[$i]['mainmenu'].', leftmenu='.$menu_array[$i]['leftmenu'].', level='.$menu_array[$i]['level'].' enabled='.$menu_array[$i]['enabled'].', position='.$menu_array[$i]['position'].' -->'."\n";

@@ -583,2 +524,4 @@
-			if ($menu_array[$i]['level'] == 0) {

-				if ($menu_array[$i]['enabled']) {     // Enabled so visible

+			if ($menu_array[$i]['level'] == 0)

+			{

+				if ($menu_array[$i]['enabled'])     // Enabled so visible

+				{

@@ -586,20 +529,5 @@
-					if ($shorturlwithoutparam) {

-						print '<a class="vmenu" title="'.dol_escape_htmltag(dol_string_nohtmltag($menu_array[$i]['titre'])).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';

-					} else {

-						print '<span class="vmenu">';

-					}

-					if (!empty($menu_array[$i]['prefix'])) {

-						if (preg_match('/^fa\-[a-zA-Z0-9\-_]+$/', $menu_array[$i]['prefix'])) {

-							print '<span class="fas '.$menu_array[$i]['prefix'].' paddingright pictofixedwidth"></span>';

-						} else {

-							print $menu_array[$i]['prefix'];

-						}

-					}

-

-					// print ($menu_array[$i]['prefix'] ? $menu_array[$i]['prefix'] : '');

-					print $menu_array[$i]['titre'];

-					if ($shorturlwithoutparam) {

-						print '</a>';

-					} else {

-						print '</span>';

-					}

+					if ($shorturlwithoutparam) print '<a class="vmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';

+					else print '<span class="vmenu">';

+					print ($menu_array[$i]['prefix'] ? $menu_array[$i]['prefix'] : '').$menu_array[$i]['titre'];

+					if ($shorturlwithoutparam) print '</a>';

+					else print '</span>';

@@ -608,6 +536,27 @@
-				} elseif ($showmenu) {                 // Not enabled but visible (so greyed)

-					print '<div class="menu_titre">'.$tabstring;

-					print '<span class="vmenudisabled">';

-					if (!empty($menu_array[$i]['prefix'])) {

-						print $menu_array[$i]['prefix'];

-					}

+				}

+				elseif ($showmenu)                 // Not enabled but visible (so greyed)

+				{

+					print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";

+					$lastlevel0 = 'greyed';

+				}

+				else

+				{

+				    $lastlevel0 = 'hidden';

+				}

+				if ($showmenu)

+				{

+					print '<div class="menu_top"></div>'."\n";

+				}

+			}

+

+			// Menu level > 0

+			if ($menu_array[$i]['level'] > 0)

+			{

+				$cssmenu = '';

+				if ($menu_array[$i]['url']) $cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/', '', $menu_array[$i]['url']));

+

+				if ($menu_array[$i]['enabled'] && $lastlevel0 == 'enabled')     // Enabled so visible, except if parent was not enabled.

+				{

+					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring;

+					if ($shorturlwithoutparam) print '<a class="vsmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';

+					else print '<span class="vsmenu">';

@@ -615 +564,4 @@
-					print '</span>';

+					if ($shorturlwithoutparam) print '</a>';

+					else print '</span>';

+					// If title is not pure text and contains a table, no carriage return added

+					if (!strstr($menu_array[$i]['titre'], '<table')) print '<br>';

@@ -617,42 +569,4 @@
-					$lastlevel0 = 'greyed';

-				} else {

-					$lastlevel0 = 'hidden';

-				}

-				if ($showmenu) {

-					print '<div class="menu_top"></div>'."\n";

-				}

-			}

-

-			// Menu level > 0

-			if ($menu_array[$i]['level'] > 0) {

-				$cssmenu = '';

-				if ($menu_array[$i]['url']) {

-					$cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/', '', $menu_array[$i]['url']));

-				}

-

-				if ($menu_array[$i]['enabled'] && $lastlevel0 == 'enabled') {

-					// Enabled so visible, except if parent was not enabled.

-					print '<div class="menu_contenu'.$cssmenu.'">';

-					print $tabstring;

-					if ($shorturlwithoutparam) {

-						print '<a class="vsmenu" title="'.dol_escape_htmltag(dol_string_nohtmltag($menu_array[$i]['titre'])).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';

-					} else {

-						print '<span class="vsmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'">';

-					}

-					print $menu_array[$i]['titre'];

-					if ($shorturlwithoutparam) {

-						print '</a>';

-					} else {

-						print '</span>';

-					}

-					// If title is not pure text and contains a table, no carriage return added

-					if (!strstr($menu_array[$i]['titre'], '<table')) {

-						print '<br>';

-					}

-					print '</div>'."\n";

-				} elseif ($showmenu && $lastlevel0 == 'enabled') {

-					// Not enabled but visible (so greyed), except if parent was not enabled.

-					print '<div class="menu_contenu'.$cssmenu.'">';

-					print $tabstring;

-					print '<span class="spanlilevel0 vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</span><br>';

-					print '</div>'."\n";

+				}

+				elseif ($showmenu && $lastlevel0 == 'enabled')       // Not enabled but visible (so greyed), except if parent was not enabled.

+				{

+					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";

@@ -663,2 +577,3 @@
-			if (empty($menu_array[$i + 1]['level'])) {               // End menu block

-				if ($showmenu) {

+			if (empty($menu_array[$i + 1]['level']))               // End menu block

+			{

+				if ($showmenu)

@@ -666,11 +581,5 @@
-				}

-				if ($blockvmenuopened) {

-					print '</div>'."\n";

-					$blockvmenuopened = false;

-				}

-			}

-		}

-

-		if ($altok) {

-			print '<div class="blockvmenuend"></div>'; // End menu block

-		}

+				if ($blockvmenuopened) { print '</div>'."\n"; $blockvmenuopened = false; }

+			}

+		}

+

+		if ($altok) print '<div class="blockvmenuend"></div>'; // End menu block

@@ -697,4 +606,3 @@
-	if (empty($menuentry['enabled'])) {

-		return 0; // Entry disabled by condition

-	}

-	if ($type_user && $menuentry['module']) {

+	if (empty($menuentry['enabled'])) return 0; // Entry disabled by condition

+	if ($type_user && $menuentry['module'])

+	{

@@ -703 +611,2 @@
-		foreach ($tmploops as $tmploop) {

+		foreach ($tmploops as $tmploop)

+		{

@@ -705,17 +614,8 @@
-				$found++;

-				break;

-			}

-		}

-		if (!$found) {

-			return 0; // Entry is for menus all excluded to external users

-		}

-	}

-	if (!$menuentry['perms'] && $type_user) {

-		return 0; // No permissions and user is external

-	}

-	if (!$menuentry['perms'] && getDolGlobalString('MAIN_MENU_HIDE_UNAUTHORIZED')) {

-		return 0; // No permissions and option to hide when not allowed, even for internal user, is on

-	}

-	if (!$menuentry['perms']) {

-		return 2; // No permissions and user is external

-	}

+				$found++; break;

+			}

+		}

+		if (!$found) return 0; // Entry is for menus all excluded to external users

+	}

+	if (!$menuentry['perms'] && $type_user) return 0; // No permissions and user is external

+	if (!$menuentry['perms'] && !empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))	return 0; // No permissions and option to hide when not allowed, even for internal user, is on

+	if (!$menuentry['perms']) return 2; // No permissions and user is external

--- /tmp/dsg/dolibarr/htdocs/core/menus/standard/github_19.0.3_auguria_menu.php
+++ /tmp/dsg/dolibarr/htdocs/core/menus/standard/client_auguria_menu.php
@@ -32,22 +32,17 @@
-	 * @var DoliDB Database handler.

-	 */

-	public $db;

-

-	public $type_user; // Put 0 for internal users, 1 for external users

-	public $atarget = ""; // To store default target to use onto links

-	public $name = "auguria";

-

-	/**

-	 * @var Menu

-	 */

-	public $menu;

-

-	public $menu_array;

-	public $menu_array_after;

-

-	public $tabMenu;

-

-

-	/**

-	 *  Constructor

-	 *

+     * @var DoliDB Database handler.

+     */

+    public $db;

+

+    public $type_user; // Put 0 for internal users, 1 for external users

+    public $atarget = ""; // To store default target to use onto links

+    public $name = "auguria";

+

+    public $menu_array;

+    public $menu_array_after;

+

+    public $tabMenu;

+

+

+    /**

+     *  Constructor

+     *

@@ -55,79 +50,78 @@
-	 *  @param	int			$type_user	Type of user

-	 */

-	public function __construct($db, $type_user)

-	{

-		$this->type_user = $type_user;

-		$this->db = $db;

-	}

-

-

-	/**

-	 * Load this->tabMenu

-	 *

-	 * @param	string	$forcemainmenu		To force mainmenu to load

-	 * @param	string	$forceleftmenu		To force leftmenu to load

-	 * @return	void

-	 */

-	public function loadMenu($forcemainmenu = '', $forceleftmenu = '')

-	{

-		global $conf, $user, $langs;

-

-		// We save into session the main menu selected

-		if (GETPOSTISSET("mainmenu")) {

-			$_SESSION["mainmenu"] = GETPOST("mainmenu", 'aZ09');

-		}

-		if (GETPOSTISSET("idmenu")) {

-			$_SESSION["idmenu"] = GETPOST("idmenu", 'int');

-		}

-

-		// Read now mainmenu and leftmenu that define which menu to show

-		if (GETPOSTISSET("mainmenu")) {

-			// On sauve en session le menu principal choisi

-			$mainmenu = GETPOST("mainmenu", 'aZ09');

-			$_SESSION["mainmenu"] = $mainmenu;

-			$_SESSION["leftmenuopened"] = "";

-		} else {

-			// On va le chercher en session si non defini par le lien

-			$mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';

-		}

-		if (!empty($forcemainmenu)) {

-			$mainmenu = $forcemainmenu;

-		}

-

-		if (GETPOSTISSET("leftmenu")) {

-			// On sauve en session le menu principal choisi

-			$leftmenu = GETPOST("leftmenu", 'aZ09');

-			$_SESSION["leftmenu"] = $leftmenu;

-

-			if ($_SESSION["leftmenuopened"] == $leftmenu) {	// To collapse

-				//$leftmenu="";

-				$_SESSION["leftmenuopened"] = "";

-			} else {

-				$_SESSION["leftmenuopened"] = $leftmenu;

-			}

-		} else {

-			// On va le chercher en session si non defini par le lien

-			$leftmenu = isset($_SESSION["leftmenu"]) ? $_SESSION["leftmenu"] : '';

-		}

-		if (!empty($forceleftmenu)) {

-			$leftmenu = $forceleftmenu;

-		}

-

-		require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';

-		$tabMenu = array();

-		$menuArbo = new Menubase($this->db, 'auguria');

-		$menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'auguria', $tabMenu);

-		$this->tabMenu = $tabMenu;

-		//var_dump($tabMenu);

-

-		//if ($forcemainmenu == 'all') { var_dump($this->tabMenu); exit; }

-	}

-

-

-	/**

-	 *  Show menu.

-	 *  Menu defined in sql tables were stored into $this->tabMenu BEFORE this is called.

-	 *

-	 *	@param	string	$mode		    'top', 'topnb', 'left', 'jmobile' (used to get full xml ul/li menu)

-	 *  @param	array	$moredata		An array with more data to output

-	 *  @return int                     0 or nb of top menu entries if $mode = 'topnb'

+     *  @param	int			$type_user	Type of user

+     */

+    public function __construct($db, $type_user)

+    {

+    	$this->type_user = $type_user;

+    	$this->db = $db;

+    }

+

+

+   	/**

+   	 * Load this->tabMenu

+   	 *

+   	 * @param	string	$forcemainmenu		To force mainmenu to load

+   	 * @param	string	$forceleftmenu		To force leftmenu to load

+   	 * @return	void

+   	 */

+   	public function loadMenu($forcemainmenu = '', $forceleftmenu = '')

+   	{

+    	global $conf, $user, $langs;

+

+   		// On sauve en session le menu principal choisi

+    	if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"] = $_GET["mainmenu"];

+    	if (isset($_GET["idmenu"]))   $_SESSION["idmenu"] = $_GET["idmenu"];

+

+    	// Read mainmenu and leftmenu that define which menu to show

+    	if (isset($_GET["mainmenu"]))

+    	{

+    		// On sauve en session le menu principal choisi

+    		$mainmenu = $_GET["mainmenu"];

+    		$_SESSION["mainmenu"] = $mainmenu;

+    		$_SESSION["leftmenuopened"] = "";

+    	}

+    	else

+    	{

+    		// On va le chercher en session si non defini par le lien

+    		$mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';

+    	}

+		if (!empty($forcemainmenu)) $mainmenu = $forcemainmenu;

+

+    	if (isset($_GET["leftmenu"]))

+    	{

+    		// On sauve en session le menu principal choisi

+    		$leftmenu = $_GET["leftmenu"];

+    		$_SESSION["leftmenu"] = $leftmenu;

+

+    		if ($_SESSION["leftmenuopened"] == $leftmenu)	// To collapse

+    		{

+    			//$leftmenu="";

+    			$_SESSION["leftmenuopened"] = "";

+    		}

+    		else

+    		{

+    			$_SESSION["leftmenuopened"] = $leftmenu;

+    		}

+    	} else {

+    		// On va le chercher en session si non defini par le lien

+    		$leftmenu = isset($_SESSION["leftmenu"]) ? $_SESSION["leftmenu"] : '';

+    	}

+    	if (!empty($forceleftmenu)) $leftmenu = $forceleftmenu;

+

+    	require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';

+    	$tabMenu = array();

+    	$menuArbo = new Menubase($this->db, 'auguria');

+    	$menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'auguria', $tabMenu);

+    	$this->tabMenu = $tabMenu;

+    	//var_dump($tabMenu);

+

+    	//if ($forcemainmenu == 'all') { var_dump($this->tabMenu); exit; }

+   	}

+

+

+    /**

+     *  Show menu.

+     *  Menu defined in sql tables were stored into $this->tabMenu BEFORE this is called.

+     *

+     *	@param	string	$mode		    'top', 'topnb', 'left', 'jmobile' (used to get full xml ul/li menu)

+     *  @param	array	$moredata		An array with more data to output

+     *  @return int                     0 or nb of top menu entries if $mode = 'topnb'

@@ -137,7 +131,29 @@
-		global $conf, $langs, $user;

-

-		require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php';

-

-		if ($this->type_user == 1) {

-			$conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED = 1;

-			$conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED = 1;

+    	global $conf, $langs, $user;

+

+        require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php';

+

+        if ($this->type_user == 1)

+        {

+        	$conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED = 1;

+	        $conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED = 1;

+        }

+

+		require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';

+        $this->menu = new Menu();

+

+        if (empty($conf->global->MAIN_MENU_INVERT))

+        {

+        	if ($mode == 'top')  print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);

+        	if ($mode == 'left') print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata);

+        }

+        else

+        {

+        	$conf->global->MAIN_SHOW_LOGO = 0;

+        	if ($mode == 'top')  print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0);

+        	if ($mode == 'left') print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);

+        }

+

+		if ($mode == 'topnb')

+		{

+		    print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode);

+		    return $this->menu->getNbOfVisibleMenuEntries();

@@ -146,45 +162,22 @@
-		require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';

-		$this->menu = new Menu();

-

-		if (!getDolGlobalString('MAIN_MENU_INVERT')) {

-			if ($mode == 'top') {

-				print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);

-			}

-			if ($mode == 'left') {

-				print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata);

-			}

-		} else {

-			$conf->global->MAIN_SHOW_LOGO = 0;

-			if ($mode == 'top') {

-				print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0);

-			}

-			if ($mode == 'left') {

-				print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);

-			}

-		}

-

-		if ($mode == 'topnb') {

-			print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode);

-			return $this->menu->getNbOfVisibleMenuEntries();

-		}

-

-		if ($mode == 'jmobile') {     // Used to get menu in xml ul/li

-			print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode);

-

-			// $this->menu->liste is top menu

-			//var_dump($this->menu->liste);exit;

-			$lastlevel = array();

-			$showmenu = true;  // Is current menu shown - define here to keep static code checker happy

-			print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";

-			foreach ($this->menu->liste as $key => $val) {		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'

-				print '<ul class="ulmenu" data-inset="true">';

-				print '<li class="lilevel0">';

-				if ($val['enabled'] == 1) {

-					$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);

-					$substitarray['__USERID__'] = $user->id; // For backward compatibility

-					$val['url'] = make_substitutions($val['url'], $substitarray);

-

-					$relurl = dol_buildpath($val['url'], 1);

-					$canonurl = preg_replace('/\?.*$/', '', $val['url']);

-

-					print '<a class="alilevel0" href="#">';

+        if ($mode == 'jmobile')     // Used to get menu in xml ul/li

+        {

+        	print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode);

+

+            // $this->menu->liste is top menu

+            //var_dump($this->menu->liste);exit;

+        	$lastlevel = array();

+        	print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";

+        	foreach ($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'

+        	{

+        		print '<ul class="ulmenu" data-inset="true">';

+        		print '<li class="lilevel0">';

+        		if ($val['enabled'] == 1)

+        		{

+        			$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);

+        			$substitarray['__USERID__'] = $user->id; // For backward compatibility

+        			$val['url'] = make_substitutions($val['url'], $substitarray);

+

+        			$relurl = dol_buildpath($val['url'], 1);

+        			$canonurl = preg_replace('/\?.*$/', '', $val['url']);

+

+        			print '<a class="alilevel0" href="#">';

@@ -193,3 +186 @@
-					if ($val['level'] == 0 && !empty($val['prefix'])) {

-						print str_replace('<span class="', '<span class="paddingright pictofixedwidth ', $val['prefix']);

-					}

+					if ($val['level'] == 0 && $val['mainmenu'] == 'home') print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';

@@ -198,20 +189,17 @@
-					print '</a>'."\n";

-

-					// Search submenu fot this mainmenu entry

-					$tmpmainmenu = $val['mainmenu'];

-					$tmpleftmenu = 'all';

-					$submenu = new Menu();

-					print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $submenu, 1, $tmpmainmenu, $tmpleftmenu);

-					if (!empty($submenu->liste[0]['url'])) {

-						$nexturl = dol_buildpath($submenu->liste[0]['url'], 1);

-					} else {

-						$nexturl = '';

-					}

-

-					$canonrelurl = preg_replace('/\?.*$/', '', $relurl);

-					$canonnexturl = preg_replace('/\?.*$/', '', $nexturl);

-					//var_dump($canonrelurl);

-					//var_dump($canonnexturl);

-					print '<ul>'."\n";

-					if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools')))

-						|| (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false)) {

+        			print '</a>'."\n";

+

+        			// Search submenu fot this mainmenu entry

+        			$tmpmainmenu = $val['mainmenu'];

+        			$tmpleftmenu = 'all';

+        			$submenu = new Menu();

+        			print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $submenu, 1, $tmpmainmenu, $tmpleftmenu);

+        			$nexturl = dol_buildpath($submenu->liste[0]['url'], 1);

+

+        			$canonrelurl = preg_replace('/\?.*$/', '', $relurl);

+        			$canonnexturl = preg_replace('/\?.*$/', '', $nexturl);

+        			//var_dump($canonrelurl);

+        			//var_dump($canonnexturl);

+        			print '<ul>'."\n";

+        			if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools')))

+        				|| (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false))

+					{

@@ -221,14 +209,6 @@
-

-						if ($val['level'] == 0) {

-							print '<span class="fas fa-home fa-fw paddingright pictofixedwidth" aria-hidden="true"></span>';

-						}

-

-						if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard") {  // No translation

-							if (in_array($val['mainmenu'], array('cashdesk', 'externalsite', 'website', 'collab', 'takepos'))) {

-								print $langs->trans("Access");

-							} else {

-								print $langs->trans("Dashboard");

-							}

-						} else {

-							print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");

-						}

+					    if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation

+        				{

+        				    if (in_array($val['mainmenu'], array('cashdesk', 'externalsite', 'website', 'collab'))) print $langs->trans("Access");

+        				    else print $langs->trans("Dashboard");

+        				}

+						else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");

@@ -236,0 +217,16 @@
+        			}

+

+    				if ($val['level'] == 0)

+					{

+					    if ($val['enabled'])

+					    {

+					        $lastlevel[0] = 'enabled';

+					    }

+					    elseif ($showmenu)                 // Not enabled but visible (so greyed)

+					    {

+					        $lastlevel[0] = 'greyed';

+					    }

+					    else

+					    {

+					        $lastlevel[0] = 'hidden';

+					    }

@@ -239,7 +235,15 @@
-					if ($val['level'] == 0) {

-						if ($val['enabled']) {

-							$lastlevel[0] = 'enabled';

-						} elseif ($showmenu) {                 // Not enabled but visible (so greyed)

-							$lastlevel[0] = 'greyed';

-						} else {

-							$lastlevel[0] = 'hidden';

+					$lastlevel2 = array();

+					foreach ($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'

+        			{

+						$showmenu = true;

+						if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) $showmenu = false;

+

+        				// If at least one parent is not enabled, we do not show any menu of all children

+						if ($val2['level'] > 0)

+						{

+						    $levelcursor = $val2['level'] - 1;

+						    while ($levelcursor >= 0)

+						    {

+                                if ($lastlevel2[$levelcursor] != 'enabled') $showmenu = false;

+                                $levelcursor--;

+						    }

@@ -247,106 +251,83 @@
-					}

-

-					$lastlevel2 = array();

-					foreach ($submenu->liste as $key2 => $val2) {		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'

-						$showmenu = true;

-						if (getDolGlobalString('MAIN_MENU_HIDE_UNAUTHORIZED') && empty($val2['enabled'])) {

-							$showmenu = false;

-						}

-

-						// If at least one parent is not enabled, we do not show any menu of all children

-						if ($val2['level'] > 0) {

-							$levelcursor = $val2['level'] - 1;

-							while ($levelcursor >= 0) {

-								if ($lastlevel2[$levelcursor] != 'enabled') {

-									$showmenu = false;

-								}

-								$levelcursor--;

-							}

-						}

-

-						if ($showmenu) {		// Visible (option to hide when not allowed is off or allowed)

-							$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);

-							$substitarray['__USERID__'] = $user->id; // For backward compatibility

-							$val2['url'] = make_substitutions($val2['url'], $substitarray); // Make also substitution of __(XXX)__ and __[XXX]__

-

-							if (!preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url'])) {

-								$relurl2 = dol_buildpath($val2['url'], 1);

-							} else {

-								$relurl2 = $val2['url'];

-							}

-							$canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);

-							//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);

-							if (in_array($canonurl2, array('/admin/index.php', '/admin/tools/index.php', '/core/tools.php'))) {

-								$relurl2 = '';

-							}

-

-							$disabled = '';

-							if (!$val2['enabled']) {

-								$disabled = " vsmenudisabled";

-							}

-

-							print str_pad('', $val2['level'] + 1);

-							print '<li class="lilevel'.($val2['level'] + 1);

-							if ($val2['level'] == 0) {

-								print ' ui-btn-icon-right ui-btn'; // ui-btn to highlight on clic

-							}

-							print $disabled.'">'; // ui-btn to highlight on clic

-							if ($relurl2) {

-								if ($val2['enabled']) {	// Allowed

-									print '<a href="'.$relurl2.'"';

-									//print ' data-ajax="false"';

-									print '>';

-									$lastlevel2[$val2['level']] = 'enabled';

-								} else { // Not allowed but visible (greyed)

-									print '<a href="#" class="vsmenudisabled">';

-									$lastlevel2[$val2['level']] = 'greyed';

-								}

-							} else {

-								if ($val2['enabled']) {	// Allowed

-									$lastlevel2[$val2['level']] = 'enabled';

-								} else {

-									$lastlevel2[$val2['level']] = 'greyed';

-								}

-							}

-

-							if ($val2['level'] == 0 && !empty($val2['prefix'])) {

-								print $val2['prefix'];

-							} else {

-								print '<i class="fa fa-does-not-exists fa-fw paddingright pictofixedwidth"></i>';

-							}

-

-							print $val2['titre'];

-							if ($relurl2) {

-								if ($val2['enabled']) {	// Allowed

-									print '</a>';

-								} else {

-									print '</a>';

-								}

-							}

-							print '</li>'."\n";

-						}

-					}

-					//var_dump($submenu);

-					print '</ul>';

-				}

-				if ($val['enabled'] == 2) {

-					print '<span class="spanlilevel0 vsmenudisabled">';

-

-					// Add font-awesome

-					if ($val['level'] == 0 && !empty($val['prefix'])) {

-						print $val['prefix'];

-					}

-

-					print $val['titre'];

-					print '</span>';

-				}

-				print '</li>';

-				print '</ul>'."\n";

-			}

-		}

-

-		unset($this->menu);

-

-		//print 'xx'.$mode;

-		return 0;

-	}

+

+						if ($showmenu)		// Visible (option to hide when not allowed is off or allowed)

+       					{

+       						$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);

+       						$substitarray['__USERID__'] = $user->id; // For backward compatibility

+       						$val2['url'] = make_substitutions($val2['url'], $substitarray); // Make also substitution of __(XXX)__ and __[XXX]__

+

+       						if (!preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url']))

+       						{

+       							$relurl2 = dol_buildpath($val2['url'], 1);

+       						}

+       						else

+       						{

+       							$relurl2 = $val2['url'];

+       						}

+	        				$canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);

+	        				//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);

+	        				if (in_array($canonurl2, array('/admin/index.php', '/admin/tools/index.php', '/core/tools.php'))) $relurl2 = '';

+

+	        				$disabled = '';

+	        				if (!$val2['enabled'])

+	        				{

+	        				    $disabled = " vsmenudisabled";

+	        				}

+

+	        				print str_pad('', $val2['level'] + 1);

+	        				print '<li class="lilevel'.($val2['level'] + 1);

+	        				if ($val2['level'] == 0) print ' ui-btn-icon-right ui-btn'; // ui-btn to highlight on clic

+	        				print $disabled.'">'; // ui-btn to highlight on clic

+	        				if ($relurl2)

+	        				{

+	        					if ($val2['enabled'])	// Allowed

+	        					{

+	        						print '<a href="'.$relurl2.'"';

+		        					//print ' data-ajax="false"';

+		        					print '>';

+		        					$lastlevel2[$val2['level']] = 'enabled';

+	        					}

+	        					else					// Not allowed but visible (greyed)

+	        					{

+				        			print '<a href="#" class="vsmenudisabled">';

+				        			$lastlevel2[$val2['level']] = 'greyed';

+	        					}

+	        				}

+	        				else

+	        				{

+	        				    if ($val2['enabled'])	// Allowed

+	        				    {

+	        				        $lastlevel2[$val2['level']] = 'enabled';

+	        				    }

+	        				    else

+	        				    {

+	        				        $lastlevel2[$val2['level']] = 'greyed';

+	        				    }

+	        				}

+	        				print $val2['titre'];

+	        				if ($relurl2)

+	        				{

+	        					if ($val2['enabled'])	// Allowed

+	        						print '</a>';

+	        					else

+	        						print '</a>';

+	        				}

+	        				print '</li>'."\n";

+       					}

+        			}

+        			//var_dump($submenu);

+        			print '</ul>';

+        		}

+        		if ($val['enabled'] == 2)

+        		{

+        			print '<font class="vsmenudisabled">'.$val['titre'].'</font>';

+        		}

+        		print '</li>';

+        		print '</ul>'."\n";

+        	}

+        }

+

+        unset($this->menu);

+

+        //print 'xx'.$mode;

+        return 0;

+    }

--- /tmp/dsg/dolibarr/htdocs/core/menus/standard/github_19.0.3_eldy.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/menus/standard/client_eldy.lib.php
@@ -2 +2 @@
-/* Copyright (C) 2010-2022 Laurent Destailleur  <eldy@users.sourceforge.net>

+/* Copyright (C) 2010-2014 Laurent Destailleur  <eldy@users.sourceforge.net>

@@ -8,2 +8 @@
- * Copyright (C) 2018-2022 Frédéric France      <frederic.france@netlogic.fr>

- * Copyright (C) 2021      Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>

+ * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>

@@ -54 +53 @@
-	$listofmodulesforexternal = explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL'));

+	$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);

@@ -58,2 +57,12 @@
-	if (empty($noout)) {

-		print_start_menu_array();

+	if (empty($noout)) print_start_menu_array();

+

+    $usemenuhider = 1;

+

+	// Show/Hide vertical menu. The hamburger icon for .menuhider action.

+	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))

+	{

+    	$showmode = 1;

+    	$classname = 'class="tmenu menuhider"';

+    	$idsel = 'menu';

+

+    	$menu->add('#', (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE) ? '<span class="fa fa-bars"></span>' : ''), 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);

@@ -62,13 +71 @@
-	global $usemenuhider;

-	$usemenuhider = 1;

-

-	// Show/Hide vertical menu. The hamburger icon for .menuhider action.

-	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {

-		$showmode = 1;

-		$classname = 'class="tmenu menuhider nohover"';

-		$idsel = 'menu';

-

-		$menu->add('#', (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 1 ? '<span class="fas fa-bars size12x"></span>' : ''), 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname, '<span class="fas fa-bars size12x"></span>');

-	}

-

-	$menu_arr = array();

+    $menu_arr = array();

@@ -80 +77 @@
-		'title' => "Home",

+		'title' => (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE) ? '<span class="fa fa-home"></span>' : "Home"),

@@ -89,3 +86,3 @@
-		'classname' =>  $classname = (empty($_SESSION["mainmenu"]) || $_SESSION["mainmenu"] == "home") ? 'class="tmenusel"' : 'class="tmenu"',

-		'prefix' => '<span class="fas fa-home fa-fw"></span>',

-		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "home") ? 0 : 1),

+		'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home") ? 'class="tmenusel"' : 'class="tmenu"',

+		'prefix' => '',

+		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home") ? 0 : 1),

@@ -98,3 +95,3 @@
-		'enabled' => isModEnabled('adherent'),

-		'perms' => $user->hasRight('adherent', 'lire'),

-		'module' => 'adherent'

+	    'enabled' => (!empty($conf->adherent->enabled)),

+	    'perms' => (!empty($user->rights->adherent->lire)),

+	    'module' => 'adherent'

@@ -114,4 +111,4 @@
-		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "members") ? 'class="tmenusel"' : 'class="tmenu"',

-		'prefix' => img_picto('', 'member', 'class="fa-fw pictofixedwidth"'),

-		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "members") ? 0 : 1),

-		'loadLangs' => array("members"),

+		'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members") ? 'class="tmenusel"' : 'class="tmenu"',

+		'prefix' => '',

+		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members") ? 0 : 1),

+		'loadLangs' => array(),

@@ -123,9 +120,7 @@
-		'enabled'=> (

-			(

-			isModEnabled('societe') &&

-			(!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') || !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS'))

-		)

-			|| (isModEnabled('supplier_proposal') || isModEnabled('supplier_order') || isModEnabled('supplier_invoice'))

-		),

-		'perms'=> ($user->hasRight('societe', 'lire') || $user->hasRight('fournisseur', 'lire') || $user->hasRight('supplier_order', 'lire') || $user->hasRight('supplier_invoice', 'lire') || $user->hasRight('supplier_proposal', 'lire')),

-		'module'=>'societe|fournisseur'

+	    'enabled'=> ((!empty($conf->societe->enabled) &&

+	        (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))

+	        )

+	        || (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))

+	        ),

+	    'perms'=> (!empty($user->rights->societe->lire) || !empty($user->rights->fournisseur->lire)),

+	    'module'=>'societe|fournisseur'

@@ -145,3 +140,3 @@
-		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "companies") ? 'class="tmenusel"' : 'class="tmenu"',

-		'prefix' => img_picto('', 'company', 'class="fa-fw pictofixedwidth"'),

-		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "companies") ? 0 : 1),

+		'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "companies") ? 'class="tmenusel"' : 'class="tmenu"',

+		'prefix' => '',

+		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "companies") ? 0 : 1),

@@ -154,3 +149,3 @@
-		'enabled'=> (isModEnabled('product') || isModEnabled('service') || isModEnabled('expedition')),

-		'perms'=> ($user->hasRight('product', 'read') || $user->hasRight('service', 'read') || $user->hasRight('expedition', 'lire')),

-		'module'=>'product|service'

+		'enabled'=> (!empty($conf->product->enabled) || !empty($conf->service->enabled) || !empty($conf->expedition->enabled)),

+		'perms'=> (!empty($user->rights->produit->lire) || !empty($user->rights->service->lire) || !empty($user->rights->expedition->lire)),

+	    'module'=>'product|service'

@@ -161,3 +156,3 @@
-		'title' => (isModEnabled('product') && isModEnabled('service'))

-		? (array("TMenuProducts", " | ", "TMenuServices"))

-		: (isModEnabled('product') ? "TMenuProducts" : "TMenuServices"),

+		'title' => (!empty($conf->product->enabled) && !empty($conf->service->enabled))

+					? (array("TMenuProducts", " | ", "TMenuServices"))

+					: (!empty($conf->product->enabled) ? "TMenuProducts" : "TMenuServices"),

@@ -165 +160 @@
-		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),

+	    'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),

@@ -172,4 +167,4 @@
-		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "products") ? 'class="tmenusel"' : 'class="tmenu"',

-		'prefix' => img_picto('', 'product', 'class="fa-fw pictofixedwidth"'),

-		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "products") ? 0 : 1),

-		'loadLangs' => array("products", "stocks"),

+		'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "products") ? 'class="tmenusel"' : 'class="tmenu"',

+		'prefix' => '',

+		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "products") ? 0 : 1),

+		'loadLangs' => array("products"),

@@ -179 +174 @@
-	// MRP - GPAO

+	// MRP

@@ -181,3 +176,3 @@
-		'enabled'=>(isModEnabled('bom') || isModEnabled('mrp')),

-		'perms'=>($user->hasRight('bom', 'read') || $user->hasRight('mrp', 'read')),

-		'module'=>'bom|mrp'

+	    'enabled'=>(!empty($conf->bom->enabled) || !empty($conf->mrp->enabled)),

+	    'perms'=>(!empty($user->rights->bom->read) || !empty($user->rights->mrp->read)),

+	    'module'=>'bom|mrp'

@@ -186,16 +181,16 @@
-		'name' => 'TMenuMRP',

-		'link' => '/mrp/index.php?mainmenu=mrp&amp;leftmenu=',

-		'title' => "TMenuMRP",

-		'level' => 0,

-		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),

-		'target' => $atarget,

-		'mainmenu' => "mrp",

-		'leftmenu' => '',

-		'position' => 31,

-		'id' => $id,

-		'idsel' => 'mrp',

-		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "mrp") ? 'class="tmenusel"' : 'class="tmenu"',

-		'prefix' => img_picto('', 'mrp', 'class="fa-fw pictofixedwidth"'),

-		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "mrp") ? 0 : 1),

-		'loadLangs' => array("mrp"),

-		'submenus' => array(),

+	    'name' => 'TMenuMRP',

+	    'link' => '/mrp/index.php?mainmenu=mrp&amp;leftmenu=',

+	    'title' => "TMenuMRP",

+	    'level' => 0,

+	    'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),

+	    'target' => $atarget,

+	    'mainmenu' => "mrp",

+	    'leftmenu' => '',

+	    'position' => 30,

+	    'id' => $id,

+	    'idsel' => 'mrp',

+	    'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mrp") ? 'class="tmenusel"' : 'class="tmenu"',

+	    'prefix' => '',

+	    'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mrp") ? 0 : 1),

+	    'loadLangs' => array("mrp"),

+	    'submenus' => array(),

@@ -206,17 +201,4 @@
-		'enabled'=> (isModEnabled('projet') ? 1 : 0),

-		'perms'=> ($user->hasRight('projet', 'lire') ? 1 : 0),

-		'module'=>'projet'

-	);

-

-	if ($mode == 'jmobile') {

-		$titleboth = $langs->trans("LeadsOrProjects");

-	} else {

-		$titleboth = $langs->trans("Projects");

-	}

-	if (!getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {

-		$titleboth = $langs->trans("Projects");

-	}

-	if (getDolGlobalInt('PROJECT_USE_OPPORTUNITIES') == 2) {	// 2 = leads only

-		$titleboth = $langs->trans("Leads");

-	}

-

+	    'enabled'=> (!empty($conf->projet->enabled) ? 1 : 0),

+	    'perms'=> (!empty($user->rights->projet->lire) ? 1 : 0),

+	    'module'=>'projet'

+	);

@@ -224 +206 @@
-		'name' => 'Project',

+		'name' => 'Projet',

@@ -226 +208,3 @@
-		'title' => $titleboth,

+		'title' => (empty($conf->global->PROJECT_USE_OPPORTUNITIES) || $conf->global->PROJECT_USE_OPPORTUNITIES == 2)

+					? (($conf->global->PROJECT_USE_OPPORTUNITIES == 2) ? "Leads" : "Projects")

+					: "Projects",

@@ -228 +212 @@
-		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),

+	    'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),

@@ -235,3 +219,3 @@
-		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "project") ? 'class="tmenusel"' : 'class="tmenu"',

-		'prefix' => img_picto('', 'project', 'class="fa-fw pictofixedwidth"'),

-		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "project") ? 0 : 1),

+		'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project") ? 'class="tmenusel"' : 'class="tmenu"',

+		'prefix' => '',

+		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project") ? 0 : 1),

@@ -242 +226 @@
-	// Commercial (propal, commande, supplier_proposal, supplier_order, contrat, ficheinter)

+	// Commercial

@@ -244,29 +228,26 @@
-		'enabled'=>(

-			isModEnabled('propal')

-			|| isModEnabled('commande')

-			|| isModEnabled('fournisseur')

-			|| isModEnabled('supplier_proposal')

-			|| isModEnabled('supplier_order')

-			|| isModEnabled('contrat')

-			|| isModEnabled('ficheinter')

-		) ? 1 : 0,

-		'perms'=>(

-			$user->hasRight('propal', 'read')

-			|| $user->hasRight('commande', 'lire')

-			|| $user->hasRight('supplier_proposal', 'lire')

-			|| $user->hasRight('fournisseur', 'lire')

-			|| $user->hasRight('fournisseur', 'commande', 'lire')

-			|| $user->hasRight('supplier_order', 'lire')

-			|| $user->hasRight('contrat', 'lire')

-			|| $user->hasRight('ficheinter', 'lire')

-		),

-		'module'=>'propal|commande|supplier_proposal|supplier_order|contrat|ficheinter'

-	);

-

-	$onlysupplierorder = $user->hasRight('fournisseur', 'commande', 'lire') &&

-	!$user->hasRight('propal', 'lire') &&

-	!$user->hasRight('commande', 'lire') &&

-	!$user->hasRight('supplier_order', 'lire') &&

-	!$user->hasRight('supplier_proposal', 'lire') &&

-	!$user->hasRight('contrat', 'lire') &&

-	!$user->hasRight('ficheinter', 'lire');

+	    'enabled'=>(!empty($conf->propal->enabled) ||

+	        !empty($conf->commande->enabled) ||

+	    	!empty($conf->fournisseur->enabled) ||

+	    	!empty($conf->supplier_proposal->enabled) ||

+	    	!empty($conf->supplier_order->enabled) ||

+	    	!empty($conf->contrat->enabled) ||

+	        !empty($conf->ficheinter->enabled)

+	        ) ? 1 : 0,

+		'perms'=>(!empty($user->rights->propal->lire) ||

+				  !empty($user->rights->commande->lire) ||

+				  !empty($user->rights->fournisseur->lire) ||

+				  !empty($user->rights->supplier_proposal->lire) ||

+				  !empty($user->rights->supplier_order->lire) ||

+				  !empty($user->rights->contrat->lire) ||

+				  !empty($user->rights->ficheinter->lire)

+			),

+	    'module'=>'propal|commande|supplier_proposal|supplier_order|contrat|ficheinter'

+	);

+

+	$onlysupplierorder = !empty($user->rights->fournisseur->commande->lire) &&

+		empty($user->rights->propal->lire) &&

+		empty($user->rights->commande->lire) &&

+		empty($user->rights->supplier_order->lire) &&

+		empty($user->rights->supplier_proposal->lire) &&

+		empty($user->rights->contrat->lire) &&

+		empty($user->rights->ficheinter->lire);

@@ -279 +260 @@
-		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),

+	    'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),

@@ -286,3 +267,3 @@
-		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "commercial") ? 'class="tmenusel"' : 'class="tmenu"',

-		'prefix' => img_picto('', 'contract', 'class="fa-fw pictofixedwidth"'),

-		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "commercial") ? 0 : 1),

+		'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial") ? 'class="tmenusel"' : 'class="tmenu"',

+		'prefix' => '',

+		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial") ? 0 : 1),

@@ -295,13 +276,12 @@
-		'enabled'=>(

-			isModEnabled('facture') ||

-			isModEnabled('don') ||

-			isModEnabled('tax') ||

-			isModEnabled('salaries') ||

-			isModEnabled('supplier_invoice') ||

-			isModEnabled('loan') ||

-			isModEnabled('margin')

-		) ? 1 : 0,

-		'perms'=>($user->hasRight('facture', 'lire') || $user->hasRight('don', 'contact', 'lire')

-			|| $user->hasRight('tax', 'charges', 'lire') || $user->hasRight('salaries', 'read')

-			|| $user->hasRight('fournisseur', 'facture', 'lire') || $user->hasRight('loan', 'read') || $user->hasRight('margins', 'liretous')),

-		'module'=>'facture|supplier_invoice|don|tax|salaries|loan'

+	    'enabled'=>(!empty($conf->facture->enabled) ||

+	        !empty($conf->don->enabled) ||

+	        !empty($conf->tax->enabled) ||

+	        !empty($conf->salaries->enabled) ||

+	        !empty($conf->supplier_invoice->enabled) ||

+	        !empty($conf->loan->enabled) ||

+            !empty($conf->margins->enabled)

+	        ) ? 1 : 0,

+	    'perms'=>(!empty($user->rights->facture->lire) || !empty($user->rights->don->contact->lire)

+	        || !empty($user->rights->tax->charges->lire) || !empty($user->rights->salaries->read)

+	        || !empty($user->rights->fournisseur->facture->lire) || !empty($user->rights->loan->read) || !empty($user->rights->margins->liretous)),

+	    'module'=>'facture|supplier_invoice|don|tax|salaries|loan'

@@ -314 +294 @@
-		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),

+	    'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),

@@ -321,3 +301,3 @@
-		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "billing") ? 'class="tmenusel"' : 'class="tmenu"',

-		'prefix' => img_picto('', 'bill', 'class="fa-fw pictofixedwidth"'),

-		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "billing") ? 0 : 1),

+		'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "billing") ? 'class="tmenusel"' : 'class="tmenu"',

+		'prefix' => '',

+		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "billing") ? 0 : 1),

@@ -330,3 +310,3 @@
-		'enabled'=>(isModEnabled('banque') || isModEnabled('prelevement')),

-		'perms'=>($user->hasRight('banque', 'lire') || $user->hasRight('prelevement', 'lire') || $user->hasRight('paymentbybanktransfer', 'read')),

-		'module'=>'banque|prelevement|paymentbybanktransfer'

+	    'enabled'=>(!empty($conf->banque->enabled) || !empty($conf->prelevement->enabled)),

+		'perms'=>(!empty($user->rights->banque->lire) || !empty($user->rights->prelevement->lire) || !empty($user->rights->paymentbybanktransfer->read)),

+	    'module'=>'banque|prelevement|paymentbybanktransfer'

@@ -339 +319 @@
-		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),

+	    'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),

@@ -346,3 +326,5 @@
-		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "bank") ? 'class="tmenusel"' : 'class="tmenu"',

-		'prefix' => img_picto('', 'bank_account', 'class="fa-fw pictofixedwidth"'),

-		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "bank") ? 0 : 1),

+		'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "bank") ? 'class="tmenusel"' : 'class="tmenu"',

+		'prefix' => '',

+

+		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "bank") ? 0 : 1),

+

@@ -355,3 +337,3 @@
-		'enabled'=>(isModEnabled('comptabilite') || isModEnabled('accounting') || isModEnabled('asset') || isModEnabled('intracommreport')),

-		'perms'=>($user->hasRight('compta', 'resultat', 'lire') || $user->hasRight('accounting', 'comptarapport', 'lire') || $user->hasRight('accounting', 'mouvements', 'lire') || $user->hasRight('asset', 'read') || $user->hasRight('intracommreport', 'read')),

-		'module'=>'comptabilite|accounting|asset|intracommreport'

+	    'enabled'=>(!empty($conf->comptabilite->enabled) || !empty($conf->accounting->enabled) || !empty($conf->asset->enabled)),

+	    'perms'=>(!empty($user->rights->compta->resultat->lire) || !empty($user->rights->accounting->mouvements->lire) || !empty($user->rights->asset->read)),

+        'module'=>'comptabilite|accounting|asset'

@@ -364 +346 @@
-		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),

+	    'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),

@@ -371,4 +353,6 @@
-		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "accountancy") ? 'class="tmenusel"' : 'class="tmenu"',

-		'prefix' => img_picto('', 'accountancy', 'class="fa-fw pictofixedwidth"'),

-		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "accountancy") ? 0 : 1),

-		'loadLangs' => array("compta", "accountancy", "assets", "intracommreport"),

+		'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy") ? 'class="tmenusel"' : 'class="tmenu"',

+		'prefix' => '',

+

+		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy") ? 0 : 1),

+

+		'loadLangs' => array("compta", "accountancy", "assets"),

@@ -380,5 +364,4 @@
-		'enabled'=>(isModEnabled('hrm') || (isModEnabled('holiday')) || isModEnabled('deplacement') || isModEnabled('expensereport') || isModEnabled('recruitment')),

-		'perms'=>($user->hasRight('user', 'user', 'lire') || $user->hasRight('holiday', 'read') || $user->hasRight('deplacement', 'lire') || $user->hasRight('expensereport', 'lire') || $user->hasRight('recruitment', 'recruitmentjobposition', 'read')),

-		'module'=>'hrm|holiday|deplacement|expensereport|recruitment'

-	);

-

+	    'enabled'=>(!empty($conf->hrm->enabled) || !empty($conf->holiday->enabled) || !empty($conf->deplacement->enabled) || !empty($conf->expensereport->enabled)),

+	    'perms'=>(!empty($user->rights->hrm->employee->read) || !empty($user->rights->holiday->write) || !empty($user->rights->deplacement->lire) || !empty($user->rights->expensereport->lire)),

+	    'module'=>'hrm|holiday|deplacement|expensereport'

+	);

@@ -390 +373 @@
-		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),

+	    'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),

@@ -397,35 +380,6 @@
-		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "hrm") ? 'class="tmenusel"' : 'class="tmenu"',

-		'prefix' => img_picto('', 'hrm', 'class="fa-fw pictofixedwidth"'),

-		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "hrm") ? 0 : 1),

-		'loadLangs' => array("hrm", "holiday"),

-		'submenus' => array(),

-	);

-

-	// Tickets and Knowledge base

-	$tmpentry = array(

-		'enabled'=>(isModEnabled('ticket') || isModEnabled('knowledgemanagement')),

-		'perms'=>($user->hasRight('ticket', 'read') || $user->hasRight('knowledgemanagement', 'knowledgerecord', 'read')),

-		'module'=>'ticket|knowledgemanagement'

-	);

-	$link = '';

-	if (isModEnabled('ticket')) {

-		$link = '/ticket/index.php?mainmenu=ticket&amp;leftmenu=';

-	} else {

-		$link = '/knowledgemanagement/knowledgerecord_list.php?mainmenu=ticket&amp;leftmenu=';

-	}

-	$menu_arr[] = array(

-		'name' => 'Ticket',

-		'link' => $link,

-		'title' =>  isModEnabled('ticket') ? "Tickets" : "MenuKnowledgeRecordShort",

-		'level' => 0,

-		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),

-		'target' => $atarget,

-		'mainmenu' => "ticket",

-		'leftmenu' => '',

-		'position' => 88,

-		'id' => $id,

-		'idsel' => 'ticket',

-		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "ticket") ? 'class="tmenusel"' : 'class="tmenu"',

-		'prefix' => img_picto('', 'ticket', 'class="fa-fw pictofixedwidth"'),

-		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "ticket") ? 0 : 1),

-		'loadLangs' => array("ticket", "knowledgemanagement"),

+		'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "hrm") ? 'class="tmenusel"' : 'class="tmenu"',

+		'prefix' => '',

+

+		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "hrm") ? 0 : 1),

+

+		'loadLangs' => array("holiday"),

@@ -437,3 +391,3 @@
-		'enabled'=>1,

-		'perms'=>1,

-		'module'=>''

+	    'enabled'=>1,

+	    'perms'=>1,

+	    'module'=>''

@@ -446 +400 @@
-		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),

+	    'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),

@@ -453,3 +407,5 @@
-		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "tools") ? 'class="tmenusel"' : 'class="tmenu"',

-		'prefix' => img_picto('', 'tools', 'class="fa-fw pictofixedwidth"'),

-		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "tools") ? 0 : 1),

+		'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "tools") ? 'class="tmenusel"' : 'class="tmenu"',

+		'prefix' => '',

+

+		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "tools") ? 0 : 1),

+

@@ -461 +417,2 @@
-	foreach ($menu_arr as $key => $smenu) {

+	foreach ($menu_arr as $key => $smenu)

+	{

@@ -464,2 +421,4 @@
-		if ($smenu->enabled) {

-			if ($smenu->session) {

+		if ($smenu->enabled)

+		{

+			if ($smenu->session)

+			{

@@ -470 +429,2 @@
-			if (!empty($smenu->loadLangs)) {

+			if (!empty($smenu->loadLangs))

+			{

@@ -476,2 +436,4 @@
-			if (is_array($smenu->title)) {

-				foreach ($smenu->title as $item) {

+			if (is_array($smenu->title))

+			{

+				foreach ($smenu->title as $item)

+				{

@@ -480 +442,3 @@
-			} else {

+			}

+			else

+			{

@@ -490 +453,0 @@
-

@@ -494 +457,2 @@
-	for ($i = 0; $i < $num; $i++) {

+	for ($i = 0; $i < $num; $i++)

+	{

@@ -498,19 +462,25 @@
-		$newTabMenu[$i]['url'] = make_substitutions($newTabMenu[$i]['url'], $substitarray);

-

-		// url = url from host, shorturl = relative path into dolibarr sources

-		$url = $shorturl = $newTabMenu[$i]['url'];

-		if (!preg_match("/^(http:\/\/|https:\/\/)/i", $newTabMenu[$i]['url'])) {	// Do not change url content for external links

-			$tmp = explode('?', $newTabMenu[$i]['url'], 2);

-			$url = $shorturl = $tmp[0];

-			$param = (isset($tmp[1]) ? $tmp[1] : '');

-

-			if ((!preg_match('/mainmenu/i', $param)) || !preg_match('/leftmenu/i', $param)) {

-				$param .= ($param ? '&' : '').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=';

-			}

-			//$url.="idmenu=".$newTabMenu[$i]['rowid'];    // Already done by menuLoad

-			$url = dol_buildpath($url, 1).($param ? '?'.$param : '');

-			//$shorturl = $shorturl.($param?'?'.$param:'');

-			$shorturl = $url;

-			if (DOL_URL_ROOT) {

-				$shorturl = preg_replace('/^'.preg_quote(DOL_URL_ROOT, '/').'/', '', $shorturl);

-			}

+		$showmode = isVisibleToUserType($type_user, $newTabMenu[$i], $listofmodulesforexternal);

+		if ($showmode == 1)

+		{

+			$newTabMenu[$i]['url'] = make_substitutions($newTabMenu[$i]['url'], $substitarray);

+

+		    // url = url from host, shorturl = relative path into dolibarr sources

+			$url = $shorturl = $newTabMenu[$i]['url'];

+			if (!preg_match("/^(http:\/\/|https:\/\/)/i", $newTabMenu[$i]['url']))	// Do not change url content for external links

+			{

+				$tmp = explode('?', $newTabMenu[$i]['url'], 2);

+				$url = $shorturl = $tmp[0];

+				$param = (isset($tmp[1]) ? $tmp[1] : '');

+

+				if (!preg_match('/mainmenu/i', $param) || !preg_match('/leftmenu/i', $param)) $param .= ($param ? '&' : '').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&amp;leftmenu=';

+				//$url.="idmenu=".$newTabMenu[$i]['rowid'];    // Already done by menuLoad

+				$url = dol_buildpath($url, 1).($param ? '?'.$param : '');

+				//$shorturl = $shorturl.($param?'?'.$param:'');

+                $shorturl = $url;

+				if (DOL_URL_ROOT) $shorturl = preg_replace('/^'.preg_quote(DOL_URL_ROOT, '/').'/', '', $shorturl);

+			}

+

+			// Define the class (top menu selected or not)

+			if (!empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) $classname = 'class="tmenusel"';

+			elseif (!empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname = 'class="tmenusel"';

+			else $classname = 'class="tmenu"';

@@ -518,29 +488,3 @@
-

-		$showmode = isVisibleToUserType($type_user, $newTabMenu[$i], $listofmodulesforexternal);

-		if ($showmode == 1) {

-			// Define the class (top menu selected or not)

-			if (!empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) {

-				$classname = 'class="tmenusel"';

-			} elseif (!empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) {

-				$classname = 'class="tmenusel"';

-			} else {

-				$classname = 'class="tmenu"';

-			}

-		} elseif ($showmode == 2) {

-			$classname = 'class="tmenu"';

-		}

-

-		$menu->add(

-			$shorturl,

-			$newTabMenu[$i]['titre'],

-			0,

-			$showmode,

-			($newTabMenu[$i]['target'] ? $newTabMenu[$i]['target'] : $atarget),

-			($newTabMenu[$i]['mainmenu'] ? $newTabMenu[$i]['mainmenu'] : $newTabMenu[$i]['rowid']),

-			($newTabMenu[$i]['leftmenu'] ? $newTabMenu[$i]['leftmenu'] : ''),

-			$newTabMenu[$i]['position'],

-			$id,

-			$idsel,

-			$classname,

-			$newTabMenu[$i]['prefix']

-		);

+		elseif ($showmode == 2) $classname = 'class="tmenu"';

+

+		$menu->add($shorturl, $newTabMenu[$i]['titre'], 0, $showmode, ($newTabMenu[$i]['target'] ? $newTabMenu[$i]['target'] : $atarget), ($newTabMenu[$i]['mainmenu'] ? $newTabMenu[$i]['mainmenu'] : $newTabMenu[$i]['rowid']), ($newTabMenu[$i]['leftmenu'] ? $newTabMenu[$i]['leftmenu'] : ''), $newTabMenu[$i]['position'], $id, $idsel, $classname);

@@ -552 +496 @@
-	// Output menu entries

+    // Output menu entries

@@ -554 +498,2 @@
-	if (!getDolGlobalString('MAIN_MENU_INVERT') && empty($noout) && getDolGlobalString('MAIN_SHOW_LOGO') && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {

+	if (empty($conf->global->MAIN_MENU_INVERT) && empty($noout) && !empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))

+	{

@@ -556 +501 @@
-		$mysoc->logo_squarred_mini = (!getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI') ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI);

+		$mysoc->logo_squarred_mini = (empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI) ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI);

@@ -559 +504 @@
-		if (getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_NO_BACKGROUND')) {

+		if (!empty($conf->global->MAIN_INFO_SOCIETE_LOGO_NO_BACKGROUND)) {

@@ -563 +508,2 @@
-		if (!empty($mysoc->logo_squarred_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini)) {

+		if (!empty($mysoc->logo_squarred_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini))

+		{

@@ -565,2 +511,3 @@
-			/*} elseif (!empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))

-			{

+		}

+		/*elseif (! empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))

+		{

@@ -568,2 +515,3 @@
-			}*/

-		} else {

+		}*/

+		else

+		{

@@ -577,0 +526 @@
+

@@ -583,8 +532,7 @@
-	//var_dump($menu->liste);

-	if (empty($noout)) {

-		foreach ($menu->liste as $menuval) {

-			print_start_menu_entry($menuval['idsel'], $menuval['classname'], $menuval['enabled']);

-			print_text_menu_entry($menuval['titre'], $menuval['enabled'], (($menuval['url'] != '#' && !preg_match('/^(http:\/\/|https:\/\/)/i', $menuval['url'])) ? DOL_URL_ROOT : '').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget), $menuval);

-			print_end_menu_entry($menuval['enabled']);

-		}

-	}

+    if (empty($noout)) {

+        foreach ($menu->liste as $menuval) {

+            print_start_menu_entry($menuval['idsel'], $menuval['classname'], $menuval['enabled']);

+            print_text_menu_entry($menuval['titre'], $menuval['enabled'], (($menuval['url'] != '#' && !preg_match('/^(http:\/\/|https:\/\/)/i', $menuval['url'])) ? DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));

+            print_end_menu_entry($menuval['enabled']);

+        }

+    }

@@ -593,5 +541,5 @@
-	if (empty($noout)) {

-		print_start_menu_entry('', 'class="tmenuend"', $showmode);

-		print_end_menu_entry($showmode);

-		print_end_menu_array();

-	}

+    if (empty($noout)) {

+        print_start_menu_entry('', 'class="tmenuend"', $showmode);

+        print_end_menu_entry($showmode);

+        print_end_menu_array();

+    }

@@ -610 +558 @@
-	global $conf;

+    global $conf;

@@ -613 +561 @@
-	print '<ul role="navigation" class="tmenu"'.(!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '' : ' title="Top menu"').'>';

+	print '<ul role="navigation" class="tmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Top menu"').'>';

@@ -626 +574,2 @@
-	if ($showmode) {

+	if ($showmode)

+	{

@@ -636,8 +585,7 @@
- * @param	string	$text			Text

- * @param	int		$showmode		0 = hide, 1 = allowed or 2 = not allowed

- * @param	string	$url			Url

- * @param	string	$id				Id

- * @param	string	$idsel			Id sel

- * @param	string	$classname		Class name

- * @param	string	$atarget		Target

- * @param	array	$menuval		All the $menuval array

+ * @param	string	$text		Text

+ * @param	int		$showmode	0 = hide, 1 = allowed or 2 = not allowed

+ * @param	string	$url		Url

+ * @param	string	$id			Id

+ * @param	string	$idsel		Id sel

+ * @param	string	$classname	Class name

+ * @param	string	$atarget	Target

@@ -646 +594 @@
-function print_text_menu_entry($text, $showmode, $url, $id, $idsel, $classname, $atarget, $menuval = array())

+function print_text_menu_entry($text, $showmode, $url, $id, $idsel, $classname, $atarget)

@@ -648,6 +596,2 @@
-	global $conf, $langs;

-

-	$classnameimg = str_replace('class="', 'class="tmenuimage ', $classname);

-	$classnametxt = str_replace('class="', 'class="tmenulabel ', $classname);

-

-	//$conf->global->THEME_TOPMENU_DISABLE_TEXT=1;

+	global $langs;

+

@@ -655,10 +599,2 @@
-		print '<a '.$classnameimg.' tabindex="-1" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').' title="'.dol_escape_htmltag($text).'">';

-		print '<div class="'.$id.' '.$idsel.' topmenuimage">';

-		if (!empty($menuval['prefix']) && strpos($menuval['prefix'], '<span') === 0) {

-			print $menuval['prefix'];

-		} elseif (!empty($menuval['prefix']) && strpos($menuval['prefix'], 'fa-') === 0) {

-			print '<span class="'.$id.' '.$menuval['prefix'].'" id="mainmenuspan_'.$idsel.'"></span>';

-		} else {

-			print '<span class="'.$id.' tmenuimageforpng" id="mainmenuspan_'.$idsel.'"></span>';

-		}

-		print '</div>';

+		print '<a class="tmenuimage" tabindex="-1" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').' title="'.dol_escape_htmltag($text).'">';

+		print '<div class="'.$id.' '.$idsel.' topmenuimage"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';

@@ -666,7 +602,5 @@
-		if (!getDolGlobalString('THEME_TOPMENU_DISABLE_TEXT')) {

-			print '<a '.$classnametxt.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').' title="'.dol_escape_htmltag($text).'">';

-			print '<span class="mainmenuaspan">';

-			print $text;

-			print '</span>';

-			print '</a>';

-		}

+		print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').' title="'.dol_escape_htmltag($text).'">';

+		print '<span class="mainmenuaspan">';

+		print $text;

+		print '</span>';

+		print '</a>';

@@ -674,16 +608,6 @@
-		print '<div '.$classnameimg.' title="'.dol_escape_htmltag($text.' - '.$langs->trans("NotAllowed")).'">';

-		print '<div class="'.$id.' '.$idsel.' topmenuimage tmenudisabled">';

-		if (!empty($menuval['prefix']) && strpos($menuval['prefix'], '<span') === 0) {

-			print $menuval['prefix'];

-		} else {

-			print '<span class="'.$id.' tmenuimageforpng tmenudisabled" id="mainmenuspan_'.$idsel.'"></span>';

-		}

-		print '</div>';

-		print '</div>';

-		if (!getDolGlobalString('THEME_TOPMENU_DISABLE_TEXT')) {

-			print '<span '.$classnametxt.' id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($text.' - '.$langs->trans("NotAllowed")).'">';

-			print '<span class="mainmenuaspan tmenudisabled">';

-			print $text;

-			print '</span>';

-			print '</span>';

-		}

+		print '<div class="'.$id.' '.$idsel.' topmenuimage tmenudisabled"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';

+		print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';

+		print '<span class="mainmenuaspan">';

+		print $text;

+		print '</span>';

+		print '</a>';

@@ -701 +625,2 @@
-	if ($showmode) {

+	if ($showmode)

+	{

@@ -717,0 +643,2 @@
+

+

@@ -732 +658,0 @@
- * @param 	int			$type_user     		0=Menu for backoffice, 1=Menu for front office

@@ -735 +661 @@
-function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabMenu, &$menu, $noout = 0, $forcemainmenu = '', $forceleftmenu = '', $moredata = null, $type_user = 0)

+function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabMenu, &$menu, $noout = 0, $forcemainmenu = '', $forceleftmenu = '', $moredata = null)

@@ -737 +663 @@
-	global $user, $conf, $langs, $hookmanager;

+	global $user, $conf, $langs, $dolibarr_main_db_name, $mysoc;

@@ -743,5 +669,13 @@
-	$mainmenu = ($forcemainmenu ? $forcemainmenu : $_SESSION["mainmenu"]??'');

-	$leftmenu = ($forceleftmenu ? '' : (empty($_SESSION["leftmenu"]) ? 'none' : $_SESSION["leftmenu"]??''));

-

-	if (is_null($mainmenu)) {

-		$mainmenu = 'home';

+	$mainmenu = ($forcemainmenu ? $forcemainmenu : $_SESSION["mainmenu"]);

+	$leftmenu = ($forceleftmenu ? '' : (empty($_SESSION["leftmenu"]) ? 'none' : $_SESSION["leftmenu"]));

+

+    $usemenuhider = 0;

+

+	if (is_array($moredata) && !empty($moredata['searchform']))	// searchform can contains select2 code or link to show old search form or link to switch on search page

+	{

+        print "\n";

+        print "<!-- Begin SearchForm -->\n";

+        print '<div id="blockvmenusearch" class="blockvmenusearch">'."\n";

+        print $moredata['searchform'];

+        print '</div>'."\n";

+        print "<!-- End SearchForm -->\n";

@@ -750,10 +684,8 @@
-	global $usemenuhider;

-	$usemenuhider = 0;

-

-	if (is_array($moredata) && !empty($moredata['searchform'])) {	// searchform can contains select2 code or link to show old search form or link to switch on search page

-		print "\n";

-		print "<!-- Begin SearchForm -->\n";

-		print '<div id="blockvmenusearch" class="blockvmenusearch">'."\n";

-		print $moredata['searchform'];

-		print '</div>'."\n";

-		print "<!-- End SearchForm -->\n";

+	if (is_array($moredata) && !empty($moredata['bookmarks']))

+	{

+	    print "\n";

+	    print "<!-- Begin Bookmarks -->\n";

+	    print '<div id="blockvmenubookmarks" class="blockvmenubookmarks">'."\n";

+	    print $moredata['bookmarks'];

+	    print '</div>'."\n";

+	    print "<!-- End Bookmarks -->\n";

@@ -762,9 +693,0 @@
-	if (is_array($moredata) && !empty($moredata['bookmarks'])) {

-		print "\n";

-		print "<!-- Begin Bookmarks -->\n";

-		print '<div id="blockvmenubookmarks" class="blockvmenubookmarks">'."\n";

-		print $moredata['bookmarks'];

-		print '</div>'."\n";

-		print "<!-- End Bookmarks -->\n";

-	}

-

@@ -772,2 +694,0 @@
-

-	$listofmodulesforexternal = explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL'));

@@ -779 +700,2 @@
-	if ($mainmenu) {	// If this is empty, loading hard coded menu and loading personalised menu will fail

+	if ($mainmenu)	// If this is empty, loading hard coded menu and loading personalised menu will fail

+	{

@@ -783,2 +705,99 @@
-		if ($mainmenu == 'home') {

-			get_left_menu_home($mainmenu, $newmenu, $usemenuhider, $leftmenu, $type_user);

+		if ($mainmenu == 'home')

+		{

+			$langs->load("users");

+

+			// Home - dashboard

+			$newmenu->add("/index.php?mainmenu=home&amp;leftmenu=home", $langs->trans("MyDashboard"), 0, 1, '', $mainmenu, 'home', 0, '', '', '', '<i class="fa fa-bar-chart fa-fw paddingright"></i>');

+

+			// Setup

+			$newmenu->add("/admin/index.php?mainmenu=home&amp;leftmenu=setup", $langs->trans("Setup"), 0, $user->admin, '', $mainmenu, 'setup', 0, '', '', '', '<i class="fa fa-wrench fa-fw paddingright"></i>');

+

+			if ($usemenuhider || empty($leftmenu) || $leftmenu == "setup")

+			{

+			    // Load translation files required by the page

+                $langs->loadLangs(array("admin", "help"));

+

+				$warnpicto = '';

+				if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY))

+				{

+					$langs->load("errors");

+					$warnpicto = ' '.img_warning($langs->trans("WarningMandatorySetupNotComplete"));

+				}

+				$newmenu->add("/admin/company.php?mainmenu=home", $langs->trans("MenuCompanySetup").$warnpicto, 1);

+				$warnpicto = '';

+				if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING) ? 1 : $conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING))	// If only user module enabled

+				{

+					$langs->load("errors");

+					$warnpicto = ' '.img_warning($langs->trans("WarningMandatorySetupNotComplete"));

+				}

+				$newmenu->add("/admin/modules.php?mainmenu=home", $langs->trans("Modules").$warnpicto, 1);

+				$newmenu->add("/admin/ihm.php?mainmenu=home", $langs->trans("GUISetup"), 1);

+				$newmenu->add("/admin/menus.php?mainmenu=home", $langs->trans("Menus"), 1);

+

+				$newmenu->add("/admin/translation.php?mainmenu=home", $langs->trans("Translation"), 1);

+				$newmenu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"), 1);

+				$newmenu->add("/admin/boxes.php?mainmenu=home", $langs->trans("Boxes"), 1);

+				$newmenu->add("/admin/delais.php?mainmenu=home", $langs->trans("MenuWarnings"), 1);

+				$newmenu->add("/admin/security_other.php?mainmenu=home", $langs->trans("Security"), 1);

+				$newmenu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"), 1);

+				$newmenu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"), 1);

+				$newmenu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails"), 1);

+				$newmenu->add("/admin/sms.php?mainmenu=home", $langs->trans("SMS"), 1);

+				$newmenu->add("/admin/dict.php?mainmenu=home", $langs->trans("Dictionary"), 1);

+				$newmenu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"), 1);

+			}

+

+			// System tools

+			$newmenu->add("/admin/tools/index.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("AdminTools"), 0, $user->admin, '', $mainmenu, 'admintools', 0, '', '', '', '<i class="fa fa-server fa-fw paddingright"></i>');

+			if ($usemenuhider || empty($leftmenu) || preg_match('/^admintools/', $leftmenu))

+			{

+			    // Load translation files required by the page

+                $langs->loadLangs(array('admin', 'help'));

+

+				$newmenu->add('/admin/system/dolibarr.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('InfoDolibarr'), 1);

+				if ($usemenuhider || empty($leftmenu) || $leftmenu == 'admintools_info') {

+                    $newmenu->add('/admin/system/modules.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('Modules'), 2);

+				    $newmenu->add('/admin/triggers.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('Triggers'), 2);

+                    $newmenu->add('/admin/system/filecheck.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('FileCheck'), 2);

+                }

+				$newmenu->add('/admin/system/browser.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoBrowser'), 1);

+				$newmenu->add('/admin/system/os.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoOS'), 1);

+				$newmenu->add('/admin/system/web.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoWebServer'), 1);

+				$newmenu->add('/admin/system/phpinfo.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoPHP'), 1);

+				//if (function_exists('xdebug_is_enabled')) $newmenu->add('/admin/system/xdebug.php', $langs->trans('XDebug'),1);

+				$newmenu->add('/admin/system/database.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoDatabase'), 1);

+				//$newmenu->add("/admin/system/perf.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("InfoPerf"),1);

+				$newmenu->add("/admin/tools/dolibarr_export.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Backup"), 1);

+				$newmenu->add("/admin/tools/dolibarr_import.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Restore"), 1);

+				$newmenu->add("/admin/tools/update.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("MenuUpgrade"), 1);

+				$newmenu->add("/admin/tools/purge.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Purge"), 1);

+				$newmenu->add("/admin/tools/listevents.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Audit"), 1);

+				$newmenu->add("/admin/tools/listsessions.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Sessions"), 1);

+				$newmenu->add('/admin/system/about.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('ExternalResources'), 1);

+

+				if (!empty($conf->product->enabled) || !empty($conf->service->enabled))

+				{

+					$langs->load("products");

+				    $newmenu->add("/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("ProductVatMassChange"), 1, $user->admin);

+				}

+			}

+

+			$newmenu->add("/user/home.php?leftmenu=users", $langs->trans("MenuUsersAndGroups"), 0, $user->rights->user->user->lire, '', $mainmenu, 'users', 0, '', '', '', '<i class="fa fa-users fa-fw paddingright"></i>');

+			if ($user->rights->user->user->lire)

+			{

+				if ($usemenuhider || empty($leftmenu) || $leftmenu == "users")

+				{

+					$newmenu->add("", $langs->trans("Users"), 1, $user->rights->user->user->lire || $user->admin);

+					$newmenu->add("/user/card.php?leftmenu=users&action=create", $langs->trans("NewUser"), 2, ($user->rights->user->user->creer || $user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE), '', 'home');

+					$newmenu->add("/user/list.php?leftmenu=users", $langs->trans("ListOfUsers"), 2, $user->rights->user->user->lire || $user->admin);

+					$newmenu->add("/user/hierarchy.php?leftmenu=users", $langs->trans("HierarchicView"), 2, $user->rights->user->user->lire || $user->admin);

+					if (!empty($conf->categorie->enabled))

+					{

+						$langs->load("categories");

+						$newmenu->add("/categories/index.php?leftmenu=users&type=7", $langs->trans("UsersCategoriesShort"), 2, $user->rights->categorie->lire, '', $mainmenu, 'cat');

+					}

+					$newmenu->add("", $langs->trans("Groups"), 1, ($user->rights->user->user->lire || $user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));

+					$newmenu->add("/user/group/card.php?leftmenu=users&action=create", $langs->trans("NewGroup"), 2, (($conf->global->MAIN_USE_ADVANCED_PERMS ? $user->rights->user->group_advance->write : $user->rights->user->user->creer) || $user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));

+					$newmenu->add("/user/group/list.php?leftmenu=users", $langs->trans("ListOfGroups"), 2, (($conf->global->MAIN_USE_ADVANCED_PERMS ? $user->rights->user->group_advance->read : $user->rights->user->user->lire) || $user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));

+				}

+			}

@@ -785,0 +805 @@
+

@@ -790,2 +810,87 @@
-		if ($mainmenu == 'companies') {

-			get_left_menu_thridparties($mainmenu, $newmenu, $usemenuhider, $leftmenu, $type_user);

+		if ($mainmenu == 'companies')

+		{

+			// Societes

+			if (!empty($conf->societe->enabled))

+			{

+				$langs->load("companies");

+				$newmenu->add("/societe/index.php?leftmenu=thirdparties", $langs->trans("ThirdParty"), 0, $user->rights->societe->lire, '', $mainmenu, 'thirdparties');

+

+				if ($user->rights->societe->creer)

+				{

+					$newmenu->add("/societe/card.php?action=create", $langs->trans("MenuNewThirdParty"), 1);

+					if (!$conf->use_javascript_ajax) $newmenu->add("/societe/card.php?action=create&amp;private=1", $langs->trans("MenuNewPrivateIndividual"), 1);

+				}

+			}

+

+			$newmenu->add("/societe/list.php?leftmenu=thirdparties", $langs->trans("List"), 1);

+

+			// Prospects

+			if (!empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))

+			{

+				$langs->load("commercial");

+				$newmenu->add("/societe/list.php?type=p&amp;leftmenu=prospects", $langs->trans("ListProspectsShort"), 1, $user->rights->societe->lire, '', $mainmenu, 'prospects');

+				/* no more required, there is a filter that can do more

+				if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=-1", $langs->trans("LastProspectDoNotContact"), 2, $user->rights->societe->lire);

+				if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=0", $langs->trans("LastProspectNeverContacted"), 2, $user->rights->societe->lire);

+				if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=1", $langs->trans("LastProspectToContact"), 2, $user->rights->societe->lire);

+				if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=2", $langs->trans("LastProspectContactInProcess"), 2, $user->rights->societe->lire);

+				if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=3", $langs->trans("LastProspectContactDone"), 2, $user->rights->societe->lire);

+				*/

+				$newmenu->add("/societe/card.php?leftmenu=prospects&amp;action=create&amp;type=p", $langs->trans("MenuNewProspect"), 2, $user->rights->societe->creer);

+				//$newmenu->add("/contact/list.php?leftmenu=customers&amp;type=p", $langs->trans("Contacts"), 2, $user->rights->societe->contact->lire);

+			}

+

+			// Customers/Prospects

+			if (!empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))

+			{

+				$langs->load("commercial");

+				$newmenu->add("/societe/list.php?type=c&amp;leftmenu=customers", $langs->trans("ListCustomersShort"), 1, $user->rights->societe->lire, '', $mainmenu, 'customers');

+

+				$newmenu->add("/societe/card.php?leftmenu=customers&amp;action=create&amp;type=c", $langs->trans("MenuNewCustomer"), 2, $user->rights->societe->creer);

+				//$newmenu->add("/contact/list.php?leftmenu=customers&amp;type=c", $langs->trans("Contacts"), 2, $user->rights->societe->contact->lire);

+			}

+

+			// Suppliers

+			if (!empty($conf->societe->enabled) && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) || !empty($conf->supplier_proposal->enabled)))

+			{

+				$langs->load("suppliers");

+				$newmenu->add("/societe/list.php?type=f&amp;leftmenu=suppliers", $langs->trans("ListSuppliersShort"), 1, ($user->rights->fournisseur->lire || $user->rights->supplier_proposal->lire), '', $mainmenu, 'suppliers');

+				$newmenu->add("/societe/card.php?leftmenu=suppliers&amp;action=create&amp;type=f", $langs->trans("MenuNewSupplier"), 2, $user->rights->societe->creer && ($user->rights->fournisseur->lire || $user->rights->supplier_proposal->lire));

+			}

+

+			// Categories

+			if (!empty($conf->categorie->enabled))

+			{

+				$langs->load("categories");

+				if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))

+				{

+					// Categories prospects/customers

+					$menutoshow = $langs->trans("CustomersProspectsCategoriesShort");

+					if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) $menutoshow = $langs->trans("CustomersCategoriesShort");

+					if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $menutoshow = $langs->trans("ProspectsCategoriesShort");

+					$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=2", $menutoshow, 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

+				}

+				// Categories suppliers

+				if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))

+				{

+					$newmenu->add("/categories/index.php?leftmenu=catfournish&amp;type=1", $langs->trans("SuppliersCategoriesShort"), 1, $user->rights->categorie->lire);

+				}

+			}

+

+			// Contacts

+			$newmenu->add("/societe/index.php?leftmenu=thirdparties", (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses")), 0, $user->rights->societe->contact->lire, '', $mainmenu, 'contacts');

+			$newmenu->add("/contact/card.php?leftmenu=contacts&amp;action=create", (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("NewContact") : $langs->trans("NewContactAddress")), 1, $user->rights->societe->contact->creer);

+			$newmenu->add("/contact/list.php?leftmenu=contacts", $langs->trans("List"), 1, $user->rights->societe->contact->lire);

+			if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) $newmenu->add("/contact/list.php?leftmenu=contacts&type=p", $langs->trans("Prospects"), 2, $user->rights->societe->contact->lire);

+			if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $newmenu->add("/contact/list.php?leftmenu=contacts&type=c", $langs->trans("Customers"), 2, $user->rights->societe->contact->lire);

+			if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) $newmenu->add("/contact/list.php?leftmenu=contacts&type=f", $langs->trans("Suppliers"), 2, $user->rights->societe->contact->lire);

+			$newmenu->add("/contact/list.php?leftmenu=contacts&type=o", $langs->trans("ContactOthers"), 2, $user->rights->societe->contact->lire);

+			//$newmenu->add("/contact/list.php?userid=$user->id", $langs->trans("MyContacts"), 1, $user->rights->societe->contact->lire);

+

+			// Categories

+			if (!empty($conf->categorie->enabled))

+			{

+				$langs->load("categories");

+				// Categories Contact

+				$newmenu->add("/categories/index.php?leftmenu=catcontact&amp;type=4", $langs->trans("ContactCategoriesShort"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

+			}

@@ -795 +900 @@
-		 * Menu COMMERCIAL (propal, commande, supplier_proposal, supplier_order, contrat, ficheinter)

+		 * Menu COMMERCIAL

@@ -797,2 +902,100 @@
-		if ($mainmenu == 'commercial') {

-			get_left_menu_commercial($mainmenu, $newmenu, $usemenuhider, $leftmenu, $type_user);

+		if ($mainmenu == 'commercial')

+		{

+			$langs->load("companies");

+

+			// Customer proposal

+			if (!empty($conf->propal->enabled))

+			{

+				$langs->load("propal");

+				$newmenu->add("/comm/propal/index.php?leftmenu=propals", $langs->trans("Proposals"), 0, $user->rights->propale->lire, '', $mainmenu, 'propals', 100);

+				$newmenu->add("/comm/propal/card.php?action=create&amp;leftmenu=propals", $langs->trans("NewPropal"), 1, $user->rights->propale->creer);

+				$newmenu->add("/comm/propal/list.php?leftmenu=propals", $langs->trans("List"), 1, $user->rights->propale->lire);

+				if ($usemenuhider || empty($leftmenu) || $leftmenu == "propals") {

+                    $newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=0", $langs->trans("PropalsDraft"), 2, $user->rights->propale->lire);

+				    $newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=1", $langs->trans("PropalsOpened"), 2, $user->rights->propale->lire);

+				    $newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=2", $langs->trans("PropalStatusSigned"), 2, $user->rights->propale->lire);

+				    $newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=3", $langs->trans("PropalStatusNotSigned"), 2, $user->rights->propale->lire);

+				    $newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=4", $langs->trans("PropalStatusBilled"), 2, $user->rights->propale->lire);

+                    //$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=2,3,4", $langs->trans("PropalStatusClosedShort"), 2, $user->rights->propale->lire);

+                }

+				$newmenu->add("/comm/propal/stats/index.php?leftmenu=propals", $langs->trans("Statistics"), 1, $user->rights->propale->lire);

+			}

+

+            // Customers orders

+            if (!empty($conf->commande->enabled))

+            {

+                $langs->load("orders");

+                $newmenu->add("/commande/index.php?leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders', 200);

+                $newmenu->add("/commande/card.php?action=create&amp;leftmenu=orders", $langs->trans("NewOrder"), 1, $user->rights->commande->creer);

+                $newmenu->add("/commande/list.php?leftmenu=orders", $langs->trans("List"), 1, $user->rights->commande->lire);

+                if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders") {

+                    $newmenu->add("/commande/list.php?leftmenu=orders&search_status=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire);

+                    $newmenu->add("/commande/list.php?leftmenu=orders&search_status=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->commande->lire);

+                    if (!empty($conf->expedition->enabled)) $newmenu->add("/commande/list.php?leftmenu=orders&search_status=2", $langs->trans("StatusOrderSentShort"), 2, $user->rights->commande->lire);

+                    $newmenu->add("/commande/list.php?leftmenu=orders&search_status=3", $langs->trans("StatusOrderDelivered"), 2, $user->rights->commande->lire);

+                    //$newmenu->add("/commande/list.php?leftmenu=orders&search_status=4", $langs->trans("StatusOrderProcessed"), 2, $user->rights->commande->lire);

+                    $newmenu->add("/commande/list.php?leftmenu=orders&search_status=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->rights->commande->lire);

+                }

+                $newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->rights->commande->lire);

+            }

+

+			// Supplier proposal

+			if (!empty($conf->supplier_proposal->enabled))

+			{

+				$langs->load("supplier_proposal");

+				$newmenu->add("/supplier_proposal/index.php?leftmenu=propals_supplier", $langs->trans("SupplierProposalsShort"), 0, $user->rights->supplier_proposal->lire, '', $mainmenu, 'propals_supplier', 300);

+				$newmenu->add("/supplier_proposal/card.php?action=create&amp;leftmenu=supplier_proposals", $langs->trans("SupplierProposalNew"), 1, $user->rights->supplier_proposal->creer);

+				$newmenu->add("/supplier_proposal/list.php?leftmenu=supplier_proposals", $langs->trans("List"), 1, $user->rights->supplier_proposal->lire);

+				$newmenu->add("/comm/propal/stats/index.php?leftmenu=supplier_proposals&amp;mode=supplier", $langs->trans("Statistics"), 1, $user->rights->supplier_proposal->lire);

+			}

+

+			// Suppliers orders

+            if (!empty($conf->supplier_order->enabled))

+			{

+				$langs->load("orders");

+				$newmenu->add("/fourn/commande/index.php?leftmenu=orders_suppliers", $langs->trans("SuppliersOrders"), 0, $user->rights->fournisseur->commande->lire, '', $mainmenu, 'orders_suppliers', 400);

+				$newmenu->add("/fourn/commande/card.php?action=create&amp;leftmenu=orders_suppliers", $langs->trans("NewOrder"), 1, $user->rights->fournisseur->commande->creer);

+				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers", $langs->trans("List"), 1, $user->rights->fournisseur->commande->lire);

+

+				if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders_suppliers") {

+                    $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=0", $langs->trans("StatusSupplierOrderDraftShort"), 2, $user->rights->fournisseur->commande->lire);

+                    if (empty($conf->global->SUPPLIER_ORDER_HIDE_VALIDATED)) $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=1", $langs->trans("StatusSupplierOrderValidated"), 2, $user->rights->fournisseur->commande->lire);

+                    $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=2", $langs->trans("StatusSupplierOrderApprovedShort"), 2, $user->rights->fournisseur->commande->lire);

+                    $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=3", $langs->trans("StatusSupplierOrderOnProcessShort"), 2, $user->rights->fournisseur->commande->lire);

+                    $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=4", $langs->trans("StatusSupplierOrderReceivedPartiallyShort"), 2, $user->rights->fournisseur->commande->lire);

+                    $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=5", $langs->trans("StatusSupplierOrderReceivedAll"), 2, $user->rights->fournisseur->commande->lire);

+                    $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=6,7", $langs->trans("StatusSupplierOrderCanceled"), 2, $user->rights->fournisseur->commande->lire);

+                    $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=9", $langs->trans("StatusSupplierOrderRefused"), 2, $user->rights->fournisseur->commande->lire);

+                }

+                // Billed is another field. We should add instead a dedicated filter on list. if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&billed=1", $langs->trans("Billed"), 2, $user->rights->fournisseur->commande->lire);

+

+

+				$newmenu->add("/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier", $langs->trans("Statistics"), 1, $user->rights->fournisseur->commande->lire);

+			}

+

+			// Contrat

+			if (!empty($conf->contrat->enabled))

+			{

+				$langs->load("contracts");

+				$newmenu->add("/contrat/index.php?leftmenu=contracts", $langs->trans("ContractsSubscriptions"), 0, $user->rights->contrat->lire, '', $mainmenu, 'contracts', 2000);

+				$newmenu->add("/contrat/card.php?action=create&amp;leftmenu=contracts", $langs->trans("NewContractSubscription"), 1, $user->rights->contrat->creer);

+				$newmenu->add("/contrat/list.php?leftmenu=contracts", $langs->trans("List"), 1, $user->rights->contrat->lire);

+				$newmenu->add("/contrat/services_list.php?leftmenu=contracts", $langs->trans("MenuServices"), 1, $user->rights->contrat->lire);

+				if ($usemenuhider || empty($leftmenu) || $leftmenu == "contracts") {

+                    $newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=0", $langs->trans("MenuInactiveServices"), 2, $user->rights->contrat->lire);

+				    $newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=4", $langs->trans("MenuRunningServices"), 2, $user->rights->contrat->lire);

+				    $newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=4&amp;filter=expired", $langs->trans("MenuExpiredServices"), 2, $user->rights->contrat->lire);

+                    $newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=5", $langs->trans("MenuClosedServices"), 2, $user->rights->contrat->lire);

+                }

+			}

+

+			// Interventions

+			if (!empty($conf->ficheinter->enabled))

+			{

+				$langs->load("interventions");

+				$newmenu->add("/fichinter/index.php?leftmenu=ficheinter", $langs->trans("Interventions"), 0, $user->rights->ficheinter->lire, '', $mainmenu, 'ficheinter', 2200);

+				$newmenu->add("/fichinter/card.php?action=create&amp;leftmenu=ficheinter", $langs->trans("NewIntervention"), 1, $user->rights->ficheinter->creer, '', '', '', 201);

+				$newmenu->add("/fichinter/list.php?leftmenu=ficheinter", $langs->trans("List"), 1, $user->rights->ficheinter->lire, '', '', '', 202);

+				if ($conf->global->MAIN_FEATURES_LEVEL >= 2) $newmenu->add("/fichinter/card-rec.php?leftmenu=ficheinter", $langs->trans("ListOfTemplates"), 1, $user->rights->ficheinter->lire, '', '', '', 203);

+				$newmenu->add("/fichinter/stats/index.php?leftmenu=ficheinter", $langs->trans("Statistics"), 1, $user->rights->ficheinter->lire);

+			}

@@ -799,0 +1003 @@
+

@@ -804,2 +1008,176 @@
-		if ($mainmenu == 'billing') {

-			get_left_menu_billing($mainmenu, $newmenu, $usemenuhider, $leftmenu, $type_user);

+		if ($mainmenu == 'billing')

+		{

+			$langs->load("companies");

+

+			// Customers invoices

+			if (!empty($conf->facture->enabled))

+			{

+				$langs->load("bills");

+				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills", $langs->trans("BillsCustomers"), 0, $user->rights->facture->lire, '', $mainmenu, 'customers_bills');

+				$newmenu->add("/compta/facture/card.php?action=create", $langs->trans("NewBill"), 1, $user->rights->facture->creer);

+				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills", $langs->trans("List"), 1, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_list');

+

+				if ($usemenuhider || empty($leftmenu) || preg_match('/customers_bills(|_draft|_notpaid|_paid|_canceled)$/', $leftmenu))

+				{

+					$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_draft&amp;search_status=0", $langs->trans("BillShortStatusDraft"), 2, $user->rights->facture->lire);

+					$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_notpaid&amp;search_status=1", $langs->trans("BillShortStatusNotPaid"), 2, $user->rights->facture->lire);

+					$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_paid&amp;search_status=2", $langs->trans("BillShortStatusPaid"), 2, $user->rights->facture->lire);

+					$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_canceled&amp;search_status=3", $langs->trans("BillShortStatusCanceled"), 2, $user->rights->facture->lire);

+				}

+				$newmenu->add("/compta/facture/invoicetemplate_list.php?leftmenu=customers_bills_templates", $langs->trans("ListOfTemplates"), 1, $user->rights->facture->creer, '', $mainmenu, 'customers_bills_templates'); // No need to see recurring invoices, if user has no permission to create invoice.

+

+				$newmenu->add("/compta/paiement/list.php?leftmenu=customers_bills_payment", $langs->trans("Payments"), 1, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_payment');

+

+				if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))

+				{

+					$newmenu->add("/compta/paiement/tovalidate.php?leftmenu=customers_bills_tovalid", $langs->trans("MenuToValid"), 2, $user->rights->facture->lire, '', $mainmenu, 'customer_bills_tovalid');

+				}

+				$newmenu->add("/compta/paiement/rapport.php?leftmenu=customers_bills_reports", $langs->trans("Reportings"), 2, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_reports');

+

+				$newmenu->add("/compta/facture/stats/index.php?leftmenu=customers_bills_stats", $langs->trans("Statistics"), 1, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_stats');

+			}

+

+			// Suppliers invoices

+			if (!empty($conf->societe->enabled) && !empty($conf->supplier_invoice->enabled))

+			{

+				$langs->load("bills");

+				$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", $langs->trans("BillsSuppliers"), 0, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills');

+				$newmenu->add("/fourn/facture/card.php?leftmenu=suppliers_bills&amp;action=create", $langs->trans("NewBill"), 1, $user->rights->fournisseur->facture->creer, '', $mainmenu, 'suppliers_bills_create');

+				$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", $langs->trans("List"), 1, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_list');

+

+				if ($usemenuhider || empty($leftmenu) || preg_match('/suppliers_bills/', $leftmenu)) {

+					$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_draft&amp;search_status=0", $langs->trans("BillShortStatusDraft"), 2, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_draft');

+					$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_notpaid&amp;search_status=1", $langs->trans("BillShortStatusNotPaid"), 2, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_notpaid');

+					$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_paid&amp;search_status=2", $langs->trans("BillShortStatusPaid"), 2, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_paid');

+				}

+

+				$newmenu->add("/fourn/facture/paiement.php?leftmenu=suppliers_bills_payment", $langs->trans("Payments"), 1, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_payment');

+

+				$newmenu->add("/fourn/facture/rapport.php?leftmenu=suppliers_bills_report", $langs->trans("Reportings"), 2, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_report');

+

+				$newmenu->add("/compta/facture/stats/index.php?mode=supplier&amp;leftmenu=suppliers_bills_stats", $langs->trans("Statistics"), 1, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_stats');

+			}

+

+			// Orders

+			if (!empty($conf->commande->enabled))

+			{

+				$langs->load("orders");

+				if (!empty($conf->facture->enabled)) $newmenu->add("/commande/list.php?leftmenu=orders&amp;search_status=-3&amp;billed=0&amp;contextpage=billableorders", $langs->trans("MenuOrdersToBill2"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');

+				//if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire);

+			}

+

+			// Supplier Orders to bill

+			if (!empty($conf->supplier_invoice->enabled))

+			{

+				if (!empty($conf->global->SUPPLIER_MENU_ORDER_RECEIVED_INTO_INVOICE))

+				{

+					$langs->load("supplier");

+					$newmenu->add("/fourn/commande/list.php?leftmenu=orders&amp;search_status=5&amp;billed=0", $langs->trans("MenuOrdersSupplierToBill"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');

+					//if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire);

+				}

+			}

+

+

+			// Donations

+			if (!empty($conf->don->enabled))

+			{

+				$langs->load("donations");

+				$newmenu->add("/don/index.php?leftmenu=donations&amp;mainmenu=billing", $langs->trans("Donations"), 0, $user->rights->don->lire, '', $mainmenu, 'donations');

+				if ($usemenuhider || empty($leftmenu) || $leftmenu == "donations") {

+                    $newmenu->add("/don/card.php?leftmenu=donations&amp;action=create", $langs->trans("NewDonation"), 1, $user->rights->don->creer);

+                    $newmenu->add("/don/list.php?leftmenu=donations", $langs->trans("List"), 1, $user->rights->don->lire);

+                }

+				// if ($leftmenu=="donations") $newmenu->add("/don/stats/index.php",$langs->trans("Statistics"), 1, $user->rights->don->lire);

+			}

+

+			// Taxes and social contributions

+			if (!empty($conf->tax->enabled) || !empty($conf->salaries->enabled) || !empty($conf->loan->enabled) || !empty($conf->banque->enabled))

+			{

+				global $mysoc;

+

+				$permtoshowmenu = ((!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) || (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read)) || (!empty($conf->loan->enabled) && $user->rights->loan->read) || (!empty($conf->banque->enabled) && $user->rights->banque->lire));

+				$newmenu->add("/compta/charges/index.php?leftmenu=tax&amp;mainmenu=billing", $langs->trans("MenuTaxesAndSpecialExpenses"), 0, $permtoshowmenu, '', $mainmenu, 'tax');

+

+				// Social contributions

+				if (!empty($conf->tax->enabled))

+				{

+					$newmenu->add("/compta/sociales/list.php?leftmenu=tax_social", $langs->trans("MenuSocialContributions"), 1, $user->rights->tax->charges->lire);

+					if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_social/i', $leftmenu)) {

+                        $newmenu->add("/compta/sociales/card.php?leftmenu=tax_social&action=create", $langs->trans("MenuNewSocialContribution"), 2, $user->rights->tax->charges->creer);

+					    $newmenu->add("/compta/sociales/list.php?leftmenu=tax_social", $langs->trans("List"), 2, $user->rights->tax->charges->lire);

+                        $newmenu->add("/compta/sociales/payments.php?leftmenu=tax_social&amp;mainmenu=billing&amp;mode=sconly", $langs->trans("Payments"), 2, $user->rights->tax->charges->lire);

+                    }

+					// VAT

+					if (empty($conf->global->TAX_DISABLE_VAT_MENUS))

+					{

+						$newmenu->add("/compta/tva/list.php?leftmenu=tax_vat&amp;mainmenu=billing", $langs->transcountry("VAT", $mysoc->country_code), 1, $user->rights->tax->charges->lire, '', $mainmenu, 'tax_vat');

+						if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_vat/i', $leftmenu)) {

+                            $newmenu->add("/compta/tva/card.php?leftmenu=tax_vat&action=create", $langs->trans("New"), 2, $user->rights->tax->charges->creer);

+						    $newmenu->add("/compta/tva/list.php?leftmenu=tax_vat", $langs->trans("List"), 2, $user->rights->tax->charges->lire);

+						    $newmenu->add("/compta/tva/index.php?leftmenu=tax_vat", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);

+						    $newmenu->add("/compta/tva/clients.php?leftmenu=tax_vat", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);

+                            $newmenu->add("/compta/tva/quadri_detail.php?leftmenu=tax_vat", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);

+                        }

+						global $mysoc;

+

+						//Local Taxes 1

+						if ($mysoc->useLocalTax(1) && (isset($mysoc->localtax1_assuj) && $mysoc->localtax1_assuj == "1"))

+						{

+							$newmenu->add("/compta/localtax/list.php?leftmenu=tax_1_vat&amp;mainmenu=billing&amp;localTaxType=1", $langs->transcountry("LT1", $mysoc->country_code), 1, $user->rights->tax->charges->lire);

+							if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_1_vat/i', $leftmenu)) {

+                                $newmenu->add("/compta/localtax/card.php?leftmenu=tax_1_vat&action=create&amp;localTaxType=1", $langs->trans("New"), 2, $user->rights->tax->charges->creer);

+							    $newmenu->add("/compta/localtax/list.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("List"), 2, $user->rights->tax->charges->lire);

+							    $newmenu->add("/compta/localtax/index.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);

+							    $newmenu->add("/compta/localtax/clients.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);

+                                $newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);

+                            }

+						}

+						//Local Taxes 2

+						if ($mysoc->useLocalTax(2) && (isset($mysoc->localtax2_assuj) && $mysoc->localtax2_assuj == "1"))

+						{

+							$newmenu->add("/compta/localtax/list.php?leftmenu=tax_2_vat&amp;mainmenu=billing&amp;localTaxType=2", $langs->transcountry("LT2", $mysoc->country_code), 1, $user->rights->tax->charges->lire);

+							if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_2_vat/i', $leftmenu)) {

+                                $newmenu->add("/compta/localtax/card.php?leftmenu=tax_2_vat&action=create&amp;localTaxType=2", $langs->trans("New"), 2, $user->rights->tax->charges->creer);

+							    $newmenu->add("/compta/localtax/list.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("List"), 2, $user->rights->tax->charges->lire);

+							    $newmenu->add("/compta/localtax/index.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);

+							    $newmenu->add("/compta/localtax/clients.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);

+                                $newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);

+                            }

+						}

+					}

+				}

+

+				// Salaries

+				if (!empty($conf->salaries->enabled))

+				{

+					$langs->load("salaries");

+					$newmenu->add("/salaries/list.php?leftmenu=tax_salary&amp;mainmenu=billing", $langs->trans("Salaries"), 0, $user->rights->salaries->read, '', $mainmenu, 'tax_salary');

+					if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_salary/i', $leftmenu)) {

+                        $newmenu->add("/salaries/card.php?leftmenu=tax_salary&action=create", $langs->trans("NewPayment"), 1, $user->rights->salaries->write);

+					    $newmenu->add("/salaries/list.php?leftmenu=tax_salary", $langs->trans("Payments"), 1, $user->rights->salaries->read);

+                        $newmenu->add("/salaries/stats/index.php?leftmenu=tax_salary", $langs->trans("Statistics"), 1, $user->rights->salaries->read);

+                    }

+				}

+

+				// Loan

+				if (!empty($conf->loan->enabled))

+				{

+					$langs->load("loan");

+					$newmenu->add("/loan/list.php?leftmenu=tax_loan&amp;mainmenu=billing", $langs->trans("Loans"), 0, $user->rights->loan->read, '', $mainmenu, 'tax_loan');

+					if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_loan/i', $leftmenu)) {

+                        $newmenu->add("/loan/card.php?leftmenu=tax_loan&action=create", $langs->trans("NewLoan"), 1, $user->rights->loan->write);

+                        //$newmenu->add("/loan/payment/list.php?leftmenu=tax_loan",$langs->trans("Payments"),2,$user->rights->loan->read);

+                    }

+				}

+

+				// Various payment

+				if (!empty($conf->banque->enabled) && empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT))

+				{

+					$langs->load("banks");

+					$newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various&amp;mainmenu=billing", $langs->trans("MenuVariousPayment"), 0, $user->rights->banque->lire, '', $mainmenu, 'tax_various');

+					if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_various/i', $leftmenu)) {

+                        $newmenu->add("/compta/bank/various_payment/card.php?leftmenu=tax_various&action=create", $langs->trans("New"), 1, $user->rights->banque->modifier);

+                        $newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various", $langs->trans("List"), 1, $user->rights->banque->lire);

+                    }

+				}

+			}

@@ -811,2 +1189,271 @@
-		if ($mainmenu == 'accountancy') {

-			get_left_menu_accountancy($mainmenu, $newmenu, $usemenuhider, $leftmenu, $type_user);

+		if ($mainmenu == 'accountancy')

+		{

+			$langs->load("companies");

+

+			// Accounting (Double entries)

+			if (!empty($conf->accounting->enabled))

+			{

+				$permtoshowmenu = (!empty($conf->accounting->enabled) || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire);

+				//$newmenu->add("/accountancy/index.php?leftmenu=accountancy", $langs->trans("MenuAccountancy"), 0, $permtoshowmenu, '', $mainmenu, 'accountancy');

+

+				// Configuration

+				$newmenu->add("/accountancy/index.php?leftmenu=accountancy_admin", $langs->trans("Setup"), 0, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin', 1);

+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/', $leftmenu)) {

+					$newmenu->add("/accountancy/admin/index.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("General"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_general', 10);

+

+					// Fiscal year - Not really yet used. In a future will lock some periods.

+					if ($conf->global->MAIN_FEATURES_LEVEL > 1) {

+						$newmenu->add("/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("FiscalPeriod"), 1, $user->rights->accounting->fiscalyear->write, '', $mainmenu, 'fiscalyear', 20);

+					}

+

+					$newmenu->add("/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingJournals"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_journal', 30);

+					$newmenu->add("/accountancy/admin/accountmodel.php?id=31&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Pcg_version"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chartmodel', 40);

+					$newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 41);

+					$newmenu->add("/accountancy/admin/categories_list.php?id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 50);

+					$newmenu->add("/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuDefaultAccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 60);

+					if (!empty($conf->banque->enabled)) {

+						$newmenu->add("/compta/bank/list.php?mainmenu=accountancy&leftmenu=accountancy_admin&search_status=-1", $langs->trans("MenuBankAccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_bank', 70);

+					}

+					if (!empty($conf->facture->enabled) || (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled))) {

+						$newmenu->add("/admin/dict.php?id=10&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuVatAccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 80);

+					}

+					if (!empty($conf->tax->enabled)) {

+						$newmenu->add("/admin/dict.php?id=7&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuTaxAccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 90);

+					}

+					if (!empty($conf->expensereport->enabled)) {

+						$newmenu->add("/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuExpenseReportAccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 100);

+					}

+					$newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuProductsAccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_product', 110);

+					if ($conf->global->MAIN_FEATURES_LEVEL > 1) {

+						$newmenu->add("/accountancy/admin/closure.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuClosureAccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_closure', 120);

+					}

+					$newmenu->add("/accountancy/admin/export.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ExportOptions"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_export', 130);

+				}

+

+                // Transfer in accounting

+                $newmenu->add("/accountancy/index.php?leftmenu=accountancy_transfer", $langs->trans("TransferInAccounting"), 0, $user->rights->accounting->bind->write, '', $mainmenu, 'transfer', 1);

+

+                // Binding

+                // $newmenu->add("", $langs->trans("Binding"), 0, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch');

+                if (!empty($conf->facture->enabled))

+                {

+                	$newmenu->add("/accountancy/customer/index.php?leftmenu=accountancy_dispatch_customer&amp;mainmenu=accountancy", $langs->trans("CustomersVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_customer');

+                	if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_customer/', $leftmenu)) {

+                		$newmenu->add("/accountancy/customer/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);

+                		$newmenu->add("/accountancy/customer/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);

+                	}

+                }

+                if (!empty($conf->supplier_invoice->enabled))

+                {

+                	$newmenu->add("/accountancy/supplier/index.php?leftmenu=accountancy_dispatch_supplier&amp;mainmenu=accountancy", $langs->trans("SuppliersVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_supplier');

+                	if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_supplier/', $leftmenu)) {

+                		$newmenu->add("/accountancy/supplier/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);

+                		$newmenu->add("/accountancy/supplier/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);

+                	}

+                }

+                if (!empty($conf->expensereport->enabled))

+                {

+                	$newmenu->add("/accountancy/expensereport/index.php?leftmenu=accountancy_dispatch_expensereport&amp;mainmenu=accountancy", $langs->trans("ExpenseReportsVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_expensereport');

+                	if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_expensereport/', $leftmenu)) {

+                		$newmenu->add("/accountancy/expensereport/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);

+                		$newmenu->add("/accountancy/expensereport/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);

+                	}

+                }

+

+				// Journals

+				if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy')

+				{

+					$newmenu->add('', $langs->trans("RegistrationInAccounting"), 1, $user->rights->accounting->comptarapport->lire);

+

+					// Multi journal

+					$sql = "SELECT rowid, code, label, nature";

+					$sql .= " FROM ".MAIN_DB_PREFIX."accounting_journal";

+					$sql .= " WHERE entity = ".$conf->entity;

+					$sql .= " AND active = 1";

+					$sql .= " ORDER BY label DESC";

+

+					$resql = $db->query($sql);

+					if ($resql)

+					{

+						$numr = $db->num_rows($resql);

+						$i = 0;

+

+						if ($numr > 0)

+						{

+							while ($i < $numr)

+							{

+								$objp = $db->fetch_object($resql);

+

+								$nature = '';

+

+								// Must match array $sourceList defined into journals_list.php

+								if ($objp->nature == 2 && !empty($conf->facture->enabled)) $nature = "sells";

+								if ($objp->nature == 3 && (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled))) $nature = "purchases";

+								if ($objp->nature == 4 && !empty($conf->banque->enabled)) $nature = "bank";

+								if ($objp->nature == 5 && !empty($conf->expensereport->enabled)) $nature = "expensereports";

+								if ($objp->nature == 1) $nature = "various";

+								if ($objp->nature == 8) $nature = "inventory";

+								if ($objp->nature == 9) $nature = "hasnew";

+

+								// To enable when page exists

+								if (empty($conf->global->ACCOUNTANCY_SHOW_DEVELOP_JOURNAL))

+								{

+									if ($nature == 'various' || $nature == 'hasnew' || $nature == 'inventory') $nature = '';

+								}

+

+								if ($nature)

+								{

+									$langs->load('accountancy');

+									$journallabel = $langs->transnoentities($objp->label); // Labels in this table are set by loading llx_accounting_abc.sql. Label can be 'ACCOUNTING_SELL_JOURNAL', 'InventoryJournal', ...

+									$newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $journallabel, 2, $user->rights->accounting->comptarapport->lire);

+								}

+								$i++;

+							}

+						}

+						else

+						{

+							// Should not happend. Entries are added

+							$newmenu->add('', $langs->trans("NoJournalDefined"), 2, $user->rights->accounting->comptarapport->lire);

+						}

+					}

+					else dol_print_error($db);

+					$db->free($resql);

+				}

+

+                // Accounting

+                $newmenu->add("/accountancy/index.php?leftmenu=accountancy_accountancy", $langs->trans("MenuAccountancy"), 0, $user->rights->accounting->mouvements->lire, '', $mainmenu, 'accountancy', 1);

+

+

+                // General Ledger

+				$newmenu->add("/accountancy/bookkeeping/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("Bookkeeping"), 1, $user->rights->accounting->mouvements->lire);

+

+				// Balance

+				$newmenu->add("/accountancy/bookkeeping/balance.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("AccountBalance"), 1, $user->rights->accounting->mouvements->lire);

+

+                // Closure

+                if (!empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2) {

+                    $newmenu->add("/accountancy/closure/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_closure", $langs->trans("MenuAccountancyClosure"), 1, $user->rights->accounting->fiscalyear->write, '', $mainmenu, 'closure');

+

+                    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_closure/', $leftmenu)) {

+                        $newmenu->add("/accountancy/closure/validate.php?leftmenu=accountancy_closure", $langs->trans("MenuAccountancyValidationMovements"), 2, $user->rights->accounting->fiscalyear->write);

+                    }

+                }

+

+				// Files

+				if (empty($conf->global->ACCOUNTANCY_HIDE_EXPORT_FILES_MENU))

+				{

+					$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 1, $user->rights->accounting->mouvements->lire);

+				}

+

+				// Reports

+				$newmenu->add("/compta/resultat/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_report", $langs->trans("Reportings"), 1, $user->rights->accounting->comptarapport->lire, '', $mainmenu, 'ca');

+

+                if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {

+                    $newmenu->add("/compta/resultat/index.php?leftmenu=accountancy_report", $langs->trans("MenuReportInOut"), 2, $user->rights->accounting->comptarapport->lire);

+                    $newmenu->add("/compta/resultat/clientfourn.php?leftmenu=accountancy_report", $langs->trans("ByPredefinedAccountGroups"), 3, $user->rights->accounting->comptarapport->lire);

+                    $newmenu->add("/compta/resultat/result.php?leftmenu=accountancy_report", $langs->trans("ByPersonalizedAccountGroups"), 3, $user->rights->accounting->comptarapport->lire);

+                }

+

+				$modecompta = 'CREANCES-DETTES';

+				if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') $modecompta = 'BOOKKEEPING'; // Not yet implemented. Should be BOOKKEEPINGCOLLECTED

+				if ($modecompta)

+				{

+					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {

+                        $newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnover"), 2, $user->rights->accounting->comptarapport->lire);

+					    $newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);

+					    $newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 3, $user->rights->accounting->comptarapport->lire);

+					    $newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 3, $user->rights->accounting->comptarapport->lire);

+                        $newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByVatRate"), 3, $user->rights->accounting->comptarapport->lire);

+                    }

+				}

+

+				$modecompta = 'RECETTES-DEPENSES';

+				//if (! empty($conf->accounting->enabled) && ! empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') $modecompta='';	// Not yet implemented. Should be BOOKKEEPINGCOLLECTED

+				if ($modecompta)

+				{

+					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {

+					    $newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnoverCollected"), 2, $user->rights->accounting->comptarapport->lire);

+					    $newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);

+					    $newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 3, $user->rights->accounting->comptarapport->lire);

+					    //$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"),3,$user->rights->accounting->comptarapport->lire);

+                        //$newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByVatRate"),3,$user->rights->accounting->comptarapport->lire);

+                    }

+				}

+

+				$modecompta = 'CREANCES-DETTES';

+				if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') $modecompta = 'BOOKKEEPING'; // Not yet implemented. Should be BOOKKEEPINGCOLLECTED

+				if ($modecompta && $conf->fournisseur->enabled)

+				{

+					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {

+						$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnover"), 2, $user->rights->accounting->comptarapport->lire);

+						$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);

+						$newmenu->add("/compta/stats/supplier_turnover_by_prodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 3, $user->rights->accounting->comptarapport->lire);

+					}

+				}

+

+				$modecompta = 'RECETTES-DEPENSES';

+				//if (! empty($conf->accounting->enabled) && ! empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') $modecompta='';	// Not yet implemented. Should be BOOKKEEPINGCOLLECTED

+				if ($modecompta && $conf->fournisseur->enabled)

+				{

+					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {

+						$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnoverCollected"), 2, $user->rights->accounting->comptarapport->lire);

+						$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);

+					}

+				}

+            }

+

+			// Accountancy (simple)

+            if (!empty($conf->comptabilite->enabled))

+            {

+            	// Files

+            	if (empty($conf->global->ACCOUNTANCY_HIDE_EXPORT_FILES_MENU))

+            	{

+            		$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'files');

+            	}

+

+                // Bilan, resultats

+                $newmenu->add("/compta/resultat/index.php?leftmenu=report&amp;mainmenu=accountancy", $langs->trans("Reportings"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'ca');

+

+                if ($usemenuhider || empty($leftmenu) || preg_match('/report/', $leftmenu)) {

+                    $newmenu->add("/compta/resultat/index.php?leftmenu=report", $langs->trans("MenuReportInOut"), 1, $user->rights->compta->resultat->lire);

+                    $newmenu->add("/compta/resultat/clientfourn.php?leftmenu=report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);

+                    /* On verra ca avec module compabilite expert

+                    $newmenu->add("/compta/resultat/compteres.php?leftmenu=report","Compte de resultat",2,$user->rights->compta->resultat->lire);

+                    $newmenu->add("/compta/resultat/bilan.php?leftmenu=report","Bilan",2,$user->rights->compta->resultat->lire);

+                    */

+                    $newmenu->add("/compta/stats/index.php?leftmenu=report", $langs->trans("ReportTurnover"), 1, $user->rights->compta->resultat->lire);

+

+                    /*

+                    $newmenu->add("/compta/stats/cumul.php?leftmenu=report","Cumule",2,$user->rights->compta->resultat->lire);

+                    if (! empty($conf->propal->enabled)) {

+                        $newmenu->add("/compta/stats/prev.php?leftmenu=report","Previsionnel",2,$user->rights->compta->resultat->lire);

+                        $newmenu->add("/compta/stats/comp.php?leftmenu=report","Transforme",2,$user->rights->compta->resultat->lire);

+                    }

+                    */

+                    $newmenu->add("/compta/stats/casoc.php?leftmenu=report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);

+                    $newmenu->add("/compta/stats/cabyuser.php?leftmenu=report", $langs->trans("ByUsers"), 2, $user->rights->compta->resultat->lire);

+                    $newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=report", $langs->trans("ByProductsAndServices"), 2, $user->rights->compta->resultat->lire);

+                    $newmenu->add("/compta/stats/byratecountry.php?leftmenu=report", $langs->trans("ByVatRate"), 2, $user->rights->compta->resultat->lire);

+					//Achats

+					$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report", $langs->trans("ReportPurchaseTurnover"), 1, $user->rights->compta->resultat->lire);

+					$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);

+					$newmenu->add("/compta/stats/supplier_turnover_by_prodserv.php?leftmenu=accountancy_report", $langs->trans("ByProductsAndServices"), 2, $user->rights->compta->resultat->lire);

+                    // Journaux

+                    $newmenu->add("/compta/journal/sellsjournal.php?leftmenu=report", $langs->trans("SellsJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 50);

+                    $newmenu->add("/compta/journal/purchasesjournal.php?leftmenu=report", $langs->trans("PurchasesJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 51);

+                }

+                //if ($leftmenu=="ca") $newmenu->add("/compta/journaux/index.php?leftmenu=ca",$langs->trans("Journaux"),1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);

+            }

+

+			// Assets

+			if (!empty($conf->asset->enabled))

+			{

+				$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuAssets"), 0, $user->rights->asset->read, '', $mainmenu, 'asset');

+				$newmenu->add("/asset/card.php?leftmenu=asset&amp;action=create", $langs->trans("MenuNewAsset"), 1, $user->rights->asset->write);

+				$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuListAssets"), 1, $user->rights->asset->read);

+				$newmenu->add("/asset/type.php?leftmenu=asset_type", $langs->trans("MenuTypeAssets"), 1, $user->rights->asset->read, '', $mainmenu, 'asset_type');

+				if ($usemenuhider || empty($leftmenu) || preg_match('/asset_type/', $leftmenu)) {

+					$newmenu->add("/asset/type.php?leftmenu=asset_type&amp;action=create", $langs->trans("MenuNewTypeAssets"), 2, (empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->write) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->setup_advance));

+                    $newmenu->add("/asset/type.php?leftmenu=asset_type", $langs->trans("MenuListTypeAssets"), 2, $user->rights->asset->read);

+                }

+			}

@@ -813,0 +1461 @@
+

@@ -818,2 +1466,73 @@
-		if ($mainmenu == 'bank') {

-			get_left_menu_bank($mainmenu, $newmenu, $usemenuhider, $leftmenu, $type_user);

+		if ($mainmenu == 'bank')

+		{

+			// Load translation files required by the page

+			$langs->loadLangs(array("withdrawals", "banks", "bills", "categories"));

+

+			// Bank-Cash account

+			if (!empty($conf->banque->enabled))

+			{

+				$newmenu->add("/compta/bank/list.php?leftmenu=bank&amp;mainmenu=bank", $langs->trans("MenuBankCash"), 0, $user->rights->banque->lire, '', $mainmenu, 'bank');

+

+				$newmenu->add("/compta/bank/card.php?action=create", $langs->trans("MenuNewFinancialAccount"), 1, $user->rights->banque->configurer);

+				$newmenu->add("/compta/bank/list.php?leftmenu=bank&amp;mainmenu=bank", $langs->trans("List"), 1, $user->rights->banque->lire, '', $mainmenu, 'bank');

+				$newmenu->add("/compta/bank/bankentries_list.php", $langs->trans("ListTransactions"), 1, $user->rights->banque->lire);

+				$newmenu->add("/compta/bank/budget.php", $langs->trans("ListTransactionsByCategory"), 1, $user->rights->banque->lire);

+

+				$newmenu->add("/compta/bank/transfer.php", $langs->trans("MenuBankInternalTransfer"), 1, $user->rights->banque->transfer);

+			}

+

+			if (!empty($conf->categorie->enabled))

+			{

+				$langs->load("categories");

+				$newmenu->add("/categories/index.php?type=5", $langs->trans("Rubriques"), 1, $user->rights->categorie->creer, '', $mainmenu, 'tags');

+				$newmenu->add("/compta/bank/categ.php", $langs->trans("RubriquesTransactions"), 1, $user->rights->categorie->creer, '', $mainmenu, 'tags');

+			}

+

+			// Direct debit order

+			if (!empty($conf->prelevement->enabled))

+			{

+				$newmenu->add("/compta/prelevement/index.php?leftmenu=withdraw&amp;mainmenu=bank", $langs->trans("PaymentByDirectDebit"), 0, $user->rights->prelevement->bons->lire, '', $mainmenu, 'withdraw');

+

+				if ($usemenuhider || empty($leftmenu) || $leftmenu == "withdraw") {

+				    $newmenu->add("/compta/prelevement/create.php?mainmenu=bank", $langs->trans("NewStandingOrder"), 1, $user->rights->prelevement->bons->creer);

+

+				    $newmenu->add("/compta/prelevement/bons.php?mainmenu=bank", $langs->trans("WithdrawalsReceipts"), 1, $user->rights->prelevement->bons->lire);

+				    $newmenu->add("/compta/prelevement/list.php?mainmenu=bank", $langs->trans("WithdrawalsLines"), 1, $user->rights->prelevement->bons->lire);

+				    $newmenu->add("/compta/prelevement/rejets.php?mainmenu=bank", $langs->trans("Rejects"), 1, $user->rights->prelevement->bons->lire);

+				    $newmenu->add("/compta/prelevement/stats.php?mainmenu=bank", $langs->trans("Statistics"), 1, $user->rights->prelevement->bons->lire);

+                }

+			}

+

+			// Bank transfer order

+			if (!empty($conf->paymentbybanktransfer->enabled))

+			{

+				$newmenu->add("/compta/paymentbybanktransfer/index.php?leftmenu=banktransfer&amp;mainmenu=bank", $langs->trans("PaymentByBankTransfer"), 0, $user->rights->paymentbybanktransfer->read, '', $mainmenu, 'banktransfer');

+

+				if ($usemenuhider || empty($leftmenu) || $leftmenu == "banktransfer") {

+					$newmenu->add("/compta/prelevement/create.php?type=bank-transfer&mainmenu=bank", $langs->trans("NewPaymentByBankTransfer"), 1, $user->rights->paymentbybanktransfer->create);

+

+					$newmenu->add("/compta/prelevement/bons.php?type=bank-transfer&mainmenu=bank", $langs->trans("PaymentByBankTransferReceipts"), 1, $user->rights->paymentbybanktransfer->read);

+					$newmenu->add("/compta/prelevement/list.php?type=bank-transfer&mainmenu=bank", $langs->trans("PaymentByBankTransferLines"), 1, $user->rights->paymentbybanktransfer->read);

+					$newmenu->add("/compta/prelevement/rejets.php?type=bank-transfer&mainmenu=bank", $langs->trans("Rejects"), 1, $user->rights->paymentbybanktransfer->read);

+					$newmenu->add("/compta/prelevement/stats.php?type=bank-transfer&mainmenu=bank", $langs->trans("Statistics"), 1, $user->rights->paymentbybanktransfer->read);

+				}

+			}

+

+			// Management of checks

+			if (empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && !empty($conf->banque->enabled) && (!empty($conf->facture->enabled) || !empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)))

+			{

+				$newmenu->add("/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank", $langs->trans("MenuChequeDeposits"), 0, $user->rights->banque->cheque, '', $mainmenu, 'checks');

+				if (preg_match('/checks/', $leftmenu)) {

+                    $newmenu->add("/compta/paiement/cheque/card.php?leftmenu=checks_bis&amp;action=new&amp;mainmenu=bank", $langs->trans("NewChequeDeposit"), 1, $user->rights->banque->cheque);

+                    $newmenu->add("/compta/paiement/cheque/list.php?leftmenu=checks_bis&amp;mainmenu=bank", $langs->trans("List"), 1, $user->rights->banque->cheque);

+                }

+			}

+

+			// Cash Control

+			if (!empty($conf->takepos->enabled) || !empty($conf->cashdesk->enabled))

+			{

+				$permtomakecashfence = ($user->rights->cashdesk->run || $user->rights->takepos->run);

+				$newmenu->add("/compta/cashcontrol/cashcontrol_list.php?action=list", $langs->trans("POS"), 0, $permtomakecashfence, '', $mainmenu, 'cashcontrol');

+				$newmenu->add("/compta/cashcontrol/cashcontrol_card.php?action=create", $langs->trans("NewCashFence"), 1, $permtomakecashfence);

+				$newmenu->add("/compta/cashcontrol/cashcontrol_list.php?action=list", $langs->trans("List"), 1, $permtomakecashfence);

+			}

@@ -825,2 +1544,122 @@
-		if ($mainmenu == 'products') {

-			get_left_menu_products($mainmenu, $newmenu, $usemenuhider, $leftmenu, $type_user);

+		if ($mainmenu == 'products')

+		{

+			// Products

+			if (!empty($conf->product->enabled))

+			{

+				$newmenu->add("/product/index.php?leftmenu=product&amp;type=0", $langs->trans("Products"), 0, $user->rights->produit->lire, '', $mainmenu, 'product');

+				$newmenu->add("/product/card.php?leftmenu=product&amp;action=create&amp;type=0", $langs->trans("NewProduct"), 1, $user->rights->produit->creer);

+				$newmenu->add("/product/list.php?leftmenu=product&amp;type=0", $langs->trans("List"), 1, $user->rights->produit->lire);

+				if (!empty($conf->stock->enabled))

+				{

+					$newmenu->add("/product/reassort.php?type=0", $langs->trans("MenuStocks"), 1, $user->rights->produit->lire && $user->rights->stock->lire);

+				}

+				if (!empty($conf->productbatch->enabled))

+				{

+					$langs->load("stocks");

+					$newmenu->add("/product/reassortlot.php?type=0", $langs->trans("StocksByLotSerial"), 1, $user->rights->produit->lire && $user->rights->stock->lire);

+					$newmenu->add("/product/stock/productlot_list.php", $langs->trans("LotSerial"), 1, $user->rights->produit->lire && $user->rights->stock->lire);

+				}

+				if (!empty($conf->variants->enabled))

+				{

+					$newmenu->add("/variants/list.php", $langs->trans("VariantAttributes"), 1, $user->rights->produit->lire);

+				}

+				if (!empty($conf->propal->enabled) || !empty($conf->commande->enabled) || !empty($conf->facture->enabled) || !empty($conf->fournisseur->enabled) || !empty($conf->supplier_proposal->enabled))

+				{

+					$newmenu->add("/product/stats/card.php?id=all&leftmenu=stats&type=0", $langs->trans("Statistics"), 1, $user->rights->produit->lire && $user->rights->propale->lire);

+				}

+

+				// Categories

+				if (!empty($conf->categorie->enabled))

+				{

+					$langs->load("categories");

+					$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=0", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

+					//if ($usemenuhider || empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->rights->categorie->lire);

+				}

+			}

+

+			// Services

+			if (!empty($conf->service->enabled))

+			{

+				$newmenu->add("/product/index.php?leftmenu=service&amp;type=1", $langs->trans("Services"), 0, $user->rights->service->lire, '', $mainmenu, 'service');

+				$newmenu->add("/product/card.php?leftmenu=service&amp;action=create&amp;type=1", $langs->trans("NewService"), 1, $user->rights->service->creer);

+				$newmenu->add("/product/list.php?leftmenu=service&amp;type=1", $langs->trans("List"), 1, $user->rights->service->lire);

+				if (!empty($conf->propal->enabled) || !empty($conf->commande->enabled) || !empty($conf->facture->enabled) || !empty($conf->fournisseur->enabled) || !empty($conf->supplier_proposal->enabled))

+				{

+					$newmenu->add("/product/stats/card.php?id=all&leftmenu=stats&type=1", $langs->trans("Statistics"), 1, $user->rights->service->lire && $user->rights->propale->lire);

+				}

+				// Categories

+				if (!empty($conf->categorie->enabled))

+				{

+					$langs->load("categories");

+					$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=0", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

+					//if ($usemenuhider || empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->rights->categorie->lire);

+				}

+			}

+

+			// Warehouse

+			if (!empty($conf->stock->enabled))

+			{

+				$langs->load("stocks");

+				$newmenu->add("/product/stock/index.php?leftmenu=stock", $langs->trans("Warehouses"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock');

+				$newmenu->add("/product/stock/card.php?action=create", $langs->trans("MenuNewWarehouse"), 1, $user->rights->stock->creer);

+				$newmenu->add("/product/stock/list.php", $langs->trans("List"), 1, $user->rights->stock->lire);

+				$newmenu->add("/product/stock/movement_list.php", $langs->trans("Movements"), 1, $user->rights->stock->mouvement->lire);

+

+                $newmenu->add("/product/stock/massstockmove.php", $langs->trans("MassStockTransferShort"), 1, $user->rights->stock->mouvement->creer);

+                if ($conf->supplier_order->enabled) $newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire);

+

+                // Categories for warehouses

+                if (!empty($conf->categorie->enabled))

+                {

+                	$newmenu->add("/categories/index.php?leftmenu=stock&amp;type=9", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

+                }

+			}

+

+			// Inventory

+			if ($conf->global->MAIN_FEATURES_LEVEL >= 2)

+			{

+    			if (!empty($conf->stock->enabled))

+    			{

+    				$langs->load("stocks");

+					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))

+					{

+						$newmenu->add("/product/inventory/list.php?leftmenu=stock", $langs->trans("Inventory"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock');

+						$newmenu->add("/product/inventory/card.php?action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->creer);

+						$newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->lire);

+					}

+					else

+					{

+						$newmenu->add("/product/inventory/list.php?leftmenu=stock", $langs->trans("Inventory"), 0, $user->rights->stock->inventory_advance->read, '', $mainmenu, 'stock');

+						$newmenu->add("/product/inventory/card.php?action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->inventory_advance->write);

+						$newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->inventory_advance->read);

+					}

+    			}

+			}

+

+			// Shipments

+			if (!empty($conf->expedition->enabled))

+			{

+				$langs->load("sendings");

+				$newmenu->add("/expedition/index.php?leftmenu=sendings", $langs->trans("Shipments"), 0, $user->rights->expedition->lire, '', $mainmenu, 'sendings');

+				$newmenu->add("/expedition/card.php?action=create2&amp;leftmenu=sendings", $langs->trans("NewSending"), 1, $user->rights->expedition->creer);

+				$newmenu->add("/expedition/list.php?leftmenu=sendings", $langs->trans("List"), 1, $user->rights->expedition->lire);

+				if ($usemenuhider || empty($leftmenu) || $leftmenu == "sendings") {

+                    $newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=0", $langs->trans("StatusSendingDraftShort"), 2, $user->rights->expedition->lire);

+				    $newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=1", $langs->trans("StatusSendingValidatedShort"), 2, $user->rights->expedition->lire);

+                    $newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=2", $langs->trans("StatusSendingProcessedShort"), 2, $user->rights->expedition->lire);

+                }

+				$newmenu->add("/expedition/stats/index.php?leftmenu=sendings", $langs->trans("Statistics"), 1, $user->rights->expedition->lire);

+			}

+

+            // Receptions

+			if (!empty($conf->reception->enabled))

+			{

+				$langs->load("receptions");

+				$newmenu->add("/reception/index.php?leftmenu=receptions", $langs->trans("Receptions"), 0, $user->rights->reception->lire, '', $mainmenu, 'receptions');

+				$newmenu->add("/reception/card.php?action=create2&amp;leftmenu=receptions", $langs->trans("NewReception"), 1, $user->rights->reception->creer);

+				$newmenu->add("/reception/list.php?leftmenu=receptions", $langs->trans("List"), 1, $user->rights->reception->lire);

+				if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") $newmenu->add("/reception/list.php?leftmenu=receptions&search_status=0", $langs->trans("StatusReceptionDraftShort"), 2, $user->rights->reception->lire);

+				if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") $newmenu->add("/reception/list.php?leftmenu=receptions&search_status=1", $langs->trans("StatusReceptionValidatedShort"), 2, $user->rights->reception->lire);

+				if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") $newmenu->add("/reception/list.php?leftmenu=receptions&search_status=2", $langs->trans("StatusReceptionProcessedShort"), 2, $user->rights->reception->lire);

+				$newmenu->add("/reception/stats/index.php?leftmenu=receptions", $langs->trans("Statistics"), 1, $user->rights->reception->lire);

+			}

@@ -830 +1669 @@
-		 * Menu PRODUCTS-SERVICES MRP - GPAO

+		 * Menu PRODUCTS-SERVICES MRP

@@ -832,2 +1671,20 @@
-		if ($mainmenu == 'mrp') {

-			get_left_menu_mrp($mainmenu, $newmenu, $usemenuhider, $leftmenu, $type_user);

+		if ($mainmenu == 'mrp')

+		{

+		    // BOM

+		    if (!empty($conf->bom->enabled) || !empty($conf->mrp->enabled))

+		    {

+		        $langs->load("mrp");

+

+		        $newmenu->add("", $langs->trans("MenuBOM"), 0, $user->rights->bom->read, '', $mainmenu, 'bom');

+		        $newmenu->add("/bom/bom_card.php?leftmenu=bom&amp;action=create", $langs->trans("NewBOM"), 1, $user->rights->bom->write, '', $mainmenu, 'bom');

+		        $newmenu->add("/bom/bom_list.php?leftmenu=bom", $langs->trans("List"), 1, $user->rights->bom->read, '', $mainmenu, 'bom');

+		    }

+

+		    if (!empty($conf->mrp->enabled))

+		    {

+		    	$langs->load("mrp");

+

+		    	$newmenu->add("", $langs->trans("MenuMRP"), 0, $user->rights->mrp->read, '', $mainmenu, 'mo');

+		    	$newmenu->add("/mrp/mo_card.php?leftmenu=mo&amp;action=create", $langs->trans("NewMO"), 1, $user->rights->mrp->write, '', $mainmenu, 'mo');

+		    	$newmenu->add("/mrp/mo_list.php?leftmenu=mo", $langs->trans("List"), 1, $user->rights->mrp->read, '', $mainmenu, 'mo');

+		    }

@@ -839,2 +1696,65 @@
-		if ($mainmenu == 'project') {

-			get_left_menu_projects($mainmenu, $newmenu, $usemenuhider, $leftmenu, $type_user);

+		if ($mainmenu == 'project')

+		{

+			if (!empty($conf->projet->enabled))

+			{

+				$langs->load("projects");

+

+				$search_project_user = GETPOST('search_project_user', 'int');

+

+				$tmpentry = array(

+                    'enabled'=>(!empty($conf->projet->enabled)),

+				    'perms'=>(!empty($user->rights->projet->lire)),

+                    'module'=>'projet'

+                );

+				$showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal);

+

+				$titleboth = $langs->trans("LeadsOrProjects");

+				$titlenew = $langs->trans("NewLeadOrProject"); // Leads and opportunities by default

+				if ($conf->global->PROJECT_USE_OPPORTUNITIES == 0)

+				{

+					$titleboth = $langs->trans("Projects");

+					$titlenew = $langs->trans("NewProject");

+				}

+				if ($conf->global->PROJECT_USE_OPPORTUNITIES == 2) {	// 2 = leads only

+					$titleboth = $langs->trans("Leads");

+					$titlenew = $langs->trans("NewLead");

+				}

+

+				// Project assigned to user

+				$newmenu->add("/projet/index.php?leftmenu=projects".($search_project_user ? '&search_project_user='.$search_project_user : ''), $titleboth, 0, $user->rights->projet->lire, '', $mainmenu, 'projects');

+				$newmenu->add("/projet/card.php?leftmenu=projects&action=create".($search_project_user ? '&search_project_user='.$search_project_user : ''), $titlenew, 1, $user->rights->projet->creer);

+

+				if ($conf->global->PROJECT_USE_OPPORTUNITIES == 0)

+				{

+					$newmenu->add("/projet/list.php?leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : '').'&search_status=99', $langs->trans("List"), 1, $showmode, '', 'project', 'list');

+				}

+				elseif ($conf->global->PROJECT_USE_OPPORTUNITIES == 1)

+				{

+					$newmenu->add("/projet/list.php?leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $showmode, '', 'project', 'list');

+					$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_usage_opportunity=1&search_status=99&contextpage=lead', $langs->trans("ListOpenLeads"), 2, $showmode);

+					$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_opp_status=notopenedopp&search_status=99&contextpage=project', $langs->trans("ListOpenProjects"), 2, $showmode);

+				}

+				elseif ($conf->global->PROJECT_USE_OPPORTUNITIES == 2) {	// 2 = leads only

+					$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_usage_opportunity=1&search_status=99', $langs->trans("List"), 2, $showmode);

+				}

+

+				$newmenu->add("/projet/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);

+

+				// Categories

+				if (!empty($conf->categorie->enabled))

+				{

+					$langs->load("categories");

+					$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=6", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

+				}

+

+				if (empty($conf->global->PROJECT_HIDE_TASKS))

+				{

+					// Project affected to user

+					$newmenu->add("/projet/activity/index.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("Activities"), 0, $user->rights->projet->lire);

+					$newmenu->add("/projet/tasks.php?leftmenu=tasks&action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer);

+					$newmenu->add("/projet/tasks/list.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $user->rights->projet->lire);

+				    $newmenu->add("/projet/tasks/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);

+

+				    $newmenu->add("/projet/activity/perweek.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("NewTimeSpent"), 0, $user->rights->projet->lire);

+				}

+			}

@@ -845,3 +1765,73 @@
-		 */

-		if ($mainmenu == 'hrm') {

-			get_left_menu_hrm($mainmenu, $newmenu, $usemenuhider, $leftmenu, $type_user);

+		*/

+		if ($mainmenu == 'hrm')

+		{

+			// HRM module

+			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->hrm->employee->read, '', $mainmenu, 'hrm');

+				$newmenu->add("/user/card.php?mainmenu=hrm&leftmenu=hrm&action=create&employee=1", $langs->trans("NewEmployee"), 1, $user->rights->hrm->employee->write);

+				$newmenu->add("/user/list.php?mainmenu=hrm&leftmenu=hrm&mode=employee&contextpage=employeelist", $langs->trans("List"), 1, $user->rights->hrm->employee->read);

+			}

+

+			// Leave/Holiday/Vacation module

+			if (!empty($conf->holiday->enabled))

+			{

+			    // Load translation files required by the page

+                $langs->loadLangs(array("holiday", "trips"));

+

+				$newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=hrm", $langs->trans("CPTitreMenu"), 0, $user->rights->holiday->read, '', $mainmenu, 'hrm');

+				$newmenu->add("/holiday/card.php?mainmenu=hrm&leftmenu=holiday&action=request", $langs->trans("New"), 1, $user->rights->holiday->write);

+				$newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=hrm", $langs->trans("List"), 1, $user->rights->holiday->read);

+				if ($usemenuhider || empty($leftmenu) || $leftmenu == "hrm") {

+                    $newmenu->add("/holiday/list.php?search_statut=1&mainmenu=hrm&leftmenu=hrm", $langs->trans("DraftCP"), 2, $user->rights->holiday->read);

+				    $newmenu->add("/holiday/list.php?search_statut=2&mainmenu=hrm&leftmenu=hrm", $langs->trans("ToReviewCP"), 2, $user->rights->holiday->read);

+				    $newmenu->add("/holiday/list.php?search_statut=3&mainmenu=hrm&leftmenu=hrm", $langs->trans("ApprovedCP"), 2, $user->rights->holiday->read);

+				    $newmenu->add("/holiday/list.php?search_statut=4&mainmenu=hrm&leftmenu=hrm", $langs->trans("CancelCP"), 2, $user->rights->holiday->read);

+                    $newmenu->add("/holiday/list.php?search_statut=5&mainmenu=hrm&leftmenu=hrm", $langs->trans("RefuseCP"), 2, $user->rights->holiday->read);

+                }

+				$newmenu->add("/holiday/define_holiday.php?mainmenu=hrm&action=request", $langs->trans("MenuConfCP"), 1, $user->rights->holiday->read);

+				$newmenu->add("/holiday/month_report.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("MenuReportMonth"), 1, $user->rights->holiday->read_all);

+				$newmenu->add("/holiday/view_log.php?mainmenu=hrm&leftmenu=holiday&action=request", $langs->trans("MenuLogCP"), 1, $user->rights->holiday->define_holiday);

+			}

+

+			// Trips and expenses (old module)

+			if (!empty($conf->deplacement->enabled))

+			{

+				$langs->load("trips");

+				$newmenu->add("/compta/deplacement/index.php?leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("TripsAndExpenses"), 0, $user->rights->deplacement->lire, '', $mainmenu, 'tripsandexpenses');

+				$newmenu->add("/compta/deplacement/card.php?action=create&amp;leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("New"), 1, $user->rights->deplacement->creer);

+				$newmenu->add("/compta/deplacement/list.php?leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("List"), 1, $user->rights->deplacement->lire);

+				$newmenu->add("/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("Statistics"), 1, $user->rights->deplacement->lire);

+			}

+

+			// Expense report

+			if (!empty($conf->expensereport->enabled))

+			{

+				$langs->load("trips");

+				$newmenu->add("/expensereport/index.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("TripsAndExpenses"), 0, $user->rights->expensereport->lire, '', $mainmenu, 'expensereport');

+				$newmenu->add("/expensereport/card.php?action=create&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("New"), 1, $user->rights->expensereport->creer);

+				$newmenu->add("/expensereport/list.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("List"), 1, $user->rights->expensereport->lire);

+				if ($usemenuhider || empty($leftmenu) || $leftmenu == "expensereport") {

+                    $newmenu->add("/expensereport/list.php?search_status=0&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Draft"), 2, $user->rights->expensereport->lire);

+				    $newmenu->add("/expensereport/list.php?search_status=2&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Validated"), 2, $user->rights->expensereport->lire);

+				    $newmenu->add("/expensereport/list.php?search_status=5&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Approved"), 2, $user->rights->expensereport->lire);

+				    $newmenu->add("/expensereport/list.php?search_status=6&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Paid"), 2, $user->rights->expensereport->lire);

+				    $newmenu->add("/expensereport/list.php?search_status=4&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Canceled"), 2, $user->rights->expensereport->lire);

+                    $newmenu->add("/expensereport/list.php?search_status=99&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Refused"), 2, $user->rights->expensereport->lire);

+                }

+				$newmenu->add("/expensereport/stats/index.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Statistics"), 1, $user->rights->expensereport->lire);

+			}

+

+			if (!empty($conf->projet->enabled))

+			{

+				if (empty($conf->global->PROJECT_HIDE_TASKS))

+				{

+					$langs->load("projects");

+

+					$search_project_user = GETPOST('search_project_user', 'int');

+

+					$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("NewTimeSpent"), 0, $user->rights->projet->lire);

+				}

+			}

@@ -848,0 +1839,2 @@
+

+

@@ -852,2 +1844,29 @@
-		if ($mainmenu == 'tools') {

-			get_left_menu_tools($mainmenu, $newmenu, $usemenuhider, $leftmenu, $type_user);

+		if ($mainmenu == 'tools')

+		{

+			if (empty($user->socid)) // limit to internal users

+			{

+				$langs->load("mails");

+				$newmenu->add("/admin/mails_templates.php?leftmenu=email_templates", $langs->trans("EMailTemplates"), 0, 1, '', $mainmenu, 'email_templates');

+			}

+

+			if (!empty($conf->mailing->enabled))

+			{

+				$newmenu->add("/comm/mailing/index.php?leftmenu=mailing", $langs->trans("EMailings"), 0, $user->rights->mailing->lire, '', $mainmenu, 'mailing');

+				$newmenu->add("/comm/mailing/card.php?leftmenu=mailing&amp;action=create", $langs->trans("NewMailing"), 1, $user->rights->mailing->creer);

+				$newmenu->add("/comm/mailing/list.php?leftmenu=mailing", $langs->trans("List"), 1, $user->rights->mailing->lire);

+			}

+

+			if (!empty($conf->export->enabled))

+			{

+				$langs->load("exports");

+				$newmenu->add("/exports/index.php?leftmenu=export", $langs->trans("FormatedExport"), 0, $user->rights->export->lire, '', $mainmenu, 'export');

+				$newmenu->add("/exports/export.php?leftmenu=export", $langs->trans("NewExport"), 1, $user->rights->export->creer);

+				//$newmenu->add("/exports/export.php?leftmenu=export",$langs->trans("List"),1, $user->rights->export->lire);

+			}

+

+			if (!empty($conf->import->enabled))

+			{

+				$langs->load("exports");

+				$newmenu->add("/imports/index.php?leftmenu=import", $langs->trans("FormatedImport"), 0, $user->rights->import->run, '', $mainmenu, 'import');

+				$newmenu->add("/imports/import.php?leftmenu=import", $langs->trans("NewImport"), 1, $user->rights->import->run);

+			}

@@ -859,2 +1878,39 @@
-		if ($mainmenu == 'members') {

-			get_left_menu_members($mainmenu, $newmenu, $usemenuhider, $leftmenu, $type_user);

+		if ($mainmenu == 'members')

+		{

+			if (!empty($conf->adherent->enabled))

+			{

+				// Load translation files required by the page

+                $langs->loadLangs(array("members", "compta"));

+

+				$newmenu->add("/adherents/index.php?leftmenu=members&amp;mainmenu=members", $langs->trans("Members"), 0, $user->rights->adherent->lire, '', $mainmenu, 'members');

+				$newmenu->add("/adherents/card.php?leftmenu=members&amp;action=create", $langs->trans("NewMember"), 1, $user->rights->adherent->creer);

+				$newmenu->add("/adherents/list.php?leftmenu=members", $langs->trans("List"), 1, $user->rights->adherent->lire);

+				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=-1", $langs->trans("MenuMembersToValidate"), 2, $user->rights->adherent->lire);

+				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1", $langs->trans("MenuMembersValidated"), 2, $user->rights->adherent->lire);

+				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=uptodate", $langs->trans("MenuMembersUpToDate"), 2, $user->rights->adherent->lire);

+				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=outofdate", $langs->trans("MenuMembersNotUpToDate"), 2, $user->rights->adherent->lire);

+				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=0", $langs->trans("MenuMembersResiliated"), 2, $user->rights->adherent->lire);

+				$newmenu->add("/adherents/stats/index.php?leftmenu=members", $langs->trans("MenuMembersStats"), 1, $user->rights->adherent->lire);

+

+				$newmenu->add("/adherents/cartes/carte.php?leftmenu=export", $langs->trans("MembersCards"), 1, $user->rights->adherent->export);

+				if (!empty($conf->global->MEMBER_LINK_TO_HTPASSWDFILE) && ($usemenuhider || empty($leftmenu) || $leftmenu == 'none' || $leftmenu == "members" || $leftmenu == "export")) $newmenu->add("/adherents/htpasswd.php?leftmenu=export", $langs->trans("Filehtpasswd"), 1, $user->rights->adherent->export);

+

+				if (!empty($conf->categorie->enabled))

+				{

+					$langs->load("categories");

+					$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=3", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

+				}

+

+				$newmenu->add("/adherents/index.php?leftmenu=members&amp;mainmenu=members", $langs->trans("Subscriptions"), 0, $user->rights->adherent->cotisation->lire);

+				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=-1,1&amp;mainmenu=members", $langs->trans("NewSubscription"), 1, $user->rights->adherent->cotisation->creer);

+				$newmenu->add("/adherents/subscription/list.php?leftmenu=members", $langs->trans("List"), 1, $user->rights->adherent->cotisation->lire);

+				$newmenu->add("/adherents/stats/index.php?leftmenu=members", $langs->trans("MenuMembersStats"), 1, $user->rights->adherent->lire);

+

+				//$newmenu->add("/adherents/index.php?leftmenu=export&amp;mainmenu=members",$langs->trans("Tools"),0,$user->rights->adherent->export, '', $mainmenu, 'export');

+				//if (! empty($conf->export->enabled) && ($usemenuhider || empty($leftmenu) || $leftmenu=="export")) $newmenu->add("/exports/index.php?leftmenu=export",$langs->trans("Datas"),1,$user->rights->adherent->export);

+

+				// Type

+				$newmenu->add("/adherents/type.php?leftmenu=setup&amp;mainmenu=members", $langs->trans("MembersTypes"), 0, $user->rights->adherent->configurer, '', $mainmenu, 'setup');

+				$newmenu->add("/adherents/type.php?leftmenu=setup&amp;mainmenu=members&amp;action=create", $langs->trans("New"), 1, $user->rights->adherent->configurer);

+				$newmenu->add("/adherents/type.php?leftmenu=setup&amp;mainmenu=members", $langs->trans("List"), 1, $user->rights->adherent->configurer);

+			}

@@ -869 +1925,2 @@
-		if (isModEnabled('ftp') && $mainmenu == 'ftp') {	// Entry for FTP

+		if (!empty($conf->ftp->enabled) && $mainmenu == 'ftp')	// Entry for FTP

+		{

@@ -872 +1929,2 @@
-			while ($i <= $MAXFTP) {

+			while ($i <= $MAXFTP)

+			{

@@ -875 +1933,2 @@
-				if (!empty($conf->global->$paramkey)) {

+				if (!empty($conf->global->$paramkey))

+				{

@@ -876,0 +1936 @@
+

@@ -884 +1944 @@
-	//var_dump($tabMenu);

+	//var_dump($tabMenu);    //

@@ -891,6 +1951,2 @@
-	if (is_array($menu_array_before)) {

-		$menu_array = array_merge($menu_array_before, $menu_array);

-	}

-	if (is_array($menu_array_after)) {

-		$menu_array = array_merge($menu_array, $menu_array_after);

-	}

+	if (is_array($menu_array_before)) $menu_array = array_merge($menu_array_before, $menu_array);

+	if (is_array($menu_array_after))  $menu_array = array_merge($menu_array, $menu_array_after);

@@ -898,26 +1954 @@
-	if (!is_array($menu_array)) {

-		return 0;

-	}

-

-	// Allow the $menu_array of the menu to be manipulated by modules

-	$parameters = array(

-		'mainmenu' => $mainmenu,

-	);

-	$hook_items = $menu_array;

-	$reshook = $hookmanager->executeHooks('menuLeftMenuItems', $parameters, $hook_items); // Note that $action and $object may have been modified by some hooks

-

-	if (is_numeric($reshook)) {

-		if ($reshook == 0 && !empty($hookmanager->resArray)) {

-			$menu_array[] = $hookmanager->resArray; // add

-		} elseif ($reshook == 1) {

-			$menu_array = $hookmanager->resArray; // replace

-		}

-

-		// @todo Sort menu items by 'position' value

-		//      $position = array();

-		//      foreach ($menu_array as $key => $row) {

-		//          $position[$key] = $row['position'];

-		//      }

-		//		$array1_sort_order = SORT_ASC;

-		//      array_multisort($position, $array1_sort_order, $menu_array);

-	}

+	if (!is_array($menu_array)) return 0;

@@ -928,7 +1959,7 @@
-	 $level=0; $cusor=0; $position=0;

-	 $nbentry = count($menu_array);

-	 while (findNextEntryForLevel($menu_array, $cursor, $position, $level))

-	 {

-

-	 $cursor++;

-	 }*/

+	$level=0; $cusor=0; $position=0;

+	$nbentry = count($menu_array);

+	while (findNextEntryForLevel($menu_array, $cursor, $position, $level))

+	{

+

+	    $cursor++;

+	}*/

@@ -937,5 +1968,4 @@
-	$invert = !getDolGlobalString('MAIN_MENU_INVERT') ? "" : "invert";

-	if (empty($noout)) {

-		$altok = 0;

-		$blockvmenuopened = false;

-		$lastlevel0 = '';

+	$invert = empty($conf->global->MAIN_MENU_INVERT) ? "" : "invert";

+	if (empty($noout))

+	{

+		$altok = 0; $blockvmenuopened = false; $lastlevel0 = '';

@@ -943 +1973,2 @@
-		for ($i = 0; $i < $num; $i++) {     // Loop on each menu entry

+		for ($i = 0; $i < $num; $i++)     // Loop on each menu entry

+		{

@@ -945,3 +1976 @@
-			if (getDolGlobalString('MAIN_MENU_HIDE_UNAUTHORIZED') && empty($menu_array[$i]['enabled'])) {

-				$showmenu = false;

-			}

+			if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) 	$showmenu = false;

@@ -950 +1979,2 @@
-			if (empty($menu_array[$i]['level']) && $showmenu) {

+			if (empty($menu_array[$i]['level']) && $showmenu)

+			{

@@ -954,6 +1984,6 @@
-				for ($j = ($i + 1); $j < $num; $j++) {

-					if (empty($menu_array[$j]['level'])) {

-						$lastopened = false;

-					}

-				}

-				if ($altok % 2 == 0) {

+				for ($j = ($i + 1); $j < $num; $j++)

+				{

+				    if (empty($menu_array[$j]['level'])) $lastopened = false;

+				}

+				if ($altok % 2 == 0)

+				{

@@ -961 +1991,3 @@
-				} else {

+				}

+				else

+				{

@@ -969,2 +2001,4 @@
-			if ($tabul > 0) {

-				for ($j = 0; $j < $tabul; $j++) {

+			if ($tabul > 0)

+			{

+				for ($j = 0; $j < $tabul; $j++)

+				{

@@ -980,16 +2014,19 @@
-			if (!preg_match("/^(http:\/\/|https:\/\/)/i", $menu_array[$i]['url'])) {

-				$tmp = explode('?', $menu_array[$i]['url'], 2);

-				$url = $shorturl = $tmp[0];

-				$param = (isset($tmp[1]) ? $tmp[1] : ''); // params in url of the menu link

-

-				// Complete param to force leftmenu to '' to close open menu when we click on a link with no leftmenu defined.

-				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && !empty($menu_array[$i]['mainmenu'])) {

-					$param .= ($param ? '&' : '').'mainmenu='.$menu_array[$i]['mainmenu'].'&leftmenu=';

-				}

-				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && empty($menu_array[$i]['mainmenu'])) {

-					$param .= ($param ? '&' : '').'leftmenu=';

-				}

-				//$url.="idmenu=".$menu_array[$i]['rowid'];    // Already done by menuLoad

-				$url = dol_buildpath($url, 1).($param ? '?'.$param : '');

-				$shorturlwithoutparam = $shorturl;

-				$shorturl = $shorturl.($param ? '?'.$param : '');

+			if (!preg_match("/^(http:\/\/|https:\/\/)/i", $menu_array[$i]['url']))

+			{

+			    $tmp = explode('?', $menu_array[$i]['url'], 2);

+			    $url = $shorturl = $tmp[0];

+			    $param = (isset($tmp[1]) ? $tmp[1] : ''); // params in url of the menu link

+

+			    // Complete param to force leftmenu to '' to close open menu when we click on a link with no leftmenu defined.

+			    if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && !empty($menu_array[$i]['mainmenu']))

+			    {

+			        $param .= ($param ? '&' : '').'mainmenu='.$menu_array[$i]['mainmenu'].'&leftmenu=';

+			    }

+			    if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && empty($menu_array[$i]['mainmenu']))

+			    {

+			        $param .= ($param ? '&' : '').'leftmenu=';

+			    }

+			    //$url.="idmenu=".$menu_array[$i]['rowid'];    // Already done by menuLoad

+			    $url = dol_buildpath($url, 1).($param ? '?'.$param : '');

+			    $shorturlwithoutparam = $shorturl;

+			    $shorturl = $shorturl.($param ? '?'.$param : '');

@@ -1002,2 +2039,4 @@
-			if ($menu_array[$i]['level'] == 0) {

-				if ($menu_array[$i]['enabled']) {     // Enabled so visible

+			if ($menu_array[$i]['level'] == 0)

+			{

+				if ($menu_array[$i]['enabled'])     // Enabled so visible

+				{

@@ -1005,18 +2044,5 @@
-					if ($shorturlwithoutparam) {

-						print '<a class="vmenu" title="'.dol_escape_htmltag(dol_string_nohtmltag($menu_array[$i]['titre'])).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';

-					} else {

-						print '<span class="vmenu">';

-					}

-					if (!empty($menu_array[$i]['prefix'])) {

-						if (preg_match('/^fa\-[a-zA-Z0-9\-_]+$/', $menu_array[$i]['prefix'])) {

-							print '<span class="fas '.$menu_array[$i]['prefix'].' paddingright pictofixedwidth"></span>';

-						} else {

-							print $menu_array[$i]['prefix'];

-						}

-					}

-					print $menu_array[$i]['titre'];

-					if ($shorturlwithoutparam) {

-						print '</a>';

-					} else {

-						print '</span>';

-					}

+					if ($shorturlwithoutparam) print '<a class="vmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';

+					else print '<span class="vmenu">';

+					print ($menu_array[$i]['prefix'] ? $menu_array[$i]['prefix'] : '').$menu_array[$i]['titre'];

+					if ($shorturlwithoutparam) print '</a>';

+					else print '</span>';

@@ -1025,6 +2051,27 @@
-				} elseif ($showmenu) {                 // Not enabled but visible (so greyed)

-					print '<div class="menu_titre">'.$tabstring;

-					print '<span class="vmenudisabled" title="'.dolPrintHTMLForAttribute($menu_array[$i]['titre']).'">';

-					if (!empty($menu_array[$i]['prefix'])) {

-						print $menu_array[$i]['prefix'];

-					}

+				}

+				elseif ($showmenu)                 // Not enabled but visible (so greyed)

+				{

+					print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";

+					$lastlevel0 = 'greyed';

+				}

+				else

+				{

+				    $lastlevel0 = 'hidden';

+				}

+				if ($showmenu)

+				{

+					print '<div class="menu_top"></div>'."\n";

+				}

+			}

+

+			// Menu level > 0

+			if ($menu_array[$i]['level'] > 0)

+			{

+				$cssmenu = '';

+				if ($menu_array[$i]['url']) $cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/', '', $menu_array[$i]['url']));

+

+				if ($menu_array[$i]['enabled'] && $lastlevel0 == 'enabled')     // Enabled so visible, except if parent was not enabled.

+				{

+					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring;

+					if ($shorturlwithoutparam) print '<a class="vsmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';

+					else print '<span class="vsmenu">';

@@ -1032 +2079,4 @@
-					print '</span>';

+					if ($shorturlwithoutparam) print '</a>';

+					else print '</span>';

+					// If title is not pure text and contains a table, no carriage return added

+					if (!strstr($menu_array[$i]['titre'], '<table')) print '<br>';

@@ -1034,42 +2084,4 @@
-					$lastlevel0 = 'greyed';

-				} else {

-					$lastlevel0 = 'hidden';

-				}

-				if ($showmenu) {

-					print '<div class="menu_top"></div>'."\n";

-				}

-			}

-

-			// Menu level > 0

-			if ($menu_array[$i]['level'] > 0) {

-				$cssmenu = '';

-				if ($menu_array[$i]['url']) {

-					$cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/', '', $menu_array[$i]['url']));

-				}

-

-				if ($menu_array[$i]['enabled'] && $lastlevel0 == 'enabled') {

-					// Enabled so visible, except if parent was not enabled.

-					print '<div class="menu_contenu'.$cssmenu.'">';

-					print $tabstring;

-					if ($shorturlwithoutparam) {

-						print '<a class="vsmenu" title="'.dol_escape_htmltag(dol_string_nohtmltag($menu_array[$i]['titre'])).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';

-					} else {

-						print '<span class="vsmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'">';

-					}

-					print $menu_array[$i]['titre'];

-					if ($shorturlwithoutparam) {

-						print '</a>';

-					} else {

-						print '</span>';

-					}

-					// If title is not pure text and contains a table, no carriage return added

-					if (!strstr($menu_array[$i]['titre'], '<table')) {

-						print '<br>';

-					}

-					print '</div>'."\n";

-				} elseif ($showmenu && $lastlevel0 == 'enabled') {

-					// Not enabled but visible (so greyed), except if parent was not enabled.

-					print '<div class="menu_contenu'.$cssmenu.'">';

-					print $tabstring;

-					print '<span class="vsmenudisabled vsmenudisabledmargin" title="'.dolPrintHTMLForAttribute($menu_array[$i]['titre']).'">'.$menu_array[$i]['titre'].'</span><br>';

-					print '</div>'."\n";

+				}

+				elseif ($showmenu && $lastlevel0 == 'enabled')       // Not enabled but visible (so greyed), except if parent was not enabled.

+				{

+					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";

@@ -1080,2 +2092,3 @@
-			if (empty($menu_array[$i + 1]['level'])) {               // End menu block

-				if ($showmenu) {

+			if (empty($menu_array[$i + 1]['level']))               // End menu block

+			{

+				if ($showmenu)

@@ -1083,5 +2096 @@
-				}

-				if ($blockvmenuopened) {

-					print '</div>'."\n";

-					$blockvmenuopened = false;

-				}

+				if ($blockvmenuopened) { print '</div>'."\n"; $blockvmenuopened = false; }

@@ -1091,3 +2100 @@
-		if ($altok) {

-			print '<div class="blockvmenuend"></div>'; // End menu block

-		}

+		if ($altok) print '<div class="blockvmenuend"></div>'; // End menu block

@@ -1098,1406 +2104,0 @@
-

-

-/**

- * Get left Menu HOME

- *

- * @param	string		$mainmenu		Main menu

- * @param	Menu 		$newmenu		Object Menu to return back list of menu entries

- * @param	int 		$usemenuhider	Use menu hider

- * @param	string 		$leftmenu		Left menu

- * @param	int 		$type_user		Type of user

- * @return	void

- */

-function get_left_menu_home($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = 'none', $type_user = 0)

-{

-	global $user, $conf, $langs;

-

-	if ($mainmenu == 'home') {

-		$langs->load("users");

-

-		// Home - dashboard

-		$newmenu->add("/index.php?mainmenu=home&amp;leftmenu=home", $langs->trans("MyDashboard"), 0, 1, '', $mainmenu, 'home', 0, '', '', '', '<i class="fas fa-chart-bar fa-fw paddingright pictofixedwidth"></i>');

-

-		// Setup

-		$newmenu->add("/admin/index.php?mainmenu=home&amp;leftmenu=setup", $langs->trans("Setup"), 0, $user->admin, '', $mainmenu, 'setup', 0, '', '', '', '<i class="fa fa-tools fa-fw paddingright pictofixedwidth"></i>');

-

-		if ($usemenuhider || empty($leftmenu) || $leftmenu == "setup") {

-			$nbmodulesnotautoenabled = count($conf->modules);

-			if (in_array('fckeditor', $conf->modules)) {

-				$nbmodulesnotautoenabled--;

-			}

-			if (in_array('export', $conf->modules)) {

-				$nbmodulesnotautoenabled--;

-			}

-			if (in_array('import', $conf->modules)) {

-				$nbmodulesnotautoenabled--;

-			}

-

-			// Load translation files required by the page

-			$langs->loadLangs(array("admin", "help"));

-			$warnpicto = '';

-			if (!getDolGlobalString('MAIN_INFO_SOCIETE_NOM') || !getDolGlobalString('MAIN_INFO_SOCIETE_COUNTRY') || getDolGlobalString('MAIN_INFO_SOCIETE_SETUP_TODO_WARNING')) {

-				$langs->load("errors");

-				$warnpicto = img_warning($langs->trans("WarningMandatorySetupNotComplete"));

-			}

-			$newmenu->add("/admin/company.php?mainmenu=home", $langs->trans("MenuCompanySetup").$warnpicto, 1);

-			$warnpicto = '';

-			if ($nbmodulesnotautoenabled <= getDolGlobalInt('MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING', 1)) {	// If only user module enabled

-				$langs->load("errors");

-				$warnpicto = img_warning($langs->trans("WarningMandatorySetupNotComplete"));

-			}

-			$newmenu->add("/admin/modules.php?mainmenu=home", $langs->trans("Modules").$warnpicto, 1);

-			$newmenu->add("/admin/ihm.php?mainmenu=home", $langs->trans("GUISetup"), 1);

-			$newmenu->add("/admin/menus.php?mainmenu=home", $langs->trans("Menus"), 1);

-

-			$newmenu->add("/admin/translation.php?mainmenu=home", $langs->trans("Translation"), 1);

-			$newmenu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"), 1);

-			$newmenu->add("/admin/boxes.php?mainmenu=home", $langs->trans("Boxes"), 1);

-			$newmenu->add("/admin/delais.php?mainmenu=home", $langs->trans("MenuWarnings"), 1);

-			$newmenu->add("/admin/security_other.php?mainmenu=home", $langs->trans("Security"), 1);

-			$newmenu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"), 1);

-			$newmenu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"), 1);

-

-			$warnpicto = '';

-			if (getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail') == 'mail' && !getDolGlobalString('MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP')) {

-				$langs->load("errors");

-				$warnpicto = img_warning($langs->trans("WarningPHPMailD"));

-			}

-			if (getDolGlobalString('MAIN_MAIL_SENDMODE') && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmail')) && !getDolGlobalString('MAIN_MAIL_SMTP_SERVER')) {

-				$langs->load("errors");

-				$warnpicto = img_warning($langs->trans("ErrorSetupOfEmailsNotComplete"));

-			}

-

-			$newmenu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails").$warnpicto, 1);

-			$newmenu->add("/admin/sms.php?mainmenu=home", $langs->trans("SMS"), 1);

-			$newmenu->add("/admin/dict.php?mainmenu=home", $langs->trans("Dictionary"), 1);

-			$newmenu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"), 1);

-		}

-

-		// System tools

-		$newmenu->add("/admin/tools/index.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("AdminTools"), 0, $user->admin, '', $mainmenu, 'admintools', 0, '', '', '', '<i class="fa fa-server fa-fw paddingright pictofixedwidth"></i>');

-		if ($usemenuhider || empty($leftmenu) || preg_match('/^admintools/', $leftmenu)) {

-			// Load translation files required by the page

-			$langs->loadLangs(array('admin', 'help'));

-

-			$newmenu->add('/admin/system/dolibarr.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('InfoDolibarr'), 1);

-			if ($usemenuhider || empty($leftmenu) || $leftmenu == 'admintools_info') {

-				$newmenu->add('/admin/system/modules.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('Modules'), 2);

-				$newmenu->add('/admin/triggers.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('Triggers'), 2);

-				$newmenu->add('/admin/system/filecheck.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('FileCheck'), 2);

-			}

-			$newmenu->add('/admin/system/browser.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoBrowser'), 1);

-			$newmenu->add('/admin/system/os.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoOS'), 1);

-			$newmenu->add('/admin/system/web.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoWebServer'), 1);

-			$newmenu->add('/admin/system/phpinfo.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoPHP'), 1);

-			$newmenu->add('/admin/system/database.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoDatabase'), 1);

-			$newmenu->add("/admin/system/perf.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("InfoPerf"), 1);

-			$newmenu->add("/admin/system/security.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("InfoSecurity"), 1);

-			$newmenu->add("/admin/tools/listevents.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Audit"), 1);

-			$newmenu->add("/admin/tools/listsessions.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Sessions"), 1);

-			$newmenu->add("/admin/tools/dolibarr_export.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Backup"), 1);

-			$newmenu->add("/admin/tools/dolibarr_import.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Restore"), 1);

-			$newmenu->add("/admin/tools/update.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("MenuUpgrade"), 1);

-			$newmenu->add("/admin/tools/purge.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Purge"), 1);

-			$newmenu->add('/admin/system/about.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('ExternalResources'), 1);

-

-			if (isModEnabled('product') || isModEnabled('service')) {

-				$langs->load("products");

-				$newmenu->add("/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("ProductVatMassChange"), 1, $user->admin);

-			}

-		}

-

-		$newmenu->add("/user/home.php?leftmenu=users", $langs->trans("MenuUsersAndGroups"), 0, $user->hasRight('user', 'user', 'read'), '', $mainmenu, 'users', 0, '', '', '', img_picto('', 'user', 'class="paddingright pictofixedwidth"'));

-		if ($user->hasRight('user', 'user', 'read')) {

-			if ($usemenuhider || empty($leftmenu) || $leftmenu == "users") {

-				$newmenu->add("", $langs->trans("Users"), 1, $user->hasRight('user', 'user', 'lire') || $user->admin);

-				$newmenu->add("/user/card.php?leftmenu=users&action=create", $langs->trans("NewUser"), 2, ($user->hasRight("user", "user", "write") || $user->admin) && !(isModEnabled('multicompany') && $conf->entity > 1 && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')), '', 'home');

-				$newmenu->add("/user/list.php?leftmenu=users", $langs->trans("ListOfUsers"), 2, $user->hasRight('user', 'user', 'lire') || $user->admin);

-				$newmenu->add("/user/hierarchy.php?leftmenu=users", $langs->trans("HierarchicView"), 2, $user->hasRight('user', 'user', 'lire') || $user->admin);

-				if (isModEnabled('categorie')) {

-					$langs->load("categories");

-					$newmenu->add("/categories/index.php?leftmenu=users&type=7", $langs->trans("UsersCategoriesShort"), 2, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');

-				}

-				$newmenu->add("", $langs->trans("Groups"), 1, ($user->hasRight('user', 'user', 'lire') || $user->admin) && !(isModEnabled('multicompany') && $conf->entity > 1 && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')));

-				$newmenu->add("/user/group/card.php?leftmenu=users&action=create", $langs->trans("NewGroup"), 2, ((getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight("user", "group_advance", "create") : $user->hasRight("user", "user", "creer")) || $user->admin) && !(isModEnabled('multicompany') && $conf->entity > 1 && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')));

-				$newmenu->add("/user/group/list.php?leftmenu=users", $langs->trans("ListOfGroups"), 2, ((getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('user', 'group_advance', 'read') : $user->hasRight('user', 'user', 'lire')) || $user->admin) && !(isModEnabled('multicompany') && $conf->entity > 1 && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')));

-			}

-		}

-	}

-}

-

-/**

- * Get left Menu THIRDPARTIES

- *

- * @param	string		$mainmenu		Main menu

- * @param	Menu 		$newmenu		Object Menu to return back list of menu entries

- * @param	int 		$usemenuhider	Use menu hider

- * @param	string 		$leftmenu		Left menu

- * @param	int 		$type_user		Type of targeted user for menu

- * @return	void

- */

-function get_left_menu_thridparties($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = 'none', $type_user = 0)

-{

-	global $user, $conf, $langs;

-

-	if ($mainmenu == 'companies') {

-		// Societes

-		if (isModEnabled('societe')) {

-			$langs->load("companies");

-			$newmenu->add("/societe/index.php?leftmenu=thirdparties", $langs->trans("ThirdParty"), 0, $user->hasRight('societe', 'lire'), '', $mainmenu, 'thirdparties', 0, '', '', '', img_picto('', 'company', 'class="paddingright pictofixedwidth"'));

-

-			if ($user->hasRight('societe', 'creer')) {

-				$newmenu->add("/societe/card.php?action=create", $langs->trans("MenuNewThirdParty"), 1);

-				if (!$conf->use_javascript_ajax) {

-					$newmenu->add("/societe/card.php?action=create&amp;private=1", $langs->trans("MenuNewPrivateIndividual"), 1);

-				}

-			}

-		}

-

-		$newmenu->add("/societe/list.php?leftmenu=thirdparties", $langs->trans("List"), 1);

-

-		// Prospects

-		if (isModEnabled('societe') && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTS')) {

-			$langs->load("commercial");

-			$newmenu->add("/societe/list.php?type=p&amp;leftmenu=prospects", $langs->trans("ListProspectsShort"), 2, $user->hasRight('societe', 'lire'), '', $mainmenu, 'prospects');

-			/* no more required, there is a filter that can do more

-			 if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=-1", $langs->trans("LastProspectDoNotContact"), 2, $user->hasRight('societe',  'lire'));

-			 if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=0", $langs->trans("LastProspectNeverContacted"), 2, $user->hasRight('societe',  'lire'));

-			 if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=1", $langs->trans("LastProspectToContact"), 2, $user->hasRight('societe',  'lire'));

-			 if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=2", $langs->trans("LastProspectContactInProcess"), 2, $user->hasRight('societe',  'lire'));

-			 if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=3", $langs->trans("LastProspectContactDone"), 2, $user->hasRight('societe',  'lire'));

-			 */

-			$newmenu->add("/societe/card.php?leftmenu=prospects&amp;action=create&amp;type=p", $langs->trans("MenuNewProspect"), 3, $user->hasRight('societe', 'creer'));

-		}

-

-		// Customers/Prospects

-		if (isModEnabled('societe') && !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS')) {

-			$langs->load("commercial");

-			$newmenu->add("/societe/list.php?type=c&amp;leftmenu=customers", $langs->trans("ListCustomersShort"), 2, $user->hasRight('societe', 'lire'), '', $mainmenu, 'customers');

-

-			$newmenu->add("/societe/card.php?leftmenu=customers&amp;action=create&amp;type=c", $langs->trans("MenuNewCustomer"), 3, $user->hasRight('societe', 'creer'));

-		}

-

-		// Suppliers

-		if (isModEnabled('societe') && (isModEnabled('supplier_order') || isModEnabled('supplier_invoice') || isModEnabled('supplier_proposal'))) {

-			$langs->load("suppliers");

-			$newmenu->add("/societe/list.php?type=f&amp;leftmenu=suppliers", $langs->trans("ListSuppliersShort"), 2, ($user->hasRight('fournisseur', 'lire') || $user->hasRight('supplier_order', 'lire') || $user->hasRight('supplier_invoice', 'lire') || $user->hasRight('supplier_proposal', 'lire')), '', $mainmenu, 'suppliers');

-			$newmenu->add("/societe/card.php?leftmenu=suppliers&amp;action=create&amp;type=f", $langs->trans("MenuNewSupplier"), 3, $user->hasRight('societe', 'creer') && ($user->hasRight('fournisseur', 'lire') || $user->hasRight('supplier_order', 'lire') || $user->hasRight('supplier_invoice', 'lire') || $user->hasRight('supplier_proposal', 'lire')));

-		}

-

-		// Categories

-		if (isModEnabled('categorie')) {

-			$langs->load("categories");

-			if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') || !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS')) {

-				// Categories prospects/customers

-				$menutoshow = $langs->trans("CustomersProspectsCategoriesShort");

-				if (getDolGlobalString('SOCIETE_DISABLE_PROSPECTS')) {

-					$menutoshow = $langs->trans("CustomersCategoriesShort");

-				}

-				if (getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS')) {

-					$menutoshow = $langs->trans("ProspectsCategoriesShort");

-				}

-				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=2", $menutoshow, 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');

-			}

-			// Categories suppliers

-			if (isModEnabled('supplier_proposal') || isModEnabled('supplier_order') || isModEnabled('supplier_invoice')) {

-				$newmenu->add("/categories/index.php?leftmenu=catfournish&amp;type=1", $langs->trans("SuppliersCategoriesShort"), 1, $user->hasRight('categorie', 'lire'));

-			}

-		}

-

-		// Contacts

-		$newmenu->add("/societe/index.php?leftmenu=thirdparties", (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses")), 0, $user->hasRight('societe', 'contact', 'lire'), '', $mainmenu, 'contacts', 0, '', '', '', img_picto('', 'contact', 'class="paddingright pictofixedwidth"'));

-

-		$newmenu->add("/contact/card.php?leftmenu=contacts&amp;action=create", (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("NewContact") : $langs->trans("NewContactAddress")), 1, $user->hasRight('societe', 'contact', 'creer'));

-		$newmenu->add("/contact/list.php?leftmenu=contacts", $langs->trans("List"), 1, $user->hasRight('societe', 'contact', 'lire'));

-		if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS')) {

-			$newmenu->add("/contact/list.php?leftmenu=contacts&type=p", $langs->trans("Prospects"), 2, $user->hasRight('societe', 'contact', 'lire'));

-		}

-		if (!getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS')) {

-			$newmenu->add("/contact/list.php?leftmenu=contacts&type=c", $langs->trans("Customers"), 2, $user->hasRight('societe', 'contact', 'lire'));

-		}

-		if (isModEnabled('supplier_proposal') || isModEnabled('supplier_order') || isModEnabled('supplier_invoice')) {

-			$newmenu->add("/contact/list.php?leftmenu=contacts&type=f", $langs->trans("Suppliers"), 2, $user->hasRight('fournisseur', 'lire'));

-		}

-		$newmenu->add("/contact/list.php?leftmenu=contacts&type=o", $langs->trans("ContactOthers"), 2, $user->hasRight('societe', 'contact', 'lire'));

-		//$newmenu->add("/contact/list.php?userid=$user->id", $langs->trans("MyContacts"), 1, $user->hasRight('societe',  'contact', 'lire'));

-

-		// Categories

-		if (isModEnabled('categorie')) {

-			$langs->load("categories");

-			// Categories Contact

-			$newmenu->add("/categories/index.php?leftmenu=catcontact&amp;type=4", $langs->trans("ContactCategoriesShort"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');

-		}

-	}

-}

-

-/**

- * Get left Menu COMMERCIAL (propal, commande, supplier_proposal, supplier_order, contrat, ficheinter)

- *

- * @param	string		$mainmenu		Main menu

- * @param	Menu 		$newmenu		Object Menu to return back list of menu entries

- * @param	int 		$usemenuhider	Use menu hider

- * @param	string 		$leftmenu		Left menu

- * @param	int 		$type_user		Type of targeted user for menu

- * @return	void

- */

-function get_left_menu_commercial($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = 'none', $type_user = 0)

-{

-	global $user, $conf, $langs;

-

-	if ($mainmenu == 'commercial') {

-		$langs->load("companies");

-

-		// Customer proposal

-		if (isModEnabled('propal')) {

-			$langs->load("propal");

-			$newmenu->add("/comm/propal/index.php?leftmenu=propals", $langs->trans("Proposals"), 0, $user->hasRight('propal', 'read'), '', $mainmenu, 'propals', 100, '', '', '', img_picto('', 'propal', 'class="paddingright pictofixedwidth"'));

-			$newmenu->add("/comm/propal/card.php?action=create&amp;leftmenu=propals", $langs->trans("NewPropal"), 1, $user->hasRight('propal', 'write'));

-			$newmenu->add("/comm/propal/list.php?leftmenu=propals", $langs->trans("List"), 1, $user->hasRight('propal', 'read'));

-			if ($usemenuhider || empty($leftmenu) || $leftmenu == "propals") {

-				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=0", $langs->trans("PropalsDraft"), 2, $user->hasRight('propal', 'read'));

-				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=1", $langs->trans("PropalsOpened"), 2, $user->hasRight('propal', 'read'));

-				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=2", $langs->trans("PropalStatusSigned"), 2, $user->hasRight('propal', 'read'));

-				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=3", $langs->trans("PropalStatusNotSigned"), 2, $user->hasRight('propal', 'read'));

-				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=4", $langs->trans("PropalStatusBilled"), 2, $user->hasRight('propal', 'read'));

-				//$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=2,3,4", $langs->trans("PropalStatusClosedShort"), 2, $user->hasRight('propal',  'read'));

-			}

-			$newmenu->add("/comm/propal/stats/index.php?leftmenu=propals", $langs->trans("Statistics"), 1, $user->hasRight('propal', 'read'));

-		}

-

-		// Customers orders

-		if (isModEnabled('commande')) {

-			$langs->load("orders");

-			$newmenu->add("/commande/index.php?leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->hasRight('commande', 'lire'), '', $mainmenu, 'orders', 200, '', '', '', img_picto('', 'order', 'class="paddingright pictofixedwidth"'));

-			$newmenu->add("/commande/card.php?action=create&amp;leftmenu=orders", $langs->trans("NewOrder"), 1, $user->hasRight('commande', 'creer'));

-			$newmenu->add("/commande/list.php?leftmenu=orders", $langs->trans("List"), 1, $user->hasRight('commande', 'lire'));

-			if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders") {

-				$newmenu->add("/commande/list.php?leftmenu=orders&search_status=0", $langs->trans("StatusOrderDraftShort"), 2, $user->hasRight('commande', 'lire'));

-				$newmenu->add("/commande/list.php?leftmenu=orders&search_status=1", $langs->trans("StatusOrderValidated"), 2, $user->hasRight('commande', 'lire'));

-				if (isModEnabled('expedition')) {

-					$newmenu->add("/commande/list.php?leftmenu=orders&search_status=2", $langs->trans("StatusOrderSentShort"), 2, $user->hasRight('commande', 'lire'));

-				}

-				$newmenu->add("/commande/list.php?leftmenu=orders&search_status=3", $langs->trans("StatusOrderDelivered"), 2, $user->hasRight('commande', 'lire'));

-				//$newmenu->add("/commande/list.php?leftmenu=orders&search_status=4", $langs->trans("StatusOrderProcessed"), 2, $user->hasRight('commande',  'lire'));

-				$newmenu->add("/commande/list.php?leftmenu=orders&search_status=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->hasRight('commande', 'lire'));

-			}

-			if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2 && empty($user->socid)) {

-				$newmenu->add("/commande/list_det.php?leftmenu=orders", $langs->trans("ListOrderLigne"), 1, $user->hasRight('commande', 'lire'));

-			}

-			if (getDolGlobalInt('MAIN_NEED_EXPORT_PERMISSION_TO_READ_STATISTICS')) {

-				$newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->hasRight('commande', 'commande', 'export'));

-			} else {

-				$newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->hasRight('commande', 'lire'));

-			}

-		}

-

-		// Supplier proposal

-		if (isModEnabled('supplier_proposal')) {

-			$langs->load("supplier_proposal");

-			$newmenu->add("/supplier_proposal/index.php?leftmenu=propals_supplier", $langs->trans("SupplierProposalsShort"), 0, $user->hasRight('supplier_proposal', 'lire'), '', $mainmenu, 'propals_supplier', 300, '', '', '', img_picto('', 'supplier_proposal', 'class="paddingright pictofixedwidth"'));

-			$newmenu->add("/supplier_proposal/card.php?action=create&amp;leftmenu=supplier_proposals", $langs->trans("SupplierProposalNew"), 1, $user->hasRight('supplier_proposal', 'creer'));

-			$newmenu->add("/supplier_proposal/list.php?leftmenu=supplier_proposals", $langs->trans("List"), 1, $user->hasRight('supplier_proposal', 'lire'));

-			$newmenu->add("/comm/propal/stats/index.php?leftmenu=supplier_proposals&amp;mode=supplier", $langs->trans("Statistics"), 1, $user->hasRight('supplier_proposal', 'lire'));

-		}

-

-		// Suppliers orders

-		if (isModEnabled('supplier_order')) {

-			$langs->load("orders");

-			$newmenu->add("/fourn/commande/index.php?leftmenu=orders_suppliers", $langs->trans("SuppliersOrders"), 0, $user->hasRight('fournisseur', 'commande', 'lire'), '', $mainmenu, 'orders_suppliers', 400, '', '', '', img_picto('', 'supplier_order', 'class="paddingright pictofixedwidth"'));

-			$newmenu->add("/fourn/commande/card.php?action=create&amp;leftmenu=orders_suppliers", $langs->trans("NewSupplierOrderShort"), 1, $user->hasRight('fournisseur', 'commande', 'creer'));

-			$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers", $langs->trans("List"), 1, $user->hasRight('fournisseur', 'commande', 'lire'));

-

-			if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders_suppliers") {

-				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=0", $langs->trans("StatusSupplierOrderDraftShort"), 2, $user->hasRight('fournisseur', 'commande', 'lire'));

-				if (!getDolGlobalString('SUPPLIER_ORDER_HIDE_VALIDATED')) {

-					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=1", $langs->trans("StatusSupplierOrderValidated"), 2, $user->hasRight('fournisseur', 'commande', 'lire'));

-				}

-				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=2", $langs->trans("StatusSupplierOrderApprovedShort"), 2, $user->hasRight('fournisseur', 'commande', 'lire'));

-				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=3", $langs->trans("StatusSupplierOrderOnProcessShort"), 2, $user->hasRight('fournisseur', 'commande', 'lire'));

-				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=4", $langs->trans("StatusSupplierOrderReceivedPartiallyShort"), 2, $user->hasRight('fournisseur', 'commande', 'lire'));

-				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=5", $langs->trans("StatusSupplierOrderReceivedAll"), 2, $user->hasRight('fournisseur', 'commande', 'lire'));

-				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=6,7", $langs->trans("StatusSupplierOrderCanceled"), 2, $user->hasRight('fournisseur', 'commande', 'lire'));

-				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=9", $langs->trans("StatusSupplierOrderRefused"), 2, $user->hasRight('fournisseur', 'commande', 'lire'));

-			}

-			// Billed is another field. We should add instead a dedicated filter on list. if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&billed=1", $langs->trans("Billed"), 2, $user->hasRight('fournisseur',  'commande', 'lire'));

-

-			if (getDolGlobalInt('MAIN_NEED_EXPORT_PERMISSION_TO_READ_STATISTICS')) {

-				$newmenu->add("/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier", $langs->trans("Statistics"), 1, $user->hasRight('fournisseur', 'commande', 'export'));

-			} else {

-				$newmenu->add("/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier", $langs->trans("Statistics"), 1, $user->hasRight('fournisseur', 'commande', 'lire'));

-			}

-		}

-

-		// Contrat

-		if (isModEnabled('contrat')) {

-			$langs->load("contracts");

-			$newmenu->add("/contrat/index.php?leftmenu=contracts", $langs->trans("ContractsSubscriptions"), 0, $user->hasRight('contrat', 'lire'), '', $mainmenu, 'contracts', 2000, '', '', '', img_picto('', 'contract', 'class="paddingright pictofixedwidth"'));

-			$newmenu->add("/contrat/card.php?action=create&amp;leftmenu=contracts", $langs->trans("NewContractSubscription"), 1, $user->hasRight('contrat', 'creer'));

-			$newmenu->add("/contrat/list.php?leftmenu=contracts", $langs->trans("List"), 1, $user->hasRight('contrat', 'lire'));

-			$newmenu->add("/contrat/services_list.php?leftmenu=contracts", $langs->trans("MenuServices"), 1, $user->hasRight('contrat', 'lire'));

-			if ($usemenuhider || empty($leftmenu) || $leftmenu == "contracts") {

-				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;search_status=0", $langs->trans("MenuInactiveServices"), 2, $user->hasRight('contrat', 'lire'));

-				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;search_status=4", $langs->trans("MenuRunningServices"), 2, $user->hasRight('contrat', 'lire'));

-				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;search_status=4%26filter=expired", $langs->trans("MenuExpiredServices"), 2, $user->hasRight('contrat', 'lire'));

-				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;search_status=5", $langs->trans("MenuClosedServices"), 2, $user->hasRight('contrat', 'lire'));

-			}

-		}

-

-		// Interventions

-		if (isModEnabled('ficheinter')) {

-			$langs->load("interventions");

-			$newmenu->add("/fichinter/index.php?leftmenu=ficheinter", $langs->trans("Interventions"), 0, $user->hasRight('ficheinter', 'lire'), '', $mainmenu, 'ficheinter', 2200, '', '', '', img_picto('', 'intervention', 'class="paddingright pictofixedwidth"'));

-			$newmenu->add("/fichinter/card.php?action=create&amp;leftmenu=ficheinter", $langs->trans("NewIntervention"), 1, $user->hasRight('ficheinter', 'creer'), '', '', '', 201);

-			$newmenu->add("/fichinter/list.php?leftmenu=ficheinter", $langs->trans("List"), 1, $user->hasRight('ficheinter', 'lire'), '', '', '', 202);

-			if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {

-				$newmenu->add("/fichinter/card-rec.php?leftmenu=ficheinter", $langs->trans("ListOfTemplates"), 1, $user->hasRight('ficheinter', 'lire'), '', '', '', 203);

-			}

-			$newmenu->add("/fichinter/stats/index.php?leftmenu=ficheinter", $langs->trans("Statistics"), 1, $user->hasRight('ficheinter', 'lire'));

-		}

-	}

-}

-

-/**

- * Get left COMPTA-FINANCIAL

- *

- * @param	string		$mainmenu		Main menu

- * @param	Menu 		$newmenu		Object Menu to return back list of menu entries

- * @param	int 		$usemenuhider	Use menu hider

- * @param	string 		$leftmenu		Left menu

- * @param	int 		$type_user		Type of targeted user for menu

- * @return	void

- */

-function get_left_menu_billing($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = 'none', $type_user = 0)

-{

-	global $user, $conf, $langs;

-

-	if ($mainmenu == 'billing') {

-		$langs->load("companies");

-

-		// Customers invoices

-		if (isModEnabled('facture')) {

-			$langs->load("bills");

-			$newmenu->add("/compta/facture/index.php?leftmenu=customers_bills", $langs->trans("BillsCustomers"), 0, $user->hasRight('facture', 'lire'), '', $mainmenu, 'customers_bills', 0, '', '', '', img_picto('', 'bill', 'class="paddingright pictofixedwidth"'));

-			$newmenu->add("/compta/facture/card.php?action=create", $langs->trans("NewBill"), 1, $user->hasRight('facture', 'creer'));

-			$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills", $langs->trans("List"), 1, $user->hasRight('facture', 'lire'), '', $mainmenu, 'customers_bills_list');

-

-			if ($usemenuhider || empty($leftmenu) || preg_match('/customers_bills(|_draft|_notpaid|_paid|_canceled)$/', $leftmenu)) {

-				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_draft&amp;search_status=0", $langs->trans("BillShortStatusDraft"), 2, $user->hasRight('facture', 'lire'));

-				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_notpaid&amp;search_status=1", $langs->trans("BillShortStatusNotPaid"), 2, $user->hasRight('facture', 'lire'));

-				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_paid&amp;search_status=2", $langs->trans("BillShortStatusPaid"), 2, $user->hasRight('facture', 'lire'));

-				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_canceled&amp;search_status=3", $langs->trans("BillShortStatusCanceled"), 2, $user->hasRight('facture', 'lire'));

-			}

-			$newmenu->add("/compta/facture/invoicetemplate_list.php?leftmenu=customers_bills_templates", $langs->trans("ListOfTemplates"), 1, $user->hasRight('facture', 'creer'), '', $mainmenu, 'customers_bills_templates'); // No need to see recurring invoices, if user has no permission to create invoice.

-

-			$newmenu->add("/compta/paiement/list.php?leftmenu=customers_bills_payment", $langs->trans("Payments"), 1, $user->hasRight('facture', 'lire'), '', $mainmenu, 'customers_bills_payment');

-

-			if (getDolGlobalString('BILL_ADD_PAYMENT_VALIDATION') && preg_match('/customers_bills_payment/', $leftmenu)) {

-				$newmenu->add("/compta/paiement/tovalidate.php?leftmenu=customers_bills_payment_tovalid", $langs->trans("MenuToValid"), 2, $user->hasRight('facture', 'lire'), '', $mainmenu, 'customers_bills_payment_tovalid');

-			}

-			if ($usemenuhider || empty($leftmenu) || preg_match('/customers_bills_payment/', $leftmenu)) {

-				$newmenu->add("/compta/paiement/rapport.php?leftmenu=customers_bills_payment_report", $langs->trans("Reportings"), 2, $user->hasRight('facture', 'lire'), '', $mainmenu, 'customers_bills_payment_report');

-			}

-

-			$newmenu->add("/compta/facture/stats/index.php?leftmenu=customers_bills_stats", $langs->trans("Statistics"), 1, $user->hasRight('facture', 'lire'), '', $mainmenu, 'customers_bills_stats');

-		}

-

-		// Suppliers invoices

-		if (isModEnabled('societe') && isModEnabled('supplier_invoice')) {

-			$langs->load("bills");

-			$newmenu->add("/fourn/facture/index.php?leftmenu=suppliers_bills", $langs->trans("BillsSuppliers"), 0, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'suppliers_bills', 0, '', '', '', img_picto('', 'supplier_invoice', 'class="paddingright pictofixedwidth"'));

-			$newmenu->add("/fourn/facture/card.php?leftmenu=suppliers_bills&amp;action=create", $langs->trans("NewBill"), 1, ($user->hasRight('fournisseur', 'facture', 'creer') || $user->hasRight('supplier_invoice', 'creer')), '', $mainmenu, 'suppliers_bills_create');

-			$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", $langs->trans("List"), 1, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'suppliers_bills_list');

-

-			if ($usemenuhider || empty($leftmenu) || preg_match('/suppliers_bills/', $leftmenu)) {

-				$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_draft&amp;search_status=0", $langs->trans("BillShortStatusDraft"), 2, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'suppliers_bills_draft');

-				$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_notpaid&amp;search_status=1", $langs->trans("BillShortStatusNotPaid"), 2, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'suppliers_bills_notpaid');

-				$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_paid&amp;search_status=2", $langs->trans("BillShortStatusPaid"), 2, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'suppliers_bills_paid');

-			}

-

-			$newmenu->add("/fourn/facture/list-rec.php?leftmenu=supplierinvoicestemplate_list", $langs->trans("ListOfTemplates"), 1, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'supplierinvoicestemplate_list');

-

-			$newmenu->add("/fourn/paiement/list.php?leftmenu=suppliers_bills_payment", $langs->trans("Payments"), 1, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'suppliers_bills_payment');

-

-			if ($usemenuhider || empty($leftmenu) || preg_match('/suppliers_bills/', $leftmenu)) {

-				$newmenu->add("/fourn/facture/rapport.php?leftmenu=suppliers_bills_payment_report", $langs->trans("Reportings"), 2, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'suppliers_bills_payment_report');

-			}

-

-			$newmenu->add("/compta/facture/stats/index.php?mode=supplier&amp;leftmenu=suppliers_bills_stats", $langs->trans("Statistics"), 1, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'suppliers_bills_stats');

-		}

-

-		// Orders

-		if (isModEnabled('commande')) {

-			$langs->load("orders");

-			if (isModEnabled('facture')) {

-				$newmenu->add("/commande/list.php?leftmenu=orders&amp;search_status=-3&amp;search_billed=0&amp;contextpage=billableorders", $langs->trans("MenuOrdersToBill2"), 0, $user->hasRight('commande',  'lire'), '', $mainmenu, 'orders', 0, '', '', '', img_picto('', 'order', 'class="paddingright pictofixedwidth"'));

-			}

-			//if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->hasRight('commande',  'lire'));

-		}

-

-		// Supplier Orders to bill

-		if (isModEnabled('supplier_invoice')) {

-			if (getDolGlobalString('SUPPLIER_MENU_ORDER_RECEIVED_INTO_INVOICE')) {

-				$langs->load("supplier");

-				$newmenu->add("/fourn/commande/list.php?leftmenu=orders&amp;search_status=5&amp;search_billed=0", $langs->trans("MenuOrdersSupplierToBill"), 0, $user->hasRight('commande',  'lire'), '', $mainmenu, 'orders', 0, '', '', '', img_picto('', 'supplier_order', 'class="paddingright pictofixedwidth"'));

-				//if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->hasRight('commande',  'lire'));

-			}

-		}

-

-

-		// Donations

-		if (isModEnabled('don')) {

-			$langs->load("donations");

-			$newmenu->add("/don/index.php?leftmenu=donations&amp;mainmenu=billing", $langs->trans("Donations"), 0, $user->hasRight('don', 'lire'), '', $mainmenu, 'donations', 0, '', '', '', img_picto('', 'donation', 'class="paddingright pictofixedwidth"'));

-			if ($usemenuhider || empty($leftmenu) || $leftmenu == "donations") {

-				$newmenu->add("/don/card.php?leftmenu=donations&amp;action=create", $langs->trans("NewDonation"), 1, $user->hasRight('don', 'creer'));

-				$newmenu->add("/don/list.php?leftmenu=donations", $langs->trans("List"), 1, $user->hasRight('don', 'lire'));

-			}

-			// if ($leftmenu=="donations") $newmenu->add("/don/stats/index.php",$langs->trans("Statistics"), 1, $user->hasRight('don',  'lire'));

-		}

-

-		// Taxes and social contributions

-		if (isModEnabled('tax')) {

-			$newmenu->add("/compta/charges/index.php?leftmenu=tax&amp;mainmenu=billing", $langs->trans("MenuTaxesAndSpecialExpenses"), 0, $user->hasRight('tax', 'charges', 'lire'), '', $mainmenu, 'tax', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));

-

-			$newmenu->add("/compta/sociales/list.php?leftmenu=tax_social", $langs->trans("MenuSocialContributions"), 1, $user->hasRight('tax', 'charges', 'lire'));

-			if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_social/i', $leftmenu)) {

-				$newmenu->add("/compta/sociales/card.php?leftmenu=tax_social&action=create", $langs->trans("MenuNewSocialContribution"), 2, $user->hasRight('tax', 'charges', 'creer'));

-				$newmenu->add("/compta/sociales/list.php?leftmenu=tax_social", $langs->trans("List"), 2, $user->hasRight('tax', 'charges', 'lire'));

-				$newmenu->add("/compta/sociales/payments.php?leftmenu=tax_social&amp;mainmenu=billing", $langs->trans("Payments"), 2, $user->hasRight('tax', 'charges', 'lire'));

-			}

-			// VAT

-			if (!getDolGlobalString('TAX_DISABLE_VAT_MENUS')) {

-				global $mysoc;

-

-				$newmenu->add("/compta/tva/list.php?leftmenu=tax_vat&amp;mainmenu=billing", $langs->transcountry("VAT", $mysoc->country_code), 1, $user->hasRight('tax', 'charges', 'lire'), '', $mainmenu, 'tax_vat');

-				if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_vat/i', $leftmenu)) {

-					$newmenu->add("/compta/tva/card.php?leftmenu=tax_vat&action=create", $langs->trans("New"), 2, $user->hasRight('tax', 'charges', 'creer'));

-					$newmenu->add("/compta/tva/list.php?leftmenu=tax_vat", $langs->trans("List"), 2, $user->hasRight('tax', 'charges', 'lire'));

-					$newmenu->add("/compta/tva/payments.php?mode=tvaonly&amp;leftmenu=tax_vat", $langs->trans("Payments"), 2, $user->hasRight('tax', 'charges', 'lire'));

-					$newmenu->add("/compta/tva/index.php?leftmenu=tax_vat", $langs->trans("ReportByMonth"), 2, $user->hasRight('tax', 'charges', 'lire'));

-					$newmenu->add("/compta/tva/clients.php?leftmenu=tax_vat", $langs->trans("ReportByThirdparties"), 2, $user->hasRight('tax', 'charges', 'lire'));

-					$newmenu->add("/compta/tva/quadri_detail.php?leftmenu=tax_vat", $langs->trans("ReportByQuarter"), 2, $user->hasRight('tax', 'charges', 'lire'));

-				}

-

-				//Local Taxes 1

-				if ($mysoc->useLocalTax(1) && (isset($mysoc->localtax1_assuj) && $mysoc->localtax1_assuj == "1")) {

-					$newmenu->add("/compta/localtax/list.php?leftmenu=tax_1_vat&amp;mainmenu=billing&amp;localTaxType=1", $langs->transcountry("LT1", $mysoc->country_code), 1, $user->hasRight('tax', 'charges', 'lire'));

-					if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_1_vat/i', $leftmenu)) {

-						$newmenu->add("/compta/localtax/card.php?leftmenu=tax_1_vat&action=create&amp;localTaxType=1", $langs->trans("New"), 2, $user->hasRight('tax', 'charges', 'creer'));

-						$newmenu->add("/compta/localtax/list.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("List"), 2, $user->hasRight('tax', 'charges', 'lire'));

-						$newmenu->add("/compta/localtax/index.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByMonth"), 2, $user->hasRight('tax', 'charges', 'lire'));

-						$newmenu->add("/compta/localtax/clients.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByThirdparties"), 2, $user->hasRight('tax', 'charges', 'lire'));

-						$newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByQuarter"), 2, $user->hasRight('tax', 'charges', 'lire'));

-					}

-				}

-				//Local Taxes 2

-				if ($mysoc->useLocalTax(2) && (isset($mysoc->localtax2_assuj) && $mysoc->localtax2_assuj == "1")) {

-					$newmenu->add("/compta/localtax/list.php?leftmenu=tax_2_vat&amp;mainmenu=billing&amp;localTaxType=2", $langs->transcountry("LT2", $mysoc->country_code), 1, $user->hasRight('tax', 'charges', 'lire'));

-					if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_2_vat/i', $leftmenu)) {

-						$newmenu->add("/compta/localtax/card.php?leftmenu=tax_2_vat&action=create&amp;localTaxType=2", $langs->trans("New"), 2, $user->hasRight('tax', 'charges', 'creer'));

-						$newmenu->add("/compta/localtax/list.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("List"), 2, $user->hasRight('tax', 'charges', 'lire'));

-						$newmenu->add("/compta/localtax/index.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByMonth"), 2, $user->hasRight('tax', 'charges', 'lire'));

-						$newmenu->add("/compta/localtax/clients.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByThirdparties"), 2, $user->hasRight('tax', 'charges', 'lire'));

-						$newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByQuarter"), 2, $user->hasRight('tax', 'charges', 'lire'));

-					}

-				}

-			}

-		}

-

-		// Salaries

-		if (isModEnabled('salaries')) {

-			$langs->load("salaries");

-			$newmenu->add("/salaries/list.php?leftmenu=tax_salary&amp;mainmenu=billing", $langs->trans("Salaries"), 0, $user->hasRight('salaries', 'read'), '', $mainmenu, 'tax_salary', 0, '', '', '', img_picto('', 'salary', 'class="paddingright pictofixedwidth"'));

-			if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_salary/i', $leftmenu)) {

-				$newmenu->add("/salaries/card.php?leftmenu=tax_salary&action=create", $langs->trans("New"), 1, $user->hasRight('salaries', 'write'));

-				$newmenu->add("/salaries/list.php?leftmenu=tax_salary", $langs->trans("List"), 1, $user->hasRight('salaries', 'read'));

-				$newmenu->add("/salaries/payments.php?leftmenu=tax_salary", $langs->trans("Payments"), 1, $user->hasRight('salaries', 'read'));

-				$newmenu->add("/salaries/stats/index.php?leftmenu=tax_salary", $langs->trans("Statistics"), 1, $user->hasRight('salaries', 'read'));

-			}

-		}

-

-		// Loan

-		if (isModEnabled('loan')) {

-			$langs->load("loan");

-			$newmenu->add("/loan/list.php?leftmenu=tax_loan&amp;mainmenu=billing", $langs->trans("Loans"), 0, $user->hasRight('loan', 'read'), '', $mainmenu, 'tax_loan', 0, '', '', '', img_picto('', 'loan', 'class="paddingright pictofixedwidth"'));

-			if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_loan/i', $leftmenu)) {

-				$newmenu->add("/loan/card.php?leftmenu=tax_loan&action=create", $langs->trans("NewLoan"), 1, $user->hasRight('loan', 'write'));

-				//$newmenu->add("/loan/payment/list.php?leftmenu=tax_loan",$langs->trans("Payments"),2,$user->hasRight('loan',  'read'));

-			}

-		}

-

-		// Various payment

-		if (isModEnabled('banque') && !getDolGlobalString('BANK_USE_OLD_VARIOUS_PAYMENT')) {

-			$langs->load("banks");

-			$newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various&amp;mainmenu=billing", $langs->trans("MenuVariousPayment"), 0, $user->hasRight('banque', 'lire'), '', $mainmenu, 'tax_various', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));

-			if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_various/i', $leftmenu)) {

-				$newmenu->add("/compta/bank/various_payment/card.php?leftmenu=tax_various&action=create", $langs->trans("New"), 1, $user->hasRight('banque', 'modifier'));

-				$newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various", $langs->trans("List"), 1, $user->hasRight('banque', 'lire'));

-			}

-		}

-	}

-}

-

-/**

- * Get left COMPTA-FINANCIAL (accountancy)

- *

- * @param	string		$mainmenu		Main menu

- * @param	Menu 		$newmenu		Object Menu to return back list of menu entries

- * @param	int 		$usemenuhider	Use menu hider

- * @param	string 		$leftmenu		Left menu

- * @param	int 		$type_user		Type of targeted user for menu

- * @return	void

- */

-function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = 'none', $type_user = 0)

-{

-	global $user, $conf, $langs;

-	global $db;

-

-	if ($mainmenu == 'accountancy') {

-		$langs->load("companies");

-

-		// Accounting (Double entries)

-		if (isModEnabled('accounting')) {

-			//$permtoshowmenu = (isModEnabled('accounting') || $user->hasRight('accounting',  'bind', 'write') || $user->hasRight('compta',  'resultat', 'lire'));

-			//$newmenu->add("/accountancy/index.php?leftmenu=accountancy", $langs->trans("MenuAccountancy"), 0, $permtoshowmenu, '', $mainmenu, 'accountancy');

-

-			// Configuration

-			$newmenu->add("/accountancy/index.php?leftmenu=accountancy_admin", $langs->trans("Setup"), 0, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin', 1, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));

-			if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/', $leftmenu)) {

-				global $mysoc;

-				$newmenu->add("/accountancy/admin/index.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("General"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_general', 10);

-

-				// Fiscal year

-				$newmenu->add("/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("FiscalPeriod"), 1, $user->hasRight('accounting', 'fiscalyear', 'write'), '', $mainmenu, 'fiscalyear', 20);

-

-				$newmenu->add("/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingJournals"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_journal', 30);

-				$newmenu->add("/accountancy/admin/accountmodel.php?id=31&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Pcg_version"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_chartmodel', 40);

-				$newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_chart', 41);

-				$newmenu->add("/accountancy/admin/subaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ChartOfSubaccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_chart', 41);

-				$newmenu->add("/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuDefaultAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_default', 60);

-				if (isModEnabled('banque')) {

-					$newmenu->add("/compta/bank/list.php?mainmenu=accountancy&leftmenu=accountancy_admin&search_status=-1", $langs->trans("MenuBankAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_bank', 70);

-				}

-				if (isModEnabled('facture') || isModEnabled('supplier_invoice')) {

-					$newmenu->add("/admin/dict.php?id=10&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuVatAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_default', 80);

-				}

-				if (isModEnabled('tax')) {

-					$newmenu->add("/admin/dict.php?id=7&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuTaxAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_default', 90);

-				}

-				if (isModEnabled('expensereport')) {

-					$newmenu->add("/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuExpenseReportAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_default', 100);

-				}

-				$newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuProductsAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_product', 110);

-				$newmenu->add("/accountancy/admin/closure.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuClosureAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_closure', 120);

-				$newmenu->add("/accountancy/admin/categories_list.php?id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_chart', 125);

-				$newmenu->add("/accountancy/admin/export.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ExportOptions"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_export', 130);

-			}

-

-			// Transfer in accounting

-			$newmenu->add("/accountancy/index.php?leftmenu=accountancy_transfer", $langs->trans("TransferInAccounting"), 0, $user->hasRight('accounting', 'bind', 'write'), '', $mainmenu, 'transfer', 1, '', '', '', img_picto('', 'long-arrow-alt-right', 'class="paddingright pictofixedwidth"'));

-

-			// Binding

-			// $newmenu->add("", $langs->trans("Binding"), 0, $user->hasRight('accounting',  'bind', 'write'), '', $mainmenu, 'dispatch');

-			if (isModEnabled('facture') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_SALES')) {

-				$newmenu->add("/accountancy/customer/index.php?leftmenu=accountancy_dispatch_customer&amp;mainmenu=accountancy", $langs->trans("CustomersVentilation"), 1, $user->hasRight('accounting', 'bind', 'write'), '', $mainmenu, 'dispatch_customer');

-				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_customer/', $leftmenu)) {

-					$newmenu->add("/accountancy/customer/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer", $langs->trans("ToBind"), 2, $user->hasRight('accounting', 'bind', 'write'));

-					$newmenu->add("/accountancy/customer/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer", $langs->trans("Binded"), 2, $user->hasRight('accounting', 'bind', 'write'));

-				}

-			}

-			if (isModEnabled('supplier_invoice') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_PURCHASES')) {

-				$newmenu->add("/accountancy/supplier/index.php?leftmenu=accountancy_dispatch_supplier&amp;mainmenu=accountancy", $langs->trans("SuppliersVentilation"), 1, $user->hasRight('accounting', 'bind', 'write'), '', $mainmenu, 'dispatch_supplier');

-				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_supplier/', $leftmenu)) {

-					$newmenu->add("/accountancy/supplier/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier", $langs->trans("ToBind"), 2, $user->hasRight('accounting', 'bind', 'write'));

-					$newmenu->add("/accountancy/supplier/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier", $langs->trans("Binded"), 2, $user->hasRight('accounting', 'bind', 'write'));

-				}

-			}

-			if (isModEnabled('expensereport') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS')) {

-				$newmenu->add("/accountancy/expensereport/index.php?leftmenu=accountancy_dispatch_expensereport&amp;mainmenu=accountancy", $langs->trans("ExpenseReportsVentilation"), 1, $user->hasRight('accounting', 'bind', 'write'), '', $mainmenu, 'dispatch_expensereport');

-				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_expensereport/', $leftmenu)) {

-					$newmenu->add("/accountancy/expensereport/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport", $langs->trans("ToBind"), 2, $user->hasRight('accounting', 'bind', 'write'));

-					$newmenu->add("/accountancy/expensereport/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport", $langs->trans("Binded"), 2, $user->hasRight('accounting', 'bind', 'write'));

-				}

-			}

-

-			// Journals

-			if (isModEnabled('accounting') && $user->hasRight('accounting', 'comptarapport', 'lire') && $mainmenu == 'accountancy') {

-				$newmenu->add('', $langs->trans("RegistrationInAccounting"), 1, $user->hasRight('accounting', 'comptarapport', 'lire'), '', $mainmenu, 'accountancy_journal');

-

-				// Multi journal

-				$sql = "SELECT rowid, code, label, nature";

-				$sql .= " FROM ".MAIN_DB_PREFIX."accounting_journal";

-				$sql .= " WHERE entity = ".((int) $conf->entity);

-				$sql .= " AND active = 1";

-				$sql .= " ORDER BY nature ASC, label DESC";

-

-				$resql = $db->query($sql);

-				if ($resql) {

-					$numr = $db->num_rows($resql);

-					$i = 0;

-

-					if ($numr > 0) {

-						while ($i < $numr) {

-							$objp = $db->fetch_object($resql);

-

-							$nature = '';

-

-							// Must match array $sourceList defined into journals_list.php

-							if ($objp->nature == 2 && isModEnabled('facture') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_SALES')) {

-								$nature = "sells";

-							}

-							if ($objp->nature == 3

-								&& isModEnabled('supplier_invoice')

-								&& !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_PURCHASES')) {

-								$nature = "purchases";

-							}

-							if ($objp->nature == 4 && isModEnabled('banque')) {

-								$nature = "bank";

-							}

-							if ($objp->nature == 5 && isModEnabled('expensereport') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS')) {

-								$nature = "expensereports";

-							}

-							if ($objp->nature == 1 && isModEnabled('asset')) {

-								$nature = "various";	// Warning: The page /accountancy/journal/variousjournal.php is bugged. It read tables that does not exists.

-							}

-							if ($objp->nature == 8) {

-								$nature = "inventory";

-							}

-							if ($objp->nature == 9) {

-								$nature = "hasnew";

-							}

-

-							// To enable when page exists

-							if (!getDolGlobalString('ACCOUNTANCY_SHOW_DEVELOP_JOURNAL')) {

-								if ($nature == 'hasnew' || $nature == 'inventory') {

-									$nature = '';

-								}

-							}

-

-							if ($nature) {

-								$langs->load('accountancy');

-								$journallabel = '';

-								if ($objp->label) {

-									$journallabelwithoutspan = $langs->trans($objp->label);

-									$journallabel = '<span class="opacitymedium">('.$langs->trans($objp->label).')</span>'; // Label of bank account in llx_accounting_journal

-								}

-

-								$key = $langs->trans("AccountingJournalType".$objp->nature);	// $objp->nature is 1, 2, 3 ...

-								$transferlabel = (($objp->nature && $key != "AccountingJournalType".$objp->nature) ? $key.($journallabelwithoutspan != $key ? ' '.$journallabel : '') : $journallabel);

-

-								$newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $transferlabel, 2, $user->hasRight('accounting', 'comptarapport', 'lire'));

-							}

-							$i++;

-						}

-					} else {

-						// Should not happend. Entries are added

-						$newmenu->add('', $langs->trans("NoJournalDefined"), 2, $user->hasRight('accounting', 'comptarapport', 'lire'));

-					}

-				} else {

-					dol_print_error($db);

-				}

-				$db->free($resql);

-			}

-

-			// Files

-			if (!getDolGlobalString('ACCOUNTANCY_HIDE_EXPORT_FILES_MENU')) {

-				$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 1, $user->hasRight('accounting', 'mouvements', 'lire'));

-			}

-

-

-			// Accounting

-			$newmenu->add("/accountancy/index.php?leftmenu=accountancy_accountancy", $langs->trans("MenuAccountancy"), 0, $user->hasRight('accounting', 'mouvements', 'lire') || $user->hasRight('accounting', 'comptarapport', 'lire'), '', $mainmenu, 'accountancy', 1, '', '', '', img_picto('', 'accountancy', 'class="paddingright pictofixedwidth"'));

-

-			// General Ledger

-			$newmenu->add("/accountancy/bookkeeping/listbyaccount.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("Bookkeeping"), 1, $user->hasRight('accounting', 'mouvements', 'lire'));

-

-			// Journals

-			$newmenu->add("/accountancy/bookkeeping/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("Journals"), 1, $user->hasRight('accounting', 'mouvements', 'lire'));

-

-			// Account Balance

-			$newmenu->add("/accountancy/bookkeeping/balance.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("AccountBalance"), 1, $user->hasRight('accounting', 'mouvements', 'lire'));

-

-			// Export accountancy

-			$newmenu->add("/accountancy/bookkeeping/export.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("MenuExportAccountancy"), 1, $user->hasRight('accounting', 'mouvements', 'lire'));

-

-			// Closure

-			$newmenu->add("/accountancy/closure/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_closure", $langs->trans("MenuAccountancyClosure"), 1, $user->hasRight('accounting', 'fiscalyear', 'write'), '', $mainmenu, 'closure');

-

-			// Reports

-			$newmenu->add("/accountancy/index.php?leftmenu=accountancy_report", $langs->trans("Reportings"), 1, $user->hasRight('accounting', 'comptarapport', 'lire'), '', $mainmenu, 'ca');

-

-			if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {

-				$newmenu->add("/compta/resultat/index.php?leftmenu=accountancy_report", $langs->trans("MenuReportInOut"), 2, $user->hasRight('accounting', 'comptarapport', 'lire'));

-				$newmenu->add("/compta/resultat/clientfourn.php?leftmenu=accountancy_report", $langs->trans("ByPredefinedAccountGroups"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));

-				$newmenu->add("/compta/resultat/result.php?leftmenu=accountancy_report", $langs->trans("ByPersonalizedAccountGroups"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));

-			}

-

-			$modecompta = 'CREANCES-DETTES';

-			if (isModEnabled('accounting') && $user->hasRight('accounting', 'comptarapport', 'lire') && $mainmenu == 'accountancy') {

-				$modecompta = 'BOOKKEEPING'; // Not yet implemented. Should be BOOKKEEPINGCOLLECTED

-			}

-			if ($modecompta) {

-				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {

-					$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnover"), 2, $user->hasRight('accounting', 'comptarapport', 'lire'));

-					$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));

-					$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));

-					$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));

-					$newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByVatRate"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));

-				}

-			}

-

-			$modecompta = 'RECETTES-DEPENSES';

-			//if (isModEnabled('accounting') && $user->hasRight('accounting',  'comptarapport', 'lire') && $mainmenu == 'accountancy') $modecompta='';	// Not yet implemented. Should be BOOKKEEPINGCOLLECTED

-			if ($modecompta) {

-				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {

-					$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnoverCollected"), 2, $user->hasRight('accounting', 'comptarapport', 'lire'));

-					$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));

-					$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));

-					//$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"),3,$user->hasRight('accounting',  'comptarapport', 'lire'));

-					//$newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByVatRate"),3,$user->hasRight('accounting',  'comptarapport', 'lire'));

-				}

-			}

-

-			$modecompta = 'CREANCES-DETTES';

-			if (isModEnabled('accounting') && $user->hasRight('accounting', 'comptarapport', 'lire') && $mainmenu == 'accountancy') {

-				$modecompta = 'BOOKKEEPING'; // Not yet implemented.

-			}

-			if ($modecompta && isModEnabled('supplier_invoice')) {

-				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {

-					$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnover"), 2, $user->hasRight('accounting', 'comptarapport', 'lire'));

-					$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));

-					$newmenu->add("/compta/stats/supplier_turnover_by_prodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));

-				}

-			}

-

-			$modecompta = 'RECETTES-DEPENSES';

-			if (isModEnabled('accounting') && $user->hasRight('accounting', 'comptarapport', 'lire') && $mainmenu == 'accountancy') {

-				$modecompta = 'BOOKKEEPINGCOLLECTED'; // Not yet implemented.

-			}

-			if ($modecompta && ((isModEnabled('fournisseur') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || isModEnabled('supplier_invoice'))) {

-				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {

-					$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnoverCollected"), 2, $user->hasRight('accounting', 'comptarapport', 'lire'));

-					$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));

-				}

-			}

-		}

-

-		// Accountancy (simple)

-		if (isModEnabled('comptabilite')) {

-			// Files

-			if (!getDolGlobalString('ACCOUNTANCY_HIDE_EXPORT_FILES_MENU')) {

-				$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 0, $user->hasRight('compta', 'resultat', 'lire'), '', $mainmenu, 'files', 0, '', '', '', img_picto('', 'accountancy', 'class="paddingright pictofixedwidth"'));

-			}

-

-			// Bilan, resultats

-			$newmenu->add("/compta/resultat/index.php?leftmenu=report&mainmenu=accountancy", $langs->trans("Reportings"), 0, $user->hasRight('compta', 'resultat', 'lire'), '', $mainmenu, 'ca', 0, '', '', '', img_picto('', 'accountancy', 'class="paddingright pictofixedwidth"'));

-

-			if ($usemenuhider || empty($leftmenu) || preg_match('/report/', $leftmenu)) {

-				$newmenu->add("/compta/resultat/index.php?leftmenu=report", $langs->trans("MenuReportInOut"), 1, $user->hasRight('compta', 'resultat', 'lire'));

-				$newmenu->add("/compta/resultat/clientfourn.php?leftmenu=report", $langs->trans("ByPredefinedAccountGroups"), 2, $user->hasRight('compta', 'resultat', 'lire'));

-				/* On verra ca avec module compabilite expert

-				 $newmenu->add("/compta/resultat/compteres.php?leftmenu=report","Compte de resultat",2,$user->hasRight('compta',  'resultat', 'lire'));

-				 $newmenu->add("/compta/resultat/bilan.php?leftmenu=report","Bilan",2,$user->hasRight('compta',  'resultat', 'lire'));

-				 */

-

-				/*

-				 $newmenu->add("/compta/stats/cumul.php?leftmenu=report","Cumule",2,$user->hasRight('compta',  'resultat', 'lire'));

-				 if (isModEnabled('propal')) {

-				 $newmenu->add("/compta/stats/prev.php?leftmenu=report","Previsionnel",2,$user->hasRight('compta',  'resultat', 'lire'));

-				 $newmenu->add("/compta/stats/comp.php?leftmenu=report","Transforme",2,$user->hasRight('compta',  'resultat', 'lire'));

-				 }

-				 */

-

-				$modecompta = 'CREANCES-DETTES';

-				$newmenu->add("/compta/stats/index.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ReportTurnover"), 1, $user->hasRight('compta', 'resultat', 'lire'));

-				$newmenu->add("/compta/stats/casoc.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->hasRight('compta', 'resultat', 'lire'));

-				$newmenu->add("/compta/stats/cabyuser.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByUsers"), 2, $user->hasRight('compta', 'resultat', 'lire'));

-				$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 2, $user->hasRight('compta', 'resultat', 'lire'));

-				$newmenu->add("/compta/stats/byratecountry.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByVatRate"), 2, $user->hasRight('compta', 'resultat', 'lire'));

-

-				$modecompta = 'RECETTES-DEPENSES';

-				$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnoverCollected"), 1, $user->hasRight('compta', 'resultat', 'lire'));

-				$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->hasRight('compta', 'resultat', 'lire'));

-				$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 2, $user->hasRight('compta', 'resultat', 'lire'));

-

-				//Achats

-				$modecompta = 'CREANCES-DETTES';

-				$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnover"), 1, $user->hasRight('compta', 'resultat', 'lire'));

-				$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->hasRight('compta', 'resultat', 'lire'));

-				$newmenu->add("/compta/stats/supplier_turnover_by_prodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 2, $user->hasRight('compta', 'resultat', 'lire'));

-

-				/*

-				 $modecompta = 'RECETTES-DEPENSES';

-				 $newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnoverCollected"), 1, $user->hasRight('compta',  'resultat', 'lire'));

-				 $newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->hasRight('compta',  'resultat', 'lire'));

-				 $newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 2, $user->hasRight('compta',  'resultat', 'lire'));

-				 */

-

-				// Journals

-				$newmenu->add("/compta/journal/sellsjournal.php?leftmenu=report", $langs->trans("SellsJournal"), 1, $user->hasRight('compta', 'resultat', 'lire'), '', '', '', 50);

-				$newmenu->add("/compta/journal/purchasesjournal.php?leftmenu=report", $langs->trans("PurchasesJournal"), 1, $user->hasRight('compta', 'resultat', 'lire'), '', '', '', 51);

-			}

-			//if ($leftmenu=="ca") $newmenu->add("/compta/journaux/index.php?leftmenu=ca",$langs->trans("Journals"),1,$user->hasRight('compta',  'resultat', 'lire')||$user->hasRight('accounting',  'comptarapport', 'lire'));

-		}

-

-		// Intracomm report

-		if (isModEnabled('intracommreport')) {

-			$newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReport"), 0, $user->hasRight('intracommreport', 'read'), '', $mainmenu, 'intracommreport', 60, '', '', '', img_picto('', 'intracommreport', 'class="paddingright pictofixedwidth"'));

-			if ($usemenuhider || empty($leftmenu) || preg_match('/intracommreport/', $leftmenu)) {

-				// DEB / DES

-				$newmenu->add("/intracommreport/card.php?action=create&leftmenu=intracommreport", $langs->trans("MenuIntracommReportNew"), 1, $user->hasRight('intracommreport', 'write'), '', $mainmenu, 'intracommreport', 1);

-				$newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReportList"), 1, $user->hasRight('intracommreport', 'read'), '', $mainmenu, 'intracommreport', 1);

-			}

-		}

-

-		// Assets

-		if (isModEnabled('asset')) {

-			$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuAssets"), 0, $user->hasRight('asset', 'read'), '', $mainmenu, 'asset', 100, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));

-			$newmenu->add("/asset/card.php?leftmenu=asset&amp;action=create", $langs->trans("MenuNewAsset"), 1, $user->hasRight('asset', 'write'));

-			$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuListAssets"), 1, $user->hasRight('asset', 'read'));

-			$newmenu->add("/asset/model/list.php?leftmenu=asset_model", $langs->trans("MenuAssetModels"), 1, (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'read')) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'model_advance', 'read')), '', $mainmenu, 'asset_model');

-			if ($usemenuhider || empty($leftmenu) || preg_match('/asset_model/', $leftmenu)) {

-				$newmenu->add("/asset/model/card.php?leftmenu=asset_model&amp;action=create", $langs->trans("MenuNewAssetModel"), 2, (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'write')) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'model_advance', 'write')));

-				$newmenu->add("/asset/model/list.php?leftmenu=asset_model", $langs->trans("MenuListAssetModels"), 2, (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'read')) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'model_advance', 'read')));

-			}

-		}

-	}

-}

-

-/**

- * Get left Menu BANK

- *

- * @param	string		$mainmenu		Main menu

- * @param	Menu 		$newmenu		Object Menu to return back list of menu entries

- * @param	int 		$usemenuhider	Use menu hider

- * @param	string 		$leftmenu		Left menu

- * @param	int 		$type_user		Type of targeted user for menu

- * @return	void

- */

-function get_left_menu_bank($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = 'none', $type_user = 0)

-{

-	global $user, $conf, $langs;

-

-	if ($mainmenu == 'bank') {

-		// Load translation files required by the page

-		$langs->loadLangs(array("withdrawals", "banks", "bills", "categories"));

-

-		// Bank-Cash account

-		if (isModEnabled('banque')) {

-			$newmenu->add("/compta/bank/list.php?leftmenu=bank&amp;mainmenu=bank", $langs->trans("MenuBankCash"), 0, $user->hasRight('banque', 'lire'), '', $mainmenu, 'bank', 0, '', '', '', img_picto('', 'bank_account', 'class="paddingright pictofixedwidth"'));

-

-			$newmenu->add("/compta/bank/card.php?action=create", $langs->trans("MenuNewFinancialAccount"), 1, $user->hasRight('banque', 'configurer'));

-			$newmenu->add("/compta/bank/list.php?leftmenu=bank&amp;mainmenu=bank", $langs->trans("List"), 1, $user->hasRight('banque', 'lire'), '', $mainmenu, 'bank');

-			$newmenu->add("/compta/bank/bankentries_list.php", $langs->trans("ListTransactions"), 1, $user->hasRight('banque', 'lire'));

-			$newmenu->add("/compta/bank/budget.php", $langs->trans("ListTransactionsByCategory"), 1, $user->hasRight('banque', 'lire'));

-

-			$newmenu->add("/compta/bank/transfer.php", $langs->trans("MenuBankInternalTransfer"), 1, $user->hasRight('banque', 'transfer'));

-		}

-

-		if (isModEnabled('categorie')) {

-			$langs->load("categories");

-			$newmenu->add("/categories/index.php?type=5", $langs->trans("Rubriques"), 1, $user->hasRight('categorie', 'creer'), '', $mainmenu, 'tags');

-			$newmenu->add("/compta/bank/categ.php", $langs->trans("RubriquesTransactions"), 1, $user->hasRight('banque', 'configurer'), '', $mainmenu, 'tags');

-		}

-

-		// Direct debit order

-		if (isModEnabled('prelevement')) {

-			$newmenu->add("/compta/prelevement/index.php?leftmenu=withdraw&amp;mainmenu=bank", $langs->trans("PaymentByDirectDebit"), 0, $user->hasRight('prelevement', 'bons', 'lire'), '', $mainmenu, 'withdraw', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));

-

-			if ($usemenuhider || empty($leftmenu) || $leftmenu == "withdraw") {

-				$newmenu->add("/compta/prelevement/create.php?mainmenu=bank", $langs->trans("NewStandingOrder"), 1, $user->hasRight('prelevement', 'bons', 'creer'));

-

-				$newmenu->add("/compta/prelevement/orders_list.php?mainmenu=bank", $langs->trans("WithdrawalsReceipts"), 1, $user->hasRight('prelevement', 'bons', 'lire'));

-				$newmenu->add("/compta/prelevement/list.php?mainmenu=bank", $langs->trans("WithdrawalsLines"), 1, $user->hasRight('prelevement', 'bons', 'lire'));

-				$newmenu->add("/compta/prelevement/rejets.php?mainmenu=bank", $langs->trans("Rejects"), 1, $user->hasRight('prelevement', 'bons', 'lire'));

-				$newmenu->add("/compta/prelevement/stats.php?mainmenu=bank", $langs->trans("Statistics"), 1, $user->hasRight('prelevement', 'bons', 'lire'));

-			}

-		}

-

-		// Bank transfer order

-		if (isModEnabled('paymentbybanktransfer')) {

-			$newmenu->add("/compta/paymentbybanktransfer/index.php?leftmenu=banktransfer&amp;mainmenu=bank", $langs->trans("PaymentByBankTransfer"), 0, $user->hasRight('paymentbybanktransfer', 'read'), '', $mainmenu, 'banktransfer', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));

-

-			if ($usemenuhider || empty($leftmenu) || $leftmenu == "banktransfer") {

-				$newmenu->add("/compta/prelevement/create.php?type=bank-transfer&mainmenu=bank", $langs->trans("NewPaymentByBankTransfer"), 1, $user->hasRight('paymentbybanktransfer', 'create'));

-

-				$newmenu->add("/compta/prelevement/orders_list.php?type=bank-transfer&mainmenu=bank", $langs->trans("PaymentByBankTransferReceipts"), 1, $user->hasRight('paymentbybanktransfer', 'read'));

-				$newmenu->add("/compta/prelevement/list.php?type=bank-transfer&mainmenu=bank", $langs->trans("PaymentByBankTransferLines"), 1, $user->hasRight('paymentbybanktransfer', 'read'));

-				$newmenu->add("/compta/prelevement/rejets.php?type=bank-transfer&mainmenu=bank", $langs->trans("Rejects"), 1, $user->hasRight('paymentbybanktransfer', 'read'));

-				$newmenu->add("/compta/prelevement/stats.php?type=bank-transfer&mainmenu=bank", $langs->trans("Statistics"), 1, $user->hasRight('paymentbybanktransfer', 'read'));

-			}

-		}

-

-		// Management of checks

-		if (!getDolGlobalString('BANK_DISABLE_CHECK_DEPOSIT') && isModEnabled('banque') && (isModEnabled('facture') || getDolGlobalString('MAIN_MENU_CHEQUE_DEPOSIT_ON'))) {

-			$newmenu->add("/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank", $langs->trans("MenuChequeDeposits"), 0, $user->hasRight('banque', 'cheque'), '', $mainmenu, 'checks', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));

-			if (preg_match('/checks/', $leftmenu)) {

-				$newmenu->add("/compta/paiement/cheque/card.php?leftmenu=checks_bis&amp;action=new&amp;mainmenu=bank", $langs->trans("NewChequeDeposit"), 1, $user->hasRight('banque', 'cheque'));

-				$newmenu->add("/compta/paiement/cheque/list.php?leftmenu=checks_bis&amp;mainmenu=bank", $langs->trans("List"), 1, $user->hasRight('banque', 'cheque'));

-			}

-		}

-

-		// Cash Control

-		if (isModEnabled('takepos') || isModEnabled('cashdesk')) {

-			$permtomakecashfence = ($user->hasRight('cashdesk', 'run')|| $user->hasRight('takepos', 'run'));

-			$newmenu->add("/compta/cashcontrol/cashcontrol_list.php?action=list", $langs->trans("CashControl"), 0, $permtomakecashfence, '', $mainmenu, 'cashcontrol', 0, '', '', '', img_picto('', 'pos', 'class="paddingright pictofixedwidth"'));

-			$newmenu->add("/compta/cashcontrol/cashcontrol_card.php?action=create", $langs->trans("NewCashFence"), 1, $permtomakecashfence);

-			$newmenu->add("/compta/cashcontrol/cashcontrol_list.php?action=list", $langs->trans("List"), 1, $permtomakecashfence);

-		}

-	}

-}

-

-/**

- * Get left Menu PRODUCTS-SERVICES

- *

- * @param	string		$mainmenu		Main menu

- * @param	Menu 		$newmenu		Object Menu to return back list of menu entries

- * @param	int 		$usemenuhider	Use menu hider

- * @param	string 		$leftmenu		Left menu

- * @param	int 		$type_user		Type of targeted user for menu

- * @return	void

- */

-function get_left_menu_products($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = 'none', $type_user = 0)

-{

-	global $user, $conf, $langs;

-

-	if ($mainmenu == 'products') {

-		// Products

-		if (isModEnabled('product')) {

-			$newmenu->add("/product/index.php?leftmenu=product&amp;type=0", $langs->trans("Products"), 0, $user->hasRight('product', 'read'), '', $mainmenu, 'product', 0, '', '', '', img_picto('', 'product', 'class="paddingright pictofixedwidth"'));

-			$newmenu->add("/product/card.php?leftmenu=product&amp;action=create&amp;type=0", $langs->trans("NewProduct"), 1, $user->hasRight('product', 'creer'));

-			$newmenu->add("/product/list.php?leftmenu=product&amp;type=0", $langs->trans("List"), 1, $user->hasRight('product', 'read'));

-			if (isModEnabled('stock')) {

-				$newmenu->add("/product/reassort.php?type=0", $langs->trans("MenuStocks"), 1, $user->hasRight('product', 'read') && $user->hasRight('stock', 'lire'));

-			}

-			if (isModEnabled('productbatch')) {

-				$langs->load("stocks");

-				$newmenu->add("/product/reassortlot.php?type=0&search_subjecttolotserial=1", $langs->trans("StocksByLotSerial"), 1, $user->hasRight('product', 'read') && $user->hasRight('stock', 'lire'));

-				$newmenu->add("/product/stock/productlot_list.php", $langs->trans("LotSerial"), 1, $user->hasRight('product', 'read') && $user->hasRight('stock', 'lire'));

-			}

-			if (isModEnabled('variants')) {

-				$newmenu->add("/variants/list.php", $langs->trans("VariantAttributes"), 1, $user->hasRight('product', 'read'));

-			}

-			if (isModEnabled('propal') || isModEnabled('commande') || isModEnabled('facture') || isModEnabled('supplier_proposal') || isModEnabled('supplier_order') || isModEnabled('supplier_invoice')) {

-				$newmenu->add("/product/stats/card.php?id=all&leftmenu=stats&type=0", $langs->trans("Statistics"), 1, $user->hasRight('product', 'read'));

-			}

-

-			// Categories

-			if (isModEnabled('categorie')) {

-				$langs->load("categories");

-				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=0", $langs->trans("Categories"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');

-				//if ($usemenuhider || empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->hasRight('categorie',  'lire'));

-			}

-		}

-

-		// Services

-		if (isModEnabled('service')) {

-			$newmenu->add("/product/index.php?leftmenu=service&amp;type=1", $langs->trans("Services"), 0, $user->hasRight('service', 'read'), '', $mainmenu, 'service', 0, '', '', '', img_picto('', 'service', 'class="paddingright pictofixedwidth"'));

-			$newmenu->add("/product/card.php?leftmenu=service&amp;action=create&amp;type=1", $langs->trans("NewService"), 1, $user->hasRight('service', 'creer'));

-			$newmenu->add("/product/list.php?leftmenu=service&amp;type=1", $langs->trans("List"), 1, $user->hasRight('service', 'read'));

-

-			if (isModEnabled('stock') && getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {

-				$newmenu->add("/product/reassort.php?type=1", $langs->trans("MenuStocks"), 1, $user->hasRight('service', 'read') && $user->hasRight('stock', 'lire'));

-			}

-			if (isModEnabled('variants')) {

-				$newmenu->add("/variants/list.php", $langs->trans("VariantAttributes"), 1, $user->hasRight('service', 'read'));

-			}

-			if (isModEnabled('propal') || isModEnabled('commande') || isModEnabled('facture') || isModEnabled('supplier_proposal') || isModEnabled('supplier_order') || isModEnabled('supplier_invoice')) {

-				$newmenu->add("/product/stats/card.php?id=all&leftmenu=stats&type=1", $langs->trans("Statistics"), 1, $user->hasRight('service', 'read'));

-			}

-			// Categories

-			if (isModEnabled('categorie')) {

-				$langs->load("categories");

-				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=0", $langs->trans("Categories"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');

-				//if ($usemenuhider || empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->hasRight('categorie',  'lire'));

-			}

-		}

-

-		// Warehouse

-		if (isModEnabled('stock')) {

-			$langs->load("stocks");

-			$newmenu->add("/product/stock/index.php?leftmenu=stock", $langs->trans("Warehouses"), 0, $user->hasRight('stock', 'lire'), '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'stock', 'class="paddingright pictofixedwidth"'));

-			$newmenu->add("/product/stock/card.php?action=create", $langs->trans("MenuNewWarehouse"), 1, $user->hasRight('stock', 'creer'));

-			$newmenu->add("/product/stock/list.php", $langs->trans("List"), 1, $user->hasRight('stock', 'lire'));

-			$newmenu->add("/product/stock/movement_list.php", $langs->trans("Movements"), 1, $user->hasRight('stock', 'mouvement', 'lire'));

-

-			$newmenu->add("/product/stock/massstockmove.php?init=1", $langs->trans("MassStockTransferShort"), 1, $user->hasRight('stock', 'mouvement', 'creer'));

-			if (isModEnabled('supplier_order')) {

-				$newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->hasRight('stock', 'mouvement', 'creer') && $user->hasRight('fournisseur', 'lire'));

-			}

-			$newmenu->add("/product/stock/stockatdate.php", $langs->trans("StockAtDate"), 1, $user->hasRight('product', 'read') && $user->hasRight('stock', 'lire'));

-

-			// Categories for warehouses

-			if (isModEnabled('categorie')) {

-				$newmenu->add("/categories/index.php?leftmenu=stock&amp;type=9", $langs->trans("Categories"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');

-			}

-		}

-

-		if (isModEnabled('stocktransfer')) {

-			$newmenu->add('/product/stock/stocktransfer/stocktransfer_list.php', $langs->trans("ModuleStockTransferName"), 0, $user->hasRight('stocktransfer', 'stocktransfer', 'read'), '', $mainmenu, 'stocktransfer', 0, '', '', '', img_picto('', 'stock', 'class="paddingright pictofixedwidth"'));

-			$newmenu->add('/product/stock/stocktransfer/stocktransfer_card.php?action=create', $langs->trans('StockTransferNew'), 1, $user->hasRight('stocktransfer', 'stocktransfer', 'write'));

-			$newmenu->add('/product/stock/stocktransfer/stocktransfer_list.php', $langs->trans('List'), 1, $user->hasRight('stocktransfer', 'stocktransfer', 'read'));

-		}

-

-		// Inventory

-		if (isModEnabled('stock')) {

-			$langs->load("stocks");

-			if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {

-				$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("Inventories"), 0, $user->hasRight('stock', 'lire'), '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'inventory', 'class="paddingright pictofixedwidth"'));

-				if ($usemenuhider || empty($leftmenu) || $leftmenu == "stock_inventories") {

-					$newmenu->add("/product/inventory/card.php?action=create&leftmenu=stock_inventories", $langs->trans("NewInventory"), 1, $user->hasRight('stock', 'creer'));

-					$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("List"), 1, $user->hasRight('stock', 'lire'));

-				}

-			} else {

-				$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("Inventories"), 0, $user->hasRight('stock', 'inventory_advance', 'read'), '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'inventory', 'class="paddingright pictofixedwidth"'));

-				if ($usemenuhider || empty($leftmenu) || $leftmenu == "stock_inventories") {

-					$newmenu->add("/product/inventory/card.php?action=create&leftmenu=stock_inventories", $langs->trans("NewInventory"), 1, $user->hasRight('stock', 'inventory_advance', 'write'));

-					$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("List"), 1, $user->hasRight('stock', 'inventory_advance', 'read'));

-				}

-			}

-		}

-

-		// Shipments

-		if (isModEnabled('expedition')) {

-			$langs->load("sendings");

-			$newmenu->add("/expedition/index.php?leftmenu=sendings", $langs->trans("Shipments"), 0, $user->hasRight('expedition', 'lire'), '', $mainmenu, 'sendings', 0, '', '', '', img_picto('', 'shipment', 'class="paddingright pictofixedwidth"'));

-			$newmenu->add("/expedition/card.php?action=create2&amp;leftmenu=sendings", $langs->trans("NewSending"), 1, $user->hasRight('expedition', 'creer'));

-			$newmenu->add("/expedition/list.php?leftmenu=sendings", $langs->trans("List"), 1, $user->hasRight('expedition', 'lire'));

-			if ($usemenuhider || empty($leftmenu) || $leftmenu == "sendings") {

-				$newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=0", $langs->trans("StatusSendingDraftShort"), 2, $user->hasRight('expedition', 'lire'));

-				$newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=1", $langs->trans("StatusSendingValidatedShort"), 2, $user->hasRight('expedition', 'lire'));

-				$newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=2", $langs->trans("StatusSendingProcessedShort"), 2, $user->hasRight('expedition', 'lire'));

-			}

-			$newmenu->add("/expedition/stats/index.php?leftmenu=sendings", $langs->trans("Statistics"), 1, $user->hasRight('expedition', 'lire'));

-		}

-

-		// Receptions

-		if (isModEnabled('reception')) {

-			$langs->load("receptions");

-			$newmenu->add("/reception/index.php?leftmenu=receptions", $langs->trans("Receptions"), 0, $user->hasRight('reception', 'lire'), '', $mainmenu, 'receptions', 0, '', '', '', img_picto('', 'dollyrevert', 'class="paddingright pictofixedwidth"'));

-			$newmenu->add("/reception/card.php?action=create2&amp;leftmenu=receptions", $langs->trans("NewReception"), 1, $user->hasRight('reception', 'creer'));

-			$newmenu->add("/reception/list.php?leftmenu=receptions", $langs->trans("List"), 1, $user->hasRight('reception', 'lire'));

-			if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") {

-				$newmenu->add("/reception/list.php?leftmenu=receptions&search_status=0", $langs->trans("StatusReceptionDraftShort"), 2, $user->hasRight('reception', 'lire'));

-			}

-			if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") {

-				$newmenu->add("/reception/list.php?leftmenu=receptions&search_status=1", $langs->trans("StatusReceptionValidatedShort"), 2, $user->hasRight('reception', 'lire'));

-			}

-			if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") {

-				$newmenu->add("/reception/list.php?leftmenu=receptions&search_status=2", $langs->trans("StatusReceptionProcessedShort"), 2, $user->hasRight('reception', 'lire'));

-			}

-			$newmenu->add("/reception/stats/index.php?leftmenu=receptions", $langs->trans("Statistics"), 1, $user->hasRight('reception', 'lire'));

-		}

-	}

-}

-

-/**

- * Get left Menu PRODUCTS-SERVICES MRP - GPAO

- *

- * @param	string		$mainmenu		Main menu

- * @param	Menu 		$newmenu		Object Menu to return back list of menu entries

- * @param	int 		$usemenuhider	Use menu hider

- * @param	string 		$leftmenu		Left menu

- * @param	int 		$type_user		Type of targeted user for menu

- * @return	void

- */

-function get_left_menu_mrp($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = 'none', $type_user = 0)

-{

-	global $user, $conf, $langs;

-

-	if ($mainmenu == 'mrp') {

-		// BOM

-		if (isModEnabled('bom') || isModEnabled('mrp')) {

-			$langs->load("mrp");

-

-			$newmenu->add("", $langs->trans("MenuBOM"), 0, $user->hasRight('bom', 'read'), '', $mainmenu, 'bom', 0, '', '', '', img_picto('', 'bom', 'class="paddingright pictofixedwidth"'));

-			$newmenu->add("/bom/bom_card.php?leftmenu=bom&amp;action=create", $langs->trans("NewBOM"), 1, $user->hasRight('bom', 'write'), '', $mainmenu, 'bom');

-			$newmenu->add("/bom/bom_list.php?leftmenu=bom", $langs->trans("List"), 1, $user->hasRight('bom', 'read'), '', $mainmenu, 'bom');

-		}

-

-		if (isModEnabled('mrp')) {

-			$langs->load("mrp");

-

-			$newmenu->add("", $langs->trans("MenuMRP"), 0, $user->hasRight('mrp', 'read'), '', $mainmenu, 'mrp', 0, '', '', '', img_picto('', 'mrp', 'class="paddingright pictofixedwidth"'));

-			$newmenu->add("/mrp/mo_card.php?leftmenu=mo&amp;action=create", $langs->trans("NewMO"), 1, $user->hasRight('mrp', 'write'), '', $mainmenu, '');

-			$newmenu->add("/mrp/mo_list.php?leftmenu=mo", $langs->trans("List"), 1, $user->hasRight('mrp', 'read'), '', $mainmenu, '');

-		}

-	}

-}

-

-/**

- * Get left Menu PROJECTS

- *

- * @param	string		$mainmenu		Main menu

- * @param	Menu 		$newmenu		Object Menu to return back list of menu entries

- * @param	int 		$usemenuhider	Use menu hider

- * @param	string 		$leftmenu		Left menu

- * @param	int 		$type_user		Type of targeted user for menu

- * @return	void

- */

-function get_left_menu_projects($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = 'none', $type_user = 0)

-{

-	global $user, $conf, $langs;

-

-	if ($mainmenu == 'project') {

-		if (isModEnabled('projet')) {

-			$langs->load("projects");

-

-			$search_project_user = GETPOST('search_project_user', 'int');

-

-			$tmpentry = array(

-				'enabled'=>isModEnabled('projet'),

-				'perms'=>$user->hasRight('projet', 'lire'),

-				'module'=>'projet'

-			);

-			$listofmodulesforexternal = explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL'));

-			$showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal);

-

-			$titleboth = $langs->trans("LeadsOrProjects");

-			$titlenew = $langs->trans("NewLeadOrProject"); // Leads and opportunities by default

-			if (!getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {

-				$titleboth = $langs->trans("Projects");

-				$titlenew = $langs->trans("NewProject");

-			}

-			if (getDolGlobalInt('PROJECT_USE_OPPORTUNITIES') == 2) {	// 2 = leads only

-				$titleboth = $langs->trans("Leads");

-				$titlenew = $langs->trans("NewLead");

-			}

-

-			// Project assigned to user

-			$newmenu->add("/projet/index.php?leftmenu=projects".($search_project_user ? '&search_project_user='.$search_project_user : ''), $titleboth, 0, $user->hasRight('projet', 'lire'), '', $mainmenu, 'projects', 0, '', '', '', img_picto('', 'project', 'class="paddingright pictofixedwidth"'));

-			$newmenu->add("/projet/card.php?leftmenu=projects&action=create".($search_project_user ? '&search_project_user='.$search_project_user : ''), $titlenew, 1, $user->hasRight('projet', 'creer'));

-

-			if (!getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {

-				$newmenu->add("/projet/list.php?leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : '').'&search_status=99', $langs->trans("List"), 1, $showmode, '', 'project', 'list');

-			} elseif (getDolGlobalInt('PROJECT_USE_OPPORTUNITIES') == 1) {

-				$newmenu->add("/projet/list.php?leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $showmode, '', 'project', 'list');

-				$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_usage_opportunity=1&search_status=99&search_opp_status=openedopp&contextpage=lead', $langs->trans("ListOpenLeads"), 2, $showmode);

-				$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_opp_status=notopenedopp&search_status=99&contextpage=project', $langs->trans("ListOpenProjects"), 2, $showmode);

-			} elseif (getDolGlobalInt('PROJECT_USE_OPPORTUNITIES') == 2) {	// 2 = leads only

-				$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_usage_opportunity=1&search_status=99', $langs->trans("List"), 2, $showmode);

-			}

-

-			$newmenu->add("/projet/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->hasRight('projet', 'lire'));

-

-			// Categories

-			if (isModEnabled('categorie')) {

-				$langs->load("categories");

-				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=6", $langs->trans("Categories"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');

-			}

-

-			if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {

-				// Project assigned to user

-				$newmenu->add("/projet/activity/index.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("Activities"), 0, $user->hasRight('projet', 'lire'), '', 'project', 'tasks', 0, '', '', '', img_picto('', 'projecttask', 'class="paddingright pictofixedwidth"'));

-				$newmenu->add("/projet/tasks.php?leftmenu=tasks&action=create", $langs->trans("NewTask"), 1, $user->hasRight('projet', 'creer'));

-				$newmenu->add("/projet/tasks/list.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $user->hasRight('projet', 'lire'));

-				$newmenu->add("/projet/tasks/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->hasRight('projet', 'lire'));

-

-				$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("TimeEntry"), 0, $user->hasRight('projet', 'lire'), '', 'project', 'timespent', 0, '', '', '', img_picto('', 'timespent', 'class="paddingright pictofixedwidth"'));

-				$newmenu->add("/projet/tasks/time.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $user->hasRight('projet', 'lire'));

-			}

-		}

-	}

-}

-

-/**

- * Get left Menu HRM

- *

- * @param	string		$mainmenu		Main menu

- * @param	Menu 		$newmenu		Object Menu to return back list of menu entries

- * @param	int 		$usemenuhider	Use menu hider

- * @param	string 		$leftmenu		Left menu

- * @param	int 		$type_user		Type of targeted user for menu

- * @return	void

- */

-function get_left_menu_hrm($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = 'none', $type_user = 0)

-{

-	global $user, $conf, $langs;

-

-	if ($mainmenu == 'hrm') {

-		// HRM module

-		if (isModEnabled('hrm')) {

-			$langs->load("hrm");

-

-			$newmenu->add("/user/list.php?mainmenu=hrm&leftmenu=hrm&contextpage=employeelist", $langs->trans("Employees"), 0, $user->hasRight('user', 'user', 'read'), '', $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->hasRight('user', 'user', 'write'));

-			$newmenu->add("/user/list.php?mainmenu=hrm&leftmenu=hrm&contextpage=employeelist", $langs->trans("List"), 1, $user->hasRight('user', 'user', 'read'));

-

-			$newmenu->add("/hrm/skill_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("SkillsManagement"), 0, $user->hasRight('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->hasRight('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->hasRight('hrm',  'all', 'write'));

-			//$newmenu->add("/hrm/skill_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->hasRight('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->hasRight('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->hasRight('hrm',  'all', 'write'));

-			//$newmenu->add("/hrm/job_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->hasRight('hrm',  'all', 'read'));

-

-			// Position = Link job - user

-			$newmenu->add("/hrm/position_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("EmployeePositions"), 1, $user->hasRight('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->hasRight('hrm',  'all', 'write'));

-			//$newmenu->add("/hrm/position_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->hasRight('hrm',  'all', 'read'));

-

-			// Evaluation

-			$newmenu->add("/hrm/evaluation_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("Evals"), 1, $user->hasRight('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->hasRight('hrm',  'evaluation', 'write'));

-			//$newmenu->add("/hrm/evaluation_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->hasRight('hrm', 'evaluation', 'read'));

-			$newmenu->add("/hrm/compare.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("SkillComparison"), 1, $user->hasRight('hrm', 'evaluation', 'read') || $user->hasRight('hrm', 'compare_advance', 'read'));

-		}

-

-		// Leave/Holiday/Vacation module

-		if (isModEnabled('holiday')) {

-			// 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->hasRight('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->hasRight('holiday', 'write'), '', $mainmenu);

-			$newmenu->add("/holiday/card_group.php?mainmenu=hrm&leftmenu=holiday&action=create", $langs->trans("NewHolidayForGroup"), 1, ($user->hasRight('holiday', 'writeall') && $user->hasRight('holiday', 'readall')), '', $mainmenu, 'holiday_sm');

-			$newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("List"), 1, $user->hasRight('holiday', 'read'), '', $mainmenu);

-			if ($usemenuhider || empty($leftmenu) || $leftmenu == "holiday") {

-				$newmenu->add("/holiday/list.php?search_status=1&mainmenu=hrm&leftmenu=holiday", $langs->trans("DraftCP"), 2, $user->hasRight('holiday', 'read'), '', $mainmenu, 'holiday_sm');

-				$newmenu->add("/holiday/list.php?search_status=2&mainmenu=hrm&leftmenu=holiday", $langs->trans("ToReviewCP"), 2, $user->hasRight('holiday', 'read'), '', $mainmenu, 'holiday_sm');

-				$newmenu->add("/holiday/list.php?search_status=3&mainmenu=hrm&leftmenu=holiday", $langs->trans("ApprovedCP"), 2, $user->hasRight('holiday', 'read'), '', $mainmenu, 'holiday_sm');

-				$newmenu->add("/holiday/list.php?search_status=4&mainmenu=hrm&leftmenu=holiday", $langs->trans("CancelCP"), 2, $user->hasRight('holiday', 'read'), '', $mainmenu, 'holiday_sm');

-				$newmenu->add("/holiday/list.php?search_status=5&mainmenu=hrm&leftmenu=holiday", $langs->trans("RefuseCP"), 2, $user->hasRight('holiday', 'read'), '', $mainmenu, 'holiday_sm');

-			}

-			$newmenu->add("/holiday/define_holiday.php?mainmenu=hrm", $langs->trans("MenuConfCP"), 1, $user->hasRight('holiday', 'read'), '', $mainmenu, 'holiday_sm');

-			$newmenu->add("/holiday/month_report.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("MenuReportMonth"), 1, $user->hasRight('holiday', 'readall'), '', $mainmenu, 'holiday_sm');

-			$newmenu->add("/holiday/view_log.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("MenuLogCP"), 1, $user->hasRight('holiday', 'define_holiday'), '', $mainmenu, 'holiday_sm');

-		}

-

-		// Trips and expenses (old module)

-		if (isModEnabled('deplacement')) {

-			$langs->load("trips");

-			$newmenu->add("/compta/deplacement/index.php?leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("TripsAndExpenses"), 0, $user->hasRight('deplacement', 'lire'), '', $mainmenu, 'tripsandexpenses', 0, '', '', '', img_picto('', 'trip', 'class="paddingright pictofixedwidth"'));

-			$newmenu->add("/compta/deplacement/card.php?action=create&amp;leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("New"), 1, $user->hasRight('deplacement', 'creer'));

-			$newmenu->add("/compta/deplacement/list.php?leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("List"), 1, $user->hasRight('deplacement', 'lire'));

-			$newmenu->add("/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("Statistics"), 1, $user->hasRight('deplacement', 'lire'));

-		}

-

-		// Expense report

-		if (isModEnabled('expensereport')) {

-			$langs->loadLangs(array("trips", "bills"));

-			$newmenu->add("/expensereport/index.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("TripsAndExpenses"), 0, $user->hasRight('expensereport', 'lire'), '', $mainmenu, 'expensereport', 0, '', '', '', img_picto('', 'expensereport', 'class="paddingright pictofixedwidth"'));

-			$newmenu->add("/expensereport/card.php?action=create&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("New"), 1, $user->hasRight('expensereport', 'creer'));

-			$newmenu->add("/expensereport/list.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("List"), 1, $user->hasRight('expensereport', 'lire'));

-			if ($usemenuhider || empty($leftmenu) || $leftmenu == "expensereport") {

-				$newmenu->add("/expensereport/list.php?search_status=0&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Draft"), 2, $user->hasRight('expensereport', 'lire'));

-				$newmenu->add("/expensereport/list.php?search_status=2&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Validated"), 2, $user->hasRight('expensereport', 'lire'));

-				$newmenu->add("/expensereport/list.php?search_status=5&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Approved"), 2, $user->hasRight('expensereport', 'lire'));

-				$newmenu->add("/expensereport/list.php?search_status=6&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Paid"), 2, $user->hasRight('expensereport', 'lire'));

-				$newmenu->add("/expensereport/list.php?search_status=4&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Canceled"), 2, $user->hasRight('expensereport', 'lire'));

-				$newmenu->add("/expensereport/list.php?search_status=99&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Refused"), 2, $user->hasRight('expensereport', 'lire'));

-			}

-			$newmenu->add("/expensereport/payment/list.php?leftmenu=expensereport_payments&amp;mainmenu=hrm", $langs->trans("Payments"), 1, ($user->hasRight('expensereport', 'lire')) && isModEnabled('banque'));

-			$newmenu->add("/expensereport/stats/index.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Statistics"), 1, $user->hasRight('expensereport', 'lire'));

-		}

-

-		if (isModEnabled('projet')) {

-			if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {

-				$langs->load("projects");

-

-				$search_project_user = GETPOST('search_project_user', 'int');

-

-				$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("TimeEntry"), 0, $user->hasRight('projet', 'lire'), '', $mainmenu, 'timespent', 0, '', '', '', img_picto('', 'timespent', 'class="paddingright pictofixedwidth"'));

-			}

-		}

-	}

-}

-

-

-/**

- * Get left Menu TOOLS

- *

- * @param	string		$mainmenu		Main menu

- * @param	Menu 		$newmenu		Object Menu to return back list of menu entries

- * @param	int 		$usemenuhider	Use menu hider

- * @param	string 		$leftmenu		Left menu

- * @param	int 		$type_user		Type of targeted user for menu

- * @return	void

- */

-function get_left_menu_tools($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = 'none', $type_user = 0)

-{

-	global $user, $conf, $langs;

-

-	if ($mainmenu == 'tools') {

-		if (empty($user->socid)) { // limit to internal users

-			$langs->load("mails");

-			$newmenu->add("/admin/mails_templates.php?leftmenu=email_templates", $langs->trans("EMailTemplates"), 0, 1, '', $mainmenu, 'email_templates', 0, '', '', '', img_picto('', 'email', 'class="paddingright pictofixedwidth"'));

-		}

-

-		if (isModEnabled('mailing')) {

-			$newmenu->add("/comm/mailing/index.php?leftmenu=mailing", $langs->trans("EMailings"), 0, $user->hasRight('mailing', 'lire'), '', $mainmenu, 'mailing', 0, '', '', '', img_picto('', 'email', 'class="paddingright pictofixedwidth"'));

-			$newmenu->add("/comm/mailing/card.php?leftmenu=mailing&amp;action=create", $langs->trans("NewMailing"), 1, $user->hasRight('mailing', 'creer'));

-			$newmenu->add("/comm/mailing/list.php?leftmenu=mailing", $langs->trans("List"), 1, $user->hasRight('mailing', 'lire'));

-		}

-

-		if (isModEnabled('export')) {

-			$langs->load("exports");

-			$newmenu->add("/exports/index.php?leftmenu=export", $langs->trans("FormatedExport"), 0, $user->hasRight('export', 'lire'), '', $mainmenu, 'export', 0, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));

-			$newmenu->add("/exports/export.php?leftmenu=export", $langs->trans("NewExport"), 1, $user->hasRight('export', 'creer'));

-			//$newmenu->add("/exports/export.php?leftmenu=export",$langs->trans("List"),1, $user->hasRight('export',  'lire'));

-		}

-

-		if (isModEnabled('import')) {

-			$langs->load("exports");

-			$newmenu->add("/imports/index.php?leftmenu=import", $langs->trans("FormatedImport"), 0, $user->hasRight('import', 'run'), '', $mainmenu, 'import', 0, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));

-			$newmenu->add("/imports/import.php?leftmenu=import", $langs->trans("NewImport"), 1, $user->hasRight('import', 'run'));

-		}

-	}

-}

-

-/**

- * Get left Menu MEMBERS

- *

- * @param	string		$mainmenu		Main menu

- * @param	Menu 		$newmenu		Object Menu to return back list of menu entries

- * @param	int 		$usemenuhider	Use menu hider

- * @param	string 		$leftmenu		Left menu

- * @param	int 		$type_user		Type of targeted user for menu

- * @return	void

- */

-function get_left_menu_members($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = 'none', $type_user = 0)

-{

-	global $user, $conf, $langs;

-

-	if ($mainmenu == 'members') {

-		if (isModEnabled('adherent')) {

-			// Load translation files required by the page

-			$langs->loadLangs(array("members", "compta"));

-

-			$newmenu->add("/adherents/index.php?leftmenu=members&amp;mainmenu=members", $langs->trans("Members"), 0, $user->hasRight('adherent', 'read'), '', $mainmenu, 'members', 0, '', '', '', img_picto('', 'member', 'class="paddingright pictofixedwidth"'));

-			$newmenu->add("/adherents/card.php?leftmenu=members&amp;action=create", $langs->trans("NewMember"), 1, $user->hasRight('adherent', 'write'));

-			$newmenu->add("/adherents/list.php?leftmenu=members", $langs->trans("List"), 1, $user->hasRight('adherent', 'read'));

-			$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=-1", $langs->trans("MenuMembersToValidate"), 2, $user->hasRight('adherent', 'read'));

-			$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1", $langs->trans("MenuMembersValidated"), 2, $user->hasRight('adherent', 'read'));

-			$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=waitingsubscription", $langs->trans("WaitingSubscription"), 3, $user->hasRight('adherent', 'read'));

-			$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=uptodate", $langs->trans("UpToDate"), 3, $user->hasRight('adherent', 'read'));

-			$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=outofdate", $langs->trans("OutOfDate"), 3, $user->hasRight('adherent', 'read'));

-			$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=0", $langs->trans("MenuMembersResiliated"), 2, $user->hasRight('adherent', 'read'));

-			$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=-2", $langs->trans("MenuMembersExcluded"), 2, $user->hasRight('adherent', 'read'));

-			$newmenu->add("/adherents/stats/index.php?leftmenu=members", $langs->trans("MenuMembersStats"), 1, $user->hasRight('adherent', 'read'));

-

-			$newmenu->add("/adherents/cartes/carte.php?leftmenu=export", $langs->trans("MembersCards"), 1, $user->hasRight('adherent', 'export'));

-

-			if (isModEnabled('categorie')) {

-				$langs->load("categories");

-				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=3", $langs->trans("Categories"), 1, $user->hasRight('categorie', 'read'), '', $mainmenu, 'cat');

-			}

-

-			$newmenu->add("/adherents/index.php?leftmenu=members&amp;mainmenu=members", $langs->trans("Subscriptions"), 0, $user->hasRight('adherent', 'cotisation', 'read'), '', $mainmenu, 'members', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));

-			$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=-1,1&amp;mainmenu=members", $langs->trans("NewMembership"), 1, $user->hasRight('adherent', 'cotisation', 'write'));

-			$newmenu->add("/adherents/subscription/list.php?leftmenu=members", $langs->trans("List"), 1, $user->hasRight('adherent', 'cotisation', 'read'));

-			$newmenu->add("/adherents/stats/index.php?leftmenu=members", $langs->trans("MenuMembersStats"), 1, $user->hasRight('adherent', 'read'));

-

-			//$newmenu->add("/adherents/index.php?leftmenu=export&amp;mainmenu=members",$langs->trans("Tools"),0,$user->hasRight('adherent',  'export'), '', $mainmenu, 'export');

-			//if (isModEnabled('export') && ($usemenuhider || empty($leftmenu) || $leftmenu=="export")) $newmenu->add("/exports/index.php?leftmenu=export",$langs->trans("Datas"),1,$user->hasRight('adherent',  'export'));

-

-			// Type

-			$newmenu->add("/adherents/type.php?leftmenu=setup&amp;mainmenu=members", $langs->trans("MembersTypes"), 0, $user->hasRight('adherent', 'configurer'), '', $mainmenu, 'setup', 0, '', '', '', img_picto('', 'members', 'class="paddingright pictofixedwidth"'));

-			$newmenu->add("/adherents/type.php?leftmenu=setup&amp;mainmenu=members&amp;action=create", $langs->trans("New"), 1, $user->hasRight('adherent', 'configurer'));

-			$newmenu->add("/adherents/type.php?leftmenu=setup&amp;mainmenu=members", $langs->trans("List"), 1, $user->hasRight('adherent', 'configurer'));

-		}

-	}

-}

--- /tmp/dsg/dolibarr/htdocs/core/menus/standard/github_19.0.3_eldy_menu.php
+++ /tmp/dsg/dolibarr/htdocs/core/menus/standard/client_eldy_menu.php
@@ -31,22 +31,17 @@
-	 * @var DoliDB Database handler.

-	 */

-	public $db;

-

-	public $type_user; // Put 0 for internal users, 1 for external users

-	public $atarget = ""; // To store default target to use onto links

-	public $name = "eldy";

-

-	/**

-	 * @var Menu

-	 */

-	public $menu;

-

-	public $menu_array;

-	public $menu_array_after;

-

-	public $tabMenu;

-

-

-	/**

-	 *  Constructor

-	 *

+     * @var DoliDB Database handler.

+     */

+    public $db;

+

+    public $type_user; // Put 0 for internal users, 1 for external users

+    public $atarget = ""; // To store default target to use onto links

+    public $name = "eldy";

+

+    public $menu_array;

+    public $menu_array_after;

+

+    public $tabMenu;

+

+

+    /**

+     *  Constructor

+     *

@@ -54,23 +49,106 @@
-	 *  @param	int			$type_user	Type of user

-	 */

-	public function __construct($db, $type_user)

-	{

-		$this->type_user = $type_user;

-		$this->db = $db;

-	}

-

-

-	/**

-	 * Load this->tabMenu

-	 *

-	 * @param	string	$forcemainmenu		To force mainmenu to load

-	 * @param	string	$forceleftmenu		To force leftmenu to load

-	 * @return	void

-	 */

-	public function loadMenu($forcemainmenu = '', $forceleftmenu = '')

-	{

-		global $conf, $user, $langs;

-

-		// We save into session the main menu selected

-		if (GETPOSTISSET("mainmenu")) {

-			$_SESSION["mainmenu"] = GETPOST("mainmenu", 'aZ09');

+     *  @param	int			$type_user	Type of user

+     */

+    public function __construct($db, $type_user)

+    {

+    	$this->type_user = $type_user;

+        $this->db = $db;

+    }

+

+

+    /**

+     * Load this->tabMenu

+     *

+   	 * @param	string	$forcemainmenu		To force mainmenu to load

+   	 * @param	string	$forceleftmenu		To force leftmenu to load

+     * @return	void

+     */

+    public function loadMenu($forcemainmenu = '', $forceleftmenu = '')

+    {

+    	global $conf, $user, $langs;

+

+		// On sauve en session le menu principal choisi

+		if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"] = $_GET["mainmenu"];

+		if (isset($_GET["idmenu"]))   $_SESSION["idmenu"] = $_GET["idmenu"];

+

+		// Read mainmenu and leftmenu that define which menu to show

+        if (isset($_GET["mainmenu"]))

+        {

+        	// On sauve en session le menu principal choisi

+        	$mainmenu = $_GET["mainmenu"];

+        	$_SESSION["mainmenu"] = $mainmenu;

+        	$_SESSION["leftmenuopened"] = "";

+        }

+        else

+        {

+        	// On va le chercher en session si non defini par le lien

+        	$mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';

+        }

+        if (!empty($forcemainmenu)) $mainmenu = $forcemainmenu;

+

+        if (isset($_GET["leftmenu"]))

+        {

+        	// On sauve en session le menu principal choisi

+        	$leftmenu = $_GET["leftmenu"];

+        	$_SESSION["leftmenu"] = $leftmenu;

+

+        	if ($_SESSION["leftmenuopened"] == $leftmenu)	// To collapse

+        	{

+        		//$leftmenu="";

+        		$_SESSION["leftmenuopened"] = "";

+        	}

+        	else

+        	{

+        		$_SESSION["leftmenuopened"] = $leftmenu;

+        	}

+        } else {

+        	// On va le chercher en session si non defini par le lien

+        	$leftmenu = isset($_SESSION["leftmenu"]) ? $_SESSION["leftmenu"] : '';

+        }

+        if (!empty($forceleftmenu)) $leftmenu = $forceleftmenu;

+

+        require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';

+        $tabMenu = array();

+        $menuArbo = new Menubase($this->db, 'eldy');

+        $menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'eldy', $tabMenu);

+        $this->tabMenu = $tabMenu;

+        //var_dump($tabMenu);

+

+        //if ($forcemainmenu == 'all') { var_dump($this->tabMenu); exit; }

+    }

+

+

+    /**

+     *  Show menu.

+     *  Menu defined in sql tables were stored into $this->tabMenu BEFORE this is called.

+     *

+     *	@param	string	$mode			'top', 'topnb', 'left', 'jmobile' (used to get full xml ul/li menu)

+     *  @param	array	$moredata		An array with more data to output

+     *  @return int                     0 or nb of top menu entries if $mode = 'topnb'

+     */

+    public function showmenu($mode, $moredata = null)

+    {

+    	global $conf, $langs, $user;

+

+    	//var_dump($this->tabMenu);

+

+        require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php';

+

+        if ($this->type_user == 1)

+        {

+        	$conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED = 1;

+        	$conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED = 1;

+        }

+

+		require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';

+        $this->menu = new Menu();

+

+        if (empty($conf->global->MAIN_MENU_INVERT))

+        {

+        	if ($mode == 'top')  print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);

+        	if ($mode == 'left') print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata);

+        }

+        else

+		{

+        	$conf->global->MAIN_SHOW_LOGO = 0;

+        	if ($mode == 'top')  print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0);

+        	if ($mode == 'left') print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);

@@ -78,2 +156,5 @@
-		if (GETPOSTISSET("idmenu")) {

-			$_SESSION["idmenu"] = GETPOST("idmenu", 'int');

+

+		if ($mode == 'topnb')

+		{

+		    print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode); // no output

+		    return $this->menu->getNbOfVisibleMenuEntries();

@@ -82,111 +163,20 @@
-		// Read now mainmenu and leftmenu that define which menu to show

-		if (GETPOSTISSET("mainmenu")) {

-			// On sauve en session le menu principal choisi

-			$mainmenu = GETPOST("mainmenu", 'aZ09');

-			$_SESSION["mainmenu"] = $mainmenu;

-			$_SESSION["leftmenuopened"] = "";

-		} else {

-			// On va le chercher en session si non defini par le lien

-			$mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';

-		}

-		if (!empty($forcemainmenu)) {

-			$mainmenu = $forcemainmenu;

-		}

-

-		if (GETPOSTISSET("leftmenu")) {

-			// On sauve en session le menu principal choisi

-			$leftmenu = GETPOST("leftmenu", 'aZ09');

-			$_SESSION["leftmenu"] = $leftmenu;

-

-			if ($_SESSION["leftmenuopened"] == $leftmenu) {	// To collapse

-				//$leftmenu="";

-				$_SESSION["leftmenuopened"] = "";

-			} else {

-				$_SESSION["leftmenuopened"] = $leftmenu;

-			}

-		} else {

-			// On va le chercher en session si non defini par le lien

-			$leftmenu = isset($_SESSION["leftmenu"]) ? $_SESSION["leftmenu"] : '';

-		}

-		if (!empty($forceleftmenu)) {

-			$leftmenu = $forceleftmenu;

-		}

-

-		require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';

-		$tabMenu = array();

-		$menuArbo = new Menubase($this->db, 'eldy');

-		$menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'eldy', $tabMenu);

-		$this->tabMenu = $tabMenu;

-		//var_dump($tabMenu);

-

-		//if ($forcemainmenu == 'all') { var_dump($this->tabMenu); exit; }

-	}

-

-

-	/**

-	 *  Show menu.

-	 *  Menu defined in sql tables were stored into $this->tabMenu BEFORE this is called.

-	 *

-	 *	@param	string	$mode			'top', 'topnb', 'left', 'jmobile' (used to get full xml ul/li menu)

-	 *  @param	array	$moredata		An array with more data to output

-	 *  @return int                     0 or nb of top menu entries if $mode = 'topnb'

-	 */

-	public function showmenu($mode, $moredata = null)

-	{

-		global $conf, $langs, $user;

-

-		//var_dump($this->tabMenu);

-

-		require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php';

-

-		if ($this->type_user == 1) {

-			$conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED = 1;

-			$conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED = 1;

-		}

-

-		require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';

-		$this->menu = new Menu();

-

-		if (!getDolGlobalString('MAIN_MENU_INVERT')) {

-			if ($mode == 'top') {

-				print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);

-			}

-			if ($mode == 'left') {

-				print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata, $this->type_user);

-			}

-		} else {

-			$conf->global->MAIN_SHOW_LOGO = 0;

-			if ($mode == 'top') {

-				print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata, $this->type_user);

-			}

-			if ($mode == 'left') {

-				print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);

-			}

-		}

-		if ($mode == 'topnb') {

-			print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode); // no output

-			return $this->menu->getNbOfVisibleMenuEntries();

-		}

-

-		if ($mode == 'jmobile') {     // Used to get menu in xml ul/li

-			print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode); // Fill this->menu that is empty with top menu

-

-			// $this->menu->liste is top menu

-			//var_dump($this->menu->liste);exit;

-			$lastlevel = array();

-			print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";

-			foreach ($this->menu->liste as $key => $val) {		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'

-				print '<ul class="ulmenu" data-inset="true">';

-				print '<li class="lilevel0">';

-

-				if ($val['enabled'] == 1) {

-					$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);

-					$substitarray['__USERID__'] = $user->id; // For backward compatibility

-					$val['url'] = make_substitutions($val['url'], $substitarray);

-

-					if (!preg_match('/^http/', $val['url'])) {

-						$relurl = dol_buildpath($val['url'], 1);

-					} else {

-						$relurl = $val['url'];

-					}

-

+        if ($mode == 'jmobile')     // Used to get menu in xml ul/li

+        {

+            print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode); // Fill this->menu that is empty with top menu

+

+            // $this->menu->liste is top menu

+            //var_dump($this->menu->liste);exit;

+            $lastlevel = array();

+        	print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";

+        	foreach ($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'

+        	{

+        		print '<ul class="ulmenu" data-inset="true">';

+        		print '<li class="lilevel0">';

+

+        		if ($val['enabled'] == 1)

+        		{

+        			$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);

+        			$substitarray['__USERID__'] = $user->id; // For backward compatibility

+        			$val['url'] = make_substitutions($val['url'], $substitarray);

+

+					$relurl = dol_buildpath($val['url'], 1);

@@ -195 +185 @@
-					print '<a class="alilevel0" href="#">';

+        			print '<a class="alilevel0" href="#">';

@@ -198,3 +188 @@
-					if ($val['level'] == 0 && !empty($val['prefix'])) {

-						print str_replace('<span class="', '<span class="paddingright pictofixedwidth ', $val['prefix']);

-					}

+					if ($val['level'] == 0 && $val['mainmenu'] == 'home') print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';

@@ -203,30 +191,64 @@
-					print '</a>'."\n";

-

-					// Search submenu fot this mainmenu entry

-					$tmpmainmenu = $val['mainmenu'];

-					$tmpleftmenu = 'all';

-					$submenu = new Menu();

-					print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $submenu, 1, $tmpmainmenu, $tmpleftmenu, null, $this->type_user); // Fill $submenu (example with tmpmainmenu='home' tmpleftmenu='all', return left menu tree of Home)

-					// Note: $submenu contains menu entry with substitution not yet done

-					//if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') {

-					//var_dump($submenu); exit;

-					//}

-					//if ($tmpmainmenu=='accountancy') {

-					//var_dump($submenu->liste); exit;

-					//}

-					$nexturl = dol_buildpath(empty($submenu->liste[0]['url']) ? '' : $submenu->liste[0]['url'], 1);

-

-					$canonrelurl = preg_replace('/\?.*$/', '', $relurl);

-					$canonnexturl = preg_replace('/\?.*$/', '', $nexturl);

-					//var_dump($canonrelurl);

-					//var_dump($canonnexturl);

-

-					print '<ul>'."\n";

-					if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools')))

-						|| (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false)) {

-						// We add sub entry

-						print str_pad('', 1).'<li class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic

-						print '<a href="'.$relurl.'">';

-

-						if ($val['level'] == 0) {

-							print '<span class="fas fa-home fa-fw paddingright pictofixedwidth" aria-hidden="true"></span>';

+        			print '</a>'."\n";

+

+        			// Search submenu fot this mainmenu entry

+        			$tmpmainmenu = $val['mainmenu'];

+        			$tmpleftmenu = 'all';

+        			$submenu = new Menu();

+	        		print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $submenu, 1, $tmpmainmenu, $tmpleftmenu); // Fill $submenu (example with tmpmainmenu='home' tmpleftmenu='all', return left menu tree of Home)

+	        		// Note: $submenu contains menu entry with substitution not yet done

+        		    //if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') { var_dump($submenu); exit; }

+                    //if ($tmpmainmenu=='accountancy') { var_dump($submenu->liste); exit; }

+	        		$nexturl = dol_buildpath($submenu->liste[0]['url'], 1);

+

+        			$canonrelurl = preg_replace('/\?.*$/', '', $relurl);

+        			$canonnexturl = preg_replace('/\?.*$/', '', $nexturl);

+        			//var_dump($canonrelurl);

+        			//var_dump($canonnexturl);

+        			print '<ul>'."\n";

+        			if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools')))

+        				|| (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false))

+					{

+        				// We add sub entry

+        				print str_pad('', 1).'<li class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic

+        				print '<a href="'.$relurl.'">';

+        				if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation

+        				{

+        					if (in_array($val['mainmenu'], array('cashdesk', 'externalsite', 'website', 'collab'))) print $langs->trans("Access");

+        				    else print $langs->trans("Dashboard");

+        				}

+        				else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");

+        				print '</a>';

+        				print '</li>'."\n";

+        			}

+

+        			if ($val['level'] == 0)

+        			{

+        			    if ($val['enabled'])

+        			    {

+        			        $lastlevel[0] = 'enabled';

+        			    }

+        			    elseif ($showmenu)                 // Not enabled but visible (so greyed)

+        			    {

+        			        $lastlevel[0] = 'greyed';

+        			    }

+        			    else

+        			    {

+        			        $lastlevel[0] = 'hidden';

+        			    }

+        			}

+

+        			$lastlevel2 = array();

+       				foreach ($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'

+       				{

+						$showmenu = true;

+						if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) $showmenu = false;

+

+						// If at least one parent is not enabled, we do not show any menu of all children

+						if ($val2['level'] > 0)

+						{

+						    $levelcursor = $val2['level'] - 1;

+						    while ($levelcursor >= 0)

+						    {

+                                if ($lastlevel2[$levelcursor] != 'enabled') $showmenu = false;

+                                $levelcursor--;

+						    }

@@ -235,129 +257,82 @@
-						if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard") {  // No translation

-							if (in_array($val['mainmenu'], array('cashdesk', 'externalsite', 'website', 'collab', 'takepos'))) {

-								print $langs->trans("Access");

-							} else {

-								print $langs->trans("Dashboard");

-							}

-						} else {

-							print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");

-						}

-						print '</a>';

-						print '</li>'."\n";

-					}

-

-					/*

-					if ($val['level'] == 0) {

-						if ($val['enabled']) {

-							$lastlevel[0] = 'enabled';

-						} elseif ($showmenu) {

-							// Not enabled but visible (so greyed)

-							$lastlevel[0] = 'greyed';

-						} else {

-							$lastlevel[0] = 'hidden';

-						}

-					}

-					*/

-

-					$lastlevel2 = array();

-					foreach ($submenu->liste as $key2 => $val2) {		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'

-						$showmenu = true;

-						if (getDolGlobalString('MAIN_MENU_HIDE_UNAUTHORIZED') && empty($val2['enabled'])) {

-							$showmenu = false;

-						}

-

-						// If at least one parent is not enabled, we do not show any menu of all children

-						if ($val2['level'] > 0) {

-							$levelcursor = $val2['level'] - 1;

-							while ($levelcursor >= 0) {

-								if ($lastlevel2[$levelcursor] != 'enabled') {

-									$showmenu = false;

-								}

-								$levelcursor--;

-							}

-						}

-

-						if ($showmenu) {		// Visible (option to hide when not allowed is off or allowed)

-							$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);

-							$substitarray['__USERID__'] = $user->id; // For backward compatibility

-							$val2['url'] = make_substitutions($val2['url'], $substitarray); // Make also substitution of __(XXX)__ and __[XXX]__

-

-							if (!preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url'])) {

-								$relurl2 = dol_buildpath($val2['url'], 1);

-							} else {

-								$relurl2 = $val2['url'];

-							}

-							$canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);

-							//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);

-							if (in_array($canonurl2, array('/admin/index.php', '/admin/tools/index.php', '/core/tools.php'))) {

-								$relurl2 = '';

-							}

-

-							$disabled = '';

-							if (!$val2['enabled']) {

-								$disabled = " vsmenudisabled";

-							}

-

-							print str_pad('', $val2['level'] + 1);

-							print '<li class="lilevel'.($val2['level'] + 1);

-							if ($val2['level'] == 0) {

-								print ' ui-btn-icon-right ui-btn'; // ui-btn to highlight on clic

-							}

-							print $disabled.'">'; // ui-btn to highlight on clic

-							if ($relurl2) {

-								if ($val2['enabled']) {	// Allowed

-									print '<a href="'.$relurl2.'"';

-									//print ' data-ajax="false"';

-									print '>';

-									$lastlevel2[$val2['level']] = 'enabled';

-								} else { // Not allowed but visible (greyed)

-									print '<a href="#" class="vsmenudisabled">';

-									$lastlevel2[$val2['level']] = 'greyed';

-								}

-							} else {

-								if ($val2['enabled']) {	// Allowed

-									$lastlevel2[$val2['level']] = 'enabled';

-								} else {

-									$lastlevel2[$val2['level']] = 'greyed';

-								}

-							}

-

-							// Add font-awesome (if $val2['level'] == 0, we are on level2

-							if ($val2['level'] == 0 && !empty($val2['prefix'])) {

-								print $val2['prefix'];	// the picto must have class="pictofixedwidth paddingright"

-							}

-

-							print $val2['titre'];

-							if ($relurl2) {

-								if ($val2['enabled']) {	// Allowed

-									print '</a>';

-								} else {

-									print '</a>';

-								}

-							}

-							print '</li>'."\n";

-						}

-					}

-					//var_dump($submenu);

-					print '</ul>';

-				}

-				if ($val['enabled'] == 2) {

-					print '<span class="spanlilevel0 vsmenudisabled">';

-

-					// Add font-awesome

-					if ($val['level'] == 0 && !empty($val['prefix'])) {

-						print $val['prefix'];

-					}

-

-					print $val['titre'];

-					print '</span>';

-				}

-				print '</li>';

-				print '</ul>'."\n";

-			}

-		}

-

-		unset($this->menu);

-

-		//print 'xx'.$mode;

-		return 0;

-	}

+       					if ($showmenu)		// Visible (option to hide when not allowed is off or allowed)

+       					{

+       						$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);

+       						$substitarray['__USERID__'] = $user->id; // For backward compatibility

+       						$val2['url'] = make_substitutions($val2['url'], $substitarray); // Make also substitution of __(XXX)__ and __[XXX]__

+

+       						if (!preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url']))

+       						{

+       							$relurl2 = dol_buildpath($val2['url'], 1);

+       						}

+       						else

+       						{

+       							$relurl2 = $val2['url'];

+       						}

+	        				$canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);

+	        				//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);

+	        				if (in_array($canonurl2, array('/admin/index.php', '/admin/tools/index.php', '/core/tools.php'))) $relurl2 = '';

+

+	        				$disabled = '';

+	        				if (!$val2['enabled'])

+	        				{

+	        				    $disabled = " vsmenudisabled";

+	        				}

+

+	        				print str_pad('', $val2['level'] + 1);

+	        				print '<li class="lilevel'.($val2['level'] + 1);

+	        				if ($val2['level'] == 0) print ' ui-btn-icon-right ui-btn'; // ui-btn to highlight on clic

+	        				print $disabled.'">'; // ui-btn to highlight on clic

+	        				if ($relurl2)

+	        				{

+	        					if ($val2['enabled'])	// Allowed

+	        					{

+	        						print '<a href="'.$relurl2.'"';

+		        					//print ' data-ajax="false"';

+		        					print '>';

+		        					$lastlevel2[$val2['level']] = 'enabled';

+	        					}

+	        					else					// Not allowed but visible (greyed)

+	        					{

+				        			print '<a href="#" class="vsmenudisabled">';

+				        			$lastlevel2[$val2['level']] = 'greyed';

+	        					}

+	        				}

+	        				else

+	        				{

+	        				    if ($val2['enabled'])	// Allowed

+	        				    {

+	        				        $lastlevel2[$val2['level']] = 'enabled';

+	        				    }

+	        				    else

+	        				    {

+	        				        $lastlevel2[$val2['level']] = 'greyed';

+	        				    }

+	        				}

+                            print $val2['titre'];

+	        				if ($relurl2)

+	        				{

+	        					if ($val2['enabled'])	// Allowed

+	        						print '</a>';

+	        					else

+	        						print '</a>';

+	        				}

+	        				print '</li>'."\n";

+       					}

+       				}

+        			//var_dump($submenu);

+        			print '</ul>';

+        		}

+        		if ($val['enabled'] == 2)

+        		{

+        			print '<font class="vsmenudisabled">'.$val['titre'].'</font>';

+        		}

+        		print '</li>';

+        		print '</ul>'."\n";

+        	}

+        }

+

+        unset($this->menu);

+

+        //print 'xx'.$mode;

+        return 0;

+    }

--- /tmp/dsg/dolibarr/htdocs/core/menus/standard/github_19.0.3_empty.php
+++ /tmp/dsg/dolibarr/htdocs/core/menus/standard/client_empty.php
@@ -29,15 +29,10 @@
-	 * @var DoliDB Database handler.

-	 */

-	public $db;

-

-	public $type_user = 0; // Put 0 for internal users, 1 for external users

-	public $atarget = ""; // To store default target to use onto links

-	public $name = "empty";

-

-	public $menu;

-	public $menu_array_after;

-

-	public $tabMenu;

-

-	public $topmenu;

-	public $leftmenu;

+     * @var DoliDB Database handler.

+     */

+    public $db;

+

+    public $type_user = 0; // Put 0 for internal users, 1 for external users

+    public $atarget = ""; // To store default target to use onto links

+

+    public $menu;

+    public $menu_array_after;

+

@@ -49 +44 @@
-	 *  @param	int			$type_user		Type of user

+     *  @param	int			$type_user		Type of user

@@ -59,5 +54,5 @@
-	 * Load this->tabMenu

-	 *

-	 * @param	string	$forcemainmenu		To force mainmenu to load

-	 * @param	string	$forceleftmenu		To force leftmenu to load

-	 * @return	void

+   	 * Load this->tabMenu

+   	 *

+   	 * @param	string	$forcemainmenu		To force mainmenu to load

+   	 * @param	string	$forceleftmenu		To force leftmenu to load

+   	 * @return	void

@@ -68 +62,0 @@
-		$this->tabMenu = array();

@@ -75,3 +69,3 @@
-	 *	@param	string	$mode			'top', 'left', 'jmobile'

-	 *  @param	array	$moredata		An array with more data to output

-	 *  @return int                     0 or nb of top menu entries if $mode = 'topnb'

+     *	@param	string	$mode			'top', 'left', 'jmobile'

+     *  @param	array	$moredata		An array with more data to output

+     *  @return int                     0 or nb of top menu entries if $mode = 'topnb'

@@ -93,2 +87,3 @@
-		if ($mode == 'topnb') {

-			return 1;

+		if ($mode == 'topnb')

+		{

+		    return 1;

@@ -97,6 +92,5 @@
-		if ($mode == 'top') {

-			if (empty($noout)) {

-				print_start_menu_array_empty();

-			}

-

-			$usemenuhider = 1;

+		if ($mode == 'top')

+		{

+			if (empty($noout)) print_start_menu_array_empty();

+

+            $usemenuhider = 1;

@@ -105,6 +99,7 @@
-			if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {

-				$showmode = 1;

-				$classname = 'class="tmenu menuhider nohover"';

-				$idsel = 'menu';

-

-				$this->menu->add('#', '', 0, $showmode, $this->atarget, "xxx", '', 0, $id, $idsel, $classname);

+			if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))

+			{

+			    $showmode = 1;

+			    $classname = 'class="tmenu menuhider"';

+			    $idsel = 'menu';

+

+			    $this->menu->add('#', '', 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);

@@ -125,10 +120,5 @@
-			foreach ($this->menu->liste as $menkey => $menuval) {

-				if (empty($noout)) {

-					print_start_menu_entry_empty($menuval['idsel'], $menuval['classname'], $menuval['enabled']);

-				}

-				if (empty($noout)) {

-					print_text_menu_entry_empty($menuval['titre'], $menuval['enabled'], ($menuval['url'] != '#' ? DOL_URL_ROOT : '').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $this->atarget));

-				}

-				if (empty($noout)) {

-					print_end_menu_entry_empty($menuval['enabled']);

-				}

+			foreach ($this->menu->liste as $menkey => $menuval)

+			{

+			    if (empty($noout)) print_start_menu_entry_empty($menuval['idsel'], $menuval['classname'], $menuval['enabled']);

+			    if (empty($noout)) print_text_menu_entry_empty($menuval['titre'], $menuval['enabled'], ($menuval['url'] != '#' ?DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));

+			    if (empty($noout)) print_end_menu_entry_empty($menuval['enabled']);

@@ -138,12 +128,7 @@
-			if (empty($noout)) {

-				print_start_menu_entry_empty('', 'class="tmenuend"', $showmode);

-			}

-			if (empty($noout)) {

-				print_end_menu_entry_empty($showmode);

-			}

-

-			if (empty($noout)) {

-				print_end_menu_array_empty();

-			}

-

-			if ($mode == 'jmobile') {

+			if (empty($noout)) print_start_menu_entry_empty('', 'class="tmenuend"', $showmode);

+			if (empty($noout)) print_end_menu_entry_empty($showmode);

+

+			if (empty($noout)) print_end_menu_array_empty();

+

+			if ($mode == 'jmobile')

+			{

@@ -155,176 +140,187 @@
-		if ($mode == 'jmobile') {     // Used to get menu in xml ul/li

-			// Home

-			$showmode = 1;

-			$classname = 'class="tmenusel"';

-			$idsel = 'home';

-

-			$this->menu->add('/index.php', $langs->trans("Home"), 0, $showmode, $this->atarget, 'home', '', 10, $id, $idsel, $classname);

-

-			$substitarray = getCommonSubstitutionArray($langs, 0, null, null);

-

-			// $this->menu->liste is top menu

-			//var_dump($this->menu->liste);exit;

-			$lastlevel = array();

-			$showmenu = true;  // Is current menu shown - define here to keep static code checker happy

-			print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";

-			foreach ($this->menu->liste as $key => $val) {		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'

-				print '<ul class="ulmenu" data-inset="true">';

-				print '<li class="lilevel0">';

-

-				$val['url'] = make_substitutions($val['url'], $substitarray);

-

-				if ($val['enabled'] == 1) {

-					$relurl = dol_buildpath($val['url'], 1);

-					$canonurl = preg_replace('/\?.*$/', '', $val['url']);

-

-					print '<a class="alilevel0" href="#">';

-

-					// Add font-awesome

-					if ($val['level'] == 0 && $val['mainmenu'] == 'home') {

-						print '<span class="fas fa-home fa-fw paddingright" aria-hidden="true"></span>';

-					}

-

-					print $val['titre'];

-					print '</a>'."\n";

-

-					// Search submenu fot this mainmenu entry

-					$tmpmainmenu = $val['mainmenu'];

-					$tmpleftmenu = 'all';

-					$submenu = new Menu();

-

-					$langs->load("admin"); // Load translation file admin.lang

-					$submenu->add("/admin/index.php?leftmenu=setup", $langs->trans("Setup"), 0);

-					$submenu->add("/admin/company.php", $langs->trans("MenuCompanySetup"), 1);

-					$submenu->add("/admin/modules.php", $langs->trans("Modules"), 1);

-					$submenu->add("/admin/menus.php", $langs->trans("Menus"), 1);

-					$submenu->add("/admin/ihm.php", $langs->trans("GUISetup"), 1);

-					$submenu->add("/admin/translation.php?mainmenu=home", $langs->trans("Translation"), 1);

-					$submenu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"), 1);

-

-					$submenu->add("/admin/boxes.php?mainmenu=home", $langs->trans("Boxes"), 1);

-					$submenu->add("/admin/delais.php?mainmenu=home", $langs->trans("Alerts"), 1);

-					$submenu->add("/admin/proxy.php?mainmenu=home", $langs->trans("Security"), 1);

-					$submenu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"), 1);

-					$submenu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"), 1);

-					$submenu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails"), 1);

-					$submenu->add("/admin/sms.php?mainmenu=home", $langs->trans("SMS"), 1);

-					$submenu->add("/admin/dict.php?mainmenu=home", $langs->trans("DictionarySetup"), 1);

-					$submenu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"), 1);

-

-					//if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') {

-					//var_dump($submenu); exit;

-					//}

-					//if ($tmpmainmenu=='accountancy') {

-					//var_dump($submenu->liste); exit;

-					//}

-					$nexturl = dol_buildpath($submenu->liste[0]['url'], 1);

-

-					$canonrelurl = preg_replace('/\?.*$/', '', $relurl);

-					$canonnexturl = preg_replace('/\?.*$/', '', $nexturl);

-

-					print '<ul>'."\n";

-					if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools')))

-						|| (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false)) {

-						// We add sub entry

-						print str_pad('', 1).'<li class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic

-						print '<a href="'.$relurl.'">';

-						if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard") {  // No translation

-							if (in_array($val['mainmenu'], array('cashdesk', 'websites'))) {

-								print $langs->trans("Access");

-							} else {

-								print $langs->trans("Dashboard");

-							}

-						} else {

-							print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");

-						}

-						print '</a>';

-						print '</li>'."\n";

-					}

-

-					if ($val['level'] == 0) {

-						if ($val['enabled']) {

-							$lastlevel[0] = 'enabled';

-						} elseif ($showmenu) {                 // Not enabled but visible (so greyed)

-							$lastlevel[0] = 'greyed';

-						} else {

-							$lastlevel[0] = 'hidden';

-						}

-					}

-

-					$lastlevel2 = array();

-					foreach ($submenu->liste as $key2 => $val2) {		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'

-						$showmenu = true;

-						if (getDolGlobalString('MAIN_MENU_HIDE_UNAUTHORIZED') && empty($val2['enabled'])) {

-							$showmenu = false;

-						}

-

-						// If at least one parent is not enabled, we do not show any menu of all children

-						if ($val2['level'] > 0) {

-							$levelcursor = $val2['level'] - 1;

-							while ($levelcursor >= 0) {

-								if ($lastlevel2[$levelcursor] != 'enabled') {

-									$showmenu = false;

-								}

-								$levelcursor--;

-							}

-						}

-

-						if ($showmenu) {		// Visible (option to hide when not allowed is off or allowed)

-							$val2['url'] = make_substitutions($val2['url'], $substitarray);

-

-							$relurl2 = dol_buildpath($val2['url'], 1);

-							$canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);

-							//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);

-							if (in_array($canonurl2, array('/admin/index.php', '/admin/tools/index.php', '/core/tools.php'))) {

-								$relurl2 = '';

-							}

-

-							$disabled = '';

-							if (!$val2['enabled']) {

-								$disabled = " vsmenudisabled";

-							}

-

-							print str_pad('', $val2['level'] + 1);

-							print '<li class="lilevel'.($val2['level'] + 1);

-							if ($val2['level'] == 0) {

-								print ' ui-btn-icon-right ui-btn'; // ui-btn to highlight on clic

-							}

-							print $disabled.'">'; // ui-btn to highlight on clic

-							if ($relurl2) {

-								if ($val2['enabled']) {

-									// Allowed

-									print '<a href="'.$relurl2.'">';

-									$lastlevel2[$val2['level']] = 'enabled';

-								} else {

-									// Not allowed but visible (greyed)

-									print '<a href="#" class="vsmenudisabled">';

-									$lastlevel2[$val2['level']] = 'greyed';

-								}

-							} else {

-								if ($val2['enabled']) {	// Allowed

-									$lastlevel2[$val2['level']] = 'enabled';

-								} else {

-									$lastlevel2[$val2['level']] = 'greyed';

-								}

-							}

-							print $val2['titre'];

-							if ($relurl2) {

-								if ($val2['enabled']) {

-									// Allowed

-									print '</a>';

-								} else {

-									// Not allowed

-									print '</a>';

-								}

-							}

-							print '</li>'."\n";

-						}

-					}

-					print '</ul>';

-				}

-				if ($val['enabled'] == 2) {

-					print '<span class="vsmenudisabled">'.$val['titre'].'</span>';

-				}

-				print '</li>';

-				print '</ul>'."\n";

-			}

+		if ($mode == 'jmobile')     // Used to get menu in xml ul/li

+		{

+		    // Home

+		    $showmode = 1;

+		    $classname = 'class="tmenusel"';

+		    $idsel = 'home';

+

+		    $this->menu->add('/index.php', $langs->trans("Home"), 0, $showmode, $this->atarget, 'home', '', 10, $id, $idsel, $classname);

+

+		    $substitarray = getCommonSubstitutionArray($langs, 0, null, null);

+

+		    // $this->menu->liste is top menu

+		    //var_dump($this->menu->liste);exit;

+		    $lastlevel = array();

+		    print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";

+		    foreach ($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'

+		    {

+		        print '<ul class="ulmenu" data-inset="true">';

+		        print '<li class="lilevel0">';

+

+		        $val['url'] = make_substitutions($val['url'], $substitarray);

+

+		        if ($val['enabled'] == 1)

+		        {

+		            $relurl = dol_buildpath($val['url'], 1);

+		            $canonurl = preg_replace('/\?.*$/', '', $val['url']);

+

+		            print '<a class="alilevel0" href="#">';

+

+		            // Add font-awesome

+		            if ($val['level'] == 0 && $val['mainmenu'] == 'home') print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';

+

+		            print $val['titre'];

+		            print '</a>'."\n";

+

+		            // Search submenu fot this mainmenu entry

+		            $tmpmainmenu = $val['mainmenu'];

+		            $tmpleftmenu = 'all';

+		            $submenu = new Menu();

+

+		            $langs->load("admin"); // Load translation file admin.lang

+		            $submenu->add("/admin/index.php?leftmenu=setup", $langs->trans("Setup"), 0);

+		            $submenu->add("/admin/company.php", $langs->trans("MenuCompanySetup"), 1);

+		            $submenu->add("/admin/modules.php", $langs->trans("Modules"), 1);

+		            $submenu->add("/admin/menus.php", $langs->trans("Menus"), 1);

+		            $submenu->add("/admin/ihm.php", $langs->trans("GUISetup"), 1);

+		            $submenu->add("/admin/translation.php?mainmenu=home", $langs->trans("Translation"), 1);

+		            $submenu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"), 1);

+

+		            $submenu->add("/admin/boxes.php", $langs->trans("Boxes"), 1);

+		            $submenu->add("/admin/delais.php", $langs->trans("Alerts"), 1);

+		            $submenu->add("/admin/proxy.php?mainmenu=home", $langs->trans("Security"), 1);

+		            $submenu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"), 1);

+		            $submenu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"), 1);

+		            $submenu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails"), 1);

+		            $submenu->add("/admin/sms.php?mainmenu=home", $langs->trans("SMS"), 1);

+		            $submenu->add("/admin/dict.php?mainmenu=home", $langs->trans("DictionarySetup"), 1);

+		            $submenu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"), 1);

+

+		            //if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') { var_dump($submenu); exit; }

+		            //if ($tmpmainmenu=='accountancy') { var_dump($submenu->liste); exit; }

+		            $nexturl = dol_buildpath($submenu->liste[0]['url'], 1);

+

+		            $canonrelurl = preg_replace('/\?.*$/', '', $relurl);

+		            $canonnexturl = preg_replace('/\?.*$/', '', $nexturl);

+		            //var_dump($canonrelurl);

+		            //var_dump($canonnexturl);

+		            print '<ul>'."\n";

+		            if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools')))

+		                || (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false))

+		            {

+		                // We add sub entry

+		                print str_pad('', 1).'<li class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic

+		                print '<a href="'.$relurl.'">';

+		                if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation

+		                {

+		                    if (in_array($val['mainmenu'], array('cashdesk', 'websites'))) print $langs->trans("Access");

+		                    else print $langs->trans("Dashboard");

+		                }

+		                else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");

+		                print '</a>';

+		                print '</li>'."\n";

+		            }

+

+		            if ($val['level'] == 0)

+		            {

+		                if ($val['enabled'])

+		                {

+		                    $lastlevel[0] = 'enabled';

+		                }

+		                elseif ($showmenu)                 // Not enabled but visible (so greyed)

+		                {

+		                    $lastlevel[0] = 'greyed';

+		                }

+		                else

+		                {

+		                    $lastlevel[0] = 'hidden';

+		                }

+		            }

+

+		            $lastlevel2 = array();

+		            foreach ($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'

+		            {

+		                $showmenu = true;

+		                if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) $showmenu = false;

+

+		                // If at least one parent is not enabled, we do not show any menu of all children

+		                if ($val2['level'] > 0)

+		                {

+		                    $levelcursor = $val2['level'] - 1;

+		                    while ($levelcursor >= 0)

+		                    {

+		                        if ($lastlevel2[$levelcursor] != 'enabled') $showmenu = false;

+		                        $levelcursor--;

+		                    }

+		                }

+

+		                if ($showmenu)		// Visible (option to hide when not allowed is off or allowed)

+		                {

+		                	$val2['url'] = make_substitutions($val2['url'], $substitarray);

+

+		                    $relurl2 = dol_buildpath($val2['url'], 1);

+		                    $canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);

+		                    //var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);

+		                    if (in_array($canonurl2, array('/admin/index.php', '/admin/tools/index.php', '/core/tools.php'))) $relurl2 = '';

+

+		                    $disabled = '';

+		                    if (!$val2['enabled'])

+		                    {

+		                        $disabled = " vsmenudisabled";

+		                    }

+

+		                    print str_pad('', $val2['level'] + 1);

+		                    print '<li class="lilevel'.($val2['level'] + 1);

+		                    if ($val2['level'] == 0) print ' ui-btn-icon-right ui-btn'; // ui-btn to highlight on clic

+		                    print $disabled.'">'; // ui-btn to highlight on clic

+		                    if ($relurl2)

+		                    {

+		                        if ($val2['enabled'])	// Allowed

+		                        {

+		                            print '<a href="'.$relurl2.'"';

+		                            //print ' data-ajax="false"';

+		                            print '>';

+		                            $lastlevel2[$val2['level']] = 'enabled';

+		                        }

+		                        else					// Not allowed but visible (greyed)

+		                        {

+		                            print '<a href="#" class="vsmenudisabled">';

+		                            $lastlevel2[$val2['level']] = 'greyed';

+		                        }

+		                    }

+		                    else

+		                    {

+		                        if ($val2['enabled'])	// Allowed

+		                        {

+		                            $lastlevel2[$val2['level']] = 'enabled';

+		                        }

+		                        else

+		                        {

+		                            $lastlevel2[$val2['level']] = 'greyed';

+		                        }

+		                    }

+		                    //var_dump($val2['level']);

+		                    //var_dump($lastlevel2);

+		                    print $val2['titre'];

+		                    if ($relurl2)

+		                    {

+		                        if ($val2['enabled']) {

+                                    // Allowed

+                                    print '</a>';

+                                } else {

+                                    print '</a>';

+                                }

+		                    }

+		                    print '</li>'."\n";

+		                }

+		            }

+		            //var_dump($submenu);

+		            print '</ul>';

+		        }

+		        if ($val['enabled'] == 2)

+		        {

+		            print '<font class="vsmenudisabled">'.$val['titre'].'</font>';

+		        }

+		        print '</li>';

+		        print '</ul>'."\n";

+		    }

@@ -333 +329,2 @@
-		if ($mode == 'left') {

+		if ($mode == 'left')

+		{

@@ -346,2 +343,2 @@
-			$this->menu->add("/admin/boxes.php?mainmenu=home", $langs->trans("Boxes"), 1);

-			$this->menu->add("/admin/delais.php?mainmenu=home", $langs->trans("Alerts"), 1);

+		    $this->menu->add("/admin/boxes.php", $langs->trans("Boxes"), 1);

+			$this->menu->add("/admin/delais.php", $langs->trans("Alerts"), 1);

@@ -358,3 +354,0 @@
-			$menu_array_before = array();

-			$menu_array_after = array();

-

@@ -363,18 +357,6 @@
-			$menu_array = $this->menu->liste;

-			if (is_array($menu_array_before)) {

-				$menu_array = array_merge($menu_array_before, $menu_array);

-			}

-			if (is_array($menu_array_after)) {

-				$menu_array = array_merge($menu_array, $menu_array_after);

-			}

-			//var_dump($menu_array);exit;

-			if (!is_array($menu_array)) {

-				return 0;

-			}

-

-			if (empty($noout)) {

-				$alt = 0;

-				$altok = 0;

-				$blockvmenuopened = false;

-				$num = count($menu_array);

-				for ($i = 0; $i < $num; $i++) {

+			if (empty($noout))

+			{

+				$alt = 0; $altok = 0; $blockvmenuopened = false;

+				$num = count($this->menu->liste);

+				for ($i = 0; $i < $num; $i++)

+				{

@@ -382,3 +364,4 @@
-					if (empty($menu_array[$i]['level'])) {

-						$altok++;

-						$blockvmenuopened = true;

+					if (empty($this->menu->liste[$i]['level']))

+					{

+			    		$altok++;

+    					$blockvmenuopened = true;

@@ -386,4 +369,9 @@
-						for ($j = ($i + 1); $j < $num; $j++) {

-							if (empty($menu_array[$j]['level'])) {

-								$lastopened = false;

-							}

+        				for ($j = ($i + 1); $j < $num; $j++)

+        				{

+        				    if (empty($menu_array[$j]['level'])) $lastopened = false;

+        				}

+        				$alt = 0; // For menu manager "empty", we force to not have blockvmenufirst defined

+        				$lastopened = 1; // For menu manager "empty", we force to not have blockvmenulast defined

+						if (($alt % 2 == 0))

+						{

+							print '<div class="blockvmenub lockvmenuimpair blockvmenuunique'.($lastopened ? ' blockvmenulast' : '').($alt == 1 ? ' blockvmenufirst' : '').'">'."\n";

@@ -391,5 +379,2 @@
-						$alt = 0; // For menu manager "empty", we force to not have blockvmenufirst defined

-						$lastopened = 1; // For menu manager "empty", we force to not have blockvmenulast defined

-						if (($alt % 2 == 0)) {

-							print '<div class="blockvmenub lockvmenuimpair blockvmenuunique'.($lastopened ? ' blockvmenulast' : '').($alt == 1 ? ' blockvmenufirst' : '').'">'."\n";

-						} else {

+						else

+						{

@@ -402,3 +387,5 @@
-					$tabul = ($menu_array[$i]['level'] - 1);

-					if ($tabul > 0) {

-						for ($j = 0; $j < $tabul; $j++) {

+					$tabul = ($this->menu->liste[$i]['level'] - 1);

+					if ($tabul > 0)

+					{

+						for ($j = 0; $j < $tabul; $j++)

+						{

@@ -409,5 +396,8 @@
-					if ($menu_array[$i]['level'] == 0) {

-						if ($menu_array[$i]['enabled']) {

-							print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.dol_buildpath($menu_array[$i]['url'], 1).'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>'.$menu_array[$i]['titre'].'</a></div>'."\n";

-						} else {

-							print '<div class="menu_titre">'.$tabstring.'<span class="vmenudisabled">'.$menu_array[$i]['titre'].'</span></div>'."\n";

+					if ($this->menu->liste[$i]['level'] == 0) {

+						if ($this->menu->liste[$i]['enabled'])

+						{

+							print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.dol_buildpath($this->menu->liste[$i]['url'], 1).'"'.($this->menu->liste[$i]['target'] ? ' target="'.$this->menu->liste[$i]['target'].'"' : '').'>'.$this->menu->liste[$i]['titre'].'</a></div>'."\n";

+						}

+						else

+						{

+							print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$this->menu->liste[$i]['titre'].'</font></div>'."\n";

@@ -418,4 +408,14 @@
-					if ($menu_array[$i]['level'] > 0) {

-						$cssmenu = '';

-						if ($menu_array[$i]['url']) {

-							$cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/', '', $menu_array[$i]['url']));

+					if ($this->menu->liste[$i]['level'] > 0)

+					{

+        				$cssmenu = '';

+        				if ($this->menu->liste[$i]['url']) $cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/', '', $this->menu->liste[$i]['url']));

+

+					    print '<div class="menu_contenu'.$cssmenu.'">';

+

+						if ($this->menu->liste[$i]['enabled'])

+						{

+							print $tabstring;

+							if ($this->menu->liste[$i]['url']) print '<a class="vsmenu" href="'.dol_buildpath($this->menu->liste[$i]['url'], 1).'"'.($this->menu->liste[$i]['target'] ? ' target="'.$this->menu->liste[$i]['target'].'"' : '').'>';

+							else print '<span class="vsmenu">';

+							if ($this->menu->liste[$i]['url']) print $this->menu->liste[$i]['titre'].'</a>';

+							else print '</span>';

@@ -423,17 +423,3 @@
-

-						print '<div class="menu_contenu'.$cssmenu.'">';

-

-						if ($menu_array[$i]['enabled']) {

-							print $tabstring;

-							if ($menu_array[$i]['url']) {

-								print '<a class="vsmenu"  itle="'.dol_escape_htmltag($menu_array[$i]['titre']).'" href="'.dol_buildpath($menu_array[$i]['url'], 1).'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';

-							} else {

-								print '<span class="vsmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'">';

-							}

-							if ($menu_array[$i]['url']) {

-								print $menu_array[$i]['titre'].'</a>';

-							} else {

-								print '</span>';

-							}

-						} else {

-							print $tabstring.'<span class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</span>';

+						else

+						{

+							print $tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$this->menu->liste[$i]['titre'].'</font>';

@@ -443,3 +429 @@
-						if (!strstr($menu_array[$i]['titre'], '<table')) {

-							print '<br>';

-						}

+						if (!strstr($this->menu->liste[$i]['titre'], '<table')) print '<br>';

@@ -450 +434,2 @@
-					if (empty($menu_array[$i + 1]['level'])) {

+					if (empty($this->menu->liste[$i + 1]['level']))

+					{

@@ -456,3 +441 @@
-				if ($altok) {

-					print '<div class="blockvmenuend"></div>';

-				}

+				if ($altok) print '<div class="blockvmenuend"></div>';

@@ -461 +444,2 @@
-			if ($mode == 'jmobile') {

+			if ($mode == 'jmobile')

+			{

@@ -463 +447 @@
-				unset($menu_array);

+				unset($this->menu->liste);

@@ -465,0 +450,57 @@
+        /*

+		if ($mode == 'jmobile')

+		{

+			$substitarray = getCommonSubstitutionArray($langs, 0, null, null);

+

+			foreach($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'

+			{

+				print '<ul class="ulmenu" data-inset="true">';

+				print '<li class="lilevel0">';

+

+		        $val['url'] = make_substitutions($val['url'], $substitarray);

+

+				if ($val['enabled'] == 1)

+				{

+					$relurl=dol_buildpath($val['url'],1);

+

+					print '<a href="#">'.$val['titre'].'</a>'."\n";

+					// Search submenu fot this entry

+					$tmpmainmenu=$val['mainmenu'];

+					$tmpleftmenu='all';

+					//$submenu=new Menu();

+					//$res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$submenu,1,$tmpmainmenu,$tmpleftmenu);

+					//$nexturl=dol_buildpath($submenu->liste[0]['url'],1);

+					$submenu=$this->leftmenu;

+

+					$canonrelurl=preg_replace('/\?.*$/','',$relurl);

+					$canonnexturl=preg_replace('/\?.*$/','',$nexturl);

+					//var_dump($canonrelurl);

+					//var_dump($canonnexturl);

+					print '<ul>';

+        			if ($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('home','tools')))

+					{

+						// We add sub entry

+						print '<li><a href="'.$relurl.'">'.$langs->trans("MainArea").'-'.$val['titre'].'</a></li>'."\n";

+					}

+					foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'

+					{

+	                	$val2['url'] = make_substitutions($val2['url'], $substitarray);

+

+						$relurl2=dol_buildpath($val2['url'],1);

+						//var_dump($val2);

+						print '<li><a href="'.$relurl2.'">'.$val2['titre'].'</a></li>'."\n";

+					}

+					//var_dump($submenu);

+					print '</ul>';

+				}

+				if ($val['enabled'] == 2)

+				{

+					print '<font class="vsmenudisabled">'.$val['titre'].'</font>';

+				}

+				print '</li>';

+				print '</ul>'."\n";

+

+				break;	// Only first menu entry (so home)

+			}

+		}

+        */

@@ -480 +521 @@
-	global $conf;

+    global $conf;

@@ -483 +524 @@
-	print '<ul role="navigation" class="tmenu"'.(!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '' : ' title="Top menu"').'>';

+	print '<ul role="navigation" class="tmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Top menu"').'>';

@@ -496 +537,2 @@
-	if ($showmode) {

+	if ($showmode)

+	{

@@ -506,8 +548,7 @@
- * @param	string	$text			Text

- * @param	int		$showmode		1 or 2

- * @param	string	$url			Url

- * @param	string	$id				Id

- * @param	string	$idsel			Id sel

- * @param	string	$classname		Class name

- * @param	string	$atarget		Target

- * @param	array	$menuval		All the $menuval array

+ * @param	string	$text		Text

+ * @param	int		$showmode	1 or 2

+ * @param	string	$url		Url

+ * @param	string	$id			Id

+ * @param	string	$idsel		Id sel

+ * @param	string	$classname	Class name

+ * @param	string	$atarget	Target

@@ -516 +557 @@
-function print_text_menu_entry_empty($text, $showmode, $url, $id, $idsel, $classname, $atarget, $menuval = array())

+function print_text_menu_entry_empty($text, $showmode, $url, $id, $idsel, $classname, $atarget)

@@ -520,14 +561,4 @@
-	$classnameimg = str_replace('class="', 'class="tmenuimage ', $classname);

-	$classnametxt = str_replace('class="', 'class="tmenulabel ', $classname);

-

-	if ($showmode == 1) {

-		print '<a '.$classnameimg.' tabindex="-1" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').' title="'.dol_escape_htmltag($text).'">';

-		print '<div class="'.$id.' '.$idsel.' topmenuimage">';

-		if (!empty($menuval['prefix']) && strpos($menuval['prefix'], '<span') === 0) {

-			print $menuval['prefix'];

-		} elseif (!empty($menuval['prefix']) && strpos($menuval['prefix'], 'fa-') === 0) {

-			print '<span class="'.$id.' '.$menuval['prefix'].'" id="mainmenuspan_'.$idsel.'"></span>';

-		} else {

-			print '<span class="'.$id.' tmenuimageforpng" id="mainmenuspan_'.$idsel.'"></span>';

-		}

-		print '</div>';

+	if ($showmode == 1)

+	{

+		print '<a class="tmenuimage" tabindex="-1" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').'>';

+		print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';

@@ -535,7 +566,5 @@
-		if (!getDolGlobalString('THEME_TOPMENU_DISABLE_TEXT')) {

-			print '<a '.$classnametxt.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').'>';

-			print '<span class="mainmenuaspan">';

-			print $text;

-			print '</span>';

-			print '</a>';

-		}

+		print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').'>';

+		print '<span class="mainmenuaspan">';

+		print $text;

+		print '</span>';

+		print '</a>';

@@ -543,13 +572,4 @@
-	if ($showmode == 2) {

-		print '<div '.$classnameimg.' title="'.dol_escape_htmltag($text.' - '.$langs->trans("NotAllowed")).'">';

-		print '<div class="'.$id.' '.$idsel.' topmenuimage tmenudisabled">';

-		print '<span class="'.$id.' tmenuimageforpng tmenudisabled" id="mainmenuspan_'.$idsel.'"></span>';

-		print '</div>';

-		print '</div>';

-		if (!getDolGlobalString('THEME_TOPMENU_DISABLE_TEXT')) {

-			print '<span '.$classnametxt.' id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($text.' - '.$langs->trans("NotAllowed")).'">';

-			print '<span class="mainmenuaspan">';

-			print $text;

-			print '</span>';

-			print '</span>';

-		}

+	if ($showmode == 2)

+	{

+		print '<div class="'.$id.' '.$idsel.' tmenudisabled"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';

+		print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';

@@ -567 +587,2 @@
-	if ($showmode) {

+	if ($showmode)

+	{