From 87a16dd89893ccedd0fb59be3df84c24d308b960 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sun, 15 Jul 2007 22:26:29 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20la=20liste=20d=E9roulante=20affichait=20?=
 =?UTF-8?q?0=20pour=20le=20prix=20si=20un=20produit=20n'avait=20pas=20de?=
 =?UTF-8?q?=20prix=20multiple=20en=20mode=20multiprix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/html.form.class.php | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index 544945dbc69..7d74673f483 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -1040,7 +1040,7 @@ class Form
 				}
 				$opt = '<option value="'.$objp->rowid.'">'.$objp->ref.' - ';
 				$opt.= dolibarr_trunc($objp->label,32).' - ';
-				
+
 				// Multiprix
 				if ($price_level > 1)
 				{
@@ -1048,12 +1048,23 @@ class Form
 					$sql.= "FROM ".MAIN_DB_PREFIX."product_price ";
 					$sql.= "where fk_product='".$objp->rowid."' and price_level=".$price_level;
 					$sql.= " order by date_price DESC limit 1";
-					$result2 = $this->db->query($sql) ;
+					$result2 = $this->db->query($sql);
 					$objp2 = $this->db->fetch_object($result2);
-					if ($objp2->price_base_type == 'HT')
-						$opt.= price2num($objp2->price,'MU').' '.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("HT");
+					if ($objp2)
+					{
+					  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
-						$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
 				{