From 0d853cf73d83af2730c24419dfb588785acaa7fe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 21 Nov 2013 02:49:22 +0100
Subject: [PATCH 1/2] Fix: [ bug #1118 ] Minor problem on print page link

---
 htdocs/main.inc.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index a8fc47ba413..7d1c9e310de 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1442,8 +1442,9 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 	    // Link to print main content area
 	    if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->browser->phone))
 	    {
-	        $qs=$_SERVER["QUERY_STRING"].($_SERVER["QUERY_STRING"]?'&':'').$morequerystring;
-	        $text ='<a href="'.$_SERVER["PHP_SELF"].'?'.$qs.($qs?'&amp;':'').'optioncss=print" target="_blank">';
+	        $qs=$_SERVER["QUERY_STRING"];
+	        $qs.=(($qs && $morequerystring)?'&':'').$morequerystring;
+	        $text ='<a href="'.$_SERVER["PHP_SELF"].'?'.$qs.($qs?'&':'').'optioncss=print" target="_blank">';
 	        $text.= img_picto('', 'printer.png', 'class="printer"');
 	        $text.='</a>';
 	        $toprightmenu.=$form->textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'',1);

From 29e029161f77c92bb488fa00bad45004b7c2a3cb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 21 Nov 2013 18:41:06 +0100
Subject: [PATCH 2/2] Fix: Restore translation lost because entry was not set
 into en_US lang.

---
 htdocs/langs/en_US/main.lang   | 1 +
 htdocs/langs/fr_FR/main.lang   | 1 +
 htdocs/langs/fr_FR/orders.lang | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 4f5485eb226..6876d0c6b2b 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -656,6 +656,7 @@ Deductible=Deductible
 from=from
 toward=toward
 Access=Access
+SetDemandReason=Set source
 
 # Week day
 Monday=Monday
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index dcb72b22cad..f642fe4c9b5 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -654,6 +654,7 @@ Deductible=Déductible
 from=de
 toward=vers
 Access=Accès
+SetDemandReason=Définir l'origine
 
 # Week day
 Monday=Lundi
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index 045b6223038..f0da79c799d 100644
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -144,7 +144,6 @@ OrderSource5=Commercial
 OrderSource6=Magasin
 QtyOrdered=Qté commandée
 AddDeliveryCostLine=Ajouter une ligne de frais port indiquant le poids de la commande
-SetDemandReason=Définir l'origine de la commande
 
 # Document models
 PDFEinsteinDescription=Modèle de commande complet (logo...)