django-ledger 0.7.2__py3-none-any.whl → 0.7.4__py3-none-any.whl

django_ledger/__init__.py

@@ -6,7 +6,7 @@ Copyright© EDMA Group Inc licensed under the GPLv3 Agreement.
 default_app_config = 'django_ledger.apps.DjangoLedgerConfig'
 
 """Django Ledger"""
-__version__ = '0.7.2'
+__version__ = '0.7.4'
 __license__ = 'GPLv3 License'
 
 __author__ = 'Miguel Sanda'

django_ledger/contrib/django_ledger_graphene/journal_entry/schema.py

@@ -27,10 +27,9 @@ class JournalEntryQuery(graphene.ObjectType):
             sort = info.context.GET.get('sort')
             if not sort:
                 sort = '-updated'
-                return JournalEntryModel.objects.for_ledger(
-                    ledger_pk=pk_ledger,
+                return JournalEntryModel.objects.for_entity(
                     entity_slug=slug_name,
                     user_model=info.context.user
-                ).order_by(sort)
+                ).for_ledger(ledger_pk=pk_ledger).order_by(sort)
         else:
             return JournalEntryModel.objects.none()

django_ledger/contrib/django_ledger_graphene/transaction/schema.py

@@ -17,18 +17,20 @@ class TransactionNode(DjangoObjectType):
             'description': ['exact', 'icontains', 'istartswith'],
         }
         interfaces = (relay.Node,)
+
+
 class TransactionsQuery(graphene.ObjectType):
-    all_transactions = DjangoFilterConnectionField(TransactionNode, slug_name=graphene.String(required=True),
-     pk_je=graphene.UUID(), pk_ledger=graphene.UUID())
+    all_transactions = DjangoFilterConnectionField(
+        TransactionNode,
+        slug_name=graphene.String(required=True),
+        pk_je=graphene.UUID(),
+        pk_ledger=graphene.UUID())
 
     def resolve_all_transactions(self, info, slug_name, pk_je, pk_ledger, **kwargs):
         if info.context.user.is_authenticated:
-            return TransactionModel.objects.for_journal_entry(
+            return TransactionModel.objects.for_entity(
                 entity_slug=slug_name,
                 user_model=info.context.user,
-                je_model=pk_je,
-                ledger_model=pk_ledger
-            ).order_by('account__code')
+            ).for_journal_entry(je_model=pk_je).order_by('account__code')
         else:
             return TransactionModel.objects.none()
-

django_ledger/forms/account.py

@@ -145,13 +145,16 @@ class AccountModelUpdateForm(MoveNodeForm):
 
     class Meta:
         model = AccountModel
-        exclude = ('depth', 'numchild', 'path', 'balance_type')
+        exclude = ('depth', 'numchild', 'path')
         widgets = {
             'role': HiddenInput(),
             'coa_model': HiddenInput(),
             'parent': Select(attrs={
                 'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
             }),
+            'balance_type': Select(attrs={
+                'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
+            }),
             'code': TextInput(attrs={
                 'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
             }),

django_ledger/forms/journal_entry.py

@@ -1,32 +1,39 @@
+from typing import Union
+from uuid import UUID
+
 from django.forms import ModelForm, Textarea, Select, DateTimeInput, ValidationError
 from django.utils.translation import gettext_lazy as _
 
+from django_ledger.models import EntityModel
 from django_ledger.models.journal_entry import JournalEntryModel
 from django_ledger.models.ledger import LedgerModel
-from django_ledger.models.unit import EntityUnitModel
 from django_ledger.settings import DJANGO_LEDGER_FORM_INPUT_CLASSES
 
 
 class JournalEntryModelCreateForm(ModelForm):
     def __init__(self,
-                 entity_slug: str,
-                 ledger_model: LedgerModel,
-                 user_model, *args, **kwargs):
+                 entity_model: EntityModel,
+                 ledger_model: Union[str, UUID, LedgerModel],
+                 *args, **kwargs
+                 ):
         super().__init__(*args, **kwargs)
-        self.USER_MODEL = user_model
-        self.ENTITY_SLUG = entity_slug
+        self.ENTITY_MODEL: EntityModel = entity_model
+
+        # processes the provided ledger model UUID is valid....
+        if isinstance(ledger_model, (str, UUID)):
+            ledger_model = self.ENTITY_MODEL.get_ledgers().get(uuid__exact=ledger_model)
+        elif isinstance(ledger_model, LedgerModel):
+            self.ENTITY_MODEL.validate_ledger_model_for_entity(ledger_model)
+
         self.LEDGER_MODEL: LedgerModel = ledger_model
 
         if 'timestamp' in self.fields:
             self.fields['timestamp'].required = False
         if 'entity_unit' in self.fields:
-            self.fields['entity_unit'].queryset = EntityUnitModel.objects.for_entity(
-                entity_slug=self.ENTITY_SLUG,
-                user_model=self.USER_MODEL
-            )
+            self.fields['entity_unit'].queryset = self.ENTITY_MODEL.entityunitmodel_set.all()
 
     def clean(self):
-        if not self.LEDGER_MODEL.can_edit_journal_entries():
+        if self.LEDGER_MODEL.is_locked():
             raise ValidationError(message=_('Cannot create new Journal Entries on a locked Ledger.'))
         self.instance.ledger = self.LEDGER_MODEL
         return super().clean()
@@ -57,7 +64,7 @@ class JournalEntryModelCreateForm(ModelForm):
         }
 
 
-class JournalEntryModelUpdateForm(JournalEntryModelCreateForm):
+class JournalEntryModelUpdateForm(ModelForm):
 
     def clean_timestamp(self):
         if 'timestamp' in self.changed_data:

django_ledger/forms/transactions.py

@@ -3,15 +3,15 @@ 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>
-Michael Noel <noel.michael87@gmail.com>
+    - Miguel Sanda <msanda@arrobalytics.com>
+    - Michael Noel <noel.michael87@gmail.com>
 """
 
 from django.forms import ModelForm, modelformset_factory, BaseModelFormSet, TextInput, Select, ValidationError
 from django.utils.translation import gettext_lazy as _
 
 from django_ledger.io.io_core import check_tx_balance
-from django_ledger.models.accounts import AccountModel
+from django_ledger.models import EntityModel
 from django_ledger.models.journal_entry import JournalEntryModel
 from django_ledger.models.transactions import TransactionModel
 from django_ledger.settings import DJANGO_LEDGER_FORM_INPUT_CLASSES
@@ -44,17 +44,13 @@ class TransactionModelForm(ModelForm):
 
 class TransactionModelFormSet(BaseModelFormSet):
 
-    def __init__(self, *args, entity_slug, user_model, ledger_pk, je_model=None, **kwargs):
+    def __init__(self, *args, entity_model: EntityModel, je_model: JournalEntryModel, **kwargs):
         super().__init__(*args, **kwargs)
-        self.USER_MODEL = user_model
+        je_model.validate_for_entity(entity_model)
         self.JE_MODEL: JournalEntryModel = je_model
-        self.LEDGER_PK = ledger_pk
-        self.ENTITY_SLUG = entity_slug
+        self.ENTITY_MODEL = entity_model
 
-        account_qs = AccountModel.objects.for_entity(
-            user_model=self.USER_MODEL,
-            entity_model=self.ENTITY_SLUG
-        ).available().order_by('code')
+        account_qs = self.ENTITY_MODEL.get_coa_accounts().active().order_by('code')
 
         for form in self.forms:
             form.fields['account'].queryset = account_qs
@@ -64,7 +60,7 @@ class TransactionModelFormSet(BaseModelFormSet):
                 form.fields['amount'].disabled = True
 
     def get_queryset(self):
-        return self.JE_MODEL.transactionmodel_set.all().order_by('account__code')
+        return self.JE_MODEL.transactionmodel_set.all()
 
     def clean(self):
         if any(self.errors):

django_ledger/io/io_core.py

@@ -359,11 +359,12 @@ class IODatabaseMixIn:
                     raise IOValidationError('Inconsistent entity_slug. '
                                             f'Provided {entity_slug} does not match actual {self.slug}')
             if unit_slug:
-                txs_queryset_init = TransactionModel.objects.for_unit(
+
+                txs_queryset_init = TransactionModel.objects.for_entity(
                     user_model=user_model,
-                    entity_slug=entity_slug or self.slug,
-                    unit_slug=unit_slug
-                )
+                    entity_slug=entity_slug or self.slug
+                ).for_unit(unit_slug=unit_slug)
+
             else:
                 txs_queryset_init = TransactionModel.objects.for_entity(
                     user_model=user_model,
@@ -373,20 +374,22 @@ class IODatabaseMixIn:
             if not entity_slug:
                 raise IOValidationError(
                     'Calling digest from Entity Unit requires entity_slug explicitly for safety')
-            txs_queryset_init = TransactionModel.objects.for_unit(
+
+            txs_queryset_init = TransactionModel.objects.for_entity(
                 user_model=user_model,
                 entity_slug=entity_slug,
-                unit_slug=unit_slug or self
-            )
+            ).for_unit(unit_slug=unit_slug or self)
+
         elif self.is_ledger_model():
             if not entity_slug:
                 raise IOValidationError(
                     'Calling digest from Ledger Model requires entity_slug explicitly for safety')
-            txs_queryset_init = TransactionModel.objects.for_ledger(
-                user_model=user_model,
+
+            txs_queryset_init = TransactionModel.objects.for_entity(
                 entity_slug=entity_slug,
-                ledger_model=self
-            )
+                user_model=user_model,
+            ).for_ledger(ledger_model=self)
+
         else:
             raise IOValidationError(
                 message=f'Cannot call digest from {self.__class__.__name__}'
@@ -499,10 +502,11 @@ class IODatabaseMixIn:
         VALUES = [
             'account__uuid',
             'account__balance_type',
-            'tx_type',
             'account__code',
             'account__name',
             'account__role',
+            'account__coa_model__slug',
+            'tx_type',
         ]
 
         ANNOTATE = {'balance': Sum('amount')}
@@ -663,6 +667,7 @@ class IODatabaseMixIn:
         gl = list(g)
         return {
             'account_uuid': k[0],
+            'coa_slug': gl[0]['account__coa_model__slug'],
             'unit_uuid': k[1],
             'unit_name': gl[0].get('journal_entry__entity_unit__name'),
             'activity': gl[0].get('journal_entry__activity'),

django_ledger/io/io_library.py

@@ -433,9 +433,9 @@ class IOBluePrint:
         return round(amount, self.precision_decimals)
 
     def _amount(self, amount: Union[float, Decimal, int]) -> Decimal:
-        if amount <= 0:
+        if amount < 0:
             raise IOBluePrintValidationError(
-                message='Amounts must be greater than 0'
+                message='Amounts cannot be negative.'
             )
 
         if isinstance(amount, float):
@@ -448,7 +448,7 @@ class IOBluePrint:
             return Decimal(str(amount))
 
         raise IOBluePrintValidationError(
-            message='Amounts must be float or Decimal'
+            message='Amounts must be float, Decimal or int.'
         )
 
     def credit(self, account_code: str, amount: Union[float, Decimal], description: str = None):

django_ledger/migrations/0001_initial.py

@@ -46,7 +46,7 @@ class Migration(migrations.Migration):
                 ('lia_cl_acc_payable', 'Accounts Payable'), ('lia_cl_wages_payable', 'Wages Payable'),
                 ('lia_cl_int_payable', 'Interest Payable'), ('lia_cl_taxes_payable', 'Taxes Payable'),
                 ('lia_cl_st_notes_payable', 'Notes Payable'),
-                ('lia_cl_ltd_mat', 'Current Maturities of Long Tern Debt'), ('lia_cl_def_rev', 'Deferred Revenue'),
+                ('lia_cl_ltd_mat', 'Current Maturities of Long Term Debt'), ('lia_cl_def_rev', 'Deferred Revenue'),
                 ('lia_cl_other', 'Other Liabilities'), ('lia_ltl_notes', 'Notes Payable'),
                 ('lia_ltl_bonds', 'Bonds Payable'), ('lia_ltl_mortgage', 'Mortgage Payable'))), ('Equity', (
                 ('eq_capital', 'Capital'), ('eq_stock_common', 'Common Stock'),

django_ledger/migrations/0019_alter_transactionmodel_amount_and_more.py

@@ -0,0 +1,33 @@
+# Generated by Django 5.1.5 on 2025-01-17 00:11
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('django_ledger', '0018_transactionmodel_cleared_transactionmodel_reconciled_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='transactionmodel',
+            name='amount',
+            field=models.DecimalField(decimal_places=2, default=0.0, help_text='Amount of the transaction.',
+                                      max_digits=20, validators=[django.core.validators.MinValueValidator(0)],
+                                      verbose_name='Amount'),
+        ),
+        migrations.AlterField(
+            model_name='transactionmodel',
+            name='description',
+            field=models.CharField(blank=True,
+                                   help_text='A description to be included with this individual transaction.',
+                                   max_length=100, null=True, verbose_name='Transaction Description'),
+        ),
+        migrations.AlterField(
+            model_name='transactionmodel',
+            name='tx_type',
+            field=models.CharField(choices=[('credit', 'Credit'), ('debit', 'Debit')], max_length=10,
+                                   verbose_name='Transaction Type'),
+        ),
+    ]

django_ledger/models/bill.py

@@ -33,8 +33,13 @@ from django_ledger.io import ASSET_CA_CASH, ASSET_CA_PREPAID, LIABILITY_CL_ACC_P
 from django_ledger.io.io_core import get_localtime, get_localdate
 from django_ledger.models.entity import EntityModel
 from django_ledger.models.items import ItemTransactionModelQuerySet, ItemTransactionModel, ItemModel, ItemModelQuerySet
-from django_ledger.models.mixins import (CreateUpdateMixIn, AccrualMixIn, MarkdownNotesMixIn,
-                                         PaymentTermsMixIn, ItemizeMixIn)
+from django_ledger.models.mixins import (
+    CreateUpdateMixIn,
+    AccrualMixIn,
+    MarkdownNotesMixIn,
+    PaymentTermsMixIn,
+    ItemizeMixIn
+)
 from django_ledger.models.signals import (
     bill_status_draft,
     bill_status_in_review,
@@ -575,6 +580,16 @@ class BillModelAbstract(
 
     # ### ItemizeMixIn implementation END...
 
+    def get_transaction_queryset(self, annotated: bool = False):
+        """
+        Fetches the TransactionModelQuerySet associated with the BillModel instance.
+        """
+        TransactionModel = lazy_loader.get_txs_model()
+        transaction_model_qs = TransactionModel.objects.all().for_ledger(ledger_model=self.ledger_id)
+        if annotated:
+            return transaction_model_qs.with_annotated_details()
+        return transaction_model_qs
+
     # State..
     def get_migrate_state_desc(self) -> str:
         """

