v0.8.2.3 (#293)

* **Refactored `StagedTransactionModel` logic and template conditions:**
- Simplified queryset filters and refactored helpers like `can_unbundle` and `ready_to_import` for better readability.
- Replaced `children_count` check with `children_mapping_done` to streamline logic.
- Updated template conditional to check for `receipt_uuid` instead of `has_receipt`.
- Added commented-out logic for potential future conditions in `data_import_job_txs_table.html`.

### **Summary**
Refactored transaction evaluation logic and templates for clarity and maintainability. Improved existing checks and prepared room for future enhancements in transaction handling.

* v0.8.2.3
- **Enhanced import handling and UI for transactions:**
  - Introduced clearer logic for bundled vs. unbundled transactions in `StagedTransactionModel`.
  - Added new fields (`imported_count`, `children_import_pending_count`) for tracking transaction states.
  - Improved `is_imported` and `is_pending` query handling for parent and child transactions.
  - Enabled staged transaction deletion with `can_delete` and pre-deletion validation to reject invalid deletes.
  - Updated forms to streamline `tx_import` and `bundle_split` behavior for child transactions.

- **Refined receipt migration and undo-import logic:**
  - Modified `migrate_receipt` to handle split amounts during migration.
  - Enhanced undo-import to account for child transactions and ensure proper cascade delete behavior.

- **Improved templating and user experience:**
  - Added currency formatting for transaction amounts in receipt details.
  - Refined dropdown actions in imported transactions list to dynamically respect transaction types.
  - Reorganized transaction states and validations in templates for consistency.

- **Refactored import state tracking for clarity:**
  - Expanded staged transaction attributes for better state evaluation (`is_children`, `is_parent`, `is_bundled`).
  - Introduced additional parent-child relationship checks for transaction clarity.

### **Summary**
Refactored `StagedTransactionModel`, forms, and templates for improved import logic and UI experience. Introduced split amount handling and

* - **Simplified journal entry update logic in import process:**
  - Adjusted the order of `unlock` and `unpost` calls to reflect appropriate transactional sequence before deletion.

- **Refined transaction actions in template:**
  - Updated dropdown structure to consistently display transaction actions regardless of `is_parent` or `is_bundled` status.
  - Improved conditional logic to dynamically manage available actions like "View JE," "View Receipt," and "Undo Import."
  - Enhanced template organization for better readability and maintainability.

### **Summary**
Streamlined journal entry handling logic and improved dropdown action display in transaction templates for better consistency and user experience.

### **Backwards Compatibility**
These changes are fully backwards compatible. No significant behavioral or structural changes to existing workflows.

Author: elarroba

django_ledger/__init__.py

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

django_ledger/forms/data_import.py

@@ -1,3 +1,5 @@
+from itertools import groupby
+
 from django import forms
 from django.forms import (
     ModelForm,
@@ -140,7 +142,7 @@ def __init__(self, base_formset_instance, *args, **kwargs):
                 self.fields['tx_split'].disabled = True
 
             if not staged_tx_model.can_unbundle():
-                # self.fields['bundle_split'].widget = HiddenInput()
+                self.fields['bundle_split'].widget = HiddenInput()
                 self.fields['bundle_split'].disabled = True
 
     def clean_account_model(self):
@@ -160,13 +162,42 @@ def clean_unit_model(self):
     def clean_tx_import(self):
         staged_txs_model: StagedTransactionModel = self.instance
         if staged_txs_model.is_children():
-            return False
+            parent_form = self.BASE_FORMSET_INSTANCE.FORMS_BY_ID[staged_txs_model.parent_id]
+            if all(
+                [
+                    any(
+                        [
+                            staged_txs_model.is_child_not_bundled_has_receipt(),
+                            staged_txs_model.is_child_not_bundled_no_receipt(),
+                        ]
+                    ),
+                    parent_form.cleaned_data['tx_import'] is True,
+                ]
+            ):
+                return True
         return self.cleaned_data['tx_import']
 
+    def clean_bundle_split(self):
+        staged_txs_model: StagedTransactionModel = self.instance
+        if staged_txs_model.is_single():
+            return True
+        if staged_txs_model.is_children():
+            parent_form = self.BASE_FORMSET_INSTANCE.FORMS_BY_ID[staged_txs_model.parent.uuid]
+            return parent_form.cleaned_data['bundle_split']
+        return self.cleaned_data['bundle_split']
+
     def clean(self):
         if self.cleaned_data['tx_import'] and self.cleaned_data['tx_split']:
             raise ValidationError(message=_('Cannot import and split at the same time'))
 
+    def has_changed(self):
+        has_changed = super().has_changed()
+        staged_txs_model: StagedTransactionModel = self.instance
+        if not has_changed and staged_txs_model.is_children():
+            parent_form = self.BASE_FORMSET_INSTANCE.FORMS_BY_ID[staged_txs_model.parent.uuid]
+            return parent_form.has_changed()
+        return has_changed
+
     class Meta:
         model = StagedTransactionModel
         fields = [
@@ -244,15 +275,24 @@ def __init__(
         self.unit_model_qs = entity_model.entityunitmodel_set.all()
         self.UNIT_MODEL_CHOICES = [(None, '----')] + [(u.uuid, u) for i, u in enumerate(self.unit_model_qs)]
 
-        self.VENDOR_MODEL_QS = entity_model.vendormodel_set.visible()
-        self.CUSTOMER_MODEL_QS = entity_model.customermodel_set.visible()
+        self.VENDOR_MODEL_QS = entity_model.vendormodel_set.visible().order_by('vendor_name')
+        self.CUSTOMER_MODEL_QS = entity_model.customermodel_set.visible().order_by('customer_name')
 
         self.VENDOR_CHOICES = [(None, '-----')] + [(str(v.uuid), v) for v in self.VENDOR_MODEL_QS]
         self.CUSTOMER_CHOICES = [(None, '-----')] + [(str(c.uuid), c) for c in self.CUSTOMER_MODEL_QS]
 
         self.VENDOR_MAP = dict(self.VENDOR_CHOICES)
         self.CUSTOMER_MAP = dict(self.CUSTOMER_CHOICES)
 
+        self.FORMS_BY_ID = {
+            f.instance.uuid: f for f in self.forms if getattr(f, 'instance', None) and getattr(f.instance, 'uuid', None)
+        }
+
+        form_children = [(f.instance.parent_id, f.instance.uuid) for f in self.forms if f.instance.parent_id]
+        form_children.sort(key=lambda f: f[0])
+
+        self.FORM_CHILDREN = {g: list(j[1] for j in p) for g, p in groupby(form_children, key=lambda i: i[0])}
+
     def get_form_kwargs(self, index):
         return {
             'base_formset_instance': self,

django_ledger/models/__init__.py

@@ -15,5 +15,6 @@
 from django_ledger.models.purchase_order import *
 from django_ledger.models.closing_entry import *
 from django_ledger.models.entity import *
+
 from django_ledger.models.data_import import *
 from django_ledger.models.receipt import *