diff --git a/ChangeLog b/ChangeLog index 55ab5506633..c88e1554a6a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -139,6 +139,7 @@ Fix: wrong buy price update Fix: [ bug #1142 ] Set paiement on invoice (PGSql) 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 ***** 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/comm/propal/list.php b/htdocs/comm/propal/list.php index 58aee255312..2c23db317a7 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -182,11 +182,7 @@ if ($search_montant_ht) $sql.= " AND p.total_ht='".$db->escape(price2num(trim($search_montant_ht)))."'"; } if ($sall) { - /*$scrit = explode(' ', $sall); - foreach ($scrit as $crit) { - $sql.= " AND (s.nom LIKE '%".$db->escape($crit)."%' OR p.note LIKE '%".$db->escape($crit)."%' OR pd.description LIKE '%".$db->escape($crit)."%')"; - }*/ - $sql .= natural_search(array('s.nom', 'p.note_private', 'pd.description'), $sall); + $sql .= natural_search(array('s.nom', 'p.note_private', 'p.note_public', 'pd.description'), $sall); } if ($socid) $sql.= ' AND s.rowid = '.$socid; if ($viewstatut <> '')