Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: bug #19583

Browse Source 
ajout de la rfrence interne du produit et de la rfrence fournisseur dans la liste droulante ainsi que dans la fiche.
La rfrence fournisseur est entre parenthese.
This commit is contained in:
Regis Houssin
2007-04-24 11:09:55 +00:00
parent 27cf70f71a
commit 9992a2fa5d
6 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -929,11 +929,14 @@ class Form
{
global $langs,$conf;
$sql = "SELECT p.rowid, p.label, p.ref, p.price, pf.price as fprice, pf.quantity, p.duration";
$sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration,";
$sql.= " pf.ref_fourn,";
$sql.= " pfp.price as fprice, pfp.quantity";
$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pf ON p.rowid = pf.fk_product";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur as pf ON p.rowid = pf.fk_product";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
$sql.= " WHERE p.envente = 1";
if ($socid) $sql.= " AND pf.fk_soc = ".$socid;
if ($socid) $sql.= " AND pfp.fk_soc = ".$socid;
if ($filtretype && $filtretype != '') $sql.=" AND p.fk_product_type=".$filtretype;
if ($filtre) $sql.="$filtre";
$sql.= " ORDER BY p.ref DESC";
@@ -955,7 +958,7 @@ class Form
$opt = '<option value="'.$objp->rowid.'"';
if ($selected == $objp->rowid) $opt.= ' selected="true"';
$opt.= '>'.$objp->ref.' - ';
$opt.= '>'.$objp->ref.' ('.$objp->ref_fourn.') - ';
$opt.= dolibarr_trunc($objp->label,24).' - ';
$opt.= $objp->fprice.$langs->trans("Currency".$conf->monnaie)."/".$objp->quantity.$langs->trans("Units");
if ($objp->quantity > 1)