Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge pull request #383 from marcosgdf/task-539

Browse Source 
Task #539 - Add new products into proposals,invoices... with barcode
This commit is contained in:
Laurent Destailleur
2012-09-10 14:04:50 -07:00
parent de339278bc ded4e061e1
commit 3a18633df3
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -43,10 +43,11 @@ For users:
- New: [ task #498 ] Improvement of the block to add products/services lines. - New: [ task #498 ] Improvement of the block to add products/services lines.
- New: ECM autodir works also for files joined to products and services. - New: ECM autodir works also for files joined to products and services.
- New: Add a selection module for emailing to enter a recipient from gui. - New: Add a selection module for emailing to enter a recipient from gui.
- New: Allow to search product from barcodes directly from the permanent mini search left box
- New: Allow to search product from barcodes directly from invoices, proposals... through AJAX
New experimental modules: New experimental modules:
- New: Add margin and commissions management module. - New: Add margin and commissions management module.
- New: Add holiday 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: [ bug #499 ]: Supplier order input method not translated
- Fix: No images into product description lines as PDF generation does - Fix: No images into product description lines as PDF generation does

11
htdocs/core/class/html.form.class.php
View File

@@ -12,6 +12,7 @@
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2010 Philippe Grand <philippe.grand@atoo-net.com> * Copyright (C) 2010 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2011 Herve Prot <herve.prot@symeos.com> * Copyright (C) 2011 Herve Prot <herve.prot@symeos.com>
* Copyright (C) 2012 Marcos García <marcosgdf@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@@ -1196,6 +1197,11 @@ class Form
if (! empty($conf->global->MAIN_MULTILANGS)) $sql.=" OR pl.label LIKE '%".$filterkey."%'"; if (! empty($conf->global->MAIN_MULTILANGS)) $sql.=" OR pl.label LIKE '%".$filterkey."%'";
$sql.=")"; $sql.=")";
} }
if (! empty($conf->global->MAIN_MODULE_BARCODE))
{
$sql .= " OR p.barcode LIKE '".$filterkey."'";
}
} }
$sql.= $db->order("p.ref"); $sql.= $db->order("p.ref");
$sql.= $db->plimit($limit); $sql.= $db->plimit($limit);
@@ -1441,6 +1447,11 @@ class Form
{ {
$sql.=" AND (pfp.ref_fourn LIKE '%".$filterkey."%' OR p.ref LIKE '%".$filterkey."%' OR p.label LIKE '%".$filterkey."%')"; $sql.=" AND (pfp.ref_fourn LIKE '%".$filterkey."%' OR p.ref LIKE '%".$filterkey."%' OR p.label LIKE '%".$filterkey."%')";
} }
if (! empty($conf->global->MAIN_MODULE_BARCODE))
{
$sql .= " OR p.barcode LIKE '".$filterkey."'";
}
} }
$sql.= " ORDER BY pfp.ref_fourn DESC"; $sql.= " ORDER BY pfp.ref_fourn DESC";