From def98925481ed3bf8cf02215d59ad0aeedba62a3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 25 Oct 2008 11:45:31 +0000 Subject: [PATCH] Fix: Error on price page if no min price defined. --- htdocs/product.class.php | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/htdocs/product.class.php b/htdocs/product.class.php index 6cd4305d24a..8f96a3e13cd 100644 --- a/htdocs/product.class.php +++ b/htdocs/product.class.php @@ -814,7 +814,7 @@ class Product extends CommonObject { //multiprix global $conf,$langs; - dolibarr_syslog("Product::update_price id=".$id." newprice=".$newprice." newpricebase=".$newpricebase); + dolibarr_syslog("Product::update_price id=".$id." newprice=".$newprice." newpricebase=".$newpricebase, LOG_DEBUG); if ($newvat == '') $newvat=$this->tva_tx; @@ -826,11 +826,17 @@ class Product extends CommonObject $price = price2num($newprice) / (1 + ($newvat / 100)); $price = price2num($price,'MU'); - if($newminprice!=''){ + if($newminprice!='') + { $price_min_ttc = price2num($newminprice,'MU'); $price_min = price2num($newminprice) / (1 + ($newvat / 100)); $price_min = price2num($price_min,'MU'); } + else + { + $price_min=0; + $price_min_ttc=0; + } } else { @@ -838,15 +844,22 @@ class Product extends CommonObject $price_ttc = price2num($newprice) * (1 + ($newvat / 100)); $price_ttc = price2num($price_ttc,'MU'); - if($newminprice!=''){ + if ($newminprice!='') + { $price_min = price2num($newminprice,'MU'); $price_min_ttc = price2num($newminprice) * (1 + ($newvat / 100)); $price_min_ttc = price2num($price_min_ttc,'MU'); } + else + { + $price_min=0; + $price_min_ttc=0; + } } - - // Ne pas mettre de quote sur le num�riques decimaux. - // Ceci provoque des sotckage avec arrondis en base au lieu des valeurs exactes. + //print 'x'.$id.'-'.$newprice.'-'.$newpricebase.'-'.$price.'-'.$price_ttc.'-'.$price_min.'-'.$price_min_ttc; + + // Ne pas mettre de quote sur le numeriques decimaux. + // Ceci provoque des stockage avec arrondis en base au lieu des valeurs exactes. $sql = "UPDATE ".MAIN_DB_PREFIX."product SET"; $sql.= " price_base_type='".$newpricebase."',"; $sql.= " price=".$price.",";