django-ledger 0.6.4__py3-none-any.whl → 0.7.1__py3-none-any.whl

django_ledger/models/journal_entry.py

@@ -2,9 +2,6 @@
 Django Ledger created by Miguel Sanda <msanda@arrobalytics.com>.
 Copyright© EDMA Group Inc licensed under the GPLv3 Agreement.
 
-Contributions to this module:
-    * Miguel Sanda <msanda@arrobalytics.com>
-
 A Journal Entry (JE) is the foundation of all double entry accounting and financial data of any EntityModel.
 A JE encapsulates a collection of TransactionModel, which must contain two transactions at a minimum. Each transaction
 must perform a DEBIT or a CREDIT to an AccountModel. The JE Model performs additional validation to make sure that
@@ -37,7 +34,7 @@ from uuid import uuid4, UUID
 
 from django.core.exceptions import FieldError, ObjectDoesNotExist, ValidationError
 from django.db import models, transaction, IntegrityError
-from django.db.models import Q, Sum, QuerySet, F
+from django.db.models import Q, Sum, QuerySet, F, Manager
 from django.db.models.functions import Coalesce
 from django.db.models.signals import pre_save
 from django.urls import reverse
@@ -144,7 +141,7 @@ class JournalEntryModelQuerySet(QuerySet):
         return self.filter(locked=False)
 
 
-class JournalEntryModelManager(models.Manager):
+class JournalEntryModelManager(Manager):
     """
     A custom defined Journal Entry Model Manager that supports additional complex initial Queries based on the
     EntityModel and authenticated UserModel.
@@ -490,15 +487,18 @@ class JournalEntryModelAbstract(CreateUpdateMixIn):
         """
         return self._verified
 
-    def is_balance_valid(self, txs_qs: Optional[TransactionModelQuerySet] = None) -> bool:
+    # Transaction QuerySet
+    def is_balance_valid(self, txs_qs: TransactionModelQuerySet, raise_exception: bool = True) -> bool:
         """
         Checks if CREDITs and DEBITs are equal.
 
         Parameters
         ----------
         txs_qs: TransactionModelQuerySet
-            Optional pre-fetched JE instance TransactionModelQuerySet. Will be validated if provided.
 
+        raise_exception: bool
+            Raises JournalEntryValidationError if TransactionModelQuerySet is not valid.
+            
         Returns
         -------
         bool
@@ -506,32 +506,38 @@ class JournalEntryModelAbstract(CreateUpdateMixIn):
         """
         if len(txs_qs) > 0:
             balances = self.get_txs_balances(txs_qs=txs_qs, as_dict=True)
-            return balances[CREDIT] == balances[DEBIT]
+            is_valid = balances[CREDIT] == balances[DEBIT]
+            if not is_valid:
+                if raise_exception:
+                    raise JournalEntryValidationError(
+                        message='Balance of {0} CREDITs are {1} does not match DEBITs {2}.'.format(
+                            self,
+                            balances[CREDIT],
+                            balances[DEBIT]
+                        )
+                    )
+            return is_valid
         return True
 
-    def is_cash_involved(self, txs_qs=None):
-        return ASSET_CA_CASH in self.get_txs_roles(txs_qs=None)
-
-    def is_operating(self):
-        return self.activity in [
-            self.OPERATING_ACTIVITY
-        ]
+    def is_txs_qs_coa_valid(self, txs_qs: TransactionModelQuerySet) -> bool:
+        """
+        Validates that the Chart of Accounts (COA) is valid for the transactions.
+        Journal Entry transactions can only be associated with one Chart of Accounts (COA).
+        
+        
+        Parameters
+        ----------
+        txs_qs: TransactionModelQuerySet
 
-    def is_financing(self):
-        return self.activity in [
-            self.FINANCING_EQUITY,
-            self.FINANCING_LTD,
-            self.FINANCING_DIVIDENDS,
-            self.FINANCING_STD,
-            self.FINANCING_OTHER
-        ]
+        Returns
+        -------
+        True if Transaction CoAs are valid, otherwise False.
+        """
 
-    def is_investing(self):
-        return self.activity in [
-            self.INVESTING_SECURITIES,
-            self.INVESTING_PPE,
-            self.INVESTING_OTHER
-        ]
+        if len(txs_qs) > 0:
+            coa_count = len(set(tx.coa_id for tx in txs_qs))
+            return coa_count == 1
+        return True
 
     def is_txs_qs_valid(self, txs_qs: TransactionModelQuerySet, raise_exception: bool = True) -> bool:
         """
@@ -563,6 +569,30 @@ class JournalEntryModelAbstract(CreateUpdateMixIn):
                                               f'associated with LedgerModel {self.uuid}')
         return is_valid
 
+    def is_cash_involved(self, txs_qs=None):
+        return ASSET_CA_CASH in self.get_txs_roles(txs_qs=None)
+
+    def is_operating(self):
+        return self.activity in [
+            self.OPERATING_ACTIVITY
+        ]
+
+    def is_financing(self):
+        return self.activity in [
+            self.FINANCING_EQUITY,
+            self.FINANCING_LTD,
+            self.FINANCING_DIVIDENDS,
+            self.FINANCING_STD,
+            self.FINANCING_OTHER
+        ]
+
+    def is_investing(self):
+        return self.activity in [
+            self.INVESTING_SECURITIES,
+            self.INVESTING_PPE,
+            self.INVESTING_OTHER
+        ]
+
     def get_entity_unit_name(self, no_unit_name: str = ''):
         if self.entity_unit_id:
             return self.entity_unit.name
@@ -1158,6 +1188,15 @@ class JournalEntryModelAbstract(CreateUpdateMixIn):
             except JournalEntryValidationError as e:
                 raise e
 
+            # Transaction CoA if valid
+
+            try:
+                is_coa_valid = self.is_txs_qs_coa_valid(txs_qs=txs_qs)
+                if not is_coa_valid:
+                    raise JournalEntryValidationError('Transaction COA is not valid!')
+            except JournalEntryValidationError as e:
+                raise e
+
             # if not len(txs_qs):
             #     if raise_exception:
             #         raise JournalEntryValidationError('Journal entry has no transactions.')
@@ -1166,7 +1205,7 @@ class JournalEntryModelAbstract(CreateUpdateMixIn):
             #     if raise_exception:
             #         raise JournalEntryValidationError('At least two transactions required.')
 
-            if all([is_balance_valid, is_txs_qs_valid]):
+            if all([is_balance_valid, is_txs_qs_valid, is_coa_valid]):
                 # activity flag...
                 self.generate_activity(txs_qs=txs_qs, raise_exception=raise_exception)
                 self._verified = True
@@ -1353,6 +1392,10 @@ class JournalEntryModel(JournalEntryModelAbstract):
     Journal Entry Model Base Class From Abstract
     """
 
+    class Meta(JournalEntryModelAbstract.Meta):
+        swappable = 'DJANGO_LEDGER_JOURNAL_ENTRY_MODEL'
+        abstract = False
+
 
 def journalentrymodel_presave(instance: JournalEntryModel, **kwargs):
     if instance._state.adding and not instance.ledger.can_edit_journal_entries():

django_ledger/models/ledger.py

@@ -2,9 +2,6 @@
 Django Ledger created by Miguel Sanda <msanda@arrobalytics.com>.
 Copyright© EDMA Group Inc licensed under the GPLv3 Agreement.
 
-Contributions to this module:
-    * Miguel Sanda <msanda@arrobalytics.com>
-
 The LedgerModel is the heart of Django Ledger. It is a self-contained unit of accounting that implements a
 double-entry accounting system capable of creating and managing transactions into the ledger and producing any financial
 statements. In essence, an EntityModel is made of a collection of LedgerModels that drive the whole bookkeeping process.
@@ -23,7 +20,7 @@ which is the class responsible for making accounting queries to the Database in
 The digest() method executes all necessary aggregations and optimizations in order to push as much work to the Database
 layer as possible in order to minimize the amount of data being pulled for analysis into the Python memory.
 
-The Django Ledger core model follows the following structure: \n
+The Django Ledger core model follows the following structure:
 EntityModel -< LedgerModel -< JournalEntryModel -< TransactionModel
 """
 from datetime import date
@@ -37,6 +34,10 @@ from django.db import models
 from django.db.models import Q, Min, F, Count
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
+
+from django_ledger.io.io_core import IOMixIn
+from django_ledger.models import lazy_loader
+from django_ledger.models.mixins import CreateUpdateMixIn
 from django_ledger.models.signals import (
     ledger_posted,
     ledger_unposted,
@@ -46,10 +47,6 @@ from django_ledger.models.signals import (
     ledger_unhidden
 )
 
-from django_ledger.io.io_core import IOMixIn
-from django_ledger.models import lazy_loader
-from django_ledger.models.mixins import CreateUpdateMixIn
-
 LEDGER_ID_CHARS = ascii_lowercase + digits
 
 
@@ -728,6 +725,9 @@ class LedgerModel(LedgerModelAbstract):
     """
     Base LedgerModel from Abstract.
     """
+    class Meta(LedgerModelAbstract.Meta):
+        swappable = 'DJANGO_LEDGER_LEDGER_MODEL'
+        abstract = False
 
 
 def ledgermodel_presave(instance: LedgerModel, **kwargs):

django_ledger/models/mixins.py

@@ -2,9 +2,6 @@
 Django Ledger created by Miguel Sanda <msanda@arrobalytics.com>.
 Copyright© EDMA Group Inc licensed under the GPLv3 Agreement.
 
-Contributions to this module:
-    * Miguel Sanda <msanda@arrobalytics.com>
-
 This module implements the different model MixIns used on different Django Ledger Models to implement common
 functionality.
 """

