From 1e6e7e0af64e3c010286ffcd5155e314a9b575cd Mon Sep 17 00:00:00 2001
From: Vincent Vinet <vincent.vinet@savoirfairelinux.com>
Date: Wed, 29 Oct 2014 08:40:10 -0400
Subject: [PATCH] remove Foreign Currency Registered Balance, fix formula for
 registered difference in currency

---
 .../account_banking_reconciliation.py         | 19 ++-----------------
 .../account_banking_reconciliation_view.xml   |  4 ----
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/account_banking_reconciliation/account_banking_reconciliation.py b/account_banking_reconciliation/account_banking_reconciliation.py
index 537bee35e..8afbadf89 100644
--- a/account_banking_reconciliation/account_banking_reconciliation.py
+++ b/account_banking_reconciliation/account_banking_reconciliation.py
@@ -454,7 +454,7 @@ class bank_acc_rec_statement(orm.Model):
                 account_precision)
             sres['difference_in_currency'] = round(
                 (statement.ending_balance_in_currency
-                 + sres['cleared_balance_in_currency']
+                 - sres['cleared_balance_in_currency']
                  - statement.starting_balance),
                 account_precision)
             sres['general_ledger_balance'] = self._get_gl_balance(
@@ -464,11 +464,6 @@ class bank_acc_rec_statement(orm.Model):
                  + sres['cleared_balance']
                  + sres['uncleared_balance']),
                 account_precision)
-            sres['registered_balance_in_currency'] = round(
-                (statement.starting_balance_in_currency
-                 + sres['cleared_balance_in_currency']
-                 + sres['uncleared_balance_in_currency']),
-                account_precision)
 
         return res
 
@@ -1056,17 +1051,7 @@ class bank_acc_rec_statement(orm.Model):
             string='Registered Balance',
             digits_compute=dp.get_precision('Account'),
             help="Initial balance + Cleared Balance + Uncleared Balance",
-            multi="balance"
-        ),
-        'registered_balance_in_currency': fields.function(
-            _get_balance,
-            method=True,
-            type='float',
-            string='Registered Balance',
-            digits_compute=dp.get_precision('Account'),
-            help="Initial balance + Cleared Balance + Uncleared Balance",
-            multi="balance"
-        ),
+            multi="balance"),
         'adjustment_move_id': fields.many2one(
             'account.move',
             'Adjustement Move',
diff --git a/account_banking_reconciliation/account_banking_reconciliation_view.xml b/account_banking_reconciliation/account_banking_reconciliation_view.xml
index 3cfcf8cc3..d64094ab8 100644
--- a/account_banking_reconciliation/account_banking_reconciliation_view.xml
+++ b/account_banking_reconciliation/account_banking_reconciliation_view.xml
@@ -193,10 +193,6 @@
                         <group name="gen_ledger" col="2" colspan="2">
                           <field name="general_ledger_balance" colspan="2"/>
                           <field name="registered_balance" />
-                          <field name="registered_balance_in_currency"
-                            string="Foreign Currency Registered Balance"
-                            attrs="{'invisible':[('multi_currency', '=', False)]}"
-                            />
                           <field name="adjustment_move_id" readonly="1"
                             attrs="{'invisible':[('multi_currency', '=', False)]}"
                             />