django-ledger 0.8.0__py3-none-any.whl → 0.8.2__py3-none-any.whl

django_ledger/urls/__init__.py

@@ -35,6 +35,7 @@ urlpatterns = [
     path('feedback/', include('django_ledger.urls.feedback')),
     path('inventory/', include('django_ledger.urls.inventory')),
     path('home/', include('django_ledger.urls.home')),
+    path('receipt/', include('django_ledger.urls.receipt')),
     path('api/', include('django_ledger.urls.djl_api')),
     path('', views.RootUrlView.as_view(), name='root'),
 ]

django_ledger/urls/customer.py

@@ -7,4 +7,7 @@ urlpatterns = [
     path('<slug:entity_slug>/update/<uuid:customer_pk>/',
          views.CustomerModelUpdateView.as_view(),
          name='customer-update'),
+    path('<slug:entity_slug>/detail/<uuid:customer_pk>/',
+         views.CustomerModelDetailView.as_view(),
+         name='customer-detail'),
 ]

django_ledger/urls/data_import.py

@@ -18,4 +18,7 @@ urlpatterns = [
     path('<slug:entity_slug>/jobs/<uuid:job_pk>/txs/',
          views.DataImportJobDetailView.as_view(),
          name='data-import-job-txs'),
+    path('<slug:entity_slug>/jobs/<uuid:job_pk>/txs/<uuid:staged_tx_pk>/undo/',
+         views.StagedTransactionUndoView.as_view(),
+         name='data-import-staged-tx-undo'),
 ]

django_ledger/urls/receipt.py

@@ -0,0 +1,102 @@
+"""
+Django Ledger created by Miguel Sanda <msanda@arrobalytics.com>.
+Copyright© EDMA Group Inc licensed under the GPLv3 Agreement.
+
+Contributions to this module:
+    * Miguel Sanda <msanda@arrobalytics.com>
+"""
+
+from django.urls import path
+
+from django_ledger import views
+
+urlpatterns = [
+    path(
+        '<slug:entity_slug>/latest/',
+        views.ReceiptModelListView.as_view(),
+        name='receipt-list',
+    ),
+    path(
+        '<slug:entity_slug>/year/<int:year>/',
+        views.ReceiptModelYearListView.as_view(),
+        name='receipt-list-year',
+    ),
+    path(
+        '<slug:entity_slug>/quarter/<int:year>/q<int:quarter>/',
+        views.ReceiptModelQuarterListView.as_view(),
+        name='receipt-list-quarter',
+    ),
+    path(
+        '<slug:entity_slug>/month/<int:year>/<int:month>/',
+        views.ReceiptModelMonthListView.as_view(),
+        name='receipt-list-month',
+    ),
+    path(
+        '<slug:entity_slug>/detail/<uuid:receipt_pk>/',
+        views.ReceiptModelDetailView.as_view(),
+        name='receipt-detail',
+    ),
+    path(
+        '<slug:entity_slug>/delete/<uuid:receipt_pk>/',
+        views.ReceiptModelDeleteView.as_view(),
+        name='receipt-delete',
+    ),
+    # Filtered lists
+    path(
+        '<slug:entity_slug>/type/<str:receipt_type>/',
+        views.ReceiptModelListView.as_view(),
+        name='receipt-list-type',
+    ),
+    path(
+        '<slug:entity_slug>/vendor/<uuid:vendor_pk>/',
+        views.ReceiptModelListView.as_view(),
+        name='receipt-list-vendor',
+    ),
+    path(
+        '<slug:entity_slug>/customer/<uuid:customer_pk>/',
+        views.ReceiptModelListView.as_view(),
+        name='receipt-list-customer',
+    ),
+    # Reports: Vendor
+    path(
+        '<slug:entity_slug>/report/vendor/<uuid:vendor_pk>/latest/',
+        views.VendorReceiptReportListView.as_view(),
+        name='receipt-report-vendor',
+    ),
+    path(
+        '<slug:entity_slug>/report/vendor/<uuid:vendor_pk>/year/<int:year>/',
+        views.VendorReceiptReportYearListView.as_view(),
+        name='receipt-report-vendor-year',
+    ),
+    path(
+        '<slug:entity_slug>/report/vendor/<uuid:vendor_pk>/quarter/<int:year>/q<int:quarter>/',
+        views.VendorReceiptReportQuarterListView.as_view(),
+        name='receipt-report-vendor-quarter',
+    ),
+    path(
+        '<slug:entity_slug>/report/vendor/<uuid:vendor_pk>/month/<int:year>/<int:month>/',
+        views.VendorReceiptReportMonthListView.as_view(),
+        name='receipt-report-vendor-month',
+    ),
+    # Reports: Customer
+    path(
+        '<slug:entity_slug>/report/customer/<uuid:customer_pk>/latest/',
+        views.CustomerReceiptReportListView.as_view(),
+        name='receipt-report-customer',
+    ),
+    path(
+        '<slug:entity_slug>/report/customer/<uuid:customer_pk>/year/<int:year>/',
+        views.CustomerReceiptReportYearListView.as_view(),
+        name='receipt-report-customer-year',
+    ),
+    path(
+        '<slug:entity_slug>/report/customer/<uuid:customer_pk>/quarter/<int:year>/q<int:quarter>/',
+        views.CustomerReceiptReportQuarterListView.as_view(),
+        name='receipt-report-customer-quarter',
+    ),
+    path(
+        '<slug:entity_slug>/report/customer/<uuid:customer_pk>/month/<int:year>/<int:month>/',
+        views.CustomerReceiptReportMonthListView.as_view(),
+        name='receipt-report-customer-month',
+    ),
+]

