django-ledger 0.8.2.2__py3-none-any.whl → 0.8.2.3__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.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 @@ class StagedTransactionModelForm(ModelForm):
                 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 @@ class StagedTransactionModelForm(ModelForm):
     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,8 +275,8 @@ class BaseStagedTransactionModelFormSet(BaseModelFormSet):
         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]
@@ -253,6 +284,15 @@ class BaseStagedTransactionModelFormSet(BaseModelFormSet):
         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.unit import *
 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 *

django_ledger/models/data_import.py

@@ -16,7 +16,7 @@ from decimal import Decimal
 from typing import Dict, List, Optional, Set, Union
 from uuid import UUID, uuid4
 
-from django.core.exceptions import ObjectDoesNotExist, ValidationError
+from django.core.exceptions import ValidationError
 from django.db import models, transaction
 from django.db.models import (
     BooleanField,
@@ -432,16 +432,31 @@ class StagedTransactionModelQuerySet(QuerySet):
 
         This method filters the objects in the queryset to determine whether there
         are any transactions that are pending (i.e., have a null transaction_model).
-        Pending transactions are identified by checking if the `transaction_model` is
-        null for any of the objects in the queryset.
+        Additionally, it includes parent transactions (not bundled) that have at least
+        one child transaction still pending import.
 
         Returns
         -------
         QuerySet
-            A QuerySet containing objects with a null `transaction_model`.
+            A QuerySet containing objects with a null `transaction_model`, or parent
+            transactions (not bundled) with pending children.
 
         """
-        return self.filter(transaction_model__isnull=True)
+        parents_with_pending_children = Q(
+            parent__isnull=True, bundle_split=False, children_mapping_done=False, children_import_pending_count__gt=0
+        )
+
+        return self.filter(
+            Q(
+                transaction_model__isnull=True,
+            )
+            | parents_with_pending_children
+        ).exclude(
+            bundle_split=False,
+            transaction_model__isnull=True,
+            children_count__gt=0,
+            children_import_pending_count=0
+        )
 
     def is_imported(self):
         """
@@ -449,13 +464,19 @@ class StagedTransactionModelQuerySet(QuerySet):
         related transaction model. This function checks whether the `transaction_model`
         field in the related objects is non-null.
 
+        Additionally, it includes non-bundled parent transactions only if they have at
+        least one imported child (i.e., a child with a non-null `transaction_model`).
+        This ensures a parent is not considered imported until at least one child is
+        imported.
+
         Returns
         -------
         QuerySet
-            A filtered queryset containing only objects where the `transaction_model`
-            is not null.
+            A filtered queryset containing objects where the `transaction_model` is not
+            null, plus non-bundled parents that have at least one imported child.
         """
-        return self.filter(transaction_model__isnull=False)
+        parents_with_imported_children = Q(parent__isnull=True, bundle_split=False, imported_count__gt=0)
+        return self.filter(Q(transaction_model__isnull=False) | parents_with_imported_children)
 
     def is_parent(self):
         """
@@ -548,6 +569,7 @@ class StagedTransactionModelManager(Manager):
                 entity_unit=F('transaction_model__journal_entry__entity_unit__name'),
                 children_count=Count('split_transaction_set'),
                 children_mapped_count=Count('split_transaction_set__account_model__uuid'),
+                imported_count=Count('split_transaction_set__transaction_model_id'),
                 total_amount_split=Coalesce(
                     Sum('split_transaction_set__amount_split'),
                     Value(value=0.00, output_field=DecimalField()),
@@ -560,6 +582,7 @@ class StagedTransactionModelManager(Manager):
             )
             .annotate(
                 children_mapping_pending_count=F('children_count') - F('children_mapped_count'),
+                children_import_pending_count=F('imported_count') - F('children_count'),
             )
             .annotate(
                 children_mapping_done=Case(
@@ -602,7 +625,7 @@ class StagedTransactionModelManager(Manager):
                         ),
                         then=True,
                     ),
-                    # is children, mapped and all parent amount is split...
+                    # is parent, mapped and all parent amount is split...
                     When(
                         condition=(
                             # no receipt type selected...
@@ -611,12 +634,12 @@ class StagedTransactionModelManager(Manager):
                                 Q(children_count__gt=0)
                                 & Q(bundle_split=True)
                                 & Q(receipt_type__isnull=True)
-                                & Q(children_count=F('children_mapped_count'))
+                                & Q(children_mapping_done=True)
                                 & Q(total_amount_split__exact=F('amount'))
                                 & Q(parent__isnull=True)
                                 & Q(transaction_model__isnull=True)
                                 & Q(customer_model__isnull=True)
-                                & Q(vendor_model__isnull=False)
+                                & Q(vendor_model__isnull=True)
                             )
                             # BUNDLED...
                             # a receipt type is assigned... at least a customer or vendor is selected...
@@ -643,10 +666,19 @@ class StagedTransactionModelManager(Manager):
                                 & Q(receipt_type__isnull=True)
                                 & Q(vendor_model__isnull=True)
                                 & Q(customer_model__isnull=True)
-                                & Q(children_count=F('children_mapped_count'))
+                                & Q(children_mapping_done=True)
                                 & Q(total_amount_split__exact=F('amount'))
                                 & Q(transaction_model__isnull=True)
                             )
+                            | (
+                                Q(children_count__exact=0)
+                                & Q(parent__isnull=False)
+                                & Q(bundle_split=False)
+                                & Q(receipt_type__isnull=False)
+                                & (Q(vendor_model__isnull=False) | Q(customer_model__isnull=False))
+                                & Q(children_mapping_done=True)
+                                & Q(transaction_model__isnull=True)
+                            )
                         ),
                         then=True,
                     ),
