diff --git a/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php b/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php
index 7d364de8af8..730384f6c98 100644
--- a/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php
+++ b/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php
@@ -106,7 +106,7 @@ class BordereauChequeBlochet extends FPDF
$pdf->Text(32, 19, $this->number);
$pdf->SetFont('Arial','B',10);
- $pdf->Text(32, 27, dolibarr_print_date($this->date,"day"));
+ $pdf->Text(32, 27, dolibarr_print_date($this->date,"day",false,$outputlangs));
$pdf->SetFont('Arial','',10);
@@ -187,10 +187,10 @@ class BordereauChequeBlochet extends FPDF
$pdf->MultiCell(20, $this->line_height, $this->lines[$j]->num_chq?$this->lines[$j]->num_chq:'', 0, 'J', 0);
$pdf->SetXY (30, $this->tab_top + 10 + $yp);
- $pdf->MultiCell(70, $this->line_height, dolibarr_trunc($this->lines[$j]->bank_chq,44), 0, 'J', 0);
+ $pdf->MultiCell(70, $this->line_height, dolibarr_trunc($outputlangs->convToOutputCharset($this->lines[$j]->bank_chq),44), 0, 'J', 0);
$pdf->SetXY (100, $this->tab_top + 10 + $yp);
- $pdf->MultiCell(80, $this->line_height, dolibarr_trunc($this->lines[$j]->emetteur_chq,50), 0, 'J', 0);
+ $pdf->MultiCell(80, $this->line_height, dolibarr_trunc($outputlangs->convToOutputCharset($this->lines[$j]->emetteur_chq),50), 0, 'J', 0);
$pdf->SetXY (180, $this->tab_top + 10 + $yp);
$pdf->MultiCell(20, $this->line_height, price($this->lines[$j]->amount_chq), 0, 'R', 0);
diff --git a/htdocs/includes/modules/commande/pdf_edison.modules.php b/htdocs/includes/modules/commande/pdf_edison.modules.php
index d179cdfaffa..adbba67fee2 100644
--- a/htdocs/includes/modules/commande/pdf_edison.modules.php
+++ b/htdocs/includes/modules/commande/pdf_edison.modules.php
@@ -84,7 +84,7 @@ class pdf_edison extends ModelePDFCommandes
\param com id de la propale a generer
\return int 1=ok, 0=ko
*/
- function write_file($com,$outputlangs='')
+ function write_file($com,$outputlangs)
{
global $user,$conf,$langs,$mysoc;
@@ -397,7 +397,7 @@ class pdf_edison extends ModelePDFCommandes
$pdf->SetTextColor(200,0,0);
$pdf->SetFont('Arial','B',12);
- $pdf->Text(11, 88, "Date : " . dolibarr_print_date($com->date,'day'));
+ $pdf->Text(11, 88, "Date : " . dolibarr_print_date($com->date,'day',false,$outputlangs));
$pdf->Text(11, 94, $langs->transnoentities("Order")." ".$com->ref);
}
diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php
index 93febf09d5e..6e41cf7cdce 100644
--- a/htdocs/includes/modules/commande/pdf_einstein.modules.php
+++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php
@@ -273,7 +273,7 @@ class pdf_einstein extends ModelePDFCommandes
if ($com->lignes[$i]->date_start && $com->lignes[$i]->date_end)
{
// Affichage duree si il y en a une
- $libelleproduitservice.="
".dol_htmlentitiesbr("(".$outputlangs->transnoentities("From")." ".dolibarr_print_date($com->lignes[$i]->date_start)." ".$outputlangs->transnoentities("to")." ".dolibarr_print_date($com->lignes[$i]->date_end).")",1);
+ $libelleproduitservice.="
".dol_htmlentitiesbr("(".$outputlangs->transnoentities("From")." ".dolibarr_print_date($com->lignes[$i]->date_start,'',false,$outputlangs)." ".$outputlangs->transnoentities("to")." ".dolibarr_print_date($com->lignes[$i]->date_end,'',false,$outputlangs).")",1);
}
$pdf->SetFont('Arial','', 9); // Dans boucle pour gerer multi-page
@@ -828,7 +828,7 @@ class pdf_einstein extends ModelePDFCommandes
$posy+=5;
$pdf->SetXY(100,$posy);
$pdf->SetTextColor(0,0,60);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : " . dolibarr_print_date($object->date,"%d %b %Y",'',$outputlangs), '', 'R');
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : " . dolibarr_print_date($object->date,"%d %b %Y",false,$outputlangs), '', 'R');
if ($showadress)
{
diff --git a/htdocs/includes/modules/dons/html_cerfafr.modules.php b/htdocs/includes/modules/dons/html_cerfafr.modules.php
index f1262349d3b..88c0d57ca96 100644
--- a/htdocs/includes/modules/dons/html_cerfafr.modules.php
+++ b/htdocs/includes/modules/dons/html_cerfafr.modules.php
@@ -66,10 +66,13 @@ class html_cerfafr extends ModeleDon
\param id Id du recu � g�n�rer
\return int >0 si ok, <0 si ko
*/
- function write_file($don)
+ function write_file($don,$outputlangs)
{
- global $conf,$langs,$user,$mysoc;
- $langs->load("main");
+ global $user,$conf,$langs,$mysoc;
+
+ if (! is_object($outputlangs)) $outputlangs=$langs;
+
+ $langs->load("main");
if ($conf->don->dir_output)
{
@@ -109,10 +112,10 @@ class html_cerfafr extends ModeleDon
$donmodel=DOL_DOCUMENT_ROOT ."/includes/modules/dons/html_cerfafr.html";
$html = implode('', file($donmodel));
$html = eregi_replace('__REF__',$id,$html);
- $html = eregi_replace('__DATE__',dolibarr_print_date($don->date),$html);
+ $html = eregi_replace('__DATE__',dolibarr_print_date($don->date,'',false,$outputlangs),$html);
$html = eregi_replace('__IP__',$user->ip,$html);
$html = eregi_replace('__AMOUNT__',$don->amount,$html);
- $html = eregi_replace('__CURRENCY__',$langs->trans("Currency".$conf->monnaie),$html);
+ $html = eregi_replace('__CURRENCY__',$outputlangs->trans("Currency".$conf->monnaie),$html);
$html = eregi_replace('__CURRENCYCODE__',$conf->monnaie,$html);
$html = eregi_replace('__MAIN_INFO_SOCIETE_NOM__',$mysoc->nom,$html);
$html = eregi_replace('__MAIN_INFO_SOCIETE_ADRESSE__',$mysoc->adresse,$html);
@@ -123,7 +126,7 @@ class html_cerfafr extends ModeleDon
$html = eregi_replace('__DONATOR_ZIP__',$don->cp,$html);
$html = eregi_replace('__DONATOR_TOWN__',$don->ville,$html);
$html = eregi_replace('__PAYMENTMODE_LIB__ ',$don->modepaiement,$html);
- $html = eregi_replace('__NOW__',dolibarr_print_date(time()),$html);
+ $html = eregi_replace('__NOW__',dolibarr_print_date(time(),'',false,$outputlangs),$html);
// Sauve fichier sur disque
dolibarr_syslog("html_cerfafr::write_file $file");
@@ -137,18 +140,18 @@ class html_cerfafr extends ModeleDon
}
else
{
- $this->error=$outputlangs->trans("ErrorCanNotCreateDir",$dir);
+ $this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
$langs->setPhpLang(); // On restaure langue session
return 0;
}
}
else
{
- $this->error=$outputlangs->trans("ErrorConstantNotDefined","DON_OUTPUTDIR");
+ $this->error=$langs->trans("ErrorConstantNotDefined","DON_OUTPUTDIR");
$langs->setPhpLang(); // On restaure langue session
return 0;
}
- $this->error=$outputlangs->trans("ErrorUnknown");
+ $this->error=$langs->trans("ErrorUnknown");
$langs->setPhpLang(); // On restaure langue session
return 0; // Erreur par defaut
diff --git a/htdocs/includes/modules/expedition/methode_expedition.modules.php b/htdocs/includes/modules/expedition/methode_expedition.modules.php
index 21d5ac27dac..84d63fcffe1 100644
--- a/htdocs/includes/modules/expedition/methode_expedition.modules.php
+++ b/htdocs/includes/modules/expedition/methode_expedition.modules.php
@@ -43,6 +43,7 @@ class methode_expedition
$this->description = "ERREUR DANS LA DEFINITION DU MODULE.";
}
+
function Active($statut)
{
// Mise a jour du statut
@@ -57,7 +58,7 @@ class methode_expedition
if ($af == 0 && $statut == 1)
{
- // On cr�� la m�thode dans la base
+ // On cre la methode dans la base
$sql = "INSERT INTO ".MAIN_DB_PREFIX."expedition_methode";
$sql .= " (rowid, statut, code, libelle, description)";
@@ -77,15 +78,14 @@ class methode_expedition
}
}
- function write_file($id)
+
+ function write_file($id,$outputlangs)
{
global $conf, $user;
$propale = new Propal($this->db,"",$id);
if ($propale->fetch($id))
{
-
-
$file = $dir . "/" . $propale->ref . ".pdf";
if (file_exists($dir))
@@ -108,7 +108,7 @@ class methode_expedition
$pdf->AddPage();
$pdf->SetTitle($propale->ref);
- $pdf->SetSubject("Proposition commerciale");
+ $pdf->SetSubject($outputlangs->trans("Proposal"));
$pdf->SetCreator("Dolibarr ".DOL_VERSION);
$pdf->SetAuthor($user->fullname);
@@ -298,10 +298,8 @@ class methode_expedition
$pdf->SetTextColor(200,0,0);
$pdf->SetFont('Courier','B',12);
- $pdf->Text(11, 88, "Date : " . dolibarr_print_date($propale->date,'day'));
- $pdf->Text(11, 94, "Proposition commerciale : ".$propale->ref);
-
-
+ $pdf->Text(11, 88, $outputlangs->trans("Date")." : " . dolibarr_print_date($propale->date,'day',false,$outputlangs));
+ $pdf->Text(11, 94, $outputlangs->trans("Proposal")." : ".$propale->ref);
}
}
diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
index a9c9f8de2fe..b5880bc2ca5 100644
--- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
+++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
@@ -422,7 +422,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
$pdf->SetXY($blSocX,$blSocY+20);
$pdf->SetFont('Arial','B',8);
$pdf->SetTextColor(0,0,0);
- $pdf->MultiCell(50, 8, $outputlangs->transnoentities("Date")." : " . dolibarr_print_date($exp->date,'day'), '' , 'L');
+ $pdf->MultiCell(50, 8, $outputlangs->transnoentities("Date")." : " . dolibarr_print_date($exp->date,'day',false,$outputlangs), '' , 'L');
//Date Expedition
$pdf->SetXY($blSocX2,$blSocY+20);
$pdf->SetFont('Arial','B',8);
diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
index 5571a4ecd46..79c789abaa7 100644
--- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
+++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
@@ -96,7 +96,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
$pdf->SetFont('Arial','', 14);
$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, 28, $outputlangs->transnoentities("Date")." : ".dolibarr_print_date($this->expe->date,"%d %b %Y",false,$outputlangs));
$pdf->Text($posx, 34, $outputlangs->transnoentities("Page")." : ".$pdf->PageNo() ."/{nb}", 0);
if ($this->barcode->enabled)
diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php
index 8fa9c59cd45..beb53afc615 100644
--- a/htdocs/includes/modules/facture/pdf_crabe.modules.php
+++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php
@@ -524,7 +524,7 @@ class pdf_crabe extends ModelePDFFactures
$row = $this->db->fetch_row($resql);
$pdf->SetXY ($tab3_posx, $tab3_top+$y );
- $pdf->MultiCell(20, 4, dolibarr_print_date($row[0],'day'), 0, 'L', 0);
+ $pdf->MultiCell(20, 4, dolibarr_print_date($row[0],'day',false,$outputlangs), 0, 'L', 0);
$pdf->SetXY ($tab3_posx+21, $tab3_top+$y);
$pdf->MultiCell(20, 4, price($row[1]), 0, 'L', 0);
$pdf->SetXY ($tab3_posx+41, $tab3_top+$y);
@@ -1055,7 +1055,7 @@ class pdf_crabe extends ModelePDFFactures
$posy+=5;
$pdf->SetXY(100,$posy);
$pdf->SetTextColor(0,0,60);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEcheance")." : " . dolibarr_print_date($object->date_lim_reglement,"day"), '', 'R');
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEcheance")." : " . dolibarr_print_date($object->date_lim_reglement,"day",false,$outputlangs), '', 'R');
}
if ($showadress)
diff --git a/htdocs/includes/modules/facture/pdf_huitre.modules.php b/htdocs/includes/modules/facture/pdf_huitre.modules.php
index d81195f2581..47ba44b71e4 100644
--- a/htdocs/includes/modules/facture/pdf_huitre.modules.php
+++ b/htdocs/includes/modules/facture/pdf_huitre.modules.php
@@ -588,7 +588,7 @@ class pdf_huitre extends ModelePDFFactures
$pdf->SetTextColor(200,0,0);
$pdf->SetFont('Arial','B',14);
$pdf->Text(11, 88, $outputlangs->transnoentities('Date'));
- $pdf->Text(35, 88, ": " . dolibarr_print_date($fac->date,'day'));
+ $pdf->Text(35, 88, ": " . dolibarr_print_date($fac->date,'day',false,$outputlangs));
$pdf->Text(11, 94, $outputlangs->transnoentities('Invoice'));
$pdf->Text(35, 94, ": ".$fac->ref);
diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php
index ddfb56a8fe8..5530f1b2bf9 100644
--- a/htdocs/includes/modules/facture/pdf_oursin.modules.php
+++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php
@@ -207,7 +207,7 @@ class pdf_oursin extends ModelePDFFactures
}
if ($fac->lignes[$i]->date_start && $fac->lignes[$i]->date_end) {
// Affichage dur�e si il y en a une
- $codeproduitservice.=" (".$outputlangs->transnoentities("From")." ".dolibarr_print_date($fac->lignes[$i]->date_start)." ".$langs->transnoentities("to")." ".dolibarr_print_date($fac->lignes[$i]->date_end).")";
+ $codeproduitservice.=" (".$outputlangs->transnoentities("From")." ".dolibarr_print_date($fac->lignes[$i]->date_start,'',false,$outputlangs)." ".$langs->transnoentities("to")." ".dolibarr_print_date($fac->lignes[$i]->date_end,'',false,$outputlangs).")";
}
$pdf->MultiCell(108, 5, $fac->lignes[$i]->desc."$codeproduitservice", 0, 'J');
@@ -467,7 +467,7 @@ class pdf_oursin extends ModelePDFFactures
$row = $this->db->fetch_row($resql);
$pdf->SetXY ($tab3_posx, $tab3_top+$y );
- $pdf->MultiCell(20, 4, dolibarr_print_date($row[0],'day'), 0, 'L', 0);
+ $pdf->MultiCell(20, 4, dolibarr_print_date($row[0],'day',false,$outputlangs), 0, 'L', 0);
$pdf->SetXY ($tab3_posx+21, $tab3_top+$y);
$pdf->MultiCell(20, 4, price($row[1]), 0, 'L', 0);
$pdf->SetXY ($tab3_posx+41, $tab3_top+$y);
@@ -748,7 +748,7 @@ class pdf_oursin extends ModelePDFFactures
$pdf->SetFont('Arial','B',13);
$pdf->SetXY($this->marges['g'],$posy);
$pdf->SetTextColor(0,0,0);
- $pdf->MultiCell(100, 10, $langs->transnoentities("Bill").' '.$langs->transnoentities("Of").' '.dolibarr_print_date($fac->date,"%d %B %Y"), '' , 'L');
+ $pdf->MultiCell(100, 10, $langs->transnoentities("Bill").' '.$langs->transnoentities("Of").' '.dolibarr_print_date($fac->date,"%d %B %Y",false,$outputlangs), '' , 'L');
$pdf->SetFont('Arial','B',11);
$pdf->SetXY($this->marges['g'],$posy+6);
$pdf->SetTextColor(22,137,210);
diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
index f55c8e90d38..ee9bb45998a 100644
--- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
+++ b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
@@ -205,7 +205,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
if ($delivery->lignes[$i]->date_start && $delivery->lignes[$i]->date_end)
{
// Affichage duree si il y en a une
- $libelleproduitservice.="
".dol_htmlentitiesbr("(".$outputlangs->transnoentities("From")." ".dolibarr_print_date($delivery->lignes[$i]->date_start)." ".$outputlangs->transnoentities("to")." ".dolibarr_print_date($delivery->lignes[$i]->date_end).")",1);
+ $libelleproduitservice.="
".dol_htmlentitiesbr("(".$outputlangs->transnoentities("From")." ".dolibarr_print_date($delivery->lignes[$i]->date_start,'',false,$outputlangs)." ".$outputlangs->transnoentities("to")." ".dolibarr_print_date($delivery->lignes[$i]->date_end,'',false,$outputlangs).")",1);
}
$pdf->SetXY (30, $curY );
@@ -372,7 +372,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
$pdf->SetTextColor(200,0,0);
$pdf->SetFont('Arial','B',12);
- $pdf->Text(11, 88, $outputlangs->transnoentities("Date")." : " . dolibarr_print_date($delivery->date_valid,"day"));
+ $pdf->Text(11, 88, $outputlangs->transnoentities("Date")." : " . dolibarr_print_date($delivery->date_valid,"day",false,$outputlangs));
$pdf->Text(11, 94, $outputlangs->transnoentities("DeliveryOrder")." ".$delivery->ref);
$pdf->SetFont('Arial','B',9);
diff --git a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
index 85632e7e66d..f76f34ce799 100644
--- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
+++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
@@ -240,7 +240,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
if ($delivery->lignes[$i]->date_start && $delivery->lignes[$i]->date_end)
{
// Affichage duree si il y en a une
- $libelleproduitservice.="
".dol_htmlentitiesbr("(".$outputlangs->transnoentities("From")." ".dolibarr_print_date($delivery->lignes[$i]->date_start)." ".$outputlangs->transnoentities("to")." ".dolibarr_print_date($delivery->lignes[$i]->date_end).")",1);
+ $libelleproduitservice.="
".dol_htmlentitiesbr("(".$outputlangs->transnoentities("From")." ".dolibarr_print_date($delivery->lignes[$i]->date_start,'',false,$outputlangs)." ".$outputlangs->transnoentities("to")." ".dolibarr_print_date($delivery->lignes[$i]->date_end,'',false,$outputlangs).")",1);
}
$pdf->SetFont('Arial','', 9); // Dans boucle pour gerer multi-page
@@ -436,7 +436,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$pdf->SetTextColor(0,0,60);
if ($delivery->date_valid)
{
- $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : " . dolibarr_print_date($delivery->date_valid,"%d %b %Y"), '', 'R');
+ $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : " . dolibarr_print_date($delivery->date_valid,"%d %b %Y",false,$outputlangs), '', 'R');
}
else
{
diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
index febd4c3cbd0..527570abd93 100644
--- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
@@ -276,7 +276,7 @@ class pdf_propale_azur extends ModelePDFPropales
if ($propale->lignes[$i]->date_start && $propale->lignes[$i]->date_end)
{
// Affichage durée si il y en a une
- $libelleproduitservice.="
".dol_htmlentitiesbr("(".$outputlangs->transnoentities("From")." ".dolibarr_print_date($propale->lignes[$i]->date_start)." ".$outputlangs->transnoentities("to")." ".dolibarr_print_date($propale->lignes[$i]->date_end).")",1);
+ $libelleproduitservice.="
".dol_htmlentitiesbr("(".$outputlangs->transnoentities("From")." ".dolibarr_print_date($propale->lignes[$i]->date_start,'',false,$outputlangs)." ".$outputlangs->transnoentities("to")." ".dolibarr_print_date($propale->lignes[$i]->date_end,'',false,$outputlangs).")",1);
}
$pdf->SetFont('Arial','', 9); // Dans boucle pour gérer multi-page
@@ -851,12 +851,12 @@ class pdf_propale_azur extends ModelePDFPropales
$posy+=5;
$pdf->SetXY(100,$posy);
$pdf->SetTextColor(0,0,60);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities("Date")." : " . dolibarr_print_date($object->date,"day"), '', 'R');
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities("Date")." : " . dolibarr_print_date($object->date,"day",false,$outputlangs), '', 'R');
$posy+=5;
$pdf->SetXY(100,$posy);
$pdf->SetTextColor(0,0,60);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEndPropal")." : " . dolibarr_print_date($object->fin_validite,"day"), '', 'R');
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEndPropal")." : " . dolibarr_print_date($object->fin_validite,"day",false,$outputlangs), '', 'R');
if ($showadress)
{
diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
index 8efb6b202e6..6805168c4be 100644
--- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
@@ -395,7 +395,7 @@ class pdf_propale_jaune extends ModelePDFPropales
$pdf->SetXY(10,90);
$pdf->MultiCell(110, 10, $outputlangs->transnoentities("Ref")." : ".$propale->ref);
$pdf->SetXY(110,90);
- $pdf->MultiCell(100, 10, $outputlangs->transnoentities("Date")." : " . dolibarr_print_date($propale->date,'day'));
+ $pdf->MultiCell(100, 10, $outputlangs->transnoentities("Date")." : " . dolibarr_print_date($propale->date,'day',false,$outputlangs));
}
/*
diff --git a/htdocs/includes/modules/rapport/pdf_paiement.class.php b/htdocs/includes/modules/rapport/pdf_paiement.class.php
index ebc0d57b312..6e46653fea5 100644
--- a/htdocs/includes/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/includes/modules/rapport/pdf_paiement.class.php
@@ -73,12 +73,12 @@ class pdf_paiement extends FPDF
global $langs;
$title=$outputlangs->transnoentities("ListOfCustomerPayments");
- $title.=' - '.dolibarr_print_date(dolibarr_mktime(0,0,0,$this->month,1,$this->year),"%B %Y");
+ $title.=' - '.dolibarr_print_date(dolibarr_mktime(0,0,0,$this->month,1,$this->year),"%B %Y",false,$outputlangs);
$pdf->SetFont('Arial','B',12);
$pdf->Text(76, 10, $title);
$pdf->SetFont('Arial','B',12);
- $pdf->Text(11, 16, $outputlangs->transnoentities("Date")." : ".dolibarr_print_date(time(),"day"));
+ $pdf->Text(11, 16, $outputlangs->transnoentities("Date")." : ".dolibarr_print_date(time(),"day",false,$outputlangs));
$pdf->SetFont('Arial','',12);
$pdf->Text(11, 22, $outputlangs->transnoentities("Page")." : ".$page);
@@ -236,7 +236,7 @@ class pdf_paiement extends FPDF
$var=!$var;
$lines[$i][0] = $objp->facnumber;
- $lines[$i][1] = dolibarr_print_date($objp->dp,"%d %B %Y");
+ $lines[$i][1] = dolibarr_print_date($objp->dp,"%d %B %Y",false,$outputlangs);
//$lines[$i][2] = $objp->paiement_type ;
$lines[$i][2] = $langs->transnoentities("PaymentTypeShort".$objp->paiement_code);
$lines[$i][3] = $objp->num_paiement;
diff --git a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
index f292a950310..d95a7468b4b 100644
--- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -252,7 +252,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
if ($com->lignes[$i]->date_start && $com->lignes[$i]->date_end)
{
// Affichage dur�e si il y en a une
- $libelleproduitservice.="
".dol_htmlentitiesbr("(".$outputlangs->transnoentities("From")." ".dolibarr_print_date($com->lignes[$i]->date_start)." ".$outputlangs->transnoentities("to")." ".dolibarr_print_date($com->lignes[$i]->date_end).")",1);
+ $libelleproduitservice.="
".dol_htmlentitiesbr("(".$outputlangs->transnoentities("From")." ".dolibarr_print_date($com->lignes[$i]->date_start,'',false,$outputlangs)." ".$outputlangs->transnoentities("to")." ".dolibarr_print_date($com->lignes[$i]->date_end,'',false,$outputlangs).")",1);
}
$pdf->SetFont('Arial','', 9); // Dans boucle pour g�rer multi-page
@@ -700,7 +700,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$posy+=6;
$pdf->SetXY(100,$posy);
$pdf->SetTextColor(0,0,60);
- $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : " . dolibarr_print_date($object->date,"day"), '', 'R');
+ $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : " . dolibarr_print_date($object->date,"day",false,$outputlangs), '', 'R');
if ($showadress)
{