diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index 74726d615dc..5405f9ee621 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -580,7 +580,7 @@ class Form
     {
         global $langs,$conf;
     
-        $sql = "SELECT p.rowid, p.label, p.ref, p.price, (pf.price / pf.quantity) as priceunit, p.duration";
+        $sql = "SELECT p.rowid, p.label, p.ref, p.price, pf.quantity, p.duration";
         $sql.= " FROM ".MAIN_DB_PREFIX."product as p ";
         $sql .= " , ".MAIN_DB_PREFIX."product_fournisseur_price as pf ";
         $sql.= " WHERE p.rowid = pf.fk_product AND pf.fk_soc = ".$socid;
@@ -599,7 +599,13 @@ class Form
             while ($i < $num)
             {
                 $objp = $this->db->fetch_object($result);
-                $opt = "<option value=\"$objp->rowid\">[$objp->ref] $objp->label - ".round($objp->priceunit,4)." ".$langs->trans("Currency".$conf->monnaie)." / ".$langs->trans("Unit");
+                $opt = "<option value=\"$objp->rowid\">[$objp->ref] $objp->label - ";
+                $opt.= $objp->price." ".$langs->trans("Currency".$conf->monnaie)." / ".$objp->quantity." ".$langs->trans("Units");
+                if ($objp->quantity > 1)
+                {
+                    $opt.=" - ";
+                    $opt.= round($objp->price/$objp->quantity,4)." ".$langs->trans("Currency".$conf->monnaie)." / ".$langs->trans("Unit");
+                }
                 if ($objp->duration) $opt .= " - ".$objp->duration;
                 $opt .= "</option>\n";
                 print $opt;