diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index b24a1600f43..cd469c7bea9 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -405,7 +405,7 @@ if ($_GET["propalid"]) print ''; print ""; print ''; - print ''; + print ''; print ""; print "\n"; diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index b3ee6b21129..683d6b1db23 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -553,7 +553,7 @@ else print ''; print ''; print ''; - print ''; + print ''; print ''; print "\n"; } @@ -657,7 +657,7 @@ else print ''; print ''; print ''; - print ''; + print ''; print ''."\n"; print ''; print "".''; diff --git a/htdocs/compta/commande.php b/htdocs/compta/commande.php index c436953e68d..2df2b6f607b 100644 --- a/htdocs/compta/commande.php +++ b/htdocs/compta/commande.php @@ -161,7 +161,7 @@ if ($_GET["id"] > 0) print ''; print ''; print ''; - print ''; + print ''; print ''; print "\n"; } diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 2aeccd8c4f3..211ce79811c 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1029,7 +1029,7 @@ else print ""; print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -1144,7 +1144,7 @@ else print ""; print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index c166deb0985..1dd26f9d1f6 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -157,7 +157,7 @@ if ($_GET["action"] == 'create') print ''; print ''; print ''; - print ''; + print ''; print ''; print "\n"; } diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index 85d262e3d01..fc66fcce025 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -360,7 +360,7 @@ if ($id > 0) print ''; print ''; print ''; - print ''; + print ''; print ''; print "\n"; } @@ -469,7 +469,7 @@ if ($id > 0) print ''; print ''; print ''; - print ''; + print ''; print ''."\n"; /* diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 4744028a3e8..f7ccee5f9bf 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -256,7 +256,7 @@ if ($_GET["action"] == 'create' or $_GET["action"] == 'copy') print "
'.$langs->trans("Ref").''.$langs->trans("ProductOrService").''.$langs->trans("VAT").''.$langs->trans("Qty").''.$langs->trans("Discount").'P.U.'.$langs->trans("VAT").''.$langs->trans("Qty").''.$langs->trans("Discount").''.$langs->trans("PriceU").' 
'.$langs->trans("VAT").''.$langs->trans("Qty").''.$langs->trans("Discount").'P.U.'.$langs->trans("PriceU").'  
'.$langs->trans("VAT").''.$langs->trans("Qty").''.$langs->trans("Discount").'P.U.'.$langs->trans("PriceU").'  
'.$langs->trans("VAT").''.$langs->trans("Qty").''.$langs->trans("Discount").'P.U.'.$langs->trans("PriceU").'  
'.$langs->trans("Description").''.$langs->trans("VAT").'P.U. HT'.$langs->trans("PriceUHT").''.$langs->trans("Quantity").''.$langs->trans("Discount").''.$langs->trans("AmountHT").'
'.$langs->trans("Description").''.$langs->trans("VAT").'P.U. HT'.$langs->trans("PriceUHT").''.$langs->trans("Quantity").''.$langs->trans("Dscount").' '.$langs->trans("VAT").''.$langs->trans("Qty").''.$langs->trans("Discount").'P.U.'.$langs->trans("PriceU").'N.P.
'.$langs->trans("VAT").''.$langs->trans("Qty").''.$langs->trans("Discount").'P.U.'.$langs->trans("PriceU").'  
'.$langs->trans("VAT").''.$langs->trans("Qty").''.$langs->trans("Discount").'P.U.'.$langs->trans("PriceU").'  

"; print ''; - print ''; + print ''; for ($i = 1 ; $i < 9 ; $i++) { @@ -354,7 +354,7 @@ else print "id&action=add_ligne\" method=\"post\">"; print '
 '.$langs->trans("Label").'P.U. HT'.$langs->trans("Qty").''.$langs->trans("VATRate").'
 '.$langs->trans("Label").''.$langs->trans("PriceUHT").''.$langs->trans("Qty").''.$langs->trans("VATRate").'
'; print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -522,7 +522,7 @@ else */ print '

'.$langs->trans("Label").'P.U. HT'.$langs->trans("PriceUHT").''.$langs->trans("Qty").''.$langs->trans("TotalHT").''.$langs->trans("VATRate").'
'; print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/includes/modules/facture/pdf_adytek.modules.php b/htdocs/includes/modules/facture/pdf_adytek.modules.php index 6c2ae0b8fc6..8037b26e648 100644 --- a/htdocs/includes/modules/facture/pdf_adytek.modules.php +++ b/htdocs/includes/modules/facture/pdf_adytek.modules.php @@ -375,21 +375,25 @@ class pdf_adytek extends ModelePDFFactures { */ function _tableau(&$pdf, $tab_top, $tab_height, $nexY) { + global $langs; + $langs->load("main"); + $langs->load("bills"); + $pdf->SetFont('Arial','',10); - $pdf->Text(11,$tab_top + 5,'Désignation'); + $pdf->Text(11,$tab_top + 5,$langs->trans("Designation")); $pdf->line(132, $tab_top, 132, $tab_top + $tab_height); - $pdf->Text(134,$tab_top + 5,'TVA'); + $pdf->Text(134,$tab_top + 5,$langs->trans("VAT")); $pdf->line(144, $tab_top, 144, $tab_top + $tab_height); - $pdf->Text(147,$tab_top + 5,'Qté'); + $pdf->Text(147,$tab_top + 5,$langs->trans("Qty")); $pdf->line(156, $tab_top, 156, $tab_top + $tab_height); - $pdf->Text(160,$tab_top + 5,'P.U.'); + $pdf->Text(160,$tab_top + 5,$langs->trans("PriceU")); $pdf->line(174, $tab_top, 174, $tab_top + $tab_height); - $pdf->Text(187,$tab_top + 5,'Total'); + $pdf->Text(187,$tab_top + 5,$langs->trans("Total")); $pdf->Rect(10, $tab_top, 190, $tab_height); $pdf->line(10, $tab_top + 10, 200, $tab_top + 10 ); diff --git a/htdocs/includes/modules/facture/pdf_bernique.modules.php b/htdocs/includes/modules/facture/pdf_bernique.modules.php index 5ad7f79b069..794dcd8b07e 100644 --- a/htdocs/includes/modules/facture/pdf_bernique.modules.php +++ b/htdocs/includes/modules/facture/pdf_bernique.modules.php @@ -293,21 +293,25 @@ class pdf_bernique extends ModelePDFFactures { */ function _tableau(&$pdf, $tab_top, $tab_height, $nexY) { + global $langs; + $langs->load("main"); + $langs->load("bills"); + $pdf->SetFont('Arial','',10); - $pdf->Text(11,$tab_top + 5,'Désignation'); + $pdf->Text(11,$tab_top + 5,$langs->trans("Designation")); $pdf->line(132, $tab_top, 132, $tab_top + $tab_height); - $pdf->Text(134,$tab_top + 5,'TVA'); + $pdf->Text(134,$tab_top + 5,$langs->trans("VAT")); $pdf->line(144, $tab_top, 144, $tab_top + $tab_height); - $pdf->Text(147,$tab_top + 5,'Qté'); + $pdf->Text(147,$tab_top + 5,$langs->trans("Qty")); $pdf->line(156, $tab_top, 156, $tab_top + $tab_height); - $pdf->Text(160,$tab_top + 5,'P.U.'); + $pdf->Text(160,$tab_top + 5,$langs->trans("PriceU")); $pdf->line(174, $tab_top, 174, $tab_top + $tab_height); - $pdf->Text(187,$tab_top + 5,'Total'); + $pdf->Text(187,$tab_top + 5,$langs->trans("Total")); $pdf->Rect(10, $tab_top, 190, $tab_height); $pdf->line(10, $tab_top + 10, 200, $tab_top + 10 ); diff --git a/htdocs/includes/modules/facture/pdf_bigorneau.modules.php b/htdocs/includes/modules/facture/pdf_bigorneau.modules.php index ba19563a2e0..dfd054f7603 100644 --- a/htdocs/includes/modules/facture/pdf_bigorneau.modules.php +++ b/htdocs/includes/modules/facture/pdf_bigorneau.modules.php @@ -237,21 +237,25 @@ class pdf_bigorneau extends ModelePDFFactures { */ function _tableau(&$pdf, $tab_top, $tab_height, $nexY) { + global $langs; + $langs->load("main"); + $langs->load("bills"); + $pdf->SetFont('Arial','',12); - $pdf->Text(11,$tab_top + 5,'Désignation'); + $pdf->Text(11,$tab_top + 5,$langs->trans("Designation")); $pdf->line(132, $tab_top, 132, $tab_top + $tab_height); - $pdf->Text(134,$tab_top + 5,'TVA'); + $pdf->Text(134,$tab_top + 5,$langs->trans("VAT")); $pdf->line(144, $tab_top, 144, $tab_top + $tab_height); - $pdf->Text(147,$tab_top + 5,'Qté'); + $pdf->Text(147,$tab_top + 5,$langs->trans("Qty")); $pdf->line(156, $tab_top, 156, $tab_top + $tab_height); - $pdf->Text(160,$tab_top + 5,'P.U.'); + $pdf->Text(160,$tab_top + 5,$langs->trans("PriceU")); $pdf->line(174, $tab_top, 174, $tab_top + $tab_height); - $pdf->Text(187,$tab_top + 5,'Total'); + $pdf->Text(187,$tab_top + 5,$langs->trans("Total")); $pdf->Rect(10, $tab_top, 190, $tab_height); $pdf->line(10, $tab_top + 10, 200, $tab_top + 10 ); diff --git a/htdocs/includes/modules/facture/pdf_bulot.modules.php b/htdocs/includes/modules/facture/pdf_bulot.modules.php index 2b8bd25a0c4..ad31e60196e 100644 --- a/htdocs/includes/modules/facture/pdf_bulot.modules.php +++ b/htdocs/includes/modules/facture/pdf_bulot.modules.php @@ -306,21 +306,25 @@ class pdf_bulot extends ModelePDFFactures { */ function _tableau(&$pdf, $tab_top, $tab_height, $nexY) { + global $langs; + $langs->load("main"); + $langs->load("bills"); + $pdf->SetFont('Arial','',10); - $pdf->Text(11,$tab_top + 5,'Désignation'); + $pdf->Text(11,$tab_top + 5,$langs->trans("Designation")); $pdf->line(132, $tab_top, 132, $tab_top + $tab_height); - $pdf->Text(134,$tab_top + 5,'TVA'); + $pdf->Text(134,$tab_top + 5,$langs->trans("VAT")); $pdf->line(144, $tab_top, 144, $tab_top + $tab_height); - $pdf->Text(147,$tab_top + 5,'Qté'); + $pdf->Text(147,$tab_top + 5,$langs->trans("Qty")); $pdf->line(156, $tab_top, 156, $tab_top + $tab_height); - $pdf->Text(160,$tab_top + 5,'P.U.'); + $pdf->Text(160,$tab_top + 5,$langs->trans("PriceU")); $pdf->line(174, $tab_top, 174, $tab_top + $tab_height); - $pdf->Text(187,$tab_top + 5,'Total'); + $pdf->Text(187,$tab_top + 5,$langs->trans("Total")); $pdf->Rect(10, $tab_top, 190, $tab_height); $pdf->line(10, $tab_top + 10, 200, $tab_top + 10 ); diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php index 5833c4a6c1e..7d560969d67 100644 --- a/htdocs/includes/modules/facture/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php @@ -514,13 +514,13 @@ class pdf_crabe extends ModelePDFFactures $pdf->SetFont('Arial','',10); - $pdf->Text(12,$tab_top + 5, $langs->trans("Label")); + $pdf->Text(12,$tab_top + 5, $langs->trans("Designation")); $pdf->line(120, $tab_top, 120, $tab_top + $tab_height); $pdf->Text(122, $tab_top + 5, $langs->trans("VAT")); $pdf->line(132, $tab_top, 132, $tab_top + $tab_height); - $pdf->Text(135, $tab_top + 5,'P.U. HT'); + $pdf->Text(135, $tab_top + 5,$langs->trans("PriceUHT")); $pdf->line(150, $tab_top, 150, $tab_top + $tab_height); $pdf->Text(153, $tab_top + 5, $langs->trans("Qty")); diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php index 7609f5cbd39..093ad61470e 100644 --- a/htdocs/includes/modules/facture/pdf_oursin.modules.php +++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php @@ -510,19 +510,19 @@ class pdf_oursin extends ModelePDFFactures */ function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $fac) { - global $langs; - $langs->load("main"); - $langs->load("bills"); + global $langs; + $langs->load("main"); + $langs->load("bills"); $pdf->line( $this->marges['g'], $tab_top+8, 210-$this->marges['d'], $tab_top+8 ); $pdf->line( $this->marges['g'], $tab_top + $tab_height, 210-$this->marges['d'], $tab_top + $tab_height ); $pdf->SetFont('Arial','B',10); - $pdf->Text($this->marges['g']+2,$tab_top + 5, $langs->trans("Label")); + $pdf->Text($this->marges['g']+2,$tab_top + 5, $langs->trans("Designation")); if ($this->franchise!=1) $pdf->Text($this->marges['g']+120, $tab_top + 5, $langs->trans("VAT")); - $pdf->Text($this->marges['g']+135, $tab_top + 5,'P.U. HT'); - $pdf->Text($this->marges['g']+153, $tab_top + 5, $langs->trans("Qté")); + $pdf->Text($this->marges['g']+135, $tab_top + 5,$langs->trans("PriceUHT")); + $pdf->Text($this->marges['g']+153, $tab_top + 5, $langs->trans("Qty")); $nblignes = sizeof($fac->lignes); $rem=0; diff --git a/htdocs/includes/modules/facture/pdf_tourteau.modules.php b/htdocs/includes/modules/facture/pdf_tourteau.modules.php index 616ac64cb37..13abc26f238 100644 --- a/htdocs/includes/modules/facture/pdf_tourteau.modules.php +++ b/htdocs/includes/modules/facture/pdf_tourteau.modules.php @@ -289,21 +289,25 @@ class pdf_tourteau extends ModelePDFFactures { */ function _tableau(&$pdf, $tab_top, $tab_height, $nexY) { + global $langs; + $langs->load("main"); + $langs->load("bills"); + $pdf->SetFont('Arial','',12); - $pdf->Text(11,$tab_top + 5,'Désignation'); + $pdf->Text(11,$tab_top + 5,$langs->trans("Designation")); $pdf->line(132, $tab_top, 132, $tab_top + $tab_height); - $pdf->Text(134,$tab_top + 5,'TVA'); + $pdf->Text(134,$tab_top + 5,$langs->trans("VAT")); $pdf->line(144, $tab_top, 144, $tab_top + $tab_height); - $pdf->Text(147,$tab_top + 5,'Qté'); + $pdf->Text(147,$tab_top + 5,$langs->trans("Qty")); $pdf->line(156, $tab_top, 156, $tab_top + $tab_height); - $pdf->Text(160,$tab_top + 5,'P.U.'); + $pdf->Text(160,$tab_top + 5,$langs->trans("PriceU")); $pdf->line(174, $tab_top, 174, $tab_top + $tab_height); - $pdf->Text(187,$tab_top + 5,'Total'); + $pdf->Text(187,$tab_top + 5,$langs->trans("Total")); $pdf->Rect(10, $tab_top, 190, $tab_height); $pdf->line(10, $tab_top + 10, 200, $tab_top + 10 ); diff --git a/htdocs/includes/modules/propale/pdf_propale_adytek.modules.php b/htdocs/includes/modules/propale/pdf_propale_adytek.modules.php index e0b99c92e2a..fe5e22ac651 100644 --- a/htdocs/includes/modules/propale/pdf_propale_adytek.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_adytek.modules.php @@ -229,30 +229,33 @@ class pdf_propale_adytek extends ModelePDFPropales function _tableau(&$pdf, $tab_top, $tab_height, $nexY) { - + global $langs; + $langs->load("main"); + $langs->load("bills"); + $pdf->SetFont('Arial','',11); $pdf->SetXY(10,$tab_top); - $pdf->MultiCell(20,10,'Réf',0,'C',1); + $pdf->MultiCell(20,10,$langs->trans("Ref"),0,'C',1); $pdf->SetXY(30,$tab_top); - $pdf->MultiCell(102,10,'Désignation',0,'L',1); + $pdf->MultiCell(102,10,$langs->trans("Designation"),0,'L',1); $pdf->line(132, $tab_top, 132, $tab_top + $tab_height); $pdf->SetXY(132,$tab_top); - $pdf->MultiCell(12, 10,'TVA',0,'C',1); + $pdf->MultiCell(12, 10,$langs->trans("VAT"),0,'C',1); $pdf->line(144, $tab_top, 144, $tab_top + $tab_height); $pdf->SetXY(144,$tab_top); - $pdf->MultiCell(10,10,'Qté',0,'C',1); + $pdf->MultiCell(10,10,$langs->trans("Qty"),0,'C',1); $pdf->line(154, $tab_top, 154, $tab_top + $tab_height); $pdf->SetXY(154,$tab_top); - $pdf->MultiCell(22,10,'P.U.',0,'R',1); + $pdf->MultiCell(22,10,$langs->trans("PriceU"),0,'R',1); $pdf->line(176, $tab_top, 176, $tab_top + $tab_height); $pdf->SetXY(176,$tab_top); - $pdf->MultiCell(24,10,'Total',0,'R',1); + $pdf->MultiCell(24,10,$langs->trans("Total"),0,'R',1); $pdf->Rect(10, $tab_top, 190, $tab_height); diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php index 8978b966544..6c91ea6ffe3 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php @@ -436,7 +436,7 @@ class pdf_propale_azur extends ModelePDFPropales $pdf->Text(122, $tab_top + 5, $langs->trans("VAT")); $pdf->line(132, $tab_top, 132, $tab_top + $tab_height); - $pdf->Text(135, $tab_top + 5,'P.U. HT'); + $pdf->Text(135, $tab_top + 5,$langs->trans("PriceUHT")); $pdf->line(150, $tab_top, 150, $tab_top + $tab_height); $pdf->Text(153, $tab_top + 5, $langs->trans("Qty")); diff --git a/htdocs/includes/modules/propale/pdf_propale_bleu.modules.php b/htdocs/includes/modules/propale/pdf_propale_bleu.modules.php index eb48aba9ec9..1506afc353c 100644 --- a/htdocs/includes/modules/propale/pdf_propale_bleu.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_bleu.modules.php @@ -214,22 +214,25 @@ class pdf_propale_bleu extends ModelePDFPropales function _tableau(&$pdf, $tab_top, $tab_height, $nexY) { + global $langs; + $langs->load("main"); + $langs->load("bills"); $pdf->SetFont('Arial','',11); - $pdf->Text(30,$tab_top + 5,'Désignation'); + $pdf->Text(30,$tab_top + 5,$langs->trans("Designation")); $pdf->line(132, $tab_top, 132, $tab_top + $tab_height); - $pdf->Text(134,$tab_top + 5,'TVA'); + $pdf->Text(134,$tab_top + 5,$langs->trans("VAT")); $pdf->line(144, $tab_top, 144, $tab_top + $tab_height); - $pdf->Text(147,$tab_top + 5,'Qté'); + $pdf->Text(147,$tab_top + 5,$langs->trans("Qty")); $pdf->line(156, $tab_top, 156, $tab_top + $tab_height); - $pdf->Text(160,$tab_top + 5,'P.U.'); + $pdf->Text(160,$tab_top + 5,$langs->trans("PriceU")); $pdf->line(174, $tab_top, 174, $tab_top + $tab_height); - $pdf->Text(187,$tab_top + 5,'Total'); + $pdf->Text(187,$tab_top + 5,$langs->trans("Total")); // $pdf->Rect(10, $tab_top, 190, $nexY - $tab_top); $pdf->Rect(10, $tab_top, 190, $tab_height); diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php index 93c0a26bc50..26fdcbff89c 100644 --- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php @@ -212,30 +212,33 @@ class pdf_propale_jaune extends ModelePDFPropales function _tableau(&$pdf, $tab_top, $tab_height, $nexY) { + global $langs; + $langs->load("main"); + $langs->load("bills"); $pdf->SetFont('Arial','',11); $pdf->SetXY(10,$tab_top); - $pdf->MultiCell(20,10,'Réf',0,'C',1); + $pdf->MultiCell(20,10,$langs->trans("Ref"),0,'C',1); $pdf->SetXY(30,$tab_top); - $pdf->MultiCell(102,10,'Désignation',0,'L',1); + $pdf->MultiCell(102,10,$langs->trans("Designation"),0,'L',1); $pdf->line(132, $tab_top, 132, $tab_top + $tab_height); $pdf->SetXY(132,$tab_top); - $pdf->MultiCell(12, 10,'TVA',0,'C',1); + $pdf->MultiCell(12, 10,$langs->trans("VAT"),0,'C',1); $pdf->line(144, $tab_top, 144, $tab_top + $tab_height); $pdf->SetXY(144,$tab_top); - $pdf->MultiCell(10,10,'Qté',0,'C',1); + $pdf->MultiCell(10,10,$langs->trans("Qty"),0,'C',1); $pdf->line(154, $tab_top, 154, $tab_top + $tab_height); $pdf->SetXY(154,$tab_top); - $pdf->MultiCell(22,10,'P.U.',0,'R',1); + $pdf->MultiCell(22,10,$langs->trans("PriceU"),0,'R',1); $pdf->line(176, $tab_top, 176, $tab_top + $tab_height); $pdf->SetXY(176,$tab_top); - $pdf->MultiCell(24,10,'Total',0,'R',1); + $pdf->MultiCell(24,10,$langs->trans("Total"),0,'R',1); $pdf->Rect(10, $tab_top, 190, $tab_height); diff --git a/htdocs/includes/modules/propale/pdf_propale_rouge.modules.php b/htdocs/includes/modules/propale/pdf_propale_rouge.modules.php index ed3f4285fca..b03bed5d414 100644 --- a/htdocs/includes/modules/propale/pdf_propale_rouge.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_rouge.modules.php @@ -233,22 +233,25 @@ class pdf_propale_rouge extends ModelePDFPropales function _tableau(&$pdf, $tab_top, $tab_height, $nexY) { + global $langs; + $langs->load("main"); + $langs->load("bills"); $pdf->SetFont('Arial','',11); - $pdf->Text(30,$tab_top + 5,'Désignation'); + $pdf->Text(30,$tab_top + 5,$langs->trans("Designation")); $pdf->line(132, $tab_top, 132, $tab_top + $tab_height); - $pdf->Text(134,$tab_top + 5,'TVA'); + $pdf->Text(134,$tab_top + 5,$langs->trans("VAT")); $pdf->line(144, $tab_top, 144, $tab_top + $tab_height); - $pdf->Text(147,$tab_top + 5,'Qté'); + $pdf->Text(147,$tab_top + 5,$langs->trans("Qty")); $pdf->line(156, $tab_top, 156, $tab_top + $tab_height); - $pdf->Text(160,$tab_top + 5,'P.U.'); + $pdf->Text(160,$tab_top + 5,$langs->trans("PriceU")); $pdf->line(174, $tab_top, 174, $tab_top + $tab_height); - $pdf->Text(187,$tab_top + 5,'Total'); + $pdf->Text(187,$tab_top + 5,$langs->trans("Total")); // $pdf->Rect(10, $tab_top, 190, $nexY - $tab_top); $pdf->Rect(10, $tab_top, 190, $tab_height); diff --git a/htdocs/includes/modules/propale/pdf_propale_vert.modules.php b/htdocs/includes/modules/propale/pdf_propale_vert.modules.php index df36e615844..a17c09cdcf2 100644 --- a/htdocs/includes/modules/propale/pdf_propale_vert.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_vert.modules.php @@ -230,16 +230,18 @@ class pdf_propale_vert extends ModelePDFPropales function _tableau(&$pdf, $tab_top, $tab_height, $nexY) { - global $langs; + global $langs; + $langs->load("main"); + $langs->load("bills"); $yt = 100; $pdf->SetFont('Arial','',10); $pdf->SetXY(10, $yt); - $pdf->MultiCell(30,5,'Référence',0,'L'); + $pdf->MultiCell(30,5,$langs->trans("Ref"),0,'L'); $pdf->SetXY(40, $yt); - $pdf->MultiCell(90,5,'Désignation',0,'L'); + $pdf->MultiCell(90,5,$langs->trans("Designation"),0,'L'); $pdf->SetXY(132, $yt); $pdf->line(132, $tab_top, 132, $tab_top + $tab_height); @@ -251,7 +253,7 @@ class pdf_propale_vert extends ModelePDFPropales $pdf->line(150, $tab_top, 150, $tab_top + $tab_height); $pdf->SetXY(150, $yt); - $pdf->MultiCell(16,5,'P.U.',0,'C'); + $pdf->MultiCell(16,5,$langs->trans("PriceU"),0,'C'); $pdf->line(166, $tab_top, 166, $tab_top + $tab_height); $pdf->SetXY(166, $yt); diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index fa4e61a71e4..7a93f9387e9 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -71,6 +71,7 @@ Label=Label Info=Info Family=Family Description=Description +Designation=Description Action=Action About=About WelcomeString=We are %s, and you are connected with name %s @@ -112,6 +113,9 @@ Copy=Copy Paste=Paste Default=Default Price=Price +UnitPrice=Unit price +PriceU=U.P. +PriceUHT=U.P. HT Amount=Amount AmountHT=Amount HT AmountTTC=Amount TTC diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index acdfc2e4663..6af80411d6d 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -71,6 +71,7 @@ Label=Libell Info=Info Family=Famille Description=Description +Designation=Designation Action=Action About=À propos WelcomeString=Nous sommes le %s, et vous êtes connecté(e) sous le nom %s @@ -112,6 +113,9 @@ Copy=Copier Paste=Coller Default=Défaut Price=Prix +UnitPrice=Prix unitaire +PriceU=P.U. +PriceUHT=P.U. HT Amount=Montant AmountHT=Montant HT AmountTTC=Montant TTC
'.$langs->trans("Label").'P.U. HT'.$langs->trans("PriceUHT").''.$langs->trans("Qty").''.$langs->trans("TotalHT").''.$langs->trans("VATRate").'