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
[MODULE] ~copyright
[burette/remembership.git]
/
remembership.py
diff --git
a/remembership.py
b/remembership.py
index
fcd89fe
..
e424e03
100644
(file)
--- a/
remembership.py
+++ b/
remembership.py
@@
-2,7
+2,7
@@
##############################################################################
#
# Remembership module for OpenERP, Membership module enhancement and bug fixes
##############################################################################
#
# Remembership module for OpenERP, Membership module enhancement and bug fixes
-# Copyright (C) 2012-201
3
L'Heureux Cyclage (<http://www.heureux-cyclage.org>)
+# Copyright (C) 2012-201
8
L'Heureux Cyclage (<http://www.heureux-cyclage.org>)
#
# This file is a part of Remembership
#
#
# This file is a part of Remembership
#
@@
-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],
@@
-253,7
+253,7
@@
class account_invoice_line(osv.osv):
and context.get('date_from')
and datetime.strptime(context('date_from'), "%Y-%m-%d")
or date.today())
and context.get('date_from')
and datetime.strptime(context('date_from'), "%Y-%m-%d")
or date.today())
- date_to = date_from + relativedelta(months
= +12
) # TODO: parameterize this delta?
+ date_to = date_from + relativedelta(months
=+12, days=-1
) # TODO: parameterize this delta?
date_from = date_from.strftime("%Y-%m-%d")
date_to = date_to .strftime("%Y-%m-%d")
print ("DEV: [remembership] [account_invoice_line] [write] date_from: %s" % str(date_from))
date_from = date_from.strftime("%Y-%m-%d")
date_to = date_to .strftime("%Y-%m-%d")
print ("DEV: [remembership] [account_invoice_line] [write] date_from: %s" % str(date_from))
@@
-325,7
+325,8
@@
class account_invoice_line(osv.osv):
and context.get('date_from')
and datetime.strptime(context.get('date_from'), "%Y-%m-%d")
or date.today())
and context.get('date_from')
and datetime.strptime(context.get('date_from'), "%Y-%m-%d")
or date.today())
- date_to = date_from + relativedelta(days = +364) # TODO: parameterize this delta?
+ print("#DEBUG: Date de début - %s" % str(date_from))
+ date_to = date_from + relativedelta(months=+12, days=-1) # TODO: parameterize this delta?
date_from = date_from.strftime("%Y-%m-%d")
date_to = date_to .strftime("%Y-%m-%d")
print ("DEV: [remembership] [account_invoice_line] [create] date_from: %s" % str(date_from))
date_from = date_from.strftime("%Y-%m-%d")
date_to = date_to .strftime("%Y-%m-%d")
print ("DEV: [remembership] [account_invoice_line] [create] date_from: %s" % str(date_from))