django-ledger 0.7.10__py3-none-any.whl → 0.8.0__py3-none-any.whl

django_ledger/templates/django_ledger/financial_statements/tags/income_statement.html

@@ -1,9 +1,21 @@
 {% load django_ledger %}
 {% load i18n %}
 
+<style>
+    /* Align currency (2nd-to-last column) to the right for financial-statement tables */
+    table.financial-statement thead th:nth-last-child(2),
+    table.financial-statement tbody td:nth-last-child(2) {
+        text-align: right;
+    }
+
+    table.financial-statement tfoot td {
+        font-weight: 700;
+    }
+</style>
 
 <div class="table-container">
-    <table class="table is-fullwidth is-narrow is-striped">
+    <table class="table is-fullwidth is-narrow is-striped is-hoverable is-bordered financial-statement">
+        <thead>
         <tr>
             <th>{% trans 'Account Number' %}</th>
             <th>{% trans 'Description' %}</th>
@@ -11,13 +23,15 @@
                 <th>{% trans 'Unit' %}</th>
             {% endif %}
             <th>{% trans 'Balance Type' %}</th>
-            <th>{% trans 'Balance' %}</th>
+            <th class="has-text-right">{% trans 'Balance' %}</th>
             <th>{% trans 'Actions' %}</th>
         </tr>
+        </thead>
+        <tbody>
 
         {# OPERATING INCOME #}
         <tr>
-            <td><h2 class="is-size-3 has-text-left">{% trans 'Operating Revenues' %}</h2></td>
+            <td><h2 class="is-size-4 has-text-left">{% trans 'Operating Revenues' %}</h2></td>
             <td></td>
             {% if tx_digest.by_unit %}
                 <td></td>
@@ -36,12 +50,20 @@
                 {% endif %}
                 <td class="has-text-centered">
                     {% if acc.balance_type == 'debit' %}
-                        <span class="icon">{% icon 'bi:arrow-bar-down' 24 %}</span>
+                        <span class="tag is-info is-light">
+                            <span class="icon is-small mr-1">{% icon 'bi:arrow-bar-down' 16 %}</span>
+                            debit
+                        </span>
                     {% elif acc.balance_type == 'credit' %}
-                        <span class="icon">{% icon 'bi:arrow-bar-up' 24 %}</span>
+                        <span class="tag is-success is-light">
+                            <span class="icon is-small mr-1">{% icon 'bi:arrow-bar-up' 16 %}</span>
+                            credit
+                        </span>
+                    {% else %}
+                        <span class="tag is-light">{{ acc.balance_type }}</span>
                     {% endif %}
                 </td>
-                <td>{% currency_symbol %}{{ acc.balance | currency_format }}</td>
+                <td class="has-text-right">{% currency_symbol %}{{ acc.balance | currency_format }}</td>
                 <td>
                     <div class="dropdown is-hoverable" id="account-action-{{ account.uuid }}">
                         <div class="dropdown-trigger">
@@ -79,7 +101,7 @@
 
         {# COGS #}
         <tr>
-            <td><h2 class="is-size-3 has-text-left">{% trans 'Less: Cost of Goods Sold' %}</h2></td>
+            <td><h2 class="is-size-4 has-text-left">{% trans 'Less: Cost of Goods Sold' %}</h2></td>
             <td></td>
             {% if tx_digest.by_unit %}
                 <td></td>
@@ -97,9 +119,17 @@
                 {% endif %}
                 <td class="has-text-centered">
                     {% if acc.balance_type == 'debit' %}
-                        <span class="icon">{% icon 'bi:arrow-bar-down' 24 %}</span>
+                        <span class="tag is-info is-light">
+                            <span class="icon is-small mr-1">{% icon 'bi:arrow-bar-down' 16 %}</span>
+                            debit
+                        </span>
                     {% elif acc.balance_type == 'credit' %}
-                        <span class="icon">{% icon 'bi:arrow-bar-up' 24 %}</span>
+                        <span class="tag is-success is-light">
+                            <span class="icon is-small mr-1">{% icon 'bi:arrow-bar-up' 16 %}</span>
+                            credit
+                        </span>
+                    {% else %}
+                        <span class="tag is-light">{{ acc.balance_type }}</span>
                     {% endif %}
                 </td>
                 <td>{% currency_symbol %}{{ acc.balance | reverse_sign | currency_format }}</td>
@@ -153,7 +183,7 @@
 
         {# OPERATING EXPENSES #}
         <tr>
-            <td><h2 class="is-size-3 has-text-left">{% trans 'Operating Expenses' %}</h2></td>
+            <td><h2 class="is-size-4 has-text-left">{% trans 'Operating Expenses' %}</h2></td>
             <td></td>
             {% if tx_digest.by_unit %}
                 <td></td>
@@ -171,9 +201,17 @@
                 {% endif %}
                 <td class="has-text-centered">
                     {% if acc.balance_type == 'debit' %}
-                        <span class="icon">{% icon 'bi:arrow-bar-down' 24 %}</span>
+                        <span class="tag is-info is-light">
+                            <span class="icon is-small mr-1">{% icon 'bi:arrow-bar-down' 16 %}</span>
+                            debit
+                        </span>
                     {% elif acc.balance_type == 'credit' %}
-                        <span class="icon">{% icon 'bi:arrow-bar-up' 24 %}</span>
+                        <span class="tag is-success is-light">
+                            <span class="icon is-small mr-1">{% icon 'bi:arrow-bar-up' 16 %}</span>
+                            credit
+                        </span>
+                    {% else %}
+                        <span class="tag is-light">{{ acc.balance_type }}</span>
                     {% endif %}
                 </td>
                 <td>{% currency_symbol %}{{ acc.balance | reverse_sign | currency_format }}</td>
@@ -227,7 +265,7 @@
 
         {# OTHER REVENUES #}
         <tr>
-            <td><h2 class="is-size-3 has-text-left">{% trans 'Other Revenues' %}</h2></td>
+            <td><h2 class="is-size-4 has-text-left">{% trans 'Other Revenues' %}</h2></td>
             <td></td>
             {% if tx_digest.by_unit %}
                 <td></td>
@@ -245,9 +283,17 @@
                 {% endif %}
                 <td class="has-text-centered">
                     {% if acc.balance_type == 'debit' %}
-                        <span class="icon">{% icon 'bi:arrow-bar-down' 24 %}</span>
+                        <span class="tag is-info is-light">
+                            <span class="icon is-small mr-1">{% icon 'bi:arrow-bar-down' 16 %}</span>
+                            debit
+                        </span>
                     {% elif acc.balance_type == 'credit' %}
-                        <span class="icon">{% icon 'bi:arrow-bar-up' 24 %}</span>
+                        <span class="tag is-success is-light">
+                            <span class="icon is-small mr-1">{% icon 'bi:arrow-bar-up' 16 %}</span>
+                            credit
+                        </span>
+                    {% else %}
+                        <span class="tag is-light">{{ acc.balance_type }}</span>
                     {% endif %}
                 </td>
                 <td class="is-size-5">{% currency_symbol %}{{ acc.balance | currency_format }}</td>
@@ -288,7 +334,7 @@
 
         {# OTHER EXPENSES #}
         <tr>
-            <td><h2 class="is-size-3 has-text-left">{% trans 'Other Expenses' %}</h2></td>
+            <td><h2 class="is-size-4 has-text-left">{% trans 'Other Expenses' %}</h2></td>
             <td></td>
             {% if tx_digest.by_unit %}
                 <td></td>
@@ -306,9 +352,17 @@
                 {% endif %}
                 <td class="has-text-centered">
                     {% if acc.balance_type == 'debit' %}
-                        <span class="icon">{% icon 'bi:arrow-bar-down' 24 %}</span>
+                        <span class="tag is-info is-light">
+                            <span class="icon is-small mr-1">{% icon 'bi:arrow-bar-down' 16 %}</span>
+                            debit
+                        </span>
                     {% elif acc.balance_type == 'credit' %}
-                        <span class="icon">{% icon 'bi:arrow-bar-up' 24 %}</span>
+                        <span class="tag is-success is-light">
+                            <span class="icon is-small mr-1">{% icon 'bi:arrow-bar-up' 16 %}</span>
+                            credit
+                        </span>
+                    {% else %}
+                        <span class="tag is-light">{{ acc.balance_type }}</span>
                     {% endif %}
                 </td>
                 <td class="is-size-5">{% currency_symbol %}{{ acc.balance | reverse_sign | currency_format }}</td>
@@ -375,5 +429,6 @@
             <td></td>
         </tr>
 
+        </tbody>
     </table>
 </div>

django_ledger/templates/django_ledger/includes/widget_ratios.html

@@ -6,51 +6,45 @@
     <h4>Solvency:</h4>
     <h5 class="has-text-weight-light">Current
         Ratio: {{ tx_digest.ratios.current_ratio | currency_format }}</h5>
-    <progress
-            class="progress {{ tx_digest.ratios.current_ratio | fin_ratio_threshold_class:'current_ratio' }}"
-            value="{{ tx_digest.ratios.current_ratio }}"
-            max="{% fin_ratio_max_value ratio='current_ratio' %}">
+    <progress class="progress {{ tx_digest.ratios.current_ratio | fin_ratio_threshold_class:'current_ratio' }}"
+              value="{{ tx_digest.ratios.current_ratio }}"
+              max="{% fin_ratio_max_value ratio='current_ratio' %}">
         {{ tx_digest.ratios.current_ratio }}</progress>
     <h5 class="has-text-weight-light">Quick
         Ratio: {{ tx_digest.ratios.quick_ratio | currency_format }} </h5>
-    <progress
-            class="progress {{ tx_digest.ratios.quick_ratio | fin_ratio_threshold_class:'quick_ratio' }}"
-            value="{{ tx_digest.ratios.quick_ratio }}"
-            max="{% fin_ratio_max_value ratio='quick_ratio' %}">
+    <progress class="progress {{ tx_digest.ratios.quick_ratio | fin_ratio_threshold_class:'quick_ratio' }}"
+              value="{{ tx_digest.ratios.quick_ratio }}"
+              max="{% fin_ratio_max_value ratio='quick_ratio' %}">
         {{ tx_digest.ratios.current_ratio }}</progress>
 
     <h4>Leverage:</h4>
     <h5 class="has-text-weight-light">Debt to
         Equity: {{ tx_digest.ratios.debt_to_equity | currency_format }} </h5>
-    <progress
-            class="progress {{ tx_digest.ratios.debt_to_equity | fin_ratio_threshold_class:'debt_to_equity' }}"
-            value="{{ tx_digest.ratios.debt_to_equity }}"
-            max="{% fin_ratio_max_value ratio='debt_to_equity' %}">
+    <progress class="progress {{ tx_digest.ratios.debt_to_equity | fin_ratio_threshold_class:'debt_to_equity' }}"
+              value="{{ tx_digest.ratios.debt_to_equity }}"
+              max="{% fin_ratio_max_value ratio='debt_to_equity' %}">
         {{ tx_digest.ratios.debt_to_equity }}</progress>
 
 
     <h4>Profitability:</h4>
     <h5 class="has-text-weight-light">Return on
         Equity: {{ tx_digest.ratios.return_on_equity | percentage }} </h5>
-    <progress
-            class="progress {{ tx_digest.ratios.quick_ratio | fin_ratio_threshold_class:'quick_ratio' }}"
-            value="{{ tx_digest.ratios.return_on_equity }}"
-            max="{% fin_ratio_max_value ratio='return_on_equity' %}">
+    <progress class="progress {{ tx_digest.ratios.quick_ratio | fin_ratio_threshold_class:'quick_ratio' }}"
+              value="{{ tx_digest.ratios.return_on_equity }}"
+              max="{% fin_ratio_max_value ratio='return_on_equity' %}">
         {{ tx_digest.ratios.return_on_equity }}</progress>
 
     <h5 class="has-text-weight-light">Return on
         Assets: {{ tx_digest.ratios.return_on_assets | percentage }} </h5>
-    <progress
-            class="progress {{ tx_digest.ratios.return_on_assets | fin_ratio_threshold_class:'return_on_assets' }}"
-            value="{{ tx_digest.ratios.return_on_assets }}"
-            max="{% fin_ratio_max_value ratio='return_on_assets' %}">{{ tx_digest.ratios.return_on_assets }}</progress>
+    <progress class="progress {{ tx_digest.ratios.return_on_assets | fin_ratio_threshold_class:'return_on_assets' }}"
+              value="{{ tx_digest.ratios.return_on_assets }}"
+              max="{% fin_ratio_max_value ratio='return_on_assets' %}">{{ tx_digest.ratios.return_on_assets }}</progress>
 
     <h5 class="has-text-weight-light">Net Profit
         Margin: {{ tx_digest.ratios.net_profit_margin | percentage }} </h5>
-    <progress
-            class="progress {{ tx_digest.ratios.net_profit_margin | fin_ratio_threshold_class:'net_profit_margin' }}"
-            value="{{ tx_digest.ratios.net_profit_margin }}"
-            max="{% fin_ratio_max_value ratio='net_profit_margin' %}">{{ tx_digest.ratios.net_profit_margin }}</progress>
+    <progress class="progress {{ tx_digest.ratios.net_profit_margin | fin_ratio_threshold_class:'net_profit_margin' }}"
+              value="{{ tx_digest.ratios.net_profit_margin }}"
+              max="{% fin_ratio_max_value ratio='net_profit_margin' %}">{{ tx_digest.ratios.net_profit_margin }}</progress>
 
     <h5 class="has-text-weight-light">Gross Profit
         Margin: {{ tx_digest.ratios.gross_profit_margin | percentage }} </h5>

django_ledger/templates/django_ledger/invoice/includes/card_invoice.html

@@ -8,8 +8,8 @@
                 <p class="subtitle has-text-grey has-text-right">
                     <span class="icon">{% icon "bi:cash-stack" 16 %}</span>
                     {% trans 'Invoice' %}</p>
-                <p class="title">{{ invoice.customer.customer_name }}</p>
-                <p class="subtitle has-text-weight-light">{{ invoice.customer.address_1 }}</p>
+                <h2 class="title">{{ invoice.customer.customer_name }}</h2>
+                <h3 class="has-text-weight-light">{{ invoice.customer.address_1 }}</h3>
                 {% if not invoice.is_past_due %}
                     <p class="is-size-5 has-text-info">{% trans 'Due in' %}: {{ invoice.date_due | timeuntil }}</p>
                 {% else %}
@@ -31,7 +31,7 @@
                           value="{{ invoice.get_progress_percent }}"
                           max="100">{{ invoice.get_progress | percentage }}
                 </progress>
-                {% modal_action invoice 'get' entity_slug %}#}
+                {% modal_action invoice 'get' entity_slug %}
             </div>
             <footer class="card-footer">
                 <a href="{% url 'django_ledger:invoice-detail' entity_slug=entity_slug invoice_pk=invoice.uuid %}"

django_ledger/templates/django_ledger/layouts/base.html

@@ -8,7 +8,12 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>{% block page_title %}{% session_entity_name %} | {{ page_title }}{% endblock %}</title>
-    <script src="{% static 'django_ledger/bundle/styles.bundle.js' %}"></script>
+
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@1.0.4/css/bulma.min.css">
+    <link rel="stylesheet" href="{% static 'django_ledger/css/djl_styles.css' %}">
+    <link rel="stylesheet"
+          href="https://cdn.rawgit.com/jenil/bulmaswatch/gh-pages/{{ DJANGO_LEDGER_THEME }}/bulmaswatch.min.css">
+
     <link rel="shortcut icon" type="image/jpg" href="{% static 'django_ledger/logo/favicon.png' %}">
 
     {% block header_extra_js %}{% endblock %}

django_ledger/templates/django_ledger/vendor/tags/vendor_table.html

@@ -20,15 +20,19 @@
             <tr class="has-text-centered">
                 <td>{{ vendor.vendor_number }}</td>
                 <td>{{ vendor.vendor_name }}</td>
-                <td>{{ vendor.address_1 }}</td>
+                <td>
+                    {% if vendor.address_1 %}
+                        {{ vendor.address_1 }}
+                    {% endif %}
+                </td>
                 <td>{% if vendor.vendor_code %}{{ vendor.vendor_code }}{% endif %}</td>
                 <td>
                     {% if vendor.active %}
-                        <span class="icon has-text-success-dark">
+                        <span class="icon has-text-success">
                                         {% icon 'ant-design:check-circle-filled' 24 %}
                                     </span>
                     {% elif not vendor.active %}
-                        <span class="icon has-text-danger-dark">
+                        <span class="icon has-text-danger">
                                         {% icon 'mdi:dangerous' 24 %}
                                     </span>
                     {% endif %}
@@ -36,11 +40,11 @@
 
                 <td>
                     {% if vendor.hidden %}
-                        <span class="icon has-text-success-dark">
+                        <span class="icon has-text-success">
                                         {% icon 'ant-design:check-circle-filled' 24 %}
                                     </span>
                     {% elif not vendor.hidden %}
-                        <span class="icon has-text-danger-dark">
+                        <span class="icon has-text-danger">
                                         {% icon 'mdi:dangerous' 24 %}
                                     </span>
                     {% endif %}

django_ledger/tests/test_accounts.py

@@ -95,8 +95,7 @@ class AccountModelTests(DjangoLedgerBaseTest):
         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,
+            coa_model=entity_model.default_coa_slug,
         ).with_codes(codes=NEW_ACCOUNT_CODE).exists())
 
         # cannot create an account with same code again...

django_ledger/tests/test_io.py

@@ -195,3 +195,20 @@ class IOTest(DjangoLedgerBaseTest):
         # )
         #
         # self.assertEqual(io_digest.get_io_txs_queryset().count(), 0)
+
+    def test_io_transactions_belong_to_entity(self):
+        entity_model = self.get_random_entity_model()
+        from_datetime = self.START_DATE
+        to_datetime = self.START_DATE + timedelta(days=randint(10, 60))
+
+        io_digest = entity_model.digest(
+            entity_slug=entity_model.slug,
+            from_date=from_datetime,
+            to_date=to_datetime,
+            for_test=True
+        )
+
+        tx_qs = io_digest.get_io_txs_queryset()
+        # Every transaction returned by the IO for an entity digest must belong to that entity.
+        for tx in tx_qs:
+            self.assertEqual(tx['journal_entry__ledger__entity_id'], entity_model.uuid)

django_ledger/tests/test_purchase_order.py

@@ -1,6 +1,6 @@
 from datetime import date, datetime
 from random import choice, randint
-from typing import Union, Optional
+from typing import Union, Optional, List
 from urllib.parse import urlparse
 from uuid import uuid4
 
@@ -31,8 +31,8 @@ class PurchaseOrderModelTests(DjangoLedgerBaseTest):
                                       commit=True)
         return po_model
 
-    def get_purchase_orders(self, entity_model: EntityModel) -> list[PurchaseOrderModel]:
-        return PurchaseOrderModel.objects.for_entity(entity_model, self.user_model)
+    def get_purchase_orders(self, entity_model: EntityModel) -> List[PurchaseOrderModel]:
+        return PurchaseOrderModel.objects.for_entity(entity_model=entity_model)
 
     def test_protected_views(self):
         """

django_ledger/tests/test_transactions.py

@@ -96,8 +96,7 @@ class TransactionModelFormSetTest(DjangoLedgerBaseTest):
 
             # get a journal entry that has transactions...
             je_model = JournalEntryModel.objects.for_entity(
-                entity_slug=entity_model,
-                user_model=self.user_model
+                entity_model=entity_model
             ).annotate(
                 txs_count=Count('transactionmodel')).filter(
                 txs_count__gt=0).order_by('-timestamp').first()

django_ledger/urls/__init__.py

@@ -5,11 +5,9 @@ Copyright© EDMA Group Inc licensed under the GPLv3 Agreement.
 Contributions to this module:
 Miguel Sanda <msanda@arrobalytics.com>
 """
-
 from django.urls import path, include
 
 from django_ledger import views
-from django_ledger.settings import DJANGO_LEDGER_GRAPHQL_SUPPORT_ENABLED
 
 app_name = 'django_ledger'
 
@@ -41,5 +39,3 @@ urlpatterns = [
     path('', views.RootUrlView.as_view(), name='root'),
 ]
 
-if DJANGO_LEDGER_GRAPHQL_SUPPORT_ENABLED:
-    pass

django_ledger/views/bill.py

@@ -64,8 +64,7 @@ class BillModelCreateView(BillModelModelBaseView, CreateView):
 
         if self.for_estimate and 'ce_pk' in self.kwargs:
             estimate_qs = EstimateModel.objects.for_entity(
-                entity_slug=self.kwargs['entity_slug'],
-                user_model=self.request.user
+                entity_model=self.AUTHORIZED_ENTITY_MODEL,
             )
             estimate_model: EstimateModel = get_object_or_404(estimate_qs, uuid__exact=self.kwargs['ce_pk'])
             if not estimate_model.can_bind():
@@ -87,8 +86,7 @@ class BillModelCreateView(BillModelModelBaseView, CreateView):
                 return HttpResponseBadRequest()
 
             po_qs = PurchaseOrderModel.objects.for_entity(
-                entity_slug=self.kwargs['entity_slug'],
-                user_model=self.request.user
+                entity_model=self.kwargs['entity_slug'],
             ).prefetch_related('itemtransactionmodel_set')
             po_model: PurchaseOrderModel = get_object_or_404(po_qs, uuid__exact=po_pk)
             po_itemtxs_qs = po_model.itemtransactionmodel_set.filter(
@@ -104,8 +102,7 @@ class BillModelCreateView(BillModelModelBaseView, CreateView):
                                   }) + f'?item_uuids={po_item_uuids_qry_param}'
         elif self.for_estimate:
             estimate_qs = EstimateModel.objects.for_entity(
-                entity_slug=self.kwargs['entity_slug'],
-                user_model=self.request.user
+                entity_model=self.AUTHORIZED_ENTITY_MODEL
             )
             estimate_uuid = self.kwargs['ce_pk']
             estimate_model: EstimateModel = get_object_or_404(estimate_qs, uuid__exact=estimate_uuid)
@@ -137,15 +134,16 @@ class BillModelCreateView(BillModelModelBaseView, CreateView):
     def form_valid(self, form):
         bill_model: BillModel = form.save(commit=False)
         ledger_model, bill_model = bill_model.configure(
-            entity_slug=self.AUTHORIZED_ENTITY_MODEL,
+            entity_slug=self.AUTHORIZED_ENTITY_MODEL.slug,
+            user_model=self.request.user,
             commit_ledger=True
         )
 
         if self.for_estimate:
             ce_pk = self.kwargs['ce_pk']
             estimate_model_qs = EstimateModel.objects.for_entity(
-                entity_slug=self.kwargs['entity_slug'],
-                user_model=self.request.user)
+                entity_model=self.kwargs['entity_slug']
+            )
 
             estimate_model = get_object_or_404(estimate_model_qs, uuid__exact=ce_pk)
             bill_model.bind_estimate(estimate_model=estimate_model, commit=False)
