From 96d704dd5b594ec36e7d0033b826294d41f5f554 Mon Sep 17 00:00:00 2001 From: "ARA (OpenERP)" Date: Tue, 15 Mar 2011 16:56:45 +0530 Subject: [PATCH] [FIX] account: legal reports - Display accounts dropdown lp bug: https://launchpad.net/bugs/706287 fixed bzr revid: ara@tinyerp.com-20110315112645-3stqj1l8j3gdpkwt --- addons/account/report/account_balance.py | 2 +- addons/account/report/account_balance_sheet.py | 2 +- addons/account/report/account_profit_loss.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py index 5d9cfac5699..80508ede44b 100644 --- a/addons/account/report/account_balance.py +++ b/addons/account/report/account_balance.py @@ -89,7 +89,7 @@ class account_balance(report_sxw.rml_parse, common_report_header): self.sum_debit += account_rec['debit'] self.sum_credit += account_rec['credit'] if disp_acc == 'bal_movement': - if not currency_obj.is_zero(self.cr, self.uid, currency, res['credit']) > 0 or not currency_obj.is_zero(self.cr, self.uid, currency, res['debit']) > 0 or not currency_obj.is_zero(self.cr, self.uid, currency, res['balance']): + if not currency_obj.is_zero(self.cr, self.uid, currency, res['credit']) or not currency_obj.is_zero(self.cr, self.uid, currency, res['debit']) or not currency_obj.is_zero(self.cr, self.uid, currency, res['balance']): self.result_acc.append(res) elif disp_acc == 'bal_solde': if not currency_obj.is_zero(self.cr, self.uid, currency, res['balance']): diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py index e13fa43fac5..fa80ad96f3c 100644 --- a/addons/account/report/account_balance_sheet.py +++ b/addons/account/report/account_balance_sheet.py @@ -144,7 +144,7 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header) if typ == 'asset' and account.type <> 'view' and (account.debit <> account.credit): self.result_sum_cr += account.balance if data['form']['display_account'] == 'bal_movement': - if not currency_pool.is_zero(self.cr, self.uid, currency, account.credit) > 0 or not currency_pool.is_zero(self.cr, self.uid, currency, account.debit) > 0 or not currency_pool.is_zero(self.cr, self.uid, currency, account.balance): + if not currency_pool.is_zero(self.cr, self.uid, currency, account.credit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.debit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.balance): accounts_temp.append(account_dict) elif data['form']['display_account'] == 'bal_solde': if not currency_pool.is_zero(self.cr, self.uid, currency, account.balance): diff --git a/addons/account/report/account_profit_loss.py b/addons/account/report/account_profit_loss.py index 6f16048d3a8..b672c930f95 100644 --- a/addons/account/report/account_profit_loss.py +++ b/addons/account/report/account_profit_loss.py @@ -114,7 +114,7 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header): if typ == 'income' and account.type <> 'view' and (account.debit <> account.credit): self.result_sum_cr += abs(account.debit - account.credit) if data['form']['display_account'] == 'bal_movement': - if not currency_pool.is_zero(self.cr, self.uid, currency, account.credit) > 0 or not currency_pool.is_zero(self.cr, self.uid, currency, account.debit) > 0 or not currency_pool.is_zero(self.cr, self.uid, currency, account.balance): + if not currency_pool.is_zero(self.cr, self.uid, currency, account.credit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.debit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.balance): accounts_temp.append(account) elif data['form']['display_account'] == 'bal_solde': if not currency_pool.is_zero(self.cr, self.uid, currency, account.balance):