From d66d765df480395d95edef4425043dc1270f8c7a Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 26 Mar 2010 14:25:06 +0000 Subject: [PATCH] Works on product canvas Works on custom list --- htdocs/install/mysql/Makefile | 14 +++++++------- htdocs/install/mysql/migration/2.8.0-2.9.0.sql | 16 ++++++++-------- .../canvas/default/product.default.class.php | 12 ++++++------ htdocs/product/canvas/default/templates/list.tpl | 6 +++--- .../canvas/default/templates/list.tpl.php | 6 +++--- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/htdocs/install/mysql/Makefile b/htdocs/install/mysql/Makefile index 9aa796e5401..5e7a56816ff 100644 --- a/htdocs/install/mysql/Makefile +++ b/htdocs/install/mysql/Makefile @@ -19,16 +19,16 @@ # $Source$ # # ********************************************************************** -# Ce makefile permet d'initialiser la base de donnée de dolibarr en manuel. +# Ce makefile permet d'initialiser la base de donnée de dolibarr en manuel. # Il n'est utile que si vous n'utilisez pas l'installateur automatique -# accessible à http://localhost/dolibarr/install/ +# accessible à http://localhost/dolibarr/install/ # -# Pour une installation manuelle, créer la base dolibarr puis faire: +# Pour une installation manuelle, créer la base dolibarr puis faire: # make mysql.sql # mysql dolibarr < mysql.sql # -# Le script mysql.sql cotient tous le ordres sql pour créer la base -# Tables + Index et Clés + Données +# Le script mysql.sql cotient tous le ordres sql pour créer la base +# Tables + Index et Clés + Données # # ********************************************************************** @@ -87,8 +87,8 @@ createpriv: mysql.sql: $(TABLES) data/data.sql Makefile - echo "-- Fichier généré par make mysql.sql" > mysql.sql - echo "-- Contient les ordres de creation des tables + les clés + les données" >> mysql.sql + echo "-- Fichier généré par make mysql.sql" > mysql.sql + echo "-- Contient les ordres de creation des tables + les clés + les données" >> mysql.sql echo "-- ;" >> mysql.sql $(FIND) tables/ -name "*sql" | grep -v "key.sql" | xargs cat | grep -v "^--" | cut -d "-" -f 1 >> mysql.sql $(FIND) tables/ -name "*sql" | grep "key.sql" | xargs cat | grep -v "^--" | cut -d "-" -f 1 >> mysql.sql 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 5ab7721eec3..eb034a782c3 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 @@ -151,12 +151,12 @@ create table llx_c_field_list )type=innodb; INSERT INTO `llx_c_field_list` (`rowid`, `element`, `entity`, `name`, `alias`, `title`, `align`, `sort`, `search`, `enabled`, `rang`) VALUES -(1, 'product_default', 1, 'ref', NULL, 'Ref', 'left', 1, 1, '1', 1), -(2, 'product_default', 1, 'label', NULL, 'Label', 'left', 1, 1, '1', 2), -(3, 'product_default', 1, 'barcode', NULL, 'BarCode', 'center', 1, 1, '$conf->barcode->enabled', 3), -(4, 'product_default', 1, 'tms', 'datem', 'DateModification', 'center', 1, 0, '1', 4), -(5, 'product_default', 1, 'price', NULL, 'SellingPriceHT', 'right', 1, 0, '1', 5), -(6, 'product_default', 1, 'price_ttc', NULL, 'SellingPriceTTC', 'right', 1, 0, '1', 6), -(7, 'product_default', 1, 'stock', NULL, 'Stock', 'right', 0, 0, '$conf->stock->enabled', 7), -(8, 'product_default', 1, 'envente', 'status', 'Status', 'right', 1, 0, '1', 8); +(1, 'product_default', 1, 'p.ref', 'ref', 'Ref', 'left', 1, 1, '1', 1), +(2, 'product_default', 1, 'p.label', 'label', 'Label', 'left', 1, 1, '1', 2), +(3, 'product_default', 1, 'p.barcode', 'barcode', 'BarCode', 'center', 1, 1, '$conf->barcode->enabled', 3), +(4, 'product_default', 1, 'p.tms', 'datem', 'DateModification', 'center', 1, 0, '1', 4), +(5, 'product_default', 1, 'p.price', 'price', 'SellingPriceHT', 'right', 1, 0, '1', 5), +(6, 'product_default', 1, 'p.price_ttc', 'price_ttc', 'SellingPriceTTC', 'right', 1, 0, '1', 6), +(7, 'product_default', 1, 'p.stock', 'stock', 'Stock', 'right', 0, 0, '$conf->stock->enabled', 7), +(8, 'product_default', 1, 'p.envente', 'status', 'Status', 'right', 1, 0, '1', 8); diff --git a/htdocs/product/canvas/default/product.default.class.php b/htdocs/product/canvas/default/product.default.class.php index fd1b214164d..06cccaeb75f 100644 --- a/htdocs/product/canvas/default/product.default.class.php +++ b/htdocs/product/canvas/default/product.default.class.php @@ -85,7 +85,7 @@ class ProductDefault extends Product { if ($field['enabled']) { - $fieldname = "s".$field['name']; + $fieldname = "s".$field['alias']; $$fieldname = trim(isset($_GET[$fieldname])?$_GET[$fieldname]:$_POST[$fieldname]); } } @@ -93,14 +93,14 @@ class ProductDefault extends Product $sql = 'SELECT DISTINCT '; // Fields requiered - $sql.= 'p.rowid, p.price_base_type, p.fk_product_type, p.seuil_stock_alerte, p.price_ttc'; + $sql.= 'p.rowid, p.price_base_type, p.fk_product_type, p.seuil_stock_alerte'; // Fields not requiered foreach($this->field_list as $field) { if ($field['enabled']) { - $sql.= ", p.".$field['name']." as ".$field['alias']; + $sql.= ", ".$field['name']." as ".$field['alias']; } } @@ -116,7 +116,7 @@ class ProductDefault extends Product { if ($field['enabled']) { - $sql.= $clause." p.".$field['name']." LIKE '%".addslashes($sall)."%'"; + $sql.= $clause." ".$field['name']." LIKE '%".addslashes($sall)."%'"; if ($clause=='') $clause = ' OR'; } } @@ -128,8 +128,8 @@ class ProductDefault extends Product { if ($field['enabled']) { - $fieldname = "s".$field['name']; - if (${$fieldname}) $sql.= " AND p.".$field['name']." LIKE '%".addslashes(${$fieldname})."%'"; + $fieldname = "s".$field['alias']; + if (${$fieldname}) $sql.= " AND ".$field['name']." LIKE '%".addslashes(${$fieldname})."%'"; } } diff --git a/htdocs/product/canvas/default/templates/list.tpl b/htdocs/product/canvas/default/templates/list.tpl index 8682491fa8a..4181ca9fa49 100644 --- a/htdocs/product/canvas/default/templates/list.tpl +++ b/htdocs/product/canvas/default/templates/list.tpl @@ -43,10 +43,10 @@ {if $fieldlist[field].enabled} {if $fieldlist[field].sort} {$fieldlist[field].title} - + A-Z - + Z-A @@ -67,7 +67,7 @@ {if $fieldlist[searchfield].enabled} {if $fieldlist[searchfield].search} - + {elseif $smarty.section.search.last} diff --git a/htdocs/product/canvas/default/templates/list.tpl.php b/htdocs/product/canvas/default/templates/list.tpl.php index a2c91b209f0..4c07d85159d 100644 --- a/htdocs/product/canvas/default/templates/list.tpl.php +++ b/htdocs/product/canvas/default/templates/list.tpl.php @@ -49,10 +49,10 @@ if ($field['enabled']) { if ($field['sort']) { ?> - ?sortfield=p.&sortorder=asc&begin=&envente=&canvas=default&fourn_id=&snom=&sref="> + ?sortfield=&sortorder=asc&begin=&envente=&canvas=default&fourn_id=&snom=&sref="> A-Z - ?sortfield=p.&sortorder=desc&begin=&envente=&canvas=default&fourn_id=&snom=&sref="> + ?sortfield=&sortorder=desc&begin=&envente=&canvas=default&fourn_id=&snom=&sref="> Z-A @@ -69,7 +69,7 @@ foreach($fieldlist as $key => $searchfield) { if ($searchfield['enabled']) { if ($searchfield['search']) { ?> - +