diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index f252443df80..155d5accabe 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -637,18 +637,19 @@ if ($action == 'addline' && $user->rights->commande->creer)
 
                 if ($result > 0)
                 {
-                    // 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=$object->client->default_lang;
-                    if (! empty($newlang))
-                    {
-                        $outputlangs = new Translate("",$conf);
-                        $outputlangs->setDefaultLang($newlang);
-                    }
                     if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
                     {
+                    	// Define output language
+                    	$outputlangs = $langs;
+                    	$newlang='';
+                    	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','int')) $newlang=GETPOST('lang_id','int');
+                    	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+                    	if (! empty($newlang))
+                    	{
+                    		$outputlangs = new Translate("",$conf);
+                    		$outputlangs->setDefaultLang($newlang);
+                    	}
+                    	
                         $ret=$object->fetch($id);    // Reload to get new records
                         commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
                     }
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index b30dd309167..09ebb908820 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -217,14 +217,19 @@ if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
         //print "xx".$tva_tx; exit;
         if ($result > 0)
         {
-            $outputlangs = $langs;
-            if (! empty($_REQUEST['lang_id']))
-            {
-                $outputlangs = new Translate("",$conf);
-                $outputlangs->setDefaultLang($_REQUEST['lang_id']);
-            }
             if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
             {
+            	// Define output language
+            	$outputlangs = $langs;
+            	$newlang='';
+            	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','int')) $newlang=GETPOST('lang_id','int');
+            	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+            	if (! empty($newlang))
+            	{
+            		$outputlangs = new Translate("",$conf);
+            		$outputlangs->setDefaultLang($newlang);
+            	}
+            	
                 $ret=$object->fetch($id);    // Reload to get new records
                 supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'));
             }
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index 001666bea71..0d7bdc829b5 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -507,12 +507,16 @@ if ($action == 'addline')
     //print "xx".$tva_tx; exit;
     if ($result > 0)
     {
-        $outputlangs = $langs;
-        if (! empty($_REQUEST['lang_id']))
-        {
-            $outputlangs = new Translate("",$conf);
-            $outputlangs->setDefaultLang($_REQUEST['lang_id']);
-        }
+    	// Define output language
+    	$outputlangs = $langs;
+    	$newlang='';
+    	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','int')) $newlang=GETPOST('lang_id','int');
+    	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+    	if (! empty($newlang))
+    	{
+    		$outputlangs = new Translate("",$conf);
+    		$outputlangs->setDefaultLang($newlang);
+    	}
         //if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_invoice_pdf_create($db, $object->id, $object->modelpdf, $outputlangs);
 
         unset($_POST['qty']);