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

add amount in currency in separate column

Browse Source
This commit is contained in:
Vincent Vinet
2014-08-26 13:10:18 -04:00
committed by Sandy Carter
parent 3743a6c79f
commit 6b45f76868
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
npg_bank_account_reconciliation/npg_bank_account_reconciliation.py
View File

@@ -218,13 +218,10 @@ class bank_acc_rec_statement(osv.osv):
'type': line.credit and 'cr' or 'dr'
}
if all((line.currency_id,
line.company_id,
line.currency_id.id != line.company_id.currency_id.id)):
if line.credit:
res['amount'] = -line.amount_currency
else:
res['amount'] = line.amount_currency
if line.credit:
res['amount_in_currency'] = -line.amount_currency
else:
res['amount_in_currency'] = line.amount_currency
return res
@@ -390,6 +387,8 @@ class bank_acc_rec_statement_line(osv.osv):
'partner_id': fields.many2one('res.partner', string='Partner', help="Derived from related Journal Item."),
'amount': fields.float('Amount', digits_compute=dp.get_precision('Account'),
help="Derived from the 'debit' amount from related Journal Item."),
'amount_in_currency': fields.float('Amount in Currency', digits_compute=dp.get_precision('Account'),
help="Amount in currency from the related Journal Item."),
'date': fields.date('Date', required=True, help="Derived from related Journal Item."),
'statement_id': fields.many2one('bank.acc.rec.statement', 'Statement', required=True, ondelete='cascade'),
'move_line_id': fields.many2one('account.move.line', 'Journal Item', help="Related Journal Item."),

4
npg_bank_account_reconciliation/npg_bank_account_reconciliation_view.xml
View File

@@ -57,6 +57,7 @@
<field name="partner_id"/>
<field name="amount"/>
<field name="currency_id"/>
<field name="amount_in_currency"/>
<field name="research_required"/>
</form>
<tree string="Deposits, Credits, and Interest" editable="top">
@@ -67,6 +68,7 @@
<field name="partner_id"/>
<field name="amount"/>
<field name="currency_id"/>
<field name="amount_in_currency"/>
<field name="research_required"/>
<field name="move_line_id"/>
</tree>
@@ -81,6 +83,7 @@
<field name="partner_id"/>
<field name="amount"/>
<field name="currency_id"/>
<field name="amount_in_currency"/>
<field name="research_required"/>
</form>
<tree string="Checks, Withdrawals, Debits, and Service Charges" editable="top">
@@ -91,6 +94,7 @@
<field name="partner_id"/>
<field name="amount"/>
<field name="currency_id"/>
<field name="amount_in_currency"/>
<field name="research_required"/>
<field name="move_line_id"/>
</tree>