diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 1da2800a57f..ee014814e5a 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -1614,13 +1614,17 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM $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); + $newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("Inventories"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock'); + if ($usemenuhider || empty($leftmenu) || $leftmenu == "stock_inventories") { + $newmenu->add("/product/inventory/card.php?action=create&leftmenu=stock_inventories", $langs->trans("NewInventory"), 1, $user->rights->stock->creer); + $newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $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); + $newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("Inventories"), 0, $user->rights->stock->inventory_advance->read, '', $mainmenu, 'stock'); + if ($usemenuhider || empty($leftmenu) || $leftmenu == "stock_inventories") { + $newmenu->add("/product/inventory/card.php?action=create&leftmenu=stock_inventories", $langs->trans("NewInventory"), 1, $user->rights->stock->inventory_advance->write); + $newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("List"), 1, $user->rights->stock->inventory_advance->read); + } } } } diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php index 4d4b0820e18..1d61018467a 100644 --- a/htdocs/product/stats/card.php +++ b/htdocs/product/stats/card.php @@ -217,18 +217,20 @@ if ($result || empty($id)) // Choice of stats mode (byunit or bynumber) if (!empty($conf->dol_use_jmobile)) print "\n".'
'."\n"; - if ($mode == 'bynumber') print 'id).($type != '' ? '&type='.$type : '').'&mode=byunit&search_year='.$search_year.'">'; - else print img_picto('', 'tick').' '; + if ($mode == 'bynumber') print 'id).($type != '' ? '&type='.$type : '').'&mode=byunit&search_year='.$search_year.'">'; + else print ''; print $langs->trans("StatsByNumberOfUnits"); if ($mode == 'bynumber') print ''; + else print ''; if (!empty($conf->dol_use_jmobile)) print '
'."\n".'
'."\n"; - else print '   /   '; + else print '   '; - if ($mode == 'byunit') print 'id).($type != '' ? '&type='.$type : '').'&mode=bynumber&search_year='.$search_year.'">'; - else print img_picto('', 'tick').' '; + if ($mode == 'byunit') print 'id).($type != '' ? '&type='.$type : '').'&mode=bynumber&search_year='.$search_year.'">'; + else print ''; print $langs->trans("StatsByNumberOfEntities"); if ($mode == 'byunit') print ''; + else print ''; if (!empty($conf->dol_use_jmobile)) print '
'; else print '
'; diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 0c59a2354ab..0bed245996d 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -832,6 +832,31 @@ div.divsearchfield { padding: 3px; } +.a-filter, .a-mesure { + border-radius: 50px; + background: var(--colortexttitlenotab); + color: #fff; + padding: 8px 10px 8px 6px; +} +.a-filter:before { + content: "\f0b0"; +} +.a-mesure:before { + content: "\f080"; +} +.a-filter:before, .a-mesure:before { + font-family: "Font Awesome 5 Free"; + font-weight: 600; + padding-right: 5px; + padding-left: 5px; +} +.a-filter-disabled, .a-mesure-disabled { + border-radius: 50px; + background: var(--colorbacktitle1); + padding: 8px; + opacity: 0.6; +} + browser->layout == 'phone') { white-space: nowrap; } + + +.a-filter, .a-mesure { + border-radius: 50px; + background: var(--colortexttitlenotab); + color: #fff; + padding: 8px 10px 8px 6px; +} +.a-filter:before { + content: "\f0b0"; +} +.a-mesure:before { + content: "\f080"; +} +.a-filter:before, .a-mesure:before { + font-family: "Font Awesome 5 Free"; + font-weight: 600; + padding-right: 5px; + padding-left: 5px; +} +.a-filter-disabled, .a-mesure-disabled { + border-radius: 50px; + background: var(--colorbacktitle1); + padding: 8px; + opacity: 0.6; +} + + div.confirmmessage { padding-top: 6px; }