Works on product canvas and templates

!! 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

View File

@ -61,7 +61,7 @@ create table llx_product
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

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))
{ {

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']; ?>">

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 )