From 1880373019019cf20955b71948985d066f22b83c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 16 Nov 2008 19:30:29 +0000 Subject: [PATCH] Look: A lot of enhancements in Dolibarr skins --- htdocs/product/liste.php | 4 ++-- htdocs/product/stats/commande.php | 2 +- htdocs/product/stats/commande_fournisseur.php | 4 ++-- htdocs/product/stats/contrat.php | 2 +- htdocs/product/stats/facture.php | 2 +- htdocs/product/stats/facture_fournisseur.php | 2 +- htdocs/product/stats/propal.php | 9 +++------ 7 files changed, 11 insertions(+), 14 deletions(-) diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php index a630523ace4..9c78229b7c5 100644 --- a/htdocs/product/liste.php +++ b/htdocs/product/liste.php @@ -350,11 +350,11 @@ if ($resql) { if ($sref || $snom || $sall || $_POST["search"]) { - print_barre_liste($texte, $page, "liste.php", "&sref=".$sref."&snom=".$snom."&sall=".$sall."&envente=".$_POST["envente"], $sortfield, $sortorder,'',$num); + print_barre_liste('', $page, "liste.php", "&sref=".$sref."&snom=".$snom."&sall=".$sall."&envente=".$_POST["envente"], $sortfield, $sortorder,'',$num); } else { - print_barre_liste($texte, $page, "liste.php", "&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&type=$type":""), $sortfield, $sortorder,'',$num); + print_barre_liste('', $page, "liste.php", "&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&type=$type":""), $sortfield, $sortorder,'',$num); } } diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php index 8973a0cfaca..c87b8848e14 100644 --- a/htdocs/product/stats/commande.php +++ b/htdocs/product/stats/commande.php @@ -147,7 +147,7 @@ if ($_GET["id"] || $_GET["ref"]) { $num = $db->num_rows($result); - print_barre_liste($langs->trans("CustomersOrders"),$page,$_SERVER["PHP_SELF"],"&id=$product->id",$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans("CustomersOrders"),$page,$_SERVER["PHP_SELF"],"&id=$product->id",$sortfield,$sortorder,'',$num,0,''); $i = 0; print ""; diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php index 0fbc4bfd0a2..157e66d2367 100644 --- a/htdocs/product/stats/commande_fournisseur.php +++ b/htdocs/product/stats/commande_fournisseur.php @@ -130,7 +130,7 @@ if ($_GET["id"] || $_GET["ref"]) if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if ($socid) { - $sql .= " AND c.fk_soc = ".$socid; + $sql .= " AND c.fk_soc = ".$socid; } $sql.= " ORDER BY $sortfield $sortorder "; $sql.= $db->plimit($conf->liste_limit +1, $offset); @@ -140,7 +140,7 @@ if ($_GET["id"] || $_GET["ref"]) { $num = $db->num_rows($result); - print_barre_liste($langs->trans("SuppliersOrders"),$page,$_SERVER["PHP_SELF"],"&id=$product->id",$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans("SuppliersOrders"),$page,$_SERVER["PHP_SELF"],"&id=$product->id",$sortfield,$sortorder,'',$num,0,''); $i = 0; print "
"; diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php index 0e16787d6ea..5464cb8bde3 100644 --- a/htdocs/product/stats/contrat.php +++ b/htdocs/product/stats/contrat.php @@ -150,7 +150,7 @@ if ($_GET["id"] || $_GET["ref"]) { $num = $db->num_rows($result); - print_barre_liste($langs->trans("Contrats"),$page,$_SERVER["PHP_SELF"],"&id=$product->id",$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans("Contrats"),$page,$_SERVER["PHP_SELF"],"&id=$product->id",$sortfield,$sortorder,'',$num,0,''); $i = 0; print "
"; diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index 4ee57bd7b6e..888f08ad68b 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -141,7 +141,7 @@ if ($_GET["id"] || $_GET["ref"]) { $num = $db->num_rows($result); - print_barre_liste($langs->trans("CustomersInvoices"),$page,$_SERVER["PHP_SELF"],"&id=$product->id",$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans("CustomersInvoices"),$page,$_SERVER["PHP_SELF"],"&id=$product->id",$sortfield,$sortorder,'',$num,0,''); $i = 0; print "
"; diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php index 495241448f9..05f6e6d704c 100644 --- a/htdocs/product/stats/facture_fournisseur.php +++ b/htdocs/product/stats/facture_fournisseur.php @@ -141,7 +141,7 @@ if ($_GET["id"] || $_GET["ref"]) { $num = $db->num_rows($result); - print_barre_liste($langs->trans("SuppliersInvoices"),$page,$_SERVER["PHP_SELF"],"&id=$product->id",$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans("SuppliersInvoices"),$page,$_SERVER["PHP_SELF"],"&id=$product->id",$sortfield,$sortorder,'',$num,0,''); $i = 0; print "
"; diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php index 628f552d693..2e97d52e1e2 100644 --- a/htdocs/product/stats/propal.php +++ b/htdocs/product/stats/propal.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2007 Laurent Destailleur + * Copyright (C) 2004-2008 Laurent Destailleur * Copyright (C) 2005-2007 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -16,16 +16,13 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ */ /** \file htdocs/product/stats/propal.php \ingroup product, service, propal \brief Page des stats des propals pour un produit - \version $Revision$ + \version $Id$ */ @@ -148,7 +145,7 @@ if ($_GET["id"] || $_GET["ref"]) { $num = $db->num_rows($result); - print_barre_liste($langs->trans("Proposals"),$page,$_SERVER["PHP_SELF"],"&id=$product->id",$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans("Proposals"),$page,$_SERVER["PHP_SELF"],"&id=$product->id",$sortfield,$sortorder,'',$num,0,''); $i = 0; print "
";