From 884c5f539d386e81a77b0647c19156f58c8086cc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 18 Jun 2006 15:48:28 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20Gestion=20multilangue=20sur=20les=20mode?=
 =?UTF-8?q?les=20de=20document=20g=E9n=E9r=E9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/comm/propal.php                        | 51 +++++++++++++------
 htdocs/commande/fiche.php                     | 42 +++++++++++----
 htdocs/compta/facture.php                     | 35 +++++++++----
 htdocs/expedition/fiche.php                   |  7 ++-
 htdocs/fichinter/fiche.php                    |  7 ++-
 htdocs/fourn/commande/fiche.php               | 14 ++++-
 .../modules/modules_commandefournisseur.php   |  4 +-
 .../modules/commande/modules_commande.php     |  2 +-
 .../modules/facture/pdf_crabe.modules.php     |  2 +-
 .../modules/fichinter/modules_fichinter.php   |  2 +-
 htdocs/livraison/fiche.php                    |  7 ++-
 htdocs/livraison/mods/modules_livraison.php   |  2 +-
 12 files changed, 126 insertions(+), 49 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 84cb7c7f2cb..a89a61986a9 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -96,9 +96,12 @@ if ($_POST['action'] == 'confirm_deleteproductline' && $_POST['confirm'] == 'yes
     {
     	$propal = new Propal($db);
     	$propal->fetch($_GET['propalid']);
-    	$propal->delete_product($_GET['ligne']);
-	    $outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
-		if ($_REQUEST['lang_id']) $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+    	$result=$propal->delete_product($_GET['ligne']);
+		if ($_REQUEST['lang_id'])
+		{
+			$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+			$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+		}
     	propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs);
     }
     Header('Location: '.$_SERVER["PHP_SELF"].'?propalid='.$_GET['propalid']);
@@ -112,8 +115,11 @@ if ($_POST['action'] == 'confirm_validate' && $_POST['confirm'] == 'yes')
         $propal = new Propal($db);
         $propal->fetch($_GET['propalid']);
         $result=$propal->update_price($_GET['propalid']);
-	    $outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
-		if ($_REQUEST['lang_id']) $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+		if ($_REQUEST['lang_id'])
+		{
+			$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+			$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+		}
         propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs);
         $result=$propal->valid($user);
     }
@@ -229,8 +235,11 @@ if ($_POST['action'] == 'add')
 			$db->commit();
 
 			// Generation document PDF
-			$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
-			if ($_REQUEST['lang_id']) $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+			if ($_REQUEST['lang_id'])
+			{
+				$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+				$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+			}
 			propale_pdf_create($db, $id, $_POST['model'], $outputlangs);
 		
 			Header ('Location: '.$_SERVER["PHP_SELF"].'?propalid='.$id);
@@ -465,8 +474,11 @@ if ($_POST['action'] == "addligne" && $user->rights->propale->creer)
 			$_POST['remise_percent']
 			);
 
-		$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
-		if ($_REQUEST['lang_id']) $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+		if ($_REQUEST['lang_id'])
+		{
+			$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+			$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+		}
   	    propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs);
 	}
 }
@@ -486,8 +498,11 @@ if ($_POST['action'] == 'updateligne' && $user->rights->propale->creer && $_POST
     	$_POST['tva_tx'],
     	$_POST['desc']);
 
-	$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
-	if ($_REQUEST['lang_id']) $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+	if ($_REQUEST['lang_id'])
+	{
+		$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+		$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+	}
     propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs);
 }
 
@@ -499,8 +514,11 @@ if ($_REQUEST['action'] == 'builddoc' && $user->rights->propale->creer)
     $propal = new Propal($db);
     $propal->fetch($_GET['propalid']);
     if ($_POST['model']) $propal->set_pdf_model($user, $_POST['model']);
-    $outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
-	if ($_REQUEST['lang_id']) $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+	if ($_REQUEST['lang_id'])
+	{
+		$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+		$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+	}
     propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs);
 }
 
