diff --git a/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php b/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php index efda5ce637a..ab63147db48 100644 --- a/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php +++ b/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php @@ -134,7 +134,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition { if (create_exdir($dir) < 0) { - $this->error=$outputlangs->trans("ErrorCanNotCreateDir",$dir); + $this->error=$outputlangs->transnoentities("ErrorCanNotCreateDir",$dir); return 0; } } @@ -148,7 +148,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition $pdf->AddPage(); //Generation de l entete du fichier $pdf->SetTitle($this->expe->ref); - $pdf->SetSubject($langs->trans("Sending")); + $pdf->SetSubject($langs->transnoentities("Sending")); $pdf->SetCreator("EXPRESSIV Dolibarr ".DOL_VERSION); $pdf->SetAuthor($user->fullname); $pdf->SetMargins(10, 10, 10); @@ -222,18 +222,18 @@ Class pdf_expedition_merou extends ModelePdfExpedition } else { - $this->error=$outputlangs->trans("ErrorCanNotCreateDir",$dir); + $this->error=$outputlangs->transnoentities("ErrorCanNotCreateDir",$dir); $langs->setPhpLang(); // On restaure langue session return 0; } } else { - $this->error=$outputlangs->trans("ErrorConstantNotDefined","EXP_OUTPUTDIR"); + $this->error=$outputlangs->transnoentities("ErrorConstantNotDefined","EXP_OUTPUTDIR"); $langs->setPhpLang(); // On restaure langue session return 0; } - $this->error=$outputlangs->trans("ErrorUnknown"); + $this->error=$outputlangs->transnoentities("ErrorUnknown"); $langs->setPhpLang(); // On restaure langue session return 0; // Erreur par defaut @@ -257,11 +257,11 @@ Class pdf_expedition_merou extends ModelePdfExpedition $pdf->MultiCell(10,5,"LR",0,'C',1); $pdf->line(30, $tab_top, 30, $tab_top + $tab_height); $pdf->SetXY(30,$tab_top); - $pdf->MultiCell(20,5,$langs->trans("Ref"),0,'C',1); + $pdf->MultiCell(20,5,$langs->transnoentities("Ref"),0,'C',1); $pdf->SetXY(50,$tab_top); - $pdf->MultiCell(130,5,$langs->trans("Description"),0,'L',1); + $pdf->MultiCell(130,5,$langs->transnoentities("Description"),0,'L',1); $pdf->SetXY(180,$tab_top); - $pdf->MultiCell(20,5,$langs->trans("Quantity"),0,'L',1); + $pdf->MultiCell(20,5,$langs->transnoentities("Quantity"),0,'L',1); $pdf->Rect(10, $tab_top, 190, $tab_height); } @@ -306,8 +306,8 @@ Class pdf_expedition_merou extends ModelePdfExpedition { $pdf->SetTextColor(200,0,0); $pdf->SetFont('Arial','B',8); - $pdf->MultiCell(100, 3, $langs->trans("ErrorLogoFileNotFound",$logo), 0, 'L'); - $pdf->MultiCell(100, 3, $langs->trans("ErrorGoToModuleSetup"), 0, 'L'); + $pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L'); + $pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L'); } } else if(defined("MAIN_INFO_SOCIETE_NOM") && FAC_PDF_SOCIETE_NOM) @@ -321,7 +321,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition $pdf->SetXY(60,7); $pdf->SetFont('Arial','B',14); $pdf->SetTextColor(0,0,0); - $pdf->MultiCell(0, 8, $langs->trans("SendingSheet"), '' , 'L'); // Bordereau expedition + $pdf->MultiCell(0, 8, $langs->transnoentities("SendingSheet"), '' , 'L'); // Bordereau expedition //Num Expedition $Yoff = $Yoff+7; $Xoff = 140; @@ -329,7 +329,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition $pdf->SetXY($Xoff,$Yoff); $pdf->SetFont('Arial','',8); $pdf->SetTextColor(0,0,0); - $pdf->MultiCell(0, 8, $langs->trans("RefSending").': '.$exp->ref, '' , 'L'); + $pdf->MultiCell(0, 8, $langs->transnoentities("RefSending").': '.$exp->ref, '' , 'L'); //$this->Code39($Xoff+43, $Yoff+1, $this->expe->ref,$ext = true, $cks = false, $w = 0.4, $h = 4, $wide = true); //Num Commande $Yoff = $Yoff+4; @@ -337,7 +337,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition $pdf->SetXY($Xoff,$Yoff); $pdf->SetFont('Arial','',8); $pdf->SetTextColor(0,0,0); - $pdf->MultiCell(0, 8, $langs->trans("RefOrder").': '.$exp->commande->ref, '' , 'L'); + $pdf->MultiCell(0, 8, $langs->transnoentities("RefOrder").': '.$exp->commande->ref, '' , 'L'); $Xoff = 115; //$this->Code39($Xoff+43, $Yoff+1, $exp->commande->ref,$ext = true, $cks = false, $w = 0.4, $h = 4, $wide = true); diff --git a/htdocs/expedition/mods/pdf/pdf_expedition_rouget.modules.php b/htdocs/expedition/mods/pdf/pdf_expedition_rouget.modules.php index 98c14ebde3c..5ff65315104 100644 --- a/htdocs/expedition/mods/pdf/pdf_expedition_rouget.modules.php +++ b/htdocs/expedition/mods/pdf/pdf_expedition_rouget.modules.php @@ -98,10 +98,10 @@ Class pdf_expedition_rouget extends ModelePdfExpedition $pdf->SetDrawColor(128,128,128); $pdf->SetFont('Arial','', 14); - $pdf->Text($posx, 16, $outputlangs->trans("SendingSheet")); // Bordereau expedition - $pdf->Text($posx, 22, $outputlangs->trans("Ref") ." : ".$this->expe->ref); - $pdf->Text($posx, 28, $outputlangs->trans("Date")." : ".dolibarr_print_date($this->expe->date,"%d %b %Y")); - $pdf->Text($posx, 34, $outputlangs->trans("Page")." : ".$pdf->PageNo() ."/{nb}", 0); + $pdf->Text($posx, 16, $outputlangs->transnoentities("SendingSheet")); // Bordereau expedition + $pdf->Text($posx, 22, $outputlangs->transnoentities("Ref") ." : ".$this->expe->ref); + $pdf->Text($posx, 28, $outputlangs->transnoentities("Date")." : ".dolibarr_print_date($this->expe->date,"%d %b %Y")); + $pdf->Text($posx, 34, $outputlangs->transnoentities("Page")." : ".$pdf->PageNo() ."/{nb}", 0); if ($this->barcode->enabled) { @@ -109,9 +109,9 @@ Class pdf_expedition_rouget extends ModelePdfExpedition } $pdf->SetFont('Arial','', 14); - $pdf->Text($posx, 48, $outputlangs->trans("Order")); - $pdf->Text($posx, 54, $outputlangs->trans("Ref") ." : ".$this->expe->commande->ref); - $pdf->Text($posx, 60, $outputlangs->trans("Date")." : ".dolibarr_print_date($this->expe->commande->date,"%d %b %Y")); + $pdf->Text($posx, 48, $outputlangs->transnoentities("Order")); + $pdf->Text($posx, 54, $outputlangs->transnoentities("Ref") ." : ".$this->expe->commande->ref); + $pdf->Text($posx, 60, $outputlangs->transnoentities("Date")." : ".dolibarr_print_date($this->expe->commande->date,"%d %b %Y")); } @@ -154,7 +154,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition { if (create_exdir($dir) < 0) { - $this->error=$outputlangs->trans("ErrorCanNotCreateDir",$dir); + $this->error=$outputlangs->transnoentities("ErrorCanNotCreateDir",$dir); return 0; } } @@ -170,7 +170,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition $pdf->AddPage(); $pdf->SetTitle($this->expe->ref); - $pdf->SetSubject($langs->trans("Sending")); + $pdf->SetSubject($langs->transnoentities("Sending")); $pdf->SetCreator("Dolibarr ".DOL_VERSION); //$this->pdf->SetAuthor($user->fullname); @@ -198,10 +198,10 @@ Class pdf_expedition_rouget extends ModelePdfExpedition $pdf->SetFont('Arial','', 10); $curY = $this->tableau_top + 5; - $pdf->Text(12, $curY+2, $outputlangs->trans("Description")); - $pdf->Text(160, $curY, $outputlangs->trans("Qty")); + $pdf->Text(12, $curY+2, $outputlangs->transnoentities("Description")); + $pdf->Text(160, $curY, $outputlangs->transnoentities("Qty")); $pdf->Text(160, $curY+4, "Commandée"); - $pdf->Text(186, $curY, $outputlangs->trans("Qty")); + $pdf->Text(186, $curY, $outputlangs->transnoentities("Qty")); $pdf->Text(186, $curY+4, "Livrée"); $this->expe->fetch_lignes(); @@ -232,9 +232,9 @@ Class pdf_expedition_rouget extends ModelePdfExpedition { $prefix_prodserv = ""; if($prodser->type == 0) - $prefix_prodserv = $outputlangs->trans("Product")." "; + $prefix_prodserv = $outputlangs->transnoentities("Product")." "; if($prodser->type == 1) - $prefix_prodserv = $outputlangs->trans("Service")." "; + $prefix_prodserv = $outputlangs->transnoentities("Service")." "; $libelleproduitservice=$prefix_prodserv.$prodser->ref." - ".$libelleproduitservice; } @@ -271,18 +271,18 @@ Class pdf_expedition_rouget extends ModelePdfExpedition } else { - $this->error=$outputlangs->trans("ErrorCanNotCreateDir",$dir); + $this->error=$outputlangs->transnoentities("ErrorCanNotCreateDir",$dir); $langs->setPhpLang(); // On restaure langue session return 0; } } else { - $this->error=$outputlangs->trans("ErrorConstantNotDefined","EXP_OUTPUTDIR"); + $this->error=$outputlangs->transnoentities("ErrorConstantNotDefined","EXP_OUTPUTDIR"); $langs->setPhpLang(); // On restaure langue session return 0; } - $this->error=$outputlangs->trans("ErrorUnknown"); + $this->error=$outputlangs->transnoentities("ErrorUnknown"); $langs->setPhpLang(); // On restaure langue session return 0; // Erreur par defaut } diff --git a/htdocs/includes/modules/livraison/README b/htdocs/includes/modules/livraison/README new file mode 100644 index 00000000000..004ffd88286 --- /dev/null +++ b/htdocs/includes/modules/livraison/README @@ -0,0 +1,2 @@ +Deplace dans htdocs/livraison/mods pour les modules +et htdocs/livraison/mods/pdf pour les modeles pdf \ No newline at end of file diff --git a/htdocs/livraison/mods/pdf/pdf_sirocco.modules.php b/htdocs/livraison/mods/pdf/pdf_sirocco.modules.php index 6dea28b6d84..cfc098c7358 100644 --- a/htdocs/livraison/mods/pdf/pdf_sirocco.modules.php +++ b/htdocs/livraison/mods/pdf/pdf_sirocco.modules.php @@ -90,14 +90,14 @@ class pdf_sirocco extends ModelePDFDeliveryOrder { if (create_exdir($dir) < 0) { - $this->error=$langs->trans("ErrorCanNotCreateDir",$dir); + $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir); return 0; } } } else { - $this->error=$langs->trans("ErrorConstantNotDefined","LIVRAISON_OUTPUTDIR"); + $this->error=$langs->transnoentities("ErrorConstantNotDefined","LIVRAISON_OUTPUTDIR"); return 0; } @@ -111,7 +111,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder $pdf->AddPage(); $pdf->SetTitle($delivery->ref); - $pdf->SetSubject($langs->trans("DeliveryOrder")); + $pdf->SetSubject($langs->transnoentities("DeliveryOrder")); $pdf->SetCreator("Dolibarr ".DOL_VERSION); $pdf->SetAuthor($user->fullname); @@ -197,19 +197,19 @@ class pdf_sirocco extends ModelePDFDeliveryOrder $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($delivery->total_ht + $delivery->remise), 0, 'R', 0); @@ -241,19 +241,19 @@ class pdf_sirocco extends ModelePDFDeliveryOrder $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); @@ -261,7 +261,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder $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); } @@ -320,8 +320,8 @@ class pdf_sirocco extends ModelePDFDeliveryOrder $pdf->SetTextColor(200,0,0); $pdf->SetFont('Arial','B',12); - $pdf->Text(11, 88, "Date : " . strftime("%d %b %Y", $delivery->date)); - $pdf->Text(11, 94, $langs->trans("DeliveryOrder")." ".$delivery->ref); + $pdf->Text(11, 88, $langs->transnoentities("Date")." : " . strftime("%d %b %Y", $delivery->date)); + $pdf->Text(11, 94, $langs->transnoentities("DeliveryOrder")." ".$delivery->ref); } diff --git a/htdocs/livraison/mods/pdf/pdf_typhon.modules.php b/htdocs/livraison/mods/pdf/pdf_typhon.modules.php index 87e0df5af49..e2961bc2734 100644 --- a/htdocs/livraison/mods/pdf/pdf_typhon.modules.php +++ b/htdocs/livraison/mods/pdf/pdf_typhon.modules.php @@ -152,7 +152,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder { if (create_exdir($dir) < 0) { - $this->error=$langs->trans("ErrorCanNotCreateDir",$dir); + $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir); return 0; } @@ -168,7 +168,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder $pdf->SetDrawColor(128,128,128); $pdf->SetTitle($delivery->ref); - $pdf->SetSubject($langs->trans("DeliveryOrder")); + $pdf->SetSubject($langs->transnoentities("DeliveryOrder")); $pdf->SetCreator("Dolibarr ".DOL_VERSION); $pdf->SetAuthor($user->fullname); @@ -215,7 +215,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder $prodser->fetch($lignesdelivery[$i]->fk_product); if ($prodser->ref) { - $libelleproduitservice=$langs->trans("Product")." ".$prodser->ref." - ".$libelleproduitservice; + $libelleproduitservice=$langs->transnoentities("Product")." ".$prodser->ref." - ".$libelleproduitservice; } // Ajoute description du produit @@ -231,7 +231,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder if ($lignesdelivery[$i]->date_start && $lignesdelivery[$i]->date_end) { // Affichage durée si il y en a une - $libelleproduitservice.="\n(".$langs->trans("From")." ".dolibarr_print_date($lignesdelivery[$i]->date_start)." ".$langs->trans("to")." ".dolibarr_print_date($lignesdelivery[$i]->date_end).")"; + $libelleproduitservice.="\n(".$langs->transnoentities("From")." ".dolibarr_print_date($lignesdelivery[$i]->date_start)." ".$langs->transnoentities("to")." ".dolibarr_print_date($lignesdelivery[$i]->date_end).")"; } $pdf->SetFont('Arial','', 9); // Dans boucle pour gérer multi-page @@ -320,8 +320,8 @@ class pdf_typhon extends ModelePDFDeliveryOrder $pdf->SetXY ($this->marge_gauche, 228); $pdf->SetTextColor(200,0,0); $pdf->SetFont('Arial','B',8); - $pdf->MultiCell(90, 3, $langs->trans("ErrorNoPaiementModeConfigured"),0,'L',0); - $pdf->MultiCell(90, 3, $langs->trans("ErrorCreateBankAccount"),0,'L',0); + $pdf->MultiCell(90, 3, $langs->transnoentities("ErrorNoPaiementModeConfigured"),0,'L',0); + $pdf->MultiCell(90, 3, $langs->transnoentities("ErrorCreateBankAccount"),0,'L',0); $pdf->SetTextColor(0,0,0); } */ @@ -428,16 +428,16 @@ class pdf_typhon extends ModelePDFDeliveryOrder } else { - $this->error=$langs->trans("ErrorCanNotCreateDir",$dir); + $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir); return 0; } } else { - $this->error=$langs->trans("ErrorConstantNotDefined","PROP_OUTPUTDIR"); + $this->error=$langs->transnoentities("ErrorConstantNotDefined","PROP_OUTPUTDIR"); return 0; } - $this->error=$langs->trans("ErrorUnknown"); + $this->error=$langs->transnoentities("ErrorUnknown"); return 0; // Erreur par defaut } @@ -472,7 +472,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder // Total HT $pdf->SetFillColor(256,256,256); $pdf->SetXY ($col1x, $tab2_top + 0); - $pdf->MultiCell($col2x-$col1x, $tab2_hl, $langs->trans("TotalHT"), 0, 'L', 1); + $pdf->MultiCell($col2x-$col1x, $tab2_hl, $langs->transnoentities("TotalHT"), 0, 'L', 1); $pdf->SetXY ($col2x, $tab2_top + 0); $pdf->MultiCell($largcol2, $tab2_hl, price($delivery->total_ht +$delivery->remise), 0, 'R', 1); @@ -481,7 +481,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder if ($delivery->remise > 0) { $pdf->SetXY ($col1x, $tab2_top + $tab2_hl); - $pdf->MultiCell($col2x-$col1x, $tab2_hl, $langs->trans("GlobalDiscount"), 0, 'L', 1); + $pdf->MultiCell($col2x-$col1x, $tab2_hl, $langs->transnoentities("GlobalDiscount"), 0, 'L', 1); $pdf->SetXY ($col2x, $tab2_top + $tab2_hl); $pdf->MultiCell($largcol2, $tab2_hl, "-".$delivery->remise_percent."%", 0, 'R', 1); @@ -509,8 +509,8 @@ class pdf_typhon extends ModelePDFDeliveryOrder $index++; $pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index); - $tvacompl = ( (float)$tvakey < 0 ) ? " (".$langs->trans("NonPercuRecuperable").")" : '' ; - $pdf->MultiCell($col2x-$col1x, $tab2_hl, $langs->trans("TotalVAT").' '.abs($tvakey).'%'.$tvacompl, 0, 'L', 1); + $tvacompl = ( (float)$tvakey < 0 ) ? " (".$langs->transnoentities("NonPercuRecuperable").")" : '' ; + $pdf->MultiCell($col2x-$col1x, $tab2_hl, $langs->transnoentities("TotalVAT").' '.abs($tvakey).'%'.$tvacompl, 0, 'L', 1); $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index); $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval * abs((float)$tvakey) / 100 ), 0, 'R', 1); @@ -520,7 +520,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder { $index++; $pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index); - $pdf->MultiCell($col2x-$col1x, $tab2_hl, $langs->trans("TotalVAT"), 0, 'L', 1); + $pdf->MultiCell($col2x-$col1x, $tab2_hl, $langs->transnoentities("TotalVAT"), 0, 'L', 1); $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index); $pdf->MultiCell($largcol2, $tab2_hl, price($delivery->total_tva), 0, 'R', 1); @@ -532,7 +532,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder $pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index); $pdf->SetTextColor(0,0,60); $pdf->SetFillColor(224,224,224); - $pdf->MultiCell($col2x-$col1x, $tab2_hl, $langs->trans("TotalTTC"), $useborder, 'L', 1); + $pdf->MultiCell($col2x-$col1x, $tab2_hl, $langs->transnoentities("TotalTTC"), $useborder, 'L', 1); $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index); $pdf->MultiCell($largcol2, $tab2_hl, price($delivery->total_ttc), $useborder, 'R', 1); @@ -544,7 +544,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder $index++; $pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index); - $pdf->MultiCell($col2x-$col1x, $tab2_hl, $langs->trans("AlreadyPayed"), 0, 'L', 0); + $pdf->MultiCell($col2x-$col1x, $tab2_hl, $langs->transnoentities("AlreadyPayed"), 0, 'L', 0); $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index); $pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle), 0, 'R', 0); @@ -553,7 +553,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder $pdf->SetTextColor(0,0,60); //$pdf->SetFont('Arial','B', 9); $pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index); - $pdf->MultiCell($col2x-$col1x, $tab2_hl, $langs->trans("RemainderToPay"), $useborder, 'L', 1); + $pdf->MultiCell($col2x-$col1x, $tab2_hl, $langs->transnoentities("RemainderToPay"), $useborder, 'L', 1); $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index); $pdf->MultiCell($largcol2, $tab2_hl, price($delivery->total_ttc - $deja_regle), $useborder, 'R', 1); @@ -578,7 +578,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder // Montants exprimés en (en tab_top - 1) $pdf->SetTextColor(0,0,0); $pdf->SetFont('Arial','',8); - //$titre = $langs->trans("AmountInCurrency",$langs->trans("Currency".$conf->monnaie)); + //$titre = $langs->transnoentities("AmountInCurrency",$langs->transnoentities("Currency".$conf->monnaie)); //$pdf->Text($this->page_largeur - $this->marge_droite - $pdf->GetStringWidth($titre), $tab_top-1, $titre); $pdf->SetDrawColor(128,128,128); @@ -591,25 +591,25 @@ class pdf_typhon extends ModelePDFDeliveryOrder $pdf->SetFont('Arial','',10); $pdf->SetXY ($this->posxdesc-1, $tab_top+2); - $pdf->MultiCell(108,2, $langs->trans("Designation"),'','L'); + $pdf->MultiCell(108,2, $langs->transnoentities("Designation"),'','L'); /* $pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height); $pdf->SetXY ($this->posxtva-1, $tab_top+2); - $pdf->MultiCell(12,2, $langs->trans("VAT"),'','C'); + $pdf->MultiCell(12,2, $langs->transnoentities("VAT"),'','C'); $pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height); $pdf->SetXY ($this->posxup-1, $tab_top+2); - $pdf->MultiCell(18,2, $langs->trans("PriceUHT"),'','C'); + $pdf->MultiCell(18,2, $langs->transnoentities("PriceUHT"),'','C'); */ $pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height); $pdf->SetXY ($this->posxqty-1, $tab_top+2); - $pdf->MultiCell(11,2, $langs->trans("Qty"),'','C'); + $pdf->MultiCell(11,2, $langs->transnoentities("Qty"),'','C'); /* $pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height); if ($this->atleastonediscount) { $pdf->SetXY ($this->posxdiscount-1, $tab_top+2); - $pdf->MultiCell(16,2, $langs->trans("ReductionShort"),'','C'); + $pdf->MultiCell(16,2, $langs->transnoentities("ReductionShort"),'','C'); } if ($this->atleastonediscount) @@ -617,7 +617,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder $pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height); } $pdf->SetXY ($this->postotalht-1, $tab_top+2); - $pdf->MultiCell(23,2, $langs->trans("TotalHT"),'','C'); + $pdf->MultiCell(23,2, $langs->transnoentities("TotalHT"),'','C'); */ } @@ -655,8 +655,8 @@ class pdf_typhon extends ModelePDFDeliveryOrder { $pdf->SetTextColor(200,0,0); $pdf->SetFont('Arial','B',8); - $pdf->MultiCell(100, 3, $langs->trans("ErrorLogoFileNotFound",$logo), 0, 'L'); - $pdf->MultiCell(100, 3, $langs->trans("ErrorGoToModuleSetup"), 0, 'L'); + $pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L'); + $pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L'); } } else if(defined("MAIN_INFO_SOCIETE_NOM") && FAC_PDF_SOCIETE_NOM) @@ -667,13 +667,13 @@ class pdf_typhon extends ModelePDFDeliveryOrder $pdf->SetFont('Arial','B',13); $pdf->SetXY(100,$posy); $pdf->SetTextColor(0,0,60); - $pdf->MultiCell(100, 4, $langs->trans("DeliveryOrder")." ".$delivery->ref, '' , 'R'); + $pdf->MultiCell(100, 4, $langs->transnoentities("DeliveryOrder")." ".$delivery->ref, '' , 'R'); $pdf->SetFont('Arial','',12); $posy+=6; $pdf->SetXY(100,$posy); $pdf->SetTextColor(0,0,60); - $pdf->MultiCell(100, 4, $langs->trans("Date")." : " . dolibarr_print_date($delivery->date_valid,"%d %b %Y"), '', 'R'); + $pdf->MultiCell(100, 4, $langs->transnoentities("Date")." : " . dolibarr_print_date($delivery->date_valid,"%d %b %Y"), '', 'R'); if ($showadress) { @@ -683,7 +683,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder $pdf->SetTextColor(0,0,0); $pdf->SetFont('Arial','',8); $pdf->SetXY($this->marge_gauche,$posy-5); - $pdf->MultiCell(66,5, $langs->trans("BillFrom").":"); + $pdf->MultiCell(66,5, $langs->transnoentities("BillFrom").":"); $pdf->SetXY($this->marge_gauche,$posy); @@ -708,17 +708,17 @@ class pdf_typhon extends ModelePDFDeliveryOrder } $carac_emetteur .= "\n"; // Tel - if (defined("FAC_PDF_TEL") && FAC_PDF_TEL) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$langs->trans("Phone").": ".FAC_PDF_TEL; - elseif ($mysoc->tel) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$langs->trans("Phone").": ".$mysoc->tel; + if (defined("FAC_PDF_TEL") && FAC_PDF_TEL) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$langs->transnoentities("Phone").": ".FAC_PDF_TEL; + elseif ($mysoc->tel) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$langs->transnoentities("Phone").": ".$mysoc->tel; // Fax - if (defined("FAC_PDF_FAX") && FAC_PDF_FAX) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$langs->trans("Fax").": ".FAC_PDF_FAX; - elseif ($mysoc->fax) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$langs->trans("Fax").": ".$mysoc->fax; + if (defined("FAC_PDF_FAX") && FAC_PDF_FAX) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$langs->transnoentities("Fax").": ".FAC_PDF_FAX; + elseif ($mysoc->fax) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$langs->transnoentities("Fax").": ".$mysoc->fax; // EMail - if (defined("FAC_PDF_MEL") && FAC_PDF_MEL) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$langs->trans("Email").": ".FAC_PDF_MEL; - elseif ($mysoc->email) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$langs->trans("Email").": ".$mysoc->email; + if (defined("FAC_PDF_MEL") && FAC_PDF_MEL) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$langs->transnoentities("Email").": ".FAC_PDF_MEL; + elseif ($mysoc->email) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$langs->transnoentities("Email").": ".$mysoc->email; // Web - if (defined("FAC_PDF_WWW") && FAC_PDF_WWW) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$langs->trans("Web").": ".FAC_PDF_WWW; - elseif ($mysoc->url) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$langs->trans("Web").": ".$mysoc->url; + if (defined("FAC_PDF_WWW") && FAC_PDF_WWW) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$langs->transnoentities("Web").": ".FAC_PDF_WWW; + elseif ($mysoc->url) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$langs->transnoentities("Web").": ".$mysoc->url; $pdf->SetFont('Arial','',9); $pdf->SetXY($this->marge_gauche+2,$posy+8); @@ -729,7 +729,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder $pdf->SetTextColor(0,0,0); $pdf->SetFont('Arial','',8); $pdf->SetXY(102,$posy-5); - $pdf->MultiCell(80,5, $langs->trans("BillTo").":"); + $pdf->MultiCell(80,5, $langs->transnoentities("BillTo").":"); // $client = new Societe($this->db); $client->fetch($delivery->socid); @@ -747,7 +747,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder // Caractéristiques client $carac_client=$delivery->client->adresse; $carac_client.="\n".$delivery->client->cp . " " . $delivery->client->ville."\n"; - if ($delivery->client->tva_intra) $carac_client.="\n".$langs->trans("VATIntraShort").': '.$delivery->client->tva_intra; + if ($delivery->client->tva_intra) $carac_client.="\n".$langs->transnoentities("VATIntraShort").': '.$delivery->client->tva_intra; $pdf->SetFont('Arial','',9); $pdf->SetXY(102,$posy+8); $pdf->MultiCell(86,4, $carac_client); @@ -776,7 +776,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder } if ($conf->global->MAIN_INFO_CAPITAL) { - $ligne1.=($ligne1?" - ":"").$langs->trans("CapitalOf",$conf->global->MAIN_INFO_CAPITAL)." ".$langs->trans("Currency".$conf->monnaie); + $ligne1.=($ligne1?" - ":"").$langs->transnoentities("CapitalOf",$conf->global->MAIN_INFO_CAPITAL)." ".$langs->transnoentities("Currency".$conf->monnaie); } if ($conf->global->MAIN_INFO_SIRET) { @@ -799,7 +799,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder } if ($conf->global->MAIN_INFO_TVAINTRA != '') { - $ligne2.=($ligne2?" - ":"").$langs->trans("VATIntraShort").": ".$conf->global->MAIN_INFO_TVAINTRA; + $ligne2.=($ligne2?" - ":"").$langs->transnoentities("VATIntraShort").": ".$conf->global->MAIN_INFO_TVAINTRA; } $pdf->SetFont('Arial','',8);