django-ledger 0.7.11__py3-none-any.whl → 0.8.1__py3-none-any.whl

django_ledger/views/data_import.py

@@ -5,17 +5,25 @@ Copyright© EDMA Group Inc licensed under the GPLv3 Agreement.
 Contributions to this module:
     * Miguel Sanda <msanda@arrobalytics.com>
 """
+
 from datetime import datetime, time
+from typing import Optional
 
 from django.contrib import messages
+from django.shortcuts import get_object_or_404, redirect
 from django.urls import reverse
 from django.utils.timezone import make_aware
 from django.utils.translation import gettext_lazy as _
-from django.views.generic import ListView, FormView, DetailView, UpdateView, DeleteView
-
-from django_ledger.forms.data_import import ImportJobModelCreateForm, ImportJobModelUpdateForm
-from django_ledger.forms.data_import import StagedTransactionModelFormSet
+from django.views import View
+from django.views.generic import DeleteView, DetailView, FormView, ListView, UpdateView
+
+from django_ledger.forms.data_import import (
+    ImportJobModelCreateForm,
+    ImportJobModelUpdateForm,
+    StagedTransactionModelFormSet,
+)
 from django_ledger.io.ofx import OFXFileManager
+from django_ledger.models import StagedTransactionModelValidationError
 from django_ledger.models.data_import import ImportJobModel, StagedTransactionModel
 from django_ledger.views.mixins import DjangoLedgerSecurityMixIn
 
@@ -25,36 +33,37 @@ class ImportJobModelViewBaseView(DjangoLedgerSecurityMixIn):
 
     def get_queryset(self):
         if self.queryset is None:
-            self.queryset = ImportJobModel.objects.for_entity(
-                entity_slug=self.kwargs['entity_slug'],
-                user_model=self.request.user
-            ).order_by('-created').select_related('bank_account_model',
-                                                  'bank_account_model__entity_model',
-                                                  'bank_account_model__account_model',
-                                                  'bank_account_model__account_model__coa_model')
+            self.queryset = (
+                ImportJobModel.objects.for_entity(
+                    entity_model=self.AUTHORIZED_ENTITY_MODEL,
+                )
+                .order_by('-created')
+                .select_related(
+                    'bank_account_model',
+                    'bank_account_model__entity_model',
+                    'bank_account_model__account_model',
+                    'bank_account_model__account_model__coa_model',
+                )
+            )
         return self.queryset
 
 
 class ImportJobModelCreateView(ImportJobModelViewBaseView, FormView):
     template_name = 'django_ledger/data_import/import_job_create.html'
     PAGE_TITLE = _('Create Import Job')
-    extra_context = {
-        'page_title': PAGE_TITLE,
-        'header_title': PAGE_TITLE
-    }
+    extra_context = {'page_title': PAGE_TITLE, 'header_title': PAGE_TITLE}
     form_class = ImportJobModelCreateForm
 
     def get_form(self, form_class=None, **kwargs):
         return self.form_class(
-            entity_model=self.get_authorized_entity_instance(),
-            **self.get_form_kwargs()
+            entity_model=self.get_authorized_entity_instance(), **self.get_form_kwargs()
         )
 
     def get_success_url(self):
-        return reverse('django_ledger:data-import-jobs-list',
-                       kwargs={
-                           'entity_slug': self.kwargs['entity_slug']
-                       })
+        return reverse(
+            'django_ledger:data-import-jobs-list',
+            kwargs={'entity_slug': self.kwargs['entity_slug']},
+        )
 
     def form_valid(self, form):
         ofx_manager = OFXFileManager(ofx_file_or_path=form.files['ofx_file'])
@@ -65,13 +74,16 @@ class ImportJobModelCreateView(ImportJobModelViewBaseView, FormView):
         txs_to_stage = ofx_manager.get_account_txs()
         staged_txs_model_list = [
             StagedTransactionModel(
-                date_posted=make_aware(value=datetime.combine(date=tx.dtposted.date(), time=time.min)),
+                date_posted=make_aware(
+                    value=datetime.combine(date=tx.dtposted.date(), time=time.min)
+                ),
                 fit_id=tx.fitid,
                 amount=tx.trnamt,
                 import_job=import_job,
                 name=tx.name,
-                memo=tx.memo
-            ) for tx in txs_to_stage
+                memo=tx.memo,
+            )
+            for tx in txs_to_stage
         ]
         for tx in staged_txs_model_list:
             tx.clean()
@@ -82,10 +94,7 @@ class ImportJobModelCreateView(ImportJobModelViewBaseView, FormView):
 
 class ImportJobModelListView(ImportJobModelViewBaseView, ListView):
     PAGE_TITLE = _('Data Import Jobs')
-    extra_context = {
-        'page_title': PAGE_TITLE,
-        'header_title': PAGE_TITLE
-    }
+    extra_context = {'page_title': PAGE_TITLE, 'header_title': PAGE_TITLE}
     context_object_name = 'import_jobs'
     template_name = 'django_ledger/data_import/data_import_job_list.html'
 
@@ -98,9 +107,10 @@ class ImportJobModelUpdateView(ImportJobModelViewBaseView, UpdateView):
 
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
+        import_job_model: ImportJobModel = self.object
         ctx['page_title'] = 'Import Job Update'
         ctx['header_title'] = 'Import Job Update'
-        ctx['header_subtitle'] = self.object.description
+        ctx['header_subtitle'] = import_job_model.description
         ctx['header_subtitle_icon'] = 'solar:import-bold'
         return ctx
 
@@ -108,9 +118,7 @@ class ImportJobModelUpdateView(ImportJobModelViewBaseView, UpdateView):
         entity_model = self.get_authorized_entity_instance()
         return reverse(
             viewname='django_ledger:data-import-jobs-list',
-            kwargs={
-                'entity_slug': entity_model.slug
-            }
+            kwargs={'entity_slug': entity_model.slug},
         )
 
     def form_valid(self, form):
@@ -118,7 +126,7 @@ class ImportJobModelUpdateView(ImportJobModelViewBaseView, UpdateView):
             self.request,
             level=messages.SUCCESS,
             message=_(f'Successfully updated Import Job {self.object.description}'),
-            extra_tags='is-success'
+            extra_tags='is-success',
         )
         return super().form_valid(form=form)
 
@@ -139,9 +147,7 @@ class ImportJobModelDeleteView(ImportJobModelViewBaseView, DeleteView):
     def get_success_url(self):
         return reverse(
             viewname='django_ledger:data-import-jobs-list',
-            kwargs={
-                'entity_slug': self.AUTHORIZED_ENTITY_MODEL.slug
-            }
+            kwargs={'entity_slug': self.AUTHORIZED_ENTITY_MODEL.slug},
         )
 
 
@@ -160,10 +166,10 @@ class DataImportJobDetailView(ImportJobModelViewBaseView, DetailView):
             'import_job_model': self.get_object(),
         }
 
-    def get_context_data(self, **kwargs):
+    def get_context_data(
+        self, txs_formset: Optional[StagedTransactionModelFormSet] = None, **kwargs
+    ):
         context = super().get_context_data(**kwargs)
-
-        # job_model: ImportJobModel = getattr(self, 'object', self.get_object())
         job_model: ImportJobModel = self.object
 
         context['page_title'] = job_model.description
@@ -171,9 +177,13 @@ class DataImportJobDetailView(ImportJobModelViewBaseView, DetailView):
         context['header_subtitle'] = job_model.description
         context['header_subtitle_icon'] = 'tabler:table-import'
 
-        staged_txs_formset = StagedTransactionModelFormSet(
-            entity_model=self.get_authorized_entity_instance(),
-            import_job_model=job_model
+        staged_txs_formset = (
+            StagedTransactionModelFormSet(
+                entity_model=self.get_authorized_entity_instance(),
+                import_job_model=job_model,
+            )
+            if not txs_formset
+            else txs_formset
         )
 
         context['staged_txs_formset'] = staged_txs_formset
@@ -182,35 +192,79 @@ class DataImportJobDetailView(ImportJobModelViewBaseView, DetailView):
 
     def post(self, request, **kwargs):
         self.object = self.get_object()
+        import_job_model: ImportJobModel = self.object
 
         txs_formset = StagedTransactionModelFormSet(
             entity_model=self.get_authorized_entity_instance(),
-            import_job_model=self.object,
-            data=request.POST
+            import_job_model=import_job_model,
+            data=request.POST,
         )
 
-        # if txs_formset.is_valid():
-        for tx_form in txs_formset:
-            if tx_form.has_changed():
-                # perform work only if form has changed...
-                if tx_form.is_valid():
-                    tx_form.save()
-                    # import entry was selected to be split....
-                    is_split = tx_form.cleaned_data['tx_split'] is True
-                    if is_split:
-                        tx_form.instance.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']
-                        tx_form.instance.migrate() if is_bundled else tx_form.instance.migrate(split_txs=True)
-
-        messages.add_message(request,
-                             messages.SUCCESS,
-                             'Successfully saved transactions.',
-                             extra_tags='is-success')
+        if txs_formset.has_changed():
+            if txs_formset.is_valid():
+                txs_formset.save()
+                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
+                        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']
+                            if staged_transaction_model.can_migrate_receipt():
+                                staged_transaction_model.migrate_receipt(
+                                    receipt_date=staged_transaction_model.date_posted
+                                )
+                            else:
+                                staged_transaction_model.migrate_transactions(
+                                    split_txs=not is_bundled
+                                )
+            else:
+                context = self.get_context_data(txs_formset=txs_formset, **kwargs)
+                return self.render_to_response(context)
+
+        messages.add_message(
+            request,
+            messages.SUCCESS,
+            'Successfully saved transactions.',
+            extra_tags='is-success',
+        )
 
         context = self.get_context_data(**kwargs)
         return self.render_to_response(context)
+
+
+class StagedTransactionUndoView(ImportJobModelViewBaseView, View):
+    http_method_names = ['post']
+
+    def post(self, request, entity_slug, job_pk, staged_tx_pk, *args, **kwargs):
+        import_job_model = get_object_or_404(self.get_queryset(), uuid__exact=job_pk)
+        staged_txs_qs = import_job_model.stagedtransactionmodel_set.all()
+        staged_tx = get_object_or_404(staged_txs_qs, uuid__exact=staged_tx_pk)
+        try:
+            staged_tx.undo_import()
+            messages.add_message(
+                request,
+                messages.SUCCESS,
+                _('Successfully undone import for transaction %(name)s.')
+                % {'name': staged_tx.name or staged_tx.fit_id},
+                extra_tags='is-success',
+            )
+        except StagedTransactionModelValidationError as e:
+            messages.add_message(
+                request,
+                messages.ERROR,
+                e.message,
+                extra_tags='is-danger',
+            )
+        return redirect(
+            reverse(
+                'django_ledger:data-import-job-txs',
+                kwargs={'entity_slug': entity_slug, 'job_pk': job_pk},
+            )
+        )

django_ledger/views/djl_api.py

@@ -73,8 +73,7 @@ class PayableNetAPIView(DjangoLedgerSecurityMixIn, EntityUnitMixIn, View):
     def get(self, request, *args, **kwargs):
         if request.user.is_authenticated:
             bill_qs = BillModel.objects.for_entity(
-                entity_slug=self.kwargs['entity_slug'],
-                user_model=request.user,
+                entity_model=self.AUTHORIZED_ENTITY_MODEL
             ).unpaid()
 
             # todo: implement this...
@@ -105,9 +104,8 @@ class ReceivableNetAPIView(DjangoLedgerSecurityMixIn, EntityUnitMixIn, View):
     def get(self, request, *args, **kwargs):
         if request.user.is_authenticated:
             invoice_qs = InvoiceModel.objects.for_entity(
-                entity_slug=self.kwargs['entity_slug'],
-                user_model=request.user,
-            ).unpaid()
+                entity_model=self.kwargs['entity_slug']
+            ).for_user(self.request.user).unpaid()
 
             # todo: implement this...
             # unit_slug = self.get_unit_slug()

django_ledger/views/entity.py

@@ -146,13 +146,11 @@ class EntityDeleteView(DjangoLedgerSecurityMixIn, EntityModelModelViewQuerySetMi
         entity_model.save(update_fields=['default_coa'])
 
         ItemTransactionModel.objects.for_entity(
-            user_model=self.request.user,
-            entity_slug=self.kwargs['entity_slug']
+            entity_model=self.AUTHORIZED_ENTITY_MODEL
         ).delete()
 
         TransactionModel.objects.for_entity(
-            user_model=self.request.user,
-            entity_slug=self.kwargs['entity_slug']
+            entity_model=self.kwargs['entity_slug']
         ).delete()
 
         return super().form_valid(form=form)

django_ledger/views/estimate.py

@@ -6,7 +6,6 @@ Contributions to this module:
     * Miguel Sanda <msanda@arrobalytics.com>
 """
 
-
 from django.contrib import messages
 from django.core.exceptions import ValidationError, ImproperlyConfigured
 from django.http import HttpResponseRedirect, HttpResponseForbidden
@@ -102,20 +101,17 @@ class EstimateModelDetailView(DjangoLedgerSecurityMixIn, EstimateModelModelViewQ
 
         # PO Model Queryset...
         po_qs = ce_model.purchaseordermodel_set.for_entity(
-            user_model=self.request.user,
-            entity_slug=self.kwargs['entity_slug']
+            entity_model=self.kwargs['entity_slug']
         ) if ce_model.is_approved() else ce_model.purchaseordermodel_set.none()
         context['estimate_po_model_queryset'] = po_qs
 
         invoice_qs = ce_model.invoicemodel_set.for_entity(
-            user_model=self.request.user,
-            entity_slug=self.kwargs['entity_slug']
+            entity_model=self.kwargs['entity_slug']
         ) if ce_model.is_approved() else ce_model.invoicemodel_set.none()
         context['estimate_invoice_model_queryset'] = invoice_qs
 
         bill_qs = ce_model.billmodel_set.for_entity(
-            user_model=self.request.user,
-            entity_slug=self.kwargs['entity_slug']
+            entity_model=self.kwargs['entity_slug']
         ) if ce_model.is_approved() else ce_model.billmodel_set.none()
         context['estimate_bill_model_queryset'] = bill_qs
 

django_ledger/views/inventory.py

@@ -51,7 +51,7 @@ class InventoryListView(DjangoLedgerSecurityMixIn, ListView):
     def get_queryset(self):
         if self.queryset is None:
             self.queryset = ItemTransactionModel.objects.inventory_pipeline_aggregate(
-                entity_slug=self.kwargs['entity_slug'],
+                entity_model=self.AUTHORIZED_ENTITY_MODEL
             )
         return super().get_queryset()
 
@@ -69,12 +69,10 @@ class InventoryRecountView(DjangoLedgerSecurityMixIn, DetailView):
         return super().get_queryset()
 
     def counted_inventory(self):
-        entity_slug = self.kwargs['entity_slug']
-        return ItemTransactionModel.objects.inventory_count(entity_slug=entity_slug)
+        return ItemTransactionModel.objects.inventory_count(entity_model=self.AUTHORIZED_ENTITY_MODEL)
 
     def recorded_inventory(self, queryset=None, as_values=True):
-        entity_model: EntityModel = self.get_object()
-        user_model = self.request.user
+        entity_model: EntityModel = self.AUTHORIZED_ENTITY_MODEL
         recorded_qs = entity_model.recorded_inventory(item_qs=queryset)
         return recorded_qs
 

django_ledger/views/invoice.py

@@ -33,8 +33,7 @@ class InvoiceModelModelViewQuerySetMixIn:
     def get_queryset(self):
         if self.queryset is None:
             self.queryset = InvoiceModel.objects.for_entity(
-                entity_slug=self.kwargs['entity_slug'],
-                user_model=self.request.user
+                entity_model=self.kwargs['entity_slug']
             ).select_related('customer', 'ledger').order_by('-created')
         return super().get_queryset()
 
@@ -97,8 +96,7 @@ class InvoiceModelCreateView(DjangoLedgerSecurityMixIn, InvoiceModelModelViewQue
                                                      'ce_pk': self.kwargs['ce_pk']
                                                  })
             estimate_qs = EstimateModel.objects.for_entity(
-                entity_slug=self.kwargs['entity_slug'],
-                user_model=self.request.user
+                entity_model=self.AUTHORIZED_ENTITY_MODEL,
             ).select_related('customer')
             estimate_model = get_object_or_404(estimate_qs, uuid__exact=self.kwargs['ce_pk'])
             context['estimate_model'] = estimate_model
