Merge branch 'develop'

Author: elarroba

django_ledger/__init__.py

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

django_ledger/forms/data_import.py

@@ -11,7 +11,7 @@
 )
 from django.utils.translation import gettext_lazy as _
 
-from django_ledger.io import GROUP_EXPENSES, GROUP_INCOME
+from django_ledger.io import GROUP_EXPENSES, GROUP_INCOME, GROUP_TRANSFERS, GROUP_DEBT_PAYMENT
 from django_ledger.models import (
     StagedTransactionModel,
     ImportJobModel,
@@ -24,9 +24,7 @@ class ImportJobModelCreateForm(ModelForm):
     def __init__(self, entity_model: EntityModel, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.ENTITY_MODEL: EntityModel = entity_model
-        self.fields[
-            'bank_account_model'
-        ].queryset = self.ENTITY_MODEL.bankaccountmodel_set.all().active()
+        self.fields['bank_account_model'].queryset = self.ENTITY_MODEL.bankaccountmodel_set.all().active()
 
     ofx_file = forms.FileField(
         label='Select File...',
@@ -54,19 +52,15 @@ class Meta:
             ),
         }
         help_texts = {
-            'bank_account_model': _(
-                'Select the bank account to import transactions from.'
-            ),
+            'bank_account_model': _('Select the bank account to import transactions from.'),
         }
 
 
 class ImportJobModelUpdateForm(ModelForm):
     class Meta:
         model = ImportJobModel
         fields = ['description']
-        widgets = {
-            'description': TextInput(attrs={'class': DJANGO_LEDGER_FORM_INPUT_CLASSES})
-        }
+        widgets = {'description': TextInput(attrs={'class': DJANGO_LEDGER_FORM_INPUT_CLASSES})}
 
 
 class StagedTransactionModelForm(ModelForm):
@@ -75,59 +69,49 @@ class StagedTransactionModelForm(ModelForm):
 
     def __init__(self, base_formset_instance, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.BASE_FORMSET_INSTANCE: 'BaseStagedTransactionModelFormSet' = (
-            base_formset_instance
-        )
+        self.BASE_FORMSET_INSTANCE: 'BaseStagedTransactionModelFormSet' = base_formset_instance
         self.VENDOR_CHOICES = self.BASE_FORMSET_INSTANCE.VENDOR_CHOICES
         self.VENDOR_MAP = self.BASE_FORMSET_INSTANCE.VENDOR_MAP
 
         self.CUSTOMER_CHOICES = self.BASE_FORMSET_INSTANCE.CUSTOMER_CHOICES
         self.CUSTOMER_MAP = self.BASE_FORMSET_INSTANCE.CUSTOMER_MAP
 
-        self.EXPENSE_ACCOUNT_CHOICES = (
-            self.BASE_FORMSET_INSTANCE.ACCOUNT_MODEL_EXPENSES_CHOICES
-        )
-        self.SALES_ACCOUNT_CHOICES = (
-            self.BASE_FORMSET_INSTANCE.ACCOUNT_MODEL_SALES_CHOICES
-        )
-        self.SHOW_VENDOR_FIELD: bool = False
-        self.SHOW_CUSTOMER_FIELD: bool = False
+        self.EXPENSE_ACCOUNT_CHOICES = self.BASE_FORMSET_INSTANCE.ACCOUNT_MODEL_EXPENSES_CHOICES
+        self.SALES_ACCOUNT_CHOICES = self.BASE_FORMSET_INSTANCE.ACCOUNT_MODEL_SALES_CHOICES
+        self.TRANSFER_ACCOUNT_CHOICES = self.BASE_FORMSET_INSTANCE.ACCOUNT_MODEL_TRANSFERS_CHOICES
+        self.CC_PAYMENT_ACCOUNT_CHOICES = self.BASE_FORMSET_INSTANCE.ACCOUNT_MODEL_TRANSFERS_CC_PAYMENT
 
         staged_tx_model: StagedTransactionModel = getattr(self, 'instance', None)
 
-        if staged_tx_model.can_migrate_receipt():
-            if staged_tx_model.is_expense():
-                self.fields['customer_model'].widget = forms.HiddenInput()
-                self.fields['vendor_model'].choices = self.VENDOR_CHOICES
-                self.fields['account_model'].choices = self.EXPENSE_ACCOUNT_CHOICES
-                self.SHOW_VENDOR_FIELD = True
-            elif staged_tx_model.is_sales():
-                self.fields['vendor_model'].widget = forms.HiddenInput()
-                self.fields['customer_model'].choices = self.CUSTOMER_CHOICES
-                self.fields['account_model'].choices = self.SALES_ACCOUNT_CHOICES
-                self.SHOW_CUSTOMER_FIELD = True
-        else:
-            self.fields['customer_model'].widget = forms.HiddenInput()
-            self.fields['vendor_model'].widget = forms.HiddenInput()
-            # avoids multiple DB queries rendering the formset...
-            self.fields[
-                'account_model'
-            ].choices = self.BASE_FORMSET_INSTANCE.ACCOUNT_MODEL_CHOICES
+        self.fields['vendor_model'].choices = self.VENDOR_CHOICES
+        self.fields['customer_model'].choices = self.CUSTOMER_CHOICES
+        self.fields['account_model'].choices = self.BASE_FORMSET_INSTANCE.ACCOUNT_MODEL_CHOICES
 
         # avoids multiple DB queries rendering the formset...
-        self.fields[
-            'unit_model'
-        ].choices = self.BASE_FORMSET_INSTANCE.UNIT_MODEL_CHOICES
+        self.fields['unit_model'].choices = self.BASE_FORMSET_INSTANCE.UNIT_MODEL_CHOICES
 
         if staged_tx_model:
-            if not staged_tx_model.is_children():
+            if staged_tx_model.is_sales():
+                self.fields['account_model'].choices = self.SALES_ACCOUNT_CHOICES
+
+            if staged_tx_model.is_expense():
+                self.fields['account_model'].choices = self.EXPENSE_ACCOUNT_CHOICES
+
+            if staged_tx_model.is_transfer():
+                self.fields['account_model'].choices = self.TRANSFER_ACCOUNT_CHOICES
+
+            if staged_tx_model.is_debt_payment():
+                self.fields['account_model'].choices = self.CC_PAYMENT_ACCOUNT_CHOICES
+
+            if not staged_tx_model.can_have_amount_split():
                 self.fields['amount_split'].widget = HiddenInput()
                 self.fields['amount_split'].disabled = True
-            else:
+
+            if not staged_tx_model.can_have_bundle_split():
                 self.fields['bundle_split'].widget = HiddenInput()
                 self.fields['bundle_split'].disabled = True
 
-            if staged_tx_model.has_children():
+            if not staged_tx_model.can_have_receipt():
                 self.fields['receipt_type'].widget = HiddenInput()
                 self.fields['receipt_type'].disabled = True
 
@@ -139,29 +123,26 @@ def __init__(self, base_formset_instance, *args, **kwargs):
                 self.fields['unit_model'].widget = HiddenInput()
                 self.fields['unit_model'].disabled = True
 
-            # receipt-related field visibility: not allowed for children rows
-            if staged_tx_model.is_children():
-                for f in [
-                    'receipt_type',
-                    'vendor_model',
-                    'customer_model',
-                    'bundle_split',
-                ]:
-                    self.fields[f].widget = HiddenInput()
-                    self.fields[f].disabled = True
-
-            if staged_tx_model.is_single():
-                self.fields['bundle_split'].widget = HiddenInput()
-                self.fields['bundle_split'].disabled = True
+            if not staged_tx_model.can_have_vendor():
+                self.fields['vendor_model'].widget = HiddenInput()
+                self.fields['vendor_model'].disabled = True
 
-            if not staged_tx_model.can_migrate():
+            if not staged_tx_model.can_have_customer():
+                self.fields['customer_model'].widget = HiddenInput()
+                self.fields['customer_model'].disabled = True
+
+            if not staged_tx_model.can_import():
                 self.fields['tx_import'].widget = HiddenInput()
                 self.fields['tx_import'].disabled = True
 
             if not staged_tx_model.can_split():
                 self.fields['tx_split'].widget = HiddenInput()
                 self.fields['tx_split'].disabled = True
 
+            if not staged_tx_model.can_unbundle():
+                # self.fields['bundle_split'].widget = HiddenInput()
+                self.fields['bundle_split'].disabled = True
+
     def clean_account_model(self):
         staged_txs_model: StagedTransactionModel = self.instance
         if staged_txs_model.has_children():
@@ -186,20 +167,6 @@ 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'))
 
-        staged_txs_model: StagedTransactionModel = self.instance
-        if all(
-            [
-                staged_txs_model.has_children(),
-                staged_txs_model.has_receipt(),
-                not staged_txs_model.bundle_split,
-            ]
-        ):
-            raise ValidationError(
-                message=_(
-                    'Receipt transactions cannot be split into multiple receipts.'
-                )
-            )
-
     class Meta:
         model = StagedTransactionModel
         fields = [
@@ -223,18 +190,10 @@ class Meta:
                     'class': DJANGO_LEDGER_FORM_INPUT_CLASSES + ' is-small',
                 }
             ),
-            'amount_split': NumberInput(
-                attrs={'class': DJANGO_LEDGER_FORM_INPUT_CLASSES + ' is-small'}
-            ),
-            'vendor_model': Select(
-                attrs={'class': DJANGO_LEDGER_FORM_INPUT_CLASSES + ' is-small'}
-            ),
-            'customer_model': Select(
-                attrs={'class': DJANGO_LEDGER_FORM_INPUT_CLASSES + ' is-small'}
-            ),
-            'receipt_type': Select(
-                attrs={'class': DJANGO_LEDGER_FORM_INPUT_CLASSES + ' is-small'}
-            ),
+            'amount_split': NumberInput(attrs={'class': DJANGO_LEDGER_FORM_INPUT_CLASSES + ' is-small'}),
+            'vendor_model': Select(attrs={'class': DJANGO_LEDGER_FORM_INPUT_CLASSES + ' is-small'}),
+            'customer_model': Select(attrs={'class': DJANGO_LEDGER_FORM_INPUT_CLASSES + ' is-small'}),
+            'receipt_type': Select(attrs={'class': DJANGO_LEDGER_FORM_INPUT_CLASSES + ' is-small'}),
         }
 
 
@@ -250,52 +209,46 @@ def __init__(
 
         # validates that the job import model belongs to the entity model...
         if import_job_model.entity_uuid != entity_model.uuid:
-            raise ValidationError(
-                message=_('Import job does not belong to this entity')
-            )
+            raise ValidationError(message=_('Import job does not belong to this entity'))
 
         self.ENTITY_MODEL = entity_model
         self.IMPORT_JOB_MODEL: ImportJobModel = import_job_model
 
         self.queryset = (
-            self.IMPORT_JOB_MODEL.stagedtransactionmodel_set.all().is_pending()
+            StagedTransactionModel.objects.for_entity(entity_model=entity_model)
+            .for_import_job(import_job_model=import_job_model)
+            .is_pending()
         )
 
-        self.MAPPED_ACCOUNT_MODEL = (
-            self.IMPORT_JOB_MODEL.bank_account_model.account_model
-        )
+        self.MAPPED_ACCOUNT_MODEL = self.IMPORT_JOB_MODEL.bank_account_model.account_model
 
         self.account_model_qs = (
-            entity_model.get_coa_accounts()
-            .available()
-            .exclude(uuid__exact=self.MAPPED_ACCOUNT_MODEL.uuid)
+            entity_model.get_coa_accounts().available().exclude(uuid__exact=self.MAPPED_ACCOUNT_MODEL.uuid)
         )
-        self.ACCOUNT_MODEL_CHOICES = [(None, '----')] + [
-            (a.uuid, a) for a in self.account_model_qs
-        ]
+        self.ACCOUNT_MODEL_CHOICES = [(None, '----')] + [(a.uuid, a) for a in self.account_model_qs]
         self.ACCOUNT_MODEL_EXPENSES_CHOICES = [(None, '----')] + [
             (a.uuid, a) for a in self.account_model_qs if a.role in GROUP_EXPENSES
         ]
         self.ACCOUNT_MODEL_SALES_CHOICES = [(None, '----')] + [
             (a.uuid, a) for a in self.account_model_qs if a.role in GROUP_INCOME
         ]
 
-        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.ACCOUNT_MODEL_TRANSFERS_CHOICES = [(None, '----')] + [
+            (a.uuid, a) for a in self.account_model_qs if a.role in GROUP_TRANSFERS
+        ]
+
+        self.ACCOUNT_MODEL_TRANSFERS_CC_PAYMENT = [(None, '----')] + [
+            (a.uuid, a) for a in self.account_model_qs if a.role in GROUP_DEBT_PAYMENT
         ]
 
+        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()
-        len(self.VENDOR_MODEL_QS)
         self.CUSTOMER_MODEL_QS = entity_model.customermodel_set.visible()
-        len(self.CUSTOMER_MODEL_QS)
 
-        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_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)