diff --git a/accounting/templates/accounting/bank_account_details.jinja b/accounting/templates/accounting/bank_account_details.jinja index 434d7ef1..96ef7b30 100644 --- a/accounting/templates/accounting/bank_account_details.jinja +++ b/accounting/templates/accounting/bank_account_details.jinja @@ -5,7 +5,12 @@ {% trans %}Accounting{% endtrans %} > {{ object.name }}
-{% trans %}New club account{% endtrans %}
{% trans %}New journal{% endtrans %}
{% else %} diff --git a/accounting/views.py b/accounting/views.py index 5016ce75..473e2457 100644 --- a/accounting/views.py +++ b/accounting/views.py @@ -65,7 +65,7 @@ class BankAccountCreateView(CanCreateMixin, CreateView): Create a bank account (for the admins) """ model = BankAccount - fields = ['name', 'iban', 'number'] + fields = ['name', 'club', 'iban', 'number'] template_name = 'core/create.jinja' class BankAccountDeleteView(CanEditPropMixin, DeleteView): # TODO change Delete to Close @@ -163,9 +163,8 @@ class OperationCreateView(CanCreateMixin, CreateView): Create an operation """ model = Operation - # fields = ['type', 'amount', 'label', 'remark', 'journal', 'date', 'cheque_number', 'accounting_type', 'done'] form_class = modelform_factory(Operation, - fields=['amount', 'label', 'remark', 'journal', 'date', 'cheque_number', 'accounting_type', 'done'], + fields=['amount', 'label', 'remark', 'journal', 'date', 'mode', 'cheque_number', 'accounting_type', 'done'], widgets={'journal': HiddenInput}) template_name = 'core/create.jinja' @@ -183,6 +182,6 @@ class OperationEditView(CanEditMixin, UpdateView): """ model = Operation pk_url_kwarg = "op_id" - fields = ['amount', 'label', 'remark', 'date', 'cheque_number', 'accounting_type', 'done'] + fields = ['amount', 'label', 'remark', 'date', 'mode', 'cheque_number', 'accounting_type', 'done'] template_name = 'core/edit.jinja' diff --git a/core/templates/core/user_tools.jinja b/core/templates/core/user_tools.jinja index 241ca37d..4d63f1be 100644 --- a/core/templates/core/user_tools.jinja +++ b/core/templates/core/user_tools.jinja @@ -7,6 +7,7 @@ {% block content %}