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

diff --git a/pos_membership.py b/pos_membership.py
index cce51b5..6a936d2 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: