django-ledger 0.7.4.1__py3-none-any.whl → 0.7.5__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.4.1'
+__version__ = '0.7.5'
 __license__ = 'GPLv3 License'
 
 __author__ = 'Miguel Sanda'

django_ledger/contrib/django_ledger_graphene/bank_account/schema.py

@@ -28,7 +28,7 @@ class Bank_account_Query(graphene.ObjectType):
             return BankAccountModel.objects.for_entity(
             entity_slug=slug_name,
             user_model=info.context.user
-        ).select_related('cash_account')
+        ).select_related('account_model')
         else:
             return BankAccountModel.objects.none()
 

django_ledger/forms/bank_account.py

@@ -1,7 +1,7 @@
 from django.forms import ModelForm, TextInput, Select, ValidationError
 from django.utils.translation import gettext_lazy as _
 
-from django_ledger.io.roles import ASSET_CA_CASH
+from django_ledger.io.roles import ASSET_CA_CASH, LIABILITY_CL_ACC_PAYABLE, LIABILITY_LTL_MORTGAGE_PAYABLE
 from django_ledger.models import BankAccountModel
 from django_ledger.models.accounts import AccountModel
 from django_ledger.settings import DJANGO_LEDGER_FORM_INPUT_CLASSES
@@ -19,20 +19,24 @@ class BankAccountCreateForm(ModelForm):
             user_model=self.USER_MODEL,
             entity_model=self.ENTITY_SLUG
         ).available().filter(
-            role__exact=ASSET_CA_CASH)
-        self.fields['cash_account'].queryset = account_qs
+            role__in=[
+                ASSET_CA_CASH,
+                LIABILITY_CL_ACC_PAYABLE,
+                LIABILITY_LTL_MORTGAGE_PAYABLE
+            ])
+        self.fields['account_model'].queryset = account_qs
 
     def clean(self):
-        cash_account = self.cleaned_data['cash_account']
+        account_model = self.cleaned_data['account_model']
         routing_number = self.cleaned_data['routing_number']
         account_number = self.cleaned_data['account_number']
 
-        if not cash_account:
+        if not account_model:
             raise ValidationError('Must select a bank account.')
 
         # catching unique database constraint...
         if BankAccountModel.objects.filter(
-                cash_account=cash_account,
+                account_model=account_model,
                 routing_number__exact=routing_number,
                 account_number__exact=account_number
         ).exists():
@@ -47,7 +51,7 @@ class BankAccountCreateForm(ModelForm):
             'routing_number',
             'aba_number',
             'swift_number',
