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

django_ledger/context.py

@@ -0,0 +1,12 @@
+from django.conf import settings
+
+from django_ledger import __version__
+from django_ledger.settings import DJANGO_LEDGER_THEME
+
+
+def django_ledger_context(request):
+    return {
+        'DEBUG': settings.DEBUG,
+        'VERSION': __version__,
+        'DJANGO_LEDGER_THEME': DJANGO_LEDGER_THEME,
+    }

django_ledger/forms/bill.py

@@ -214,10 +214,6 @@ class BillModelConfigureForm(BaseBillModelUpdateForm):
 
 class BillItemTransactionForm(ModelForm):
 
-    # def __init__(self, entity_unit_qs, *args, **kwargs):
-    #     super().__init__(self, *args, **kwargs)
-    #     self.fields['entity_unit'].queryset = entity_unit_qs
-
     def clean(self):
         cleaned_data = super(BillItemTransactionForm, self).clean()
         itemtxs_model: ItemTransactionModel = self.instance

django_ledger/forms/closing_entry.py

@@ -1,15 +1,25 @@
-from django.forms import DateInput, ValidationError, ModelForm, Textarea
+from django.forms import DateInput, ValidationError, ModelForm, Textarea, HiddenInput
 from django.utils.translation import gettext_lazy as _
 
 from django_ledger.io.io_core import get_localdate
 from django_ledger.models.closing_entry import ClosingEntryModel
+from django_ledger.models.entity import EntityModel
 from django_ledger.settings import DJANGO_LEDGER_FORM_INPUT_CLASSES
 
 
 class ClosingEntryCreateForm(ModelForm):
 
