From 31ced81af68f43c0a792e3aea3f787f9ee22f4de Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Tue, 23 Mar 2010 11:11:14 +0000
Subject: [PATCH] Works on canvas capability

---
 .../canvas/default/product.default.class.php  | 67 ++++++++++++++++---
 .../canvas/default/templates/liste.tpl        | 51 ++++++--------
 htdocs/product/liste.php                      |  1 +
 3 files changed, 76 insertions(+), 43 deletions(-)

diff --git a/htdocs/product/canvas/default/product.default.class.php b/htdocs/product/canvas/default/product.default.class.php
index b9b8855d3b1..56a92837424 100644
--- a/htdocs/product/canvas/default/product.default.class.php
+++ b/htdocs/product/canvas/default/product.default.class.php
@@ -107,6 +107,43 @@ class ProductDefault extends Product
 		$sql.= $this->db->order($sortfield,$sortorder);
 		$sql.= $this->db->plimit($limit + 1 ,$offset);
 		
+		$this->list_title = array();
+		
+		$titlelist["title"]		= $langs->trans("Ref");
+		$titlelist["sortfield"]	= 'p.ref';
+		$titlelist["align"]		= 'left';
+		array_push($this->list_title,$titlelist);
+		
+		$titlelist["title"]		= $langs->trans("Label");
+		$titlelist["sortfield"]	= 'p.label';
+		$titlelist["align"]		= 'left';
+		array_push($this->list_title,$titlelist);
+		
+		$titlelist["title"]		= $langs->trans("BarCode");
+		$titlelist["sortfield"]	= 'p.barcode';
+		$titlelist["align"]		= 'center';
+		array_push($this->list_title,$titlelist);
+		
+		$titlelist["title"]		= $langs->trans("DateModification");
+		$titlelist["sortfield"]	= 'p.tms';
+		$titlelist["align"]		= 'center';
+		array_push($this->list_title,$titlelist);
+		
+		$titlelist["title"]		= $langs->trans("SellingPrice");
+		$titlelist["sortfield"]	= 'p.price';
+		$titlelist["align"]		= 'right';
+		array_push($this->list_title,$titlelist);
+		
+		$titlelist["title"]		= $langs->trans("Stock");
+		$titlelist["sortfield"]	= '';
+		$titlelist["align"]		= 'right';
+		array_push($this->list_title,$titlelist);
+		
+		$titlelist["title"]		= $langs->trans("Status");
+		$titlelist["sortfield"]	= 'p.envente';
+		$titlelist["align"]		= 'right';
+		array_push($this->list_title,$titlelist);
+
 		$this->list_datas = array();
 
 		$resql = $this->db->query($sql);
