Fix: possibilité de mettre le prix à 0

This commit is contained in:
Regis Houssin 2009-05-19 13:58:11 +00:00
parent 91624baceb
commit da2f1fa536

View File

@ -800,7 +800,7 @@ class Product extends CommonObject
if ($newvat == '') $newvat=$this->tva_tx; if ($newvat == '') $newvat=$this->tva_tx;
if ($newprice) if ($newprice!='' || $newprice==0)
{ {
if ($newpricebase == 'TTC') if ($newpricebase == 'TTC')
{ {
@ -808,7 +808,7 @@ class Product extends CommonObject
$price = price2num($newprice) / (1 + ($newvat / 100)); $price = price2num($newprice) / (1 + ($newvat / 100));
$price = price2num($price,'MU'); $price = price2num($price,'MU');
if ($newminprice!='') if ($newminprice!='' || $newminprice==0)
{ {
$price_min_ttc = price2num($newminprice,'MU'); $price_min_ttc = price2num($newminprice,'MU');
$price_min = price2num($newminprice) / (1 + ($newvat / 100)); $price_min = price2num($newminprice) / (1 + ($newvat / 100));
@ -826,7 +826,7 @@ class Product extends CommonObject
$price_ttc = price2num($newprice) * (1 + ($newvat / 100)); $price_ttc = price2num($newprice) * (1 + ($newvat / 100));
$price_ttc = price2num($price_ttc,'MU'); $price_ttc = price2num($price_ttc,'MU');
if ($newminprice!='') if ($newminprice!='' || $newminprice==0)
{ {
$price_min = price2num($newminprice,'MU'); $price_min = price2num($newminprice,'MU');
$price_min_ttc = price2num($newminprice) * (1 + ($newvat / 100)); $price_min_ttc = price2num($newminprice) * (1 + ($newvat / 100));