+    def __init__(self, entity_model: EntityModel, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.ENTITY_MODEL: EntityModel = entity_model
+        self.fields['entity_model'].disabled = True
+
+    def clean_entity_model(self):
+        return self.ENTITY_MODEL
+
     def clean_closing_date(self):
         closing_date = self.cleaned_data['closing_date']
+
         if closing_date > get_localdate():
             raise ValidationError(
                 message=_('Cannot create a closing entry with a future date.'), code='invalid_date'
@@ -19,10 +29,12 @@ class ClosingEntryCreateForm(ModelForm):
     class Meta:
         model = ClosingEntryModel
         fields = [
+            'entity_model',
             'closing_date'
         ]
 
         widgets = {
+            'entity_model': HiddenInput(),
             'closing_date': DateInput(attrs={
                 'class': DJANGO_LEDGER_FORM_INPUT_CLASSES + ' is-large',
                 'placeholder': _('Closing Date (YYYY-MM-DD)...'),

django_ledger/forms/data_import.py

@@ -40,7 +40,7 @@ class ImportJobModelCreateForm(ModelForm):
         widgets = {
             'description': TextInput(attrs={
                 'class': DJANGO_LEDGER_FORM_INPUT_CLASSES + ' is-large',
-                'placeholder': _('What\'s this import about?...')
+                'placeholder': _('Name this import...')
             }),
             'bank_account_model': Select(
                 attrs={

django_ledger/forms/estimate.py

@@ -25,8 +25,7 @@ class EstimateModelCreateForm(forms.ModelForm):
 
     def get_customer_queryset(self):
         return CustomerModel.objects.for_entity(
-            entity_slug=self.ENTITY_SLUG,
-            user_model=self.USER_MODEL
+            entity_model=self.ENTITY_SLUG,
         ).active()
 
     class Meta:
@@ -116,13 +115,11 @@ class BaseEstimateItemModelFormset(BaseModelFormSet):
         self.ENTITY_SLUG = entity_slug
 
         items_qs = ItemModel.objects.for_estimate(
-            entity_slug=self.ENTITY_SLUG,
-            user_model=self.USER_MODEL
+            entity_model=self.ENTITY_SLUG
         )
 
         unit_qs = EntityUnitModel.objects.for_entity(
-            entity_slug=self.ENTITY_SLUG,
-            user_model=self.USER_MODEL
+            entity_model=self.ENTITY_SLUG
         )
 
         for form in self.forms:

django_ledger/forms/invoice.py

@@ -29,8 +29,7 @@ class InvoiceModelCreateForEstimateForm(ModelForm):
     def get_customer_queryset(self):
         if 'customer' in self.fields:
             customer_qs = CustomerModel.objects.for_entity(
-                user_model=self.USER_MODEL,
-                entity_slug=self.ENTITY_SLUG
+                entity_model=self.ENTITY_SLUG
             ).active()
             self.fields['customer'].queryset = customer_qs
 
@@ -43,7 +42,6 @@ class InvoiceModelCreateForEstimateForm(ModelForm):
         ]):
 
             account_qs = AccountModel.objects.for_entity(
-                user_model=self.USER_MODEL,
                 entity_model=self.ENTITY_SLUG
             ).for_invoice()
 
@@ -237,8 +235,7 @@ class BaseInvoiceItemTransactionFormset(BaseModelFormSet):
         self.ENTITY_SLUG = entity_slug
 
         items_qs = ItemModel.objects.for_invoice(
-            entity_slug=self.ENTITY_SLUG,
-            user_model=self.USER_MODEL
+            entity_model=self.ENTITY_SLUG
         )
 
         for form in self.forms:
@@ -252,8 +249,7 @@ class BaseInvoiceItemTransactionFormset(BaseModelFormSet):
     def get_queryset(self):
         if not self.queryset:
             self.queryset = ItemTransactionModel.objects.for_invoice(
-                entity_slug=self.ENTITY_SLUG,
-                user_model=self.USER_MODEL,
+                entity_model=self.ENTITY_SLUG,
                 invoice_pk=self.INVOICE_MODEL.uuid
             )
         else:

django_ledger/forms/item.py

@@ -1,4 +1,4 @@
-from django.forms import ModelForm, TextInput, Select, ChoiceField
+from django.forms import ModelForm, TextInput, Select
 from django.utils.translation import gettext_lazy as _
 
 from django_ledger.io.roles import GROUP_INCOME, ASSET_CA_INVENTORY, GROUP_EXPENSES, GROUP_COGS
@@ -48,7 +48,6 @@ class ProductCreateForm(ModelForm):
 
         accounts_qs = AccountModel.objects.for_entity(
             entity_model=self.ENTITY_SLUG,
-            user_model=self.USER_MODEL
         ).with_roles(
             roles=self.PRODUCT_OR_SERVICE_ROLES
         ).active()
@@ -62,8 +61,7 @@ class ProductCreateForm(ModelForm):
 
         if 'uom' in self.fields:
             uom_qs = UnitOfMeasureModel.objects.for_entity_active(
-                entity_slug=self.ENTITY_SLUG,
-                user_model=self.USER_MODEL
+                entity_model=self.ENTITY_SLUG
             )
             self.fields['uom'].queryset = uom_qs
 
@@ -142,8 +140,7 @@ class ServiceCreateForm(ModelForm):
         super().__init__(*args, **kwargs)
 
         accounts_qs = AccountModel.objects.for_entity(
-            entity_model=self.ENTITY_SLUG,
-            user_model=self.USER_MODEL
+            entity_model=self.ENTITY_SLUG
         ).with_roles(
             roles=self.SERVICE_ROLES,
         ).active()
@@ -156,8 +153,7 @@ class ServiceCreateForm(ModelForm):
 
         if 'uom' in self.fields:
             uom_qs = UnitOfMeasureModel.objects.for_entity_active(
-                entity_slug=self.ENTITY_SLUG,
-                user_model=self.USER_MODEL
+                entity_model=self.ENTITY_SLUG,
             )
             self.fields['uom'].queryset = uom_qs
 
@@ -229,8 +225,7 @@ class ExpenseItemCreateForm(ModelForm):
         super().__init__(*args, **kwargs)
 
         accounts_qs = AccountModel.objects.for_entity(
-            entity_model=self.ENTITY_SLUG,
-            user_model=self.USER_MODEL
+            entity_model=self.ENTITY_SLUG
         ).with_roles(
             roles=GROUP_EXPENSES
         ).active()
@@ -239,9 +234,8 @@ class ExpenseItemCreateForm(ModelForm):
 
         if 'uom' in self.fields:
             uom_qs = UnitOfMeasureModel.objects.for_entity(
-                entity_slug=self.ENTITY_SLUG,
-                user_model=self.USER_MODEL
-            )
+                entity_model=self.ENTITY_SLUG
+            ).for_user(user_model=self.USER_MODEL)
             self.fields['uom'].queryset = uom_qs
 
     class Meta:
@@ -313,18 +307,16 @@ class InventoryItemCreateForm(ModelForm):
         self.USER_MODEL = user_model
         super().__init__(*args, **kwargs)
 
-        accounts_qs = AccountModel.objects.for_entity(
+        inventory_account_qs = AccountModel.objects.for_entity(
             entity_model=self.ENTITY_SLUG,
-            user_model=self.USER_MODEL
         ).with_roles(
             roles=[ASSET_CA_INVENTORY]
         ).active()
-        self.fields['inventory_account'].queryset = accounts_qs
+        self.fields['inventory_account'].queryset = inventory_account_qs
 
         if 'uom' in self.fields:
             uom_qs = UnitOfMeasureModel.objects.for_entity_active(
-                entity_slug=self.ENTITY_SLUG,
-                user_model=self.USER_MODEL
+                entity_model=self.ENTITY_SLUG,
             )
             self.fields['uom'].queryset = uom_qs
 

django_ledger/forms/purchase_order.py

@@ -155,13 +155,11 @@ class BasePurchaseOrderItemFormset(BaseModelFormSet):
         self.PO_MODEL = po_model
 
         items_qs = ItemModel.objects.for_po(
-            entity_slug=self.ENTITY_SLUG,
-            user_model=self.USER_MODEL
+            entity_model=self.ENTITY_SLUG,
         )
 
         unit_qs = EntityUnitModel.objects.for_entity(
-            entity_slug=self.ENTITY_SLUG,
-            user_model=self.USER_MODEL
+            entity_model=self.ENTITY_SLUG
         )
 
         for form in self.forms:

django_ledger/io/io_core.py

@@ -120,7 +120,6 @@ from django_ledger.io.io_middleware import (
 )
 from django_ledger.io.ratios import FinancialRatioManager
 from django_ledger.models.utils import lazy_loader
-from django_ledger.settings import DJANGO_LEDGER_PDF_SUPPORT_ENABLED
 
 UserModel = get_user_model()
 
@@ -224,18 +223,29 @@ def check_tx_balance(tx_data: list, perform_correction: bool = False) -> bool:
 
         while not is_valid:
             tx_type_choice = choice([DEBIT, CREDIT])
-            txs_candidates = list(tx for tx in tx_data if tx['tx_type'] == tx_type_choice)
+
+            if IS_TX_MODEL:
+                txs_candidates = list(tx for tx in tx_data if tx.tx_type == tx_type_choice)
+            else:
+                txs_candidates = list(tx for tx in tx_data if tx['tx_type'] == tx_type_choice)
+
             if len(txs_candidates) > 0:
-                tx = choice(list(tx for tx in tx_data if tx['tx_type'] == tx_type_choice))
-                if any([diff > 0 and tx_type_choice == DEBIT,
-                        diff < 0 and tx_type_choice == CREDIT]):
+
+                tx = choice(txs_candidates)
+
+                if any([
+                    diff > 0 and tx_type_choice == DEBIT,
+                    diff < 0 and tx_type_choice == CREDIT
+                ]):
                     if IS_TX_MODEL:
                         tx.amount += settings.DJANGO_LEDGER_TRANSACTION_CORRECTION
                     else:
                         tx['amount'] += settings.DJANGO_LEDGER_TRANSACTION_CORRECTION
 
-                elif any([diff < 0 and tx_type_choice == DEBIT,
-                          diff > 0 and tx_type_choice == CREDIT]):
+                elif any([
+                    diff < 0 and tx_type_choice == DEBIT,
+                    diff > 0 and tx_type_choice == CREDIT
+                ]):
                     if IS_TX_MODEL:
                         tx.amount -= settings.DJANGO_LEDGER_TRANSACTION_CORRECTION
                     else:
@@ -719,14 +729,12 @@ class IODatabaseMixIn:
             if unit_slug:
 
                 txs_queryset_init = TransactionModel.objects.for_entity(
-                    user_model=user_model,
-                    entity_slug=entity_slug or self.slug
+                    entity_model=entity_slug or self.slug
                 ).for_unit(unit_slug=unit_slug)
 
             else:
                 txs_queryset_init = TransactionModel.objects.for_entity(
-                    user_model=user_model,
-                    entity_slug=self
+                    entity_model=self
                 )
         elif self.is_entity_unit_model():
             if not entity_slug:
@@ -734,8 +742,7 @@ class IODatabaseMixIn:
                     'Calling digest from Entity Unit requires entity_slug explicitly for safety')
 
             txs_queryset_init = TransactionModel.objects.for_entity(
-                user_model=user_model,
-                entity_slug=entity_slug,
+                entity_model=entity_slug
             ).for_unit(unit_slug=unit_slug or self)
 
         elif self.is_ledger_model():
@@ -744,8 +751,7 @@ class IODatabaseMixIn:
                     'Calling digest from Ledger Model requires entity_slug explicitly for safety')
 
             txs_queryset_init = TransactionModel.objects.for_entity(
-                entity_slug=entity_slug,
-                user_model=user_model,
+                entity_model=entity_slug
             ).for_ledger(ledger_model=self)
 
         else:
@@ -889,6 +895,10 @@ class IODatabaseMixIn:
             'tx_type',
         ]
 
+        if kwargs.get('for_test'):
+            VALUES.append('journal_entry__ledger_id')
+            VALUES.append('journal_entry__ledger__entity_id')
+
         ANNOTATE = {'balance': Sum('amount')}
         if io_result.is_bounded:
             ANNOTATE = {'balance': Sum('amount_io')}
@@ -1587,10 +1597,6 @@ class IOReportMixIn:
             memory or in saved PDF format. If the `save_pdf` option is enabled, the PDF
             report is saved at the specified location.
         """
-        if not DJANGO_LEDGER_PDF_SUPPORT_ENABLED:
-            raise IOValidationError(
-                message=_('PDF support not enabled. Install PDF support from Pipfile.')
-            )
 
         io_digest = self.digest_balance_sheet(
             to_date=to_date,
@@ -1716,10 +1722,6 @@ class IOReportMixIn:
             generated income statement report. If `save_pdf` is True, the report will also
             be saved as a PDF file at the specified location.
         """
-        if not DJANGO_LEDGER_PDF_SUPPORT_ENABLED:
-            raise IOValidationError(
-                message=_('PDF support not enabled. Install PDF support from Pipfile.')
-            )
 
         io_digest = self.digest_income_statement(
             from_date=from_date,
@@ -1833,10 +1835,6 @@ class IOReportMixIn:
         IOValidationError
             If PDF support is not enabled in the system's Django ledger configuration.
         """
-        if not DJANGO_LEDGER_PDF_SUPPORT_ENABLED:
-            raise IOValidationError(
-                message=_('PDF support not enabled. Install PDF support from Pipfile.')
-            )
 
         io_digest = self.digest_cash_flow_statement(
             from_date=from_date,
@@ -1957,11 +1955,6 @@ class IOReportMixIn:
         IOValidationError
             Raised if PDF support is not enabled in the application configuration.
         """
-        if not DJANGO_LEDGER_PDF_SUPPORT_ENABLED:
-            raise IOValidationError(
-                message=_('PDF support not enabled. Install PDF support from Pipfile.')
-            )
-
         io_digest = self.digest_financial_statements(
             from_date=from_date,
             to_date=to_date,

django_ledger/io/io_generator.py

@@ -138,8 +138,7 @@ class EntityDataGenerator(LoggingMixIn):
 
         self.logger.info('Checking for existing transactions...')
         txs_qs = TransactionModel.objects.for_entity(
-            entity_slug=self.entity_model,
-            user_model=self.user_model
+            entity_model=self.entity_model
         )
 
         if txs_qs.count() > 0 and not force_populate:
@@ -546,10 +545,12 @@ class EntityDataGenerator(LoggingMixIn):
 
             if random() > 0.50:
                 date_approved = self.get_next_timestamp(date_in_review)
-                bill_model.mark_as_approved(commit=True,
-                                            entity_slug=self.entity_model.slug,
-                                            user_model=self.user_model,
-                                            date_approved=date_approved)
+                bill_model.mark_as_approved(
+                    commit=True,
+                    entity_slug=self.entity_model.slug,
+                    user_model=self.user_model,
+                    date_approved=date_approved
+                )
 
                 if random() > 0.25:
                     paid_date = self.get_next_timestamp(date_approved)

django_ledger/io/io_library.py

@@ -116,8 +116,7 @@ class IOCursor:
         LedgerModelQuerySet
         """
         return LedgerModel.objects.for_entity(
-            self.ENTITY_MODEL,
-            self.USER_MODEL
+            entity_model=self.ENTITY_MODEL
         )
 
     def get_account_model_qs(self) -> AccountModelQuerySet:

django_ledger/migrations/0024_billmodel_entity_model_invoicemodel_entity_model.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.2.1 on 2025-08-26 12:40
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_ledger', '0023_customermodel_customer_code_customermodel_picture_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='billmodel',
+            name='entity_model',
+            field=models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, to='django_ledger.entitymodel'),
+        ),
+        migrations.AddField(
+            model_name='invoicemodel',
+            name='entity_model',
+            field=models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, to='django_ledger.entitymodel'),
+        ),
+    ]

django_ledger/migrations/0025_alter_billmodel_cash_account_and_more.py

@@ -0,0 +1,70 @@
+# Generated by Django 5.2.6 on 2025-09-08 21:32
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('django_ledger', '0024_billmodel_entity_model_invoicemodel_entity_model'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='billmodel',
+            name='cash_account',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.RESTRICT,
+                                    related_name='bill_cash_account', to='django_ledger.accountmodel',
+                                    verbose_name='Cash Account'),
+        ),
+        migrations.AlterField(
+            model_name='billmodel',
+            name='prepaid_account',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.RESTRICT,
+                                    related_name='bill_prepaid_account', to='django_ledger.accountmodel',
+                                    verbose_name='Prepaid Account'),
+        ),
+        migrations.AlterField(
+            model_name='billmodel',
+            name='unearned_account',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.RESTRICT,
+                                    related_name='bill_unearned_account', to='django_ledger.accountmodel',
+                                    verbose_name='Unearned Account'),
+        ),
+        migrations.AlterField(
+            model_name='customermodel',
+            name='address_1',
+            field=models.CharField(blank=True, max_length=70, null=True, verbose_name='Address Line 1'),
+        ),
+        migrations.AlterField(
+            model_name='entitymodel',
+            name='address_1',
+            field=models.CharField(blank=True, max_length=70, null=True, verbose_name='Address Line 1'),
+        ),
+        migrations.AlterField(
+            model_name='invoicemodel',
+            name='cash_account',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.RESTRICT,
+                                    related_name='invoice_cash_account', to='django_ledger.accountmodel',
+                                    verbose_name='Cash Account'),
+        ),
+        migrations.AlterField(
+            model_name='invoicemodel',
+            name='prepaid_account',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.RESTRICT,
+                                    related_name='invoice_prepaid_account', to='django_ledger.accountmodel',
+                                    verbose_name='Prepaid Account'),
+        ),
+        migrations.AlterField(
+            model_name='invoicemodel',
+            name='unearned_account',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.RESTRICT,
+                                    related_name='invoice_unearned_account', to='django_ledger.accountmodel',
+                                    verbose_name='Unearned Account'),
+        ),
+        migrations.AlterField(
+            model_name='vendormodel',
+            name='address_1',
+            field=models.CharField(blank=True, max_length=70, null=True, verbose_name='Address Line 1'),
+        ),
+    ]