@@ -138,8 +136,8 @@ class InvoiceModelCreateView(DjangoLedgerSecurityMixIn, InvoiceModelModelViewQue
         if self.for_estimate:
             ce_pk = self.kwargs['ce_pk']
             estimate_model_qs = EstimateModel.objects.for_entity(
-                entity_slug=self.kwargs['entity_slug'],
-                user_model=self.request.user)
+                entity_model=self.AUTHORIZED_ENTITY_MODEL,
+            )
 
             estimate_model = get_object_or_404(estimate_model_qs, uuid__exact=ce_pk)
             invoice_model.bind_estimate(estimate_model=estimate_model, commit=False)

django_ledger/views/item.py

@@ -21,21 +21,21 @@ from django_ledger.forms.item import (
     ExpenseItemCreateForm, ExpenseItemUpdateForm, InventoryItemCreateForm, InventoryItemUpdateForm,
     ServiceCreateForm, ServiceUpdateForm
 )
-from django_ledger.models import ItemModel, UnitOfMeasureModel, EntityModel
+from django_ledger.models import ItemModel, UnitOfMeasureModel, EntityModel, UnitOfMeasureModelQuerySet
 from django_ledger.views.mixins import DjangoLedgerSecurityMixIn
 
 
 # todo: Create delete views...
 
