django-ledger 0.5.6.3__py3-none-any.whl → 0.5.6.5__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.3'
+__version__ = '0.5.6.5'
 __license__ = 'GPLv3 License'
 
 __author__ = 'Miguel Sanda'

django_ledger/admin/coa.py

@@ -84,7 +84,7 @@ class ChartOfAccountsInLine(TabularInline):
     show_change_link = True
     fields = [
         'name',
-        'locked',
+        'active',
         'assign_as_default'
     ]
 
@@ -92,13 +92,13 @@ class ChartOfAccountsInLine(TabularInline):
 class ChartOfAccountsModelAdmin(ModelAdmin):
     list_filter = [
         'entity__name',
-        'locked'
+        'active'
     ]
     list_display = [
         'entity_name',
         'name',
         'slug',
-        'locked',
+        'active',
         'account_model_count'
     ]
     search_fields = [

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 = [
@@ -53,7 +61,7 @@ class AccountModelCreateForm(ModelForm):
             'role_default',
             'balance_type',
             'active',
-            'locked'
+            'active'
         ]
         widgets = {
             'code': TextInput(attrs={
@@ -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/forms/coa.py

@@ -9,19 +9,14 @@ class ChartOfAccountsModelForm(ModelForm):
     class Meta:
         model = ChartOfAccountModel
         fields = [
-            # 'slug',
             'name',
             'description'
         ]
         labels = {
-            'slug': _('CoA ID'),
             'name': _('Name'),
             'description': _('Description'),
         }
         widgets = {
-            # 'slug': TextInput(attrs={
-            #     'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
-            # }),
             'name': TextInput(attrs={
                 'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
             }),
@@ -36,7 +31,7 @@ class ChartOfAccountsModelUpdateForm(ModelForm):
         model = ChartOfAccountModel
         fields = [
             'name',
-            'locked'
+            'active'
         ]
         labels = {
             'name': _('Name'),

django_ledger/io/roles.py

@@ -119,48 +119,52 @@ ROOT_GROUP_LEVEL_2 = [
 ]
 ROOT_GROUP_META = {
     ROOT_COA: {
-        'code': '00000',
+        'code': '00000000',
         'title': 'CoA Root Node',
         'balance_type': DEBIT
     },
     ROOT_ASSETS: {
-        'code': '01000',
+        'code': '01000000',
         'title': 'Asset Accounts Root Node',
         'balance_type': DEBIT
     },
     ROOT_LIABILITIES: {
-        'code': '02000',
+        'code': '02000000',
         'title': 'Liability Accounts Root Node',
         'balance_type': CREDIT
     },
     ROOT_CAPITAL: {
-        'code': '03000',
+        'code': '03000000',
         'title': 'Capital Accounts Root Node',
         'balance_type': CREDIT
     },
     ROOT_INCOME: {
-        'code': '04000',
+        'code': '04000000',
         'title': 'Income Accounts Root Node',
         'balance_type': CREDIT
     },
     ROOT_COGS: {
-        'code': '05000',
+        'code': '05000000',
         'title': 'COGS Accounts Root Node',
         'balance_type': DEBIT
     },
     ROOT_EXPENSES: {
-        'code': '06000',
+        'code': '06000000',
         'title': 'Expense Accounts Root Node',
         'balance_type': DEBIT
     },
 }
 # ------> ROLE GROUPS <-------#
 
+GROUP_ASSETS = list()
+GROUP_ASSETS.append(ROOT_ASSETS)
+
 # ASSET GROUPS...
 GROUP_QUICK_ASSETS = [
     ASSET_CA_CASH,
     ASSET_CA_MKT_SECURITIES
 ]
+GROUP_ASSETS += GROUP_QUICK_ASSETS
 
 GROUP_CURRENT_ASSETS = [
     ASSET_CA_CASH,
@@ -171,6 +175,7 @@ GROUP_CURRENT_ASSETS = [
     ASSET_CA_UNCOLLECTIBLES,
     ASSET_CA_OTHER
 ]
+GROUP_ASSETS += GROUP_CURRENT_ASSETS
 
 GROUP_NON_CURRENT_ASSETS = [
     ASSET_LTI_NOTES_RECEIVABLE,
@@ -187,9 +192,13 @@ GROUP_NON_CURRENT_ASSETS = [
     ASSET_ADJUSTMENTS
 ]
 
-GROUP_ASSETS = GROUP_CURRENT_ASSETS + GROUP_NON_CURRENT_ASSETS
+GROUP_ASSETS += GROUP_NON_CURRENT_ASSETS
+GROUP_ASSETS = list(set(GROUP_ASSETS))
 
 # LIABILITY GROUPS....
+GROUP_LIABILITIES = list()
+GROUP_LIABILITIES.append(ROOT_LIABILITIES)
+
 GROUP_CURRENT_LIABILITIES = [
     LIABILITY_CL_ACC_PAYABLE,
     LIABILITY_CL_DEFERRED_REVENUE,
@@ -200,17 +209,21 @@ GROUP_CURRENT_LIABILITIES = [
     LIABILITY_CL_WAGES_PAYABLE,
     LIABILITY_CL_TAXES_PAYABLE
 ]
+GROUP_LIABILITIES += GROUP_CURRENT_LIABILITIES
 
 GROUP_LT_LIABILITIES = [
     LIABILITY_LTL_NOTES_PAYABLE,
     LIABILITY_LTL_BONDS_PAYABLE,
     LIABILITY_LTL_MORTGAGE_PAYABLE,
 ]
+GROUP_LIABILITIES += GROUP_LT_LIABILITIES
 
-GROUP_LIABILITIES = GROUP_CURRENT_LIABILITIES + GROUP_LT_LIABILITIES
+GROUP_LIABILITIES = list(set(GROUP_LIABILITIES))
 
 # CAPITAL/EQUITY...
+
 GROUP_CAPITAL = [
+    ROOT_CAPITAL,
     EQUITY_CAPITAL,
     EQUITY_COMMON_STOCK,
     EQUITY_PREFERRED_STOCK,
@@ -219,6 +232,7 @@ GROUP_CAPITAL = [
 ]
 
 GROUP_INCOME = [
+    ROOT_INCOME,
     INCOME_OPERATIONAL,
     INCOME_PASSIVE,
     INCOME_INTEREST,
@@ -227,10 +241,12 @@ GROUP_INCOME = [
 ]
 
 GROUP_COGS = [
+    ROOT_COGS,
     COGS
 ]
 
 GROUP_EXPENSES = [
+    ROOT_EXPENSES,
     EXPENSE_OPERATIONAL,
     EXPENSE_INTEREST_ST,
     EXPENSE_INTEREST_LT,

django_ledger/migrations/0015_remove_chartofaccountmodel_locked_and_more.py

@@ -0,0 +1,22 @@
+# Generated by Django 5.0.3 on 2024-03-14 02:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_ledger', '0014_ledgermodel_ledger_xid_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='chartofaccountmodel',
+            name='locked',
+        ),
+        migrations.AddField(
+            model_name='chartofaccountmodel',
+            name='active',
+            field=models.BooleanField(default=True, verbose_name='Is Active'),
+        ),
+    ]

django_ledger/models/accounts.py

@@ -242,8 +242,9 @@ class AccountModelManager(MP_NodeManager):
             entity_slug=entity_slug,
             coa_slug=coa_slug)
         return qs.filter(
-            active=True,
-            locked=False
+            Q(active=True) &
+            Q(locked=False) &
+            Q(coa_model__active=True)
         )
 
     def with_roles(self, roles: Union[list, str], entity_slug, user_model) -> AccountModelQuerySet:
@@ -581,7 +582,7 @@ class AccountModelAbstract(MP_Node, CreateUpdateMixIn):
         return self.balance_type == CREDIT
 
     def is_coa_root(self):
-        return self.role in ROOT_GROUP
+        return self.role == ROOT_COA
 
     def is_asset(self) -> bool:
         return self.role in GROUP_ASSETS
@@ -604,6 +605,9 @@ class AccountModelAbstract(MP_Node, CreateUpdateMixIn):
     def is_active(self) -> bool:
         return self.active is True
 
+    def is_locked(self) -> bool:
+        return self.locked is True
+
     def can_activate(self):
         return all([
             self.active is False
@@ -656,10 +660,7 @@ class AccountModelAbstract(MP_Node, CreateUpdateMixIn):
             return '5'
         elif self.is_expense():
             return '6'
-        elif self.is_coa_root():
-            return '0'
-        else:
-            raise AccountModelValidationError(f'Invalid role match for role {self.role}...')
+        raise AccountModelValidationError(f'Invalid role match for role {self.role}...')
 
     def get_root_role(self) -> str:
         if self.is_asset():
@@ -676,8 +677,7 @@ class AccountModelAbstract(MP_Node, CreateUpdateMixIn):
             return ROOT_EXPENSES
         elif self.is_coa_root():
             return ROOT_COA
-        else:
-            raise AccountModelValidationError(f'Invalid role match for role {self.role}...')
+        raise AccountModelValidationError(f'Invalid role match for role {self.role}...')
 
     def get_account_move_choice_queryset(self):
         return self.coa_model.accountmodel_set.filter(