From 84e345702378c617d6ce1ff9df6cdbe022ae5f7e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 1 Dec 2013 16:30:35 +0100
Subject: [PATCH] Fix: [ bug #1161 ] Search on product label

---
 ChangeLog                      | 3 ++-
 htdocs/societe/consumption.php | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 375bd99b338..6227e174763 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,7 +14,8 @@ Fix: [ bug #1145 ] Agenda button list type do not display
 Fix: [ bug #1148 ] Product consomation : supplier order bad status
 Fix: [ bug #1159 ] Commercial search "other" give p.note do not exists
 Fix: [ bug #1163 ] SQL Error when searching for supplier orders
-Fix: [ bug #1162 ] Traduction des mi-journées
+Fix: [ bug #1162 ] Translaction for morning and afternoon
+Fix: [ bug #1161 ] Search on product label
 
 ***** ChangeLog for 3.4.1 compared to 3.4.0 *****
 Fix: Display buying price on line edit when no supplier price is defined
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 21d98fbd64c..16d2c4fea7d 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -214,6 +214,7 @@ 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 '%".$sprod_fulldescr."%' OR p.label LIKE '%".$sprod_fulldescr."%')";
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit + 1, $offset);
 
@@ -249,7 +250,7 @@ print $formother->select_month($month?$month:-1,'month',1);
 $formother->select_year($year?$year:-1,'year',1, 20, 1);
 print '</td>';
 print '<td class="liste_titre" align="left">';
-print '<input class="flat" type="text" name="sprod_fulldescr" size="15" value="'.$sprod_fulldescr.'">';
+print '<input class="flat" type="text" name="sprod_fulldescr" size="15" value="'.dol_escape_htmltag($sprod_fulldescr).'">';
 print '</td>';
 print '<td class="liste_titre" align="right">';
 print '<input type="image" class="liste_titre" name="button_search" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';