From 043abdce034c45507568e870761182d18c7c644b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 8 Mar 2016 20:30:09 +0100 Subject: [PATCH] Fix sql error --- htdocs/societe/consumption.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php index 676871188a7..73b173bc8b3 100644 --- a/htdocs/societe/consumption.php +++ b/htdocs/societe/consumption.php @@ -306,7 +306,13 @@ if ($month > 0) { $sql.= " AND ".$dateprint." BETWEEN '".$db->idate($start)."' AND '".$db->idate($end)."'"; } if ($sref) $sql.= " AND ".$doc_number." LIKE '%".$sref."%'"; -if ($sprod_fulldescr) $sql.= " AND (d.description LIKE '%".$db->escape($sprod_fulldescr)."%' OR p.ref LIKE '%".$db->escape($sprod_fulldescr)."%' OR p.label LIKE '%".$db->escape($sprod_fulldescr)."%')"; +if ($sprod_fulldescr) +{ + $sql.= " AND (d.description LIKE '%".$db->escape($sprod_fulldescr)."%'"; + if (GETPOST('type_element') != 'fichinter') $sql.= " OR p.ref LIKE '%".$db->escape($sprod_fulldescr)."%'"; + if (GETPOST('type_element') != 'fichinter') $sql.= " OR p.label LIKE '%".$db->escape($sprod_fulldescr)."%'"; + $sql.=")"; +} $sql.= $db->order($sortfield,$sortorder); $resql=$db->query($sql);