Minor fixes
This commit is contained in:
parent
5bf4e90b98
commit
0c501189cc
@ -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)
|
||||
{
|
||||
|
||||
@ -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)
|
||||
{
|
||||
|
||||
@ -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;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user