From 3dc1f013873c782b5ed348d9664e03cb4de654d6 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sat, 1 May 2010 09:56:02 +0000 Subject: [PATCH] Works on product canvas and templates !! WARNING : not stable !! --- htdocs/install/mysql/tables/llx_product.sql | 86 +++++++++---------- .../canvas/default/product.default.class.php | 5 +- .../product/canvas/default/tpl/view.tpl.php | 2 +- htdocs/product/fiche.php | 1 - 4 files changed, 47 insertions(+), 47 deletions(-) diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql index 93ff538503a..81922629ec1 100644 --- a/htdocs/install/mysql/tables/llx_product.sql +++ b/htdocs/install/mysql/tables/llx_product.sql @@ -2,7 +2,7 @@ -- Copyright (C) 2002-2006 Rodolphe Quiedeville -- Copyright (C) 2008-2010 Laurent Destailleur -- Copyright (C) 2005-2010 Regis Houssin --- Copyright (C) 2010 juanjo Menent +-- Copyright (C) 2010 juanjo Menent -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -23,46 +23,46 @@ create table llx_product ( - rowid integer AUTO_INCREMENT PRIMARY KEY, - datec datetime, - tms timestamp, - virtual tinyint DEFAULT 0 NOT NULL, -- value 0 for physical product, 1 for virtual product - fk_parent integer DEFAULT 0, -- virtual product id - ref varchar(32) NOT NULL, - entity integer DEFAULT 1 NOT NULL, -- multi company id - label varchar(255) NOT NULL, - description text, - note text, - price double(24,8) DEFAULT 0, - price_ttc double(24,8) DEFAULT 0, - price_min double(24,8) DEFAULT 0, - price_min_ttc double(24,8) DEFAULT 0, - price_base_type varchar(3) DEFAULT 'HT', - tva_tx double(6,3), - localtax1_tx double(6,3) DEFAULT 0, - localtax2_tx double(6,3) DEFAULT 0, - fk_user_author integer, - envente tinyint DEFAULT 1, - fk_product_type integer DEFAULT 0, -- Type 0 for regular product, 1 for service - duration varchar(6), - seuil_stock_alerte integer DEFAULT 0, - barcode varchar(255) DEFAULT NULL, - fk_barcode_type integer DEFAULT 0, - accountancy_code_sell varchar(15), -- code compta vente - accountancy_code_buy varchar(15), -- code compta achat - partnumber varchar(32), - weight float DEFAULT NULL, - weight_units tinyint DEFAULT NULL, - length float DEFAULT NULL, - length_units tinyint DEFAULT NULL, - surface float DEFAULT NULL, - surface_units tinyint DEFAULT NULL, - volume float DEFAULT NULL, - volume_units tinyint DEFAULT NULL, - stock integer, -- physical stock - pmp double(24,8) DEFAULT 0 NOT NULL, - canvas varchar(15) DEFAULT '', - finished tinyint DEFAULT NULL, - hidden tinyint DEFAULT 0, -- Need permission see also hidden products - import_key varchar(14) -- import key + rowid integer AUTO_INCREMENT PRIMARY KEY, + datec datetime, + tms timestamp, + virtual tinyint DEFAULT 0 NOT NULL, -- value 0 for physical product, 1 for virtual product + fk_parent integer DEFAULT 0, -- virtual product id + ref varchar(32) NOT NULL, + entity integer DEFAULT 1 NOT NULL, -- multi company id + label varchar(255) NOT NULL, + description text, + note text, + price double(24,8) DEFAULT 0, + price_ttc double(24,8) DEFAULT 0, + price_min double(24,8) DEFAULT 0, + price_min_ttc double(24,8) DEFAULT 0, + price_base_type varchar(3) DEFAULT 'HT', + tva_tx double(6,3), + localtax1_tx double(6,3) DEFAULT 0, + localtax2_tx double(6,3) DEFAULT 0, + fk_user_author integer, + envente tinyint DEFAULT 1, + fk_product_type integer DEFAULT 0, -- Type 0 for regular product, 1 for service + duration varchar(6), + seuil_stock_alerte integer DEFAULT 0, + barcode varchar(255) DEFAULT NULL, + fk_barcode_type integer DEFAULT 0, + accountancy_code_sell varchar(15), -- code compta vente + accountancy_code_buy varchar(15), -- code compta achat + partnumber varchar(32), + weight float DEFAULT NULL, + weight_units tinyint DEFAULT NULL, + length float DEFAULT NULL, + length_units tinyint DEFAULT NULL, + surface float DEFAULT NULL, + surface_units tinyint DEFAULT NULL, + volume float DEFAULT NULL, + volume_units tinyint DEFAULT NULL, + stock integer, -- physical stock + pmp double(24,8) DEFAULT 0 NOT NULL, + canvas varchar(15) DEFAULT 'default', + finished tinyint DEFAULT NULL, + hidden tinyint DEFAULT 0, -- Need permission see also hidden products + import_key varchar(14) -- import key )type=innodb; diff --git a/htdocs/product/canvas/default/product.default.class.php b/htdocs/product/canvas/default/product.default.class.php index cc1b96d5d55..96b0e3dcee4 100644 --- a/htdocs/product/canvas/default/product.default.class.php +++ b/htdocs/product/canvas/default/product.default.class.php @@ -80,10 +80,11 @@ class ProductDefault extends Product { global $conf,$html; + $this->tpl['showrefnav'] = $html->showrefnav($this,'ref','',1,'ref'); + $this->tpl['label'] = $this->libelle; + if ($action == 'view') { - $this->tpl['showrefnav'] = $html->showrefnav($this,'ref','',1,'ref'); - $this->tpl['nblignes'] = 4; if ($this->is_photo_available($conf->produit->dir_output)) { diff --git a/htdocs/product/canvas/default/tpl/view.tpl.php b/htdocs/product/canvas/default/tpl/view.tpl.php index 4f384a890ce..ddce2e0388a 100644 --- a/htdocs/product/canvas/default/tpl/view.tpl.php +++ b/htdocs/product/canvas/default/tpl/view.tpl.php @@ -30,7 +30,7 @@ trans("Label") ?> -libelle; ?> +tpl['label']; ?> tpl['photos']) { ?> diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 15de4c73602..44018d1f9c6 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -868,7 +868,6 @@ if ($_GET["id"] || $_GET["ref"]) $template_dir = DOL_DOCUMENT_ROOT.'/product/canvas/'.$product->canvas.'/tpl/'; } - llxHeader("","",$langs->trans("CardProduct".$product->type)); if ( $result )