';
- if ($expedition->trueWeight)
- {
- // If sending weigth defined
- print $expedition->trueWeight.' '.measuring_units_string($expedition->weight_units,"weight");
- }
- else
- {
+ print '
'.$langs->trans("TotalWeight").'
';
+ print '
';
+ if ($expedition->trueWeight)
+ {
+ // If sending weigth defined
+ print $expedition->trueWeight.' '.measuring_units_string($expedition->weight_units,"weight");
+ }
+ else
+ {
// If sending Weight not defined we use sum of products
// TODO Show in best unit
- if ($totalWeight > 0) print $totalWeight.' '.measuring_units_string(0,"weight");
- else print ' ';
- }
+ if ($totalWeight > 0) print $totalWeight.' '.measuring_units_string(0,"weight");
+ else print ' ';
+ }
print '
';
// Volume Total
print '
'.$langs->trans("TotalVolume").'
';
print '
';
if ($expedition->trueVolume)
- {
+ {
// If sending volume defined
print $expedition->trueVolume.' '.measuring_units_string($expedition->volumeUnit,"volume");
}
@@ -670,18 +671,18 @@ else
print "
\n";
print '
';
- // Taille
- print '
'.$langs->trans("Size").'
';
- print '
';
- if ($expedition->trueWidth || $expedition->trueHeight || $expedition->trueDepth)
- {
- // If sending size defined
- print $expedition->trueSize.' '.measuring_units_string($expedition->size_units,"size");
- }
- else print ' ';
- print "
\n";
- print '
';
-
+ // Taille
+ print '
'.$langs->trans("Size").'
';
+ print '
';
+ if ($expedition->trueWidth || $expedition->trueHeight || $expedition->trueDepth)
+ {
+ // If sending size defined
+ print $expedition->trueSize.' '.measuring_units_string($expedition->size_units,"size");
+ }
+ else print ' ';
+ print "
\n";
+ print '
';
+
// Status
print '
'.$langs->trans("Status").'
';
print '
'.$expedition->getLibStatut(4)."
\n";
diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php
index 7170f69213e..8cbf5ced00a 100644
--- a/htdocs/fichinter/fiche.php
+++ b/htdocs/fichinter/fiche.php
@@ -78,12 +78,12 @@ if ($_REQUEST['action'] == 'confirm_validate' && $_REQUEST['confirm'] == 'yes')
$result = $fichinter->valid($user, $conf->fichinter->outputdir);
if ($result >= 0)
{
- if ($_REQUEST['lang_id'])
- {
- $outputlangs = new Translate("",$conf);
- $outputlangs->setDefaultLang($_REQUEST['lang_id']);
- }
-
+ $outputlangs = $langs;
+ if (! empty($_REQUEST['lang_id']))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+ }
$result=fichinter_create($db, $fichinter, $_REQUEST['model'], $outputlangs);
}
else
@@ -148,12 +148,12 @@ if ($_REQUEST['action'] == 'builddoc') // En get ou en post
$fichinter->fetch($_GET['id']);
$fichinter->fetch_lines();
- if ($_REQUEST['lang_id'])
- {
- $outputlangs = new Translate("",$conf);
- $outputlangs->setDefaultLang($_REQUEST['lang_id']);
- }
-
+ $outputlangs = $langs;
+ if (! empty($_REQUEST['lang_id']))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+ }
$result=fichinter_create($db, $fichinter, $_REQUEST['model'], $outputlangs);
if ($result <= 0)
{
@@ -214,7 +214,8 @@ if ($_POST['action'] == "addligne" && $user->rights->ficheinter->creer)
$duration
);
- if ($_REQUEST['lang_id'])
+ $outputlangs = $langs;
+ if (! empty($_REQUEST['lang_id']))
{
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
@@ -248,11 +249,12 @@ if ($_POST['action'] == 'updateligne' && $user->rights->ficheinter->creer && $_P
$fichinterline->duration=$duration;
$result = $fichinterline->update();
- if ($_REQUEST['lang_id'])
- {
- $outputlangs = new Translate("",$conf);
- $outputlangs->setDefaultLang($_REQUEST['lang_id']);
- }
+ $outputlangs = $langs;
+ if (! empty($_REQUEST['lang_id']))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+ }
fichinter_create($db, $fichinter, $fichinter->modelpdf, $outputlangs);
}
@@ -275,11 +277,13 @@ if ($_GET['action'] == 'deleteline' && $user->rights->ficheinter->creer && !$con
dolibarr_print_error($db);
exit;
}
- if ($_REQUEST['lang_id'])
- {
- $outputlangs = new Translate("",$conf);
- $outputlangs->setDefaultLang($_REQUEST['lang_id']);
- }
+
+ $outputlangs = $langs;
+ if (! empty($_REQUEST['lang_id']))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+ }
fichinter_create($db, $fichinter, $fichinter->modelpdf, $outputlangs);
}
@@ -303,11 +307,13 @@ if ($_REQUEST['action'] == 'confirm_deleteline' && $_REQUEST['confirm'] == 'yes'
dolibarr_print_error($db);
exit;
}
- if ($_REQUEST['lang_id'])
- {
- $outputlangs = new Translate("",$conf);
- $outputlangs->setDefaultLang($_REQUEST['lang_id']);
- }
+
+ $outputlangs = $langs;
+ if (! empty($_REQUEST['lang_id']))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+ }
fichinter_create($db, $fichinter, $fichinter->modelpdf, $outputlangs);
}
Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$_GET['id']);
@@ -323,11 +329,13 @@ if ($_GET['action'] == 'up' && $user->rights->ficheinter->creer)
$fichinter = new Fichinter($db);
$fichinter->fetch($_GET['id']);
$fichinter->line_up($_GET['rowid']);
- if ($_REQUEST['lang_id'])
- {
- $outputlangs = new Translate("",$conf);
- $outputlangs->setDefaultLang($_REQUEST['lang_id']);
- }
+
+ $outputlangs = $langs;
+ if (! empty($_REQUEST['lang_id']))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+ }
fichinter_create($db, $fichinter, $fichinter->modelpdf, $outputlangs);
Header ('Location: '.$_SERVER["PHP_SELF"].'?id='.$_GET["id"].'#'.$_GET['rowid']);
exit;
@@ -338,11 +346,13 @@ if ($_GET['action'] == 'down' && $user->rights->ficheinter->creer)
$fichinter = new Fichinter($db);
$fichinter->fetch($_GET['id']);
$fichinter->line_down($_GET['rowid']);
- if ($_REQUEST['lang_id'])
- {
- $outputlangs = new Translate("",$conf);
- $outputlangs->setDefaultLang($_REQUEST['lang_id']);
- }
+
+ $outputlangs = $langs;
+ if (! empty($_REQUEST['lang_id']))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+ }
fichinter_create($db, $fichinter, $fichinter->modelpdf, $outputlangs);
Header ('Location: '.$_SERVER["PHP_SELF"].'?id='.$_GET["id"].'#'.$_GET['rowid']);
exit;
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index 94c546c961d..15057b52ca0 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -172,7 +172,8 @@ if ($_POST['action'] == 'addligne' && $user->rights->fournisseur->commande->cree
//print "xx".$tva_tx; exit;
if ($result > 0)
{
- if ($_REQUEST['lang_id'])
+ $outputlangs = $langs;
+ if (! empty($_REQUEST['lang_id']))
{
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
@@ -204,12 +205,13 @@ if ($_POST['action'] == 'updateligne' && $user->rights->fournisseur->commande->c
if ($result >= 0)
{
- if ($_REQUEST['lang_id'])
- {
- $outputlangs = new Translate("",$conf);
- $outputlangs->setDefaultLang($_REQUEST['lang_id']);
- }
- supplier_order_pdf_create($db, $commande->id, $commande->modelpdf, $outputlangs);
+ $outputlangs = $langs;
+ if (! empty($_REQUEST['lang_id']))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+ }
+ supplier_order_pdf_create($db, $commande->id, $commande->modelpdf, $outputlangs);
}
else
{
@@ -231,7 +233,9 @@ if ($_REQUEST['action'] == 'confirm_deleteproductline' && ($_POST['confirm'] ==
$commande = new CommandeFournisseur($db);
$commande->fetch($id);
$result = $commande->delete_line($_GET['lineid']);
- if ($_REQUEST['lang_id'])
+
+ $outputlangs = $langs;
+ if (! empty($_REQUEST['lang_id']))
{
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
@@ -252,7 +256,8 @@ if ($_REQUEST['action'] == 'confirm_valid' && $_REQUEST['confirm'] == 'yes' && $
$result = $commande->valid($user);
if ($result >= 0)
{
- if ($_REQUEST['lang_id'])
+ $outputlangs = $langs;
+ if (! empty($_REQUEST['lang_id']))
{
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
@@ -338,7 +343,9 @@ if ($_GET['action'] == 'up' && $user->rights->fournisseur->commande->creer)
$commande = new CommandeFournisseur($db,'',$id);
$commande->fetch($id);
$commande->line_up($_GET['rowid']);
- if ($_REQUEST['lang_id'])
+
+ $outputlangs = $langs;
+ if (! empty($_REQUEST['lang_id']))
{
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
@@ -353,7 +360,9 @@ if ($_GET['action'] == 'down' && $user->rights->fournisseur->commande->creer)
$commande = new CommandeFournisseur($db,'',$id);
$commande->fetch($id);
$commande->line_down($_GET['rowid']);
- if ($_REQUEST['lang_id'])
+
+ $outputlangs = $langs;
+ if (! empty($_REQUEST['lang_id']))
{
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
@@ -379,7 +388,8 @@ if ($_REQUEST['action'] == 'builddoc') // En get ou en post
$commande->setDocModel($user, $_REQUEST['model']);
}
- if ($_REQUEST['lang_id'])
+ $outputlangs = $langs;
+ if (! empty($_REQUEST['lang_id']))
{
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
diff --git a/htdocs/includes/modules/facture/modules_facture.php b/htdocs/includes/modules/facture/modules_facture.php
index 5254db3bf00..afd70b1d3ac 100644
--- a/htdocs/includes/modules/facture/modules_facture.php
+++ b/htdocs/includes/modules/facture/modules_facture.php
@@ -206,7 +206,7 @@ function facture_pdf_create($db, $id, $message, $modele, $outputlangs)
facture_meta_create($db, $id);
// et on supprime l'image correspondant au preview
facture_delete_preview($db, $id);
-
+
$outputlangs->charset_output=$sav_charset_output;
return 1;
}
diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php
index fdd4c9d8846..8fa9c59cd45 100644
--- a/htdocs/includes/modules/facture/pdf_crabe.modules.php
+++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php
@@ -56,7 +56,7 @@ class pdf_crabe extends ModelePDFFactures
$this->db = $db;
$this->name = "crabe";
$this->description = $langs->trans('PDFCrabeDescription');
-
+
// Dimension page pour format A4
$this->type = 'pdf';
$this->page_largeur = 210;
@@ -105,10 +105,10 @@ class pdf_crabe extends ModelePDFFactures
* \param outputlangs Lang object for output language
* \return int 1=ok, 0=ko
*/
- function write_file($fac,$outputlangs='')
+ function write_file($fac,$outputlangs)
{
global $user,$langs,$conf;
-
+
if (! is_object($outputlangs)) $outputlangs=$langs;
// Force output charset to ISO, because, FPDF expect text encoded in ISO
$outputlangs->charset_output='ISO-8859-1';
@@ -292,7 +292,7 @@ class pdf_crabe extends ModelePDFFactures
if ($fac->lignes[$i]->date_start && $fac->lignes[$i]->date_end)
{
// Affichage duree si il y en a une
- $libelleproduitservice.=" ".dol_htmlentitiesbr("(".$outputlangs->transnoentities("From")." ".dolibarr_print_date($fac->lignes[$i]->date_start)." ".$outputlangs->transnoentities("to")." ".dolibarr_print_date($fac->lignes[$i]->date_end).")",1);
+ $libelleproduitservice.=" ".dol_htmlentitiesbr("(".$outputlangs->transnoentities("From")." ".dolibarr_print_date($fac->lignes[$i]->date_start,'',false,$outputlangs)." ".$outputlangs->transnoentities("to")." ".dolibarr_print_date($fac->lignes[$i]->date_end,'',false,$outputlangs).")",1);
}
//if ($i==0) { print $libelleproduitservice; exit; }
diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
index 8c35e5973f0..df387d08959 100644
--- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
+++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
@@ -78,7 +78,7 @@ class pdf_soleil extends ModelePDFFicheinter
\param fichinter Object fichinter
\return int 1=ok, 0=ko
*/
- function write_file($fichinter,$outputlangs='')
+ function write_file($fichinter,$outputlangs)
{
global $user,$langs,$conf,$mysoc;
@@ -243,7 +243,7 @@ class pdf_soleil extends ModelePDFFicheinter
$pdf->SetTextColor(0,0,100);
$pdf->SetFont('Arial','B',14);
- $pdf->Text(11, 94, $langs->trans("InterventionCard")." : ".$fichinter->ref);
+ $pdf->Text(11, 94, $outputlangs->trans("InterventionCard")." : ".$fichinter->ref);
$pdf->SetFillColor(220,220,220);
$pdf->SetTextColor(0,0,0);
@@ -253,7 +253,7 @@ class pdf_soleil extends ModelePDFFicheinter
$tab_height = 16;
$pdf->SetXY (10, $tab_top);
- $pdf->MultiCell(190,8,$langs->transnoentities("Description"),0,'L',0);
+ $pdf->MultiCell(190,8,$outputlangs->transnoentities("Description"),0,'L',0);
$pdf->line(10, $tab_top + 8, 200, $tab_top + 8 );
$pdf->Rect(10, $tab_top, 190, $tab_height);
@@ -279,7 +279,7 @@ class pdf_soleil extends ModelePDFFicheinter
{
$pdf->SetXY (10, $tab_top + 16 + $j * 20);
$pdf->writeHTMLCell(0, 4, 20, $tab_top + 16 + $j * 20,
- dol_htmlentitiesbr($langs->transnoentities("Date")." : ".dolibarr_print_date($fichinterligne->datei)." - ".$langs->transnoentities("Duration")." : ".ConvertSecondToTime($fichinterligne->duration), 1), 0, 0, 0);
+ dol_htmlentitiesbr($outputlangs->transnoentities("Date")." : ".dolibarr_print_date($fichinterligne->datei,'',false,$outputlangs)." - ".$outputlangs->transnoentities("Duration")." : ".ConvertSecondToTime($fichinterligne->duration), 1), 0, 0, 0);
$pdf->SetXY (10, $tab_top + 22 + $j * 20);
$pdf->writeHTMLCell(0, 4, 20, $tab_top + 22 + $j * 20,
@@ -296,13 +296,13 @@ class pdf_soleil extends ModelePDFFicheinter
$pdf->MultiCell(60, 5, '', 0, 'J', 0);
$pdf->SetXY(20,220);
- $pdf->MultiCell(66,5, $langs->transnoentities("NameAndSignatureOfInternalContact"),0,'L',0);
+ $pdf->MultiCell(66,5, $outputlangs->transnoentities("NameAndSignatureOfInternalContact"),0,'L',0);
$pdf->SetXY(20,225);
$pdf->MultiCell(80,30, '', 1);
$pdf->SetXY(110,220);
- $pdf->MultiCell(80,5, $langs->transnoentities("NameAndSignatureOfExternalContact"),0,'L',0);
+ $pdf->MultiCell(80,5, $outputlangs->transnoentities("NameAndSignatureOfExternalContact"),0,'L',0);
$pdf->SetXY(110,225);
$pdf->MultiCell(80,30, '', 1);
diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php
index f8271d42428..53508a92883 100644
--- a/htdocs/lib/functions.lib.php
+++ b/htdocs/lib/functions.lib.php
@@ -444,11 +444,11 @@ function dolibarr_time_plus_duree($time,$duration_value,$duration_unit)
* "%d/%m/%Y %H:%M:%S",
* "day", "daytext", "dayhour", "dayhourldap", "dayhourtext"
* \param to_gmt false=output string if for local server TZ users, true=output string is for GMT users
- * \param convtooutput true=Output string is encoded into encoding defined into $langs->charset_output
+ * \param outputlangs Object lang that contains charset_output property to define output
* This means output is endoded in UTF-8 in default case.
* \return string Formated date or '' if time is null
*/
-function dolibarr_print_date($time,$format='',$to_gmt=false,$convtooutput=true)
+function dolibarr_print_date($time,$format='',$to_gmt=false,$outputlangs='')
{
global $conf,$langs;
@@ -496,7 +496,9 @@ function dolibarr_print_date($time,$format='',$to_gmt=false,$convtooutput=true)
$localtime=setlocale(LC_TIME,0);
if (eregi('UTF',$localtime)) $pagecodefrom='UTF-8';
- return ($convtooutput?$langs->convToOuptutCharset($ret,$pagecodefrom):$ret);
+ if (! is_object($outputlangs)) $outputlangs=$langs;
+
+ return $outputlangs->convToOuptutCharset($ret,$pagecodefrom);
}
@@ -2873,21 +2875,23 @@ function make_substitutions($chaine,$substitutionarray)
* \remarks Updated by Matelli : added format paramter
* \remarks See http://matelli.fr/showcases/patchs-dolibarr/update-date-range-format.html for details
*/
-function print_date_range($date_start,$date_end,$format = '')
+function print_date_range($date_start,$date_end,$format = '',$outputlangs='')
{
global $langs;
+ if (! is_object($outputlangs)) $outputlangs=$langs;
+
if ($date_start && $date_end)
{
- print ' ('.$langs->trans('DateFromTo',dolibarr_print_date($date_start, $format, false, false),dolibarr_print_date($date_end, $format, false, false)).')';
+ print ' ('.$langs->trans('DateFromTo',dolibarr_print_date($date_start, $format, false, $outputlangs),dolibarr_print_date($date_end, $format, false, $outputlangs)).')';
}
if ($date_start && ! $date_end)
{
- print ' ('.$langs->trans('DateFrom',dolibarr_print_date($date_start, $format, false, false)).')';
+ print ' ('.$langs->trans('DateFrom',dolibarr_print_date($date_start, $format, false, $outputlangs)).')';
}
if (! $date_start && $date_end)
{
- print ' ('.$langs->trans('DateUntil',dolibarr_print_date($date_end, $format, false, false)).')';
+ print ' ('.$langs->trans('DateUntil',dolibarr_print_date($date_end, $format, false, $outputlangs)).')';
}
}
diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php
index 5f493b4a287..4212e4979ae 100644
--- a/htdocs/livraison/fiche.php
+++ b/htdocs/livraison/fiche.php
@@ -143,7 +143,8 @@ if ($_REQUEST['action'] == 'builddoc') // En get ou en post
$delivery->setDocModel($user, $_REQUEST['model']);
}
- if ($_REQUEST['lang_id'])
+ $outputlangs = $langs;
+ if (! empty($_REQUEST['lang_id']))
{
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($_REQUEST['lang_id']);