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

django_ledger/templates/django_ledger/bills/bill_detail.html

@@ -29,7 +29,7 @@
                             <div class="level-item has-text-centered">
                                 <div>
                                     <p class="heading">{% trans 'Cash Account' %}:
-                                        <a href="{% url 'django_ledger:account-detail' account_pk=bill.cash_account.uuid entity_slug=view.kwargs.entity_slug %}"
+                                        <a href="{% url 'django_ledger:account-detail' account_pk=bill.cash_account.uuid coa_slug=bill.cash_account.coa_model.slug entity_slug=view.kwargs.entity_slug %}"
                                            class="has-text-danger">{{ bill.cash_account.code }}</a>
                                     <p class="title" id="djl-bill-detail-amount-paid">
                                         {% currency_symbol %}{{ bill.get_amount_cash | absolute | currency_format }}</p>
@@ -40,7 +40,7 @@
                                 <div class="level-item has-text-centered">
                                     <div>
                                         <p class="heading">{% trans 'Prepaid Account' %}:
-                                            <a href="{% url 'django_ledger:account-detail' account_pk=bill.prepaid_account.uuid entity_slug=view.kwargs.entity_slug %}"
+                                            <a href="{% url 'django_ledger:account-detail' account_pk=bill.prepaid_account.uuid coa_slug=bill.prepaid_account.coa_model.slug entity_slug=view.kwargs.entity_slug %}"
                                                class="has-text-danger">{{ bill.prepaid_account.code }}</a>
                                         </p>
                                         <p class="title has-text-success" id="djl-bill-detail-amount-prepaid">
@@ -50,7 +50,7 @@
                                 <div class="level-item has-text-centered">
                                     <div>
                                         <p class="heading">{% trans 'Accounts Payable' %}:
-                                            <a href="{% url 'django_ledger:account-detail' account_pk=bill.unearned_account.uuid entity_slug=view.kwargs.entity_slug %}"
+                                            <a href="{% url 'django_ledger:account-detail' account_pk=bill.unearned_account.uuid coa_slug=bill.unearned_account.coa_model.slug entity_slug=view.kwargs.entity_slug %}"
                                                class="has-text-danger">{{ bill.unearned_account.code }}</a>
                                         </p>
                                         <p class="title has-text-danger" id="djl-bill-detail-amount-unearned">

django_ledger/templates/django_ledger/chart_of_accounts/coa_create.html

@@ -0,0 +1,25 @@
+{% extends 'django_ledger/layouts/content_layout_1.html' %}
+{% load i18n %}
+{% load static %}
+{% load django_ledger %}
+
+{% block view_content %}
+    <div class="box">
+        <div class="columns is-centered is-multiline">
+            <div class="column is-12 has-text-centered">
+                <h1 class="is-size-2">{% trans 'Create Chart of Accounts' %}</h1>
+            </div>
+            <div class="column is-8-tablet is-6-desktop">
+                <div class="box">
+                    <form method="post" id="{{ form.get_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="{{ entity_model.get_coa_list_url }}">Back</a>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}

django_ledger/templates/django_ledger/chart_of_accounts/coa_list.html

@@ -1,15 +1,34 @@
 {% extends 'django_ledger/layouts/content_layout_1.html' %}
 {% load i18n %}
 {% load static %}
+{% load icon from django_ledger %}
 
 {% block view_content %}
-    <div class="box">
-        <div class="columns is-centered is-multiline">
-            {% for coa_model in coa_list %}
-                <div class="column is-6">
-                    {% include 'django_ledger/chart_of_accounts/includes/coa_card.html' with coa_model=coa_model %}
+    <div class="card">
+        <div class="card-content">
+            <div class="columns">
+                <div class="column is-12">
+                    <h1 class="is-size-1">Chart of Accounts
+                        <a href="{{ entity_model.get_coa_create_url }}">
+                            <span class="icon is-large has-text-success">{% icon 'carbon:add-alt' 60 %}</span></a>
+                    </h1>
+                    {% if not inactive %}
+                        <a class="button is-warning" href="{{ entity_model.get_coa_list_inactive_url }}">
+                            {% trans 'Show Inactive' %}</a>
+                    {% else %}
+                        <a class="button is-warning" href="{{ entity_model.get_coa_list_url }}">
+                            {% trans 'Show Active' %}</a>
+                    {% endif %}
+
                 </div>
-            {% endfor %}
+            </div>
+            <div class="columns is-centered is-multiline">
+                {% for coa_model in coa_list %}
+                    <div class="column is-6">
+                        {% include 'django_ledger/chart_of_accounts/includes/coa_card.html' with coa_model=coa_model %}
+                    </div>
+                {% endfor %}
+            </div>
         </div>
     </div>
 {% endblock %}

django_ledger/templates/django_ledger/chart_of_accounts/coa_update.html

@@ -6,14 +6,14 @@
     <div class="columns is-centered">
         <div class="column is-8-tablet is-6-desktop">
             <div class="box">
-                <form action="{{ coa.get_update_url }}" method="post">
+                <form action="{{ coa_model.get_update_url }}" id="{{ form.form_id }}" method="post">
                     {% csrf_token %}
                     {{ form.as_p }}
                     <button class="button is-primary is-outlined is-fullwidth djetler_my_1"
                             type="submit">Update
                     </button>
                     <a class="button is-small is-dark is-fullwidth"
-                       href="{% url 'django_ledger:entity-dashboard' entity_slug=view.kwargs.entity_slug %}"
+                       href="{{ coa_model.get_coa_list_url }}"
                        type="submit">Back</a>
                 </form>
             </div>

django_ledger/templates/django_ledger/chart_of_accounts/includes/coa_card.html

@@ -4,7 +4,7 @@
 
 
 <div class="card">
-    <div class="card-header" {% if coa_model.is_default %}style="background-color: #04e304"{% endif %}>
+    <div class="card-header" {% if coa_model.is_default %}style="background-color: #04e304" {% elif not coa_model.is_active %}style="background-color: #d34e4e"{% endif %}>
         <div class="card-header-icon">
             {% icon "ic:baseline-business" 36 %}
         </div>
@@ -42,6 +42,12 @@
         </p>
     </div>
 
+    <footer class="card-footer">
+        <a href="{{ coa_model.get_update_url }}"
+           class="card-footer-item has-text-warning has-text-weight-bold">
+            {% trans 'Update' %}
+        </a>
+    </footer>
     <footer class="card-footer">
         <a href="{{ coa_model.get_account_list_url }}"
            class="card-footer-item has-text-success has-text-weight-bold">
@@ -51,14 +57,14 @@
            class="card-footer-item has-text-info has-text-weight-bold">
             {% trans 'Add Account' %}
         </a>
-
-        {% if not coa_model.is_default %}
+    </footer>
+    <footer class="card-footer">
+        {% if coa_model.can_mark_as_default %}
             <a href="{{ coa_model.mark_as_default_url }}"
                class="card-footer-item has-text-danger has-text-weight-bold">
                 {% trans 'Mark as Default' %}
             </a>
         {% endif %}
-
         {% if coa_model.can_deactivate %}
             <a href="{{ coa_model.mark_as_inactive_url }}"
                class="card-footer-item has-text-warning has-text-weight-bold">

django_ledger/templates/django_ledger/expense/tags/expense_item_table.html

@@ -9,6 +9,7 @@
             <th>{% trans 'Item' %}</th>
             <th>{% trans 'UOM' %}</th>
             <th>{% trans 'Expense Account' %}</th>
+            <th>{% trans 'Is Active' %}</th>
             <th>{% trans 'Actions' %}</th>
         </tr>
         </thead>
@@ -19,6 +20,12 @@
                 <td>{{ expense_item.name }}</td>
                 <td>{{ expense_item.uom }}</td>
                 <td>{{ expense_item.expense_account }}</td>
+                <td class="has-text-centered">
+                    {% if expense_item.is_active %}
+                        <span class="icon is-small has-text-success">{% icon 'bi:check-circle-fill' 24 %}</span>
+                    {% else %}
+                        <span class="icon is-small has-text-danger">{% icon 'healthicons:no' 24 %}</span>
+                    {% endif %} </td>
                 <td>
                     <div class="dropdown is-right is-hoverable" id="invoice-action-{{ invoice.uuid }}">
                         <div class="dropdown-trigger">

django_ledger/templates/django_ledger/financial_statements/tags/balance_sheet_statement.html

@@ -60,9 +60,9 @@
                                     </div>
                                     <div class="dropdown-menu" id="dropdown-menu-{{ acc.uuid }}" role="menu">
                                         <div class="dropdown-content">
