odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[Merge] Merged the branch of Somesh for the fix of case 4452 

bzr revid: jvo@tinyerp.com-20110314120831-ib547iqaucf2z46e
This commit is contained in:
Jay Vora (OpenERP) 2011-03-14 17:38:31 +05:30
parent 66593da253 1cf1e3c6aa
commit 2848023c6c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/membership/membership.py
View File

@ -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],