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

Works on product canvas

Browse Source 
Works on custom list
This commit is contained in:
Regis Houssin 2010-03-26 15:43:17 +00:00
parent d66d765df4
commit 1574fe2a37
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/commonobject.class.php
View File

@ -973,7 +973,7 @@ class CommonObject
$sql = "SELECT rowid, name, alias, title, align, sort, search, enabled, rang"; $sql = "SELECT rowid, name, alias, title, align, sort, search, enabled, rang";
$sql.= " FROM ".MAIN_DB_PREFIX."c_field_list"; $sql.= " FROM ".MAIN_DB_PREFIX."c_field_list";
$sql.= " WHERE element = '".$this->list."'"; $sql.= " WHERE element = '".$this->fieldListName."'";
$sql.= " AND entity = ".$conf->entity; $sql.= " AND entity = ".$conf->entity;
$sql.= " ORDER BY rang ASC"; $sql.= " ORDER BY rang ASC";
@ -991,7 +991,7 @@ class CommonObject
$fieldlist["id"] = $obj->rowid; $fieldlist["id"] = $obj->rowid;
$fieldlist["name"] = $obj->name; $fieldlist["name"] = $obj->name;
$fieldlist["alias"] = ($obj->alias?$obj->alias:$obj->name); $fieldlist["alias"] = $obj->alias;
$fieldlist["title"] = $langs->trans($obj->title); $fieldlist["title"] = $langs->trans($obj->title);
$fieldlist["align"] = $obj->align; $fieldlist["align"] = $obj->align;
$fieldlist["sort"] = $obj->sort; $fieldlist["sort"] = $obj->sort;

2
htdocs/install/mysql/migration/2.8.0-2.9.0.sql
View File

@ -141,7 +141,7 @@ create table llx_c_field_list
element varchar(64) NOT NULL, element varchar(64) NOT NULL,
entity integer DEFAULT 1 NOT NULL, entity integer DEFAULT 1 NOT NULL,
name varchar(32) NOT NULL, name varchar(32) NOT NULL,
alias varchar(32) DEFAULT NULL, alias varchar(32) NOT NULL,
title varchar(32) NOT NULL, title varchar(32) NOT NULL,
align varchar(6) DEFAULT 'left', align varchar(6) DEFAULT 'left',
sort tinyint DEFAULT 1 NOT NULL, sort tinyint DEFAULT 1 NOT NULL,

4
htdocs/install/mysql/tables/llx_c_field_list.sql
View File

@ -24,8 +24,8 @@ create table llx_c_field_list
tms timestamp, tms timestamp,
element varchar(64) NOT NULL, -- name of element list element varchar(64) NOT NULL, -- name of element list
entity integer DEFAULT 1 NOT NULL, -- entity id entity integer DEFAULT 1 NOT NULL, -- entity id
name varchar(32) NOT NULL, -- name of field (ex: ref) name varchar(32) NOT NULL, -- name of field with table alias (ex: p.ref)
alias varchar(32) DEFAULT NULL, -- alias of field (ex: prodref) alias varchar(32) NOT NULL, -- alias of field (ex: ref)
title varchar(32) NOT NULL, -- title (translation) of field (ex: Ref) title varchar(32) NOT NULL, -- title (translation) of field (ex: Ref)
align varchar(6) DEFAULT 'left', -- align (left,center,right) align varchar(6) DEFAULT 'left', -- align (left,center,right)
sort tinyint DEFAULT 1 NOT NULL, -- add sort field sort tinyint DEFAULT 1 NOT NULL, -- add sort field

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

@ -39,21 +39,23 @@ class ProductDefault extends Product
*/ */
function ProductDefault($DB=0, $id=0, $user=0) function ProductDefault($DB=0, $id=0, $user=0)
{ {
$this->db = $DB; $this->db = $DB;
$this->id = $id ; $this->id = $id ;
$this->user = $user; $this->user = $user;
$this->module = "produit"; $this->module = "produit";
$this->canvas = "default"; $this->canvas = "default";
$this->name = "default"; $this->name = "default";
$this->list = "product_default"; $this->description = "Canvas des produits (défaut)";
$this->description = "Canvas par défaut"; $this->fieldListName = "product_default";
$this->next_prev_filter = "canvas='default'"; $this->next_prev_filter = "canvas='default'";
} }
function getTitle() function getTitle()
{ {
return 'Produits'; global $langs;
return $langs->trans("Products");
} }
/** /**
@ -106,7 +108,7 @@ class ProductDefault extends Product
$sql.= ' FROM '.MAIN_DB_PREFIX.'product as p'; $sql.= ' FROM '.MAIN_DB_PREFIX.'product as p';
$sql.= " WHERE p.entity = ".$conf->entity; $sql.= " WHERE p.entity = ".$conf->entity;
if (!$user->rights->produit->hidden) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 0)'; if (!$user->rights->produit->hidden) $sql.=' AND p.hidden = 0';
if ($sall) if ($sall)
{ {