v0.7.11 (#281)

* v.0.7.7

* Enhance account list views and update icon styles.

Implemented dynamic page titles and subtitles for account pages by overriding `get_context_data`. Updated template text and classes for greater consistency, including standardizing icon colors for active, locked, and default roles.

* Adding TransactionModel attributes during commit_txs.

* Fixed a couple of hard coded dollar "$" symbols and changed them with `{% currency_symbol %}` tag to render the correct symbol when `DJANGO_LEDGER_CURRENCY_SYMBOL` is other than default ("$"). (#265)

* Dependency update

* Update contribution guidelines in README and Contribute.md

Clarified the types of pull requests that are encouraged, emphasizing those that address bug fixes, enhancements, or valuable additions. Added a note discouraging submissions focused only on cosmetic changes like linting or refactoring.

* Update ManyToManyField configurations and bump version to 0.7.8

Adjusted `ManyToManyField` relationships in `BillModel`, `InvoiceModel`, and `PurchaseOrderModel` to include `through` and `through_fields` for `ItemTransactionModel`. Incremented package version to `0.7.8`.

* Add support for bank account type validation and retrieval based on OFX standards

- Introduced `bank_account_type` field in `BankAccountModel` with predefined choices.
- Added methods to retrieve routing number, account type, and account type validation in `OFXImport` class.
- Enhanced account queries with a new `.cash()` method to filter accounts with `ASSET_CA_CASH` role.
- Updated indexing and unique constraints for `BankAccountModel`.

* Migration Update

* Refactor bank account type handling and account type mapping logic

- Replaced `BankAccountModel.BANK_ACCOUNT_TYPES` with explicit OFX types.
- Renamed `ACCOUNT_TYPE_ROLE_MAPPING` to `ACCOUNT_TYPE_DEFAULT_ROLE_MAPPING`.
- Centralized OFX type mappings in `ACCOUNT_TYPE_OFX_MAPPING`.
- Removed `bank_account_type` field from `BankAccountModel`.
- Added `get_account_type_from_ofx` method for retrieving account type from OFX data.

* Add financial institution field and utility methods to account models

- Introduced `financial_institution` field in account mixin for storing bank details.
- Added `get_account_last_digits` utility for partial account number retrieval.
- Implemented `can_hide` and `can_unhide` methods in `BankAccountModel`.

* Refactor account handling and enhance validation methods

- Renamed `get_account_type` to `get_ofx_account_type` for clarity in OFX implementation.
- Added `get_account_type` method to map OFX account types to internal account types.
- Introduced `get_routing_last_digits` method for masked routing number retrieval.
- Improved handling of missing account and routing numbers in utility methods.

* Sort node issue fix

* Update chart_of_accounts.py

* Bump version to 0.7.9 and update `for_entity` method to accept `EntityModel` instances.

* V0.7.10 (#279)

* Add customer and vendor code fields, picture upload functionality, and UI improvements

- Introduced `customer_code` and `vendor_code` fields for user-defined unique codes in `CustomerModel` and `VendorModel`.
- Added support for customer and vendor picture uploads with specified upload paths.
- Updated migration `0023` to reflect the new fields and modifications.
- Improved UI consistency in templates and added icons for enhanced usability.
- Updated `pyproject.toml` to bump version to `0.7.10`.

* Bump version to 0.7.10.

* v0.7.11
- IO Core Bugfixes.
- BillModel and InvoiceModel now have a ForeignKey to EntityModel for easier access to EntityModel.

- pre_save hook has been implemented to populate field from associated ledger model.

---------

Co-authored-by: Pablo Santa Cruz <[email protected]>
Co-authored-by: killinstreak <[email protected]>
Co-authored-by: Shucon Tech <[email protected]>

Author: 4 people

django_ledger/__init__.py

@@ -6,7 +6,7 @@
 default_app_config = 'django_ledger.apps.DjangoLedgerConfig'
 
 """Django Ledger"""
-__version__ = '0.7.10'
+__version__ = '0.7.11'
 __license__ = 'GPLv3 License'
 
 __author__ = 'Miguel Sanda'

django_ledger/io/io_core.py

@@ -224,18 +224,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:

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/models/bill.py

@@ -353,6 +353,13 @@ class BillModelAbstract(
 
     # todo: implement Void Bill (& Invoice)....
     uuid = models.UUIDField(default=uuid4, editable=False, primary_key=True)
+    entity_model = models.ForeignKey(
+        'django_ledger.EntityModel',
+        on_delete=models.CASCADE,
+        null=True,
+        blank=True,
+        editable=False
+    )
     bill_number = models.SlugField(max_length=20, verbose_name=_('Bill Number'), editable=False)
     bill_status = models.CharField(max_length=10,
                                    choices=BILL_STATUS,
@@ -1927,5 +1934,8 @@ def billmodel_presave(instance: BillModel, **kwargs):
     if instance.can_generate_bill_number():
         instance.generate_bill_number(commit=False)
 
+    if not instance.entity_model_id:
+        instance.entity_model = instance.ledger.entity
+
 
 pre_save.connect(receiver=billmodel_presave, sender=BillModel)

django_ledger/models/invoice.py

@@ -309,6 +309,11 @@ class InvoiceModelAbstract(
     """
 
     uuid = models.UUIDField(default=uuid4, editable=False, primary_key=True)
+    entity_model = models.ForeignKey('django_ledger.EntityModel',
+                                     on_delete=models.CASCADE,
+                                     null=True,
+                                     blank=True,
+                                     editable=False)
     invoice_number = models.SlugField(max_length=20,
                                       editable=False,
                                       verbose_name=_('Invoice Number'))
@@ -567,7 +572,8 @@ def get_migrate_state_desc(self):
         """
         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.
@@ -600,7 +606,8 @@ def get_migration_data(self, queryset: Optional[ItemTransactionModelQuerySet] =
             '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.
 
@@ -1835,5 +1842,8 @@ def invoicemodel_presave(instance: InvoiceModel, **kwargs):
     if instance.can_generate_invoice_number():
         instance.generate_invoice_number(commit=False)
 
+    if not instance.entity_model_id:
+        instance.entity_model = instance.ledger.entity
+
 
 pre_save.connect(receiver=invoicemodel_presave, sender=InvoiceModel)

django_ledger/models/mixins.py

@@ -787,7 +787,7 @@ def migrate_state(self,
                     check_tx_balance(tx_data=[tx for ui, tx in txs_list if uid == ui], perform_correction=True)
 
                 # validates all txs as a whole (for safety)...
-                txs = [tx for ui, tx in txs_list]
+                txs = [tx for _, tx in txs_list]
                 check_tx_balance(tx_data=txs, perform_correction=True)
                 TransactionModel.objects.bulk_create(txs)
 
@@ -1065,14 +1065,18 @@ def net_due_group(self):
             return self.TERMS_NET_90
         return self.TERMS_NET_90_PLUS
 
+    def set_due_date(self, force_update: bool = False):
+        if self.date_due is None or force_update:
+            terms_start_date = self.get_terms_start_date()
+            if terms_start_date:
+                if self.terms != self.TERMS_ON_RECEIPT:
+                    self.date_due = terms_start_date + self.get_terms_timedelta()
+                else:
+                    self.date_due = terms_start_date
+
     def clean(self):
         super().clean()
-        terms_start_date = self.get_terms_start_date()
-        if terms_start_date:
-            if self.terms != self.TERMS_ON_RECEIPT:
-                self.date_due = terms_start_date + self.get_terms_timedelta()
-            else:
-                self.date_due = terms_start_date
+        self.set_due_date()
 
 
 class MarkdownNotesMixIn(models.Model):

django_ledger/views/bill.py

@@ -253,8 +253,6 @@ def get_context_data(self, *, object_list=None, **kwargs):
         title = f'Bill {bill_model.bill_number}'
         context['page_title'] = title
         context['header_title'] = title
-
-        bill_model: BillModel = self.object
         bill_items_qs, item_data = bill_model.get_itemtxs_data()
         context['itemtxs_qs'] = bill_items_qs
         context['total_amount__sum'] = item_data['total_amount__sum']

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "django-ledger"
-version = "0.7.10"
+version = "0.7.11"
 readme = "README.md"
 requires-python = ">=3.10"
 description = "Double entry accounting system built on the Django Web Framework."