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

FIX #21280 FIX #23008

Browse Source
This commit is contained in:
Laurent Destailleur 2022-12-07 12:35:54 +01:00
parent 8236ad34fa
commit f6289297da
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/contrat/card.php
View File

@ -491,6 +491,8 @@ if (empty($reshook)) {
$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx)); $tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx)); $tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
$pu_ht = price2num($price_ht, 'MU');
// On reevalue prix selon taux tva car taux tva transaction peut etre different // On reevalue prix selon taux tva car taux tva transaction peut etre different
// de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur). // de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
if ($tmpvat != $tmpprodvat) { if ($tmpvat != $tmpprodvat) {
@ -516,7 +518,7 @@ if (empty($reshook)) {
$fk_unit = $prod->fk_unit; $fk_unit = $prod->fk_unit;
} else { } else {
$pu_ht = GETPOST('price_ht'); $pu_ht = price2num($price_ht, 'MU');
$price_base_type = 'HT'; $price_base_type = 'HT';
$tva_tx = GETPOST('tva_tx') ?str_replace('*', '', GETPOST('tva_tx')) : 0; // tva_tx field may be disabled, so we use vat rate 0 $tva_tx = GETPOST('tva_tx') ?str_replace('*', '', GETPOST('tva_tx')) : 0; // tva_tx field may be disabled, so we use vat rate 0
$tva_npr = preg_match('/\*/', GETPOST('tva_tx')) ? 1 : 0; $tva_npr = preg_match('/\*/', GETPOST('tva_tx')) ? 1 : 0;