django_ledger/models/chart_of_accounts.py

@@ -286,6 +286,10 @@ class ChartOfAccountModelAbstract(SlugNameMixIn, CreateUpdateMixIn):
                 return qs
             return qs.get()
 
+        raise ChartOfAccountsModelValidationError(
+            message='Adding Root account to Chart of Accounts is not allowed.'
+        )
+
     def get_non_root_coa_accounts_qs(self) -> AccountModelQuerySet:
         """
         Returns a query set of non-root accounts in the chart of accounts.

django_ledger/models/closing_entry.py

@@ -232,10 +232,11 @@ class ClosingEntryModelAbstract(CreateUpdateMixIn, MarkdownNotesMixIn):
                 message=_(f'Closing Entry {self.closing_date} is not posted.')
             )
         self.posted = False
-        TransactionModel.objects.for_ledger(
-            ledger_model=self.ledger_model,
+
+        TransactionModel.objects.for_entity(
             entity_slug=self.entity_model_id
-        ).delete()
+        ).for_ledger(ledger_model=self.ledger_model).delete()
+
         self.ledger_model.journal_entries.all().delete()
         if commit:
             self.save(
@@ -303,10 +304,11 @@ class ClosingEntryModelAbstract(CreateUpdateMixIn, MarkdownNotesMixIn):
             raise ClosingEntryValidationError(
                 message=_('Cannot delete a posted Closing Entry')
             )
-        TransactionModel.objects.for_ledger(
-            ledger_model=self.ledger_model,
+
+        TransactionModel.objects.for_entity(
             entity_slug=self.entity_model_id
-        ).delete()
+        ).for_ledger(ledger_model=self.ledger_model).delete()
+
         return self.ledger_model.delete()
 
     def get_delete_html_id(self) -> str:

django_ledger/models/data_import.py

@@ -156,6 +156,7 @@ class StagedTransactionModelManager(Manager):
                 When(parent_id__isnull=False, then=F('parent_id'))
             ),
         ).annotate(
+            entity_unit=F('transaction_model__journal_entry__entity_unit__name'),
             ready_to_import=Case(
                 # is mapped singleton...
                 When(

django_ledger/models/invoice.py

@@ -546,6 +546,16 @@ class InvoiceModelAbstract(
 
     # ### ItemizeMixIn implementation END...
 
+    def get_transaction_queryset(self, annotated: bool = False):
+        """
+        Fetches the TransactionModelQuerySet associated with the InvoiceModel instance.
+        """
+        TransactionModel = lazy_loader.get_txs_model()
+        transaction_model_qs = TransactionModel.objects.all().for_ledger(ledger_model=self.ledger_id)
+        if annotated:
+            return transaction_model_qs.with_annotated_details()
+        return transaction_model_qs
+
     def get_migrate_state_desc(self):
         """
         Description used when migrating transactions into the LedgerModel.
@@ -557,8 +567,7 @@ class InvoiceModelAbstract(
         """
         return f'Invoice {self.invoice_number} account adjustment.'
 
-    def get_migration_data(self,
-                           queryset: Optional[ItemTransactionModelQuerySet] = None) -> ItemTransactionModelQuerySet:
+    def get_migration_data(self, queryset: Optional[ItemTransactionModelQuerySet] = None) -> ItemTransactionModelQuerySet:
 
         """
         Fetches necessary item transaction data to perform a migration into the LedgerModel.
@@ -591,8 +600,7 @@ class InvoiceModelAbstract(
             'total_amount').annotate(
             account_unit_total=Sum('total_amount'))
 
-    def update_amount_due(self,
-                          itemtxs_qs: Optional[ItemTransactionModelQuerySet] = None) -> ItemTransactionModelQuerySet:
+    def update_amount_due(self, itemtxs_qs: Optional[ItemTransactionModelQuerySet] = None) -> ItemTransactionModelQuerySet:
         """
         Updates the InvoiceModel amount due.