@@ -157,8 +155,7 @@ class BillModelCreateView(BillModelModelBaseView, CreateView):
                 return HttpResponseBadRequest()
             item_uuids = item_uuids.split(',')
             po_qs = PurchaseOrderModel.objects.for_entity(
-                entity_slug=self.kwargs['entity_slug'],
-                user_model=self.request.user
+                entity_model=self.kwargs['entity_slug'],
             )
             po_model: PurchaseOrderModel = get_object_or_404(po_qs, uuid__exact=po_pk)
 
@@ -253,8 +250,6 @@ class BillModelDetailView(BillModelModelBaseView, DetailView):
         title = f'Bill {bill_model.bill_number}'
         context['page_title'] = title
         context['header_title'] = title
-
-        bill_model: BillModel = self.object
         bill_items_qs, item_data = bill_model.get_itemtxs_data()
         context['itemtxs_qs'] = bill_items_qs
         context['total_amount__sum'] = item_data['total_amount__sum']

django_ledger/views/chart_of_accounts.py

@@ -2,6 +2,7 @@
 Django Ledger created by Miguel Sanda <msanda@arrobalytics.com>.
 Copyright© EDMA Group Inc licensed under the GPLv3 Agreement.
 """
+from typing import Optional
 
 from django.contrib import messages
 from django.core.exceptions import ImproperlyConfigured, ValidationError
@@ -10,18 +11,19 @@ from django.views.generic import UpdateView, ListView, RedirectView, CreateView
 from django.views.generic.detail import SingleObjectMixin
 
 from django_ledger.forms.chart_of_accounts import ChartOfAccountsModelUpdateForm, ChartOfAccountsModelCreateForm
+from django_ledger.models import EntityModel, ChartOfAccountModelQuerySet
 from django_ledger.models.chart_of_accounts import ChartOfAccountModel
 from django_ledger.views.mixins import DjangoLedgerSecurityMixIn
 
 
 class ChartOfAccountModelModelBaseViewMixIn(DjangoLedgerSecurityMixIn):
-    queryset = None
+    queryset: Optional[ChartOfAccountModelQuerySet] = None
 
     def get_queryset(self):
         if self.queryset is None:
-            entity_model = self.get_authorized_entity_instance()
-            self.queryset = entity_model.chartofaccountmodel_set.all().order_by('-updated')
-        return super().get_queryset()
+            entity_model: EntityModel = self.get_authorized_entity_instance()
+            self.queryset: ChartOfAccountModelQuerySet = entity_model.chartofaccountmodel_set.all().order_by('-updated')
+        return self.queryset
 
 
 class ChartOfAccountModelListView(ChartOfAccountModelModelBaseViewMixIn, ListView):

django_ledger/views/closing_entry.py

@@ -5,6 +5,7 @@ Copyright© EDMA Group Inc licensed under the GPLv3 Agreement.
 Contributions to this module:
     * Miguel Sanda <msanda@arrobalytics.com>
 """
