django-ledger 0.7.10__py3-none-any.whl → 0.7.11__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.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 @@ 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.
@@ -600,7 +606,8 @@ 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.
 
@@ -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 @@ class AccrualMixIn(models.Model):
                     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 @@ class PaymentTermsMixIn(models.Model):
             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 @@ class BillModelDetailView(BillModelModelBaseView, DetailView):
         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']

{django_ledger-0.7.10.dist-info → django_ledger-0.7.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: django-ledger
-Version: 0.7.10
+Version: 0.7.11
 Summary: Double entry accounting system built on the Django Web Framework.
 Author-email: Miguel Sanda <msanda@arrobalytics.com>
 Maintainer-email: Miguel Sanda <msanda@arrobalytics.com>

{django_ledger-0.7.10.dist-info → django_ledger-0.7.11.dist-info}/RECORD

@@ -1,4 +1,4 @@
-django_ledger/__init__.py,sha256=bksv4wk1MvnTQqK9RYkcCU0yc4Jj9bcKBGfkvwbafKI,381
+django_ledger/__init__.py,sha256=uLgks5A6z1Ujc8_0OaliPLnQX7YQoyMbzdWZ0I1Zxy4,381
 django_ledger/apps.py,sha256=H-zEWUjKGakgSDSZmLIoXChZ2h6e0dth0ZO5SpoT-8U,163
 django_ledger/exceptions.py,sha256=rML8sQQ0Hq-DYMLZ76dfw2RYSAsXWUoyHuyC_yP9o1o,491
 django_ledger/settings.py,sha256=QOMK8mhT8MLrMxVDEzNRJ9W01Pm-Po26y7KaBPLVeNk,8952
@@ -66,7 +66,7 @@ django_ledger/forms/utils.py,sha256=sgkwBZs15_rZ5NT7h-8Z7wi3-ItM1E1sqoVDo3NQ5Jc,
 django_ledger/forms/vendor.py,sha256=eLCZiWZLVigTyltQZfBfcE35_9Re4hdXisyWOadMS-s,2417
 django_ledger/io/__init__.py,sha256=8m5AoBRiG2ymrX0Y4LVjq0275i7I5Sk7YRa1BTzVofI,369
 django_ledger/io/io_context.py,sha256=2AiQyJSTkYUCu09Ig0ZPgYj8PtlvUKNS30KvRp9e7zA,4753
-django_ledger/io/io_core.py,sha256=EmW0zu4P38OubxncBbnDdyAfM8X_epoxEc7iK-pApKA,87335
+django_ledger/io/io_core.py,sha256=Sok4OmD_8Wqma7gP2OPLRqfZOgNqb-4ZretC8MGRpJ0,87500
 django_ledger/io/io_generator.py,sha256=IN_ZuMlPHXgoEffxA7PMN2fyTvWPJktzVR6yIaocsRs,34725
 django_ledger/io/io_library.py,sha256=CGZABR4P80VfIube4QEryNOi01llrPq0Gh-8vVbtZDY,22496
 django_ledger/io/io_middleware.py,sha256=vbWIBYA4V9nwoiEtB0W9pq19QIwPmaAyVJlo_1Gg2BY,20284
@@ -99,11 +99,12 @@ django_ledger/migrations/0020_remove_bankaccountmodel_django_ledg_cash_ac_59a8af
 django_ledger/migrations/0021_alter_bankaccountmodel_account_model_and_more.py,sha256=b3eJA_QzNzvx7BPSaj2RCPIbsrCkZrpkvk_qN7v-4OA,1101
 django_ledger/migrations/0022_bankaccountmodel_financial_institution_and_more.py,sha256=MR_E-DYIEsxSfhO5O4iBsShe-tyM3wYZQ4C4_6h1Prw,2959
 django_ledger/migrations/0023_customermodel_customer_code_customermodel_picture_and_more.py,sha256=M2p8Km55aNE-aKX_XWYZKQeh03MPbyoSQ15sOj-B86E,2095
+django_ledger/migrations/0024_billmodel_entity_model_invoicemodel_entity_model.py,sha256=Fq2HiDJGpK7_dXq94INOs63psxf_q29vYZRVOr3qFRs,839
 django_ledger/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_ledger/models/__init__.py,sha256=OesBx4My9GnqU1xB5WXuuGLOnmzgxEJxI-WWxRxi658,807
 django_ledger/models/accounts.py,sha256=LDbDLUiTkxy0k2Qyrq4N6FvpaffXW4vAuM53v5xveg0,36685
 django_ledger/models/bank_account.py,sha256=dar6-iOqCBkeqyxwuV8tc2czFZVX9nGRSPvOLxp4m64,8009
-django_ledger/models/bill.py,sha256=LCuYvyOtkZ6H-tcV4AYN1GFe_C6s__QxEbR0IcfTak8,65000
+django_ledger/models/bill.py,sha256=LEJJymFBh-U6YcKZC56CnAPSC_2bPuUDptu7QKX131U,65270
 django_ledger/models/chart_of_accounts.py,sha256=cMHAc0TQdYD1iMan9qbrq2FX3NlmPYI_g1qwXPa4sSU,30308
 django_ledger/models/closing_entry.py,sha256=ILFNwxvCNvlEKuK2AL8z49izEBtfco-IT_oXcCMcbP8,18294
 django_ledger/models/coa_default.py,sha256=CK4vOZ73QePciZUL93wigDXpxKamdXAKBaQR7r-G7tk,27482
@@ -111,11 +112,11 @@ django_ledger/models/customer.py,sha256=UUGXXGMilZ4XYdK1Ytu-3IlYhHw-t3_cgh32Gbad
 django_ledger/models/data_import.py,sha256=nffhWbb-EQN3zmFtJ512ix5ExnlJDSNHieOxR4W6OSE,47802
 django_ledger/models/entity.py,sha256=kiY-VX_ot727sF0VRlfxA7bOVE5aP-hFmDg6TX78msM,124687
 django_ledger/models/estimate.py,sha256=t3ZSBHZUUOdWP6eMCyQwNgvNSY4myKbkdfaFd9zlpH0,58056
-django_ledger/models/invoice.py,sha256=l1yI-kpePNNSp0MfwGeccdPLAmTmvVV4CquNIxMrmc4,63222
+django_ledger/models/invoice.py,sha256=1HdVjm5pmdiDFSonUwEzR-U4aY0OLK3PCKxuk-xaxww,63647
 django_ledger/models/items.py,sha256=cGv681aocJJxXSbsz9NlLhPp7kJ-gQrtxl7EcsiwULg,55087
 django_ledger/models/journal_entry.py,sha256=Hqfz7oNUBXt1Vprd5W1adrFmZzCebemc2cvQZTlKVrk,66993
 django_ledger/models/ledger.py,sha256=ltWmPIzauwxODO-FSupphIOkJYPDGT47-xKOst5DEvQ,26266
-django_ledger/models/mixins.py,sha256=Y0uRYZAWUExpHdLZy30XQrmr2t05gMvOuDRKjkoauKk,54213
+django_ledger/models/mixins.py,sha256=jwHepBVjM30iQVuHSg0TMYBvchEWCgpG59B_fKBGyt4,54371
 django_ledger/models/purchase_order.py,sha256=A0fKA1lU12CYePb43T--wSNqf_d6Vwap1deyNXUoFEg,44140
 django_ledger/models/signals.py,sha256=3cm_8--Jz-Jb0fPgrVmm5xx_jKFARV6_A29VDjqHeIw,1563
 django_ledger/models/transactions.py,sha256=b_ChD6FG-ru7FgT7c9D_1ku1YyhCz840wSrnyVQN6AU,24045
@@ -389,7 +390,7 @@ django_ledger/views/__init__.py,sha256=fY9eBoPkx50p-kSalskd4QW1tHm3e64WpwOFuJzn4
 django_ledger/views/account.py,sha256=fC0PX889DxyKheTF3SIA_aDxermQu8hPhrw5JBwpwS0,9536
 django_ledger/views/auth.py,sha256=I8Mv_aAfW-8Z5VYPOX7P3IUO4Fp5jJPkSuu1ZSVpWtI,777
 django_ledger/views/bank_account.py,sha256=MbiVurJTNK-UsDPn17-ai4G8sE3qIMrdmXaWPX-J8n8,5025
-django_ledger/views/bill.py,sha256=5tNb3pyh8GQM4hjV0FXqCXrEQF2LwpEWLkOkpknEdjA,22239
+django_ledger/views/bill.py,sha256=eMVthGDkbOrRpVo4qF1jFOXq268YPjcz72P-LMM98U4,22194
 django_ledger/views/chart_of_accounts.py,sha256=wMdnXRNWzdPgxl1YeHbdAQXbCBU2VkmxVxxtUuk9NAQ,5485
 django_ledger/views/closing_entry.py,sha256=SbJMyBVG8KTfZ6oo4Gdzx03utKY5CoC7qioU_dm9n5I,8157
 django_ledger/views/customer.py,sha256=FYnwhRx6JXE4bsjXQqFp8b9H8a4m7zv6ohoSj1OkZD8,3678
@@ -410,9 +411,9 @@ django_ledger/views/purchase_order.py,sha256=CyftKrQWV1SBz7W0CvZOfZ81OPEiBHPD7b9
 django_ledger/views/transactions.py,sha256=3ijtJzdLPFkqG7OYpe-7N4QVjCyR2yl5ht_9RyfquBA,212
 django_ledger/views/unit.py,sha256=CarmOKzXANssVD3qMS1oXvJw614Y3rS0QHhSGJC0jBE,10069
 django_ledger/views/vendor.py,sha256=7gtVK_bgnXxbVwNAHYtI_eNEJPefCz807LgE1vqOov8,3532
-django_ledger-0.7.10.dist-info/AUTHORS.md,sha256=ShPwf-qniJkbjRzX5_lqhmgoLMEYMSHSwKPXHZtWmyk,824
-django_ledger-0.7.10.dist-info/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-django_ledger-0.7.10.dist-info/METADATA,sha256=A6AQDNglh19hFQNUm_skK8dBkpycpKZjv_uO1FB9Tac,9090
-django_ledger-0.7.10.dist-info/WHEEL,sha256=nn6H5-ilmfVryoAQl3ZQ2l8SH5imPWFpm1A5FgEuFV4,91
-django_ledger-0.7.10.dist-info/top_level.txt,sha256=fmHWehb2HfoDncQ3eQtYzeYc-gJMywf6q_ZpKBjwzoQ,38
-django_ledger-0.7.10.dist-info/RECORD,,
+django_ledger-0.7.11.dist-info/AUTHORS.md,sha256=ShPwf-qniJkbjRzX5_lqhmgoLMEYMSHSwKPXHZtWmyk,824
+django_ledger-0.7.11.dist-info/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+django_ledger-0.7.11.dist-info/METADATA,sha256=BGpP8dA2hd3bB1flaeDQrpii0eVK353z9PEGdFnxS_o,9090
+django_ledger-0.7.11.dist-info/WHEEL,sha256=nn6H5-ilmfVryoAQl3ZQ2l8SH5imPWFpm1A5FgEuFV4,91
+django_ledger-0.7.11.dist-info/top_level.txt,sha256=fmHWehb2HfoDncQ3eQtYzeYc-gJMywf6q_ZpKBjwzoQ,38
+django_ledger-0.7.11.dist-info/RECORD,,