dépôts
/
burette
/
remembership.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[DATA] ~padding 6 for member_ident sequence
[burette/remembership.git]
/
remembership.py
diff --git
a/remembership.py
b/remembership.py
index
ad6438f
..
afb03d6
100644
(file)
--- a/
remembership.py
+++ b/
remembership.py
@@
-51,7
+51,7
@@
class Partner(osv.osv):
'membership_cancel': False
}
if name == 'membership_start':
'membership_cancel': False
}
if name == 'membership_start':
- line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id),('
date_cancel','=',False
)],
+ line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id),('
state','!=','canceled'
)],
limit=1, order='date_from', context=context)
if line_id:
res[partner.id]['membership_start'] = member_line_obj.read(cr, uid, line_id[0],
limit=1, order='date_from', context=context)
if line_id:
res[partner.id]['membership_start'] = member_line_obj.read(cr, uid, line_id[0],
@@
-62,7
+62,7
@@
class Partner(osv.osv):
print ("DEV: [_membership_date] date_from: %s" % str(res[partner.id]['membership_start']))
if name == 'membership_stop':
print ("DEV: [_membership_date] date_from: %s" % str(res[partner.id]['membership_start']))
if name == 'membership_stop':
- line_id1 = member_line_obj.search(cr, uid, [('partner', '=', partner_id),('
date_cancel','=',False
)],
+ line_id1 = member_line_obj.search(cr, uid, [('partner', '=', partner_id),('
state','!=','canceled'
)],
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],
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],