arrobalytics
diff --git a/‎django_ledger/__init__.py
+1-1 b/‎django_ledger/__init__.py
+1-1
diff --git a/‎django_ledger/admin/__init__.py
+1-1 b/‎django_ledger/admin/__init__.py
+1-1
diff --git a/‎django_ledger/admin/coa.py renamed to ‎django_ledger/admin/chart_of_accounts.py
+1-1 b/‎django_ledger/admin/coa.py renamed to ‎django_ledger/admin/chart_of_accounts.py
+1-1
diff --git a/‎django_ledger/admin/entity.py
+1-1 b/‎django_ledger/admin/entity.py
+1-1
diff --git a/‎django_ledger/forms/account.py
+1-1 b/‎django_ledger/forms/account.py
+1-1
diff --git a/‎django_ledger/forms/bank_account.py
+2 b/‎django_ledger/forms/bank_account.py
+2
diff --git a/‎django_ledger/forms/chart_of_accounts.py
+82 b/‎django_ledger/forms/chart_of_accounts.py
+82
diff --git a/‎django_ledger/forms/coa.py
-47 b/‎django_ledger/forms/coa.py
-47
diff --git a/‎django_ledger/io/io_library.py
+1-1 b/‎django_ledger/io/io_library.py
+1-1
diff --git a/‎django_ledger/migrations/0018_transactionmodel_cleared_transactionmodel_reconciled_and_more.py
+37 b/‎django_ledger/migrations/0018_transactionmodel_cleared_transactionmodel_reconciled_and_more.py
+37
diff --git a/‎django_ledger/models/__init__.py
+1-1 b/‎django_ledger/models/__init__.py
+1-1
diff --git a/‎django_ledger/models/accounts.py
+4 b/‎django_ledger/models/accounts.py
+4
diff --git a/‎django_ledger/models/bank_account.py
+6-2 b/‎django_ledger/models/bank_account.py
+6-2
diff --git a/‎django_ledger/models/bill.py
+7-3 b/‎django_ledger/models/bill.py
+7-3
@@ -6,7 +6,7 @@
 default_app_config = 'django_ledger.apps.DjangoLedgerConfig'
 
 """Django Ledger"""
-__version__ = '0.7.0'
+__version__ = '0.7.1'
 __license__ = 'GPLv3 License'
 
 __author__ = 'Miguel Sanda'
 
@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from django_ledger.admin.coa import ChartOfAccountsModelAdmin
+from django_ledger.admin.chart_of_accounts import ChartOfAccountsModelAdmin
 from django_ledger.admin.entity import EntityModelAdmin
 from django_ledger.admin.ledger import LedgerModelAdmin
 from django_ledger.models import EntityModel, ChartOfAccountModel, LedgerModel
 
@@ -3,7 +3,7 @@
 from django.forms import ModelForm, BooleanField, BaseInlineFormSet
 
 from django_ledger.models.accounts import AccountModel
-from django_ledger.models.coa import ChartOfAccountModel
+from django_ledger.models.chart_of_accounts import ChartOfAccountModel
 from django_ledger.models.entity import EntityModel
 
 
 
@@ -7,7 +7,7 @@
 from django.urls import reverse
 from django.utils.html import format_html
 
-from django_ledger.admin.coa import ChartOfAccountsInLine
+from django_ledger.admin.chart_of_accounts import ChartOfAccountsInLine
 from django_ledger.io.io_core import get_localtime
 from django_ledger.models import EntityUnitModel
 from django_ledger.models.entity import EntityModel, EntityManagementModel
 
@@ -38,7 +38,7 @@ def __init__(self, coa_model: ChartOfAccountModel, *args, **kwargs):
         self.fields['role'].choices = ACCOUNT_CHOICES_NO_ROOT
         self.fields['code'].required = False
         self.fields['coa_model'].disabled = True
-        self.fields['coa_model'].required = False
+        self.fields['coa_model'].required = True
 
         self.form_id: str = self.get_form_id()
 
 
@@ -13,6 +13,8 @@ def __init__(self, *args, entity_slug, user_model, **kwargs):
         super().__init__(*args, **kwargs)
         self.ENTITY_SLUG = entity_slug
         self.USER_MODEL = user_model
+
+        # todo: only the accounts that do not hava an associated bank account should be available to pick from...
         account_qs = AccountModel.objects.for_entity(
             user_model=self.USER_MODEL,
             entity_model=self.ENTITY_SLUG
 
@@ -0,0 +1,82 @@
+from random import randint
+
+from django.forms import ModelForm, TextInput, Textarea, HiddenInput
+from django.utils.translation import gettext_lazy as _
+
+from django_ledger.models.chart_of_accounts import ChartOfAccountModel
+from django_ledger.models.entity import EntityModel
+from django_ledger.settings import DJANGO_LEDGER_FORM_INPUT_CLASSES
+
+
+class ChartOfAccountsModelCreateForm(ModelForm):
+    FORM_ID_SEP = '___'
+
+    def __init__(self, entity_model: EntityModel, *args, **kwargs):
+        self.ENTITY_MODEL = entity_model
+        super().__init__(*args, **kwargs)
+        self.fields['entity'].disabled = True
+        self.fields['entity'].required = True
+        self.form_id: str = self.get_form_id()
+
+    def clean_entity(self):
+        return self.ENTITY_MODEL
+
+    def get_form_id(self) -> str:
+        return f'coa-model-create-form-{self.ENTITY_MODEL.slug}{self.FORM_ID_SEP}{randint(100000, 999999)}'
+
+    class Meta:
+        model = ChartOfAccountModel
+        fields = [
+            'entity',
+            'name',
+            'description'
+        ]
+        labels = {
+            'name': _('Name'),
+            'description': _('Description'),
+        }
+        widgets = {
+            'entity': HiddenInput(),
+            'name': TextInput(
+                attrs={
+                    'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
+                }),
+            'description': Textarea(
+                attrs={
+                    'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
+                }
+            ),
+        }
+
+
+class ChartOfAccountsModelUpdateForm(ModelForm):
+
+    FORM_ID_SEP = '___'
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.form_id: str = self.get_form_id()
+
+
+    def get_form_id(self) -> str:
+        instance: ChartOfAccountModel = self.instance
+        return f'coa-model-update-form-{instance.slug}{self.FORM_ID_SEP}{randint(100000, 999999)}'
+
+    class Meta:
+        model = ChartOfAccountModel
+        fields = [
+            'name',
+            'active'
+        ]
+        labels = {
+            'name': _('Name'),
+            'description': _('Description'),
+        }
+        widgets = {
+            'name': TextInput(attrs={
+                'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
+            }),
+            'description': Textarea(attrs={
+                'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
+            }),
+        }
@@ -22,7 +22,7 @@
 
 from django_ledger.io.io_core import get_localtime
 from django_ledger.models.accounts import AccountModel, AccountModelQuerySet, CREDIT, DEBIT
-from django_ledger.models.coa import ChartOfAccountModel
+from django_ledger.models.chart_of_accounts import ChartOfAccountModel
 from django_ledger.models.entity import EntityModel
 from django_ledger.models.ledger import LedgerModel, LedgerModelQuerySet
 
 
@@ -0,0 +1,37 @@
+# Generated by Django 5.1.2 on 2024-11-20 22:26
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_ledger', '0017_alter_accountmodel_unique_together_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='transactionmodel',
+            name='cleared',
+            field=models.BooleanField(default=False, verbose_name='Cleared'),
+        ),
+        migrations.AddField(
+            model_name='transactionmodel',
+            name='reconciled',
+            field=models.BooleanField(default=False, verbose_name='Reconciled'),
+        ),
+        migrations.AlterField(
+            model_name='chartofaccountmodel',
+            name='entity',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='django_ledger.entitymodel', verbose_name='Entity'),
+        ),
+        migrations.AddIndex(
+            model_name='transactionmodel',
+            index=models.Index(fields=['cleared'], name='django_ledg_cleared_335c0b_idx'),
+        ),
+        migrations.AddIndex(
+            model_name='transactionmodel',
+            index=models.Index(fields=['reconciled'], name='django_ledg_reconci_75dbc7_idx'),
+        ),
+    ]
@@ -1,6 +1,6 @@
 from django_ledger.models.mixins import *
 from django_ledger.models.bank_account import *
-from django_ledger.models.coa import *
+from django_ledger.models.chart_of_accounts import *
 from django_ledger.models.bill import *
 from django_ledger.models.invoice import *
 from django_ledger.models.items import *
 
@@ -1058,6 +1058,10 @@ class AccountModel(AccountModelAbstract):
     Base Account Model from Account Model Abstract Class
     """
 
+    class Meta(AccountModelAbstract.Meta):
+        swappable = 'DJANGO_LEDGER_ACCOUNT_MODEL'
+        abstract = False
+
 
 def accountmodel_presave(instance: AccountModel, **kwargs):
     if instance.role_default is False:
 
@@ -91,7 +91,7 @@ def for_entity(self, entity_slug, user_model) -> BankAccountModelQuerySet:
         )
 
 
-class BackAccountModelAbstract(BankAccountInfoMixIn, CreateUpdateMixIn):
+class BankAccountModelAbstract(BankAccountInfoMixIn, CreateUpdateMixIn):
     """
     This is the main abstract class which the BankAccountModel database will inherit from.
     The BankAccountModel inherits functionality from the following MixIns:
@@ -204,7 +204,11 @@ def mark_as_inactive(self, commit: bool = False, raise_exception: bool = True, *
             ])
 
 
-class BankAccountModel(BackAccountModelAbstract):
+class BankAccountModel(BankAccountModelAbstract):
     """
     Base Bank Account Model Implementation
     """
+
+    class Meta(BankAccountModelAbstract.Meta):
+        swappable = 'DJANGO_LEDGER_BANK_ACCOUNT_MODEL'
+        abstract = False
@@ -23,7 +23,7 @@
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ValidationError, ObjectDoesNotExist
 from django.db import models, transaction, IntegrityError
-from django.db.models import Q, Sum, F, Count
+from django.db.models import Q, Sum, F, Count, QuerySet, Manager
 from django.db.models.signals import pre_save
 from django.shortcuts import get_object_or_404
 from django.urls import reverse
@@ -53,7 +53,7 @@ class BillModelValidationError(ValidationError):
     pass
 
 
-class BillModelQuerySet(models.QuerySet):
+class BillModelQuerySet(QuerySet):
     """
     A custom defined QuerySet for the BillModel. This implements multiple methods or queries needed to get a filtered
     QuerySet based on the BillModel status. For example, we might want to have list of bills which are paid, unpaid,
@@ -170,7 +170,7 @@ def unpaid(self):
         return self.filter(bill_status__exact=BillModel.BILL_STATUS_APPROVED)
 
 
-class BillModelManager(models.Manager):
+class BillModelManager(Manager):
     """
     A custom defined BillModelManager that will act as an interface to handling the initial DB queries
     to the BillModel. The default "get_queryset" has been overridden to refer the custom defined
@@ -1904,6 +1904,10 @@ class BillModel(BillModelAbstract):
     Base BillModel from Abstract.
     """
 
+    class Meta(BillModelAbstract.Meta):
+        swappable = 'DJANGO_LEDGER_BILL_MODEL'
+        abstract = False
+
 
 def billmodel_presave(instance: BillModel, **kwargs):
     if instance.can_generate_bill_number():