From 274f7ab18be99f6f2c3bc7fe71d61c6b56e0c27f Mon Sep 17 00:00:00 2001 From: "mra (Open ERP)" Date: Thu, 19 Feb 2009 11:19:26 +0530 Subject: [PATCH] membership : bug fix bzr revid: mra@tinyerp.com-20090219054926-u4sdml1y3mq2pzy2 --- addons/membership/membership.py | 6 +++--- addons/membership/wizard/invoice_membership.py | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/addons/membership/membership.py b/addons/membership/membership.py index e28628a5713..32be0a9fea8 100644 --- a/addons/membership/membership.py +++ b/addons/membership/membership.py @@ -296,8 +296,8 @@ class Partner(osv.osv): if p[0] and p[0] != partner_data.id: associate_partners_list.append(p[0]) if associate_partners_list != []: - self._membership_state(cr, uid, associate_partners_list, name, args, context) - res[id] = partner_data.associate_member.membership_state + res_state = self._membership_state(cr, uid, associate_partners_list, name, args, context) + res[id] = res_state[partner_data.associate_member.id] #partner_data.associate_member.membership_state return res def _membership_start(self, cr, uid, ids, name, args, context=None): @@ -372,7 +372,7 @@ class Partner(osv.osv): selection = STATE ,store = { 'account.invoice':(_get_invoice_partner,['state'], 10), 'membership.membership_line':(_get_partner_id,['state'], 10), - 'res.partner':(_get_partners, ['free_member'], 10) + 'res.partner':(_get_partners, ['free_member','membership_state'], 10) } ), 'membership_start': fields.function( diff --git a/addons/membership/wizard/invoice_membership.py b/addons/membership/wizard/invoice_membership.py index 1321bb38491..7e2aeba4d1d 100644 --- a/addons/membership/wizard/invoice_membership.py +++ b/addons/membership/wizard/invoice_membership.py @@ -73,15 +73,18 @@ def _invoice_membership(self, cr, uid, data, context): if line_value['invoice_line_tax_id']: tax_tab = [(6, 0, line_value['invoice_line_tax_id'])] line_value['invoice_line_tax_id'] = tax_tab - invoice_line_id = invoice_line_obj.create(cr, uid, line_value) +# invoice_line_id = invoice_line_obj.create(cr, uid, line_value) invoice_id = invoice_obj.create(cr, uid, { 'partner_id' : partner_id, 'address_invoice_id': partner_address_ids[partner_id]['id'], 'account_id': account_id, - 'invoice_line':[(6,0,[invoice_line_id])], +# 'invoice_line':[(6,0,[invoice_line_id])], 'fiscal_position': fpos_id or False } ) + line_value['invoice_id'] = invoice_id + invoice_line_id = invoice_line_obj.create(cr, uid, line_value, context) + invoice_obj.write(cr, uid, invoice_id, {'invoice_line':[(6,0,[invoice_line_id])]}) invoice_list.append(invoice_id) if line_value['invoice_line_tax_id']: invoice_obj.write(cr, uid, [invoice_id], {'tax_line':tax_tab})