fixin the merge...

This commit is contained in:
Pierre-antoine Comby 2020-03-23 15:35:24 +01:00
parent bbda99a3ac
commit 41a0529d0c
2 changed files with 2 additions and 3 deletions

View File

@ -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

View File

@ -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}