@@ -117,29 +154,37 @@ class ProductDefault extends Product
 			$i = 0;
 			while ($i < min($num,$limit))
 			{
+				$titlelist = array();
 				$datas = array();
+				
 				$obj = $this->db->fetch_object($resql);
 
 				$datas["id"]        = $obj->rowid;
-				$datas["label"]     = $obj->label;
-				$datas["barcode"]   = $obj->barcode;
-				$datas["datem"]		= dol_print_date($this->db->jdate($obj->datem),'day');
 				
 				// Ref
-				$this->id 			= $obj->rowid;
-				$this->ref 			= $obj->ref;
-				$this->type 		= $obj->fk_product_type;
-				$datas["ref"]       = $this->getNomUrl(1,'',24);
+				$this->id 				= $obj->rowid;
+				$this->ref 				= $obj->ref;
+				$this->type 			= $obj->fk_product_type;
+				$datas["ref"]       	= $this->getNomUrl(1,'',24);
 				
-				// Stock
-				$this->load_stock();
-				if ($this->stock_reel < $obj->seuil_stock_alerte) $datas["stock"] = $this->stock_reel.' '.img_warning($langs->trans("StockTooLow"));
-				else $datas["stock"] = $this->stock_reel;
+				// Label
+				$datas["label"]     	= $obj->label;
+				
+				// Barcode
+				$datas["barcode"]   	= $obj->barcode;
+				
+				// Date modification
+				$datas["datem"]			= dol_print_date($this->db->jdate($obj->datem),'day');
 				
 				// Selling price
 				if ($obj->price_base_type == 'TTC') $datas["sellingprice"] = price($obj->price_ttc).' '.$langs->trans("TTC");
 				else $datas["sellingprice"] = price($obj->price).' '.$langs->trans("HT");
 				
+				// Stock
+				$this->load_stock();
+				if ($this->stock_reel < $obj->seuil_stock_alerte) $datas["stock"] = $this->stock_reel.' '.img_warning($langs->trans("StockTooLow"));
+				else $datas["stock"] 	= $this->stock_reel;
+				
 				// Status
 				$datas["status"]    = $this->LibStatut($obj->statut,5);
 
diff --git a/htdocs/product/canvas/default/templates/liste.tpl b/htdocs/product/canvas/default/templates/liste.tpl
index ceda831f9cd..42c5ecb139b 100644
--- a/htdocs/product/canvas/default/templates/liste.tpl
+++ b/htdocs/product/canvas/default/templates/liste.tpl
@@ -34,38 +34,25 @@
 
 <table class="liste" width="100%">
  <tr class="liste_titre">
-
-  <td class="liste_titre">{$langs->trans('Ref')}
-  	<a href="liste.php?sortfield=p.ref&amp;sortorder=asc&amp;begin=&amp;envente=&amp;canvas=default&amp;fourn_id=&amp;snom=&amp;sref=">
-  		<img src="{$url_root}/theme/{$theme}/img/1downarrow.png" border="0" alt="A-Z" title="A-Z">
-  	</a>
-  	<a href="liste.php?sortfield=p.ref&amp;sortorder=desc&amp;begin=&amp;envente=&amp;canvas=default&amp;fourn_id=&amp;snom=&amp;sref=">
-  		<img src="{$url_root}/theme/{$theme}/img/1uparrow.png" border="0" alt="Z-A" title="Z-A">
-  	</a>
-  </td>
-
-  <td class="liste_titre">{$langs->trans('Label')}
-  	<a href="liste.php?sortfield=p.label&amp;sortorder=asc&amp;begin=&amp;envente=&amp;canvas=default&amp;fourn_id=&amp;snom=&amp;sref=">
-  		<img src="{$url_root}/theme/{$theme}/img/1downarrow.png" border="0" alt="A-Z" title="A-Z">
-  	</a>
-  	<a href="liste.php?sortfield=p.label&amp;sortorder=desc&amp;begin=&amp;envente=&amp;canvas=default&amp;fourn_id=&amp;snom=&amp;sref=">
-  		<img src="{$url_root}/theme/{$theme}/img/1uparrow.png" border="0" alt="Z-A" title="Z-A">
-  	</a>
-  </td>
-  
-  <td class="liste_titre">{$langs->trans('BarCode')}
-  	<a href="liste.php?sortfield=p.barcode&amp;sortorder=asc&amp;begin=&amp;envente=&amp;canvas=default&amp;fourn_id=&amp;snom=&amp;sref=">
-  		<img src="{$url_root}/theme/{$theme}/img/1downarrow.png" border="0" alt="A-Z" title="A-Z">
-  	</a>
-  	<a href="liste.php?sortfield=p.barcode&amp;sortorder=desc&amp;begin=&amp;envente=&amp;canvas=default&amp;fourn_id=&amp;snom=&amp;sref=">
-  		<img src="{$url_root}/theme/{$theme}/img/1uparrow.png" border="0" alt="Z-A" title="Z-A">
-  	</a>
-  </td>
-
-  <td class="liste_titre" align="center">{$langs->trans('DateModification')}</td>
-  <td class="liste_titre" align="right">{$langs->trans('SellingPrice')}</td>
-  <td class="liste_titre" align="right">{$langs->trans('Stock')}</td>
-  <td class="liste_titre" align="right">{$langs->trans('Status')}</td>
+ 	
+ 	{section name=mysec loop=$titlelist}
+ 	{strip}
+ 	
+ 	{if $titlelist[mysec].sortfield}
+ 		<td class="liste_titre" align="{$titlelist[mysec].align}">{$titlelist[mysec].title}
+ 			<a href="liste.php?sortfield={$titlelist[mysec].sortfield}&amp;sortorder=asc&amp;begin=&amp;envente=&amp;canvas=default&amp;fourn_id=&amp;snom=&amp;sref=">
+ 				<img src="{$url_root}/theme/{$theme}/img/1downarrow.png" border="0" alt="A-Z" title="A-Z">
+ 			</a>
+  			<a href="liste.php?sortfield={$titlelist[mysec].sortfield}&amp;sortorder=desc&amp;begin=&amp;envente=&amp;canvas=default&amp;fourn_id=&amp;snom=&amp;sref=">
+  				<img src="{$url_root}/theme/{$theme}/img/1uparrow.png" border="0" alt="Z-A" title="Z-A">
+  			</a>
+  		</td>
+  	{else}
+  		<td class="liste_titre" align="{$titlelist[mysec].align}">{$titlelist[mysec].title}</td>
+  	{/if}
+  	
+  	{/strip}
+  	{/section}
 
 </tr>
 
diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php
index 3ccc69ccc0d..28fdce81467 100644
--- a/htdocs/product/liste.php
+++ b/htdocs/product/liste.php
@@ -224,6 +224,7 @@ if ($resql)
 
 	if ($_GET["canvas"] <> '' && file_exists('canvas/'.$_GET["canvas"].'/product.'.$_GET["canvas"].'.class.php'))
 	{
+		$smarty->assign('titlelist', $object->list_title);
 		$smarty->assign('datas', $object->list_datas);
 		$smarty->assign('url_root', $dolibarr_main_url_root);
 		$smarty->assign('theme', $conf->theme);