-                                            <a href="{% url 'django_ledger:account-detail' entity_slug=tx_digest.entity_slug account_pk=acc.account_uuid %}"
+                                            <a href="{{ acc.get_absolute_url }}"
                                                class="dropdown-item has-text-success">{% trans 'Detail' %}</a>
-                                            <a href="{% url 'django_ledger:account-update' entity_slug=tx_digest.entity_slug account_pk=acc.account_uuid %}"
+                                            <a href="{{ acc.get_update_url }}"
                                                class="dropdown-item has-text-warning">{% trans 'Update' %}</a>
                                         </div>
                                     </div>

django_ledger/templates/django_ledger/includes/footer.html

@@ -1,8 +1,8 @@
 <footer class="footer">
     <div class="content has-text-centered">
         <p>
-            <strong>Django Ledger</strong> by <a href="https://miguelsanda.com" target="_blank">Miguel Sanda</a> and
-            <a href="https://arrobalytics.com" target="_blank">Arrobalytics</a>. The source code is licensed
+            <strong>Django Ledger</strong> by <a href="https://www.miguelsanda.com" target="_blank">Miguel Sanda</a> and
+            <a href="https://miguelsanda.com" target="_blank">EDMA Group Inc</a>. The source code is licensed
             <a href="https://opensource.org/licenses/GPL-3.0" target="_blank">GPL 3.0</a>
         </p>
         {% if user.is_superuser %}

django_ledger/templates/django_ledger/invoice/invoice_detail.html

@@ -28,7 +28,7 @@
                         <div class="level-item has-text-centered">
                             <div>
                                 <p class="heading">{% trans 'Cash Account' %}:
-                                    <a href="{% url 'django_ledger:account-detail' account_pk=invoice.cash_account.uuid entity_slug=view.kwargs.entity_slug %}"
+                                    <a href="{% url 'django_ledger:account-detail' account_pk=invoice.cash_account.uuid coa_slug=invoice.cash_account.coa_model.slug entity_slug=view.kwargs.entity_slug %}"
                                        class="has-text-danger">{{ invoice.cash_account.code }}</a>
                                 <p class="title">
                                     {% currency_symbol %}{{ invoice.get_amount_cash | absolute | currency_format }}</p>
@@ -39,7 +39,7 @@
                             <div class="level-item has-text-centered">
                                 <div>
                                     <p class="heading">{% trans 'Accounts Receivable' %}:
-                                        <a href="{% url 'django_ledger:account-detail' account_pk=invoice.prepaid_account.uuid entity_slug=view.kwargs.entity_slug %}"
+                                        <a href="{% url 'django_ledger:account-detail' account_pk=invoice.prepaid_account.uuid coa_slug=invoice.prepaid_account.coa_model.slug entity_slug=view.kwargs.entity_slug %}"
                                            class="has-text-danger">{{ invoice.prepaid_account.code }}</a>
                                     </p>
                                     <p class="title has-text-success">
@@ -49,7 +49,7 @@
                             <div class="level-item has-text-centered">
                                 <div>
                                     <p class="heading">{% trans 'Deferred Revenue' %}:
-                                        <a href="{% url 'django_ledger:account-detail' account_pk=invoice.unearned_account.uuid entity_slug=view.kwargs.entity_slug %}"
+                                        <a href="{% url 'django_ledger:account-detail' account_pk=invoice.unearned_account.uuid coa_slug=invoice.unearned_account.coa_model.slug entity_slug=view.kwargs.entity_slug %}"
                                            class="has-text-danger">{{ invoice.unearned_account.code }}</a>
 
                                     </p>

django_ledger/templatetags/django_ledger.py

@@ -542,6 +542,9 @@ def period_navigation(context, base_url: str):
     if context['view'].kwargs.get('unit_slug'):
         kwargs['unit_slug'] = context['view'].kwargs.get('unit_slug')
 
+    if context['view'].kwargs.get('coa_slug'):
+        kwargs['coa_slug'] = context['view'].kwargs.get('coa_slug')
+
     ctx = dict()
     ctx['year'] = context['year']
     ctx['has_year'] = context.get('has_year')
@@ -567,12 +570,15 @@ def period_navigation(context, base_url: str):
         'year': dt.year,
         'month': dt.month
     }
+
     if 'unit_slug' in kwargs:
         KWARGS_CURRENT_MONTH['unit_slug'] = kwargs['unit_slug']
     if 'account_pk' in kwargs:
         KWARGS_CURRENT_MONTH['account_pk'] = kwargs['account_pk']
     if 'ledger_pk' in kwargs:
         KWARGS_CURRENT_MONTH['ledger_pk'] = kwargs['ledger_pk']
+    if 'coa_slug' in kwargs:
+        KWARGS_CURRENT_MONTH['coa_slug'] = kwargs['coa_slug']
 
     ctx['current_month_url'] = reverse(f'django_ledger:{base_url}-month',
                                        kwargs=KWARGS_CURRENT_MONTH)
@@ -743,7 +749,7 @@ def navigation_menu(context, style):
                     {
                         'type': 'link',
                         'title': 'Ledgers',
-                        'url': reverse('django_ledger:ledger-list', kwargs={'entity_slug': ENTITY_SLUG})
+                        'url': reverse('django_ledger:ledger-list-visible', kwargs={'entity_slug': ENTITY_SLUG})
                     },
                     {
                         'type': 'link',

django_ledger/tests/base.py

@@ -8,7 +8,7 @@ from zoneinfo import ZoneInfo
 
 from django.conf import settings
 from django.contrib.auth import get_user_model
-from django.core.exceptions import ObjectDoesNotExist
+from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.test import TestCase
 from django.test.client import Client
 from django.utils.timezone import get_default_timezone
@@ -30,7 +30,7 @@ class DjangoLedgerBaseTest(TestCase):
     TEST_DATA = list()
     CLIENT = None
     TZ = None
-    N = None
+    N = 1
     USER_EMAIL = None
     PASSWORD = None
     USERNAME = None
@@ -46,7 +46,6 @@ class DjangoLedgerBaseTest(TestCase):
         cls.USERNAME: str = 'testuser'
         cls.PASSWORD: str = 'NeverUseThisPassword12345'
         cls.USER_EMAIL: str = 'testuser@djangoledger.com'
-        cls.N: int = 1
 
         cls.DAYS_FWD: int = randint(180, 180 * 3)
         cls.TZ = get_default_timezone()
@@ -191,14 +190,15 @@ class DjangoLedgerBaseTest(TestCase):
 
     def get_random_account(self,
                            entity_model: EntityModel,
-                           balance_type: Literal['credit', 'debit', None] = None) -> AccountModel:
+                           balance_type: Literal['credit', 'debit', None] = None,
+                           active: bool = True,
+                           locked: bool = False) -> AccountModel:
         """
         Returns 1 random AccountModel with the specified balance_type.
         """
-        account_qs: AccountModelQuerySet = entity_model.get_coa_accounts(active=True)
+        account_qs: AccountModelQuerySet = entity_model.get_coa_accounts(active=active, locked=locked)
         account_qs = account_qs.filter(balance_type=balance_type) if balance_type else account_qs
-        # limits the queryset in case of large querysets...
-        return choice(account_qs[:50])
+        return choice(account_qs)
 
     def get_random_ledger(self,
                           entity_model: EntityModel,
@@ -278,3 +278,19 @@ class DjangoLedgerBaseTest(TestCase):
             entity_model.validate_ledger_model_for_entity(ledger_model)
         txs_model_qs = je_model.transactionmodel_set.all()
         return choice(txs_model_qs[:qs_limit])
+
+    def resolve_url_patterns(self, url_patterns):
+        self.URL_PATTERNS = {
+            p.name: set(p.pattern.converters.keys()) for p in url_patterns
+        }
+
+    def resolve_url_kwars(self):
+        url_patterns = getattr(self, 'URL_PATTERNS', None)
+        if not url_patterns:
+            raise ValidationError(
+                message='Must call resolve_url_patterns before calling resolve_url_kwars.'
+            )
+
+        return set.union(*[
+            set(v) for v in self.URL_PATTERNS.values()
+        ])

django_ledger/tests/test_accounts.py

@@ -1,16 +1,152 @@
-from django_ledger.models import EntityModelValidationError, AccountModel
+from random import choice
+from urllib.parse import urlparse
+
+from django.urls import reverse
+
+from django_ledger.forms.account import AccountModelCreateForm
+from django_ledger.io import roles, CREDIT
+from django_ledger.models import EntityModel
+from django_ledger.models.accounts import AccountModel
 from django_ledger.tests.base import DjangoLedgerBaseTest
+from django_ledger.urls.account import urlpatterns as account_urls
 
 
 class AccountModelTests(DjangoLedgerBaseTest):
+    N = 2
+
+    def setUp(self):
+        self.resolve_url_patterns(
+            url_patterns=account_urls
+        )
+
+    def test_protected_views(self):
+
+        self.logout_client()
+        entity_model = self.get_random_entity_model()
+        account_model: AccountModel = self.get_random_account(entity_model=entity_model)
+
+        for path, kwargs in self.URL_PATTERNS.items():
+            url_kwargs = dict()
+            url_kwargs['entity_slug'] = entity_model.slug
+
+            if 'coa_slug' in kwargs:
+                url_kwargs['coa_slug'] = account_model.coa_slug
+            if 'account_pk' in kwargs:
+                url_kwargs['account_pk'] = account_model.uuid
+            if 'year' in kwargs:
+                url_kwargs['year'] = self.get_random_date().year
+            if 'quarter' in kwargs:
+                url_kwargs['quarter'] = choice(range(1, 5))
+            if 'month' in kwargs:
+                url_kwargs['month'] = self.get_random_date().month
+            if 'day' in kwargs:
+                url_kwargs['day'] = choice(range(1, 29))
+
+            url = reverse(f'django_ledger:{path}', kwargs=url_kwargs)
+            response = self.CLIENT.get(url, follow=False)
+            redirect_url = urlparse(response.url)
+            redirect_path = redirect_url.path
+            login_path = reverse(viewname='django_ledger:login')
+
+            self.assertEqual(response.status_code, 302, msg=f'{path} view is not protected.')
+            self.assertEqual(redirect_path, login_path, msg=f'{path} view not redirecting to correct auth URL.')
+
+    def test_account_create(self):
+
+        entity_model = self.get_random_entity_model()
+        account_create_url = reverse(
+            viewname='django_ledger:account-create',
+            kwargs={
+                'entity_slug': entity_model.slug,
+                'coa_slug': entity_model.default_coa_slug
+            }
+        )
+
+        self.login_client()
+        response = self.CLIENT.get(account_create_url)
+
+        # check if user can access page...
+        self.assertEqual(response.status_code, 200, msg="Fail to GET Account Create page.")
+
+        # check if account create form is rendered...
+        account_create_form: AccountModelCreateForm = response.context['form']
+        self.assertContains(response, account_create_form.form_id, count=1)
+
+        # check if all fields are rendered...
+        self.assertContains(response, 'name="code"')
+        self.assertContains(response, 'name="name"')
+        self.assertContains(response, 'name="role"')
+        self.assertContains(response, 'name="role_default"')
+        self.assertContains(response, 'name="balance_type"')
+        self.assertContains(response, 'name="active"')
+        self.assertContains(response, 'name="coa_model"')
+
+        # creates new account...
+        NEW_ACCOUNT_CODE = '404000'
+        form_data = {
+            'code': NEW_ACCOUNT_CODE,
+            'name': 'Test Income Account',
+            'role': roles.INCOME_OPERATIONAL,
+            'role_default': False,
+            'balance_type': CREDIT,
+            'active': True
+        }
+        response_create = self.CLIENT.post(account_create_url, data=form_data)
+        self.assertEqual(response_create.status_code, 302)
+        self.assertTrue(AccountModel.objects.for_entity(
+            entity_model=entity_model,
+            user_model=self.user_model,
+            coa_slug=entity_model.default_coa_slug,
+        ).with_codes(codes=NEW_ACCOUNT_CODE).exists())
+
+        # cannot create an account with same code again...
+        response_create = self.CLIENT.post(account_create_url, data=form_data)
+        self.assertEqual(response_create.status_code, 200)
+        self.assertContains(response_create, 'Account with this Chart of Accounts and Account Code already exists')
+
+    def test_account_activation(self):
+
+        entity_model: EntityModel = self.get_random_entity_model()
+        account_model: AccountModel = self.get_random_account(entity_model=entity_model, active=True)
+
+        self.assertTrue(account_model.can_deactivate())
+        self.assertTrue(account_model.active)
+
+        account_model.deactivate(commit=True)
+        self.assertFalse(account_model.can_deactivate())
+        self.assertFalse(account_model.active)
+
+        account_model.activate(commit=True)
+        self.assertTrue(account_model.can_deactivate())
+        self.assertTrue(account_model.active)
+
+    def test_account_lock(self):
+        entity_model: EntityModel = self.get_random_entity_model()
+        account_model: AccountModel = self.get_random_account(entity_model=entity_model, active=True, locked=False)
+
+        self.assertTrue(account_model.can_lock())
+        self.assertFalse(account_model.can_unlock())
+
+        account_model.lock(commit=True)
+        self.assertFalse(account_model.can_lock())
+        self.assertTrue(account_model.can_unlock())
+
+        account_model.unlock(commit=True)
+        self.assertTrue(account_model.can_lock())
+        self.assertFalse(account_model.can_unlock())
 
-    def test_no_default_coa(self):
-        entity_model = self.create_entity_model()
-        self.assertFalse(entity_model.has_default_coa(), msg='New entities do not had default coa')
+    def test_annotations(self):
+        entity_model: EntityModel = self.get_random_entity_model()
+        account_model: AccountModel = self.get_random_account(entity_model=entity_model, active=True, locked=False)
 
-        with self.assertRaises(EntityModelValidationError, msg='New entities do not have default coa'):
-            entity_model.get_default_coa()
+        self.assertEqual(account_model.entity_slug, entity_model.slug)
+        self.assertEqual(account_model.coa_slug, account_model.coa_model.slug)
+        self.assertEqual(account_model.coa_model.active, account_model.is_coa_active())
 
-        self.assertEqual(entity_model.get_default_coa(raise_exception=False),
-                         None,
-                         msg='No exception should be raised when raise_exception is False')
+    def test_can_transact(self):
+        entity_model: EntityModel = self.get_random_entity_model()
+        account_model: AccountModel = self.get_random_account(entity_model=entity_model, active=True, locked=False)
+        self.assertTrue(account_model.can_transact())
+        account_model.lock(commit=False)
+        self.assertFalse(account_model.can_transact())
+        account_model.unlock(commit=False)

django_ledger/urls/account.py

@@ -4,54 +4,47 @@ from django_ledger import views
 
 urlpatterns = [
 
-    # NO COA SLUG USES DEFAULT COA....
-    path('<slug:entity_slug>/create/',
-         views.AccountModelCreateView.as_view(),
-         name='account-create'),
-    path('<slug:entity_slug>/list/',
-         views.AccountModelListView.as_view(),
-         name='account-list'),
-    path('<slug:entity_slug>/list/active/',
-         views.AccountModelListView.as_view(active_only=True),
-         name='account-list-active'),
-
-    # EXPLICIT COA...
     path('<slug:entity_slug>/<slug:coa_slug>/create/',
          views.AccountModelCreateView.as_view(),
-         name='account-create-coa'),
+         name='account-create'),
     path('<slug:entity_slug>/<slug:coa_slug>/list/',
          views.AccountModelListView.as_view(),
-         name='account-list-coa'),
+         name='account-list'),
     path('<slug:entity_slug>/<slug:coa_slug>/list/active/',
          views.AccountModelListView.as_view(active_only=True),
-         name='account-list-active-coa'),
+         name='account-list-active'),
 
     # Account Transaction Detail....
-    path('<slug:entity_slug>/update/<uuid:account_pk>/',
+    path('<slug:entity_slug>/<slug:coa_slug>/update/<uuid:account_pk>/',
          views.AccountModelUpdateView.as_view(),
          name='account-update'),
-    path('<slug:entity_slug>/detail/<uuid:account_pk>/',
+    path('<slug:entity_slug>/<slug:coa_slug>/detail/<uuid:account_pk>/',
          views.AccountModelDetailView.as_view(),
          name='account-detail'),
-    path('<slug:entity_slug>/detail/<uuid:account_pk>/year/<int:year>/',
+    path('<slug:entity_slug>/<slug:coa_slug>/detail/<uuid:account_pk>/year/<int:year>/',
          views.AccountModelYearDetailView.as_view(),
          name='account-detail-year'),
-    path('<slug:entity_slug>/detail/<uuid:account_pk>/quarter/<int:year>/<int:quarter>/',
+    path('<slug:entity_slug>/<slug:coa_slug>/detail/<uuid:account_pk>/quarter/<int:year>/<int:quarter>/',
          views.AccountModelQuarterDetailView.as_view(),
          name='account-detail-quarter'),
-    path('<slug:entity_slug>/detail/<uuid:account_pk>/month/<int:year>/<int:month>/',
+    path('<slug:entity_slug>/<slug:coa_slug>/detail/<uuid:account_pk>/month/<int:year>/<int:month>/',
          views.AccountModelMonthDetailView.as_view(),
          name='account-detail-month'),
-    path('<slug:entity_slug>/detail/<uuid:account_pk>/date/<int:year>/<int:month>/<int:day>/',
+    path('<slug:entity_slug>/<slug:coa_slug>/detail/<uuid:account_pk>/date/<int:year>/<int:month>/<int:day>/',
          views.AccountModelDateDetailView.as_view(),
          name='account-detail-date'),
 
     # Account Actions...
-    path('<slug:entity_slug>/action/<uuid:account_pk>/activate/',
+    path('<slug:entity_slug>/<slug:coa_slug>/action/<uuid:account_pk>/activate/',
          views.AccountModelModelActionView.as_view(action_name='activate'),
          name='account-action-activate'),
-    path('<slug:entity_slug>/action/<uuid:account_pk>/deactivate/',
+    path('<slug:entity_slug>/<slug:coa_slug>/action/<uuid:account_pk>/deactivate/',
          views.AccountModelModelActionView.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'),
+         name='account-action-lock'),
+    path('<slug:entity_slug>/<slug:coa_slug>/action/<uuid:account_pk>/unlock/',
+         views.AccountModelModelActionView.as_view(action_name='unlock'),
+         name='account-action-unlock')
 ]

django_ledger/urls/chart_of_accounts.py

@@ -6,6 +6,12 @@ urlpatterns = [
     path('<slug:entity_slug>/list/',
          views.ChartOfAccountModelListView.as_view(),
          name='coa-list'),
+    path('<slug:entity_slug>/list/inactive/',
+         views.ChartOfAccountModelListView.as_view(inactive=True),
+         name='coa-list-inactive'),
+    path('<slug:entity_slug>/create/',
+         views.ChartOfAccountModelCreateView.as_view(),
+         name='coa-create'),
     path('<slug:entity_slug>/detail/<slug:coa_slug>/',
          views.ChartOfAccountModelListView.as_view(),
          name='coa-detail'),

django_ledger/utils.py

@@ -1,3 +1,11 @@
+"""
+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 datetime import date
 from importlib import import_module
 from itertools import groupby
@@ -10,7 +18,6 @@ from django.db.models import QuerySet
 from django.utils.dateparse import parse_date
 
 from django_ledger.io.io_core import get_localdate
-from django_ledger.models import EntityModel
 
 UserModel = get_user_model()
 
@@ -44,7 +51,7 @@ def get_default_unit_session_key():
     return 'djl_default_unit_model'
 
 
-def set_default_entity(request, entity_model: EntityModel):
+def set_default_entity(request, entity_model):
     session_key = get_default_entity_session_key()
     if not request.session.get(session_key):
         request.session[session_key] = {
@@ -103,37 +110,3 @@ def get_end_date_from_session(entity_slug: str, request) -> date:
     end_date = request.session.get(session_end_date_filter)
     end_date = parse_date(end_date) if end_date else get_localdate()
     return end_date
-
-
-def load_model_class(model_path: str):
-    """
-    Loads a Python Model Class by using a string.
-    This functionality is inspired by the Django Blog Zinnia project.
-    This function allows for extension and customization of the stardard Django Ledger Models.
-
-    Examples
-    ________
-    >>> model_class = load_model_class(model_path='module.models.MyModel')
-
-    Parameters
-    ----------
-    model_path: str
-        The model path to load.
-
-    Returns
-    -------
-    The loaded Python model Class.
-
-    Raises
-    ______
-    ImportError or AttributeError if unable to load model.
-    """
-    dot = model_path.rindex('.')
-    module_name = model_path[:dot]
-    klass_name = model_path[dot + 1:]
-    try:
-        klass = getattr(import_module(module_name), klass_name)
-        return klass
-    except (ImportError, AttributeError) as e:
-        print(e)
-        raise ImproperlyConfigured(f'Model {model_path} cannot be imported!')