diff --git a/src/backoffice/templates/chain_detail_backoffice.html b/src/backoffice/templates/chain_detail_backoffice.html index 987bc9a88..0d6f60dee 100644 --- a/src/backoffice/templates/chain_detail_backoffice.html +++ b/src/backoffice/templates/chain_detail_backoffice.html @@ -55,6 +55,17 @@
{{ chain.notes }}
+ {% endif %} + + {% endfor %} + {% endif %}
@@ -29,6 +29,17 @@ |
diff --git a/src/economy/templates/includes/expense_list_panel.html b/src/economy/templates/includes/expense_list_panel.html
index a7aced8a2..cc4371058 100644
--- a/src/economy/templates/includes/expense_list_panel.html
+++ b/src/economy/templates/includes/expense_list_panel.html
@@ -4,6 +4,9 @@
|||||||||||||||||||||||||
| ID | + {% if past_camps %} +Camp | + {% endif %}Invoice Date | Created By | {% if not reimbursement %} @@ -24,9 +27,12 @@ {% for expense in expense_list %}||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{ expense.pk }} | +{{ expense.pk }} | {% else %} -{{ expense.pk }} | +{{ expense.pk }} | + {% endif %} + {% if past_camps %} +{{ expense.camp.title }} | {% endif %}{{ expense.invoice_date }} | {{ expense.user.email }} | @@ -43,9 +49,9 @@{% if expense.reimbursement and not expense.paid_by_bornhack %} {% if request.resolver_match.app_name == "backoffice" %} - Details + Details {% else %} - Details + Details {% endif %} {% else %} N/A @@ -55,15 +61,15 @@ | {% if request.resolver_match.app_name == "backoffice" %} - Details + Details {% if request.user.is_staff %} Admin {% endif %} {% else %} - Details + Details {% if not expense.approved %} - Update - Delete + Update + Delete {% endif %} {% endif %} | diff --git a/src/economy/templates/includes/revenue_list_panel.html b/src/economy/templates/includes/revenue_list_panel.html index 6a306b03d..d0f4995cc 100644 --- a/src/economy/templates/includes/revenue_list_panel.html +++ b/src/economy/templates/includes/revenue_list_panel.html @@ -4,6 +4,9 @@|||||||||||||||||
| ID | + {% if past_camps %} +Camp | + {% endif %}Invoice Date | Created By | Debtor | @@ -18,6 +21,9 @@ {% for revenue in revenue_list %}|||||||||||||||||||||
| {{ revenue.pk }} | + {% if past_camps %} +{{ revenue.camp.title }} | + {% endif %}{{ revenue.invoice_date }} | {{ revenue.user.email }} | {{ revenue.debtor }} | @@ -27,14 +33,14 @@{{ revenue.approval_status }} | {% if request.resolver_match.app_name == "backoffice" %} - Details + Details {% if request.user.is_staff %} Admin {% endif %} {% else %} - Details - Update - Delete + Details + Update + Delete {% endif %} |