audrius/bank-payment
1
0
Fork 1
mirror of https://github.com/OCA/bank-payment.git synced 2025-02-02 10:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove Foreign Currency Registered Balance, fix formula for registered difference in currency

Browse Source
This commit is contained in:
Vincent Vinet
2014-10-29 08:40:10 -04:00
committed by Sandy Carter
parent 08d14419cf
commit 1e6e7e0af6
2 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
account_banking_reconciliation/account_banking_reconciliation.py
View File

@@ -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',

4
account_banking_reconciliation/account_banking_reconciliation_view.xml
View File

@@ -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)]}"
/>