From: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Date: Tue, 15 Jan 2013 15:41:20 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/julm' into membership_grouped
X-Git-Url: http://git.cyclocoop.org/?p=burette%2Fremembership.git;a=commitdiff_plain;h=7493b84e73315b3b9c47dfdd03c0b2e3b2b910fe;hp=596819ceceb6412bf2f53581667c97814645616f

Merge remote-tracking branch 'origin/julm' into membership_grouped
---

diff --git a/remembership.py b/remembership.py
index 999f8c8..b88034f 100644
--- a/remembership.py
+++ b/remembership.py
@@ -182,7 +182,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 = 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")