diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php index 11161c322586a49acdcd762ca02756e51e6eece0..89cb4512d13e8b3c7aaddac2f68644ce6c48fdc4 100644 --- a/htdocs/core/lib/price.lib.php +++ b/htdocs/core/lib/price.lib.php @@ -94,14 +94,16 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $txlocalta //Local taxes if ($txlocaltax1>0) { - $result[14] = price2num(($tot_sans_remise * (1 + ( $txlocaltax1 / 100))) - $tot_sans_remise, 'MT'); + + $result[14] = price2num(($result[6] * ( 1 + ( $txlocaltax1 / 100))) - $result[6], 'MT'); $result[8] = price2num($result[8] + $result[14], 'MT'); - $result[9] = price2num(($tot_avec_remise * (1 + ( $txlocaltax1 / 100))) - $tot_avec_remise, 'MT'); + $result[9] = price2num(($result[0] * ( 1 + ( $txlocaltax1 / 100))) - $result[0], 'MT'); $result[2] = price2num($result[2] + $result[9], 'MT'); - $result[11] = price2num(($pu * (1 + ( $txlocaltax1 / 100))) - $pu, 'MT'); + $result[11] = price2num(($result[3] * ( 1 + ( $txlocaltax1 / 100))) - $pu, 'MT'); $result[5] = price2num($result[5] + $result[11], 'MT'); + } else { @@ -111,10 +113,11 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $txlocalta } if ($txlocaltax2>0) - { - $result[15] = price2num(($tot_sans_remise * (1 + ( $txlocaltax2 / 100))) - $tot_sans_remise, 'MT'); - $result[10] = price2num(($tot_avec_remise * (1 + ( $txlocaltax2 / 100))) - $tot_avec_remise, 'MT'); - $result[12] = price2num(($pu * (1 + ( $txlocaltax2 / 100))) - $pu, 'MT'); + + { + $result[15] = price2num(($result[6] * ( 1 + ( $txlocaltax2 / 100))) - $result[6], 'MT'); + $result[10] = price2num(($result[0] * ( 1 + ( $txlocaltax2 / 100))) - $result[0], 'MT'); + $result[12] = price2num(($result[3] * ( 1 + ( $txlocaltax2 / 100))) - $pu, 'MT'); //If Country is Spain, localtax2 (IRPF) will be subtracted if ($mysoc->country_code=='ES')