@@ -905,10 +937,12 @@ class StagedTransactionModelAbstract(CreateUpdateMixIn):
         return [
             {
                 'account': self.account_model,
-                'amount': abs(self.amount),
-                'amount_staged': self.amount,
+                'amount': abs(self.amount if not self.is_children() else self.amount_split),
+                'amount_staged': self.amount if not self.is_children() else self.amount_split,
                 'unit_model': self.unit_model,
-                'tx_type': CREDIT if not self.amount < 0.00 else DEBIT,
+                'tx_type': CREDIT
+                if not (self.amount if not self.is_children() else self.amount_split) < 0.00
+                else DEBIT,
                 'description': self.name,
                 'staged_tx_model': self,
             }
@@ -996,34 +1030,57 @@ class StagedTransactionModelAbstract(CreateUpdateMixIn):
         properly. This method checks whether both `account_model_id` and
         `transaction_model_id` are set.
 
+        Additionally, a parent transaction that is not bundled will be considered
+        imported for listing purposes if it has at least one child transaction that is
+        still pending import. This allows a parent to appear in both imported and
+        pending states when its children are not fully imported.
+
         Returns
         -------
         bool
             True if both `account_model_id` and `transaction_model_id` are not None,
-            indicating that the models have been successfully imported. False otherwise.
+            indicating that the models have been successfully imported; or if this is a
+            non-bundled parent with at least one pending child. False otherwise.
         """
-        return all(
+        own_imported = all(
             [
                 self.account_model_id is not None,
                 self.transaction_model_id is not None,
             ]
         )
+        parent_with_imported_child = all(
+            [
+                self.is_parent(),
+                not self.is_bundled(),
+                self.split_transaction_set.filter(transaction_model__isnull=False).exists(),
+            ]
+        )
+        return own_imported or parent_with_imported_child
 
     def is_pending(self) -> bool:
         """
         Determine if the transaction is pending.
 
         A transaction is considered pending if it has not been assigned a
-        `transaction_model_id`. This function checks the attribute and returns
-        a boolean indicating the status.
+        `transaction_model_id`. Additionally, a parent transaction that is not
+        bundled is also considered pending if any of its children are still
+        pending import. This allows a parent to be both imported and pending
+        while its children are not fully imported.
 
         Returns
         -------
         bool
             True if the transaction is pending (i.e., `transaction_model_id`
-            is None), False otherwise.
+            is None), or this is a non-bundled parent with at least one pending
+            child. False otherwise.
         """
-        return self.transaction_model_id is None
+        return self.transaction_model_id is None or all(
+            [
+                self.is_parent(),
+                not self.is_bundled(),
+                self.split_transaction_set.filter(transaction_model__isnull=True).exists(),
+            ]
+        )
 
     def is_mapped(self) -> bool:
         """
@@ -1288,8 +1345,6 @@ class StagedTransactionModelAbstract(CreateUpdateMixIn):
         return False
 
     def has_receipt(self) -> bool:
-        # if self.is_children() and self.is_bundled():
-        #     return self.parent.receipt_type is not None
         return self.receipt_type is not None
 
     def has_mapped_receipt(self) -> bool:
@@ -1318,9 +1373,7 @@ class StagedTransactionModelAbstract(CreateUpdateMixIn):
         return False
 
     def can_unbundle(self) -> bool:
-        if any([
-            not self.is_single()
-        ]):
+        if any([not self.is_single()]):
             return True
         return False
 
