From 864a7e66730dd370168368230e10fae18a30b995 Mon Sep 17 00:00:00 2001
From: Thomas Steen Rasmussen <tykling@bornhack.org>
Date: Sun, 20 Jan 2019 15:39:59 +0100
Subject: [PATCH] add invoice_date to revenue and expense forms and templates

---
 src/economy/forms.py                                     | 8 ++++----
 src/economy/templates/includes/expense_detail_panel.html | 4 ++++
 src/economy/templates/includes/expense_list_panel.html   | 2 ++
 src/economy/templates/includes/revenue_detail_panel.html | 4 ++++
 src/economy/templates/includes/revenue_list_panel.html   | 4 +++-
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/economy/forms.py b/src/economy/forms.py
index 3dad210b..28bc3b2d 100644
--- a/src/economy/forms.py
+++ b/src/economy/forms.py
@@ -36,23 +36,23 @@ class CleanInvoiceForm(forms.ModelForm):
 class ExpenseCreateForm(CleanInvoiceForm):
     class Meta:
         model = Expense
-        fields = ['description', 'amount', 'invoice', 'paid_by_bornhack', 'responsible_team']
+        fields = ['description', 'amount', 'invoice', 'invoice_date', 'paid_by_bornhack', 'responsible_team']
 
 
 class ExpenseUpdateForm(forms.ModelForm):
     class Meta:
         model = Expense
-        fields = ['description', 'amount', 'paid_by_bornhack', 'responsible_team']
+        fields = ['description', 'amount', 'invoice_date', 'paid_by_bornhack', 'responsible_team']
 
 
 class RevenueCreateForm(CleanInvoiceForm):
     class Meta:
         model = Revenue
-        fields = ['description', 'amount', 'invoice', 'responsible_team']
+        fields = ['description', 'amount', 'invoice', 'invoice_date', 'responsible_team']
 
 
 class RevenueUpdateForm(forms.ModelForm):
     class Meta:
         model = Revenue
-        fields = ['description', 'amount', 'responsible_team']
+        fields = ['description', 'amount', 'invoice_date', 'responsible_team']
 
diff --git a/src/economy/templates/includes/expense_detail_panel.html b/src/economy/templates/includes/expense_detail_panel.html
index 89d17bee..85133171 100644
--- a/src/economy/templates/includes/expense_detail_panel.html
+++ b/src/economy/templates/includes/expense_detail_panel.html
@@ -6,6 +6,10 @@
           <th>Amount</th>
           <td>{{ expense.amount }} DKK</td>
         </tr>
+        <tr>
+          <th>Invoice Date</th>
+          <td>{{ expense.invoice_date }}</td>
+        </tr>
         <tr>
           <th>Description</th>
           <td>{{ expense.description }}</td>
diff --git a/src/economy/templates/includes/expense_list_panel.html b/src/economy/templates/includes/expense_list_panel.html
index efbdeeac..0617a549 100644
--- a/src/economy/templates/includes/expense_list_panel.html
+++ b/src/economy/templates/includes/expense_list_panel.html
@@ -6,6 +6,7 @@
     <th>Paid by</th>
     {% endif %}
     <th>Amount</th>
+    <th>Invoice Date</th>
     <th>Description</th>
     <th>Responsible Team</th>
     {% if not reimbursement %}
@@ -22,6 +23,7 @@
       <td>{% if expense.paid_by_bornhack %}BornHack{% else %}{{ expense.user }}{% endif %}</td>
       {% endif %}
       <td>{{ expense.amount }} DKK</td>
+      <td>{{ expense.invoice_date }}</td>
       <td>{{ expense.description }}</td>
       <td>{{ expense.responsible_team.name }} Team</td>
 
diff --git a/src/economy/templates/includes/revenue_detail_panel.html b/src/economy/templates/includes/revenue_detail_panel.html
index 80e97413..7fac5fea 100644
--- a/src/economy/templates/includes/revenue_detail_panel.html
+++ b/src/economy/templates/includes/revenue_detail_panel.html
@@ -6,6 +6,10 @@
               <th>Amount</th>
               <td>{{ revenue.amount }} DKK</td>
             </tr>
+            <tr>
+              <th>Invoice Date</th>
+              <td>{{ revenue.invoice_date }}</td>
+            </tr>
             <tr>
               <th>Description</th>
               <td>{{ revenue.description }}</td>
diff --git a/src/economy/templates/includes/revenue_list_panel.html b/src/economy/templates/includes/revenue_list_panel.html
index 4c2ac5ed..1199efaf 100644
--- a/src/economy/templates/includes/revenue_list_panel.html
+++ b/src/economy/templates/includes/revenue_list_panel.html
@@ -2,7 +2,8 @@
 <table class="table table-hover">
   <thead>
   <tr>
-    <th>Amaount</th>
+    <th>Amount</th>
+    <th>Invoice Date</th>
     <th>Description</th>
     <th>Responsible Team</th>
     <th>Approved</th>
@@ -13,6 +14,7 @@
     {% for revenue in revenue_list %}
     <tr>
       <td>{{ revenue.amount }} DKK</td>
+      <td>{{ revenue.invoice_date }}</td>
       <td>{{ revenue.description }}</td>
       <td>{{ revenue.responsible_team.name }} Team</td>
       <td>{{ revenue.approval_status }}</td>