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

Fix: conflit cvs

Browse Source
This commit is contained in:
Regis Houssin 2006-02-03 17:39:36 +00:00
parent 5702fc45e3
commit c737502d35
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -590,7 +590,7 @@ class Form
while ($i < $num) while ($i < $num)
{ {
$objp = $this->db->fetch_object($result); $objp = $this->db->fetch_object($result);
$opt = '<option value="'.$objp->rowid.'">['.$objp->ref.'] '; $opt = '<option value="'.$objp->rowid.'">'.$objp->ref.' - ';
$opt.= dolibarr_trunc($objp->label,40).' - '; $opt.= dolibarr_trunc($objp->label,40).' - ';
//multiprix //multiprix
if($price_level > 1) if($price_level > 1)
@ -655,7 +655,7 @@ class Form
while ($i < $num) while ($i < $num)
{ {
$objp = $this->db->fetch_object($result); $objp = $this->db->fetch_object($result);
$opt = '<option value="'.$objp->rowid.'">['.$objp->ref.'] '; $opt = '<option value="'.$objp->rowid.'">'.$objp->ref.' - ';
$opt.= dolibarr_trunc($objp->label,40).' - '; $opt.= dolibarr_trunc($objp->label,40).' - ';
$opt.= $objp->fprice." ".$langs->trans("Currency".$conf->monnaie)." / ".$objp->quantity." ".$langs->trans("Units"); $opt.= $objp->fprice." ".$langs->trans("Currency".$conf->monnaie)." / ".$objp->quantity." ".$langs->trans("Units");
if ($objp->quantity > 1) if ($objp->quantity > 1)