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

Changement $langs->trans() en $langs->transnoentities() comme dans modle azur (sauf pour $this->error qui ne devrait pas)

Browse Source
This commit is contained in:
ywarnier 2007-01-21 21:21:41 +00:00
parent f32673cb49
commit f6b581bddd
4 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/includes/modules/propale/pdf_propale_bleu.modules.php
View File

@ -242,19 +242,19 @@ class pdf_propale_bleu extends ModelePDFPropales
$pdf->SetFont('Arial','',11);
$pdf->Text(30,$tab_top + 5,$langs->trans("Designation"));
$pdf->Text(30,$tab_top + 5,$langs->transnoentities("Designation"));
$pdf->line(132, $tab_top, 132, $tab_top + $tab_height);
$pdf->Text(134,$tab_top + 5,$langs->trans("VAT"));
$pdf->Text(134,$tab_top + 5,$langs->transnoentities("VAT"));
$pdf->line(144, $tab_top, 144, $tab_top + $tab_height);
$pdf->Text(147,$tab_top + 5,$langs->trans("Qty"));
$pdf->Text(147,$tab_top + 5,$langs->transnoentities("Qty"));
$pdf->line(156, $tab_top, 156, $tab_top + $tab_height);
$pdf->Text(160,$tab_top + 5,$langs->trans("PriceU"));
$pdf->Text(160,$tab_top + 5,$langs->transnoentities("PriceU"));
$pdf->line(174, $tab_top, 174, $tab_top + $tab_height);
$pdf->Text(187,$tab_top + 5,$langs->trans("Total"));
$pdf->Text(187,$tab_top + 5,$langs->transnoentities("Total"));
// $pdf->Rect(10, $tab_top, 190, $nexY - $tab_top);
$pdf->Rect(10, $tab_top, 190, $tab_height);
@ -262,7 +262,7 @@ class pdf_propale_bleu extends ModelePDFPropales
$pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10);
$titre = $langs->trans("AmountInCurrency",$langs->trans("Currency".$conf->monnaie));
$titre = $langs->transnoentities("AmountInCurrency",$langs->transnoentities("Currency".$conf->monnaie));
$pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre);
}
@ -287,7 +287,7 @@ class pdf_propale_bleu extends ModelePDFPropales
if (defined("FAC_PDF_TEL"))
{
$pdf->SetFont('Times','',10);
$pdf->MultiCell(76, 5, $langs->trans("Phone")." : ".FAC_PDF_TEL);
$pdf->MultiCell(76, 5, $langs->transnoentities("Phone")." : ".FAC_PDF_TEL);
}
if ($this->emetteur->profid1)
{

14
htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
View File

@ -242,32 +242,32 @@ class pdf_propale_jaune extends ModelePDFPropales
$pdf->SetFont('Arial','',11);
$pdf->SetXY(10,$tab_top);
$pdf->MultiCell(20,10,$langs->trans("Ref"),0,'C',1);
$pdf->MultiCell(20,10,$langs->transnoentities("Ref"),0,'C',1);
$pdf->SetXY(30,$tab_top);
$pdf->MultiCell(102,10,$langs->trans("Designation"),0,'L',1);
$pdf->MultiCell(102,10,$langs->transnoentities("Designation"),0,'L',1);
$pdf->line(132, $tab_top, 132, $tab_top + $tab_height);
$pdf->SetXY(132,$tab_top);
$pdf->MultiCell(12, 10,$langs->trans("VAT"),0,'C',1);
$pdf->MultiCell(12, 10,$langs->transnoentities("VAT"),0,'C',1);
$pdf->line(144, $tab_top, 144, $tab_top + $tab_height);
$pdf->SetXY(144,$tab_top);
$pdf->MultiCell(10,10,$langs->trans("Qty"),0,'C',1);
$pdf->MultiCell(10,10,$langs->transnoentities("Qty"),0,'C',1);
$pdf->line(154, $tab_top, 154, $tab_top + $tab_height);
$pdf->SetXY(154,$tab_top);
$pdf->MultiCell(22,10,$langs->trans("PriceU"),0,'R',1);
$pdf->MultiCell(22,10,$langs->transnoentities("PriceU"),0,'R',1);
$pdf->line(176, $tab_top, 176, $tab_top + $tab_height);
$pdf->SetXY(176,$tab_top);
$pdf->MultiCell(24,10,$langs->trans("Total"),0,'R',1);
$pdf->MultiCell(24,10,$langs->transnoentities("Total"),0,'R',1);
$pdf->Rect(10, $tab_top, 190, $tab_height);
$pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10);
$titre = $langs->trans("AmountInCurrency",$langs->trans("Currency".$conf->monnaie));
$titre = $langs->transnoentities("AmountInCurrency",$langs->transnoentities("Currency".$conf->monnaie));
$pdf->Text(10,280, $titre);
}

22
htdocs/includes/modules/propale/pdf_propale_rouge.modules.php
View File

@ -124,7 +124,7 @@ class pdf_propale_rouge extends ModelePDFPropales
$pdf->AddPage();
$pdf->SetTitle($propale->ref);
$pdf->SetSubject($langs->trans("CommercialProposal"));
$pdf->SetSubject($langs->transnoentities("CommercialProposal"));
$pdf->SetCreator("Dolibarr ".DOL_VERSION);
$pdf->SetAuthor($user->fullname);
@ -204,19 +204,19 @@ class pdf_propale_rouge extends ModelePDFPropales
$pdf->line(174, $tab2_top, 174, $tab2_top + $tab2_height);
$pdf->SetXY (132, $tab2_top + 0);
$pdf->MultiCell(42, $tab2_lh, $langs->trans("TotalHT"), 0, 'R', 0);
$pdf->MultiCell(42, $tab2_lh, $langs->transnoentities("TotalHT"), 0, 'R', 0);
$pdf->SetXY (132, $tab2_top + $tab2_lh);
$pdf->MultiCell(42, $tab2_lh, $langs->trans("Discount"), 0, 'R', 0);
$pdf->MultiCell(42, $tab2_lh, $langs->transnoentities("Discount"), 0, 'R', 0);
$pdf->SetXY (132, $tab2_top + $tab2_lh*2);
$pdf->MultiCell(42, $tab2_lh, "Total HT après remise", 0, 'R', 0);
$pdf->SetXY (132, $tab2_top + $tab2_lh*3);
$pdf->MultiCell(42, $tab2_lh, $langs->trans("TotalVAT"), 0, 'R', 0);
$pdf->MultiCell(42, $tab2_lh, $langs->transnoentities("TotalVAT"), 0, 'R', 0);
$pdf->SetXY (132, $tab2_top + ($tab2_lh*4));
$pdf->MultiCell(42, $tab2_lh, $langs->trans("TotalTTC"), 1, 'R', 1);
$pdf->MultiCell(42, $tab2_lh, $langs->transnoentities("TotalTTC"), 1, 'R', 1);
$pdf->SetXY (174, $tab2_top + 0);
$pdf->MultiCell(26, $tab2_lh, price($propale->total_ht + $propale->remise), 0, 'R', 0);
@ -262,19 +262,19 @@ class pdf_propale_rouge extends ModelePDFPropales
$pdf->SetFont('Arial','',11);
$pdf->Text(30,$tab_top + 5,$langs->trans("Designation"));
$pdf->Text(30,$tab_top + 5,$langs->transnoentities("Designation"));
$pdf->line(132, $tab_top, 132, $tab_top + $tab_height);
$pdf->Text(134,$tab_top + 5,$langs->trans("VAT"));
$pdf->Text(134,$tab_top + 5,$langs->transnoentities("VAT"));
$pdf->line(144, $tab_top, 144, $tab_top + $tab_height);
$pdf->Text(147,$tab_top + 5,$langs->trans("Qty"));
$pdf->Text(147,$tab_top + 5,$langs->transnoentities("Qty"));
$pdf->line(156, $tab_top, 156, $tab_top + $tab_height);
$pdf->Text(160,$tab_top + 5,$langs->trans("PriceU"));
$pdf->Text(160,$tab_top + 5,$langs->transnoentities("PriceU"));
$pdf->line(174, $tab_top, 174, $tab_top + $tab_height);
$pdf->Text(187,$tab_top + 5,$langs->trans("Total"));
$pdf->Text(187,$tab_top + 5,$langs->transnoentities("Total"));
// $pdf->Rect(10, $tab_top, 190, $nexY - $tab_top);
$pdf->Rect(10, $tab_top, 190, $tab_height);
@ -282,7 +282,7 @@ class pdf_propale_rouge extends ModelePDFPropales
$pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10);
$titre = $langs->trans("AmountInCurrency",$langs->trans("Currency".$conf->monnaie));
$titre = $langs->transnoentities("AmountInCurrency",$langs->transnoentities("Currency".$conf->monnaie));
$pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre);
}

