From 3158e8db2cd1c2338386937bf4dedcfcd1c7d0b6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 8 Jun 2009 19:21:40 +0000
Subject: [PATCH] Currency of a bank account can be changed. However if
 currenci differs from default, amount must be changed during conciliation to
 reflect true amount in bank account currency.

---
 htdocs/compta/bank/account.class.php |  1 +
 htdocs/compta/bank/fiche.php         | 39 ++++++++++++++--------------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/htdocs/compta/bank/account.class.php b/htdocs/compta/bank/account.class.php
index 5576abf4f49..6459bdccce3 100644
--- a/htdocs/compta/bank/account.class.php
+++ b/htdocs/compta/bank/account.class.php
@@ -551,6 +551,7 @@ class Account extends CommonObject
 				$this->account_number = $obj->account_number;
 
 				$this->currency_code  = $obj->currency_code;
+				$this->account_currency_code  = $obj->currency_code;
 				$this->min_allowed    = $obj->min_allowed;
 				$this->min_desired    = $obj->min_desired;
 				$this->comment        = $obj->comment;
diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php
index aff4369bc6c..0ce9faafbb0 100644
--- a/htdocs/compta/bank/fiche.php
+++ b/htdocs/compta/bank/fiche.php
@@ -20,11 +20,11 @@
  */
 
 /**
-	    \file       htdocs/compta/bank/fiche.php
-        \ingroup    banque
-		\brief      Fiche creation compte bancaire
-		\version    $Id$
-*/
+ *	    \file       htdocs/compta/bank/fiche.php
+ *      \ingroup    banque
+ *		\brief      Fiche creation compte bancaire
+ *		\version    $Id$
+ */
 
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php");
@@ -148,6 +148,9 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == "yes" && $user-
 }
 
 
+/*
+ * View
+ */
 
 llxHeader();
 
@@ -198,13 +201,13 @@ if ($_GET["action"] == 'create')
 	// Currency
 	print '<tr><td valign="top">'.$langs->trans("Currency").'</td>';
 	print '<td colspan="3">';
-/*
+
 	$selectedcode=$account->account_currency_code;
 	if (! $selectedcode) $selectedcode=$conf->monnaie;
 	$form->select_currency($selectedcode, 'account_currency_code');
-*/
-	print $langs->trans("Currency".$conf->monnaie);
-	print '<input type="hidden" name="account_currency_code" value="'.$conf->monnaie.'">';
+	//print $langs->trans("Currency".$conf->monnaie);
+	//print '<input type="hidden" name="account_currency_code" value="'.$conf->monnaie.'">';
+
 	print '</td></tr>';
 
 	// Pays
@@ -286,7 +289,7 @@ else
 		dol_fiche_head($head, 'bankname', $langs->trans("FinancialAccount"));
 
 		/*
-		* Confirmation de la suppression
+		* Confirmation to delete
 		*/
 		if ($_GET["action"] == 'delete')
 		{
@@ -327,13 +330,11 @@ else
 		// Currency
 		print '<tr><td valign="top">'.$langs->trans("Currency").'</td>';
 		print '<td colspan="3">';
-	/*
+
 		$selectedcode=$account->account_currency_code;
 		if (! $selectedcode) $selectedcode=$conf->monnaie;
-		$form->select_currency($selectedcode, 'account_currency_code');
-	*/
-		print $langs->trans("Currency".$conf->monnaie);
-		print '<input type="hidden" name="account_currency_code" value="'.$conf->monnaie.'">';
+		print $langs->trans("Currency".$selectedcode);
+
 		print '</td></tr>';
 
 		print '<tr><td valign="top">'.$langs->trans("BalanceMinimalAllowed").'</td>';
@@ -439,13 +440,13 @@ else
 		print '<input type="hidden" value="'.$account->currency_code.'">';
 		print '</td>';
 		print '<td colspan="3">';
-	/*
+
 		$selectedcode=$account->account_currency_code;
 		if (! $selectedcode) $selectedcode=$conf->monnaie;
 		$form->select_currency($selectedcode, 'account_currency_code');
-	*/
-		print $langs->trans("Currency".$conf->monnaie);
-		print '<input type="hidden" name="account_currency_code" value="'.$conf->monnaie.'">';
+		//print $langs->trans("Currency".$conf->monnaie);
+		//print '<input type="hidden" name="account_currency_code" value="'.$conf->monnaie.'">';
+
 		print '</td></tr>';
 
 		print '<tr><td valign="top">'.$langs->trans("BalanceMinimalAllowed").'</td>';