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

Fix: No hard coded precision. Second param must be 'MU' (we want a

Browse Source 
unit price so 'MU'. If unit price was on 4 decimal, we must keep 4
decimals once vat rate was changed)
This commit is contained in:
Laurent Destailleur 2012-05-23 02:31:38 +02:00
parent 8eb73aaa33
commit dc16085d57
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/product/admin/product_tools.php
View File

@ -44,14 +44,14 @@ $price_base_type=GETPOST('price_base_type');
if ($action == 'convert') if ($action == 'convert')
{ {
$error=0; $error=0;
$db->begin(); $db->begin();
$sql = 'SELECT rowid'; $sql = 'SELECT rowid';
$sql.= ' FROM '.MAIN_DB_PREFIX.'product'; $sql.= ' FROM '.MAIN_DB_PREFIX.'product';
$sql.= ' WHERE entity IN ('.getEntity('product',1).')'; $sql.= ' WHERE entity IN ('.getEntity('product',1).')';
$sql.= ' AND tva_tx = "'.$oldvatrate.'"'; $sql.= ' AND tva_tx = "'.$oldvatrate.'"';
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if ($resql)
{ {
@ -62,30 +62,30 @@ if ($action == 'convert')
while ($i < $num) while ($i < $num)
{ {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
$object = new Product($db); $object = new Product($db);
$ret=$object->fetch($obj->rowid); $ret=$object->fetch($obj->rowid);
if ($ret) if ($ret)
{ {
if ($price_base_type == 'TTC') if ($price_base_type == 'TTC')
{ {
$newprice=price2num($object->price_ttc,'2'); $newprice=price2num($object->price_ttc,'MU'); // Second param must be MU (we want a unit price so 'MT'. If unit price was on 4 decimal, we must keep 4 decimals)
} }
else else
{ {
$newprice=price2num($object->price,'MU'); $newprice=price2num($object->price,'MU'); // Second param must be MU (we want a unit price so 'MT'. If unit price was on 4 decimal, we must keep 4 decimals)
} }
$newvat=str_replace('*','',$newvatrate); $newvat=str_replace('*','',$newvatrate);
$ret=$object->updatePrice($object->id, $newprice, $price_base_type, $user, $newvat); $ret=$object->updatePrice($object->id, $newprice, $price_base_type, $user, $newvat);
if ($ret < 0) $error++; if ($ret < 0) $error++;
} }
$i++; $i++;
} }
if (! $error) if (! $error)
{ {
$db->commit(); $db->commit();