@@ -1341,7 +1394,8 @@ class StagedTransactionModelAbstract(CreateUpdateMixIn):
             [
                 self.is_single(),
                 self.is_parent_is_bundled_has_receipt(),
-                self.is_parent_is_bundled_no_receipt()
+                self.is_parent_is_bundled_no_receipt(),
+                self.is_parent_not_bundled_no_receipt(),
             ]
         ):
             return True
@@ -1454,12 +1508,20 @@ class StagedTransactionModelAbstract(CreateUpdateMixIn):
 
         if not ready_to_import:
             return False
+        is_role_valid = self.is_role_mapping_valid(raise_exception=False)
+        if not is_role_valid:
+            return False
 
-        if ready_to_import:
-            is_role_valid = self.is_role_mapping_valid(raise_exception=False)
-            if is_role_valid:
+        if ready_to_import and is_role_valid:
+            if self.is_bundled():
                 return True
 
+            # not bundled....
+            else:
+                if any([self.is_child_not_bundled_no_receipt(), self.is_child_not_bundled_has_receipt()]):
+                    return True
+        return False
+
         can_split_into_je = getattr(self, 'can_split_into_je')
         if can_split_into_je and as_split:
             return True
@@ -1472,10 +1534,13 @@ class StagedTransactionModelAbstract(CreateUpdateMixIn):
             if ready_to_import:
                 if self.is_transfer():
                     return True
-                if any([
-                    self.is_single_has_receipt(),
-                    self.is_parent_is_bundled_has_receipt()
-                ]):
+                if any(
+                    [
+                        self.is_single_has_receipt(),
+                        self.is_parent_is_bundled_has_receipt(),
+                        self.is_child_not_bundled_has_receipt(),
+                    ]
+                ):
                     return True
         return False
 
@@ -1619,10 +1684,15 @@ class StagedTransactionModelAbstract(CreateUpdateMixIn):
             The journal entry activity if successfully retrieved or updated; otherwise,
             returns the existing activity or None if no activity is present.
         """
-        if (
-            force_update
-            or all([self.is_children() and self.parent.has_activity(), not self.is_bundled(), not self.has_activity()])
-            or all([not self.has_activity(), getattr(self, 'ready_to_import')])
+        if any(
+            [
+                force_update,
+                self.is_single(),
+                self.is_parent_is_bundled_no_receipt(),
+                self.is_parent_is_bundled_has_receipt(),
+                self.is_child_not_bundled_has_receipt(),
+                self.is_child_not_bundled_no_receipt(),
+            ]
         ):
             role_set = self.get_import_role_set()
             if role_set is not None:
@@ -1761,14 +1831,11 @@ class StagedTransactionModelAbstract(CreateUpdateMixIn):
                         force_je_retrieval=False,
                     )
                     staged_to_save += [i['staged_tx_model'] for i in je_data]
-                # staged_to_save = set(i['staged_tx_model'] for i in je_data)
-                # for i in staged_to_save:
-                #     i.save(update_fields=['transaction_model', 'updated'])
                 staged_to_save = set(staged_to_save)
                 for i in staged_to_save:
                     i.save(update_fields=['transaction_model', 'updated'])
 
-    def migrate_receipt(self, receipt_date: Optional[date | datetime] = None):
+    def migrate_receipt(self, receipt_date: Optional[date | datetime] = None, split_amount: bool = False):
         if not self.can_migrate_receipt():
             raise StagedTransactionModelValidationError(
                 'Migrate receipts can only be performed on receipt transactions. Use migrate_transactions() instead.'
@@ -1778,7 +1845,7 @@ class StagedTransactionModelAbstract(CreateUpdateMixIn):
 
         with transaction.atomic():
             receipt_model: ReceiptModel = self.generate_receipt_model(receipt_date=receipt_date, commit=True)
-            receipt_model.migrate_receipt()
+            receipt_model.migrate_receipt(split_amount=split_amount)
 
     def generate_receipt_model(self, receipt_date: Optional[date] = None, commit: bool = False) -> ReceiptModel:
         if receipt_date:
@@ -1791,7 +1858,7 @@ class StagedTransactionModelAbstract(CreateUpdateMixIn):
             receipt_model.configure(
                 receipt_date=receipt_date,
                 entity_model=self.entity_slug,
-                amount=abs(self.amount),
+                amount=abs(self.amount_split if self.is_children() else self.amount),
                 unit_model=self.unit_model,
                 receipt_type=self.receipt_type,
                 vendor_model=self.vendor_model if self.is_expense() or self.is_debt_payment() else None,
@@ -1805,12 +1872,12 @@ class StagedTransactionModelAbstract(CreateUpdateMixIn):
         return receipt_model
 
     def can_undo_import(self):
+        if self.transaction_model_id is None:
+            return False
         if all([self.is_children(), self.is_bundled()]):
             return False
-
         return True
 
-    # UNDO
     def undo_import(self, raise_exception: bool = True):
         """
         Undo import operation for a staged transaction. This method handles the deletion
