From df6f269daa84a7ce5d481b2dd967568797ed0729 Mon Sep 17 00:00:00 2001 From: "Jay Vora (OpenERP)" Date: Thu, 3 Feb 2011 13:14:15 +0530 Subject: [PATCH 1/2] [FIX] setup.py : typo corrected lp bug: https://launchpad.net/bugs/710813 fixed bzr revid: jvo@tinyerp.com-20110203074415-35mt5cl2bk5szzr4 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 26f55de62a2..00667bcdf96 100755 --- a/setup.py +++ b/setup.py @@ -240,7 +240,7 @@ setup(name = name, 'reportlab', 'caldav', 'pyyaml', - 'pywebdav' + 'pywebdav', 'feedparser', ], extras_require={ From 4900c4184256e7f7ac535ac78a6f08cf87ab52bf Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 3 Feb 2011 23:20:26 +0100 Subject: [PATCH 2/2] [REVERT] account: reverted incorrect fix for bug 708603, this is in fact a server error Commit reverted was merged in rev 3164.118.782 mra@mra-laptop-20110131082002-xzx4v2adzdvv8nmg lp bug: https://launchpad.net/bugs/708603 fixed bzr revid: odo@openerp.com-20110203222026-ln6hmyivaj9bo11g --- addons/account/account.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 8a2cbdb8451..3abbe4cef2e 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -301,11 +301,10 @@ class account_account(osv.osv): for fn in field_names: sums.setdefault(current.id, {})[fn] = accounts.get(current.id, {}).get(fn, 0.0) for child in current.child_id: - if sums.get(child.id, False): - if child.company_id.currency_id.id == current.company_id.currency_id.id: - sums[current.id][fn] += sums[child.id][fn] - else: - sums[current.id][fn] += currency_obj.compute(cr, uid, child.company_id.currency_id.id, current.company_id.currency_id.id, sums[child.id][fn], context=context) + if child.company_id.currency_id.id == current.company_id.currency_id.id: + sums[current.id][fn] += sums[child.id][fn] + else: + sums[current.id][fn] += currency_obj.compute(cr, uid, child.company_id.currency_id.id, current.company_id.currency_id.id, sums[child.id][fn], context=context) res = {} null_result = dict((fn, 0.0) for fn in field_names) for id in ids: