From 8392dc44fc053ca4198a17b1567c29af40ae0e82 Mon Sep 17 00:00:00 2001 From: Rodolphe Quiedeville Date: Mon, 4 Dec 2006 17:54:07 +0000 Subject: [PATCH] Ajout filtre sur le canevas utilise --- htdocs/product/liste.php | 164 ++++++++++++++++++++------------------- 1 file changed, 84 insertions(+), 80 deletions(-) diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php index 4b7ca60b8cb..12fca1759e4 100644 --- a/htdocs/product/liste.php +++ b/htdocs/product/liste.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2001-2006 Rodolphe Quiedeville * Copyright (C) 2004-2006 Laurent Destailleur * Copyright (C) 2005-2006 Regis Houssin * @@ -22,10 +22,10 @@ */ /** - \file htdocs/product/liste.php - \ingroup produit - \brief Page liste des produits ou services - \version $Revision$ + \file htdocs/product/liste.php + \ingroup produit + \brief Page liste des produits ou services + \version $Revision$ */ require("./pre.inc.php"); @@ -59,13 +59,13 @@ $offset = $limit * $page ; if (isset($_POST["button_removefilter_x"])) { - $sref=""; - $snom=""; + $sref=""; + $snom=""; } if (isset($_REQUEST['catid'])) { - $catid = $_REQUEST['catid']; + $catid = $_REQUEST['catid']; } @@ -81,47 +81,51 @@ $sql.= ' p.duration, p.envente as statut'; $sql.= ' FROM '.MAIN_DB_PREFIX.'product as p'; // '.MAIN_DB_PREFIX.'product_det as d'; //en attendant le debugage if ($catid || ($conf->categorie->enabled && !$user->rights->categorie->voir)) { - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid"; } if ($_GET["fourn_id"] > 0) { - $fourn_id = $_GET["fourn_id"]; - $sql .= ", ".MAIN_DB_PREFIX."product_fournisseur as pf"; + $fourn_id = $_GET["fourn_id"]; + $sql .= ", ".MAIN_DB_PREFIX."product_fournisseur as pf"; } $sql .= " WHERE 1=1"; if ($sall) { - $sql .= " AND (p.ref like '%".$sall."%' OR p.label like '%".$sall."%' OR p.description like '%".$sall."%' OR p.note like '%".$sall."%')"; + $sql .= " AND (p.ref like '%".$sall."%' OR p.label like '%".$sall."%' OR p.description like '%".$sall."%' OR p.note like '%".$sall."%')"; } if (strlen($_GET["type"]) || strlen($_POST["type"])) { - $sql .= " AND p.fk_product_type = ".(strlen($_GET["type"])?$_GET["type"]:$_POST["type"]); + $sql .= " AND p.fk_product_type = ".(strlen($_GET["type"])?$_GET["type"]:$_POST["type"]); } if ($sref) { - $sql .= " AND p.ref like '%".$sref."%'"; + $sql .= " AND p.ref like '%".$sref."%'"; } if ($snom) { - $sql .= " AND p.label like '%".$snom."%'"; + $sql .= " AND p.label like '%".$snom."%'"; } if (isset($_GET["envente"]) && strlen($_GET["envente"]) > 0) { - $sql .= " AND p.envente = ".$_GET["envente"]; + $sql .= " AND p.envente = ".$_GET["envente"]; +} +if (isset($_GET["canvas"]) && strlen($_GET["canvas"]) > 0) +{ + $sql .= " AND p.canvas = '".mysql_escape_string($_GET["canvas"])."'"; } if($catid) { - $sql .= " AND cp.fk_categorie = ".$catid; + $sql .= " AND cp.fk_categorie = ".$catid; } if ($conf->categorie->enabled && !$user->rights->categorie->voir) { - $sql.= ' AND IFNULL(c.visible,1)=1'; + $sql.= ' AND IFNULL(c.visible,1)=1'; } if ($fourn_id > 0) { - $sql .= " AND p.rowid = pf.fk_product AND pf.fk_soc = ".$fourn_id; + $sql .= " AND p.rowid = pf.fk_product AND pf.fk_soc = ".$fourn_id; } $sql .= " ORDER BY $sortfield $sortorder "; $sql .= $db->plimit($limit + 1 ,$offset); @@ -129,54 +133,54 @@ $resql = $db->query($sql) ; if ($resql) { - $num = $db->num_rows($resql); + $num = $db->num_rows($resql); - $i = 0; + $i = 0; - if ($num == 1 && ($sall or $snom or $sref)) + if ($num == 1 && ($sall or $snom or $sref)) { - $objp = $db->fetch_object($resql); - Header("Location: fiche.php?id=$objp->rowid"); - exit; + $objp = $db->fetch_object($resql); + Header("Location: fiche.php?id=$objp->rowid"); + exit; } - - if (isset($_GET["envente"]) || isset($_POST["envente"])) + + if (isset($_GET["envente"]) || isset($_POST["envente"])) { - $envente = (isset($_GET["envente"])?$_GET["envente"]:$_POST["envente"]); + $envente = (isset($_GET["envente"])?$_GET["envente"]:$_POST["envente"]); } - - if (isset($_GET["type"]) || isset($_POST["type"])) + + if (isset($_GET["type"]) || isset($_POST["type"])) { - $type=isset($_GET["type"])?$_GET["type"]:$_POST["type"]; - if ($type) { $texte = $langs->trans("Services"); } - else { $texte = $langs->trans("Products"); } + $type=isset($_GET["type"])?$_GET["type"]:$_POST["type"]; + if ($type) { $texte = $langs->trans("Services"); } + else { $texte = $langs->trans("Products"); } } else { - $texte = $langs->trans("ProductsAndServices"); + $texte = $langs->trans("ProductsAndServices"); } - - - llxHeader("","",$texte); - - if ($sref || $snom || $sall || $_POST["search"]) + + + llxHeader("","",$texte); + + 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($texte, $page, "liste.php", "&sref=".$sref."&snom=".$snom."&sall=".$sall."&envente=".$_POST["envente"], $sortfield, $sortorder,'',$num); } - else + 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($texte, $page, "liste.php", "&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&type=$type":""), $sortfield, $sortorder,'',$num); } - - if (isset($catid)) + + if (isset($catid)) { - print "
"; - $c = new Categorie ($db, $catid); - $ways = $c->print_all_ways(' > ','product/liste.php'); - print " > ".$ways[0]."
\n"; - print "

"; + print "
"; + $c = new Categorie ($db, $catid); + $ways = $c->print_all_ways(' > ','product/liste.php'); + print " > ".$ways[0]."
\n"; + print "

"; } print ''; - + // Lignes des titres print ""; print_liste_field_titre($langs->trans("Ref"),"liste.php", "p.ref","&envente=$envente".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","","",$sortfield); @@ -201,9 +205,9 @@ if ($resql) print ''; if ($conf->service->enabled && $type != 0) { - print ''; + print ''; } print '
'; - print ' '; - print ''; + print ' '; + print ''; print ' '; @@ -222,22 +226,22 @@ if ($resql) $var=True; while ($i < min($num,$limit)) - { + { $objp = $db->fetch_object($resql); - // Multilangs - if ($conf->global->MAIN_MULTILANGS) // si l'option est active - { - $sql = "SELECT label FROM ".MAIN_DB_PREFIX."product_det"; - $sql.= " WHERE fk_product=".$objp->rowid." AND lang='". $langs->getDefaultLang() ."'"; - $sql.= " LIMIT 1"; - $result = $db->query($sql); - if ($result) - { - $objtp = $db->fetch_object($result); - if ($objtp->label != '') $objp->label = $objtp->label; - } - } + // Multilangs + if ($conf->global->MAIN_MULTILANGS) // si l'option est active + { + $sql = "SELECT label FROM ".MAIN_DB_PREFIX."product_det"; + $sql.= " WHERE fk_product=".$objp->rowid." AND lang='". $langs->getDefaultLang() ."'"; + $sql.= " LIMIT 1"; + $result = $db->query($sql); + if ($result) + { + $objtp = $db->fetch_object($result); + if ($objtp->label != '') $objp->label = $objtp->label; + } + } $var=!$var; print '
'; @@ -265,24 +269,24 @@ if ($resql) if ($num > $conf->liste_limit) { - 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); - } - else - { - print_barre_liste($texte, $page, "liste.php", "&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&type=$type":""), $sortfield, $sortorder,'',$num); - } + 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); } - + else + { + print_barre_liste($texte, $page, "liste.php", "&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&type=$type":""), $sortfield, $sortorder,'',$num); + } + } + $db->free($resql); - + print "
"; - + } else { - dolibarr_print_error($db); + dolibarr_print_error($db); }