From 794e9050504381b555e64a53ebd8ef1fd104ba43 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Thu, 13 Sep 2018 14:09:17 +0200 Subject: [PATCH] show both user and reimbursement_user for reimbursements --- src/backoffice/templates/reimbursement_list.html | 4 ++-- .../templates/includes/reimbursement_detail_panel.html | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/backoffice/templates/reimbursement_list.html b/src/backoffice/templates/reimbursement_list.html index da716159..9c4a52a7 100644 --- a/src/backoffice/templates/reimbursement_list.html +++ b/src/backoffice/templates/reimbursement_list.html @@ -16,7 +16,7 @@ Camp - Created by + Created Reimbursement User Economy Team Notes Amount @@ -29,7 +29,7 @@ {% for reim in reimbursement_list %} {{ reim.camp }} - {{ reim.user }} + {{ reim.created }} by {{ reim.user }} {{ reim.reimbursement_user }} {{ reim.notes|default:"N/A" }} {{ reim.amount }} DKK diff --git a/src/economy/templates/includes/reimbursement_detail_panel.html b/src/economy/templates/includes/reimbursement_detail_panel.html index da010bc5..8d4d0cb1 100644 --- a/src/economy/templates/includes/reimbursement_detail_panel.html +++ b/src/economy/templates/includes/reimbursement_detail_panel.html @@ -1,7 +1,11 @@
-
Reimbursement Details for {{ reimbursement.pk }}
+
Reimbursement Details for {{ reimbursement.pk }} for {{ reimbursement.reimbursement_user }}
+ + + + @@ -16,7 +20,7 @@ - +
Reimbursement User{{ reimbursement.reimbursement_user }}
Total Amount {{ reimbursement.amount }} DKK
Created{{ reimbursement.created }}{{ reimbursement.created }} by {{ reimbursement.user }}
Expenses covered by this Reimbursement