Changeset 15842 for main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students

Timestamp:

25 Nov 2019, 11:02:44 (5 years ago)

Author:

Henrik Bettermann

Message:

Show correct buttons if payment state in ('paid', 'waived', 'scholarship').

Location:

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students

Files:

• browser.py (modified) (1 diff)
• viewlets.py (modified) (1 diff)

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/browser.py

@@ -392 +392 @@
         tabledata.append(sorted(
             [value for value in self.context['payments'].values()
-             if value.p_state in ('paid', 'waived')], key=lambda value: value.p_session))
+             if value.p_state in ('paid', 'waived', 'scholarship')],
+             key=lambda value: value.p_session))
         tableheader.append([(P_ID,'p_id', 4.2),
                          #(CD,'creation_date', 3),

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/viewlets.py

@@ -60 +60 @@
     @property
     def target_url(self):
-        if not self.context.r_company:
+        if not self.context.p_state in ('waived', 'scholarship') \
+            and not self.context.r_company:
             return ''
         return self.view.url(self.view.context, self.target)