today = time.strftime('%Y-%m-%d')
for id in ids:
partner_data = self.browse(cr, uid, id, context=context)
- if partner_data.membership_cancel and today > partner_data.membership_cancel:
- res[id] = 'canceled'
- continue
- if partner_data.membership_stop and today > partner_data.membership_stop:
- res[id] = 'old'
- continue
+ if not partner_data.free_member:
+ if partner_data.membership_cancel and today > partner_data.membership_cancel:
+ res[id] = 'canceled'
+ continue
+ if partner_data.membership_stop and today > partner_data.membership_stop:
+ res[id] = 'old'
+ continue
s = 4
if partner_data.member_lines:
for mline in partner_data.member_lines:
res[id] = 'none'
if partner_data.free_member and s != 0:
res[id] = 'free'
- if partner_data.associate_member:
- res_state = self._membership_state(cr, uid, [partner_data.associate_member.id], name, args, context=context)
- res[id] = res_state[partner_data.associate_member.id]
return res
def _membership_date(self, cr, uid, ids, name, args, context=None):
res = {}
member_line_obj = self.pool.get('membership.membership_line')
for partner in self.browse(cr, uid, ids, context=context):
- if partner.associate_member:
- partner_id = partner.associate_member.id
- else:
- partner_id = partner.id
+ partner_id = partner.id
res[partner.id] = {
'membership_start': False,
'membership_stop': False,