From 606674d8c852f29ac4c3acfb79bd6ecac624e0c3 Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Fri, 13 Jul 2012 15:28:25 +0200
Subject: [PATCH] Fix: Bad local taxes if price base type is TTC
Conflicts:
htdocs/core/lib/price.lib.php
---
htdocs/core/lib/price.lib.php | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php
index 11161c32258..89cb4512d13 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')
--
GitLab