django_ledger/urls/vendor.py

@@ -5,4 +5,5 @@ urlpatterns = [
     path('<slug:entity_slug>/list/', views.VendorModelListView.as_view(), name='vendor-list'),
     path('<slug:entity_slug>/create/', views.VendorModelCreateView.as_view(), name='vendor-create'),
     path('<slug:entity_slug>/update/<uuid:vendor_pk>/', views.VendorModelUpdateView.as_view(), name='vendor-update'),
+    path('<slug:entity_slug>/detail/<uuid:vendor_pk>/', views.VendorModelDetailView.as_view(), name='vendor-detail'),
 ]

django_ledger/views/__init__.py

@@ -28,3 +28,4 @@ from django_ledger.views.transactions import *
 from django_ledger.views.unit import *
 from django_ledger.views.vendor import *
 from django_ledger.views.closing_entry import *
+from django_ledger.views.receipt import *

django_ledger/views/customer.py

@@ -5,15 +5,24 @@ Copyright© EDMA Group Inc licensed under the GPLv3 Agreement.
 Contributions to this module:
     * Miguel Sanda <msanda@arrobalytics.com>
 """
+
 from typing import Optional
 
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
-from django.views.generic import ListView, CreateView, UpdateView, DeleteView
+from django.views.generic import (
+    CreateView,
+    DeleteView,
+    DetailView,
+    ListView,
+    UpdateView,
+)
 
 from django_ledger.forms.customer import CustomerModelForm
 from django_ledger.models.customer import CustomerModel, CustomerModelQueryset
 from django_ledger.models.entity import EntityModel
+from django_ledger.models.invoice import InvoiceModel
+from django_ledger.models.receipt import ReceiptModel
 from django_ledger.views.mixins import DjangoLedgerSecurityMixIn
 
 
@@ -34,7 +43,7 @@ class CustomerModelListView(CustomerModelModelViewQuerySetMixIn, ListView):
     extra_context = {
         'page_title': PAGE_TITLE,
         'header_title': PAGE_TITLE,
-        'header_subtitle_icon': 'dashicons:businesswoman'
+        'header_subtitle_icon': 'dashicons:businesswoman',
     }
     context_object_name = 'customers'
 
@@ -47,20 +56,20 @@ class CustomerModelCreateView(CustomerModelModelViewQuerySetMixIn, CreateView):
     extra_context = {
         'page_title': PAGE_TITLE,
         'header_title': PAGE_TITLE,
-        'header_subtitle_icon': 'dashicons:businesswoman'
+        'header_subtitle_icon': 'dashicons:businesswoman',
     }
 
     def get_success_url(self):
-        return reverse('django_ledger:customer-list',
-                       kwargs={
-                           'entity_slug': self.kwargs['entity_slug']
-                       })
+        return reverse(
+            'django_ledger:customer-list',
+            kwargs={'entity_slug': self.kwargs['entity_slug']},
+        )
 
     def form_valid(self, form):
         customer_model: CustomerModel = form.save(commit=False)
-        entity_model = EntityModel.objects.for_user(
-            user_model=self.request.user
-        ).get(slug__exact=self.kwargs['entity_slug'])
+        entity_model = EntityModel.objects.for_user(user_model=self.request.user).get(
+            slug__exact=self.kwargs['entity_slug']
+        )
         customer_model.entity_model = entity_model
         customer_model.save()
         return super().form_valid(form)
@@ -84,10 +93,10 @@ class CustomerModelUpdateView(CustomerModelModelViewQuerySetMixIn, UpdateView):
         return context
 
     def get_success_url(self):
-        return reverse('django_ledger:customer-list',
-                       kwargs={
-                           'entity_slug': self.kwargs['entity_slug']
-                       })
+        return reverse(
+            'django_ledger:customer-list',
+            kwargs={'entity_slug': self.kwargs['entity_slug']},
+        )
 
     def form_valid(self, form):
         form.save()
@@ -96,3 +105,36 @@ class CustomerModelUpdateView(CustomerModelModelViewQuerySetMixIn, UpdateView):
 
 class CustomerModelDeleteView(CustomerModelModelViewQuerySetMixIn, DeleteView):
     pass
+
+
+class CustomerModelDetailView(CustomerModelModelViewQuerySetMixIn, DetailView):
+    template_name = 'django_ledger/customer/customer_detail.html'
+    context_object_name = 'customer'
+    PAGE_TITLE = _('Customer Details')
+    slug_url_kwarg = 'customer_pk'
+    slug_field = 'uuid'
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        customer: CustomerModel = self.object
+        receipts_qs = (
+            ReceiptModel.objects.for_entity(entity_model=self.AUTHORIZED_ENTITY_MODEL)
+            .for_customer(customer_model=customer)
+            .order_by('-updated')
+        )
+        invoices_qs = (
+            InvoiceModel.objects.for_entity(entity_model=self.AUTHORIZED_ENTITY_MODEL)
+            .filter(customer=customer)
+            .order_by('-updated')
+        )
+        context.update(
+            {
+                'page_title': self.PAGE_TITLE,
+                'header_title': self.PAGE_TITLE,
+                'header_subtitle': f'{customer.customer_name} · {customer.customer_number}',
+                'header_subtitle_icon': 'dashicons:businesswoman',
+                'receipts': receipts_qs,
+                'invoices': invoices_qs,
+            }
+        )
+        return context

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,13 +33,17 @@ class ImportJobModelViewBaseView(DjangoLedgerSecurityMixIn):
 
     def get_queryset(self):
         if self.queryset is None:
-            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'
+            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
 
@@ -39,23 +51,19 @@ class ImportJobModelViewBaseView(DjangoLedgerSecurityMixIn):
 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'])
@@ -66,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()
@@ -83,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'
 
@@ -99,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
 
@@ -109,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):
@@ -119,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)
 
@@ -140,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},
         )
 
 
@@ -161,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
@@ -172,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
@@ -183,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},
+            )
+        )