django-ledger 0.7.4__py3-none-any.whl → 0.7.5__py3-none-any.whl

django_ledger/models/entity.py

@@ -1518,8 +1518,10 @@ class EntityModelAbstract(MP_Node,
         return coa_model, coa_model.create_account(**account_model_kwargs)
 
     # ### LEDGER MANAGEMENT ####
-    def get_ledgers(self, posted: bool = True):
-        return self.ledgermodel_set.filter(posted=posted)
+    def get_ledgers(self, posted: Optional[bool] = None):
+        if posted is not None:
+            return self.ledgermodel_set.filter(posted=posted)
+        return self.ledgermodel_set.all()
 
     # ### JOURNAL ENTRY MANAGEMENT ####
     def get_journal_entries(self, ledger_model: LedgerModel, posted: bool = True):
@@ -1983,55 +1985,68 @@ class EntityModelAbstract(MP_Node,
                             name: str,
                             account_type: str,
                             active=False,
-                            cash_account: Optional[AccountModel] = None,
+                            account_model: Optional[AccountModel] = None,
                             coa_model: Optional[Union[ChartOfAccountModel, UUID, str]] = None,
                             bank_account_model_kwargs: Optional[Dict] = None,
                             commit: bool = True):
 
         """
-        Creates a new BankAccountModel for the EntityModel instance.
-        Estimate will have DRAFT status.
+        Create a bank account entry for the entity model with specified attributes and validation.
+
+        This method creates a new instance of `BankAccountModel`, validates the
+        given inputs, and saves it to the database if `commit` is set to True.
 
         Parameters
         ----------
-        name: str
-            A user defined name for the BankAccountModel.
-        account_type: date
-            A choice of BankAccountModel.VALID_ACCOUNT_TYPES.
-        active: bool
-            Marks the account as active.
-        cash_account: AccountModel
-            Optional CASH AccountModel associated with the new InvoiceModel. Defaults to CASH default AccountModel role.
-        coa_model: ChartOfAccountModel
-            Optional ChartOfAccountsModel to use when fetching default role AccountModels.
-        commit: bool
-            If True, commits the new BankAccountModel in the Database. Defaults to True.
-        bank_account_model_kwargs: Dict
-            Additional kwargs for the new BankAccountModel instance.
+        name : str
+            The name of the bank account to be created.
+        account_type : str
+            The account type. It must be one of the valid types defined in
+            `BankAccountModel.VALID_ACCOUNT_TYPES`.
+        active : bool, optional
+            A flag indicating whether the account is active. Defaults to False.
+        account_model : Optional[AccountModel], optional
+            An optional pre-existing account model instance to link to the bank
+            account.
+        coa_model : Optional[Union[ChartOfAccountModel, UUID, str]], optional
+            The chart of account model or an identifier to filter accounts. Can
+            accept a UUID, string, or `ChartOfAccountModel`.
+        bank_account_model_kwargs : Optional[Dict], optional
+            Additional keyword arguments to initialize the `BankAccountModel`
+            instance. Defaults to an empty dictionary.
+        commit : bool, optional
+            Flag indicating whether to save the created bank account to the
+            database. Defaults to True.
 
         Returns
         -------
-        PurchaseOrderModel
-            The newly created PurchaseOrderModel in DRAFT state.
+        BankAccountModel
+            The newly created and optionally saved instance of the bank account model.
         """
 
         if bank_account_model_kwargs is None:
             bank_account_model_kwargs = dict()
+
         if account_type not in BankAccountModel.VALID_ACCOUNT_TYPES:
             raise EntityModelValidationError(
                 _(f'Invalid Account Type: choices are {BankAccountModel.VALID_ACCOUNT_TYPES}'))
+
         account_model_qs = self.get_coa_accounts(coa_model=coa_model, active=True)
         account_model_qs = account_model_qs.with_roles(
-            roles=roles_module.ASSET_CA_CASH
+            roles=[
+                BankAccountModel.ACCOUNT_TYPE_ROLE_MAPPING[account_type]
+            ]
         ).is_role_default()
+
         bank_account_model = BankAccountModel(
             name=name,
             entity_model=self,
             account_type=account_type,
             active=active,
-            cash_account=account_model_qs.get() if not cash_account else cash_account,
+            account_model=account_model_qs.get() if not account_model else account_model,
             **bank_account_model_kwargs
         )
+
         bank_account_model.clean()
         if commit:
             bank_account_model.save()
@@ -2668,7 +2683,7 @@ class EntityModelAbstract(MP_Node,
 
         if cash_account:
             if isinstance(cash_account, BankAccountModel):
-                cash_account = cash_account.cash_account
+                cash_account = cash_account.account_model
             self.validate_account_model_for_coa(account_model=cash_account, coa_model=coa_model)
             self.validate_account_model_for_role(cash_account, roles_module.ASSET_CA_CASH)
         else:

django_ledger/models/journal_entry.py

@@ -452,6 +452,18 @@ class JournalEntryModelAbstract(CreateUpdateMixIn):
             pass
         return self.ledger.entity.slug
 
+    @property
+    def entity_model(self) -> EntityModel:
+        """
+        Provides access to the `EntityModel` related to the JournalEntryModel.
+
+        Returns
+        -------
+        EntityModel
+            The `EntityModel` instance linked to the instance LedgerModel.
+        """
+        return self.ledger.entity
+
     @property
     def entity_last_closing_date(self) -> Optional[date]:
         """
@@ -1236,7 +1248,7 @@ class JournalEntryModelAbstract(CreateUpdateMixIn):
 
     # todo: add entity_model as parameter on all functions...
     # todo: outsource this function to EntityStateModel...?...
-    def _get_next_state_model(self, raise_exception: bool = True) -> EntityStateModel:
+    def _get_next_state_model(self, raise_exception: bool = True) -> Optional[EntityStateModel]:
         """
         Retrieves or creates the next state model for the Journal Entry.
 
@@ -1250,12 +1262,12 @@ class JournalEntryModelAbstract(CreateUpdateMixIn):
         EntityStateModel
             The state model with an incremented sequence.
         """
-        entity_model = EntityModel.objects.get(uuid__exact=self.ledger.entity_id)
+        entity_model = self.entity_model
         fy_key = entity_model.get_fy_for_date(dt=self.timestamp)
 
         try:
             LOOKUP = {
-                'entity_model_id__exact': self.ledger.entity_id,
+                'entity_model_id__exact': self.entity_uuid,
                 'entity_unit_id__exact': self.entity_unit_id,
                 'fiscal_year': fy_key,
                 'key__exact': EntityStateModel.KEY_JOURNAL_ENTRY
@@ -1279,6 +1291,7 @@ class JournalEntryModelAbstract(CreateUpdateMixIn):
             }
             state_model = EntityStateModel.objects.create(**LOOKUP)
             return state_model
+
         except IntegrityError as e:
             if raise_exception:
                 raise e
@@ -1570,11 +1583,7 @@ class JournalEntryModelAbstract(CreateUpdateMixIn):
         str
             The URL for updating or viewing journal entry details.
         """
-        return reverse('django_ledger:je-detail', kwargs={
-            'entity_slug': self.entity_slug,
-            'ledger_pk': self.ledger_id,
-            'je_pk': self.uuid
-        })
+        return self.get_absolute_url()
 
     def get_journal_entry_list_url(self) -> str:
         """
@@ -1764,6 +1773,7 @@ def journalentrymodel_presave(instance: JournalEntryModel, **kwargs):
             raise JournalEntryValidationError(
                 message=_(f'Cannot add Journal Entries to locked LedgerModel {instance.ledger_id}')
             )
+    instance.generate_je_number(commit=False)
 
 
 pre_save.connect(journalentrymodel_presave, sender=JournalEntryModel)

django_ledger/models/mixins.py

@@ -23,6 +23,7 @@ from django.utils.encoding import force_str
 from django.utils.translation import gettext_lazy as _
 from markdown import markdown
 
+from django_ledger.io import ASSET_CA_CASH, LIABILITY_CL_ST_NOTES_PAYABLE, LIABILITY_LTL_MORTGAGE_PAYABLE
 from django_ledger.io.io_core import validate_io_timestamp, check_tx_balance, get_localtime, get_localdate
 from django_ledger.models.utils import lazy_loader
 
@@ -1102,7 +1103,7 @@ class MarkdownNotesMixIn(models.Model):
         super().clean()
 
 
-class BankAccountInfoMixIn(models.Model):
+class FinancialAccountInfoMixin(models.Model):
     """
     Implements functionality used to add bank account details to base Django Models.
 
@@ -1122,10 +1123,23 @@ class BankAccountInfoMixIn(models.Model):
 
     ACCOUNT_CHECKING = 'checking'
     ACCOUNT_SAVINGS = 'savings'
+    ACCOUNT_CREDIT_CARD = 'credit_card'
+    ACCOUNT_MORTGAGE = 'mortgage'
+
+    ACCOUNT_TYPE_ROLE_MAPPING = {
+        ACCOUNT_CHECKING: ASSET_CA_CASH,
+        ACCOUNT_SAVINGS: ASSET_CA_CASH,
+        ACCOUNT_CREDIT_CARD: LIABILITY_CL_ST_NOTES_PAYABLE,
+        ACCOUNT_MORTGAGE: LIABILITY_LTL_MORTGAGE_PAYABLE
+    }
+
     ACCOUNT_TYPE_CHOICES = [
         (ACCOUNT_CHECKING, _('Checking')),
-        (ACCOUNT_SAVINGS, _('Savings'))
+        (ACCOUNT_SAVINGS, _('Savings')),
+        (ACCOUNT_CREDIT_CARD, _('Credit Card')),
+        (ACCOUNT_MORTGAGE, _('Mortgage')),
     ]
+
     VALID_ACCOUNT_TYPES = tuple(atc[0] for atc in ACCOUNT_TYPE_CHOICES)
 
     account_number = models.CharField(max_length=30, null=True, blank=True,
@@ -1139,7 +1153,7 @@ class BankAccountInfoMixIn(models.Model):
     aba_number = models.CharField(max_length=30, null=True, blank=True, verbose_name=_('ABA Number'))
     swift_number = models.CharField(max_length=30, null=True, blank=True, verbose_name=_('SWIFT Number'))
     account_type = models.CharField(choices=ACCOUNT_TYPE_CHOICES,
-                                    max_length=10,
+                                    max_length=20,
                                     default=ACCOUNT_CHECKING,
                                     verbose_name=_('Account Type'))
 

django_ledger/models/vendor.py

@@ -18,7 +18,7 @@ from django.db import models, transaction, IntegrityError
 from django.db.models import Q, F, QuerySet
 from django.utils.translation import gettext_lazy as _
 
-from django_ledger.models.mixins import ContactInfoMixIn, CreateUpdateMixIn, BankAccountInfoMixIn, TaxInfoMixIn
+from django_ledger.models.mixins import ContactInfoMixIn, CreateUpdateMixIn, FinancialAccountInfoMixin, TaxInfoMixIn
 from django_ledger.models.utils import lazy_loader
 from django_ledger.settings import DJANGO_LEDGER_DOCUMENT_NUMBER_PADDING, DJANGO_LEDGER_VENDOR_NUMBER_PREFIX
 
@@ -131,7 +131,7 @@ class VendorModelManager(models.Manager):
 
 
 class VendorModelAbstract(ContactInfoMixIn,
-                          BankAccountInfoMixIn,
+                          FinancialAccountInfoMixin,
                           TaxInfoMixIn,
                           CreateUpdateMixIn):
     """

django_ledger/settings.py

@@ -31,30 +31,26 @@ logger.info(f'Django Ledger GraphQL Enabled: {DJANGO_LEDGER_GRAPHQL_SUPPORT_ENAB
 
 ## MODEL ABSTRACTS ##
 DJANGO_LEDGER_ACCOUNT_MODEL = getattr(settings, 'DJANGO_LEDGER_ACCOUNT_MODEL', 'django_ledger.AccountModel')
-DJANGO_LEDGER_CHART_OF_ACCOUNTS_MODEL = getattr(settings, 'DJANGO_LEDGER_ACCOUNT_MODEL', 'django_ledger.ChartOfAccountModelAbstract')
-DJANGO_LEDGER_TRANSACTION_MODEL = getattr(settings, 'DJANGO_LEDGER_TRANSACTION_MODEL', 'django_ledger.TransactionModelAbstract')
-DJANGO_LEDGER_JOURNAL_ENTRY_MODEL = getattr(settings, 'DJANGO_LEDGER_JOURNAL_ENTRY_MODEL', 'django_ledger.JournalEntryModelAbstract')
+DJANGO_LEDGER_CHART_OF_ACCOUNTS_MODEL = getattr(settings, 'DJANGO_LEDGER_ACCOUNT_MODEL', 'django_ledger.ChartOfAccountModel')
+DJANGO_LEDGER_TRANSACTION_MODEL = getattr(settings, 'DJANGO_LEDGER_TRANSACTION_MODEL', 'django_ledger.TransactionModel')
+DJANGO_LEDGER_JOURNAL_ENTRY_MODEL = getattr(settings, 'DJANGO_LEDGER_JOURNAL_ENTRY_MODEL', 'django_ledger.JournalEntryModel')
 DJANGO_LEDGER_LEDGER_MODEL = getattr(settings, 'DJANGO_LEDGER_LEDGER_MODEL', 'django_ledger.LedgerModel')
-DJANGO_LEDGER_ENTITY_MODEL = getattr(settings, 'DJANGO_LEDGER_ENTITY_MODEL', 'django_ledger.EntityModelAbstract')
+DJANGO_LEDGER_ENTITY_MODEL = getattr(settings, 'DJANGO_LEDGER_ENTITY_MODEL', 'django_ledger.EntityModel')
 DJANGO_LEDGER_ENTITY_STATE_MODEL = getattr(settings, 'DJANGO_LEDGER_ENTITY_STATE_MODEL', 'django_ledger.EntityStateModel')
-
-DJANGO_LEDGER_ENTITY_UNIT_MODEL = getattr(settings, 'DJANGO_LEDGER_ENTITY_UNIT_MODEL', 'django_ledger.EntityUnitModelAbstract')
-
-DJANGO_LEDGER_ESTIMATE_MODEL = getattr(settings, 'DJANGO_LEDGER_ESTIMATE_MODEL', 'django_ledger.EstimateModelAbstract')
-DJANGO_LEDGER_BILL_MODEL = getattr(settings, 'DJANGO_LEDGER_BILL_MODEL', 'django_ledger.BillModelAbstract')
-DJANGO_LEDGER_INVOICE_MODEL = getattr(settings, 'DJANGO_LEDGER_INVOICE_MODEL', 'django_ledger.InvoiceModelAbstract')
-DJANGO_LEDGER_PURCHASE_ORDER_MODEL = getattr(settings, 'DJANGO_LEDGER_PURCHASE_ORDER_MODEL', 'django_ledger.PurchaseOrderModelAbstract')
-
-DJANGO_LEDGER_CUSTOMER_MODEL = getattr(settings, 'DJANGO_LEDGER_CUSTOMER_MODEL', 'django_ledger.CustomerModelAbstract')
-DJANGO_LEDGER_VENDOR_MODEL = getattr(settings, 'DJANGO_LEDGER_VENDOR_MODEL', 'django_ledger.VendorModelAbstract')
-
-DJANGO_LEDGER_BANK_ACCOUNT_MODEL = getattr(settings, 'DJANGO_LEDGER_BANK_ACCOUNT_MODEL', 'django_ledger.BackAccountModelAbstract')
-DJANGO_LEDGER_CLOSING_ENTRY_MODEL = getattr(settings, 'DJANGO_LEDGER_CLOSING_ENTRY_MODEL', 'django_ledger.ClosingEntryTransactionModelAbstract')
-DJANGO_LEDGER_UNIT_OF_MEASURE_MODEL = getattr(settings, 'DJANGO_LEDGER_UNIT_OF_MEASURE_MODEL', 'django_ledger.UnitOfMeasureModelAbstract')
-DJANGO_LEDGER_ITEM_TRANSACTION_MODEL = getattr(settings, 'DJANGO_LEDGER_ITEM_TRANSACTION_MODEL', 'django_ledger.ItemTransactionModelAbstract')
-DJANGO_LEDGER_ITEM_MODEL = getattr(settings, 'DJANGO_LEDGER_ITEM_MODEL', 'django_ledger.ItemModelAbstract')
-DJANGO_LEDGER_STAGED_TRANSACTION_MODEL = getattr(settings, 'DJANGO_LEDGER_STAGED_TRANSACTION_MODEL', 'django_ledger.StagedTransactionModelAbstract')
-DJANGO_LEDGER_IMPORT_JOB_MODEL = getattr(settings, 'DJANGO_LEDGER_IMPORT_JOB_MODEL', 'django_ledger.ImportJobModelAbstract')
+DJANGO_LEDGER_ENTITY_UNIT_MODEL = getattr(settings, 'DJANGO_LEDGER_ENTITY_UNIT_MODEL', 'django_ledger.EntityUnitModel')
+DJANGO_LEDGER_ESTIMATE_MODEL = getattr(settings, 'DJANGO_LEDGER_ESTIMATE_MODEL', 'django_ledger.EstimateModel')
+DJANGO_LEDGER_BILL_MODEL = getattr(settings, 'DJANGO_LEDGER_BILL_MODEL', 'django_ledger.BillModel')
+DJANGO_LEDGER_INVOICE_MODEL = getattr(settings, 'DJANGO_LEDGER_INVOICE_MODEL', 'django_ledger.InvoiceModel')
+DJANGO_LEDGER_PURCHASE_ORDER_MODEL = getattr(settings, 'DJANGO_LEDGER_PURCHASE_ORDER_MODEL', 'django_ledger.PurchaseOrderModel')
+DJANGO_LEDGER_CUSTOMER_MODEL = getattr(settings, 'DJANGO_LEDGER_CUSTOMER_MODEL', 'django_ledger.CustomerModel')
+DJANGO_LEDGER_VENDOR_MODEL = getattr(settings, 'DJANGO_LEDGER_VENDOR_MODEL', 'django_ledger.VendorModel')
+DJANGO_LEDGER_BANK_ACCOUNT_MODEL = getattr(settings, 'DJANGO_LEDGER_BANK_ACCOUNT_MODEL', 'django_ledger.BankAccountModel')
+DJANGO_LEDGER_CLOSING_ENTRY_MODEL = getattr(settings, 'DJANGO_LEDGER_CLOSING_ENTRY_MODEL', 'django_ledger.ClosingEntryModel')
+DJANGO_LEDGER_UNIT_OF_MEASURE_MODEL = getattr(settings, 'DJANGO_LEDGER_UNIT_OF_MEASURE_MODEL', 'django_ledger.UnitOfMeasureModel')
+DJANGO_LEDGER_ITEM_TRANSACTION_MODEL = getattr(settings, 'DJANGO_LEDGER_ITEM_TRANSACTION_MODEL', 'django_ledger.ItemTransactionModel')
+DJANGO_LEDGER_ITEM_MODEL = getattr(settings, 'DJANGO_LEDGER_ITEM_MODEL', 'django_ledger.ItemModel')
+DJANGO_LEDGER_STAGED_TRANSACTION_MODEL = getattr(settings, 'DJANGO_LEDGER_STAGED_TRANSACTION_MODEL', 'django_ledger.StagedTransactionModel')
+DJANGO_LEDGER_IMPORT_JOB_MODEL = getattr(settings, 'DJANGO_LEDGER_IMPORT_JOB_MODEL', 'django_ledger.ImportJobModel')
 
 DJANGO_LEDGER_USE_CLOSING_ENTRIES = getattr(settings, 'DJANGO_LEDGER_USE_CLOSING_ENTRIES', True)
 DJANGO_LEDGER_DEFAULT_CLOSING_ENTRY_CACHE_TIMEOUT = getattr(settings,

django_ledger/templates/django_ledger/bank_account/tags/bank_accounts_table.html

@@ -9,7 +9,7 @@
             <th class="has-text-centered">Account Number</th>
             <th class="has-text-centered">Routing Number</th>
             <th class="has-text-centered">Type</th>
-            <th class="has-text-centered">Cash Account</th>
+            <th class="has-text-centered">Account</th>
             <th class="has-text-centered">Active</th>
             <th class="has-text-centered">Actions</th>
         </tr>
@@ -21,7 +21,7 @@
                 <td>{{ bank_acc.account_number | last_four }}</td>
                 <td>{{ bank_acc.routing_number | last_four }}</td>
                 <td>{{ bank_acc.get_account_type_display }}</td>
-                <td>{{ bank_acc.cash_account }}</td>
+                <td>{{ bank_acc.account_model }}</td>
                 <td>
                     {% if bank_acc.active %}
                         <span class="icon has-text-success">{% icon 'ant-design:check-circle-filled' 24 %}</span>

django_ledger/templates/django_ledger/data_import/data_import_job_txs.html

@@ -12,7 +12,7 @@
             </div>
             <div class="column is-12">
                 <h2 class="is-size-2">{% trans 'Imported Transactions' %}</h2>
-                {% data_import_job_txs_imported staged_txs_qs %}
+                {% data_import_job_txs_imported import_job %}
             </div>
             <div class="column is-12 has-text-centered">
                 <a class="button is-dark"

django_ledger/templates/django_ledger/data_import/import_job_create.html

@@ -13,12 +13,21 @@
                               enctype="multipart/form-data"
                               method="post">
                             {% csrf_token %}
-                            <div class="field">
+
+                            <div class="field mb-4">
                                 <div class="control">
                                     {{ form.description }}
                                 </div>
                             </div>
-                            <div class="field">
+
+                            <div class="field mb-4">
+                                {{ form.bank_account_model.help_text }}
+                                <div class="control">
+                                    {{ form.bank_account_model }}
+                                </div>
+                            </div>
+
+                            <div class="field mb-4">
                                 <div class="control">
                                     <div id="file-js-django-ledger" class="file has-name">
                                         <label class="file-label">

django_ledger/templates/django_ledger/data_import/tags/data_import_job_txs_imported.html

@@ -28,7 +28,7 @@
                 <td>{{ imported_tx.account_model }}</td>
                 <td>{{ imported_tx.transaction_model }}</td>
                 <td class="has-text-centered">
-                    <a href="{% url 'django_ledger:je-detail' entity_slug=entity_slug ledger_pk=imported_tx.transaction_model.journal_entry.ledger_id je_pk=imported_tx.transaction_model.journal_entry_id %}"
+                    <a href="{% url 'django_ledger:je-detail' entity_slug=import_job_model.entity_slug ledger_pk=imported_tx.transaction_model.journal_entry.ledger_id je_pk=imported_tx.transaction_model.journal_entry_id %}"
                        class="button is-small is-primary">{% trans 'View JE' %}</a>
                 </td>
             </tr>

django_ledger/templates/django_ledger/data_import/tags/data_import_job_txs_table.html

@@ -3,17 +3,20 @@
 
 
 <form method="post">
+
     {{ staged_txs_formset.non_form_errors }}
     {% if staged_txs_formset.errors %}
         {{ staged_txs_formset.errors }}
     {% endif %}
     {{ staged_txs_formset.management_form }}
+
     {% csrf_token %}
 
     <div class="table-container">
         <table class="table is-narrow is-fullwidth is-bordered is-striped django-ledger-table-bottom-margin-75">
             <thead>
             <tr class="has-text-centered is-error">
+                <th></th>
                 <th>Dated Posted</th>
                 <th>Description</th>
                 <th>Amount</th>
@@ -27,11 +30,11 @@
             </tr>
             </thead>
 
-
             <tbody>
 
             {% for txf in staged_txs_formset %}
                 <tr class="{% if txf.instance.is_children %}has-background-primary{% elif txf.instance.has_children %}has-background-primary-light{% endif %}">
+                    <td>{{ forloop.counter }}</td>
                     {% for hidden_field in txf.hidden_fields %}{{ hidden_field }}{% endfor %}
                     {% if txf.instance.is_children %}
                         <td class="has-background-primary-light" style="border: 0px"></td>
@@ -59,7 +62,7 @@
                         {{ txf.account_model }}
                     </td>
                     <td>{{ txf.unit_model }}{% if txf.instance.is_children %}
-                    	<span class="content is-small">{{ txf.instance.unit_model.name }}</span>
+                        <span class="content is-small">{{ txf.instance.unit_model.name }}</span>
                     {% endif %}
                     </td>
                     <td class="has-text-centered">{{ txf.tx_import }}</td>

django_ledger/templatetags/django_ledger.py

@@ -11,17 +11,17 @@ from random import randint
 from typing import Union
 
 from django import template
-from django.db.models import Sum, F
+from django.core.exceptions import ValidationError
+from django.db.models import Sum
 from django.urls import reverse
 from django.utils.formats import number_format
-from rfc3986.exceptions import ValidationError
 
 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, JournalEntryModel
+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)
@@ -191,19 +191,18 @@ def data_import_job_list_table(context):
 @register.inclusion_tag('django_ledger/data_import/tags/data_import_job_txs_table.html', takes_context=True)
 def data_import_job_txs_pending(context, staged_txs_formset):
     return {
-        'entity_slug': context['view'].kwargs['entity_slug'],
-        'job_pk': context['view'].kwargs['job_pk'],
+        'entity_slug': staged_txs_formset.IMPORT_JOB_MODEL.entity_slug,
+        'import_job_model': staged_txs_formset.IMPORT_JOB_MODEL,
         'staged_txs_formset': staged_txs_formset
     }
 
 
 @register.inclusion_tag('django_ledger/data_import/tags/data_import_job_txs_imported.html', takes_context=True)
-def data_import_job_txs_imported(context, staged_txs_qs):
-    imported_txs = [stx for stx in staged_txs_qs if stx.is_imported()]
+def data_import_job_txs_imported(context, import_job_model):
     return {
-        'entity_slug': context['view'].kwargs['entity_slug'],
-        'job_pk': context['view'].kwargs['job_pk'],
-        'imported_txs': imported_txs
+        'entity_slug': import_job_model.entity_slug,
+        'import_job_model': import_job_model,
+        'imported_txs': import_job_model.stagedtransactionmodel_set.all().is_imported()
     }
 
 
@@ -236,7 +235,8 @@ def transactions_table(object_type: Union[JournalEntryModel, BillModel, InvoiceM
         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)))
+            '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())

django_ledger/views/bank_account.py

@@ -24,7 +24,7 @@ class BankAccountModelModelBaseView(DjangoLedgerSecurityMixIn):
     def get_queryset(self):
         if self.queryset is None:
             entity_model: EntityModel = self.get_authorized_entity_instance()
-            self.queryset = entity_model.bankaccountmodel_set.select_related('cash_account', 'entity_model')
+            self.queryset = entity_model.bankaccountmodel_set.select_related('account_model', 'entity_model')
         return super().get_queryset()