From 919a34787eaee8cfb4cdbe4fd393fd326dafe76b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laurent=20L=C3=A9onard?= Date: Sun, 26 May 2013 16:30:22 +0200 Subject: [PATCH 1/3] Fix [ bug #895 ] Description is lost when adding a new predefined product to a contract --- htdocs/contrat/fiche.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 9c1f1ae2973..77553e67d13 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -432,7 +432,7 @@ else if ($action == 'addline' && $user->rights->contrat->creer) } $desc = $prod->description; - $desc.= $prod->description && GETPOST('desc') ? "\n" : ""; + $desc.= $prod->description && GETPOST('np_desc') ? "\n" : ""; $desc.= GETPOST('np_desc'); } else From 20de960a9513afa944fdf8bc5396fcc6ab65175b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laurent=20L=C3=A9onard?= Date: Sun, 26 May 2013 19:36:24 +0300 Subject: [PATCH 2/3] Fix typo in contracts language file name --- htdocs/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/index.php b/htdocs/index.php index 3ba4e63e03e..d5d0a21d9b2 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -197,7 +197,7 @@ if ($user->societe_id == 0) "propal", "orders", "bills", - "Contracts"); + "contracts"); // Loop and displays each line of table From dc783ed06eb1c26e4a7d5bfaf0f8e2f5e226c8c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laurent=20L=C3=A9onard?= Date: Sun, 26 May 2013 19:59:57 +0300 Subject: [PATCH 3/3] Fix typo in admin french language file --- htdocs/langs/fr_FR/admin.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 29333762881..6cecfd1102b 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -487,7 +487,7 @@ Module2900Desc= Capacités de conversion GeoIP Maxmind Module5000Name= Multi-société Module5000Desc= Permet de gérer plusieurs sociétés Module20000Name=Congés -Module20000Desc=Déclaration et suivi des congès des employés +Module20000Desc=Déclaration et suivi des congés des employés Module50000Name=PayBox Module50000Desc=Module permettant d'offrir en ligne une page de paiement par carte de crédit avec PayBox Module50100Name=Point de vente