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

FIX formating of prices with foreign languages

Browse Source
This commit is contained in:
Laurent Destailleur 2020-11-23 19:08:26 +01:00
parent 3c84962891
commit e7dbc8407f
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/product/price.php
View File

@ -226,6 +226,7 @@ if (empty($reshook))
$tva_tx = $tva_tx_txt; $tva_tx = $tva_tx_txt;
$vatratecode = ''; $vatratecode = '';
$reg = array();
if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg)) if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
{ {
$vat_src_code = $reg[1]; $vat_src_code = $reg[1];
@ -261,8 +262,8 @@ if (empty($reshook))
} }
$pricestoupdate[$i] = array( $pricestoupdate[$i] = array(
'price' => $newprice[$i], 'price' => price2num($newprice[$i]),
'price_min' => $newprice_min[$i], 'price_min' => price2num($newprice_min[$i]),
'price_base_type' => $newpricebase[$i], 'price_base_type' => $newpricebase[$i],
'default_vat_code' => $vatratecode, 'default_vat_code' => $vatratecode,
'vat_tx' => $tva_tx, // default_vat_code should be used in priority in a future 'vat_tx' => $tva_tx, // default_vat_code should be used in priority in a future
@ -278,10 +279,15 @@ if (empty($reshook))
} }
elseif (!$error) elseif (!$error)
{ {
$newprice = price2num(GETPOST('price', 'alpha'));
$newprice_min = price2num(GETPOST('price_min', 'alpha'));
$newpricebase = GETPOST('price_base_type', 'alpha');
$tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5' or '8.5*' or '8.5 (XXX)' or '8.5* (XXX)' $tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5' or '8.5*' or '8.5 (XXX)' or '8.5* (XXX)'
$tva_tx = $tva_tx_txt; $tva_tx = $tva_tx_txt;
$vatratecode = ''; $vatratecode = '';
$reg = array();
if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg)) if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
{ {
$vat_src_code = $reg[1]; $vat_src_code = $reg[1];
@ -321,9 +327,9 @@ if (empty($reshook))
} }
} }
$pricestoupdate[0] = array( $pricestoupdate[0] = array(
'price' => $_POST["price"], 'price' => $newprice,
'price_min' => $_POST["price_min"], 'price_min' => $newprice_min,
'price_base_type' => $_POST["price_base_type"], 'price_base_type' => $newpricebase,
'default_vat_code' => $vatratecode, 'default_vat_code' => $vatratecode,
'vat_tx' => $tva_tx, // default_vat_code should be used in priority in a future 'vat_tx' => $tva_tx, // default_vat_code should be used in priority in a future
'npr' => $npr, // default_vat_code should be used in priority in a future 'npr' => $npr, // default_vat_code should be used in priority in a future