Skip to content

Commit

Permalink
Better fix for 416a089
Browse files Browse the repository at this point in the history
  • Loading branch information
eldy committed Sep 2, 2016
1 parent 696b54c commit 9c8145e
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions htdocs/product/price.php
Expand Up @@ -97,8 +97,6 @@
{
$tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5' or '8.5*' or '8.5

$tva_tx_txt;

// We must define tva_tx, npr and local taxes
$tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt); // keep remove all after the numbers and dot
$npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
Expand Down Expand Up @@ -204,6 +202,7 @@
}

$tva_tx_txt = $newvattx[$i];
$tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt); // keep remove all after the numbers and dot
$npr = $newvatnpr[$i];
$localtax1 = $newlocaltax1_tx[$i];
$localtax1_type = $newlocaltax1_type[$i];
Expand All @@ -214,7 +213,7 @@
'price' => $newprice[$i],
'price_min' => $newprice_min[$i],
'price_base_type' => $newpricebase[$i],
'vat_tx' => $tva_tx_txt,
'vat_tx' => $tva_tx,
'npr' => $npr,
'localtaxes_array' => array('0'=>$localtax1_type, '1'=>$localtax1, '2'=>$localtax2_type, '3'=>$localtax2)
);
Expand Down

0 comments on commit 9c8145e

Please sign in to comment.