-# UNIT OF MEASURE VIEWS....
+# UNIT OF MEASURE VIEWS...
 class UnitOfMeasureModelModelBaseView(DjangoLedgerSecurityMixIn):
-    queryset = None
+    queryset: UnitOfMeasureModelQuerySet = None
 
     def get_queryset(self):
         if self.queryset is None:
             entity_model: EntityModel = self.get_authorized_entity_instance()
             self.queryset = entity_model.unitofmeasuremodel_set.all()
-        return super().get_queryset()
+        return self.queryset
 
 
 class UnitOfMeasureModelListView(UnitOfMeasureModelModelBaseView, ListView):
@@ -75,9 +75,7 @@ class UnitOfMeasureModelCreateView(UnitOfMeasureModelModelBaseView, CreateView):
         instance: UnitOfMeasureModel = form.save(commit=False)
         entity_slug = self.kwargs['entity_slug']
         try:
-            entity_model: EntityModel = EntityModel.objects.for_user(
-                user_model=self.request.user
-            ).get(slug__iexact=entity_slug)
+            entity_model: EntityModel = self.AUTHORIZED_ENTITY_MODEL
             instance.entity = entity_model
         except ObjectDoesNotExist:
             add_message(self.request,
@@ -227,8 +225,7 @@ class ProductUpdateView(ProductItemModelModelBaseView, UpdateView):
 
     def get_queryset(self):
         return ItemModel.objects.for_entity(
-            entity_slug=self.AUTHORIZED_ENTITY_MODEL,
-            user_model=self.request.user
+            entity_model=self.AUTHORIZED_ENTITY_MODEL
         ).products()
 
     def get_form(self, form_class=None):
@@ -348,8 +345,7 @@ class ServiceUpdateView(ServiceItemModelModelBaseView, UpdateView):
 
     def get_queryset(self):
         return ItemModel.objects.for_entity(
-            entity_slug=self.kwargs['entity_slug'],
-            user_model=self.request.user
+            entity_model=self.kwargs['entity_slug']
         ).services()
 
     def get_form(self, form_class=None):

django_ledger/views/journal_entry.py

@@ -259,8 +259,7 @@ class BaseJournalEntryActionView(
 
     def get_queryset(self):
         return JournalEntryModel.objects.for_entity(
-            entity_slug=self.get_authorized_entity_instance(),
-            user_model=self.request.user
+            entity_model=self.AUTHORIZED_ENTITY_MODEL
         ).for_ledger(ledger_pk=self.kwargs['ledger_pk'])
 
     def get_redirect_url(self, *args, **kwargs):