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

Update html.form.class.php

Browse Source
This commit is contained in:
Laurent Destailleur
2019-03-14 17:44:54 +01:00
committed by GitHub
parent 60db66d2bf
commit f50638b7d8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2663,7 +2663,7 @@ class Form
if (count($scrit) > 1) $sql.=")"; if (count($scrit) > 1) $sql.=")";
if (! empty($conf->barcode->enabled)){ if (! empty($conf->barcode->enabled)){
$sql.= " OR p.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'"; $sql.= " OR p.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
if (! empty($conf->global->BARCODE_USE_BARCODE_FOR_SUPPLIER_PRICES)) $sql.= " OR pfp.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'"; $sql.= " OR pfp.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
} }
$sql.=')'; $sql.=')';
} }
@@ -2784,7 +2784,7 @@ class Form
$opt .= " - ".dol_trunc($objp->name, 8); $opt .= " - ".dol_trunc($objp->name, 8);
$outval.=" - ".dol_trunc($objp->name, 8); $outval.=" - ".dol_trunc($objp->name, 8);
} }
if (! empty($conf->barcode->enabled) && !empty($objp->barcode) && ! empty($conf->global->BARCODE_USE_BARCODE_FOR_SUPPLIER_PRICES)) if (! empty($conf->barcode->enabled) && !empty($objp->barcode))
{ {
$opt .= " - ".$objp->barcode; $opt .= " - ".$objp->barcode;
$outval.=" - ".$objp->barcode; $outval.=" - ".$objp->barcode;