diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index f52981331fa..83024c2b70d 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -379,7 +379,7 @@ class Menubase
if ($leftmenuConstraint)
{
- // print "x".$pere." ".$tab[$x][6];
+ //print 'name='.$tab[$x][3].' pere='.$pere." ".$tab[$x][6];
$this->newmenu->add((! preg_match("/^(http:\/\/|https:\/\/)/i",$tab[$x][2])) ? DOL_URL_ROOT . $tab[$x][2] : $tab[$x][2], $tab[$x][3], $rang -1, $tab[$x][4], $tab[$x][5], $tab[$x][8]);
$this->recur($tab, $tab[$x][0], $rang +1);
@@ -609,8 +609,9 @@ class Menubase
$enabled = true;
if ($menu['enabled'])
{
- $enabled = verifCond($menu['enabled']);
- //print "verifCond rowid=".$menu['rowid']." ".$menu['enabled'].":".$enabled."
\n";
+ $enabled = verifCond($menu['enabled']);
+ if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_ACCORDION && preg_match('/^\$leftmenu/',$menu['enabled'])) $enabled=1;
+ //print "verifCond chaine=".$chaine." rowid=".$menu['rowid']." ".$menu['enabled'].":".$enabled."
\n";
}
if ($menu['rowid'] != $oldrowid && $oldrowid) $b++; // Break on new entry
diff --git a/htdocs/includes/menus/standard/auguria.lib.php b/htdocs/includes/menus/standard/auguria.lib.php
index 7120ce7d3b4..5ff94850623 100644
--- a/htdocs/includes/menus/standard/auguria.lib.php
+++ b/htdocs/includes/menus/standard/auguria.lib.php
@@ -215,6 +215,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after)
$menuArbo = new Menubase($db,'auguria','left');
$overwritemenufor = $menuArbo->listeMainmenu();
$newmenu = $menuArbo->menuLeftCharger($newmenu,$mainmenu,$leftmenu,($user->societe_id?1:0),'auguria');
+ //var_dump($newmenu);
/*
* Menu AUTRES (Pour les menus du haut qui ne serait pas geres)
@@ -246,7 +247,14 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after)
{
if (($alt%2==0))
{
- print '