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

Fix: Translation

Browse Source
This commit is contained in:
Laurent Destailleur 2008-07-21 14:15:07 +00:00
parent 3aec0809e9
commit b8c99626fe
10 changed files with 20 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/includes/modules/commande/pdf_einstein.modules.php
View File

@ -593,27 +593,7 @@ class pdf_einstein extends ModelePDFCommandes
$pdf->SetXY ($col2x, $tab2_top + 0); $pdf->SetXY ($col2x, $tab2_top + 0);
$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ht + $object->remise), 0, 'R', 1); $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) // Affichage des totaux de TVA par taux (conformément à réglementation)
$pdf->SetFillColor(248,248,248); $pdf->SetFillColor(248,248,248);

20
htdocs/includes/modules/facture/pdf_crabe.modules.php
View File

@ -757,27 +757,7 @@ class pdf_crabe extends ModelePDFFactures
$pdf->SetXY ($col2x, $tab2_top + 0); $pdf->SetXY ($col2x, $tab2_top + 0);
$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ht + $object->remise), 0, 'R', 1); $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) // Affichage des totaux de TVA par taux (conformement a la reglementation)
$pdf->SetFillColor(248,248,248); $pdf->SetFillColor(248,248,248);

19
htdocs/includes/modules/facture/pdf_huitre.modules.php
View File

@ -407,26 +407,7 @@ class pdf_huitre extends ModelePDFFactures
$pdf->SetXY (174, $tab2_top + 0); $pdf->SetXY (174, $tab2_top + 0);
$pdf->MultiCell(26, $tab2_hl, price($fac->total_ht + $fac->remise), 0, 'R', 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; $index = 1;
}
$pdf->SetXY (132, $tab2_top + $tab2_hl * $index); $pdf->SetXY (132, $tab2_top + $tab2_hl * $index);
$pdf->MultiCell(42, $tab2_hl, $langs->transnoentities("TotalVAT"), 0, 'R', 0); $pdf->MultiCell(42, $tab2_hl, $langs->transnoentities("TotalVAT"), 0, 'R', 0);

19
htdocs/includes/modules/facture/pdf_oursin.modules.php
View File

@ -540,26 +540,7 @@ class pdf_oursin extends ModelePDFFactures
$pdf->SetXY ($col2x, $tab2_top + 0); $pdf->SetXY ($col2x, $tab2_top + 0);
$pdf->MultiCell(26, $tab2_hl, price($fac->total_ht + $fac->remise), 0, 'R', 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->SetXY ($col1x, $tab2_top + $tab2_hl * $index);
$pdf->MultiCell($col2x-$col1x, $tab2_hl, $langs->transnoentities("TotalVAT"), 0, 'L', 0); $pdf->MultiCell($col2x-$col1x, $tab2_hl, $langs->transnoentities("TotalVAT"), 0, 'L', 0);

20
htdocs/includes/modules/propale/pdf_propale_azur.modules.php
View File

@ -605,27 +605,7 @@ class pdf_propale_azur extends ModelePDFPropales
$pdf->SetXY ($col2x, $tab2_top + 0); $pdf->SetXY ($col2x, $tab2_top + 0);
$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ht + $object->remise), 0, 'R', 1); $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) // Affichage des totaux de TVA par taux (conformément à réglementation)
$pdf->SetFillColor(248,248,248); $pdf->SetFillColor(248,248,248);

22
htdocs/langs/en_US/main.lang
View File

