Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-bug-706287-ara into lp:openobject-addons

  1. trunk-bug-706287-ara
  2. Merge into trunk
Proposed by Ashvin Rathod (OpenERP)
Status: Merged
Merged at revision: 4553
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-706287-ara
Merge into: lp:openobject-addons
Diff against target: 38 lines (+3/-3)
3 files modified
account/report/account_balance.py (+1/-1)
account/report/account_balance_sheet.py (+1/-1)
account/report/account_profit_loss.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-706287-ara
Reviewer Review Type Date Requested Status
Mustufa Rangwala (Open ERP) (community) Approve
OpenERP buildbot (community) Disapprove
qdp (OpenERP) Pending
Review via email: mp+53405@code.launchpad.net

Description of the change

Hello,

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

Thanks,
ara

To post a comment you must log in.
Revision history for this message
OpenERP buildbot (openerp-buildbot) wrote :

hr_evaluation/test/test_hr_evaluation.yml: ('warning', 'Warning !')
crm_partner_assign/test/test_crm_partner_assign.yml[warning]: AssertionError in Python code : SMTP not configured !
project_timesheet/test/worktask_entry_to_timesheetline_entry.yml[warning]: Assertion "After hr manager's work task" FAILED test: len(timesheet_ids) > 0 values: ! 0 > 0
~/addons/anonymization/anonymization.py:298[pywarn]: The behavior of this method will change in future versions. Use specific 'len(elem)' or 'elem is not None' test instead.
~/addons/anonymization/anonymization.py:300[pywarn]: The behavior of this method will change in future versions. Use specific 'len(elem)' or 'elem is not None' test instead.

review: Disapprove
Revision history for this message
Mustufa Rangwala (Open ERP) (mra-tinyerp) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/report/account_balance.py'
2--- account/report/account_balance.py 2011-02-15 13:27:07 +0000
3+++ account/report/account_balance.py 2011-03-15 11:29:30 +0000
4@@ -89,7 +89,7 @@
5 self.sum_debit += account_rec['debit']
6 self.sum_credit += account_rec['credit']
7 if disp_acc == 'bal_movement':
8- 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']):
9+ 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']):
10 self.result_acc.append(res)
11 elif disp_acc == 'bal_solde':
12 if not currency_obj.is_zero(self.cr, self.uid, currency, res['balance']):
13
14=== modified file 'account/report/account_balance_sheet.py'
15--- account/report/account_balance_sheet.py 2011-02-07 11:48:54 +0000
16+++ account/report/account_balance_sheet.py 2011-03-15 11:29:30 +0000
17@@ -144,7 +144,7 @@
18 if typ == 'asset' and account.type <> 'view' and (account.debit <> account.credit):
19 self.result_sum_cr += account.balance
20 if data['form']['display_account'] == 'bal_movement':
21- 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):
22+ 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):
23 accounts_temp.append(account_dict)
24 elif data['form']['display_account'] == 'bal_solde':
25 if not currency_pool.is_zero(self.cr, self.uid, currency, account.balance):
26
27=== modified file 'account/report/account_profit_loss.py'
28--- account/report/account_profit_loss.py 2011-02-07 11:48:54 +0000
29+++ account/report/account_profit_loss.py 2011-03-15 11:29:30 +0000
30@@ -114,7 +114,7 @@
31 if typ == 'income' and account.type <> 'view' and (account.debit <> account.credit):
32 self.result_sum_cr += abs(account.debit - account.credit)
33 if data['form']['display_account'] == 'bal_movement':
34- 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):
35+ 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):
36 accounts_temp.append(account)
37 elif data['form']['display_account'] == 'bal_solde':
38 if not currency_pool.is_zero(self.cr, self.uid, currency, account.balance):

Subscribers

People subscribed via source and target branches

to all changes: