django-ledger 0.7.3__py3-none-any.whl → 0.7.4.1__py3-none-any.whl

django_ledger/templates/django_ledger/transactions/tags/txs_table.html

@@ -0,0 +1,69 @@
+{% load i18n %}
+{% load django_ledger %}
+
+{% if style == 'detail' %}
+    <div class="table-container">
+        <table class="table is-fullwidth is-narrow is-striped is-bordered django-ledger-table-bottom-margin-75">
+            <tr>
+                <th>{% trans 'Timestamp' %}</th>
+                <th>{% trans 'Account' %}</th>
+                <th>{% trans 'Account Name' %}</th>
+                <th>{% trans 'Unit' %}</th>
+                <th>{% trans 'Credit' %}</th>
+                <th>{% trans 'Debit' %}</th>
+                <th>{% trans 'Description' %}</th>
+            </tr>
+            {% for transaction_model in transaction_model_qs %}
+                <tr>
+                    <td>{{ transaction_model.timestamp }}</td>
+                    <td>{{ transaction_model.account_code }}</td>
+                    <td>{{ transaction_model.account_name }}</td>
+                    <td>{% if transaction_model.entity_unit_name %}
+                        {{ transaction_model.entity_unit_name }}{% endif %}</td>
+                    <td>{% if transaction_model.is_credit %}$
+                        {{ transaction_model.amount | currency_format }}{% endif %}</td>
+                    <td>{% if transaction_model.is_debit %}$
+                        {{ transaction_model.amount | currency_format }}{% endif %}</td>
+                    <td>{% if transaction_model.description %}{{ transaction_model.description }}{% endif %}</td>
+                </tr>
+            {% endfor %}
+            <tr class="has-text-weight-bold">
+                <td></td>
+                <td></td>
+                <td></td>
+                <td class="has-text-right">Total</td>
+                <td>{% currency_symbol %}{{ total_credits | currency_format }}</td>
+                <td>{% currency_symbol %}{{ total_debits | currency_format }}</td>
+                <td></td>
+            </tr>
+        </table>
+    </div>
+{% elif style == 'compact' %}
+    <div class="table-container">
+        <table class="table is-fullwidth is-narrow is-striped is-bordered django-ledger-table-bottom-margin-75">
+            <tr>
+                <th>{% trans 'Account' %}</th>
+                <th>{% trans 'Account Name' %}</th>
+                <th>{% trans 'Credit' %}</th>
+                <th>{% trans 'Debit' %}</th>
+                <th>{% trans 'Description' %}</th>
+            </tr>
+            {% for transaction_model in transaction_model_qs %}
+                <tr>
+                    <td>{{ transaction_model.account_code }}</td>
+                    <td>{{ transaction_model.account_name }}</td>
+                    <td>{% if transaction_model.is_credit %}${{ transaction_model.amount | currency_format }}{% endif %}</td>
+                    <td>{% if transaction_model.is_debit %}${{ transaction_model.amount | currency_format }}{% endif %}</td>
+                    <td>{% if transaction_model.description %}{{ transaction_model.description }}{% endif %}</td>
+                </tr>
+            {% endfor %}
+            <tr class="has-text-weight-bold">
+                <td></td>
+                <td class="has-text-right">{% trans 'Total' %}</td>
+                <td>{% currency_symbol %}{{ total_credits | currency_format }}</td>
+                <td>{% currency_symbol %}{{ total_debits | currency_format }}</td>
+                <td></td>
+            </tr>
+        </table>
+    </div>
+{% endif %}

django_ledger/templatetags/django_ledger.py

@@ -8,8 +8,10 @@ Miguel Sanda <msanda@arrobalytics.com>
 
 from calendar import month_abbr
 from random import randint
+from typing import Union
 
 from django import template
+from django.core.exceptions import ValidationError
 from django.db.models import Sum
 from django.urls import reverse
 from django.utils.formats import number_format
@@ -17,9 +19,9 @@ from django.utils.formats import number_format
 from django_ledger import __version__
 from django_ledger.forms.app_filters import EntityFilterForm, ActivityFilterForm
 from django_ledger.forms.feedback import BugReportForm, RequestNewFeatureForm
-from django_ledger.io import CREDIT, DEBIT, ROLES_ORDER_ALL
+from django_ledger.io import ROLES_ORDER_ALL
 from django_ledger.io.io_core import validate_activity, get_localdate
-from django_ledger.models import TransactionModel, BillModel, InvoiceModel, EntityUnitModel
+from django_ledger.models import BillModel, InvoiceModel, JournalEntryModel
 from django_ledger.settings import (
     DJANGO_LEDGER_FINANCIAL_ANALYSIS, DJANGO_LEDGER_CURRENCY_SYMBOL,
     DJANGO_LEDGER_SPACED_CURRENCY_SYMBOL)
@@ -216,65 +218,43 @@ def jes_table(context, journal_entry_qs, next_url=None):
                                'ledger_pk': ledger_pk
                            })
     return {
-        'jes': journal_entry_qs,
+        'journal_entry_qs': journal_entry_qs,
         'entity_slug': entity_slug,
         'ledger_pk': ledger_pk,
         'next_url': next_url
     }
 
 
-@register.inclusion_tag('django_ledger/journal_entry/tags/je_txs_table.html')
-def journal_entry_txs_table(journal_entry_model, style='detail'):
-    txs_queryset = journal_entry_model.transactionmodel_set.all().select_related('account').order_by('account__code')
-    total_credits = sum(tx.amount for tx in txs_queryset if tx.tx_type == 'credit')
-    total_debits = sum(tx.amount for tx in txs_queryset if tx.tx_type == 'debit')
-    return {
-        'txs': txs_queryset,
-        'total_debits': total_debits,
-        'total_credits': total_credits,
-        'style': style
-    }
-
-
-@register.inclusion_tag('django_ledger/journal_entry/tags/je_txs_table.html', takes_context=True)
-def bill_txs_table(context, bill_model: BillModel):
-    # todo: move this to bill model...
-    txs_queryset = TransactionModel.objects.for_bill(
-        bill_model=bill_model.uuid,
-        user_model=context['request'].user,
-        entity_slug=context['view'].kwargs['entity_slug']
-    ).select_related('journal_entry', 'journal_entry__entity_unit', 'account').order_by('-journal_entry__timestamp')
-    total_credits = sum(tx.amount for tx in txs_queryset if tx.tx_type == CREDIT)
-    total_debits = sum(tx.amount for tx in txs_queryset if tx.tx_type == DEBIT)
-    return {
-        'style': 'detail',
-        'txs': txs_queryset,
-        'total_debits': total_debits,
-        'total_credits': total_credits
-    }
+@register.inclusion_tag('django_ledger/transactions/tags/txs_table.html')
+def transactions_table(object_type: Union[JournalEntryModel, BillModel, InvoiceModel], style='detail'):
+    if isinstance(object_type, JournalEntryModel):
+        transaction_model_qs = object_type.transactionmodel_set.all().with_annotated_details().order_by(
+            '-timestamp')
+    elif isinstance(object_type, BillModel):
+        transaction_model_qs = object_type.get_transaction_queryset(annotated=True).order_by('-timestamp')
+    elif isinstance(object_type, InvoiceModel):
+        transaction_model_qs = object_type.get_transaction_queryset(annotated=True).order_by('-timestamp')
+    else:
+        raise ValidationError(
+            'Cannot handle object of type {} to get transaction model queryset'.format(type(object_type))
+        )
 
+    total_credits = sum(tx.amount for tx in transaction_model_qs if tx.is_credit())
+    total_debits = sum(tx.amount for tx in transaction_model_qs if tx.is_debit())
 
-@register.inclusion_tag('django_ledger/journal_entry/tags/je_txs_table.html', takes_context=True)
-def invoice_txs_table(context, invoice_model: InvoiceModel):
-    txs_queryset = TransactionModel.objects.for_invoice(
-        invoice_model=invoice_model,
-        user_model=context['request'].user,
-        entity_slug=context['view'].kwargs['entity_slug']
-    ).select_related('journal_entry', 'journal_entry__entity_unit', 'account').order_by('-journal_entry__timestamp')
-    total_credits = sum(tx.amount for tx in txs_queryset if tx.tx_type == CREDIT)
-    total_debits = sum(tx.amount for tx in txs_queryset if tx.tx_type == DEBIT)
     return {
-        'style': 'detail',
-        'txs': txs_queryset,
+        'style': style,
+        'transaction_model_qs': transaction_model_qs,
         'total_debits': total_debits,
-        'total_credits': total_credits
+        'total_credits': total_credits,
+        'object': object_type
     }
 
 
 @register.inclusion_tag('django_ledger/ledger/tags/ledgers_table.html', takes_context=True)
 def ledgers_table(context, ledger_model_qs):
     return {
-        'ledgers': ledger_model_qs,
+        'ledger_model_qs': ledger_model_qs,
         'entity_slug': context['view'].kwargs['entity_slug'],
     }
 

