openerp-dev-web team mailing list archive

["Ashvin Rathod \(OpenERP\)" <ara@xxxxxxxxxxx>]

Ashvin Rathod (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-706287-ara into lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #706287 in OpenERP Addons: "6.0.1 account - legal reports - 'Display accounts' dropdown"
  https://bugs.launchpad.net/openobject-addons/+bug/706287

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-706287-ara/+merge/53405

Hello,

Fix the bug: 6.0.1 account - legal reports - 'Display accounts' dropdown
https://bugs.launchpad.net/openobject-addons/+bug/706287

Thanks,
ara
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-706287-ara/+merge/53405
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-706287-ara.

=== modified file 'account/report/account_balance.py'
--- account/report/account_balance.py	2011-02-15 13:27:07 +0000
+++ account/report/account_balance.py	2011-03-15 11:29:30 +0000
@@ -89,7 +89,7 @@
                 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']):

=== modified file 'account/report/account_balance_sheet.py'
--- account/report/account_balance_sheet.py	2011-02-07 11:48:54 +0000
+++ account/report/account_balance_sheet.py	2011-03-15 11:29:30 +0000
@@ -144,7 +144,7 @@
                     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):

=== modified file 'account/report/account_profit_loss.py'
--- account/report/account_profit_loss.py	2011-02-07 11:48:54 +0000
+++ account/report/account_profit_loss.py	2011-03-15 11:29:30 +0000
@@ -114,7 +114,7 @@
                     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):