django-ledger 0.6.3__py3-none-any.whl → 0.7.0__py3-none-any.whl

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

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
 from django.db.models.signals import pre_save
 from django.utils.translation import gettext_lazy as _
 
@@ -209,7 +206,7 @@ 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.
     """

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.

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.

django_ledger/report/cash_flow_statement.py

@@ -1,7 +1,7 @@
 from datetime import datetime, date
 from typing import Optional, Dict, Union
 
-from django_ledger.io.io_digest import IODigestContextManager
+from django_ledger.io.io_context import IODigestContextManager
 from django_ledger.report.core import BaseReportSupport, PDFReportValidationError
 from django_ledger.settings import DJANGO_LEDGER_CURRENCY_SYMBOL
 from django_ledger.templatetags.django_ledger import currency_format

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,6 @@
                             <td></td>
                             <td></td>
                             <td></td>
-                            {#                            <td></td>#}
                             <td></td>
                         </tr>
                     {% endif %}
@@ -25,6 +24,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>
@@ -49,28 +49,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.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.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.role_default %}
                                         <span class="icon has-text-success-dark">
@@ -94,18 +95,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>

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/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/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()
+        ])