24
htdocs/includes/modules/propale/pdf_propale_vert.modules.php
View File

@ -213,19 +213,19 @@ class pdf_propale_vert extends ModelePDFPropales
$pdf->line(174, $tab2_top, 174, $tab2_top + $tab2_height);
$pdf->SetXY (132, $tab2_top + 0);
$pdf->MultiCell(42, $tab2_lh, $langs->trans("TotalHT"), 0, 'R', 0);
$pdf->MultiCell(42, $tab2_lh, $langs->transnoentities("TotalHT"), 0, 'R', 0);
$pdf->SetXY (132, $tab2_top + $tab2_lh);
$pdf->MultiCell(42, $tab2_lh, $langs->trans("GlobalDiscount"), 0, 'R', 0);
$pdf->MultiCell(42, $tab2_lh, $langs->transnoentities("GlobalDiscount"), 0, 'R', 0);
$pdf->SetXY (132, $tab2_top + $tab2_lh*2);
$pdf->MultiCell(42, $tab2_lh, "Total HT après remise", 0, 'R', 0);
$pdf->SetXY (132, $tab2_top + $tab2_lh*3);
$pdf->MultiCell(42, $tab2_lh, $langs->trans("TotalVAT"), 0, 'R', 0);
$pdf->MultiCell(42, $tab2_lh, $langs->transnoentities("TotalVAT"), 0, 'R', 0);
$pdf->SetXY (132, $tab2_top + ($tab2_lh*4));
$pdf->MultiCell(42, $tab2_lh, $langs->trans("TotalTTC"), 1, 'R', 1);
$pdf->MultiCell(42, $tab2_lh, $langs->transnoentities("TotalTTC"), 1, 'R', 1);
$pdf->SetXY (174, $tab2_top + 0);
$pdf->MultiCell(26, $tab2_lh, price($propale->total_ht + $propale->remise), 0, 'R', 0);
@ -262,30 +262,30 @@ class pdf_propale_vert extends ModelePDFPropales
$pdf->SetFont('Arial','',10);
$pdf->SetXY(10, $yt);
$pdf->MultiCell(30,5,$langs->trans("Ref"),0,'L');
$pdf->MultiCell(30,5,$langs->transnoentities("Ref"),0,'L');
$pdf->SetXY(40, $yt);
$pdf->MultiCell(90,5,$langs->trans("Designation"),0,'L');
$pdf->MultiCell(90,5,$langs->transnoentities("Designation"),0,'L');
$pdf->SetXY(132, $yt);
$pdf->line(132, $tab_top, 132, $tab_top + $tab_height);
$pdf->MultiCell(10,5,$langs->trans("VAT"),0,'C');
$pdf->MultiCell(10,5,$langs->transnoentities("VAT"),0,'C');
$pdf->line(142, $tab_top, 142, $tab_top + $tab_height);
$pdf->SetXY(142, $yt);
$pdf->MultiCell(8,5,$langs->trans("Qty"),0,'C');
$pdf->MultiCell(8,5,$langs->transnoentities("Qty"),0,'C');
$pdf->line(150, $tab_top, 150, $tab_top + $tab_height);
$pdf->SetXY(150, $yt);
$pdf->MultiCell(16,5,$langs->trans("PriceU"),0,'C');
$pdf->MultiCell(16,5,$langs->transnoentities("PriceU"),0,'C');
$pdf->line(166, $tab_top, 166, $tab_top + $tab_height);
$pdf->SetXY(166, $yt);
$pdf->MultiCell(14,5,$langs->trans("ReductionShort"),0,'C');
$pdf->MultiCell(14,5,$langs->transnoentities("ReductionShort"),0,'C');
$pdf->line(180, $tab_top, 180, $tab_top + $tab_height);
$pdf->SetXY(180, $yt);
$pdf->MultiCell(20,5,$langs->trans("Total"),0,'R');
$pdf->MultiCell(20,5,$langs->transnoentities("Total"),0,'R');
// $pdf->Rect(10, $tab_top, 190, $nexY - $tab_top);
$pdf->Rect(10, $tab_top, 190, $tab_height);
@ -293,7 +293,7 @@ class pdf_propale_vert extends ModelePDFPropales
$pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10);
$titre = $langs->trans("AmountInCurrency",$langs->trans("Currency".$conf->monnaie));
$titre = $langs->transnoentities("AmountInCurrency",$langs->transnoentities("Currency".$conf->monnaie));
$pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre);
$pdf->SetXY(10, ($tab_top + $tab_height + 6));