django-ledger 0.5.6.4__py3-none-any.whl → 0.6.0__py3-none-any.whl

django_ledger/__init__.py

@@ -9,7 +9,7 @@ Contributions to this module:
 default_app_config = 'django_ledger.apps.DjangoLedgerConfig'
 
 """Django Ledger"""
-__version__ = '0.5.6.4'
+__version__ = '0.6.0'
 __license__ = 'GPLv3 License'
 
 __author__ = 'Miguel Sanda'

django_ledger/admin/entity.py

@@ -53,11 +53,13 @@ class EntityModelAdmin(ModelAdmin):
     list_display = [
         'slug',
         'name',
+        'admin',
         'accrual_method',
         'last_closing_date',
         'hidden',
         'get_coa_count',
         'add_ledger_link',
+        'dashboard_link',
         'balance_sheet_link',
         'income_statement_link',
         'cash_flow_statement_link'
@@ -166,6 +168,18 @@ class EntityModelAdmin(ModelAdmin):
 
     cash_flow_statement_link.short_description = 'Cash Flow'
 
+    def dashboard_link(self, obj: EntityModel):
+        add_ledger_url = reverse(
+            viewname='django_ledger:entity-dashboard',
+            kwargs={
+                'entity_slug': obj.slug
+            })
+        return format_html('<a class="viewlink" href="{url}">View</a>',
+                           url=add_ledger_url,
+                           slug=obj.slug)
+
+    dashboard_link.short_description = 'Dashboard'
+
     def add_code_of_accounts(self, request, queryset):
         lt = get_localtime().isoformat()
         for entity_model in queryset:

django_ledger/forms/account.py

@@ -31,8 +31,9 @@ class AccountModelCreateForm(ModelForm):
     balance_type: Need to be selected from drop down as "Debit" or Credit"
     """
 
-    def __init__(self, entity_slug, user_model, *args, **kwargs):
-        self.ENTITY_SLUG = entity_slug
+    def __init__(self, entity_model, coa_model, user_model, *args, **kwargs):
+        self.ENTITY = entity_model
+        self.COA_MODEL = coa_model
         self.USER_MODEL = user_model
         super().__init__(*args, **kwargs)
         self.fields['role'].choices = ACCOUNT_CHOICES_NO_ROOT
@@ -44,6 +45,13 @@ class AccountModelCreateForm(ModelForm):
             return None
         return role_default
 
+    def clean_code(self):
+        code = self.cleaned_data['code']
+        is_code_valid = not self.COA_MODEL.accountmodel_set.filter(code=code).exists()
+        if not is_code_valid:
+            raise ValidationError(message=_('Code {} already exists for CoA {}').format(code, self.COA_MODEL.slug))
+        return code
+
     class Meta:
         model = AccountModel
         fields = [
@@ -92,8 +100,9 @@ class AccountModelUpdateForm(MoveNodeForm):
                                    'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
                                }))
 
-    def __init__(self, entity_slug, user_model, *args, **kwargs):
-        self.ENTITY_SLUG = entity_slug
+    def __init__(self, entity_model, coa_model, user_model, *args, **kwargs):
+        self.ENTITY = entity_model
+        self.COA_MODEL = coa_model
         self.USER_MODEL = user_model
         super().__init__(*args, **kwargs)
         # self.fields['_ref_node_id'].choices = self.mk_dropdown_tree_choices()

django_ledger/io/io_core.py

@@ -38,8 +38,11 @@ from django_ledger.exceptions import InvalidDateInputError, TransactionNotInBala
 from django_ledger.io import roles as roles_module
 from django_ledger.io.io_digest import IODigestContextManager
 from django_ledger.io.io_middleware import (
-    AccountRoleIOMiddleware, AccountGroupIOMiddleware, JEActivityIOMiddleware,
-    BalanceSheetIOMiddleware, IncomeStatementIOMiddleware,
+    AccountRoleIOMiddleware,
+    AccountGroupIOMiddleware,
+    JEActivityIOMiddleware,
+    BalanceSheetIOMiddleware,
+    IncomeStatementIOMiddleware,
     CashFlowStatementIOMiddleware
 )
 from django_ledger.io.ratios import FinancialRatioManager
@@ -263,7 +266,7 @@ class IODatabaseMixIn:
         return isinstance(self, lazy_loader.get_ledger_model())
 
     def is_entity_unit_model(self):
-        return isinstance(self, lazy_loader.get_unit_model())
+        return isinstance(self, lazy_loader.get_entity_unit_model())
 
     def get_entity_model_from_io(self):
         if self.is_entity_model():
@@ -601,6 +604,8 @@ class IODatabaseMixIn:
             use_closing_entries=use_closing_entries,
             **kwargs)
 
+        TransactionModel = lazy_loader.get_txs_model()
+
         for tx_model in io_result.txs_queryset:
             if tx_model['account__balance_type'] != tx_model['tx_type']:
                 tx_model['balance'] = -tx_model['balance']
@@ -625,7 +630,6 @@ class IODatabaseMixIn:
             acc['balance_abs'] = abs(acc['balance'])
 
         if signs:
-            TransactionModel = lazy_loader.get_txs_model()
             for acc in accounts_digest:
                 if any([
                     all([acc['role_bs'] == roles_module.BS_ASSET_ROLE,
@@ -945,8 +949,8 @@ class IOReportMixIn:
             **kwargs
         )
 
-        report_klass = lazy_loader.get_balance_sheet_report_class()
-        report = report_klass(
+        BalanceSheetReport = lazy_loader.get_balance_sheet_report_class()
+        report = BalanceSheetReport(
             self.PDF_REPORT_ORIENTATION,
             self.PDF_REPORT_MEASURE_UNIT,
             self.PDF_REPORT_PAGE_SIZE,
@@ -1000,8 +1004,8 @@ class IOReportMixIn:
             txs_queryset=txs_queryset,
             **kwargs
         )
-        report_klass = lazy_loader.get_income_statement_report_class()
-        report = report_klass(
+        IncomeStatementReport = lazy_loader.get_income_statement_report_class()
+        report = IncomeStatementReport(
             self.PDF_REPORT_ORIENTATION,
             self.PDF_REPORT_MEASURE_UNIT,
             self.PDF_REPORT_PAGE_SIZE,
@@ -1054,8 +1058,8 @@ class IOReportMixIn:
             **kwargs
         )
 
-        report_klass = lazy_loader.get_cash_flow_statement_report_class()
-        report = report_klass(
+        CashFlowStatementReport = lazy_loader.get_cash_flow_statement_report_class()
+        report = CashFlowStatementReport(
             self.PDF_REPORT_ORIENTATION,
             self.PDF_REPORT_MEASURE_UNIT,
             self.PDF_REPORT_PAGE_SIZE,
@@ -1108,22 +1112,22 @@ class IOReportMixIn:
             **kwargs
         )
 
-        bs_report_klass = lazy_loader.get_balance_sheet_report_class()
-        bs_report = bs_report_klass(
+        BalanceSheetReport = lazy_loader.get_balance_sheet_report_class()
+        bs_report = BalanceSheetReport(
             self.PDF_REPORT_ORIENTATION,
             self.PDF_REPORT_MEASURE_UNIT,
             self.PDF_REPORT_PAGE_SIZE,
             io_digest=io_digest
         )
-        is_report_klass = lazy_loader.get_income_statement_report_class()
-        is_report = is_report_klass(
+        IncomeStatementReport = lazy_loader.get_income_statement_report_class()
+        is_report = IncomeStatementReport(
             self.PDF_REPORT_ORIENTATION,
             self.PDF_REPORT_MEASURE_UNIT,
             self.PDF_REPORT_PAGE_SIZE,
             io_digest=io_digest
         )
-        cfs_report_klass = lazy_loader.get_cash_flow_statement_report_class()
-        cfs_report = cfs_report_klass(
+        CashFlowStatementReport = lazy_loader.get_cash_flow_statement_report_class()
+        cfs_report = CashFlowStatementReport(
             self.PDF_REPORT_ORIENTATION,
             self.PDF_REPORT_MEASURE_UNIT,
             self.PDF_REPORT_PAGE_SIZE,

django_ledger/io/io_digest.py

@@ -69,7 +69,7 @@ class IODigestContextManager:
     def is_unit_model(self) -> bool:
         return isinstance(
             self.IO_MODEL,
-            lazy_loader.get_unit_model()
+            lazy_loader.get_entity_unit_model()
         )
 
     def is_by_unit(self) -> bool:

django_ledger/io/io_middleware.py

@@ -11,9 +11,7 @@ from itertools import groupby, chain
 from django.core.exceptions import ValidationError
 
 from django_ledger.io import roles as roles_module
-from django_ledger.models.utils import LazyLoader, lazy_loader
-
-lazy_importer = LazyLoader()
+from django_ledger.models.utils import lazy_loader
 
 
 class AccountRoleIOMiddleware:
@@ -197,7 +195,7 @@ class JEActivityIOMiddleware:
         return (acc for acc in self.ACCOUNTS if acc['activity'] == activity)
 
     def process_activity(self):
-        JournalEntryModel = lazy_importer.get_journal_entry_model()
+        JournalEntryModel = lazy_loader.get_journal_entry_model()
         for act in JournalEntryModel.VALID_ACTIVITIES:
             acc_list = list(self.get_accounts_generator(act))
             self.ACTIVITY_ACCOUNTS[act] = acc_list

django_ledger/models/accounts.py

@@ -158,7 +158,10 @@ class AccountModelManager(MP_NodeManager):
         """
         Sets the custom queryset as the default.
         """
-        return AccountModelQuerySet(self.model).order_by('path')
+        return AccountModelQuerySet(
+            self.model,
+            using=self._db
+        ).order_by('path').select_related('coa_model')
 
     def for_user(self, user_model):
         qs = self.get_queryset()
@@ -646,6 +649,13 @@ class AccountModelAbstract(MP_Node, CreateUpdateMixIn):
                 'updated'
             ])
 
+    def can_transact(self) -> bool:
+        return all([
+            self.coa_model.is_active(),
+            not self.is_locked(),
+            self.is_active()
+        ])
+
     def get_code_prefix(self) -> str:
 
         if self.is_asset():

django_ledger/models/closing_entry.py

@@ -1,14 +1,14 @@
+from datetime import datetime, time
 from decimal import Decimal
 from itertools import groupby, chain
 from typing import Optional
 from uuid import uuid4, UUID
-from datetime import datetime, time
 
 from django.core.exceptions import ValidationError
 from django.core.validators import MinValueValidator
 from django.db import models
 from django.db.models import Q
-from django.db.models.signals import pre_save, pre_delete
+from django.db.models.signals import pre_save
 from django.urls import reverse
 from django.utils.timezone import make_aware
 from django.utils.translation import gettext_lazy as _
@@ -120,8 +120,6 @@ class ClosingEntryModelAbstract(CreateUpdateMixIn, MarkdownNotesMixIn):
                         f'do not equal Debits {ce_txs_sum[TransactionModel.DEBIT]}'
             )
 
-
-
         key_func = lambda i: (str(i.unit_model_id) if i.unit_model_id else '', i.activity if i.activity else '')
 
         ce_txs.sort(key=key_func)
@@ -338,6 +336,8 @@ class ClosingEntryModel(ClosingEntryModelAbstract):
     pass
 
 
+# todo: Remove this model!
+
 class ClosingEntryTransactionModelQuerySet(models.QuerySet):
     pass