dépôts
/
burette
/
remembership.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e256361
)
[date2date] : fix no 'date_from' in context.
author
Julien Moutinho
<julm+burette@autogeree.net>
Fri, 11 Jan 2013 16:35:17 +0000
(17:35 +0100)
committer
Julien Moutinho
<julm+burette@autogeree.net>
Fri, 11 Jan 2013 16:35:17 +0000
(17:35 +0100)
remembership.py
patch
|
blob
|
history
diff --git
a/remembership.py
b/remembership.py
index
48b1b45
..
849afcf
100644
(file)
--- a/
remembership.py
+++ b/
remembership.py
@@
-249,7
+249,10
@@
class account_invoice_line(osv.osv):
date_from = member_line.date_from
date_to = member_line.date_to
if line.product_id.membership_date2date:
date_from = member_line.date_from
date_to = member_line.date_to
if line.product_id.membership_date2date:
- date_from = context['date_from'] and datetime.strptime(context['date_from'], "%Y-%m-%d") or date.today()
+ date_from = ('date_from' in context
+ and context['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_from = date_from.strftime("%Y-%m-%d")
date_to = date_to .strftime("%Y-%m-%d")
date_to = date_from + relativedelta(months = +12) # TODO: parameterize this delta?
date_from = date_from.strftime("%Y-%m-%d")
date_to = date_to .strftime("%Y-%m-%d")