@ -208,30 +208,28 @@ DefaultValue=Default value
DefaultGlobalValue=Global value DefaultGlobalValue=Global value
Price=Price Price=Price
UnitPrice=Unit price UnitPrice=Unit price
UnitPriceHT=Unit price HT UnitPriceHT=Unit price (excl. VAT)
UnitPriceTTC=Unit price TTC UnitPriceTTC=Unit price (incl. VAT)
PriceU=U.P. PriceU=U.P.
PriceUHT=U.P. HT PriceUHT=U.P.
PriceUTTC=U.P. TTC PriceUTTC=U.P. (incl. VAT)
Amount=Amount Amount=Amount
AmountInvoice=Invoice amount AmountInvoice=Invoice amount
AmountPayment=Payment amount AmountPayment=Payment amount
AmountHT=Amount HT AmountHT=Amount (excl. VAT)
AmountTTC=Amount TTC AmountTTC=Amount (incl. VAT)
AmountVAT=Amount VAT AmountVAT=Amount VAT
AmountTotal=Total amount AmountTotal=Total amount
AmountAverage=Average amount AmountAverage=Average amount
Percentage=Pourcentage Percentage=Pourcentage
Total=Total Total=Total
SubTotal=Subtotal SubTotal=Subtotal
TotalHT=Total HT TotalHT=Total (excl. VAT)
TotalTTC=Total TTC TotalTTC=Total (incl. VAT)
TotalVAT=Total VAT TotalVAT=Total VAT
TotalHTAfterDiscounts=Total HT with discounts
TotalTTCAfterDiscounts=Total TTC with discounts
IncludedVAT=Included VAT IncludedVAT=Included VAT
TTC=TTC HT=(excl. VAT)
HT=HT TTC=(incl. VAT)
VAT=VAT VAT=VAT
Average=Average Average=Average
Sum=Sum Sum=Sum

4
htdocs/langs/es_ES/main.lang
View File

@ -227,11 +227,9 @@ SubTotal=Subtotal
TotalHT=Importe TotalHT=Importe
TotalTTC=Totat TotalTTC=Totat
TotalVAT=Total IVA TotalVAT=Total IVA
TotalHTAfterDiscounts=Importe con descuentos
TotalTTCAfterDiscounts=Total con descuentos
IncludedVAT=IVA incluido IncludedVAT=IVA incluido
TTC=Total
HT=Importe HT=Importe
TTC=Total
VAT=IVA VAT=IVA
Average=Media Average=Media
Sum=Suma Sum=Suma

2
htdocs/langs/fr_BE/main.lang
View File

@ -189,8 +189,6 @@ SubTotal=Sous-total
TotalHT=Total HT TotalHT=Total HT
TotalTTC=Total TTC TotalTTC=Total TTC
TotalVAT=Total TVA TotalVAT=Total TVA
TotalHTAfterDiscounts=Total HT avec réductions
TotalTTCAfterDiscounts=Total TTC avec réductions
IncludedVAT=TVA incluse IncludedVAT=TVA incluse
VAT=TVA VAT=TVA
Average=Moyenne Average=Moyenne

4
htdocs/langs/fr_FR/main.lang
View File

@ -228,11 +228,9 @@ SubTotal=Sous-total
TotalHT=Total HT TotalHT=Total HT
TotalTTC=Total TTC TotalTTC=Total TTC
TotalVAT=Total TVA TotalVAT=Total TVA
TotalHTAfterDiscounts=Total HT après remise
TotalTTCAfterDiscounts=Total TTC après remise
IncludedVAT=Dont TVA IncludedVAT=Dont TVA
TTC=TTC
HT=HT HT=HT
TTC=TTC
VAT=TVA VAT=TVA
Average=Moyenne Average=Moyenne
Sum=Somme Sum=Somme

5
htdocs/langs/pt_PT/main.lang
View File

@ -117,10 +117,11 @@ Price=Pre
UnitPrice=Preço unitário UnitPrice=Preço unitário
PriceU=U.P. PriceU=U.P.
PriceUHT=U.P. HT PriceUHT=U.P. HT
PriceUTTC=U.P. TTC
Amount=Quantidade Amount=Quantidade
AmountHT=Valor HT AmountHT=Valor HT
AmountTTC=Valor TTC AmountTTC=Valor TTC
AmountVAT=Valor VAT AmountVAT=Valor IVA
AmountTotal=Valor total AmountTotal=Valor total
AmountAverage=Valor médio AmountAverage=Valor médio
Total=Total Total=Total
@ -128,6 +129,8 @@ SubTotal=Sub-total
TotalHT=Total HT TotalHT=Total HT
TotalTTC=Total TTC TotalTTC=Total TTC
TotalVAT=Total IVA TotalVAT=Total IVA
HT=HT
TTC=TTC
VAT=IVA VAT=IVA
Average=Média Average=Média
Sum=Soma Sum=Soma