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

Works on canvas capability

Browse Source 
Works on custom list
This commit is contained in:
Regis Houssin 2010-03-24 20:05:59 +00:00
parent 5e609efffe
commit 7aaa0680b0
1 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,7 +113,7 @@ class ProductDefault extends Product
$this->list_datas = array(); $this->list_datas = array();
//$_GET["sref"] = 'LL'; //$_GET["sall"] = 'LL';
// Clean parameters // Clean parameters
$sall=trim(isset($_GET["sall"])?$_GET["sall"]:$_POST["sall"]); $sall=trim(isset($_GET["sall"])?$_GET["sall"]:$_POST["sall"]);
@ -126,19 +126,40 @@ class ProductDefault extends Product
} }
} }
$sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,'; $sql = 'SELECT DISTINCT ';
$sql.= ' p.fk_product_type, p.tms as datem,';
$sql.= ' p.envente as statut, p.seuil_stock_alerte'; // Fields requiered
$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.= ' 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 OR p.fk_product_type != 0)';
if ($sall) if ($sall)
{ {
$sql.= " AND (p.ref LIKE '%".addslashes($sall)."%'"; $clause = '';
$sql.= " OR p.label LIKE '%".addslashes($sall)."%'"; $sql.= " AND (";
$sql.= " OR p.description LIKE '%".addslashes($sall)."%'"; foreach($this->field_list as $field)
$sql.= " OR p.note LIKE '%".addslashes($sall)."%')"; {
if ($field['enabled'])
{
$sql.= $clause." p.".$field['name']." LIKE '%".addslashes($sall)."%'";
if ($clause=='') $clause = ' OR';
}
}
$sql.= ")";
} }
// Search fields
foreach($this->field_list as $field) foreach($this->field_list as $field)
{ {
if ($field['enabled']) if ($field['enabled'])
@ -147,6 +168,7 @@ class ProductDefault extends Product
if (${$fieldname}) $sql.= " AND p.".$field['name']." LIKE '%".addslashes(${$fieldname})."%'"; if (${$fieldname}) $sql.= " AND p.".$field['name']." LIKE '%".addslashes(${$fieldname})."%'";
} }
} }
if (isset($_GET["envente"]) && strlen($_GET["envente"]) > 0) if (isset($_GET["envente"]) && strlen($_GET["envente"]) > 0)
{ {
$sql.= " AND p.envente = ".addslashes($_GET["envente"]); $sql.= " AND p.envente = ".addslashes($_GET["envente"]);