From c6c4a83850b5b82a5c4b62a3f40a940133f6b126 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 Jun 2013 12:04:04 +0200
Subject: [PATCH] Fix: Removed deprecated code fo local tax type 7 since we can
use now the fiscal stamp that is a better implementation.
---
htdocs/core/class/commonobject.class.php | 12 ------
htdocs/core/lib/functions.lib.php | 4 +-
.../commande/doc/pdf_einstein.modules.php | 40 +++++--------------
.../modules/facture/doc/pdf_crabe.modules.php | 39 +++++-------------
.../modules/propale/doc/pdf_azur.modules.php | 39 +++++-------------
.../pdf/pdf_muscadet.modules.php | 7 +---
6 files changed, 34 insertions(+), 107 deletions(-)
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 7981c290183..2cbf113b362 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1527,12 +1527,6 @@ abstract class CommonObject
$obj->localtax1_tx = $localtax1_array[1];
}
//end TODO
-
- if ($obj->localtax1_type == '7')
- {
- $this->total_localtax1 += $obj->localtax1_tx;
- $this->total_ttc += $obj->localtax1_tx;
- }
}
if ($this->total_localtax2 == 0)
{
@@ -1546,12 +1540,6 @@ abstract class CommonObject
$obj->localtax2_tx = $localtax2_array[1];
}
//end TODO
-
- if ($obj->localtax2_type == '7')
- {
- $this->total_localtax2 += $obj->localtax2_tx;
- $this->total_ttc += $obj->localtax2_tx;
- }
}
}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 19839c68780..49a0fff506f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2838,8 +2838,8 @@ function get_localtax($tva, $local, $thirdparty_buyer="", $thirdparty_seller="")
if ($resql)
{
$obj = $db->fetch_object($resql);
- if ($local==1 && $obj->localtax1_type != '7') return $obj->localtax1;
- elseif ($local==2 && $obj->localtax2_type != '7') return $obj->localtax2;
+ if ($local==1) return $obj->localtax1;
+ elseif ($local==2) return $obj->localtax2;
}
return 0;
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 67da7cc8540..5593f87e361 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -381,12 +381,9 @@ class pdf_einstein extends ModelePDFCommandes
//end TODO
// retrieve global local tax
- if ($localtax1_type == '7') $localtax1_rate = $localtaxtmp_array[1];
- if ($localtax2_type == '7') $localtax2_rate = $localtaxtmp_array[3];
-
- if ($localtax1_type && ($localtax1ligne != 0 || $localtax1_type == '7'))
+ if ($localtax1_type && $localtax1ligne != 0)
$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
- if ($localtax2_type && ($localtax2ligne != 0 || $localtax2_type == '7'))
+ if ($localtax2_type && $localtax2ligne != 0)
$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
@@ -826,19 +823,10 @@ class pdf_einstein extends ModelePDFCommandes
$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
}
$totalvat = $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code).' ';
- if ($localtax_type == '7') { // amount on order
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($tvakey), 0, 'R', 1);
- }
- else
- {
- $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
- }
+ $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
}
}
}
@@ -867,19 +855,11 @@ class pdf_einstein extends ModelePDFCommandes
}
$totalvat = $outputlangs->transcountrynoentities("TotalLT2",$mysoc->country_code).' ';
- if ($localtax_type == '7') { // amount on order
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($tvakey), 0, 'R', 1);
- }
- else
- {
- $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+ $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
- }
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
}
}
}
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 9ee7f701217..4e63d6b60a9 100755
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -383,12 +383,9 @@ class pdf_crabe extends ModelePDFFactures
//end TODO
// retrieve global local tax
- if ($localtax1_type == '7') $localtax1_rate = $localtaxtmp_array[1];
- if ($localtax2_type == '7') $localtax2_rate = $localtaxtmp_array[3];
-
- if ($localtax1_type && ($localtax1ligne != 0 || $localtax1_type == '7'))
+ if ($localtax1_type && $localtax1ligne != 0)
$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
- if ($localtax2_type && ($localtax2ligne != 0 || $localtax2_type == '7'))
+ if ($localtax2_type && $localtax2ligne != 0)
$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
@@ -962,19 +959,11 @@ class pdf_crabe extends ModelePDFFactures
$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
}
$totalvat = $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code).' ';
- if ($localtax_type == '7') { // amount on order
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+ $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($tvakey), 0, 'R', 1);
- }
- else
- {
- $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
- }
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
}
}
}
@@ -1004,19 +993,11 @@ class pdf_crabe extends ModelePDFFactures
}
$totalvat = $outputlangs->transcountrynoentities("TotalLT2",$mysoc->country_code).' ';
- if ($localtax_type == '7') { // amount on order
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($tvakey), 0, 'R', 1);
- }
- else
- {
- $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+ $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
- }
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
}
}
//}
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 6018456fce7..3170f4a10b1 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -379,12 +379,9 @@ class pdf_azur extends ModelePDFPropales
//end TODO
// retrieve global local tax
- if ($localtax1_type == '7') $localtax1_rate = $localtaxtmp_array[1];
- if ($localtax2_type == '7') $localtax2_rate = $localtaxtmp_array[3];
-
- if ($localtax1_type && ($localtax1ligne != 0 || $localtax1_type == '7'))
+ if ($localtax1_type && $localtax1ligne != 0)
$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
- if ($localtax2_type && ($localtax2ligne != 0 || $localtax2_type == '7'))
+ if ($localtax2_type && $localtax2ligne != 0)
$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
@@ -857,19 +854,11 @@ class pdf_azur extends ModelePDFPropales
$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
}
$totalvat = $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code).' ';
- if ($localtax_type == '7') { // amount on order
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($tvakey), 0, 'R', 1);
- }
- else
- {
- $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
- }
+ $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
}
}
}
@@ -898,19 +887,11 @@ class pdf_azur extends ModelePDFPropales
}
$totalvat = $outputlangs->transcountrynoentities("TotalLT2",$mysoc->country_code).' ';
- if ($localtax_type == '7') { // amount on order
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($tvakey), 0, 'R', 1);
- }
- else
- {
- $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+ $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
- }
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
}
}
}
diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
index 013834fcb55..6c0e5ff2e3b 100644
--- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -381,12 +381,9 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
//end TODO
// retrieve global local tax
- if ($localtax1_type == '7') $localtax1_rate = $localtaxtmp_array[1];
- if ($localtax2_type == '7') $localtax2_rate = $localtaxtmp_array[3];
-
- if ($localtax1_type && ($localtax1ligne != 0 || $localtax1_type == '7'))
+ if ($localtax1_type && $localtax1ligne != 0)
$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
- if ($localtax2_type && ($localtax2ligne != 0 || $localtax2_type == '7'))
+ if ($localtax2_type && $localtax2ligne != 0)
$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
--
GitLab