v0.6.3

Pipfile

@@ -34,7 +34,7 @@ pandas = "*"
 #myst_parser = "*"
 
 [requires]
-python_version = "3.11"
+python_version = "3.12"
 
 [scripts]
 publish-package-test = "twine upload --repository testpypi -u __token__ -p ${DJL_PYPI_TEST_TOKEN} dist/*"

django_ledger/__init__.py

@@ -9,7 +9,7 @@
 default_app_config = 'django_ledger.apps.DjangoLedgerConfig'
 
 """Django Ledger"""
-__version__ = '0.6.2'
+__version__ = '0.6.3'
 __license__ = 'GPLv3 License'
 
 __author__ = 'Miguel Sanda'

django_ledger/admin/ledger.py

@@ -111,6 +111,7 @@ class LedgerModelAdmin(ModelAdmin):
     ]
     list_display = [
         'name',
+        'ledger_xid',
         'is_posted',
         'is_locked',
         'is_extended',

django_ledger/forms/data_import.py

@@ -13,7 +13,8 @@ class ImportJobModelCreateForm(ModelForm):
         label='Select File...',
         widget=forms.FileInput(
             attrs={
-                'class': 'file-input'
+                'class': 'file-input',
+                'accept': '.ofx,.qfx'
             })
     )
 

django_ledger/io/ofx.py

@@ -34,8 +34,9 @@ def parse_ofx(self):
     def get_accounts(self):
         return [
             {
-                'bank': self.ofx_data.org,
-                'fid': self.ofx_data.fid,
+                # conditionally return the bank and fid if they are provided by the vendor
+                'bank': self.ofx_data.fi.org if hasattr(self.ofx_data.fi, 'org') else None,
+                'fid': self.ofx_data.fi.fid if hasattr(self.ofx_data.fi, 'fid') else None,
                 'account_type': acc.accttype,
                 'account_number': acc.acctid,
                 'routing_number': acc.bankid,

django_ledger/models/bill.py

@@ -4,7 +4,6 @@
 
 Contributions to this module:
     * Miguel Sanda <[email protected]>
-    * Pranav P Tulshyan <[email protected]>
 
 This module implements the BillModel, which represents an Invoice received from a Supplier/Vendor, on which
 the Vendor states the amount owed by the recipient for the purposes of supplying goods and/or services.
@@ -39,6 +38,14 @@
 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.signals import (
+    bill_status_draft,
+    bill_status_in_review,
+    bill_status_approved,
+    bill_status_paid,
+    bill_status_canceled,
+    bill_status_void,
+)
 from django_ledger.models.utils import lazy_loader
 from django_ledger.settings import (DJANGO_LEDGER_DOCUMENT_NUMBER_PADDING, DJANGO_LEDGER_BILL_NUMBER_PREFIX)
 
@@ -612,9 +619,8 @@ def get_migration_data(self,
             account_unit_total=Sum('total_amount')
         )
 
-    def update_amount_due(self,
-                          itemtxs_qs: Optional[Union[ItemTransactionModelQuerySet, List[ItemTransactionModel]]] = None
-                          ) -> ItemTransactionModelQuerySet:
+    def update_amount_due(self, itemtxs_qs: Optional[
+        Union[ItemTransactionModelQuerySet, List[ItemTransactionModel]]] = None) -> ItemTransactionModelQuerySet:
         """
         Updates the BillModel amount due.
 
@@ -1071,6 +1077,9 @@ def mark_as_draft(self, date_draft: Optional[date] = None, commit: bool = False,
                     'updated'
                 ]
             )
+        bill_status_draft.send_robust(sender=self.__class__,
+                                      instance=self,
+                                      commited=commit, **kwargs)
 
     def get_mark_as_draft_html_id(self) -> str:
         """
@@ -1176,6 +1185,9 @@ def mark_as_review(self,
                     'updated'
                 ]
             )
+        bill_status_in_review.send_robust(sender=self.__class__,
+                                          instance=self,
+                                          commited=commit, **kwargs)
 
     def get_mark_as_review_html_id(self) -> str:
         """
@@ -1283,6 +1295,9 @@ def mark_as_approved(self,
                     force_migrate=self.accrue
                 )
             self.ledger.post(commit=commit, raise_exception=raise_exception)
+        bill_status_approved.send_robust(sender=self.__class__,
+                                         instance=self,
+                                         commited=commit, **kwargs)
 
     def get_mark_as_approved_html_id(self) -> str:
         """
@@ -1406,6 +1421,9 @@ def mark_as_paid(self,
                 force_migrate=True
             )
             self.lock_ledger(commit=True)
+        bill_status_paid.send_robust(sender=self.__class__,
+                                     instance=self,
+                                     commited=commit, **kwargs)
 
     def get_mark_as_paid_html_id(self) -> str:
         """
@@ -1507,6 +1525,9 @@ def mark_as_void(self,
                 force_migrate=True)
             self.save()
             self.lock_ledger(commit=False, raise_exception=False)
+        bill_status_void.send_robust(sender=self.__class__,
+                                     instance=self,
+                                     commited=commit, **kwargs)
 
     def get_mark_as_void_html_id(self) -> str:
         """
@@ -1574,6 +1595,9 @@ def mark_as_canceled(self, date_canceled: Optional[date] = None, commit: bool =
         self.clean()
         if commit:
             self.save()
+        bill_status_canceled.send_robust(sender=self.__class__,
+                                         instance=self,
+                                         commited=commit, **kwargs)
 
     def get_mark_as_canceled_html_id(self) -> str:
         """
@@ -1890,13 +1914,3 @@ def billmodel_presave(instance: BillModel, **kwargs):
 
 
 pre_save.connect(receiver=billmodel_presave, sender=BillModel)
-
-# def billmodel_predelete(instance: BillModel, **kwargs):
-#     ledger_model = instance.ledger
-#     ledger_model.unpost(commit=False)
-#     ledger_model.remove_wrapped_model_info()
-#     ledger_model.itemtransactonmodel_set.all().delete()
-#     instance.ledger.delete()
-#
-#
-# pre_delete.connect(receiver=billmodel_predelete, sender=BillModel)

django_ledger/models/closing_entry.py

@@ -1,3 +1,11 @@
+"""
+Django Ledger created by Miguel Sanda <[email protected]>.
+Copyright© EDMA Group Inc licensed under the GPLv3 Agreement.
+
+Contributions to this module:
+    * Miguel Sanda <[email protected]>
+"""
+
 from datetime import datetime, time
 from decimal import Decimal
 from itertools import groupby, chain