django_ledger/models/purchase_order.py

@@ -2,10 +2,6 @@
 Django Ledger created by Miguel Sanda <msanda@arrobalytics.com>.
 Copyright© EDMA Group Inc licensed under the GPLv3 Agreement.
 
-Contributions to this module:
-    * Miguel Sanda <msanda@arrobalytics.com>
-    * Pranav P Tulshyan <Ptulshyan77@gmail.com>
-
 A purchase order is a commercial source document that is issued by a business purchasing department when placing an
 order with its vendors or suppliers. The document indicates the details on the items that are to be purchased, such as
 the types of goods, quantity, and price. In simple terms, it is the contract drafted by the buyer when purchasing goods
@@ -25,7 +21,7 @@ from django.contrib.auth import get_user_model
 from django.core.exceptions import ValidationError, ObjectDoesNotExist
 from django.core.validators import MinLengthValidator
 from django.db import models, transaction, IntegrityError
-from django.db.models import Q, Sum, Count, F
+from django.db.models import Q, Sum, Count, F, Manager, QuerySet
 from django.db.models.functions import Coalesce
 from django.db.models.signals import pre_save
 from django.shortcuts import get_object_or_404
@@ -37,8 +33,6 @@ from django_ledger.models.bill import BillModel, BillModelQuerySet
 from django_ledger.models.entity import EntityModel
 from django_ledger.models.items import ItemTransactionModel, ItemTransactionModelQuerySet, ItemModelQuerySet, ItemModel
 from django_ledger.models.mixins import CreateUpdateMixIn, MarkdownNotesMixIn, ItemizeMixIn
-from django_ledger.models.utils import lazy_loader
-from django_ledger.settings import DJANGO_LEDGER_DOCUMENT_NUMBER_PADDING, DJANGO_LEDGER_PO_NUMBER_PREFIX
 from django_ledger.models.signals import (
     po_status_draft,
     po_status_void,
@@ -47,6 +41,8 @@ from django_ledger.models.signals import (
     po_status_canceled,
     po_status_in_review
 )
+from django_ledger.models.utils import lazy_loader
+from django_ledger.settings import DJANGO_LEDGER_DOCUMENT_NUMBER_PADDING, DJANGO_LEDGER_PO_NUMBER_PREFIX
 
 PO_NUMBER_CHARS = ascii_uppercase + digits
 
@@ -57,7 +53,7 @@ class PurchaseOrderModelValidationError(ValidationError):
     pass
 
 
-class PurchaseOrderModelQuerySet(models.QuerySet):
+class PurchaseOrderModelQuerySet(QuerySet):
     """
     A custom defined PurchaseOrderModel QuerySet.
     """
@@ -104,7 +100,7 @@ class PurchaseOrderModelQuerySet(models.QuerySet):
         return self.filter(po_status__exact=PurchaseOrderModel.PO_STATUS_DRAFT)
 
 
-class PurchaseOrderModelManager(models.Manager):
+class PurchaseOrderModelManager(Manager):
     """
     A custom defined PurchaseOrderModel Manager.
     """
@@ -1237,6 +1233,10 @@ class PurchaseOrderModel(PurchaseOrderModelAbstract):
     Purchase Order Base Model
     """
 
+    class Meta(PurchaseOrderModelAbstract.Meta):
+        swappable = 'DJANGO_LEDGER_PURCHASE_ORDER_MODEL'
+        abstract = False
+
 
 def purchaseordermodel_presave(instance: PurchaseOrderModel, **kwargs):
     if instance.can_generate_po_number():

django_ledger/models/signals.py

@@ -2,9 +2,6 @@
 Django Ledger created by Miguel Sanda <msanda@arrobalytics.com>.
 Copyright© EDMA Group Inc licensed under the GPLv3 Agreement.
 
-Contributions to this module:
-    * Miguel Sanda <msanda@arrobalytics.com>
-
 The signals module provide the means to notify listeners about important events or states in the models,
 such as a ledger model being posted or a bill status changing.
 """

django_ledger/models/transactions.py

@@ -2,9 +2,6 @@
 Django Ledger created by Miguel Sanda <msanda@arrobalytics.com>.
 Copyright© EDMA Group Inc licensed under the GPLv3 Agreement.
 
-Contributions to this module:
-    * Miguel Sanda <msanda@arrobalytics.com>
-
 The TransactionModel is the lowest accounting level where financial information is recorded. Every transaction with a
 financial implication must be part of a JournalEntryModel, which encapsulates a collection of TransactionModels.
 Transaction models cannot exist without being part of a validated JournalEntryModel. Orphan TransactionModels are not
@@ -24,7 +21,7 @@ from django.contrib.auth import get_user_model
 from django.core.exceptions import ValidationError
 from django.core.validators import MinValueValidator
 from django.db import models
-from django.db.models import Q, QuerySet, F
+from django.db.models import Q, QuerySet, Manager, F
 from django.db.models.signals import pre_save
 from django.utils.translation import gettext_lazy as _
 
@@ -209,14 +206,16 @@ class TransactionModelQuerySet(QuerySet):
         return self.filter(journal_entry__is_closing_entry=True)
 
 
-class TransactionModelManager(models.Manager):
+class TransactionModelManager(Manager):
     """
     A manager class for the TransactionModel.
     """
 
     def get_queryset(self) -> TransactionModelQuerySet:
         qs = TransactionModelQuerySet(self.model, using=self._db)
-        return qs.select_related(
+        return qs.annotate(
+            _coa_id=F('account__coa_model_id'),
+        ).select_related(
             'journal_entry',
             'account',
             'account__coa_model',
@@ -500,6 +499,9 @@ class TransactionModelAbstract(CreateUpdateMixIn):
                                    verbose_name=_('Tx Description'),
                                    help_text=_('A description to be included with this individual transaction'))
 
+    cleared = models.BooleanField(default=False, verbose_name=_('Cleared'))
+    reconciled = models.BooleanField(default=False, verbose_name=_('Reconciled'))
+
     objects = TransactionModelManager()
 
     class Meta:
@@ -512,7 +514,9 @@ class TransactionModelAbstract(CreateUpdateMixIn):
             models.Index(fields=['account']),
             models.Index(fields=['journal_entry']),
             models.Index(fields=['created']),
-            models.Index(fields=['updated'])
+            models.Index(fields=['updated']),
+            models.Index(fields=['cleared']),
+            models.Index(fields=['reconciled']),
         ]
 
     def __str__(self):
@@ -522,6 +526,15 @@ class TransactionModelAbstract(CreateUpdateMixIn):
                                                   x4=self.tx_type,
                                                   x5=self.account.balance_type)
 
+    @property
+    def coa_id(self):
+        try:
+            return getattr(self, '_coa_id')
+        except AttributeError:
+            if self.account is None:
+                return None
+            return self.account.coa_model_id
+
     def clean(self):
         if self.account_id and self.account.is_root_account():
             raise TransactionModelValidationError(
@@ -534,6 +547,10 @@ class TransactionModel(TransactionModelAbstract):
     Base Transaction Model From Abstract.
     """
 
+    class Meta(TransactionModelAbstract.Meta):
+        abstract = False
+        swappable = 'DJANGO_LEDGER_TRANSACTION_MODEL'
+
 
 def transactionmodel_presave(instance: TransactionModel, **kwargs):
     """

django_ledger/models/unit.py

@@ -2,9 +2,6 @@
 Django Ledger created by Miguel Sanda <msanda@arrobalytics.com>.
 Copyright© EDMA Group Inc licensed under the GPLv3 Agreement.
 
-Contributions to this module:
-    * Miguel Sanda <msanda@arrobalytics.com>
-
 An EntityUnit is a logical, user-defined grouping which is assigned to JournalEntryModels to help segregate business
 operations into separate components. Examples of business units may include Departments (i.e. Human Resources, IT, etc.)
 office locations, a real estate property, or any other label relevant to the business.
@@ -226,3 +223,7 @@ class EntityUnitModel(EntityUnitModelAbstract):
     """
     Base Model Class for EntityUnitModel
     """
+
+    class Meta(EntityUnitModelAbstract.Meta):
+        swappable = 'DJANGO_LEDGER_ENTITY_UNIT_MODEL'
+        abstract = False

django_ledger/models/utils.py

@@ -1,9 +1,6 @@
 """
 Django Ledger created by Miguel Sanda <msanda@arrobalytics.com>.
 Copyright© EDMA Group Inc licensed under the GPLv3 Agreement.
-
-Contributions to this module:
-    * Miguel Sanda <msanda@arrobalytics.com>
 """
 
 from django.apps import apps

django_ledger/models/vendor.py

@@ -2,9 +2,6 @@
 Django Ledger created by Miguel Sanda <msanda@arrobalytics.com>.
 Copyright© EDMA Group Inc licensed under the GPLv3 Agreement.
 
-Contributions to this module:
-    * Miguel Sanda <msanda@arrobalytics.com>
-
 A Vendor refers to the person or entity that provides products and services to the business for a fee.
 Vendors are an integral part of the billing process as they are the providers of goods and services for the
 business.
@@ -326,3 +323,7 @@ class VendorModel(VendorModelAbstract):
     """
     Base Vendor Model Implementation
     """
+
+    class Meta(VendorModelAbstract.Meta):
+        swappable = 'DJANGO_LEDGER_VENDOR_MODEL'
+        abstract = False

django_ledger/settings.py

@@ -1,9 +1,6 @@
 """
 Django Ledger created by Miguel Sanda <msanda@arrobalytics.com>.
 Copyright© EDMA Group Inc licensed under the GPLv3 Agreement.
-
-Contributions to this module:
-    * Miguel Sanda <msanda@arrobalytics.com>
 """
 import logging
 from decimal import Decimal
@@ -31,6 +28,34 @@ except ImportError:
 
 logger.info(f'Django Ledger GraphQL Enabled: {DJANGO_LEDGER_GRAPHQL_SUPPORT_ENABLED}')
 
+
+## 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_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_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_USE_CLOSING_ENTRIES = getattr(settings, 'DJANGO_LEDGER_USE_CLOSING_ENTRIES', True)
 DJANGO_LEDGER_DEFAULT_CLOSING_ENTRY_CACHE_TIMEOUT = getattr(settings,
                                                             'DJANGO_LEDGER_DEFAULT_CLOSING_ENTRY_CACHE_TIMEOUT', 3600)

django_ledger/templates/django_ledger/account/account_create.html

@@ -13,12 +13,12 @@
             </div>
             <div class="column is-8-tablet is-6-desktop">
                 <div class="box">
-                    <form method="post">
+                    <form method="post" id="{{ form.form_id }}">
                         {% csrf_token %}
                         {{ form.as_p }}
                         <button type="submit" class="button is-primary is-fullwidth djetler_my_1">Submit</button>
                         <a class="button is-dark is-small is-fullwidth"
-                           href="{% url 'django_ledger:account-list' entity_slug=view.kwargs.entity_slug %}">Back</a>
+                           href="{{ coa_model.get_account_list_url }}">Back</a>
                     </form>
                 </div>
             </div>

django_ledger/templates/django_ledger/account/account_update.html

@@ -18,7 +18,7 @@
                         {{ form.as_p }}
                         <button type="submit" class="button is-primary is-fullwidth djetler_my_1">Submit</button>
                         <a class="button is-dark is-small is-fullwidth"
-                           href="{% url 'django_ledger:account-list' entity_slug=view.kwargs.entity_slug %}">Back</a>
+                           href="{{ coa_model.get_account_list_url }}">Back</a>
                     </form>
                 </div>
             </div>

django_ledger/templates/django_ledger/account/tags/account_txs_table.html

@@ -32,6 +32,7 @@
                         </div>
                         <div class="dropdown-menu" id="dropdown-menu-{{ tx.uuid }}" role="menu">
                             <div class="dropdown-content">
+                                {# TODO: These URLs need to be replaced with the future mode method that generates it. #}
                                 <a href="{% url 'django_ledger:je-detail' entity_slug=entity_slug ledger_pk=tx.journal_entry.ledger.uuid je_pk=tx.journal_entry.uuid %}"
                                    class="dropdown-item has-text-success">View JE</a>
                                 {% if tx.journal_entry.ledger.billmodel %}

django_ledger/templates/django_ledger/account/tags/accounts_table.html

@@ -15,7 +15,7 @@
                             <td></td>
                             <td></td>
                             <td></td>
-                            {#                            <td></td>#}
+                            <td></td>
                             <td></td>
                         </tr>
                     {% endif %}
@@ -25,6 +25,7 @@
                         <th>{% trans 'CoA' %}</th>
                         <th>{% trans 'Balance Type' %}</th>
                         <th>{% trans 'Active' %}</th>
+                        <th>{% trans 'Locked' %}</th>
                         <th>{% trans 'CoA Role Default' %}</th>
                         <th>{% trans 'Actions' %}</th>
                     </tr>
@@ -37,7 +38,7 @@
                             <td></td>
                             <td></td>
                             <td></td>
-                            {#                            <td></td>#}
+                            <td></td>
                             <td></td>
                         </tr>
 
@@ -49,28 +50,29 @@
                                 <td>{{ account.coa_model.name }}</td>
                                 <td>{{ account.get_balance_type_display }}</td>
                                 <td class="has-text-centered">
-                                    {% if account.active %}
+                                    {% if account.is_active %}
                                         <span class="icon has-text-success-dark">
                                         {% icon 'ant-design:check-circle-filled' 24 %}
                                     </span>
-                                    {% elif not account.active %}
+                                    {% else %}
                                         <span class="icon has-text-danger-dark">
                                         {% icon 'mdi:dangerous' 24 %}
                                     </span>
                                     {% endif %}
                                 </td>
 
-                                {#                                <td class="has-text-centered">#}
-                                {#                                    {% if account.locked %}#}
-                                {#                                        <span class="icon has-text-success-dark">#}
-                                {#                                        {% icon 'bi:lock-fill' 24 %}#}
-                                {#                                    </span>#}
-                                {#                                    {% elif not account.locked %}#}
-                                {#                                        <span class="icon has-text-danger-dark">#}
-                                {#                                        {% icon 'bx:bx-lock-open-alt' 24 %}#}
-                                {#                                    </span>#}
-                                {#                                    {% endif %}#}
-                                {#                                </td>#}
+                                <td class="has-text-centered">
+                                    {% if account.is_locked %}
+                                        <span class="icon has-text-success-dark">
+                                        {% icon 'ooui:lock' 24 %}
+                                    </span>
+                                    {% else %}
+                                        <span class="icon has-text-danger-dark">
+                                        {% icon 'ooui:un-lock' 24 %}
+                                    </span>
+                                    {% endif %}
+                                </td>
+
                                 <td class="has-text-centered">
                                     {% if account.role_default %}
                                         <span class="icon has-text-success-dark">
@@ -94,18 +96,26 @@
                                         </div>
                                         <div class="dropdown-menu" id="dropdown-menu-{{ account.uuid }}" role="menu">
                                             <div class="dropdown-content">
-                                                <a href="{% url 'django_ledger:account-detail' entity_slug=entity_slug account_pk=account.uuid %}"
+                                                <a href="{{ account.get_absolute_url }}"
                                                    class="dropdown-item has-text-success">{% trans 'Detail' %}</a>
-                                                <a href="{% url 'django_ledger:account-update' entity_slug=entity_slug account_pk=account.uuid %}"
+                                                <a href="{{ account.get_update_url }}"
                                                    class="dropdown-item has-text-warning">{% trans 'Update' %}</a>
                                                 {% if account.can_activate %}
-                                                    <a href="{% url 'django_ledger:account-action-activate' entity_slug=entity_slug account_pk=account.uuid %}"
+                                                    <a href="{{ account.get_action_activate_url }}"
                                                        class="dropdown-item has-text-success has-text-weight-bold">{% trans 'Activate' %}</a>
                                                 {% endif %}
                                                 {% if account.can_deactivate %}
-                                                    <a href="{% url 'django_ledger:account-action-deactivate' entity_slug=entity_slug account_pk=account.uuid %}"
+                                                    <a href="{{ account.get_action_deactivate_url }}"
                                                        class="dropdown-item has-text-danger has-text-weight-bold">{% trans 'Deactivate' %}</a>
                                                 {% endif %}
+                                                {% if account.can_lock %}
+                                                    <a href="{{ account.get_action_lock_url }}"
+                                                       class="dropdown-item has-text-success has-text-weight-bold">{% trans 'Lock' %}</a>
+                                                {% endif %}
+                                                {% if account.can_unlock %}
+                                                    <a href="{{ account.get_action_unlock_url }}"
+                                                       class="dropdown-item has-text-danger has-text-weight-bold">{% trans 'Unlock' %}</a>
+                                                {% endif %}
                                             </div>
                                         </div>
                                     </div>