Merge feature-sidebar with conflicts

2017-05-27 11:30:22 +03:00
parent 12d7ca0835 14ed32931b
commit 9276f4cafb
7 changed files with 66 additions and 3 deletions
@@ -103,7 +103,7 @@ class Member(BaseMember):
            latest = payments.latest('date')
            date = latest.date
            return date
-        except DoesNotExist:
+        except Payment.DoesNotExist:
            return None

    @staticmethod