django_ledger/urls/account.py

@@ -36,15 +36,15 @@ urlpatterns = [
 
     # Account Actions...
     path('<slug:entity_slug>/<slug:coa_slug>/action/<uuid:account_pk>/activate/',
-         views.AccountModelModelActionView.as_view(action_name='activate'),
+         views.BaseAccountModelActionView.as_view(action_name='activate'),
          name='account-action-activate'),
     path('<slug:entity_slug>/<slug:coa_slug>/action/<uuid:account_pk>/deactivate/',
-         views.AccountModelModelActionView.as_view(action_name='deactivate'),
+         views.BaseAccountModelActionView.as_view(action_name='deactivate'),
          name='account-action-deactivate'),
     path('<slug:entity_slug>/<slug:coa_slug>/action/<uuid:account_pk>/lock/',
-         views.AccountModelModelActionView.as_view(action_name='lock'),
+         views.BaseAccountModelActionView.as_view(action_name='lock'),
          name='account-action-lock'),
     path('<slug:entity_slug>/<slug:coa_slug>/action/<uuid:account_pk>/unlock/',
-         views.AccountModelModelActionView.as_view(action_name='unlock'),
+         views.BaseAccountModelActionView.as_view(action_name='unlock'),
          name='account-action-unlock')
 ]

django_ledger/views/account.py

