From 41a0529d0c168c2d37f3bfb8c2fc0673b472c05a Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Mon, 23 Mar 2020 15:35:24 +0100 Subject: [PATCH] fixin the merge... --- apps/note/tables.py | 2 +- apps/note/views.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/note/tables.py b/apps/note/tables.py index 050c8981..f50379c4 100644 --- a/apps/note/tables.py +++ b/apps/note/tables.py @@ -9,7 +9,7 @@ from django_tables2.utils import A from django.utils.translation import gettext_lazy as _ from .models.notes import Alias -from .models.transactions import Transaction +from .models.transactions import Transaction, TransactionTemplate from .templatetags.pretty_money import pretty_money diff --git a/apps/note/views.py b/apps/note/views.py index 4f13f749..d656d7fc 100644 --- a/apps/note/views.py +++ b/apps/note/views.py @@ -13,7 +13,7 @@ from permission.backends import PermissionBackend from .forms import TransactionTemplateForm from .models import Transaction, TransactionTemplate, Alias, RecurrentTransaction, NoteSpecial from .models.transactions import SpecialTransaction -from .tables import HistoryTable +from .tables import HistoryTable, ButtonTable class TransactionCreateView(LoginRequiredMixin, SingleTableView): @@ -24,7 +24,6 @@ class TransactionCreateView(LoginRequiredMixin, SingleTableView): template_name = "note/transaction_form.html" model = Transaction - form_class = TransactionForm # Transaction history table table_class = HistoryTable table_pagination = {"per_page": 50}