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 @@
Amaount | +Amount | +Invoice Date | Description | Responsible Team | Approved | @@ -13,6 +14,7 @@ {% for revenue in revenue_list %}
---|---|---|---|---|---|
{{ revenue.amount }} DKK | +{{ revenue.invoice_date }} | {{ revenue.description }} | {{ revenue.responsible_team.name }} Team | {{ revenue.approval_status }} |