+from typing import Optional
 
 from django.contrib import messages
 from django.core.exceptions import ValidationError, ImproperlyConfigured
@@ -21,13 +22,14 @@ from django.views.generic.detail import SingleObjectMixin
 
 from django_ledger.forms.closing_entry import ClosingEntryCreateForm, ClosingEntryUpdateForm
 from django_ledger.io.io_core import get_localdate
+from django_ledger.models import EstimateModel, ClosingEntryModelQuerySet
 from django_ledger.models.closing_entry import ClosingEntryModel
 from django_ledger.models.entity import EntityModel
 from django_ledger.views import DjangoLedgerSecurityMixIn
 
 
 class ClosingEntryModelBaseView(DjangoLedgerSecurityMixIn):
-    queryset = None
+    queryset: Optional[ClosingEntryModelQuerySet] = None
 
     def get_queryset(self):
         if self.queryset is None:
@@ -75,16 +77,18 @@ class ClosingEntryModelCreateView(ClosingEntryModelBaseView, CreateView):
         'header_title': PAGE_TITLE,
         'header_subtitle_icon': 'file-icons:finaldraft'
     }
+    form_class = ClosingEntryCreateForm
 
     def get_initial(self):
         return {
-            'closing_date': get_localdate()
+            'closing_date': get_localdate(),
+            'entity_model': self.AUTHORIZED_ENTITY_MODEL
         }
 
