dépôts
/
burette
/
pos_membership.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[FIX] free member membership state when partner is old or canceled partner
[burette/pos_membership.git]
/
pos_membership.py
diff --git
a/pos_membership.py
b/pos_membership.py
index
cce51b5
..
6a936d2
100644
(file)
--- 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)
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:
s = 4
if partner_data.member_lines:
for mline in partner_data.member_lines: