diff --git a/htdocs/product/canvas/default/product.default.class.php b/htdocs/product/canvas/default/product.default.class.php index d830fcf69bf..8054a33283b 100644 --- a/htdocs/product/canvas/default/product.default.class.php +++ b/htdocs/product/canvas/default/product.default.class.php @@ -56,6 +56,18 @@ class ProductDefault extends Product return 'Produits'; } + /** + * \brief Lecture des donnees dans la base + * \param id Product id + * \param ref Product ref + */ + function fetchCanvas($id='', $ref='', $action='') + { + $result = $this->fetch($id,$ref); + + return $result; + } + /** * \brief Fetch field list */ diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 6775e788373..0187d96117f 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -857,7 +857,7 @@ if ($_GET["id"] || $_GET["ref"]) include_once('canvas/'.$product->canvas.'/product.'.$product->canvas.'.class.php'); $product = new $class($db); - $result = $product->FetchCanvas($_GET["id"],'',$_GET["action"]); + $result = $product->fetchCanvas($_GET["id"],'',$_GET["action"]); $smarty->template_dir = DOL_DOCUMENT_ROOT.'/product/canvas/'.$product->canvas.'/templates/'; diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php index bbe56a07b7a..197d4b2a8e9 100644 --- a/htdocs/product/liste.php +++ b/htdocs/product/liste.php @@ -34,6 +34,20 @@ $langs->load("products"); $type=trim(isset($_GET["type"])?$_GET["type"]:$_POST["type"]); +// TODO for compatibility +if (!isset($_GET["canvas"])) +{ + $sbarcode=isset($_GET["sbarcode"])?$_GET["sbarcode"]:$_POST["sbarcode"]; + $snom=isset($_GET["snom"])?$_GET["snom"]:$_POST["snom"]; + $sall=isset($_GET["sall"])?$_GET["sall"]:$_POST["sall"]; + $type=isset($_GET["type"])?$_GET["type"]:$_POST["type"]; + $sref=trim($sref); + $sbarcode=trim($sbarcode); + $snom=trim($snom); + $sall=trim($sall); + $type=trim($type); +} + $sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"]; $sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"]; if (! $sortfield) $sortfield="p.ref";