From 1cf1e3c6aadac7c4cab66caad5fa6cf307085657 Mon Sep 17 00:00:00 2001 From: nel-tinyerp <> Date: Mon, 14 Mar 2011 16:25:17 +0530 Subject: [PATCH] [FIX] Membership : Corrected the date evaluation of membership based on membership cancellation (Ref : Case 4452) bzr revid: skh@tinyerp.com-20110314105517-qkh4j4mrovml2evj --- addons/membership/membership.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/membership/membership.py b/addons/membership/membership.py index 7353ac33336..48fd8dc2d41 100644 --- a/addons/membership/membership.py +++ b/addons/membership/membership.py @@ -284,14 +284,14 @@ class Partner(osv.osv): 'membership_cancel': False } if name == 'membership_start': - line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id)], + line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id),('date_cancel','=',False)], limit=1, order='date_from', context=context) if line_id: res[partner.id]['membership_start'] = member_line_obj.read(cr, uid, line_id[0], ['date_from'], context=context)['date_from'] if name == 'membership_stop': - line_id1 = member_line_obj.search(cr, uid, [('partner', '=', partner_id)], + line_id1 = member_line_obj.search(cr, uid, [('partner', '=', partner_id),('date_cancel','=',False)], limit=1, order='date_to desc', context=context) if line_id1: res[partner.id]['membership_stop'] = member_line_obj.read(cr, uid, line_id1[0],