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

Fix: la liste droulante affichait 0 pour le prix si un produit n'avait pas de prix multiple en mode multiprix

Browse Source
This commit is contained in:
Regis Houssin 2007-07-15 22:26:29 +00:00
parent a840f8a79c
commit 87a16dd898
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1040,7 +1040,7 @@ class Form
} }
$opt = '<option value="'.$objp->rowid.'">'.$objp->ref.' - '; $opt = '<option value="'.$objp->rowid.'">'.$objp->ref.' - ';
$opt.= dolibarr_trunc($objp->label,32).' - '; $opt.= dolibarr_trunc($objp->label,32).' - ';
// Multiprix // Multiprix
if ($price_level > 1) if ($price_level > 1)
{ {
@ -1048,12 +1048,23 @@ class Form
$sql.= "FROM ".MAIN_DB_PREFIX."product_price "; $sql.= "FROM ".MAIN_DB_PREFIX."product_price ";
$sql.= "where fk_product='".$objp->rowid."' and price_level=".$price_level; $sql.= "where fk_product='".$objp->rowid."' and price_level=".$price_level;
$sql.= " order by date_price DESC limit 1"; $sql.= " order by date_price DESC limit 1";
$result2 = $this->db->query($sql) ; $result2 = $this->db->query($sql);
$objp2 = $this->db->fetch_object($result2); $objp2 = $this->db->fetch_object($result2);
if ($objp2->price_base_type == 'HT') if ($objp2)
$opt.= price2num($objp2->price,'MU').' '.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("HT"); {
if ($objp2->price_base_type == 'HT')
$opt.= price2num($objp2->price,'MU').' '.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("HT");
else
$opt.= price2num($objp2->price_ttc,'MU').' '.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("TTC");
}
//si il n'y a pas de prix multiple on prend le prix de base du produit/service
else else
$opt.= price2num($objp2->price_ttc,'MU').' '.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("TTC"); {
if ($objp->price_base_type == 'HT')
$opt.= price2num($objp->price,'MU').' '.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("HT");
else
$opt.= price2num($objp->price_ttc,'MU').' '.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("TTC");
}
} }
else else
{ {