From 0c501189cc2aadf2aaabbc5c01422201c48f6b74 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 4 Feb 2009 22:30:46 +0000 Subject: [PATCH] Minor fixes --- .../includes/menus/barre_left/eldy_backoffice.php | 15 ++++++++------- .../menus/barre_left/eldy_frontoffice.php | 15 ++++++++------- htdocs/product/reassort.php | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index ca742a24240..bac4b297cbd 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -604,6 +604,10 @@ class MenuLeft { $newmenu->add_submenu(DOL_URL_ROOT."/product/liste.php?leftmenu=product&type=0&canvas=livre", $langs->trans("BookList"), 1, $user->rights->produit->creer); } } + if ($conf->propal->enabled) + { + $newmenu->add_submenu(DOL_URL_ROOT."/product/popuprop.php?leftmenu=stats&type=0", $langs->trans("Popularity"), 1, $user->rights->propale->lire); + } if ($conf->stock->enabled) { $newmenu->add_submenu(DOL_URL_ROOT."/product/reassort.php?type=0", $langs->trans("Stocks"), 1, $user->rights->stock->lire); @@ -619,6 +623,10 @@ class MenuLeft { $newmenu->add_submenu(DOL_URL_ROOT."/product/fiche.php?leftmenu=service&action=create&type=1", $langs->trans("NewService"), 1, $user->rights->produit->creer); } $newmenu->add_submenu(DOL_URL_ROOT."/product/liste.php?leftmenu=service&type=1", $langs->trans("List"), 1, $user->rights->produit->lire); + if ($conf->propal->enabled) + { + $newmenu->add_submenu(DOL_URL_ROOT."/product/popuprop.php?leftmenu=stats&type=1", $langs->trans("Popularity"), 1, $user->rights->propale->lire); + } } // Categories @@ -633,13 +641,6 @@ class MenuLeft { //if ($leftmenu=="cat") $newmenu->add_submenu(DOL_URL_ROOT."/categories/liste.php", $langs->trans("List"), 1, $user->rights->categorie->lire); } - // Statistics - $newmenu->add(DOL_URL_ROOT."/product/stats/index.php?leftmenu=stats", $langs->trans("Statistics"), 0, $user->rights->produit->lire); - if ($conf->propal->enabled) - { - $newmenu->add_submenu(DOL_URL_ROOT."/product/popuprop.php?leftmenu=stats", $langs->trans("Popularity"), 1, $user->rights->propale->lire); - } - // Stocks if ($conf->stock->enabled) { diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php index 92dcb89292a..6b2f3541745 100644 --- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php @@ -584,6 +584,10 @@ class MenuLeft { $newmenu->add_submenu(DOL_URL_ROOT."/product/liste.php?leftmenu=product&type=0&canvas=livre", $langs->trans("BookList"), 1, $user->rights->produit->creer); } } + if ($conf->propal->enabled) + { + $newmenu->add_submenu(DOL_URL_ROOT."/product/popuprop.php?leftmenu=stats&type=0", $langs->trans("Popularity"), 1, $user->rights->propale->lire); + } if ($conf->stock->enabled) { $newmenu->add_submenu(DOL_URL_ROOT."/product/reassort.php?type=0", $langs->trans("Stocks"), 1, $user->rights->stock->lire); @@ -598,6 +602,10 @@ class MenuLeft { { $newmenu->add_submenu(DOL_URL_ROOT."/product/fiche.php?leftmenu=service&action=create&type=1", $langs->trans("NewService"), 1, $user->rights->produit->creer); } + if ($conf->propal->enabled) + { + $newmenu->add_submenu(DOL_URL_ROOT."/product/popuprop.php?leftmenu=stats&type=1", $langs->trans("Popularity"), 1, $user->rights->propale->lire); + } $newmenu->add_submenu(DOL_URL_ROOT."/product/liste.php?leftmenu=service&type=1", $langs->trans("List"), 1, $user->rights->produit->lire); } @@ -613,13 +621,6 @@ class MenuLeft { //if ($leftmenu=="cat") $newmenu->add_submenu(DOL_URL_ROOT."/categories/liste.php", $langs->trans("List"), 1, $user->rights->categorie->lire); } - // Statistics - $newmenu->add(DOL_URL_ROOT."/product/stats/index.php?leftmenu=stats", $langs->trans("Statistics"), 0, $user->rights->produit->lire); - if ($conf->propal->enabled) - { - $newmenu->add_submenu(DOL_URL_ROOT."/product/popuprop.php?leftmenu=stats", $langs->trans("Popularity"), 1, $user->rights->propale->lire); - } - // Stocks if ($conf->stock->enabled) { diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php index 554d14ace56..d6c3e2864d8 100644 --- a/htdocs/product/reassort.php +++ b/htdocs/product/reassort.php @@ -47,7 +47,7 @@ $type=trim($type); $sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"]; $sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"]; -if (! $sortfield) $sortfield="stock_theorique"; +if (! $sortfield) $sortfield="stock_physique"; if (! $sortorder) $sortorder="ASC"; $page = $_GET["page"]; $limit = $conf->liste_limit;