From 5f43a280f6683c604e744840f623610e936109f0 Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Sat, 9 Dec 2006 11:37:36 +0000
Subject: [PATCH] Ajout champs supplementaires le temps de trouver la meilleure
 methode pour les deplacer dans l'objet idoine

---
 htdocs/product/liste.php | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php
index e0dd2f63ad5..27199bbd418 100644
--- a/htdocs/product/liste.php
+++ b/htdocs/product/liste.php
@@ -68,13 +68,31 @@ if (isset($_REQUEST['catid']))
   $catid = $_REQUEST['catid'];
 }
 
-
 /*
  * Affichage mode liste
  *
  */
 
-$title=$langs->trans("ProductsAndServices");
+if ($_GET["canvas"] <> '' && file_exists('canvas/product.'.$_GET["canvas"].'.class.php') )
+{
+  $class = 'Product'.ucfirst($_GET["canvas"]);
+  include_once('canvas/product.'.$_GET["canvas"].'.class.php');
+}
+else
+{
+  $title=$langs->trans("ProductsAndServices");
+
+  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"); }
+    } else {
+      $texte = $langs->trans("ProductsAndServices");
+    }
+}
+
+
 
 $sql = 'SELECT p.rowid, p.ref, p.label, p.price, p.fk_product_type, '.$db->pdate('p.tms').' as datem,';
 $sql.= ' p.duration, p.envente as statut';
@@ -148,17 +166,7 @@ if ($resql)
     {
       $envente = (isset($_GET["envente"])?$_GET["envente"]:$_POST["envente"]);
     }
-  
-  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"); }
-    } else {
-      $texte = $langs->trans("ProductsAndServices");
-    }
-  
-  
+     
   llxHeader("","",$texte);
   
   if ($sref || $snom || $sall || $_POST["search"])