Merge PR #77 into 12.0

Signed-off-by pedrobaeza
OCA · Nov 21, 2019 · cf88214 · cf88214
2 parents ec9c658 + 6a226c3
commit cf88214
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/membership_extension/models/res_partner.py b/membership_extension/models/res_partner.py
@@ -133,7 +133,8 @@ def _compute_membership_date(self):
                             date_from = line.date_from
                         if not last_to or last_to < line_date_to:
                             last_to = line_date_to
-                    if not last_cancel or last_cancel < line.date_cancel:
+                    if not last_cancel or (line.date_cancel
+                                           and last_cancel < line.date_cancel):
                         last_cancel = line.date_cancel
                 partner.membership_start = date_from
                 partner.membership_last_start = last_from