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

Better fix for 416a0892d7

Browse Source
This commit is contained in:
Laurent Destailleur 2016-09-02 19:19:13 +02:00
parent 696b54c6c3
commit 9c8145eb88
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/product/price.php
View File

@ -97,8 +97,6 @@ if (empty($reshook))
{ {
$tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5' or '8.5*' or '8.5 $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 // 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 $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; $npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
@ -204,6 +202,7 @@ if (empty($reshook))
} }
$tva_tx_txt = $newvattx[$i]; $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]; $npr = $newvatnpr[$i];
$localtax1 = $newlocaltax1_tx[$i]; $localtax1 = $newlocaltax1_tx[$i];
$localtax1_type = $newlocaltax1_type[$i]; $localtax1_type = $newlocaltax1_type[$i];
@ -214,7 +213,7 @@ if (empty($reshook))
'price' => $newprice[$i], 'price' => $newprice[$i],
'price_min' => $newprice_min[$i], 'price_min' => $newprice_min[$i],
'price_base_type' => $newpricebase[$i], 'price_base_type' => $newpricebase[$i],
'vat_tx' => $tva_tx_txt, 'vat_tx' => $tva_tx,
'npr' => $npr, 'npr' => $npr,
'localtaxes_array' => array('0'=>$localtax1_type, '1'=>$localtax1, '2'=>$localtax2_type, '3'=>$localtax2) 'localtaxes_array' => array('0'=>$localtax1_type, '1'=>$localtax1, '2'=>$localtax2_type, '3'=>$localtax2)
); );