@@ -200,28 +200,28 @@ class AccountModelYearDetailView(BaseAccountModelBaseView,
         return context
 
 
-class AccountModelQuarterDetailView(QuarterlyReportMixIn, AccountModelYearDetailView):
+class AccountModelQuarterDetailView(AccountModelYearDetailView, QuarterlyReportMixIn):
     """
     Account Model Quarter Detail View
     """
 
 
-class AccountModelMonthDetailView(MonthlyReportMixIn, AccountModelYearDetailView):
+class AccountModelMonthDetailView(AccountModelYearDetailView, MonthlyReportMixIn):
     """
     Account Model Month Detail View
     """
 
 
-class AccountModelDateDetailView(DateReportMixIn, AccountModelYearDetailView):
+class AccountModelDateDetailView(AccountModelYearDetailView, DateReportMixIn):
     """
     Account Model Date Detail View
     """
 
 
 # ACTIONS...
-class AccountModelModelActionView(BaseAccountModelBaseView,
-                                  RedirectView,
-                                  SingleObjectMixin):
+class BaseAccountModelActionView(BaseAccountModelBaseView,
+                                 RedirectView,
+                                 SingleObjectMixin):
     http_method_names = ['get']
     pk_url_kwarg = 'account_pk'
     action_name = None
@@ -235,7 +235,7 @@ class AccountModelModelActionView(BaseAccountModelBaseView,
         kwargs['user_model'] = self.request.user
         if not self.action_name:
             raise ImproperlyConfigured('View attribute action_name is required.')
-        response = super(AccountModelModelActionView, self).get(request, *args, **kwargs)
+        response = super(BaseAccountModelActionView, self).get(request, *args, **kwargs)
         account_model: AccountModel = self.get_object()
 
         try:

django_ledger/views/journal_entry.py

@@ -5,75 +5,72 @@ Copyright© EDMA Group Inc licensed under the GPLv3 Agreement.
 Contributions to this module:
     * Miguel Sanda <msanda@arrobalytics.com>
 """
+from typing import Optional
+
 from django.contrib import messages
 from django.core.exceptions import ImproperlyConfigured, ValidationError
-from django.db.models import Count
 from django.http import HttpResponseForbidden
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
-from django.views.generic import (YearArchiveView, MonthArchiveView, DetailView, UpdateView, CreateView, RedirectView,
-                                  ArchiveIndexView, DeleteView)
+from django.views.generic import (
+    YearArchiveView, MonthArchiveView, DetailView, UpdateView, CreateView, RedirectView,
+    ArchiveIndexView, DeleteView
+)
 from django.views.generic.detail import SingleObjectMixin
 
-from django_ledger.forms.journal_entry import (JournalEntryModelUpdateForm,
-                                               JournalEntryModelCannotEditForm,
-                                               JournalEntryModelCreateForm)
+from django_ledger.forms.journal_entry import (
+    JournalEntryModelUpdateForm,
+    JournalEntryModelCannotEditForm,
+    JournalEntryModelCreateForm
+)
 from django_ledger.forms.transactions import get_transactionmodel_formset_class
 from django_ledger.io.io_core import get_localtime
+from django_ledger.models import EntityModel, LedgerModel
 from django_ledger.models.journal_entry import JournalEntryModel
-from django_ledger.models.ledger import LedgerModel
 from django_ledger.views.mixins import DjangoLedgerSecurityMixIn
 
 
-class JournalEntryModelModelViewQuerySetMixIn:
+class JournalEntryModelModelBaseView(DjangoLedgerSecurityMixIn):
     queryset = None
+    ledger_model: Optional[LedgerModel] = None
 
     def get_queryset(self):
         if self.queryset is None:
-            self.queryset = JournalEntryModel.objects.for_ledger(
-                ledger_pk=self.kwargs['ledger_pk'],
-                entity_slug=self.kwargs['entity_slug'],
-                user_model=self.request.user
-            ).select_related('entity_unit', 'ledger', 'ledger__entity')
-        return super().get_queryset()
+            ledger_model: LedgerModel = self.get_ledger_model()
+            journal_entry_queryset = ledger_model.journal_entries.select_related('entity_unit', 'ledger', 'ledger__entity').order_by('-timestamp')
+            self.queryset = journal_entry_queryset
+        return self.queryset
+
+    def get_ledger_model(self) -> LedgerModel:
+        if self.ledger_model is None:
+            entity_model: EntityModel = self.get_authorized_entity_instance()
+            self.ledger_model = entity_model.get_ledgers().get(uuid__exact=self.kwargs['ledger_pk'])
+        return self.ledger_model
 
 
 # JE Views ---
-class JournalEntryCreateView(DjangoLedgerSecurityMixIn, CreateView, SingleObjectMixin):
+class JournalEntryCreateView(JournalEntryModelModelBaseView, CreateView):
     template_name = 'django_ledger/journal_entry/je_create.html'
     PAGE_TITLE = _('Create Journal Entry')
     extra_context = {
         'page_title': PAGE_TITLE,
         'header_title': PAGE_TITLE
     }
-    context_object_name = 'ledger_model'
-    pk_url_kwarg = 'ledger_pk'
-    ledger_model = None
+    ledger_model: Optional[LedgerModel] = None
 
     def get_context_data(self, **kwargs):
-        if self.ledger_model is None:
-            ledger_model = self.get_object()
-            self.ledger_model = ledger_model
-        ctx = super().get_context_data(**kwargs)
-        ctx['page_title'] = self.PAGE_TITLE
-        ctx['header_title'] = self.PAGE_TITLE
-        ctx['header_subtitle'] = self.ledger_model
-        return ctx
-
-    def get_queryset(self):
-        return LedgerModel.objects.for_entity(
-            user_model=self.request.user,
-            entity_slug=self.kwargs['entity_slug'],
-        )
+        context = super().get_context_data(**kwargs)
+        ledger_model: LedgerModel = self.get_ledger_model()
+        context['page_title'] = self.PAGE_TITLE
+        context['header_title'] = self.PAGE_TITLE
+        context['header_subtitle'] = ledger_model.name
+        context['ledger_model'] = ledger_model
+        return context
 
     def get_form(self, form_class=None):
-        if self.ledger_model is None:
-            ledger_model = self.get_object()
-            self.ledger_model = ledger_model
         return JournalEntryModelCreateForm(
-            entity_slug=self.kwargs['entity_slug'],
-            ledger_model=self.ledger_model,
-            user_model=self.request.user,
+            entity_model=self.get_authorized_entity_instance(),
+            ledger_model=self.get_ledger_model(),
             **self.get_form_kwargs()
         )
 
@@ -83,42 +80,51 @@ class JournalEntryCreateView(DjangoLedgerSecurityMixIn, CreateView, SingleObject
         }
 
     def get_success_url(self):
-        return reverse('django_ledger:je-list',
-                       kwargs={
-                           'entity_slug': self.kwargs.get('entity_slug'),
-                           'ledger_pk': self.kwargs.get('ledger_pk')
-                       })
+        ledger_model = self.get_ledger_model()
+        return ledger_model.get_journal_entry_list_url()
 
 
-class JournalEntryListView(DjangoLedgerSecurityMixIn, JournalEntryModelModelViewQuerySetMixIn, ArchiveIndexView):
-    context_object_name = 'journal_entry_list'
+# ARCHIVE VIEWS START....
+class JournalEntryListView(JournalEntryModelModelBaseView, ArchiveIndexView):
+    context_object_name = 'journal_entry_qs'
     template_name = 'django_ledger/journal_entry/je_list.html'
     PAGE_TITLE = _('Journal Entries')
-    extra_context = {
-        'page_title': PAGE_TITLE,
-        'header_title': PAGE_TITLE
-    }
     http_method_names = ['get']
     date_field = 'timestamp'
     paginate_by = 20
     allow_empty = True
 
-    def get_queryset(self):
-        qs = super().get_queryset()
-        qs = qs.annotate(txs_count=Count('transactionmodel'))
-        return qs
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        entity_model: EntityModel = self.get_authorized_entity_instance()
 
+        ledger_model = self.get_ledger_model()
+        context['ledger_model'] = ledger_model
+        context['page_title'] = self.PAGE_TITLE
+        context['header_title'] = self.PAGE_TITLE
+        context['header_subtitle'] = f'{entity_model.name} | Ledger: {ledger_model.name}'
+        context['header_subtitle_icon'] = 'bi:journal-check'
 
-class JournalEntryYearListView(YearArchiveView, JournalEntryListView):
+        if ledger_model.is_locked():
+            messages.add_message(self.request,
+                                 message=_('Locked Journal Entry. Must unlock ledger to add new Journal Entries.'),
+                                 level=messages.WARNING,
+                                 extra_tags='is-warning')
+        return context
+
+
+class JournalEntryYearListView(JournalEntryListView, YearArchiveView):
     make_object_list = True
 
 
-class JournalEntryMonthListView(MonthArchiveView, JournalEntryListView):
+class JournalEntryMonthListView(JournalEntryListView, MonthArchiveView):
     make_object_list = True
     month_format = '%m'
 
 
-class JournalEntryUpdateView(DjangoLedgerSecurityMixIn, JournalEntryModelModelViewQuerySetMixIn, UpdateView):
+# ARCHIVE VIEWS END....
+
+class JournalEntryUpdateView(JournalEntryModelModelBaseView, UpdateView):
     context_object_name = 'journal_entry'
     template_name = 'django_ledger/journal_entry/je_update.html'
     pk_url_kwarg = 'je_pk'
@@ -128,34 +134,18 @@ class JournalEntryUpdateView(DjangoLedgerSecurityMixIn, JournalEntryModelModelVi
         'header_title': PAGE_TITLE
     }
 
-    def get_form(self, form_class=None):
+    def get_form_class(self, form_class=None):
         je_model: JournalEntryModel = self.object
         if not je_model.can_edit():
-            return JournalEntryModelCannotEditForm(
-                entity_slug=self.kwargs['entity_slug'],
-                ledger_model=je_model.ledger,
-                user_model=self.request.user,
-                **self.get_form_kwargs()
-            )
-        return JournalEntryModelUpdateForm(
-            entity_slug=self.kwargs['entity_slug'],
-            ledger_model=je_model.ledger,
-            user_model=self.request.user,
-            **self.get_form_kwargs()
-        )
+            return JournalEntryModelCannotEditForm
+        return JournalEntryModelUpdateForm
 
     def get_success_url(self):
-        return reverse('django_ledger:je-list', kwargs={
-            'entity_slug': self.kwargs['entity_slug'],
-            'ledger_pk': self.kwargs['ledger_pk']
-        })
-
-    def get_queryset(self):
-        qs = super().get_queryset()
-        return qs.prefetch_related('transactionmodel_set', 'transactionmodel_set__account')
+        je_model: JournalEntryModel = self.object
+        return je_model.get_journal_entry_list_url()
 
 
-class JournalEntryDetailView(DjangoLedgerSecurityMixIn, JournalEntryModelModelViewQuerySetMixIn, DetailView):
+class JournalEntryDetailView(JournalEntryModelModelBaseView, DetailView):
     context_object_name = 'journal_entry'
     template_name = 'django_ledger/journal_entry/je_detail.html'
     slug_url_kwarg = 'je_pk'
@@ -168,28 +158,19 @@ class JournalEntryDetailView(DjangoLedgerSecurityMixIn, JournalEntryModelModelVi
     }
     http_method_names = ['get']
 
-    def get_queryset(self):
-        qs = super().get_queryset()
-        return qs.prefetch_related('transactionmodel_set', 'transactionmodel_set__account')
-
 
-class JournalEntryDeleteView(DjangoLedgerSecurityMixIn, JournalEntryModelModelViewQuerySetMixIn, DeleteView):
+class JournalEntryDeleteView(JournalEntryModelModelBaseView, DeleteView):
     template_name = 'django_ledger/journal_entry/je_delete.html'
     context_object_name = 'je_model'
     pk_url_kwarg = 'je_pk'
 
     def get_success_url(self) -> str:
         je_model: JournalEntryModel = self.object
-        return reverse(
-            viewname='django_ledger:je-list',
-            kwargs={
-                'entity_slug': self.AUTHORIZED_ENTITY_MODEL.slug,
-                'ledger_pk': je_model.ledger_id
-            }
-        )
+        return je_model.get_journal_entry_list_url()
 
 
-class JournalEntryModelTXSDetailView(DjangoLedgerSecurityMixIn, JournalEntryModelModelViewQuerySetMixIn, DetailView):
+# todo:.... move this to transaction list view?.....
+class JournalEntryModelTXSDetailView(JournalEntryModelModelBaseView, DetailView):
     template_name = 'django_ledger/journal_entry/je_detail_txs.html'
     PAGE_TITLE = _('Edit Transactions')
     pk_url_kwarg = 'je_pk'
@@ -214,11 +195,8 @@ class JournalEntryModelTXSDetailView(DjangoLedgerSecurityMixIn, JournalEntryMode
         if not txs_formset:
             TransactionModelFormSet = get_transactionmodel_formset_class(journal_entry_model=je_model)
             context['txs_formset'] = TransactionModelFormSet(
-                user_model=self.request.user,
                 je_model=je_model,
-                ledger_pk=self.kwargs['ledger_pk'],
-                entity_slug=self.kwargs['entity_slug'],
-                queryset=je_model.transactionmodel_set.all().order_by('account__code')
+                entity_model=self.get_authorized_entity_instance(),
             )
         else:
             context['txs_formset'] = txs_formset
@@ -234,9 +212,7 @@ class JournalEntryModelTXSDetailView(DjangoLedgerSecurityMixIn, JournalEntryMode
 
         TransactionModelFormSet = get_transactionmodel_formset_class(journal_entry_model=je_model)
         txs_formset = TransactionModelFormSet(request.POST,
-                                              user_model=self.request.user,
-                                              ledger_pk=kwargs['ledger_pk'],
-                                              entity_slug=kwargs['entity_slug'],
+                                              entity_model=self.get_authorized_entity_instance(),
                                               je_model=je_model)
 
         if je_model.locked:
@@ -271,7 +247,11 @@ class JournalEntryModelTXSDetailView(DjangoLedgerSecurityMixIn, JournalEntryMode
 
 
 # ACTION VIEWS...
-class BaseJournalEntryActionView(DjangoLedgerSecurityMixIn, RedirectView, SingleObjectMixin):
+class BaseJournalEntryActionView(
+    JournalEntryModelModelBaseView,
+    RedirectView,
+    SingleObjectMixin
+):
     http_method_names = ['get']
     pk_url_kwarg = 'je_pk'
     action_name = None
@@ -279,11 +259,14 @@ class BaseJournalEntryActionView(DjangoLedgerSecurityMixIn, RedirectView, Single
 
     def get_queryset(self):
         return JournalEntryModel.objects.for_entity(
-            entity_slug=self.kwargs['entity_slug'],
+            entity_slug=self.get_authorized_entity_instance(),
             user_model=self.request.user
-        )
+        ).for_ledger(ledger_pk=self.kwargs['ledger_pk'])
 
     def get_redirect_url(self, *args, **kwargs):
+        next_url = self.request.GET.get('next')
+        if next_url:
+            return next_url
         return reverse('django_ledger:je-list',
                        kwargs={
                            'entity_slug': kwargs['entity_slug'],