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

Add comment

Browse Source
This commit is contained in:
Laurent Destailleur 2012-09-05 04:13:31 +02:00
parent e441b246a8
commit 105cb2373c
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
htdocs/core/lib/price.lib.php
View File

@ -86,19 +86,17 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $txlocalta
$result[4] = price2num($result[5] - $result3bis, 'MU'); $result[4] = price2num($result[5] - $result3bis, 'MU');
} }
//Local taxes // Local taxes 1
if ($txlocaltax1>0) if ($txlocaltax1>0)
{ {
$result[14] = price2num(($result[6] * ( 1 + ( $txlocaltax1 / 100))) - $result[6], 'MT'); // amount tax1 for total_ht_without_discount
$result[8] = price2num($result[8] + $result[14], 'MT'); // total_ttc_without_discount + tax1
$result[14] = price2num(($result[6] * ( 1 + ( $txlocaltax1 / 100))) - $result[6], 'MT'); $result[9] = price2num(($result[0] * ( 1 + ( $txlocaltax1 / 100))) - $result[0], 'MT'); // amount tax1 for total_ht
$result[8] = price2num($result[8] + $result[14], 'MT'); $result[2] = price2num($result[2] + $result[9], 'MT'); // total_ttc + tax1
$result[9] = price2num(($result[0] * ( 1 + ( $txlocaltax1 / 100))) - $result[0], 'MT');
$result[2] = price2num($result[2] + $result[9], 'MT');
$result[11] = price2num(($result[3] * ( 1 + ( $txlocaltax1 / 100))) - $pu, 'MT');
$result[5] = price2num($result[5] + $result[11], 'MT');
$result[11] = price2num(($result[3] * ( 1 + ( $txlocaltax1 / 100))) - $pu, 'MT'); // amount tax1 for pu_ht
$result[5] = price2num($result[5] + $result[11], 'MT'); // pu_ht + tax1
} }
else else
{ {
@ -107,25 +105,25 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $txlocalta
$result[11] = 0; $result[11] = 0;
} }
// Local taxes 2
if ($txlocaltax2>0) if ($txlocaltax2>0)
{ {
$result[15] = price2num(($result[6] * ( 1 + ( $txlocaltax2 / 100))) - $result[6], 'MT'); $result[15] = price2num(($result[6] * ( 1 + ( $txlocaltax2 / 100))) - $result[6], 'MT'); // amount tax2 for total_ht_without_discount
$result[10] = price2num(($result[0] * ( 1 + ( $txlocaltax2 / 100))) - $result[0], 'MT'); $result[10] = price2num(($result[0] * ( 1 + ( $txlocaltax2 / 100))) - $result[0], 'MT'); // amount tax2 for total_ht
$result[12] = price2num(($result[3] * ( 1 + ( $txlocaltax2 / 100))) - $pu, 'MT'); $result[12] = price2num(($result[3] * ( 1 + ( $txlocaltax2 / 100))) - $pu, 'MT'); // amount tax2 for pu_ht
//If Country is Spain, localtax2 (IRPF) will be subtracted //If Country is Spain, localtax2 (IRPF) will be subtracted
if ($mysoc->country_code=='ES') if ($mysoc->country_code=='ES')
{ {
$result[8] = price2num($result[8] - $result[15], 'MT'); $result[8] = price2num($result[8] - $result[15], 'MT'); // total_ttc_without_discount + tax2
$result[2] = price2num($result[2] - $result[10], 'MT'); $result[2] = price2num($result[2] - $result[10], 'MT'); // total_ttc + tax2
$result[5] = price2num($result[5] - $result[12], 'MU'); $result[5] = price2num($result[5] - $result[12], 'MU'); // pu_ttc + tax2
} }
else else
{ {
$result[8] = price2num($result[8] + $result[15], 'MT'); $result[8] = price2num($result[8] + $result[15], 'MT'); // total_ttc_without_discount + tax2
$result[2] = price2num($result[2] + $result[10], 'MT'); $result[2] = price2num($result[2] + $result[10], 'MT'); // total_ttc + tax2
$result[5] = price2num($result[5] + $result[12], 'MU'); $result[5] = price2num($result[5] + $result[12], 'MU'); // pu_ttc + tax2
} }
} }
else else