From 703e35ad736c23a20632a923a2df073084af9680 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 1 Mar 2010 18:12:38 +0000
Subject: [PATCH] Fix: bad language selection

---
 htdocs/expedition/fiche.php                          | 12 ++++++------
 .../expedition/pdf/ModelePdfExpedition.class.php     |  2 +-
 .../expedition/pdf/pdf_expedition_merou.modules.php  |  1 +
 .../expedition/pdf/pdf_expedition_rouget.modules.php |  1 +
 htdocs/includes/modules/propale/modules_propale.php  | 10 +++++-----
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index 9addd240d8a..51790d31462 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -195,26 +195,26 @@ if ($_REQUEST['action'] == 'builddoc')	// En get ou en post
 	require_once(DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.php");
 
 	// Sauvegarde le dernier modele choisi pour generer un document
-	$expedition = new Expedition($db, 0, $_REQUEST['id']);
-	$expedition->fetch($_REQUEST['id']);
-	$expedition->fetch_client();
+	$shipment = new Expedition($db, 0, $_REQUEST['id']);
+	$shipment->fetch($_REQUEST['id']);
+	$shipment->fetch_client();
 
 	if ($_REQUEST['model'])
 	{
-		$expedition->setDocModel($user, $_REQUEST['model']);
+		$shipment->setDocModel($user, $_REQUEST['model']);
 	}
 
 	// Define output language
 	$outputlangs = $langs;
 	$newlang='';
 	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$expedition->client->default_lang;
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$shipment->client->default_lang;
 	if (! empty($newlang))
 	{
 		$outputlangs = new Translate("",$conf);
 		$outputlangs->setDefaultLang($newlang);
 	}
-	$result=expedition_pdf_create($db,$expedition->id,$expedition->modelpdf,$outputlangs);
+	$result=expedition_pdf_create($db,$_REQUEST['id'],$_REQUEST['model'],$outputlangs);
 	if ($result <= 0)
 	{
 		dol_print_error($db,$result);
diff --git a/htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php b/htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php
index de98ab6cc03..5754af5530b 100644
--- a/htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php
+++ b/htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php
@@ -111,7 +111,7 @@ function expedition_pdf_create($db, $id, $modele, $outputlangs)
 		// We save charset_output to restore it because write_file can change it if needed for
 		// output format that does not support UTF8.
 		$sav_charset_output=$outputlangs->charset_output;
-		if ($obj->write_file($expedition, $langs) > 0)
+		if ($obj->write_file($expedition, $outputlangs) > 0)
 		{
 			$outputlangs->charset_output=$sav_charset_output;
 			// on supprime l'image correspondant au preview
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 41cc73b1a5e..d2a8db65789 100644
--- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
+++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
@@ -86,6 +86,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
 		$outputlangs->load("products");
 		$outputlangs->load("propal");
 		$outputlangs->load("sendings");
+		$outputlangs->load("deliveries");
 
 		//Generation de la fiche
 		$this->expe = $object;
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 1eb52950361..ab9a33fd787 100644
--- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
+++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
@@ -236,6 +236,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
 		$outputlangs->load("bills");
 		$outputlangs->load("products");
 		$outputlangs->load("propal");
+		$outputlangs->load("deliveries");
 
 		if ($conf->expedition->dir_output."/sending")
 		{
diff --git a/htdocs/includes/modules/propale/modules_propale.php b/htdocs/includes/modules/propale/modules_propale.php
index b79300d5e7a..89ccf7b51b2 100644
--- a/htdocs/includes/modules/propale/modules_propale.php
+++ b/htdocs/includes/modules/propale/modules_propale.php
@@ -20,11 +20,11 @@
  */
 
 /**
- \file       htdocs/includes/modules/propale/modules_propale.php
- \ingroup    propale
- \brief      Fichier contenant la classe m�re de generation des propales en PDF
- et la classe m�re de num�rotation des propales
- \version    $Id$
+ *  \file       htdocs/includes/modules/propale/modules_propale.php
+ *  \ingroup    propale
+ *  \brief      Fichier contenant la classe mere de generation des propales en PDF 
+ *  			et la classe mere de numerotation des propales
+ *	\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');