diff --git a/ChangeLog b/ChangeLog index 1aae2199336..208706b57d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ For users: - New: Can build PDF in USLetter format or canada format. - New: Can export into Excel 2007 format. - New: Add hidden option CASHDESK_FORCE_STOCK_ON_BILL +- New: Can search on part of barcode into POS module. For developers: - Qual: Removed no more used external libraries. diff --git a/htdocs/cashdesk/affIndex.php b/htdocs/cashdesk/affIndex.php index 2e6e1adf56a..d6ec051ceb3 100644 --- a/htdocs/cashdesk/affIndex.php +++ b/htdocs/cashdesk/affIndex.php @@ -35,6 +35,7 @@ if ( $_SESSION['uid'] <= 0 ) $langs->load("cashdesk"); + /* * View */ @@ -47,29 +48,6 @@ $arrayofcss=array('/cashdesk/css/style.css'); top_htmlhead($head,$langs->trans("CashDesk"),0,0,$arrayofjs,$arrayofcss); -/* -print ''; - -print ''."\n"; -print ''."\n"; -print ''.$langs->trans("CashDesk").''."\n"; - -print ''."\n"; -print ''."\n"; -print ''."\n"; -print ''."\n"; -print ''."\n"; - -print ''."\n"; -print ''."\n"; -print ''."\n"; -print ''."\n"; -print ''."\n"; -print ''."\n"; -print ''."\n"; -*/ print ''."\n"; if (!empty($error)) diff --git a/htdocs/cashdesk/facturation.php b/htdocs/cashdesk/facturation.php index 7682e89b57d..d61c1cb6f84 100644 --- a/htdocs/cashdesk/facturation.php +++ b/htdocs/cashdesk/facturation.php @@ -1,6 +1,6 @@ - * Copyright (C) 2008-2009 Laurent Destailleur + * Copyright (C) 2008-2011 Laurent Destailleur * Copyright (C) 2011 Juanjo Menent * * This program is free software; you can redistribute it and/or modify @@ -36,9 +36,9 @@ if ( $_GET['filtre'] ) { $sql.= " WHERE p.tosell = 1"; if(!$conf->global->CASHDESK_SERVICES) $sql.= " AND p.fk_product_type = 0"; $sql.= " AND (p.ref LIKE '%".$_GET['filtre']."%' OR p.label LIKE '%".$_GET['filtre']."%' "; - if ($conf->barcode->enabled) $sql.= " OR p.barcode='".$_GET['filtre']."')"; + if ($conf->barcode->enabled) $sql.= " OR p.barcode LIKE '%".$_GET['filtre']."%')"; else $sql.= ")"; - + $sql.= " ORDER BY label"; dol_syslog("facturation.php sql=".$sql);