X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=pos_membership.py;h=a37bc521f6a2c347ddd2c4e1cec63e35514d13cf;hb=73b080e4996f56e1984f76b43c669c687329b7fd;hp=cce51b5632c911931eed5f5e7a77505e29f3fd00;hpb=335a3f0c69793b57da7d7a5443c25efa8f4029d4;p=burette%2Fpos_membership.git

diff --git a/pos_membership.py b/pos_membership.py
index cce51b5..a37bc52 100644
--- a/pos_membership.py
+++ b/pos_membership.py
@@ -385,12 +385,13 @@ class Partner(osv.osv):
         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:
@@ -477,9 +478,6 @@ class Partner(osv.osv):
                     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):
@@ -488,10 +486,7 @@ 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.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,