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

readapt to 3.3

Browse Source
This commit is contained in:
Christophe Battarel 2012-09-10 16:01:20 +02:00
parent 4cca760feb
commit 8c11da1df8
1 changed files with 45 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,7 @@
*/ */
/** /**
* \file htdocs/lib/price.lib.php * \file htdocs/core/lib/price.lib.php
* \brief Librairie contenant les fonctions pour calculer un prix. * \brief Librairie contenant les fonctions pour calculer un prix.
* \version $Id: price.lib.php,v 1.36 2011/07/31 23:26:01 eldy Exp $ * \version $Id: price.lib.php,v 1.36 2011/07/31 23:26:01 eldy Exp $
*/ */
@ -27,17 +27,15 @@
/** /**
* Calculate totals (net, vat, ...) of a line. * Calculate totals (net, vat, ...) of a line.
* @param qty Quantity * @param int $qty Quantity
* @param pu Unit price (HT or TTC selon price_base_type) * @param float $pu Unit price (HT or TTC selon price_base_type)
* @param remise_percent_ligne Discount for line * @param float $remise_percent_ligne Discount for line
* @param txtva Vat rate * @param float $txtva Vat rate
* @param localtax1 Array of localtax1, localtax1_type * @param array $localtax1 Array of localtax1, localtax1_type
* @param localtax2 Array of localtax2, localtax2_type * @param array $localtax2 Array of localtax2, localtax2_type
* @param remise_percent_global 0 * @param float $remise_percent_global 0
* @param price_base_type HT=on calcule sur le HT, TTC=on calcule sur le TTC * @param string $price_base_type HT=on calcule sur le HT, TTC=on calcule sur le TTC
* @param info_bits Miscellanous informations on line * @param int $info_bits Miscellanous informations on line
* \param type Type of line (0=product, 1=service)
*
* @return result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) * @return result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
*/ */
function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $localtax1=null, $localtax2=null, $remise_percent_global=0, $price_base_type='HT', $info_bits=0, $type=0) function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $localtax1=null, $localtax2=null, $remise_percent_global=0, $price_base_type='HT', $info_bits=0, $type=0)
@ -48,8 +46,8 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $localtax1
// initialize total // initialize total
$tot_sans_remise = $pu * $qty; $tot_sans_remise = $pu * $qty;
$tot_avec_remise_ligne = $tot_sans_remise * ( 1 - ($remise_percent_ligne / 100)); $tot_avec_remise_ligne = $tot_sans_remise * (1 - ($remise_percent_ligne / 100));
$tot_avec_remise = $tot_avec_remise_ligne * ( 1 - ($remise_percent_global / 100)); $tot_avec_remise = $tot_avec_remise_ligne * (1 - ($remise_percent_global / 100));
// initialize result // initialize result
for ($i=0; $i <= 15; $i++) for ($i=0; $i <= 15; $i++)
@ -71,13 +69,13 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $localtax1
break; break;
} }
if ($apply_tax) { if ($apply_tax) {
$result[14] = price2num(($tot_sans_remise * ( 1 + ( $localtax1[0] / 100))) - $tot_sans_remise, 'MT'); $result[14] = price2num(($tot_sans_remise * (1 + ( $localtax1[0] / 100))) - $tot_sans_remise, 'MT');
$localtaxes[0] += $result[14]; $localtaxes[0] += $result[14];
$result[9] = price2num(($tot_avec_remise * ( 1 + ( $localtax1[0] / 100))) - $tot_avec_remise, 'MT'); $result[9] = price2num(($tot_avec_remise * (1 + ( $localtax1[0] / 100))) - $tot_avec_remise, 'MT');
$localtaxes[1] += $result[9]; $localtaxes[1] += $result[9];
$result[11] = price2num(($pu * ( 1 + ( $localtax1[0] / 100))) - $pu, 'MT'); $result[11] = price2num(($pu * (1 + ( $localtax1[0] / 100))) - $pu, 'MT');
$localtaxes[2] += $result[11]; $localtaxes[2] += $result[11];
} }
} }
@ -95,13 +93,13 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $localtax1
break; break;
} }
if ($apply_tax) { if ($apply_tax) {
$result[15] = price2num(($tot_sans_remise * ( 1 + ( $localtax2[0] / 100))) - $tot_sans_remise, 'MT'); $result[15] = price2num(($tot_sans_remise * (1 + ( $localtax2[0] / 100))) - $tot_sans_remise, 'MT');
$localtaxes[0] += $result[15]; $localtaxes[0] += $result[15];
$result[10] = price2num(($tot_avec_remise * ( 1 + ( $localtax2[0] / 100))) - $tot_avec_remise, 'MT'); $result[10] = price2num(($tot_avec_remise * (1 + ( $localtax2[0] / 100))) - $tot_avec_remise, 'MT');
$localtaxes[1] += $result[10]; $localtaxes[1] += $result[10];
$result[12] = price2num(($pu * ( 1 + ( $localtax2[0] / 100))) - $pu, 'MT'); $result[12] = price2num(($pu * (1 + ( $localtax2[0] / 100))) - $pu, 'MT');
$localtaxes[2] += $result[12]; $localtaxes[2] += $result[12];
} }
} }
@ -111,39 +109,39 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $localtax1
{ {
// We work to define prices using the price without tax // We work to define prices using the price without tax
$result[6] = price2num($tot_sans_remise, 'MT'); $result[6] = price2num($tot_sans_remise, 'MT');
$result[8] = price2num(($tot_sans_remise + $localtaxes[0]) * ( 1 + ( (($info_bits & 1)?0:$txtva) / 100)), 'MT'); // Selon TVA NPR ou non $result[8] = price2num(($tot_sans_remise + $localtaxes[0]) * (1 + ( (($info_bits & 1)?0:$txtva) / 100)), 'MT'); // Selon TVA NPR ou non
$result8bis= price2num(($tot_sans_remise + $localtaxes[0]) * ( 1 + ( $txtva / 100)), 'MT'); // Si TVA consideree normale (non NPR) $result8bis= price2num(($tot_sans_remise + $localtaxes[0]) * (1 + ( $txtva / 100)), 'MT'); // Si TVA consideree normale (non NPR)
$result[7] = $result8bis - ($result[6] + $localtaxes[0]); $result[7] = price2num($result8bis - ($result[6] + $localtaxes[0]), 'MT');
$result[0] = price2num($tot_avec_remise, 'MT'); $result[0] = price2num($tot_avec_remise, 'MT');
$result[2] = price2num(($tot_avec_remise + $localtaxes[1]) * ( 1 + ( (($info_bits & 1)?0:$txtva) / 100)), 'MT'); // Selon TVA NPR ou non $result[2] = price2num(($tot_avec_remise + $localtaxes[1]) * (1 + ( (($info_bits & 1)?0:$txtva) / 100)), 'MT'); // Selon TVA NPR ou non
$result2bis= price2num(($tot_avec_remise + $localtaxes[1]) * ( 1 + ( $txtva / 100)), 'MT'); // Si TVA consideree normale (non NPR) $result2bis= price2num(($tot_avec_remise + $localtaxes[1]) * (1 + ( $txtva / 100)), 'MT'); // Si TVA consideree normale (non NPR)
$result[1] = $result2bis - ($result[0] + $localtaxes[1]); // Total VAT = TTC - (HT + localtax) $result[1] = price2num($result2bis - ($result[0] + $localtaxes[1]), 'MT'); // Total VAT = TTC - (HT + localtax)
$result[3] = price2num($pu, 'MU'); $result[3] = price2num($pu, 'MU');
$result[5] = price2num(($pu + $localtaxes[2]) * ( 1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MU'); // Selon TVA NPR ou non $result[5] = price2num(($pu + $localtaxes[2]) * (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MU'); // Selon TVA NPR ou non
$result5bis= price2num(($pu + $localtaxes[2]) * ( 1 + ($txtva / 100)), 'MU'); // Si TVA consideree normale (non NPR) $result5bis= price2num(($pu + $localtaxes[2]) * (1 + ($txtva / 100)), 'MU'); // Si TVA consideree normale (non NPR)
$result[4] = $result5bis - ($result[3] + $localtaxes[2]); $result[4] = price2num($result5bis - ($result[3] + $localtaxes[2]), 'MU');
} }
else else
{ {
// We work to define prices using the price with tax // We work to define prices using the price with tax
$result[8] = price2num($tot_sans_remise + $localtaxes[0], 'MT'); $result[8] = price2num($tot_sans_remise + $localtaxes[0], 'MT');
$result[6] = price2num(($tot_sans_remise + $localtaxes[0]) / ( 1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MT'); // Selon TVA NPR ou non $result[6] = price2num(($tot_sans_remise + $localtaxes[0]) / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MT'); // Selon TVA NPR ou non
$result6bis= price2num(($tot_sans_remise + $localtaxes[0]) / ( 1 + ($txtva / 100)), 'MT'); // Si TVA consideree normale (non NPR) $result6bis= price2num(($tot_sans_remise + $localtaxes[0]) / (1 + ($txtva / 100)), 'MT'); // Si TVA consideree normale (non NPR)
$result[7] = $result[8] - ($result6bis + $localtaxes[0]); $result[7] = price2num($result[8] - ($result6bis + $localtaxes[0]), 'MT');
$result[2] = price2num($tot_avec_remise + $localtaxes[1], 'MT'); $result[2] = price2num($tot_avec_remise + $localtaxes[1], 'MT');
$result[0] = price2num(($tot_avec_remise + $localtaxes[1]) / ( 1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MT'); // Selon TVA NPR ou non $result[0] = price2num(($tot_avec_remise + $localtaxes[1]) / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MT'); // Selon TVA NPR ou non
$result0bis= price2num(($tot_avec_remise + $localtaxes[1]) / ( 1 + ($txtva / 100)), 'MT'); // Si TVA consideree normale (non NPR) $result0bis= price2num(($tot_avec_remise + $localtaxes[1]) / (1 + ($txtva / 100)), 'MT'); // Si TVA consideree normale (non NPR)
$result[1] = $result[2] - ($result0bis + $localtaxes[1]); // Total VAT = TTC - HT $result[1] = price2num($result[2] - ($result0bis + $localtaxes[1]), 'MT'); // Total VAT = TTC - HT
$result[5] = price2num(($pu + $localtaxes[2]) , 'MU'); $result[5] = price2num(($pu + $localtaxes[2]) , 'MU');
$result[3] = price2num(($pu + $localtaxes[2]) / ( 1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MU'); // Selon TVA NPR ou non $result[3] = price2num(($pu + $localtaxes[2]) / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MU'); // Selon TVA NPR ou non
$result3bis= price2num(($pu + $localtaxes[2]) / ( 1 + ($txtva / 100)), 'MU'); // Si TVA consideree normale (non NPR) $result3bis= price2num(($pu + $localtaxes[2]) / (1 + ($txtva / 100)), 'MU'); // Si TVA consideree normale (non NPR)
$result[4] = $result[5] - ($result3bis + $localtaxes[2]); $result[4] = price2num($result[5] - ($result3bis + $localtaxes[2]), 'MU');
} }
// if there's some localtax without vat // if there's some localtax without vat
@ -161,13 +159,13 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $localtax1
break; break;
} }
if ($apply_tax) { if ($apply_tax) {
$result[14] = price2num(($tot_sans_remise * ( 1 + ( $localtax1[0] / 100))) - $tot_sans_remise, 'MT'); $result[14] = price2num(($tot_sans_remise * (1 + ( $localtax1[0] / 100))) - $tot_sans_remise, 'MT');
$result[8] += $result[14]; $result[8] += $result[14];
$result[9] = price2num(($tot_avec_remise * ( 1 + ( $localtax1[0] / 100))) - $tot_avec_remise, 'MT'); $result[9] = price2num(($tot_avec_remise * (1 + ( $localtax1[0] / 100))) - $tot_avec_remise, 'MT');
$result[2] += $result[9]; $result[2] += $result[9];
$result[11] = price2num(($pu * ( 1 + ( $localtax1[0] / 100))) - $pu, 'MT'); $result[11] = price2num(($pu * (1 + ( $localtax1[0] / 100))) - $pu, 'MU');
$result[5] += $result[11]; $result[5] += $result[11];
} }
} }
@ -185,13 +183,13 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $localtax1
break; break;
} }
if ($apply_tax) { if ($apply_tax) {
$result[15] = price2num(($tot_sans_remise * ( 1 + ( $localtax2[0] / 100))) - $tot_sans_remise, 'MT'); $result[15] = price2num(($tot_sans_remise * (1 + ( $localtax2[0] / 100))) - $tot_sans_remise, 'MT');
$result[8] += $result[15]; $result[8] += $result[15];
$result[10] = price2num(($tot_avec_remise * ( 1 + ( $localtax2[0] / 100))) - $tot_avec_remise, 'MT'); $result[10] = price2num(($tot_avec_remise * (1 + ( $localtax2[0] / 100))) - $tot_avec_remise, 'MT');
$result[2] += $result[10]; $result[2] += $result[10];
$result[12] = price2num(($pu * ( 1 + ( $localtax2[0] / 100))) - $pu, 'MT'); $result[12] = price2num(($pu * (1 + ( $localtax2[0] / 100))) - $pu, 'MU');
$result[5] += $result[12]; $result[5] += $result[12];
} }
} }
@ -204,7 +202,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $localtax1
{ {
$result[0]=round($result[0]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT; $result[0]=round($result[0]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
$result[1]=round($result[1]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT; $result[1]=round($result[1]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
$result[2]=$result[0]+$result[1]; $result[2]=price2num($result[0]+$result[1], 'MT');
$result[9]=round($result[9]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT; $result[9]=round($result[9]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
$result[10]=round($result[10]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT; $result[10]=round($result[10]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
} }
@ -212,13 +210,13 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $localtax1
{ {
$result[1]=round($result[1]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT; $result[1]=round($result[1]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
$result[2]=round($result[2]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT; $result[2]=round($result[2]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
$result[0]=$result[2]-$result[0]; $result[0]=price2num($result[2]-$result[0], 'MT');
$result[9]=round($result[9]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT; $result[9]=round($result[9]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
$result[10]=round($result[10]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT; $result[10]=round($result[10]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
} }
} }
//print_r($result); //print "Price.lib::calcul_price_total ".$result[0]."-".$result[1]."-".$result[2];
return $result; return $result;
} }