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

django_ledger/context.py

@@ -0,0 +1,12 @@
+from django.conf import settings
+
+from django_ledger import __version__
+from django_ledger.settings import DJANGO_LEDGER_THEME
+
+
+def django_ledger_context(request):
+    return {
+        'DEBUG': settings.DEBUG,
+        'VERSION': __version__,
+        'DJANGO_LEDGER_THEME': DJANGO_LEDGER_THEME,
+    }

django_ledger/forms/account.py

@@ -5,10 +5,19 @@ Copyright© EDMA Group Inc licensed under the GPLv3 Agreement.
 Contributions to this module:
     * Miguel Sanda <msanda@arrobalytics.com>
 """
+
 from random import randint
 from typing import Optional
 
-from django.forms import TextInput, Select, ModelForm, ChoiceField, ValidationError, CheckboxInput, HiddenInput
+from django.forms import (
+    TextInput,
+    Select,
+    ModelForm,
+    ChoiceField,
+    ValidationError,
+    CheckboxInput,
+    HiddenInput,
+)
 from django.utils.translation import gettext_lazy as _
 from treebeard.forms import MoveNodeForm
 
@@ -62,25 +71,27 @@ class AccountModelCreateForm(ModelForm):
             'balance_type',
             'active',
             'active',
-            'coa_model'
+            'coa_model',
         ]
         widgets = {
-            'code': TextInput(attrs={
-                'class': DJANGO_LEDGER_FORM_INPUT_CLASSES,
-                'placeholder': _('Alpha Numeric (auto generated if not provided)...')
-            }),
-            'name': TextInput(attrs={
-                'class': DJANGO_LEDGER_FORM_INPUT_CLASSES,
-                'placeholder': _('Account Name...')
-            }),
-            'role': Select(attrs={
-                'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
-            }),
+            'code': TextInput(
+                attrs={
+                    'class': DJANGO_LEDGER_FORM_INPUT_CLASSES,
+                    'placeholder': _(
+                        'Alpha Numeric (auto generated if not provided)...'
+                    ),
+                }
+            ),
+            'name': TextInput(
+                attrs={
+                    'class': DJANGO_LEDGER_FORM_INPUT_CLASSES,
+                    'placeholder': _('Account Name...'),
+                }
+            ),
+            'role': Select(attrs={'class': DJANGO_LEDGER_FORM_INPUT_CLASSES}),
             'role_default': CheckboxInput(),
-            'balance_type': Select(attrs={
-                'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
-            }),
-            'coa_model': HiddenInput()
+            'balance_type': Select(attrs={'class': DJANGO_LEDGER_FORM_INPUT_CLASSES}),
+            'coa_model': HiddenInput(),
         }
 
 
@@ -88,7 +99,7 @@ class AccountModelUpdateForm(MoveNodeForm):
     """
     AccountModelUpdateForm
 
-    A form for updating account model, inheriting from MoveNodeForm.
+    A form for updating the account model, inheriting from MoveNodeForm.
 
     Attributes
     ----------
@@ -98,36 +109,32 @@ class AccountModelUpdateForm(MoveNodeForm):
         An optional choice field for selecting the relative node.
     """
 
-    _position = ChoiceField(required=True,
-                            label=_('Position'),
-                            widget=Select(attrs={
-                                'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
-                            }))
-    _ref_node_id = ChoiceField(required=False,
-                               label=_('Relative to'),
-                               widget=Select(attrs={
-                                   'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
-                               }))
-
+    _position = ChoiceField(
+        required=True,
+        label=_('Position'),
+        widget=Select(attrs={'class': DJANGO_LEDGER_FORM_INPUT_CLASSES}),
+    )
+    _ref_node_id = ChoiceField(
+        required=False,
+        label=_('Relative to'),
+        widget=Select(attrs={'class': DJANGO_LEDGER_FORM_INPUT_CLASSES}),
+    )
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields['role'].disabled = True
         self.fields['coa_model'].disabled = True
 
-
     @classmethod
     def mk_dropdown_tree(cls, model, for_node: Optional[AccountModel] = None):
-        """ Creates a tree-like list of choices """
+        """Creates a tree-like list of choices"""
 
         if not for_node:
             raise ValidationError(message='Must provide for_node argument.')
 
         qs = for_node.get_account_move_choice_queryset()
 
-        return [
-            (i.uuid, f'{"-" * (i.depth - 1)} {i}') for i in qs
-        ]
+        return [(i.uuid, f'{"-" * (i.depth - 1)} {i}') for i in qs]
 
     def clean_role(self):
         return self.instance.role
@@ -147,17 +154,9 @@ class AccountModelUpdateForm(MoveNodeForm):
         widgets = {
             'role': HiddenInput(),
             'coa_model': HiddenInput(),
-            'parent': Select(attrs={
-                'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
-            }),
-            'balance_type': Select(attrs={
-                'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
-            }),
-            'code': TextInput(attrs={
-                'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
-            }),
-            'name': TextInput(attrs={
-                'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
-            }),
+            'parent': Select(attrs={'class': DJANGO_LEDGER_FORM_INPUT_CLASSES}),
+            'balance_type': Select(attrs={'class': DJANGO_LEDGER_FORM_INPUT_CLASSES}),
+            'code': TextInput(attrs={'class': DJANGO_LEDGER_FORM_INPUT_CLASSES}),
+            'name': TextInput(attrs={'class': DJANGO_LEDGER_FORM_INPUT_CLASSES}),
             'role_default': CheckboxInput(),
         }

django_ledger/forms/bill.py

@@ -214,10 +214,6 @@ class BillModelConfigureForm(BaseBillModelUpdateForm):
 
 class BillItemTransactionForm(ModelForm):
 
-    # def __init__(self, entity_unit_qs, *args, **kwargs):
-    #     super().__init__(self, *args, **kwargs)
-    #     self.fields['entity_unit'].queryset = entity_unit_qs
-
     def clean(self):
         cleaned_data = super(BillItemTransactionForm, self).clean()
         itemtxs_model: ItemTransactionModel = self.instance

django_ledger/forms/closing_entry.py

@@ -1,15 +1,25 @@
-from django.forms import DateInput, ValidationError, ModelForm, Textarea
+from django.forms import DateInput, ValidationError, ModelForm, Textarea, HiddenInput
 from django.utils.translation import gettext_lazy as _
 
 from django_ledger.io.io_core import get_localdate
 from django_ledger.models.closing_entry import ClosingEntryModel
+from django_ledger.models.entity import EntityModel
 from django_ledger.settings import DJANGO_LEDGER_FORM_INPUT_CLASSES
 
 
 class ClosingEntryCreateForm(ModelForm):
 
+    def __init__(self, entity_model: EntityModel, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.ENTITY_MODEL: EntityModel = entity_model
+        self.fields['entity_model'].disabled = True
+
+    def clean_entity_model(self):
+        return self.ENTITY_MODEL
+
     def clean_closing_date(self):
         closing_date = self.cleaned_data['closing_date']
+
         if closing_date > get_localdate():
             raise ValidationError(
                 message=_('Cannot create a closing entry with a future date.'), code='invalid_date'
@@ -19,10 +29,12 @@ class ClosingEntryCreateForm(ModelForm):
     class Meta:
         model = ClosingEntryModel
         fields = [
+            'entity_model',
             'closing_date'
         ]
 
         widgets = {
+            'entity_model': HiddenInput(),
             'closing_date': DateInput(attrs={
                 'class': DJANGO_LEDGER_FORM_INPUT_CLASSES + ' is-large',
                 'placeholder': _('Closing Date (YYYY-MM-DD)...'),

django_ledger/forms/data_import.py

@@ -1,34 +1,37 @@
 from django import forms
 from django.forms import (
-    ModelForm, BaseModelFormSet, modelformset_factory,
-    Select, NumberInput, HiddenInput,
-    TextInput, ValidationError
+    ModelForm,
+    BaseModelFormSet,
+    modelformset_factory,
+    Select,
+    NumberInput,
+    HiddenInput,
+    TextInput,
+    ValidationError,
 )
 from django.utils.translation import gettext_lazy as _
 
+from django_ledger.io import GROUP_EXPENSES, GROUP_INCOME
 from django_ledger.models import (
     StagedTransactionModel,
     ImportJobModel,
-    EntityModel
+    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()
+        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',
-                'accept': '.ofx,.qfx'
-            })
+        widget=forms.FileInput(attrs={'class': 'file-input', 'accept': '.ofx,.qfx'}),
     )
 
     class Meta:
@@ -38,30 +41,31 @@ class ImportJobModelCreateForm(ModelForm):
             'description',
         ]
         widgets = {
-            'description': TextInput(attrs={
-                'class': DJANGO_LEDGER_FORM_INPUT_CLASSES + ' is-large',
-                'placeholder': _('What\'s this import about?...')
-            }),
+            'description': TextInput(
+                attrs={
+                    'class': DJANGO_LEDGER_FORM_INPUT_CLASSES + ' is-large',
+                    'placeholder': _('Name this import...'),
+                }
+            ),
             'bank_account_model': Select(
                 attrs={
                     'class': DJANGO_LEDGER_FORM_INPUT_CLASSES,
-                }),
+                }
+            ),
         }
         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'
-        ]
+        fields = ['description']
         widgets = {
-            'description': TextInput(attrs={
-                'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
-            })
+            'description': TextInput(attrs={'class': DJANGO_LEDGER_FORM_INPUT_CLASSES})
         }
 
 
@@ -71,37 +75,90 @@ class StagedTransactionModelForm(ModelForm):
 
     def __init__(self, base_formset_instance, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.BASE_FORMSET_INSTANCE = 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
 
-        # for IDE typing hints...
-        instance: StagedTransactionModel = getattr(self, 'instance', None)
+        self.CUSTOMER_CHOICES = self.BASE_FORMSET_INSTANCE.CUSTOMER_CHOICES
+        self.CUSTOMER_MAP = self.BASE_FORMSET_INSTANCE.CUSTOMER_MAP
 
-        # avoids multiple DB queries rendering the formset...
-        self.fields['unit_model'].choices = self.BASE_FORMSET_INSTANCE.UNIT_MODEL_CHOICES
+        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
+
+        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
 
         # avoids multiple DB queries rendering the formset...
-        self.fields['account_model'].choices = self.BASE_FORMSET_INSTANCE.ACCOUNT_MODEL_CHOICES
+        self.fields[
+            'unit_model'
+        ].choices = self.BASE_FORMSET_INSTANCE.UNIT_MODEL_CHOICES
 
-        if instance:
-            if not instance.is_children():
+        if staged_tx_model:
+            if not staged_tx_model.is_children():
                 self.fields['amount_split'].widget = HiddenInput()
                 self.fields['amount_split'].disabled = True
             else:
                 self.fields['bundle_split'].widget = HiddenInput()
                 self.fields['bundle_split'].disabled = True
 
-            if not instance.can_have_account():
+            if staged_tx_model.has_children():
+                self.fields['receipt_type'].widget = HiddenInput()
+                self.fields['receipt_type'].disabled = True
+
+            if not staged_tx_model.can_have_account():
                 self.fields['account_model'].widget = HiddenInput()
                 self.fields['account_model'].disabled = True
 
-            if not instance.can_have_unit():
+            if not staged_tx_model.can_have_unit():
                 self.fields['unit_model'].widget = HiddenInput()
                 self.fields['unit_model'].disabled = True
 
-            if not instance.can_import():
+            # 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_migrate():
                 self.fields['tx_import'].widget = HiddenInput()
                 self.fields['tx_import'].disabled = True
-            if not instance.can_split():
+
+            if not staged_tx_model.can_split():
                 self.fields['tx_split'].widget = HiddenInput()
                 self.fields['tx_split'].disabled = True
 
@@ -114,8 +171,9 @@ class StagedTransactionModelForm(ModelForm):
     def clean_unit_model(self):
         staged_txs_model: StagedTransactionModel = self.instance
         if not staged_txs_model.can_have_unit():
-            if staged_txs_model.parent_id:
+            if staged_txs_model.is_children():
                 return staged_txs_model.parent.unit_model
+            return None
         return self.cleaned_data['unit_model']
 
     def clean_tx_import(self):
@@ -125,10 +183,23 @@ class StagedTransactionModelForm(ModelForm):
         return self.cleaned_data['tx_import']
 
     def clean(self):
-        # cannot import and split at the same time
         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 = [
@@ -136,51 +207,99 @@ class StagedTransactionModelForm(ModelForm):
             'bundle_split',
             'amount_split',
             'account_model',
-            'unit_model'
+            'unit_model',
+            'receipt_type',
+            'vendor_model',
+            'customer_model',
         ]
         widgets = {
-            'account_model': Select(attrs={
-                'class': DJANGO_LEDGER_FORM_INPUT_CLASSES + ' is-small',
-            }),
-            'unit_model': Select(attrs={
-                'class': DJANGO_LEDGER_FORM_INPUT_CLASSES + ' is-small',
-            }),
-            'amount_split': NumberInput(attrs={
-                'class': DJANGO_LEDGER_FORM_INPUT_CLASSES + ' is-small'
-            })
+            'account_model': Select(
+                attrs={
+                    'class': DJANGO_LEDGER_FORM_INPUT_CLASSES + ' is-small',
+                }
+            ),
+            'unit_model': 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'}
+            ),
         }
 
 
 class BaseStagedTransactionModelFormSet(BaseModelFormSet):
-
-    def __init__(self, *args,
-                 entity_model: EntityModel,
-                 import_job_model: ImportJobModel,
-                 **kwargs):
+    def __init__(
+        self,
+        *args,
+        entity_model: EntityModel,
+        import_job_model: ImportJobModel,
+        **kwargs,
+    ):
         super().__init__(*args, **kwargs)
 
         # 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.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
+        self.queryset = (
+            self.IMPORT_JOB_MODEL.stagedtransactionmodel_set.all().is_pending()
+        )
+
+        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)
         )
-        self.ACCOUNT_MODEL_CHOICES = [
-            (a.uuid, a) if i > 0 else (None, '----') for i, a in
-            enumerate(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 = [
-            (u.uuid, u) if i > 0 else (None, '----') for i, u in
-            enumerate(self.unit_model_qs)
+            (u.uuid, u) if i > 0 else (None, '----')
+            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.queryset = self.IMPORT_JOB_MODEL.stagedtransactionmodel_set.all().is_pending()
+        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)
 
     def get_form_kwargs(self, index):
         return {
@@ -194,5 +313,5 @@ StagedTransactionModelFormSet = modelformset_factory(
     formset=BaseStagedTransactionModelFormSet,
     can_delete=True,
     can_order=False,
-    extra=0
+    extra=0,
 )

django_ledger/forms/estimate.py

@@ -25,8 +25,7 @@ class EstimateModelCreateForm(forms.ModelForm):
 
     def get_customer_queryset(self):
         return CustomerModel.objects.for_entity(
-            entity_slug=self.ENTITY_SLUG,
-            user_model=self.USER_MODEL
+            entity_model=self.ENTITY_SLUG,
         ).active()
 
     class Meta:
@@ -116,13 +115,11 @@ class BaseEstimateItemModelFormset(BaseModelFormSet):
         self.ENTITY_SLUG = entity_slug
 
         items_qs = ItemModel.objects.for_estimate(
-            entity_slug=self.ENTITY_SLUG,
-            user_model=self.USER_MODEL
+            entity_model=self.ENTITY_SLUG
         )
 
         unit_qs = EntityUnitModel.objects.for_entity(
-            entity_slug=self.ENTITY_SLUG,
-            user_model=self.USER_MODEL
+            entity_model=self.ENTITY_SLUG
         )
 
         for form in self.forms:

django_ledger/forms/invoice.py

@@ -29,8 +29,7 @@ class InvoiceModelCreateForEstimateForm(ModelForm):
     def get_customer_queryset(self):
         if 'customer' in self.fields:
             customer_qs = CustomerModel.objects.for_entity(
-                user_model=self.USER_MODEL,
-                entity_slug=self.ENTITY_SLUG
+                entity_model=self.ENTITY_SLUG
             ).active()
             self.fields['customer'].queryset = customer_qs
 
@@ -43,7 +42,6 @@ class InvoiceModelCreateForEstimateForm(ModelForm):
         ]):
 
             account_qs = AccountModel.objects.for_entity(
-                user_model=self.USER_MODEL,
                 entity_model=self.ENTITY_SLUG
             ).for_invoice()
 
@@ -237,8 +235,7 @@ class BaseInvoiceItemTransactionFormset(BaseModelFormSet):
         self.ENTITY_SLUG = entity_slug
 
         items_qs = ItemModel.objects.for_invoice(
-            entity_slug=self.ENTITY_SLUG,
-            user_model=self.USER_MODEL
+            entity_model=self.ENTITY_SLUG
         )
 
         for form in self.forms:
@@ -252,8 +249,7 @@ class BaseInvoiceItemTransactionFormset(BaseModelFormSet):
     def get_queryset(self):
         if not self.queryset:
             self.queryset = ItemTransactionModel.objects.for_invoice(
-                entity_slug=self.ENTITY_SLUG,
-                user_model=self.USER_MODEL,
+                entity_model=self.ENTITY_SLUG,
                 invoice_pk=self.INVOICE_MODEL.uuid
             )
         else: