From ef5bd8c1df91b8b9567f1a1447535fabcada60b7 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Wed, 5 May 2010 10:13:07 +0000
Subject: [PATCH] Works on product canvas and templates Add possibility to move
canvas directory to module directory
---
htdocs/core/class/canvas.class.php | 4 ++--
htdocs/product/canvas/default/product.default.class.php | 2 +-
htdocs/product/canvas/service/product.service.class.php | 2 +-
htdocs/product/fiche.php | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/htdocs/core/class/canvas.class.php b/htdocs/core/class/canvas.class.php
index 6f7a4818188..a3280491adb 100644
--- a/htdocs/core/class/canvas.class.php
+++ b/htdocs/core/class/canvas.class.php
@@ -86,9 +86,9 @@ class Canvas
/**
* \brief Assign values
*/
- function fetch($id,$action='')
+ function fetch($id,$ref='',$action='')
{
- $ret = $this->object->fetch($id,$action);
+ $ret = $this->object->fetch($id,$ref,$action);
return $ret;
}
diff --git a/htdocs/product/canvas/default/product.default.class.php b/htdocs/product/canvas/default/product.default.class.php
index 2d1dce15ee2..c76130ed72c 100644
--- a/htdocs/product/canvas/default/product.default.class.php
+++ b/htdocs/product/canvas/default/product.default.class.php
@@ -65,7 +65,7 @@ class ProductDefault extends Product
* \brief Lecture des donnees dans la base
* \param id Product id
*/
- function fetch($id='', $action='')
+ function fetch($id='', $ref='', $action='')
{
$result = parent::fetch($id);
diff --git a/htdocs/product/canvas/service/product.service.class.php b/htdocs/product/canvas/service/product.service.class.php
index 22f2b6e943b..3df13b64231 100644
--- a/htdocs/product/canvas/service/product.service.class.php
+++ b/htdocs/product/canvas/service/product.service.class.php
@@ -63,7 +63,7 @@ class ProductService extends Product
* \brief Lecture des donnees dans la base
* \param id Product id
*/
- function fetch($id='', $action='')
+ function fetch($id='', $ref='', $action='')
{
$result = parent::fetch($id);
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
index c878379db78..d32bd91267a 100644
--- a/htdocs/product/fiche.php
+++ b/htdocs/product/fiche.php
@@ -666,7 +666,7 @@ if ($_GET["id"] || $_GET["ref"])
$canvas = new Canvas($db,$user);
$product = $canvas->load_canvas('product',$productstatic->canvas);
- $canvas->fetch($productstatic->id,$_GET["action"]);
+ $canvas->fetch($productstatic->id,'',$_GET["action"]);
}
llxHeader('',$langs->trans("CardProduct".$product->type));
--
GitLab