Techsystech
/
account-financial-reporting
mirror of https://github.com/OCA/account-financial-reporting.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #207 from mdietrichc2c/8.0-fix-balance-comp 

Fix comparison between balances
pull/130/merge
Pedro M. Baeza 2016-06-22 11:59:08 +02:00 committed by GitHub
parent 02719c76d9 4e769542dc
commit 771f7399cb
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
account_financial_report_webkit/report/common_balance_reports.py
View File

@ -314,7 +314,8 @@ class CommonBalanceReportHeaderWebkit(CommonReportHeaderWebkit):
for comp_account_by_id in comp_accounts_by_ids: for comp_account_by_id in comp_accounts_by_ids:
values = comp_account_by_id.get(account.id) values = comp_account_by_id.get(account.id)
values.update( values.update(
self._get_diff(account.balance, values['balance'])) self._get_diff(balance_accounts[account.id],
values['balance']))
display_account = any((values.get('credit', 0.0), display_account = any((values.get('credit', 0.0),
values.get('debit', 0.0), values.get('debit', 0.0),
values.get('balance', 0.0), values.get('balance', 0.0),

2
account_financial_report_webkit/report/common_partner_balance_reports.py
View File

@ -319,7 +319,7 @@ class CommonPartnerBalanceReportHeaderWebkit(CommonBalanceReportHeaderWebkit,
values = comp_account_by_id.get(account.id) values = comp_account_by_id.get(account.id)
values['account'].update( values['account'].update(
self._get_diff(account.balance, self._get_diff(balance_accounts[account.id],
values['account'].get('balance', 0.0))) values['account'].get('balance', 0.0)))
comp_accounts.append(values) comp_accounts.append(values)