@@ -513,8 +531,11 @@ if ($_GET['action'] == 'del_ligne' && $user->rights->propale->creer && !$conf->g
 	$propal = new Propal($db);
 	$propal->fetch($_GET['propalid']);
 	$propal->delete_product($_GET['ligne']);
-	$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
-	if ($_REQUEST['lang_id']) $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+	if ($_REQUEST['lang_id'])
+	{
+		$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+		$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+	}
 	propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs);
 }
 
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 1228cc69cfa..2cae861fde3 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -253,8 +253,11 @@ if ($_POST['action'] == 'addligne' && $user->rights->commande->creer)
 			$_POST['remise_percent']
 			);
 
-		$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
-		if ($_REQUEST['lang_id']) $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+		if ($_REQUEST['lang_id'])
+		{
+			$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+			$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+		}
   	    commande_pdf_create($db, $commande->id, $commande->modelpdf, $outputlangs);
 	}
 }
@@ -277,8 +280,11 @@ if ($_POST['action'] == 'updateligne' && $user->rights->commande->creer && $_POS
 
 	if ($result >= 0)
 	{
-		$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
-		if ($_REQUEST['lang_id']) $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+		if ($_REQUEST['lang_id'])
+		{
+			$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+			$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+		}
 	    commande_pdf_create($db, $commande->id, $commande->modelpdf, $outputlangs);
 	}
 	else
@@ -301,7 +307,12 @@ if ($_GET['action'] == 'deleteline' && $user->rights->commande->creer && !$conf-
 	$commande = new Commande($db);
 	$commande->fetch($_GET['id']);
 	$result = $commande->delete_line($_GET['lineid']);
-	commande_pdf_create($db, $_GET['id'], $commande->modelpdf);
+	if ($_REQUEST['lang_id'])
+	{
+		$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+		$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+	}
+	commande_pdf_create($db, $_GET['id'], $commande->modelpdf, $outputlangs);
 	Header('Location: fiche.php?id='.$_GET['id']);
 	exit;
 }
@@ -348,7 +359,12 @@ if ($_POST['action'] == 'confirm_deleteproductline' && $_POST['confirm'] == 'yes
     	$commande = new Commande($db);
     	$commande->fetch($_GET['id']);
     	$commande->delete_line($_GET['lineid']);
-    	commande_pdf_create($db, $_GET['id'], $commande->modelpdf);
+		if ($_REQUEST['lang_id'])
+		{
+			$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+			$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+		}
+    	commande_pdf_create($db, $_GET['id'], $commande->modelpdf, $outputlangs);
     }
     Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$_GET['id']);
     exit;
@@ -386,13 +402,16 @@ if ($_REQUEST['action'] == 'builddoc')	// En get ou en post
 	 * Generation de la commande
 	 * définit dans /includes/modules/commande/modules_commande.php
 	 */
-	$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
-	$outputlangs->setDefaultLang($_REQUEST['lang_id']);
 
 	// Sauvegarde le dernier modèle choisi pour générer un document
 	$commande = new Commande($db, 0, $_REQUEST['id']);
 	$commande->set_pdf_model($user, $_REQUEST['model']);
 
