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

Update productcustomerprice.class.php

Browse Source
This commit is contained in:
Laurent Destailleur 2020-10-02 15:04:03 +02:00 committed by GitHub
parent 1131eb240d
commit bede4040f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/product/class/productcustomerprice.class.php
View File

@ -252,7 +252,6 @@ class Productcustomerprice extends CommonObject
$sql = "SELECT"; $sql = "SELECT";
$sql .= " t.rowid,"; $sql .= " t.rowid,";
$sql .= " t.entity,"; $sql .= " t.entity,";
$sql .= " t.datec,"; $sql .= " t.datec,";
$sql .= " t.tms,"; $sql .= " t.tms,";
@ -270,7 +269,7 @@ class Productcustomerprice extends CommonObject
$sql .= " t.localtax2_tx,"; $sql .= " t.localtax2_tx,";
$sql .= " t.fk_user,"; $sql .= " t.fk_user,";
$sql .= " t.import_key"; $sql .= " t.import_key";
$sql .= " FROM ".MAIN_DB_PREFIX."product_customer_price as t"; $sql .= " FROM ".MAIN_DB_PREFIX."product_customer_price as t";
$sql .= " WHERE t.rowid = ".$id; $sql .= " WHERE t.rowid = ".$id;
@ -330,7 +329,6 @@ class Productcustomerprice extends CommonObject
$sql = "SELECT"; $sql = "SELECT";
$sql .= " t.rowid,"; $sql .= " t.rowid,";
$sql .= " t.entity,"; $sql .= " t.entity,";
$sql .= " t.datec,"; $sql .= " t.datec,";
$sql .= " t.tms,"; $sql .= " t.tms,";
@ -363,8 +361,7 @@ class Productcustomerprice extends CommonObject
// Manage filter // Manage filter
if (count($filter) > 0) { if (count($filter) > 0) {
foreach ($filter as $key => $value) { foreach ($filter as $key => $value) {
if (strpos($key, 'date')) // To allow $filter['YEAR(s.dated)']=>$year if (strpos($key, 'date')) { // To allow $filter['YEAR(s.dated)']=>$year
{
$sql .= ' AND '.$key.' = \''.$this->db->escape($value).'\''; $sql .= ' AND '.$key.' = \''.$this->db->escape($value).'\'';
} elseif ($key == 'soc.nom') { } elseif ($key == 'soc.nom') {
$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\''; $sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
@ -373,7 +370,7 @@ class Productcustomerprice extends CommonObject
} elseif ($key == 't.price' || $key == 't.price_ttc') { } elseif ($key == 't.price' || $key == 't.price_ttc') {
$sql .= ' AND ' . $key . ' LIKE \'%' . price2num($value) . '%\''; $sql .= ' AND ' . $key . ' LIKE \'%' . price2num($value) . '%\'';
} else { } else {
$sql .= ' AND '.$key.' = '.$this->db->escape($value); $sql .= ' AND '.$key.' = '.((int) $value);
} }
} }
} }