-            'cash_account',
+            'account_model',
             'active'
         ]
         widgets = {
@@ -74,7 +78,7 @@ class BankAccountCreateForm(ModelForm):
             'account_type': Select(attrs={
                 'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
             }),
-            'cash_account': Select(attrs={
+            'account_model': Select(attrs={
                 'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
             })
         }
@@ -82,7 +86,7 @@ class BankAccountCreateForm(ModelForm):
             'name': _('Account Name'),
             'account_number': _('Account Number'),
             'account_type': _('Account Type'),
-            'cash_account': _('Cash Account'),
+            'account_model': _('CoA Account'),
             'aba_number': _('ABA Number'),
             'routing_number': _('Routing Number'),
             'active': _('Make Active'),
@@ -95,7 +99,7 @@ class BankAccountUpdateForm(BankAccountCreateForm):
         fields = [
             'name',
             'account_type',
-            'cash_account',
+            'account_model',
             'active'
         ]
         widgets = {
@@ -106,13 +110,13 @@ class BankAccountUpdateForm(BankAccountCreateForm):
             'account_type': Select(attrs={
                 'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
             }),
-            'cash_account': Select(attrs={
+            'account_model': Select(attrs={
                 'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
             })
         }
 
     def clean(self):
-        cash_account = self.cleaned_data['cash_account']
+        cash_account = self.cleaned_data['account_model']
 
         if not cash_account:
             raise ValidationError('Must select a bank account.')

django_ledger/forms/data_import.py

@@ -1,16 +1,29 @@
 from django import forms
-from django.forms import (ModelForm, BaseModelFormSet, modelformset_factory, Select, NumberInput, HiddenInput,
-                          TextInput,
-                          ValidationError)
+from django.forms import (
+    ModelForm, BaseModelFormSet, modelformset_factory,
+    Select, NumberInput, HiddenInput,
+    TextInput, ValidationError
+)
 from django.utils.translation import gettext_lazy as _
 
-from django_ledger.models import StagedTransactionModel, AccountModel, EntityUnitModel, ImportJobModel
+from django_ledger.models import (
+    StagedTransactionModel,
+    ImportJobModel,
+    EntityModel
+)
 from django_ledger.settings import DJANGO_LEDGER_FORM_INPUT_CLASSES
 
 
 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()
+
     ofx_file = forms.FileField(
         label='Select File...',
+        required=True,
         widget=forms.FileInput(
             attrs={
                 'class': 'file-input',
@@ -21,13 +34,21 @@ class ImportJobModelCreateForm(ModelForm):
     class Meta:
         model = ImportJobModel
         fields = [
-            'description'
+            'bank_account_model',
+            'description',
         ]
         widgets = {
             'description': TextInput(attrs={
                 'class': DJANGO_LEDGER_FORM_INPUT_CLASSES + ' is-large',
                 'placeholder': _('What\'s this import about?...')
-            })
+            }),
+            'bank_account_model': Select(
+                attrs={
+                    'class': DJANGO_LEDGER_FORM_INPUT_CLASSES,
+                }),
+        }
+        help_texts = {
+            'bank_account_model': _('Select the bank account to import transactions from.'),
         }
 
 
@@ -48,11 +69,20 @@ class StagedTransactionModelForm(ModelForm):
     tx_import = forms.BooleanField(initial=False, required=False)
     tx_split = forms.BooleanField(initial=False, required=False)
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, base_formset_instance, *args, **kwargs):
         super().__init__(*args, **kwargs)
+        self.BASE_FORMSET_INSTANCE = base_formset_instance
+
+        # for IDE typing hints...
         instance: StagedTransactionModel = getattr(self, 'instance', None)
-        if instance:
 
+        # avoids multiple DB queries rendering the formset...
+        self.fields['unit_model'].choices = self.BASE_FORMSET_INSTANCE.UNIT_MODEL_CHOICES
+
+        # avoids multiple DB queries rendering the formset...
+        self.fields['account_model'].choices = self.BASE_FORMSET_INSTANCE.ACCOUNT_MODEL_CHOICES
+
+        if instance:
             if not instance.is_children():
                 self.fields['amount_split'].widget = HiddenInput()
                 self.fields['amount_split'].disabled = True
@@ -100,7 +130,7 @@ class StagedTransactionModelForm(ModelForm):
             raise ValidationError(message=_('Cannot import and split at the same time'))
 
     class Meta:
-        model = StagedTransactionModel.objects.get_queryset().model
+        model = StagedTransactionModel
         fields = [
             'tx_import',
             'bundle_split',
@@ -123,32 +153,39 @@ class StagedTransactionModelForm(ModelForm):
 
 class BaseStagedTransactionModelFormSet(BaseModelFormSet):
 
-    def __init__(self, *args, entity_slug, user_model, exclude_account=None, **kwargs):
+    def __init__(self, *args,
+                 entity_model: EntityModel,
+                 import_job_model: ImportJobModel,
+                 **kwargs):
         super().__init__(*args, **kwargs)
-        self.ENTITY_SLUG = entity_slug
-        self.USER_MODEL = user_model
-        self.IMPORT_DISABLED = not exclude_account
-        self.CASH_ACCOUNT = exclude_account
-
-        account_model_qs = AccountModel.objects.for_entity(
-            user_model=self.USER_MODEL,
-            entity_model=self.ENTITY_SLUG
-        ).available().order_by('role', 'name')
-
-        unit_model_qs = EntityUnitModel.objects.for_entity(
-            user_model=self.USER_MODEL,
-            entity_slug=self.ENTITY_SLUG
-        )
 
-        if exclude_account:
-            account_model_qs = account_model_qs.exclude(uuid__exact=exclude_account.uuid)
+        # 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'))
 
-        for form in self.forms:
-            form.fields['account_model'].queryset = account_model_qs
-            form.fields['account_model'].widget.attrs['disabled'] = self.IMPORT_DISABLED
-            form.fields['unit_model'].queryset = unit_model_qs
+        self.ENTITY_MODEL = entity_model
+        self.IMPORT_JOB_MODEL: ImportJobModel = import_job_model
+        self.MAPPED_ACCOUNT_MODEL = self.IMPORT_JOB_MODEL.bank_account_model.account_model
 
-    # def get_queryset(self):
+        self.account_model_qs = entity_model.get_coa_accounts().available().exclude(
+            uuid__exact=self.MAPPED_ACCOUNT_MODEL.uuid
+        )
+        self.ACCOUNT_MODEL_CHOICES = [
+            (a.uuid, a) if i > 0 else (None, '----') for i, a in
+            enumerate(self.account_model_qs)
+        ]
+
+        self.unit_model_qs = entity_model.entityunitmodel_set.all()
+        self.UNIT_MODEL_CHOICES = [
+            (u.uuid, u) if i > 0 else (None, '----') for i, u in
+            enumerate(self.unit_model_qs)
+        ]
+        self.queryset = self.IMPORT_JOB_MODEL.stagedtransactionmodel_set.all().is_pending()
+
+    def get_form_kwargs(self, index):
+        return {
+            'base_formset_instance': self,
+        }
 
 
 StagedTransactionModelFormSet = modelformset_factory(
@@ -156,6 +193,6 @@ StagedTransactionModelFormSet = modelformset_factory(
     form=StagedTransactionModelForm,
     formset=BaseStagedTransactionModelFormSet,
     can_delete=True,
-    can_delete_extra=0,
     can_order=False,
-    extra=0)
+    extra=0
+)