From 94090e85db18357e6a5884aa6fcc5395733b94db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Sun, 9 Sep 2012 15:12:04 +0200 Subject: [PATCH] Added Copyright and changelog entry --- ChangeLog | 1 + htdocs/product/liste.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a583ceead3e..82c2b13c337 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,7 @@ For users: New experimental modules: - New: Add margin and commissions management module. - New: Add holiday module. +- New: Allow to search product from barcodes directly from the permanent mini search left box - Fix: [ bug #499 ]: Supplier order input method not translated - Fix: No images into product description lines as PDF generation does diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php index a51e7441138..b6d26f82682 100644 --- a/htdocs/product/liste.php +++ b/htdocs/product/liste.php @@ -2,6 +2,7 @@ /* Copyright (C) 2001-2006 Rodolphe Quiedeville * Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2012 Marcos García * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -131,7 +132,7 @@ else $sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')'; if ($sall) { - $sql.= " AND (p.ref LIKE '%".$db->escape($sall)."%' OR p.label LIKE '%".$db->escape($sall)."%' OR p.description LIKE '%".$db->escape($sall)."%' OR p.note LIKE '%".$db->escape($sall)."%'"; + $sql .= " AND (p.ref LIKE '%".$db->escape($sall)."%' OR p.label LIKE '%".$db->escape($sall)."%' OR p.description LIKE '%".$db->escape($sall)."%' OR p.note LIKE '%".$db->escape($sall)."%'"; if (! empty($conf->global->MAIN_MODULE_BARCODE)) { $sql .= " OR p.barcode LIKE '%".$db->escape($sall)."%'";