From 10527ed9bc80bcdc2a0ac143be97704df143a693 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Fri, 16 Jul 2010 15:13:52 +0000 Subject: [PATCH] Trad: Local Taxes --- htdocs/includes/modules/commande/pdf_quevedo.modules.php | 8 ++++---- htdocs/includes/modules/facture/pdf_lince.modules.php | 8 ++++---- .../includes/modules/propale/pdf_propale_roig.modules.php | 8 ++++---- htdocs/langs/ca_ES/main.lang | 2 ++ htdocs/langs/en_US/main.lang | 2 ++ htdocs/langs/es_AR/main.lang | 2 ++ htdocs/langs/es_ES/main.lang | 2 ++ htdocs/langs/fr_FR/main.lang | 2 ++ 8 files changed, 22 insertions(+), 12 deletions(-) diff --git a/htdocs/includes/modules/commande/pdf_quevedo.modules.php b/htdocs/includes/modules/commande/pdf_quevedo.modules.php index 59a5a528171..5b7971d1544 100755 --- a/htdocs/includes/modules/commande/pdf_quevedo.modules.php +++ b/htdocs/includes/modules/commande/pdf_quevedo.modules.php @@ -609,7 +609,7 @@ class pdf_quevedo extends ModelePDFCommandes { $index++; $pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index); - $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("Total RE"), $useborder, 'L', 1); + $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalLT1ES"), $useborder, 'L', 1); $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index); $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax1), $useborder, 'R', 1); } @@ -619,7 +619,7 @@ class pdf_quevedo extends ModelePDFCommandes { $index++; $pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index); - $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("Total IRPF"), $useborder, 'L', 1); + $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalLT2ES"), $useborder, 'L', 1); $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index); $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', 1); } @@ -642,7 +642,7 @@ class pdf_quevedo extends ModelePDFCommandes $tvakey=str_replace('*','',$tvakey); $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")"; } - $totalvat =$outputlangs->transnoentities("Total RE").' '; + $totalvat =$outputlangs->transnoentities("TotalLT1ES").' '; $totalvat.=vatrate($tvakey,1).$tvacompl; $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1); @@ -667,7 +667,7 @@ class pdf_quevedo extends ModelePDFCommandes $tvakey=str_replace('*','',$tvakey); $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")"; } - $totalvat =$outputlangs->transnoentities("Total IRPF").' '; + $totalvat =$outputlangs->transnoentities("TotalLT2ES").' '; $totalvat.=vatrate($tvakey,1).$tvacompl; $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1); diff --git a/htdocs/includes/modules/facture/pdf_lince.modules.php b/htdocs/includes/modules/facture/pdf_lince.modules.php index c47dac1fe89..4b127811bad 100755 --- a/htdocs/includes/modules/facture/pdf_lince.modules.php +++ b/htdocs/includes/modules/facture/pdf_lince.modules.php @@ -759,7 +759,7 @@ class pdf_lince extends ModelePDFFactures { $index++; $pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index); - $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("Total RE"), $useborder, 'L', 1); + $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalLT1ES"), $useborder, 'L', 1); $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index); $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax1), $useborder, 'R', 1); } @@ -769,7 +769,7 @@ class pdf_lince extends ModelePDFFactures { $index++; $pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index); - $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("Total IRPF"), $useborder, 'L', 1); + $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalLT2ES"), $useborder, 'L', 1); $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index); $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', 1); } @@ -792,7 +792,7 @@ class pdf_lince extends ModelePDFFactures $tvakey=str_replace('*','',$tvakey); $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")"; } - $totalvat =$outputlangs->transnoentities("Total RE").' '; + $totalvat =$outputlangs->transnoentities("TotalLT1ES").' '; $totalvat.=vatrate($tvakey,1).$tvacompl; $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1); @@ -817,7 +817,7 @@ class pdf_lince extends ModelePDFFactures $tvakey=str_replace('*','',$tvakey); $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")"; } - $totalvat =$outputlangs->transnoentities("Total IRPF").' '; + $totalvat =$outputlangs->transnoentities("TotalLT2ES").' '; $totalvat.=vatrate($tvakey,1).$tvacompl; $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1); diff --git a/htdocs/includes/modules/propale/pdf_propale_roig.modules.php b/htdocs/includes/modules/propale/pdf_propale_roig.modules.php index 4938d623fe7..224fbdbe66a 100755 --- a/htdocs/includes/modules/propale/pdf_propale_roig.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_roig.modules.php @@ -640,7 +640,7 @@ class pdf_propale_roig extends ModelePDFPropales { $index++; $pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index); - $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("Total RE"), $useborder, 'L', 1); + $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalLT1ES"), $useborder, 'L', 1); $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index); $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax1), $useborder, 'R', 1); } @@ -650,7 +650,7 @@ class pdf_propale_roig extends ModelePDFPropales { $index++; $pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index); - $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("Total IRPF"), $useborder, 'L', 1); + $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalLT2ES"), $useborder, 'L', 1); $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index); $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', 1); } @@ -673,7 +673,7 @@ class pdf_propale_roig extends ModelePDFPropales $tvakey=str_replace('*','',$tvakey); $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")"; } - $totalvat =$outputlangs->transnoentities("Total RE").' '; + $totalvat =$outputlangs->transnoentities("TotalLT1ES").' '; $totalvat.=vatrate($tvakey,1).$tvacompl; $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1); @@ -698,7 +698,7 @@ class pdf_propale_roig extends ModelePDFPropales $tvakey=str_replace('*','',$tvakey); $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")"; } - $totalvat =$outputlangs->transnoentities("Total IRPF").' '; + $totalvat =$outputlangs->transnoentities("TotalLT2ES").' '; $totalvat.=vatrate($tvakey,1).$tvacompl; $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1); diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang index 5729fe9bc23..244aa0abea8 100644 --- a/htdocs/langs/ca_ES/main.lang +++ b/htdocs/langs/ca_ES/main.lang @@ -282,6 +282,8 @@ TotalHT=Import TotalTTC=Total TotalTTCToYourCredit=Total a crèdit TotalVAT=Total IVA +TotalLT1ES=Total RE +TotalLT2ES=Total IRPF IncludedVAT=IVA inclòs HT=Sense IVA TTC=IVA inclòs diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index b7988174436..33a395c658e 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -284,6 +284,8 @@ TotalHT=Total (net of tax) TotalTTC=Total (inc. tax) TotalTTCToYourCredit=Total (inc. tax) to your credit TotalVAT=Total VAT +TotalLT1ES=Total RE +TotalLT2ES=Total IRPF IncludedVAT=Included VAT HT=Net of tax TTC=Inc. VAT diff --git a/htdocs/langs/es_AR/main.lang b/htdocs/langs/es_AR/main.lang index 881a9e72ece..eb83077fc61 100755 --- a/htdocs/langs/es_AR/main.lang +++ b/htdocs/langs/es_AR/main.lang @@ -284,6 +284,8 @@ TotalTTCToYourCredit=Total a crédito TotalVAT=Total IVA IncludedVAT=IVA incluido HT=Sin IVA +TotalLT1ES=Total RE +TotalLT2ES=Total IRPF TTC=IVA incluido VAT=IVA VATRate=Tasa IVA diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang index 27d6665c5c8..ccd6970a6ef 100644 --- a/htdocs/langs/es_ES/main.lang +++ b/htdocs/langs/es_ES/main.lang @@ -282,6 +282,8 @@ TotalHT=Importe TotalTTC=Total TotalTTCToYourCredit=Total a crédito TotalVAT=Total IVA +TotalLT1ES=Total RE +TotalLT2ES=Total IRPF IncludedVAT=IVA incluido HT=Sin IVA TTC=IVA incluido diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 20011cdbf7c..62dadffafe0 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -283,6 +283,8 @@ TotalHT=Total HT TotalTTC=Total TTC TotalTTCToYourCredit=Total TTC à votre crédit TotalVAT=Total TVA +TotalLT1ES=Total RE +TotalLT2ES=Total IRPF IncludedVAT=Dont TVA HT=HT TTC=TTC