@@ -1832,10 +1899,7 @@ class StagedTransactionModelAbstract(CreateUpdateMixIn):
 
         with transaction.atomic():
             # Receipt import case...
-            try:
-                receipt_model = self.receiptmodel
-            except ObjectDoesNotExist:
-                receipt_model = None
+            receipt_model = getattr(self, 'receiptmodel', None)
 
             if receipt_model is not None:
                 receipt_model.delete()
@@ -1850,10 +1914,10 @@ class StagedTransactionModelAbstract(CreateUpdateMixIn):
                 tx_model = self.transaction_model
                 journal_entry_model = tx_model.journal_entry
 
-                if journal_entry_model.can_unlock() and journal_entry_model.can_unpost():
-                    journal_entry_model.unlock(raise_exception=False)
-                    journal_entry_model.unpost(raise_exception=False)
-                    journal_entry_model.delete()
+                journal_entry_model.unpost(raise_exception=False)
+                journal_entry_model.unlock(raise_exception=False)
+
+                journal_entry_model.delete()
 
                 self.transaction_model = None
                 self.save(update_fields=['transaction_model', 'updated'])
@@ -1862,6 +1926,11 @@ class StagedTransactionModelAbstract(CreateUpdateMixIn):
         if raise_exception:
             raise StagedTransactionModelValidationError(message=_('Nothing to undo for this staged transaction.'))
 
+    def can_delete(self) -> bool:
+        if self.is_children():
+            return True
+        return False
+
     def clean(self, verify: bool = False):
         if self.has_children():
             self.amount_split = None
@@ -2001,3 +2070,10 @@ def stagedtransactionmodel_presave(instance: StagedTransactionModel, **kwargs):
 
 
 pre_save.connect(stagedtransactionmodel_presave, sender=StagedTransactionModel)
+
+
+def stagedtransactionmodel_predelete(instance: StagedTransactionModel, **kwargs):
+    if not instance.can_delete():
+        raise StagedTransactionModelValidationError(
+            message=_('Cannot delete parent Staged Transactions.'),
+        )

django_ledger/models/receipt.py

@@ -825,7 +825,7 @@ class ReceiptModelAbstract(CreateUpdateMixIn, MarkdownNotesMixIn, IOMixIn):
             ]
         )
 
