From 10d930b094915ade51e570cf13a3c2a46402a353 Mon Sep 17 00:00:00 2001 From: gpa Date: Thu, 13 May 2010 17:55:41 +0530 Subject: [PATCH] [FIX] membership: membership cancel date is not updated bzr revid: gpa@tinyerp.com-20100513122541-088w3hu6x15m2kpr --- addons/membership/membership.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/addons/membership/membership.py b/addons/membership/membership.py index 7497ea49fd5..4b0384e1ca0 100644 --- a/addons/membership/membership.py +++ b/addons/membership/membership.py @@ -332,14 +332,15 @@ class Partner(osv.osv): '''Return the cancel date of membership''' res = {} member_line_obj = self.pool.get('membership.membership_line') - for partner_id in ids: - 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'] + for partner in self.browse(cr, uid, ids, context=context): + if partner.membership_state != 'canceled': + res[partner.id] = False else: - res[partner_id] = False + 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={}):