/[dolibarr]/dolibarr/htdocs/product/liste.php
ViewVC logotype

Diff of /dolibarr/htdocs/product/liste.php

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.34 by eldy, Sun Sep 4 20:59:57 2005 UTC revision 1.35 by eldy, Wed Sep 14 23:57:05 2005 UTC
# Line 40  if (!$user->rights->produit->lire) Line 40  if (!$user->rights->produit->lire)
40  $sref=isset($_GET["sref"])?$_GET["sref"]:$_POST["sref"];  $sref=isset($_GET["sref"])?$_GET["sref"]:$_POST["sref"];
41  $snom=isset($_GET["snom"])?$_GET["snom"]:$_POST["snom"];  $snom=isset($_GET["snom"])?$_GET["snom"]:$_POST["snom"];
42  $sall=isset($_GET["sall"])?$_GET["sall"]:$_POST["sall"];  $sall=isset($_GET["sall"])?$_GET["sall"]:$_POST["sall"];
   
43  $type=isset($_GET["type"])?$_GET["type"]:$_POST["type"];  $type=isset($_GET["type"])?$_GET["type"]:$_POST["type"];
44    $sref=trim($sref);
45    $snom=trim($snom);
46    $sall=trim($sall);
47    $type=trim($type);
48    
49  $sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"];  $sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"];
50  $sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"];  $sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"];
# Line 65  if (isset($_POST["button_removefilter_x" Line 68  if (isset($_POST["button_removefilter_x"
68    
69  $title=$langs->trans("ProductsAndServices");  $title=$langs->trans("ProductsAndServices");
70    
71  $sql = 'SELECT p.rowid, p.label, p.price, p.ref, p.fk_product_type, '.$db->pdate('p.tms').' as datem';  $sql = 'SELECT p.rowid, p.ref, p.label, p.price, p.fk_product_type, '.$db->pdate('p.tms').' as datem';
72  $sql.= ' FROM '.MAIN_DB_PREFIX.'product as p';  $sql.= ' FROM '.MAIN_DB_PREFIX.'product as p';
73    
74  if ($_GET["fourn_id"] > 0)  if ($_GET["fourn_id"] > 0)
# Line 76  if ($_GET["fourn_id"] > 0) Line 79  if ($_GET["fourn_id"] > 0)
79  $sql .= " WHERE 1=1";  $sql .= " WHERE 1=1";
80  if ($sall)  if ($sall)
81  {  {
82      $sql .= " AND (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."%')";
83  }  }
84  if (strlen($_GET["type"]) || strlen($_POST["type"]))  if (strlen($_GET["type"]) || strlen($_POST["type"]))
85  {  {
# Line 101  else Line 104  else
104          $sql .= " AND p.envente = 1";          $sql .= " AND p.envente = 1";
105      }      }
106  }  }
   
107  if ($fourn_id > 0)  if ($fourn_id > 0)
108  {  {
109      $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";
110  }  }
   
111  $sql .= " ORDER BY $sortfield $sortorder ";  $sql .= " ORDER BY $sortfield $sortorder ";
112  $sql .= $db->plimit($limit + 1 ,$offset);  $sql .= $db->plimit($limit + 1 ,$offset);
113  $resql = $db->query($sql) ;  $resql = $db->query($sql) ;

Legend:
Removed from v.1.34  
changed lines
  Added in v.1.35

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26