From e9bb40be31d4030609c80654ae91cc6a926693c8 Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Tue, 18 May 2010 11:58:49 +0530 Subject: [PATCH] [FIX] membership: membership cancel date is not updated bzr revid: jvo@tinyerp.com-20100518062849-l94h54ju9zp5n4la --- addons/membership/membership.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/addons/membership/membership.py b/addons/membership/membership.py index 9331e0ba982..0cddb4d9ee0 100644 --- a/addons/membership/membership.py +++ b/addons/membership/membership.py @@ -333,14 +333,11 @@ class Partner(osv.osv): res = {} member_line_obj = self.pool.get('membership.membership_line') for partner in self.browse(cr, uid, ids, context=context): - if partner.membership_state != 'canceled': - res[partner.id] = False - else: + res[partner.id] = False + if partner.membership_state == 'canceled': line_id = member_line_obj.search(cr, uid, [('partner', '=', partner.id)],limit=1, order='date_cancel') if line_id: res[partner.id] = member_line_obj.read(cr, uid, line_id[0],['date_cancel'])['date_cancel'] - else: - res[partner.id] = False return res def _get_partners(self, cr, uid, ids, context={}): @@ -389,7 +386,7 @@ class Partner(osv.osv): _membership_cancel, method = True, string = 'Cancel membership date', type='date', store = { - 'account.invoice':(_get_invoice_partner,['state'], 10), + 'account.invoice':(_get_invoice_partner,['state'], 11), 'membership.membership_line':(_get_partner_id,['state'], 10), 'res.partner':(lambda self,cr,uid,ids,c={}:ids, ['free_member'], 10) }