-    def migrate_receipt(self):
+    def migrate_receipt(self, split_amount: bool = False):
         """Post staged transactions into the ledger as journal entries.
 
         This method commits staged transactions linked to the receipt into the
@@ -846,7 +846,7 @@ class ReceiptModelAbstract(CreateUpdateMixIn, MarkdownNotesMixIn, IOMixIn):
                 message='Must have VendorModel or CustomerModel, not both.',
             )
 
-        commit_dict = self.staged_transaction_model.commit_dict(split_txs=False)
+        commit_dict = self.staged_transaction_model.commit_dict(split_txs=split_amount)
         ledger_model = self.ledger_model
         staged_to_save = list()
         for je_data in commit_dict:

django_ledger/templates/django_ledger/data_import/tags/data_import_job_txs_imported.html

@@ -50,8 +50,8 @@
                         {{ imported_tx.get_activity_display }}
                     {% endif %}</td>
                     <td>{% if imported_tx.entity_unit %}{{ imported_tx.entity_unit }}{% endif %}</td>
-                    <td>{{ imported_tx.account_model }}</td>
-                    <td>{{ imported_tx.transaction_model }}</td>
+                    <td>{{ imported_tx.account_model | default:'' }}</td>
+                    <td>{{ imported_tx.transaction_model | default:'' }}</td>
                     <td class="has-text-centered">
                         <div class="dropdown is-hoverable is-right">
                             <div class="dropdown-trigger">
@@ -63,9 +63,11 @@
                             </div>
                             <div class="dropdown-menu" id="actions-{{ imported_tx.uuid }}" role="menu">
                                 <div class="dropdown-content">
-                                    <a href="{% url 'django_ledger:je-detail' entity_slug=import_job_model.entity_slug ledger_pk=imported_tx.transaction_model.journal_entry.ledger_id je_pk=imported_tx.transaction_model.journal_entry_id %}"
-                                       class="dropdown-item">{% trans 'View JE' %}</a>
-                                    {% if imported_tx.has_receipt %}
+                                    {% if not imported_tx.is_parent and not imported_tx.is_bundled %}
+                                        <a href="{% url 'django_ledger:je-detail' entity_slug=import_job_model.entity_slug ledger_pk=imported_tx.transaction_model.journal_entry.ledger_id je_pk=imported_tx.transaction_model.journal_entry_id %}"
+                                           class="dropdown-item">{% trans 'View JE' %}</a>
+                                    {% endif %}
+                                    {% if imported_tx.receipt_uuid %}
                                         <a href="{% url 'django_ledger:receipt-detail' entity_slug=import_job_model.entity_slug receipt_pk=imported_tx.receiptmodel.uuid %}"
                                            class="dropdown-item">{% trans 'View Receipt' %}</a>
                                     {% endif %}
@@ -77,8 +79,8 @@
                                             <button type="submit"
                                                     class="dropdown-item has-text-danger">{% trans 'Undo Import' %}</button>
                                         </form>
+                                        </div>
                                     {% endif %}
-                                </div>
                             </div>
                         </div>
                     </td>

django_ledger/templates/django_ledger/data_import/tags/data_import_job_txs_table.html

@@ -78,8 +78,6 @@
                     <td class="has-text-centered">
                         {{ txf.customer_model }}
                         {{ txf.vendor_model }}
-{#                        {{ txf.instance.can_migrate }}#}
-{#                        {{ txf.instance.ready_to_import }}#}
                     </td>
                     <td class="has-text-centered">{{ txf.tx_import }}</td>
                     <td class="has-text-centered">{{ txf.bundle_split }}</td>

django_ledger/templates/django_ledger/receipt/receipt_detail.html

@@ -58,8 +58,10 @@
                                         <a href="{{ tx.get_journal_entry_detail_url }}">{{ tx.journal_entry.description|default:'—' }}</a>
                                     </td>
                                     <td>{{ tx.account.code }} - {{ tx.account.name }}</td>
-                                    <td class="has-text-right">{% if tx.is_debit %}{{ tx.amount }}{% endif %}</td>
-                                    <td class="has-text-right">{% if tx.is_credit %}{{ tx.amount }}{% endif %}</td>
+                                    <td class="has-text-right">{% currency_symbol %}{% if tx.is_debit %}
+                                        {{ tx.amount | currency_format }}{% endif %}</td>
+                                    <td class="has-text-right">{% currency_symbol %}{% if tx.is_credit %}
+                                        {{ tx.amount | currency_format }}{% endif %}</td>
                                     <td>{{ tx.journal_entry.entity_unit.name|default:'—' }}</td>
                                 </tr>
                             {% endfor %}

django_ledger/views/data_import.py

@@ -210,17 +210,18 @@ class DataImportJobDetailView(ImportJobModelViewBaseView, DetailView):
                 for tx_form in txs_formset:
                     if tx_form.has_changed():
                         staged_transaction_model: StagedTransactionModel = tx_form.instance
+
                         is_split = tx_form.cleaned_data['tx_split'] is True
+                        is_import = tx_form.cleaned_data['tx_import'] is True
+                        is_bundled = tx_form.cleaned_data['bundle_split'] is True
+
                         if is_split:
                             staged_transaction_model.add_split()
-                        # import entry was selected for import...
-                        is_import = tx_form.cleaned_data['tx_import']
-                        if is_import:
-                            # all entries in split will be going so the same journal entry... (same unit...)
-                            is_bundled = tx_form.cleaned_data['bundle_split']
+                        elif is_import:
                             if staged_transaction_model.can_migrate_receipt():
                                 staged_transaction_model.migrate_receipt(
-                                    receipt_date=staged_transaction_model.date_posted
+                                    receipt_date=staged_transaction_model.date_posted,
+                                    split_amount=not is_bundled,
                                 )
                             else:
                                 staged_transaction_model.migrate_transactions(split_txs=not is_bundled)
@@ -276,9 +277,12 @@ class ImportJobModelResetView(ImportJobModelViewBaseView, DetailView):
 
     def post(self, request, **kwargs):
         import_job_model: ImportJobModel = self.get_object()
-        imported_staged_txs = import_job_model.stagedtransactionmodel_set.is_imported()
+        imported_staged_txs = import_job_model.stagedtransactionmodel_set.all()
         for staged_tx in imported_staged_txs:
             staged_tx.undo_import(raise_exception=False)
+            if staged_tx.is_children():
+                staged_tx.delete()
+
 
         return redirect(
             to=import_job_model.get_data_import_url(),

{django_ledger-0.8.2.2.dist-info → django_ledger-0.8.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-ledger
-Version: 0.8.2.2
+Version: 0.8.2.3
 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.8.2.2.dist-info → django_ledger-0.8.2.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-django_ledger/__init__.py,sha256=DQY-BUhQriGeWBMqAUYBynkiPI0FhUS9ecHusI9R23k,382
+django_ledger/__init__.py,sha256=ZL-fuSwWwUj6jcETC_xzBKG2xCheCQcy4KfU6QD3v-U,382
 django_ledger/apps.py,sha256=H-zEWUjKGakgSDSZmLIoXChZ2h6e0dth0ZO5SpoT-8U,163
 django_ledger/context.py,sha256=OBNHHm6qlt3fBc1_EiOcbzwafsqJBXtdZY5ubW_gga0,301
 django_ledger/exceptions.py,sha256=rML8sQQ0Hq-DYMLZ76dfw2RYSAsXWUoyHuyC_yP9o1o,491
@@ -18,7 +18,7 @@ django_ledger/forms/bill.py,sha256=u5zJWWq4huEsfqukHCCnlGEcUsArOQmrKyBcRtsSWCU,1
 django_ledger/forms/chart_of_accounts.py,sha256=wymLQ8iLNPU_LgS79BOdMUapuLqoTvgqVdAyL1Pw0Ro,2414
 django_ledger/forms/closing_entry.py,sha256=kJQtVqira0rpYvlmMlGAaV5L3Wz3XNXSgrcVfZ2VyLM,1948
 django_ledger/forms/customer.py,sha256=xK1tlA1yYvZM2TWeSumcHOfmw0DiiIzgypOoXDK5fF4,2707
-django_ledger/forms/data_import.py,sha256=EePipfO_4J7Vq4dD3ISPGA3hhhOU6fsdAs2TSv90aHg,10606
+django_ledger/forms/data_import.py,sha256=4phvkT09Gl9xT6FAj3zdW8w1yvxgjbS3Ua6Eqzqrx0E,12390
 django_ledger/forms/entity.py,sha256=b0QirmsFSnaM8YWDO4V6GQXfFgR_MLmdq27I2q2sGQ0,6880
 django_ledger/forms/estimate.py,sha256=oGx4NbIkySA3a9r4bTNCz7t2swsTQgxuOSOdXIrXcZo,5064
 django_ledger/forms/feedback.py,sha256=WUT-kI4uT6q5aqEYaDYwyIFfhXpmtwMv6qf9BFSYsDo,1850
@@ -71,7 +71,7 @@ django_ledger/migrations/0025_alter_billmodel_cash_account_and_more.py,sha256=8p
 django_ledger/migrations/0026_stagedtransactionmodel_customer_model_and_more.py,sha256=qv2PFWhXgAHWGptb8Xgoq0O4TsGqJelnI0-BRSJqZBE,4470
 django_ledger/migrations/0027_alter_accountmodel_role_alter_receiptmodel_amount_and_more.py,sha256=2lOHxOP6IvizjTwukN4GB0GWrROmDv_mdRM3wf6IXZo,7391
 django_ledger/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-django_ledger/models/__init__.py,sha256=kS8Qr1pBIeg2j1jQvDTEGzGMsK4YxKtpyUj8CWpm9yw,851
+django_ledger/models/__init__.py,sha256=AJTkUumUJzwg5RnbtuHikD7dqX4KaIYj7B8dZYtRz7E,852
 django_ledger/models/accounts.py,sha256=Y0EuVy1xCELOLhIMXnku6VlWFC33JctK7NsnJ-L62QM,38924
 django_ledger/models/bank_account.py,sha256=P-62wjQ94EneCseewDV2tyRt0ghlaEh1jFIowWJdHCU,8942
 django_ledger/models/bill.py,sha256=a15MHAl5HSu536BsWwbcYnGXL8PGo14ToncVNktME2s,64469
@@ -79,7 +79,7 @@ django_ledger/models/chart_of_accounts.py,sha256=g7NWRCSoj4YFuOPBGUqgBVekwCU7xPO
 django_ledger/models/closing_entry.py,sha256=zxoZOC2ymbrwyPOGPsKXXBwHDGegAtTnqDye0Y-mVAo,20625
 django_ledger/models/coa_default.py,sha256=L3fHc-HvYo_gTvCWv5oZl-rWnH9ZPuloK-bw3_cICo0,27614
 django_ledger/models/customer.py,sha256=JDlCII2r4Ebj08tYc2DfRVBWRb68Nw61ZRDGIEAUjvk,13375
-django_ledger/models/data_import.py,sha256=hJPHjpk8Jfgl9W7wS1MPSJsXKkIZDvEyNHeSPswl61M,75849
+django_ledger/models/data_import.py,sha256=0vB8n9JwwlGCJ5lTsf14LGCru0RDdxFqQX4MPSmxXtY,79393
 django_ledger/models/deprecations.py,sha256=49sLBeVhHMYSf3F3VPCE6_5iNZH1xmElWZsgGIGUErs,2275
 django_ledger/models/entity.py,sha256=SN73ceuj3kNcfWCrLRZVoMUePGBl6j4SABkwr9OZg_Y,122092
 django_ledger/models/estimate.py,sha256=0DmDs7U5WqaQM9xciuXKR29pGHaLT7z_QmlNvvzUy_0,59406
@@ -89,7 +89,7 @@ django_ledger/models/journal_entry.py,sha256=X3wRhYqOmDGcRZj4WYGCNDQhBBZ1hp5fnCc
 django_ledger/models/ledger.py,sha256=hT5u9IHJy5vun9_bzcC5FKN8ocP0OGdR4RDDe3icgzo,29400
 django_ledger/models/mixins.py,sha256=v5m7MwUcsndLctbTrrof-RSlMyc5tcQqRhcmPjJbOk4,54287
 django_ledger/models/purchase_order.py,sha256=X5ZIfwTAMWUbqL79nQCWWltlOiKSEFGocfaWHK3i154,45128
-django_ledger/models/receipt.py,sha256=cBAPrhW_sGs_2uXgo2U1kv6xLnfLz_x_j6YKpb-yb3o,37317
+django_ledger/models/receipt.py,sha256=q5yT5v2c55sPyvIpweHoR6LY5hm7PXlybkAilSobWUQ,37352
 django_ledger/models/signals.py,sha256=3cm_8--Jz-Jb0fPgrVmm5xx_jKFARV6_A29VDjqHeIw,1563
 django_ledger/models/transactions.py,sha256=TmHqTVaPx3d0Flaab_cUbKfa7a1hEpkgbsdV6YZlyVc,26431
 django_ledger/models/unit.py,sha256=iP7gMLCPV82uxsDIWa-BhdgLtm8FwGbQ_kOCSC-tJJo,10227
@@ -217,8 +217,8 @@ django_ledger/templates/django_ledger/data_import/import_job_create.html,sha256=
 django_ledger/templates/django_ledger/data_import/import_job_delete.html,sha256=qgobtrI-WNYFqhn8de05mcD-FQ0UGSLT6ZoaBlblXAU,944
 django_ledger/templates/django_ledger/data_import/import_job_update.html,sha256=ZDy391RSOXUq3keUs48QrVrI_ZicdNvDeLT_JacH17M,887
 django_ledger/templates/django_ledger/data_import/tags/data_import_job_list_table.html,sha256=y_U1xixMC9YPR4aq6F_cNpyb-dZ5qcVh9D6HSN9Xpps,2919
-django_ledger/templates/django_ledger/data_import/tags/data_import_job_txs_imported.html,sha256=uufMvCsyaa-oyePFl5t7V1I86MCaE7twzrbl7rsExwo,5223
-django_ledger/templates/django_ledger/data_import/tags/data_import_job_txs_table.html,sha256=OtrMoTE8B7hHaHcH4u4bRPqBEadqOHhjPjajnpI0bxU,4840
+django_ledger/templates/django_ledger/data_import/tags/data_import_job_txs_imported.html,sha256=NYck3UKL5-eLab_PV3wVnZKf0oaPisgha-2YghVrWd0,5416
+django_ledger/templates/django_ledger/data_import/tags/data_import_job_txs_table.html,sha256=93Pqi8bvLv_x4-cavBtAa6p7gKDn1_UnUjAvKwaatgY,4718
 django_ledger/templates/django_ledger/entity/entitiy_list.html,sha256=onM9uaWTm2oQ00OPIH5ki2FEfgjx7_EIOT8akuAhQM4,1507
 django_ledger/templates/django_ledger/entity/entity_create.html,sha256=TDayIv2qno7cT3xTCapKV6EZKcTTNfIMxXJFQmHHyz0,1387
 django_ledger/templates/django_ledger/entity/entity_dashboard.html,sha256=7iQYLYsP_Q1S2wGcYcZUn3FWJBNJPxZ4OvGQjfctoiw,5435
@@ -301,7 +301,7 @@ django_ledger/templates/django_ledger/purchase_order/includes/po_table.html,sha2
 django_ledger/templates/django_ledger/purchase_order/tags/po_item_table.html,sha256=2DK0aaqG4R-GsOr_I4mHVEI8O614FuggpEBN6r-jcu4,1998
 django_ledger/templates/django_ledger/receipt/customer_receipt_report.html,sha256=Z2M4JnelzRRscVgA7jA3gWvDWMv9wiz5IiVVubqn98E,5197
 django_ledger/templates/django_ledger/receipt/receipt_delete.html,sha256=yB5jHmFUOc1ZMulSU5uq8oc1jomRmIZA0aK91iF0Oxc,1226
-django_ledger/templates/django_ledger/receipt/receipt_detail.html,sha256=thlMFiqfZFKuXqX0mbdO4OmRlvAR9CrPuchK8eCMVPw,4757
+django_ledger/templates/django_ledger/receipt/receipt_detail.html,sha256=QITtI2VFa7E1Ub9KAR9ParTIPCxUvQOERuyORMykywo,4917
 django_ledger/templates/django_ledger/receipt/receipt_list.html,sha256=KZSxhgA_uZj015Arx_CM8ghbxTlSLUew6v3NP49AXzM,6810
 django_ledger/templates/django_ledger/receipt/vendor_receipt_report.html,sha256=ySVb7twSChUXEuPSujZZaD8PtNBBsEDLdTKEE8zq4qQ,5149
 django_ledger/templates/django_ledger/service/service_create.html,sha256=kGlqz3-txJojmBEnwXat8V6p4mZ0yozKBYDSlMgGcB8,1431
@@ -375,7 +375,7 @@ django_ledger/views/bill.py,sha256=dtp8KqyqvDGPy99lB1bz4jHEhHJ_4b87O6jpRFS-oOI,2
 django_ledger/views/chart_of_accounts.py,sha256=AlRdX_g-Hjqetv1pVdQRMIYj4D4gnCURUgbAnPt_kpA,5659
 django_ledger/views/closing_entry.py,sha256=JG2uDrqi90S1_Edb6-dsfNgx5xXLQRm6awjf_c8Y8fk,8433
 django_ledger/views/customer.py,sha256=UPdEZ8DJj6FHR-eO2EgqdrYzU6QoAp1QAvPgHK0SXSg,4867
-django_ledger/views/data_import.py,sha256=LNdzBaU1_7wWD9_aKaAPkAx45ouDfusMM9TzLOEubI0,10959
+django_ledger/views/data_import.py,sha256=mDQqHj5Z8lAxWwKCSmSkMPHOINm_INPlCy281HkcxlU,10934
 django_ledger/views/djl_api.py,sha256=W4DooOXtTDvcZ6AyBgcwv86CUytQx_KHxxycU6s3e3I,4359
 django_ledger/views/entity.py,sha256=eY7dDY45Mv3M5pdegXtdkbC0TAzJh7LuG0NrZx56lM8,9394
 django_ledger/views/estimate.py,sha256=z5rlNiiXDXR24yPdzCNXVM_yJRDE4CG4ZrItijaXtmY,12648
@@ -393,9 +393,9 @@ django_ledger/views/receipt.py,sha256=mtiHfk529oVVSIrAR28LgQc696HUVFnV4rYd9HTqoV
 django_ledger/views/transactions.py,sha256=3ijtJzdLPFkqG7OYpe-7N4QVjCyR2yl5ht_9RyfquBA,212
 django_ledger/views/unit.py,sha256=IK0KWf_NkTCzJILtA4SDU9tD4OL3kbAktLdvL6fxRhU,10035
 django_ledger/views/vendor.py,sha256=-tUs6-flA_SiXuDWs173Sho4JwQr0zMAhqD_-xM0eeA,4746
-django_ledger-0.8.2.2.dist-info/licenses/AUTHORS.md,sha256=ShPwf-qniJkbjRzX5_lqhmgoLMEYMSHSwKPXHZtWmyk,824
-django_ledger-0.8.2.2.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-django_ledger-0.8.2.2.dist-info/METADATA,sha256=p37l1i-Rpg7RHpm4Bx_bFhrOpT8jCGUQtlEfaV2DguQ,8460
-django_ledger-0.8.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-django_ledger-0.8.2.2.dist-info/top_level.txt,sha256=57KG3JBsF9fqPnPGyFfcpKtfFNS9TQONjtfKhUlwiy4,14
-django_ledger-0.8.2.2.dist-info/RECORD,,
+django_ledger-0.8.2.3.dist-info/licenses/AUTHORS.md,sha256=ShPwf-qniJkbjRzX5_lqhmgoLMEYMSHSwKPXHZtWmyk,824
+django_ledger-0.8.2.3.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+django_ledger-0.8.2.3.dist-info/METADATA,sha256=xvPML8oA6ACobgjGWNeEUXjwDgpvNm2pdf1ToEL2Q3Q,8460
+django_ledger-0.8.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+django_ledger-0.8.2.3.dist-info/top_level.txt,sha256=57KG3JBsF9fqPnPGyFfcpKtfFNS9TQONjtfKhUlwiy4,14
+django_ledger-0.8.2.3.dist-info/RECORD,,