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

Merge pull request #13415 from ptibogxiv/patch-314

Browse Source 
NEW PRODUCT_SHOW_ORIGIN_IN_COMBO
This commit is contained in:
Laurent Destailleur 2020-03-25 18:32:57 +01:00 committed by GitHub
commit 7c819a96d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2141,7 +2141,7 @@ class Form
} }
} }
$selectFields = " p.rowid, p.ref, p.label, p.description, p.barcode, p.fk_product_type, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.duration, p.fk_price_expression"; $selectFields = " p.rowid, p.ref, p.label, p.description, p.barcode, p.fk_country as country_id, p.fk_product_type, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.duration, p.fk_price_expression";
if (count($warehouseStatusArray)) if (count($warehouseStatusArray))
{ {
$selectFieldsGrouped = ", sum(".$db->ifsql("e.statut IS NULL", "0", "ps.reel").") as stock"; // e.statut is null if there is no record in stock $selectFieldsGrouped = ", sum(".$db->ifsql("e.statut IS NULL", "0", "ps.reel").") as stock"; // e.statut is null if there is no record in stock
@ -2445,6 +2445,7 @@ class Form
$outlabel = ''; $outlabel = '';
$outdesc = ''; $outdesc = '';
$outbarcode = ''; $outbarcode = '';
$outorigin = '';
$outtype = ''; $outtype = '';
$outprice_ht = ''; $outprice_ht = '';
$outprice_ttc = ''; $outprice_ttc = '';
@ -2464,6 +2465,7 @@ class Form
$outlabel = $objp->label; $outlabel = $objp->label;
$outdesc = $objp->description; $outdesc = $objp->description;
$outbarcode = $objp->barcode; $outbarcode = $objp->barcode;
$outorigin = $objp->country_id;
$outpbq = empty($objp->price_by_qty_rowid) ? '' : $objp->price_by_qty_rowid; $outpbq = empty($objp->price_by_qty_rowid) ? '' : $objp->price_by_qty_rowid;
$outtype = $objp->fk_product_type; $outtype = $objp->fk_product_type;
@ -2525,12 +2527,15 @@ class Form
$opt .= $objp->ref; $opt .= $objp->ref;
if ($outbarcode) $opt .= ' ('.$outbarcode.')'; if ($outbarcode) $opt .= ' ('.$outbarcode.')';
$opt .= ' - '.dol_trunc($label, $maxlengtharticle); $opt .= ' - '.dol_trunc($label, $maxlengtharticle);
if ($outorigin && !empty($conf->global->PRODUCT_SHOW_ORIGIN_IN_COMBO)) $opt .= ' ('.getCountry($outorigin, 1).')';
$objRef = $objp->ref; $objRef = $objp->ref;
if (!empty($filterkey) && $filterkey != '') $objRef = preg_replace('/('.preg_quote($filterkey).')/i', '<strong>$1</strong>', $objRef, 1); if (!empty($filterkey) && $filterkey != '') $objRef = preg_replace('/('.preg_quote($filterkey).')/i', '<strong>$1</strong>', $objRef, 1);
$outval .= $objRef; $outval .= $objRef;
if ($outbarcode) $outval .= ' ('.$outbarcode.')'; if ($outbarcode) $outval .= ' ('.$outbarcode.')';
$outval .= ' - '.dol_trunc($label, $maxlengtharticle); $outval .= ' - '.dol_trunc($label, $maxlengtharticle);
if ($outorigin && !empty($conf->global->PRODUCT_SHOW_ORIGIN_IN_COMBO)) $outval .= ' ('.getCountry($outorigin, 1).')';
// Units // Units
$opt .= $outvalUnits; $opt .= $outvalUnits;
$outval .= $outvalUnits; $outval .= $outvalUnits;