From 3b9c8a685b42d638d7c7185218a26350bb41cbf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Wed, 29 Jul 2015 19:29:18 +0200
Subject: [PATCH 1/2] Fix #3314 Display state in bank account card

---
 htdocs/compta/bank/fiche.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php
index bdb30e46528..428112f7289 100644
--- a/htdocs/compta/bank/fiche.php
+++ b/htdocs/compta/bank/fiche.php
@@ -419,7 +419,7 @@ else
 
 		// State
 		print '<tr><td>'.$langs->trans('State').'</td><td>';
-		if ($account->fk_departement > 0) print getState($account->fk_departement);
+		if ($account->state_id > 0) print getState($account->state_id);
 		print '</td></tr>';
 
 		// Conciliate

From a24f29ba8bea857787f013c054f1de75df6762b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sun, 9 Aug 2015 13:37:05 +0200
Subject: [PATCH 2/2] Fix [ bug #3341 ]: Missing translation in
 /compta/paiement_charge.php

Close #3341
---
 ChangeLog                         | 1 +
 htdocs/compta/paiement_charge.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1394e58a1f3..5054b4edb24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -41,6 +41,7 @@ English Dolibarr ChangeLog
 - Fix: [ bug #2696 ] Adding complementary attribute fails if code is numerics
 - Fix: [ bug #3074 ] Accruals accounting use payment date instead of commitment date in turnover reports for salaries
 - Fix: Not showing product supplier reference when page break
+- Fix: [ bug #3341 ] Missing translation in /compta/paiement_charge.php
 
 ***** ChangeLog for 3.6.2 compared to 3.6.1 *****
 - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice.
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index a54a0bcd935..a660259d706 100644
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -178,7 +178,7 @@ if ($_GET["action"] == 'create')
 
 	print '<table cellspacing="0" class="border" width="100%" cellpadding="2">';
 
-	print "<tr class=\"liste_titre\"><td colspan=\"3\">Charge</td>";
+	print "<tr class=\"liste_titre\"><td colspan=\"3\">".$langs->trans('Charge')."</td>";
 
 	print '<tr><td>'.$langs->trans("Ref").'</td><td colspan="2"><a href="'.DOL_URL_ROOT.'/compta/sociales/charges.php?id='.$chid.'">'.$chid.'</a></td></tr>';
 	print '<tr><td>'.$langs->trans("Type")."</td><td colspan=\"2\">".$charge->type_libelle."</td></tr>\n";