+	if ($_REQUEST['lang_id'])
+	{
+		$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+		$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+	}
 	$result=commande_pdf_create($db, $_REQUEST['id'],$_REQUEST['model'],$outputlangs);
     if ($result <= 0)
     {
@@ -1698,8 +1717,11 @@ else
 				// Construit PDF si non existant
 				if (! is_readable($file))
 				{
-					$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
-					$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+					if ($_REQUEST['lang_id'])
+					{
+						$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+						$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+					}
 					$result=commande_pdf_create($db, $_REQUEST['id'], '', $_REQUEST['model'], $outputlangs);
 				    if ($result <= 0)
 				    {
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index d33265401ab..f3640b7316a 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -142,8 +142,11 @@ if ($_POST['action'] == 'confirm_valid' && $_POST['confirm'] == 'yes' && $user->
 	$result = $fac->set_valid($fac->id, $user, $soc);
 	if ($result)
 	{
-		$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
-		if ($_REQUEST['lang_id']) $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+		if ($_REQUEST['lang_id'])
+		{
+			$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+			$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+		}
 		facture_pdf_create($db, $fac->id, '', $_REQUEST['model'], $outputlangs);
 	}
 }
@@ -477,8 +480,11 @@ if ($_POST['action'] == 'updateligne' && $user->rights->facture->creer && $_POST
 		$_POST['tva_tx']
 		);
 
-	$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
-	if ($_REQUEST['lang_id']) $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+	if ($_REQUEST['lang_id'])
+	{
+		$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+		$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+	}
     facture_pdf_create($db, $fac->id, '', $fac->modelpdf, $outputlangs);
 
 	$_GET['facid']=$_POST['facid'];   // Pour réaffichage de la fiche en cours d'édition
@@ -682,8 +688,11 @@ if ($_REQUEST['action'] == 'builddoc')	// En get ou en post
 	$facture = new Facture($db, 0, $_GET['facid']);
 	$facture->fetch($_GET['facid']);
 	if ($_REQUEST['model']) $facture->set_pdf_model($user, $_REQUEST['model']);
-	$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
-	if ($_REQUEST['lang_id']) $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+	if ($_REQUEST['lang_id'])
+	{
+		$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+		$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+	}
 	$result=facture_pdf_create($db, $facture->id, '', $facture->modelpdf, $outputlangs);
     if ($result <= 0)
     {
@@ -2270,8 +2279,11 @@ else
 				// Construit PDF si non existant
 				if (! is_readable($file))
 				{
-					$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
-					if ($_REQUEST['lang_id']) $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+					if ($_REQUEST['lang_id'])
+					{
+						$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+						$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+					}
 					$result=facture_pdf_create($db, $fac->id, '', $_REQUEST['model'], $outputlangs);
 				    if ($result <= 0)
 				    {
@@ -2321,8 +2333,11 @@ else
 				// Construit PDF si non existant
 				if (! is_readable($file))
 				{
-					$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
-					if ($_REQUEST['lang_id']) $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+					if ($_REQUEST['lang_id'])
+					{
+						$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+						$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+					}
 					$result=facture_pdf_create($db, $fac->id, '', $_REQUEST['model'], $outputlangs);
 				    if ($result <= 0)
 				    {
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index 493829e472e..9f811ea3f1f 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -134,8 +134,11 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes')
  */
 if ($_REQUEST['action'] == 'builddoc')	// En get ou en post
 {
-	$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
-	$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+	if ($_REQUEST['lang_id'])
+	{
+		$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+		$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+	}
 	$result=expedition_pdf_create($db, $_REQUEST['id'],$_REQUEST['model'],$outputlangs);
     if ($result <= 0)
     {
diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php
index 65d0e6f8c89..60d5c684f62 100644
--- a/htdocs/fichinter/fiche.php
+++ b/htdocs/fichinter/fiche.php
@@ -105,8 +105,11 @@ if ($_POST["action"] == 'update')
  */
 if ($_REQUEST['action'] == 'builddoc')	// En get ou en post
 {
-	$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
-	$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+	if ($_REQUEST['lang_id'])
+	{
+		$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+		$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+	}
 	$result=fichinter_pdf_create($db, $_REQUEST['id'], $_REQUEST['model'], $outputlangs);
     if ($result <= 0)
     {
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index 1f6b06fc0f7..bc4af39ffc1 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -202,13 +202,23 @@ if ($_POST["action"] == 'confirm_cancel' && $_POST["confirm"] == yes && $user->r
 	 */
 if ($_POST['action'] == 'builddoc')
 {
-	commande_supplier_pdf_create($db, $_GET['id'],$_POST['model']);
+	if ($_REQUEST['lang_id'])
+	{
+		$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+		$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+	}
+	commande_supplier_pdf_create($db, $_GET['id'],$_POST['model'],$outputlangs);
 }
 if($_GET['action'] == 'builddoc')
 {
 	$commande = new CommandeFournisseur($db);
 	$commande->fetch($_GET['id']);
-	commande_supplier_pdf_create($db, $_GET['id'],$commande->modelpdf);
+	if ($_REQUEST['lang_id'])
+	{
+		$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+		$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+	}
+	commande_supplier_pdf_create($db, $_GET['id'],$commande->modelpdf,$outputlangs);
 }
 
 /*
diff --git a/htdocs/fourn/commande/modules/modules_commandefournisseur.php b/htdocs/fourn/commande/modules/modules_commandefournisseur.php
index d1c8e1c52dd..c520584e340 100644
--- a/htdocs/fourn/commande/modules/modules_commandefournisseur.php
+++ b/htdocs/fourn/commande/modules/modules_commandefournisseur.php
@@ -135,7 +135,7 @@ class ModeleNumRefCommandesSuppliers
     }
     
 }
-function commande_supplier_pdf_create($db, $comid, $modele='')
+function commande_supplier_pdf_create($db, $comid, $modele='',$outputlangs='')
 {
   global $langs;
   $langs->load("suppliers");
@@ -164,7 +164,7 @@ function commande_supplier_pdf_create($db, $comid, $modele='')
   
       $obj = new $classname($db);
 
-      if ( $obj->write_pdf_file($comid) > 0)
+      if ($obj->write_pdf_file($comid,$outputlangs) > 0)
         {
           // on supprime l'image correspondant au preview
            commande_supplier_delete_preview($db, $comid);
diff --git a/htdocs/includes/modules/commande/modules_commande.php b/htdocs/includes/modules/commande/modules_commande.php
index 58f653ccf67..6f842086d87 100644
--- a/htdocs/includes/modules/commande/modules_commande.php
+++ b/htdocs/includes/modules/commande/modules_commande.php
@@ -184,7 +184,7 @@ function commande_pdf_create($db, $id, $modele='', $outputlangs='')
 	
 		$obj = new $classname($db);
 	
-		if ( $obj->write_pdf_file($id, $outputlangs) > 0)
+		if ($obj->write_pdf_file($id, $outputlangs) > 0)
 		{
 			// on supprime l'image correspondant au preview
 			commande_delete_preview($db, $id);
diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php
index 54dbe21cb8d..f1e14f73882 100644
--- a/htdocs/includes/modules/facture/pdf_crabe.modules.php
+++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php
@@ -799,7 +799,7 @@ class pdf_crabe extends ModelePDFFactures
         $pdf->SetTextColor(0,0,60);
         $pdf->MultiCell(100, 4, $outputlangs->trans("Ref")." : " . $fac->ref, '', 'R');
         
-        $pdf->SetFont('Arial','B',12);
+        $pdf->SetFont('Arial','',12);
 
         $posy+=6;
         $pdf->SetXY(100,$posy);
diff --git a/htdocs/includes/modules/fichinter/modules_fichinter.php b/htdocs/includes/modules/fichinter/modules_fichinter.php
index 3465abe44f8..cb6eced2636 100644
--- a/htdocs/includes/modules/fichinter/modules_fichinter.php
+++ b/htdocs/includes/modules/fichinter/modules_fichinter.php
@@ -178,7 +178,7 @@ function fichinter_pdf_create($db, $id, $modele='', $outputlangs='')
 	
 		$obj = new $classname($db);
 	
-		if ( $obj->write_pdf_file($id,$outputlangs) > 0)
+		if ($obj->write_pdf_file($id,$outputlangs) > 0)
 		{
 			return 1;
 		}
diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php
index 29ef50eb676..54cb46eedd0 100644
--- a/htdocs/livraison/fiche.php
+++ b/htdocs/livraison/fiche.php
@@ -140,8 +140,11 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes')
  */
 if ($_REQUEST['action'] == 'builddoc')	// En get ou en post
 {
-	$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
-	$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+	if ($_REQUEST['lang_id'])
+	{
+		$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+		$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+	}
 	$result=delivery_order_pdf_create($db, $_REQUEST['id'],$_REQUEST['model'],$outputlangs);
     if ($result <= 0)
     {
diff --git a/htdocs/livraison/mods/modules_livraison.php b/htdocs/livraison/mods/modules_livraison.php
index 07e28aa871e..51516cc66f6 100644
--- a/htdocs/livraison/mods/modules_livraison.php
+++ b/htdocs/livraison/mods/modules_livraison.php
@@ -164,7 +164,7 @@ function delivery_order_pdf_create($db, $deliveryid, $modele='', $outputlangs=''
   
       $obj = new $classname($db);
 
-      if ( $obj->write_pdf_file($deliveryid) > 0)
+      if ($obj->write_pdf_file($deliveryid,$outputlangs) > 0)
         {
           // on supprime l'image correspondant au preview
            delivery_order_delete_preview($db, $deliveryid);