lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Can search on part of barcode

Browse Source
This commit is contained in:
eldy 2011-10-01 13:23:10 +02:00
parent 8976e8e03d
commit 4d4be413af
3 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -19,6 +19,7 @@ For users:
- New: Can build PDF in USLetter format or canada format. - New: Can build PDF in USLetter format or canada format.
- New: Can export into Excel 2007 format. - New: Can export into Excel 2007 format.
- New: Add hidden option CASHDESK_FORCE_STOCK_ON_BILL - New: Add hidden option CASHDESK_FORCE_STOCK_ON_BILL
- New: Can search on part of barcode into POS module.
For developers: For developers:
- Qual: Removed no more used external libraries. - Qual: Removed no more used external libraries.

24
htdocs/cashdesk/affIndex.php
View File

@ -35,6 +35,7 @@ if ( $_SESSION['uid'] <= 0 )
$langs->load("cashdesk"); $langs->load("cashdesk");
/* /*
* View * View
*/ */
@ -47,29 +48,6 @@ $arrayofcss=array('/cashdesk/css/style.css');
top_htmlhead($head,$langs->trans("CashDesk"),0,0,$arrayofjs,$arrayofcss); top_htmlhead($head,$langs->trans("CashDesk"),0,0,$arrayofjs,$arrayofcss);
/*
print '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
print '<html>'."\n";
print '<head>'."\n";
print '<title>'.$langs->trans("CashDesk").'</title>'."\n";
print '<meta name="robots" content="none" />'."\n";
print '<meta name="author" content="Jeremie Ollivier - jeremie.o@laposte.net" />'."\n";
print '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />'."\n";
print '<meta http-equiv="Content-Style-Type" content="text/css" />'."\n";
print '<link href="'.DOL_URL_ROOT.'/cashdesk/css/style.css" rel="stylesheet" type="text/css" media="screen" />'."\n";
print '<!-- Import des fichiers necessaires a JsCalendar -->'."\n";
print '<style type="text/css">'."\n";
print '@import url(include/jscalendar/calendar-blue.css);'."\n";
print '</style>'."\n";
print '<script type="text/javascript" src="include/jscalendar/calendar.js"></script>'."\n";
print '<script type="text/javascript" src="include/jscalendar/lang/calendar-fr.js"></script>'."\n";
print '<script type="text/javascript" src="include/jscalendar/calendar-setup.js"></script>'."\n";
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/lib/lib_head.js"></script>'."\n";
print '</head>'."\n";
*/
print '<body>'."\n"; print '<body>'."\n";
if (!empty($error)) if (!empty($error))

6
htdocs/cashdesk/facturation.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.net> /* Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.net>
* Copyright (C) 2008-2009 Laurent Destailleur <eldy@uers.sourceforge.net> * Copyright (C) 2008-2011 Laurent Destailleur <eldy@uers.sourceforge.net>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -36,9 +36,9 @@ if ( $_GET['filtre'] ) {
$sql.= " WHERE p.tosell = 1"; $sql.= " WHERE p.tosell = 1";
if(!$conf->global->CASHDESK_SERVICES) $sql.= " AND p.fk_product_type = 0"; 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']."%' "; $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.= ")"; else $sql.= ")";
$sql.= " ORDER BY label"; $sql.= " ORDER BY label";
dol_syslog("facturation.php sql=".$sql); dol_syslog("facturation.php sql=".$sql);