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/3] [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 eff87b20eca6e9726151d31f9f0b0bc1a6c02dd4 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Thu, 3 Feb 2011 16:25:28 +0530 Subject: [PATCH 2/3] [FIX] pos: [wizard: pos_payment] When you create invoices with different currencies set, the price is well mapped, but with the wrong currency lp bug: https://launchpad.net/bugs/710462 fixed bzr revid: mra@mra-laptop-20110203105528-0pe8uzhg0brgib58 --- addons/point_of_sale/point_of_sale.py | 2 ++ addons/point_of_sale/point_of_sale_view.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index 8873ecf07e4..846c9e44514 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -70,6 +70,7 @@ class pos_order(osv.osv): return super(pos_order, self).unlink(cr, uid, ids, context=context) def onchange_partner_pricelist(self, cr, uid, ids, part=False, context=None): + """ Changed price list on_change of partner_id""" if not part: return {'value': {}} @@ -647,6 +648,7 @@ class pos_order(osv.osv): 'reference': order.name, 'partner_id': order.partner_id.id, 'comment': order.note or '', + 'currency_id': order.partner_id.property_product_pricelist.currency_id.id, # considering partner's sale pricelist's currency } inv.update(inv_ref.onchange_partner_id(cr, uid, [], 'out_invoice', order.partner_id.id)['value']) if not inv.get('account_id', None): diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index 5bf85aba602..50108d26dad 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -88,7 +88,7 @@ - + From 4900c4184256e7f7ac535ac78a6f08cf87ab52bf Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 3 Feb 2011 23:20:26 +0100 Subject: [PATCH 3/3] [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: