From b8c99626fe44d936d326f22e201e5cbe4a79c8f9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 21 Jul 2008 14:15:07 +0000 Subject: [PATCH] Fix: Translation --- .../modules/commande/pdf_einstein.modules.php | 22 +------------------ .../modules/facture/pdf_crabe.modules.php | 22 +------------------ .../modules/facture/pdf_huitre.modules.php | 19 ---------------- .../modules/facture/pdf_oursin.modules.php | 21 +----------------- .../propale/pdf_propale_azur.modules.php | 22 +------------------ htdocs/langs/en_US/main.lang | 22 +++++++++---------- htdocs/langs/es_ES/main.lang | 4 +--- htdocs/langs/fr_BE/main.lang | 2 -- htdocs/langs/fr_FR/main.lang | 4 +--- htdocs/langs/pt_PT/main.lang | 5 ++++- 10 files changed, 20 insertions(+), 123 deletions(-) diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php index 76531600957..6f8b8db90f3 100644 --- a/htdocs/includes/modules/commande/pdf_einstein.modules.php +++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php @@ -593,27 +593,7 @@ class pdf_einstein extends ModelePDFCommandes $pdf->SetXY ($col2x, $tab2_top + 0); $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ht + $object->remise), 0, 'R', 1); - // Remise globale - if ($object->remise > 0) - { - $pdf->SetXY ($col1x, $tab2_top + $tab2_hl); - $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("GlobalDiscount"), 0, 'L', 1); - - $pdf->SetXY ($col2x, $tab2_top + $tab2_hl); - $pdf->MultiCell($largcol2, $tab2_hl, "-".$object->remise_percent."%", 0, 'R', 1); - - $pdf->SetXY ($col1x, $tab2_top + $tab2_hl * 2); - $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("WithDiscountTotalHT"), 0, 'L', 1); - - $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * 2); - $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ht), 0, 'R', 1); - - $index = 2; - } - else - { - $index = 0; - } + $index = 0; // Affichage des totaux de TVA par taux (conformément à réglementation) $pdf->SetFillColor(248,248,248); diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php index 79ff55ed725..7b2b3192d5b 100644 --- a/htdocs/includes/modules/facture/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php @@ -757,27 +757,7 @@ class pdf_crabe extends ModelePDFFactures $pdf->SetXY ($col2x, $tab2_top + 0); $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ht + $object->remise), 0, 'R', 1); - // Remise globale - if ($object->remise > 0) - { - $pdf->SetXY ($col1x, $tab2_top + $tab2_hl); - $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("GlobalDiscount"), 0, 'L', 1); - - $pdf->SetXY ($col2x, $tab2_top + $tab2_hl); - $pdf->MultiCell($largcol2, $tab2_hl, "-".$object->remise_percent."%", 0, 'R', 1); - - $pdf->SetXY ($col1x, $tab2_top + $tab2_hl * 2); - $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("WithDiscountTotalHT"), 0, 'L', 1); - - $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * 2); - $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ht), 0, 'R', 1); - - $index = 2; - } - else - { - $index = 0; - } + $index = 0; // Affichage des totaux de TVA par taux (conformement a la reglementation) $pdf->SetFillColor(248,248,248); diff --git a/htdocs/includes/modules/facture/pdf_huitre.modules.php b/htdocs/includes/modules/facture/pdf_huitre.modules.php index a3518ddaebe..4709f02e534 100644 --- a/htdocs/includes/modules/facture/pdf_huitre.modules.php +++ b/htdocs/includes/modules/facture/pdf_huitre.modules.php @@ -407,26 +407,7 @@ class pdf_huitre extends ModelePDFFactures $pdf->SetXY (174, $tab2_top + 0); $pdf->MultiCell(26, $tab2_hl, price($fac->total_ht + $fac->remise), 0, 'R', 0); - if ($fac->remise > 0) - { - $pdf->SetXY (132, $tab2_top + $tab2_hl); - $pdf->MultiCell(42, $tab2_hl, $langs->transnoentities("GlobalDiscount"), 0, 'R', 0); - - $pdf->SetXY (174, $tab2_top + $tab2_hl); - $pdf->MultiCell(26, $tab2_hl, price($fac->remise), 0, 'R', 0); - - $pdf->SetXY (132, $tab2_top + $tab2_hl * 2); - $pdf->MultiCell(42, $tab2_hl, $langs->transnoentities("WithDiscountTotalHT"), 0, 'R', 0); - - $pdf->SetXY (174, $tab2_top + $tab2_hl * 2); - $pdf->MultiCell(26, $tab2_hl, price($fac->total_ht), 0, 'R', 0); - - $index = 3; - } - else - { $index = 1; - } $pdf->SetXY (132, $tab2_top + $tab2_hl * $index); $pdf->MultiCell(42, $tab2_hl, $langs->transnoentities("TotalVAT"), 0, 'R', 0); diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php index c61c32d6410..7c721029977 100644 --- a/htdocs/includes/modules/facture/pdf_oursin.modules.php +++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php @@ -540,26 +540,7 @@ class pdf_oursin extends ModelePDFFactures $pdf->SetXY ($col2x, $tab2_top + 0); $pdf->MultiCell(26, $tab2_hl, price($fac->total_ht + $fac->remise), 0, 'R', 0); - if ($fac->remise > 0) - { - $pdf->SetXY ($col1x, $tab2_top + $tab2_hl); - $pdf->MultiCell($col2x-$col1x, $tab2_hl, $langs->transnoentities("GlobalDiscount"), 0, 'L', 0); - - $pdf->SetXY ($col2x, $tab2_top + $tab2_hl); - $pdf->MultiCell(26, $tab2_hl, "-".$fac->remise_percent."%", 0, 'R', 0); - - $pdf->SetXY ($col1x, $tab2_top + $tab2_hl * 2); - $pdf->MultiCell($col2x-$col1x, $tab2_hl, $langs->transnoentities("WithDiscountTotalHT"), 0, 'L', 0); - - $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * 2); - $pdf->MultiCell(26, $tab2_hl, price($fac->total_ht), 0, 'R', 0); - - $index = 3; - } - else - { - $index = 1; - } + $index = 1; $pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index); $pdf->MultiCell($col2x-$col1x, $tab2_hl, $langs->transnoentities("TotalVAT"), 0, 'L', 0); diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php index 94c09d2185d..1ea607e16f3 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php @@ -605,27 +605,7 @@ class pdf_propale_azur extends ModelePDFPropales $pdf->SetXY ($col2x, $tab2_top + 0); $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ht + $object->remise), 0, 'R', 1); - // Remise globale - if ($object->remise > 0) - { - $pdf->SetXY ($col1x, $tab2_top + $tab2_hl); - $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("GlobalDiscount"), 0, 'L', 1); - - $pdf->SetXY ($col2x, $tab2_top + $tab2_hl); - $pdf->MultiCell($largcol2, $tab2_hl, "-".$object->remise_percent."%", 0, 'R', 1); - - $pdf->SetXY ($col1x, $tab2_top + $tab2_hl * 2); - $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("WithDiscountTotalHT"), 0, 'L', 1); - - $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * 2); - $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ht), 0, 'R', 1); - - $index = 2; - } - else - { - $index = 0; - } + $index = 0; // Affichage des totaux de TVA par taux (conformément à réglementation) $pdf->SetFillColor(248,248,248); diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index a18c71e1d81..f10bbf6dde8 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -208,30 +208,28 @@ DefaultValue=Default value DefaultGlobalValue=Global value Price=Price UnitPrice=Unit price -UnitPriceHT=Unit price HT -UnitPriceTTC=Unit price TTC +UnitPriceHT=Unit price (excl. VAT) +UnitPriceTTC=Unit price (incl. VAT) PriceU=U.P. -PriceUHT=U.P. HT -PriceUTTC=U.P. TTC +PriceUHT=U.P. +PriceUTTC=U.P. (incl. VAT) Amount=Amount AmountInvoice=Invoice amount AmountPayment=Payment amount -AmountHT=Amount HT -AmountTTC=Amount TTC +AmountHT=Amount (excl. VAT) +AmountTTC=Amount (incl. VAT) AmountVAT=Amount VAT AmountTotal=Total amount AmountAverage=Average amount Percentage=Pourcentage Total=Total SubTotal=Subtotal -TotalHT=Total HT -TotalTTC=Total TTC +TotalHT=Total (excl. VAT) +TotalTTC=Total (incl. VAT) TotalVAT=Total VAT -TotalHTAfterDiscounts=Total HT with discounts -TotalTTCAfterDiscounts=Total TTC with discounts IncludedVAT=Included VAT -TTC=TTC -HT=HT +HT=(excl. VAT) +TTC=(incl. VAT) VAT=VAT Average=Average Sum=Sum diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang index 9c78bd7aeaa..c90f5b14483 100644 --- a/htdocs/langs/es_ES/main.lang +++ b/htdocs/langs/es_ES/main.lang @@ -227,11 +227,9 @@ SubTotal=Subtotal TotalHT=Importe TotalTTC=Totat TotalVAT=Total IVA -TotalHTAfterDiscounts=Importe con descuentos -TotalTTCAfterDiscounts=Total con descuentos IncludedVAT=IVA incluido -TTC=Total HT=Importe +TTC=Total VAT=IVA Average=Media Sum=Suma diff --git a/htdocs/langs/fr_BE/main.lang b/htdocs/langs/fr_BE/main.lang index c9e1334460f..da156fe3fc1 100644 --- a/htdocs/langs/fr_BE/main.lang +++ b/htdocs/langs/fr_BE/main.lang @@ -189,8 +189,6 @@ SubTotal=Sous-total TotalHT=Total HT TotalTTC=Total TTC TotalVAT=Total TVA -TotalHTAfterDiscounts=Total HT avec réductions -TotalTTCAfterDiscounts=Total TTC avec réductions IncludedVAT=TVA incluse VAT=TVA Average=Moyenne diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index da312d2263c..15a4344ffd8 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -228,11 +228,9 @@ SubTotal=Sous-total TotalHT=Total HT TotalTTC=Total TTC TotalVAT=Total TVA -TotalHTAfterDiscounts=Total HT après remise -TotalTTCAfterDiscounts=Total TTC après remise IncludedVAT=Dont TVA -TTC=TTC HT=HT +TTC=TTC VAT=TVA Average=Moyenne Sum=Somme diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang index 10096228b88..82d56ce7dac 100644 --- a/htdocs/langs/pt_PT/main.lang +++ b/htdocs/langs/pt_PT/main.lang @@ -117,10 +117,11 @@ Price=Pre UnitPrice=Preço unitário PriceU=U.P. PriceUHT=U.P. HT +PriceUTTC=U.P. TTC Amount=Quantidade AmountHT=Valor HT AmountTTC=Valor TTC -AmountVAT=Valor VAT +AmountVAT=Valor IVA AmountTotal=Valor total AmountAverage=Valor médio Total=Total @@ -128,6 +129,8 @@ SubTotal=Sub-total TotalHT=Total HT TotalTTC=Total TTC TotalVAT=Total IVA +HT=HT +TTC=TTC VAT=IVA Average=Média Sum=Soma