-    def get_form(self, form_class=None, **kwargs):
-        return ClosingEntryCreateForm(
-            **self.get_form_kwargs()
-        )
+    def get_form_kwargs(self, **kwargs):
+        return super().get_form_kwargs(**kwargs) | {
+            'entity_model': self.AUTHORIZED_ENTITY_MODEL
+        }
 
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
@@ -100,7 +104,7 @@ class ClosingEntryModelCreateView(ClosingEntryModelBaseView, CreateView):
             force_update=True,
             post_closing_entry=False
         )
-        self.ce_model = ce_model
+        self.ce_model: EstimateModel = ce_model
         return HttpResponseRedirect(self.get_success_url())
 
     def get_success_url(self):

django_ledger/views/customer.py

@@ -5,32 +5,30 @@ Copyright© EDMA Group Inc licensed under the GPLv3 Agreement.
 Contributions to this module:
     * Miguel Sanda <msanda@arrobalytics.com>
 """
+from typing import Optional
 
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
-from django.views.generic import ListView, CreateView, UpdateView
+from django.views.generic import ListView, CreateView, UpdateView, DeleteView
 
 from django_ledger.forms.customer import CustomerModelForm
-from django_ledger.models.customer import CustomerModel
+from django_ledger.models.customer import CustomerModel, CustomerModelQueryset
 from django_ledger.models.entity import EntityModel
 from django_ledger.views.mixins import DjangoLedgerSecurityMixIn
 
 
-class CustomerModelModelViewQuerySetMixIn:
-    queryset = None
+class CustomerModelModelViewQuerySetMixIn(DjangoLedgerSecurityMixIn):
+    queryset: Optional[CustomerModelQueryset] = None
 
     def get_queryset(self):
         if self.queryset is None:
             self.queryset = CustomerModel.objects.for_entity(
-                entity_slug=self.kwargs['entity_slug'],
-                user_model=self.request.user
+                entity_model=self.kwargs['entity_slug'],
             ).order_by('-updated')
-        return super().get_queryset()
+        return self.queryset
 
 
-class CustomerModelListView(DjangoLedgerSecurityMixIn,
-                            CustomerModelModelViewQuerySetMixIn,
-                            ListView):
+class CustomerModelListView(CustomerModelModelViewQuerySetMixIn, ListView):
     template_name = 'django_ledger/customer/customer_list.html'
     PAGE_TITLE = _('Customer List')
     extra_context = {
@@ -41,9 +39,7 @@ class CustomerModelListView(DjangoLedgerSecurityMixIn,
     context_object_name = 'customers'
 
 
-class CustomerModelCreateView(DjangoLedgerSecurityMixIn,
-                              CustomerModelModelViewQuerySetMixIn,
-                              CreateView):
+class CustomerModelCreateView(CustomerModelModelViewQuerySetMixIn, CreateView):
     template_name = 'django_ledger/customer/customer_create.html'
     PAGE_TITLE = _('Create New Customer')
     form_class = CustomerModelForm
@@ -70,9 +66,7 @@ class CustomerModelCreateView(DjangoLedgerSecurityMixIn,
         return super().form_valid(form)
 
 
-class CustomerModelUpdateView(DjangoLedgerSecurityMixIn,
-                              CustomerModelModelViewQuerySetMixIn,
-                              UpdateView):
+class CustomerModelUpdateView(CustomerModelModelViewQuerySetMixIn, UpdateView):
     template_name = 'django_ledger/customer/customer_update.html'
     PAGE_TITLE = _('Customer Update')
     form_class = CustomerModelForm
@@ -99,4 +93,6 @@ class CustomerModelUpdateView(DjangoLedgerSecurityMixIn,
         form.save()
         return super().form_valid(form)
 
-# todo: add CustomerDeleteView
+
+class CustomerModelDeleteView(CustomerModelModelViewQuerySetMixIn, DeleteView):
+    pass