lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Works on product canvas and templates

Browse Source 
!! WARNING : not stable !!
This commit is contained in:
Regis Houssin 2010-05-01 09:56:02 +00:00
parent 230a414a2c
commit 3dc1f01387
4 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
htdocs/install/mysql/tables/llx_product.sql
View File

@ -2,7 +2,7 @@
-- Copyright (C) 2002-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org> -- Copyright (C) 2002-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2008-2010 Laurent Destailleur <eldy@users.sourceforge.net> -- Copyright (C) 2008-2010 Laurent Destailleur <eldy@users.sourceforge.net>
-- Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr> -- Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr>
-- Copyright (C) 2010 juanjo Menent <jmenent@2byte.es> -- Copyright (C) 2010 juanjo Menent <jmenent@2byte.es>
-- --
-- This program is free software; you can redistribute it and/or modify -- 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 -- it under the terms of the GNU General Public License as published by
@ -23,46 +23,46 @@
create table llx_product create table llx_product
( (
rowid integer AUTO_INCREMENT PRIMARY KEY, rowid integer AUTO_INCREMENT PRIMARY KEY,
datec datetime, datec datetime,
tms timestamp, tms timestamp,
virtual tinyint DEFAULT 0 NOT NULL, -- value 0 for physical product, 1 for virtual product virtual tinyint DEFAULT 0 NOT NULL, -- value 0 for physical product, 1 for virtual product
fk_parent integer DEFAULT 0, -- virtual product id fk_parent integer DEFAULT 0, -- virtual product id
ref varchar(32) NOT NULL, ref varchar(32) NOT NULL,
entity integer DEFAULT 1 NOT NULL, -- multi company id entity integer DEFAULT 1 NOT NULL, -- multi company id
label varchar(255) NOT NULL, label varchar(255) NOT NULL,
description text, description text,
note text, note text,
price double(24,8) DEFAULT 0, price double(24,8) DEFAULT 0,
price_ttc double(24,8) DEFAULT 0, price_ttc double(24,8) DEFAULT 0,
price_min double(24,8) DEFAULT 0, price_min double(24,8) DEFAULT 0,
price_min_ttc double(24,8) DEFAULT 0, price_min_ttc double(24,8) DEFAULT 0,
price_base_type varchar(3) DEFAULT 'HT', price_base_type varchar(3) DEFAULT 'HT',
tva_tx double(6,3), tva_tx double(6,3),
localtax1_tx double(6,3) DEFAULT 0, localtax1_tx double(6,3) DEFAULT 0,
localtax2_tx double(6,3) DEFAULT 0, localtax2_tx double(6,3) DEFAULT 0,
fk_user_author integer, fk_user_author integer,
envente tinyint DEFAULT 1, envente tinyint DEFAULT 1,
fk_product_type integer DEFAULT 0, -- Type 0 for regular product, 1 for service fk_product_type integer DEFAULT 0, -- Type 0 for regular product, 1 for service
duration varchar(6), duration varchar(6),
seuil_stock_alerte integer DEFAULT 0, seuil_stock_alerte integer DEFAULT 0,
barcode varchar(255) DEFAULT NULL, barcode varchar(255) DEFAULT NULL,
fk_barcode_type integer DEFAULT 0, fk_barcode_type integer DEFAULT 0,
accountancy_code_sell varchar(15), -- code compta vente accountancy_code_sell varchar(15), -- code compta vente
accountancy_code_buy varchar(15), -- code compta achat accountancy_code_buy varchar(15), -- code compta achat
partnumber varchar(32), partnumber varchar(32),
weight float DEFAULT NULL, weight float DEFAULT NULL,
weight_units tinyint DEFAULT NULL, weight_units tinyint DEFAULT NULL,
length float DEFAULT NULL, length float DEFAULT NULL,
length_units tinyint DEFAULT NULL, length_units tinyint DEFAULT NULL,
surface float DEFAULT NULL, surface float DEFAULT NULL,
surface_units tinyint DEFAULT NULL, surface_units tinyint DEFAULT NULL,
volume float DEFAULT NULL, volume float DEFAULT NULL,
volume_units tinyint DEFAULT NULL, volume_units tinyint DEFAULT NULL,
stock integer, -- physical stock stock integer, -- physical stock
pmp double(24,8) DEFAULT 0 NOT NULL, pmp double(24,8) DEFAULT 0 NOT NULL,
canvas varchar(15) DEFAULT '', canvas varchar(15) DEFAULT 'default',
finished tinyint DEFAULT NULL, finished tinyint DEFAULT NULL,
hidden tinyint DEFAULT 0, -- Need permission see also hidden products hidden tinyint DEFAULT 0, -- Need permission see also hidden products
import_key varchar(14) -- import key import_key varchar(14) -- import key
)type=innodb; )type=innodb;

5
htdocs/product/canvas/default/product.default.class.php
View File

@ -80,10 +80,11 @@ class ProductDefault extends Product
{ {
global $conf,$html; global $conf,$html;
$this->tpl['showrefnav'] = $html->showrefnav($this,'ref','',1,'ref');
$this->tpl['label'] = $this->libelle;
if ($action == 'view') if ($action == 'view')
{ {
$this->tpl['showrefnav'] = $html->showrefnav($this,'ref','',1,'ref');
$this->tpl['nblignes'] = 4; $this->tpl['nblignes'] = 4;
if ($this->is_photo_available($conf->produit->dir_output)) if ($this->is_photo_available($conf->produit->dir_output))
{ {

2
htdocs/product/canvas/default/tpl/view.tpl.php
View File

@ -30,7 +30,7 @@
<tr> <tr>
<td><?php echo $langs->trans("Label") ?></td> <td><?php echo $langs->trans("Label") ?></td>
<td><?php echo $product->libelle; ?></td> <td><?php echo $product->tpl['label']; ?></td>
<?php if ($product->tpl['photos']) { ?> <?php if ($product->tpl['photos']) { ?>
<td valign="middle" align="center" width="30%" rowspan="<?php echo $product->tpl['nblignes']; ?>"> <td valign="middle" align="center" width="30%" rowspan="<?php echo $product->tpl['nblignes']; ?>">

1
htdocs/product/fiche.php
View File

@ -868,7 +868,6 @@ if ($_GET["id"] || $_GET["ref"])
$template_dir = DOL_DOCUMENT_ROOT.'/product/canvas/'.$product->canvas.'/tpl/'; $template_dir = DOL_DOCUMENT_ROOT.'/product/canvas/'.$product->canvas.'/tpl/';
} }
llxHeader("","",$langs->trans("CardProduct".$product->type)); llxHeader("","",$langs->trans("CardProduct".$product->type));
if ( $result ) if ( $result )