From 1574fe2a37b21a22ec565f5f429f42729494ca9c Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 26 Mar 2010 15:43:17 +0000
Subject: [PATCH] Works on product canvas Works on custom list

---
 htdocs/commonobject.class.php                 |  4 ++--
 .../install/mysql/migration/2.8.0-2.9.0.sql   |  2 +-
 .../install/mysql/tables/llx_c_field_list.sql |  4 ++--
 .../canvas/default/product.default.class.php  | 22 ++++++++++---------
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/htdocs/commonobject.class.php b/htdocs/commonobject.class.php
index ed729795e36..9b7d29a4eb9 100644
--- a/htdocs/commonobject.class.php
+++ b/htdocs/commonobject.class.php
@@ -973,7 +973,7 @@ class CommonObject
 		
 		$sql = "SELECT rowid, name, alias, title, align, sort, search, enabled, rang";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_field_list";
-		$sql.= " WHERE element = '".$this->list."'";
+		$sql.= " WHERE element = '".$this->fieldListName."'";
 		$sql.= " AND entity = ".$conf->entity;
 		$sql.= " ORDER BY rang ASC";
 		
@@ -991,7 +991,7 @@ class CommonObject
 				
 				$fieldlist["id"]		= $obj->rowid;
 				$fieldlist["name"]		= $obj->name;
-				$fieldlist["alias"]		= ($obj->alias?$obj->alias:$obj->name);
+				$fieldlist["alias"]		= $obj->alias;
 				$fieldlist["title"]		= $langs->trans($obj->title);
 				$fieldlist["align"]		= $obj->align;
 				$fieldlist["sort"]		= $obj->sort;
diff --git a/htdocs/install/mysql/migration/2.8.0-2.9.0.sql b/htdocs/install/mysql/migration/2.8.0-2.9.0.sql
index eb034a782c3..c89dad13443 100755
--- a/htdocs/install/mysql/migration/2.8.0-2.9.0.sql
+++ b/htdocs/install/mysql/migration/2.8.0-2.9.0.sql
@@ -141,7 +141,7 @@ create table llx_c_field_list
   element		varchar(64)        			NOT NULL,
   entity		integer			DEFAULT 1 	NOT NULL,
   name			varchar(32)        			NOT NULL,
-  alias			varchar(32)		DEFAULT 	NULL,
+  alias			varchar(32)					NOT NULL,
   title			varchar(32)        			NOT NULL,
   align			varchar(6)		DEFAULT 'left',
   sort			tinyint 		DEFAULT 1  	NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_c_field_list.sql b/htdocs/install/mysql/tables/llx_c_field_list.sql
index 47e1f48064a..d1354edf43c 100644
--- a/htdocs/install/mysql/tables/llx_c_field_list.sql
+++ b/htdocs/install/mysql/tables/llx_c_field_list.sql
@@ -24,8 +24,8 @@ create table llx_c_field_list
   tms			timestamp,
   element		varchar(64)        			NOT NULL,		-- name of element list
   entity		integer			DEFAULT 1 	NOT NULL,		-- entity id
-  name			varchar(32)        			NOT NULL,		-- name of field (ex: ref)
-  alias			varchar(32)		DEFAULT 	NULL,			-- alias of field (ex: prodref)
+  name			varchar(32)        			NOT NULL,		-- name of field with table alias (ex: p.ref)
+  alias			varchar(32)					NOT NULL,		-- alias of field (ex: ref)
   title			varchar(32)        			NOT NULL,		-- title (translation) of field (ex: Ref)
   align			varchar(6)		DEFAULT 'left',				-- align (left,center,right)
   sort			tinyint 		DEFAULT 1  	NOT NULL,		-- add sort field
diff --git a/htdocs/product/canvas/default/product.default.class.php b/htdocs/product/canvas/default/product.default.class.php
index 06cccaeb75f..59842107d3a 100644
--- a/htdocs/product/canvas/default/product.default.class.php
+++ b/htdocs/product/canvas/default/product.default.class.php
@@ -39,21 +39,23 @@ class ProductDefault extends Product
 	 */
 	function ProductDefault($DB=0, $id=0, $user=0)
 	{
-		$this->db 			= $DB;
-		$this->id 			= $id ;
-		$this->user 		= $user;
-		$this->module 		= "produit";
-		$this->canvas 		= "default";
-		$this->name 		= "default";
-		$this->list			= "product_default";
-		$this->description 	= "Canvas par défaut";
+		$this->db 				= $DB;
+		$this->id 				= $id ;
+		$this->user 			= $user;
+		$this->module 			= "produit";
+		$this->canvas 			= "default";
+		$this->name 			= "default";
+		$this->description 		= "Canvas des produits (défaut)";
+		$this->fieldListName    = "product_default";
 
 		$this->next_prev_filter = "canvas='default'";
 	}
 	
 	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.= " 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)
 		{