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

django_ledger/tests/test_accounts.py

@@ -95,8 +95,7 @@ class AccountModelTests(DjangoLedgerBaseTest):
         self.assertEqual(response_create.status_code, 302)
         self.assertTrue(AccountModel.objects.for_entity(
             entity_model=entity_model,
-            user_model=self.user_model,
-            coa_slug=entity_model.default_coa_slug,
+            coa_model=entity_model.default_coa_slug,
         ).with_codes(codes=NEW_ACCOUNT_CODE).exists())
 
         # cannot create an account with same code again...

django_ledger/tests/test_io.py

@@ -195,3 +195,20 @@ class IOTest(DjangoLedgerBaseTest):
         # )
         #
         # self.assertEqual(io_digest.get_io_txs_queryset().count(), 0)
+
+    def test_io_transactions_belong_to_entity(self):
+        entity_model = self.get_random_entity_model()
+        from_datetime = self.START_DATE
+        to_datetime = self.START_DATE + timedelta(days=randint(10, 60))
+
+        io_digest = entity_model.digest(
+            entity_slug=entity_model.slug,
+            from_date=from_datetime,
+            to_date=to_datetime,
+            for_test=True
+        )
+
+        tx_qs = io_digest.get_io_txs_queryset()
+        # Every transaction returned by the IO for an entity digest must belong to that entity.
+        for tx in tx_qs:
+            self.assertEqual(tx['journal_entry__ledger__entity_id'], entity_model.uuid)

django_ledger/tests/test_purchase_order.py

@@ -1,6 +1,6 @@
 from datetime import date, datetime
 from random import choice, randint
-from typing import Union, Optional
+from typing import Union, Optional, List
 from urllib.parse import urlparse
 from uuid import uuid4
 
@@ -31,8 +31,8 @@ class PurchaseOrderModelTests(DjangoLedgerBaseTest):
                                       commit=True)
         return po_model
 
-    def get_purchase_orders(self, entity_model: EntityModel) -> list[PurchaseOrderModel]:
-        return PurchaseOrderModel.objects.for_entity(entity_model, self.user_model)
+    def get_purchase_orders(self, entity_model: EntityModel) -> List[PurchaseOrderModel]:
+        return PurchaseOrderModel.objects.for_entity(entity_model=entity_model)
 
     def test_protected_views(self):
         """

django_ledger/tests/test_transactions.py

@@ -96,8 +96,7 @@ class TransactionModelFormSetTest(DjangoLedgerBaseTest):
 
             # get a journal entry that has transactions...
             je_model = JournalEntryModel.objects.for_entity(
-                entity_slug=entity_model,
-                user_model=self.user_model
+                entity_model=entity_model
             ).annotate(
                 txs_count=Count('transactionmodel')).filter(
                 txs_count__gt=0).order_by('-timestamp').first()

django_ledger/urls/__init__.py

@@ -5,11 +5,9 @@ Copyright© EDMA Group Inc licensed under the GPLv3 Agreement.
 Contributions to this module:
 Miguel Sanda <msanda@arrobalytics.com>
 """
-
 from django.urls import path, include
 
 from django_ledger import views
-from django_ledger.settings import DJANGO_LEDGER_GRAPHQL_SUPPORT_ENABLED
 
 app_name = 'django_ledger'
 
@@ -37,9 +35,8 @@ 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'),
 ]
 
-if DJANGO_LEDGER_GRAPHQL_SUPPORT_ENABLED:
-    pass

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/bill.py

@@ -64,8 +64,7 @@ class BillModelCreateView(BillModelModelBaseView, CreateView):
 
         if self.for_estimate and 'ce_pk' in self.kwargs:
             estimate_qs = EstimateModel.objects.for_entity(
-                entity_slug=self.kwargs['entity_slug'],
-                user_model=self.request.user
+                entity_model=self.AUTHORIZED_ENTITY_MODEL,
             )
             estimate_model: EstimateModel = get_object_or_404(estimate_qs, uuid__exact=self.kwargs['ce_pk'])
             if not estimate_model.can_bind():
@@ -87,8 +86,7 @@ class BillModelCreateView(BillModelModelBaseView, CreateView):
                 return HttpResponseBadRequest()
 
             po_qs = PurchaseOrderModel.objects.for_entity(
-                entity_slug=self.kwargs['entity_slug'],
-                user_model=self.request.user
+                entity_model=self.kwargs['entity_slug'],
             ).prefetch_related('itemtransactionmodel_set')
             po_model: PurchaseOrderModel = get_object_or_404(po_qs, uuid__exact=po_pk)
             po_itemtxs_qs = po_model.itemtransactionmodel_set.filter(
@@ -104,8 +102,7 @@ class BillModelCreateView(BillModelModelBaseView, CreateView):
                                   }) + f'?item_uuids={po_item_uuids_qry_param}'
         elif self.for_estimate:
             estimate_qs = EstimateModel.objects.for_entity(
-                entity_slug=self.kwargs['entity_slug'],
-                user_model=self.request.user
+                entity_model=self.AUTHORIZED_ENTITY_MODEL
             )
             estimate_uuid = self.kwargs['ce_pk']
             estimate_model: EstimateModel = get_object_or_404(estimate_qs, uuid__exact=estimate_uuid)
@@ -137,15 +134,16 @@ class BillModelCreateView(BillModelModelBaseView, CreateView):
     def form_valid(self, form):
         bill_model: BillModel = form.save(commit=False)
         ledger_model, bill_model = bill_model.configure(
-            entity_slug=self.AUTHORIZED_ENTITY_MODEL,
+            entity_slug=self.AUTHORIZED_ENTITY_MODEL.slug,
+            user_model=self.request.user,
             commit_ledger=True
         )
 
         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.kwargs['entity_slug']
+            )
 
             estimate_model = get_object_or_404(estimate_model_qs, uuid__exact=ce_pk)
             bill_model.bind_estimate(estimate_model=estimate_model, commit=False)
@@ -157,8 +155,7 @@ class BillModelCreateView(BillModelModelBaseView, CreateView):
                 return HttpResponseBadRequest()
             item_uuids = item_uuids.split(',')
             po_qs = PurchaseOrderModel.objects.for_entity(
-                entity_slug=self.kwargs['entity_slug'],
-                user_model=self.request.user
+                entity_model=self.kwargs['entity_slug'],
             )
             po_model: PurchaseOrderModel = get_object_or_404(po_qs, uuid__exact=po_pk)
 

django_ledger/views/chart_of_accounts.py

@@ -2,6 +2,7 @@
 Django Ledger created by Miguel Sanda <msanda@arrobalytics.com>.
 Copyright© EDMA Group Inc licensed under the GPLv3 Agreement.
 """
+from typing import Optional
 
 from django.contrib import messages
 from django.core.exceptions import ImproperlyConfigured, ValidationError
@@ -10,18 +11,19 @@ from django.views.generic import UpdateView, ListView, RedirectView, CreateView
 from django.views.generic.detail import SingleObjectMixin
 
 from django_ledger.forms.chart_of_accounts import ChartOfAccountsModelUpdateForm, ChartOfAccountsModelCreateForm
+from django_ledger.models import EntityModel, ChartOfAccountModelQuerySet
 from django_ledger.models.chart_of_accounts import ChartOfAccountModel
 from django_ledger.views.mixins import DjangoLedgerSecurityMixIn
 
 
 class ChartOfAccountModelModelBaseViewMixIn(DjangoLedgerSecurityMixIn):
-    queryset = None
+    queryset: Optional[ChartOfAccountModelQuerySet] = None
 
     def get_queryset(self):
         if self.queryset is None:
-            entity_model = self.get_authorized_entity_instance()
-            self.queryset = entity_model.chartofaccountmodel_set.all().order_by('-updated')
-        return super().get_queryset()
+            entity_model: EntityModel = self.get_authorized_entity_instance()
+            self.queryset: ChartOfAccountModelQuerySet = entity_model.chartofaccountmodel_set.all().order_by('-updated')
+        return self.queryset
 
 
 class ChartOfAccountModelListView(ChartOfAccountModelModelBaseViewMixIn, ListView):

django_ledger/views/closing_entry.py

@@ -5,6 +5,7 @@ Copyright© EDMA Group Inc licensed under the GPLv3 Agreement.
 Contributions to this module:
     * Miguel Sanda <msanda@arrobalytics.com>
 """
+from typing import Optional
 
 from django.contrib import messages
 from django.core.exceptions import ValidationError, ImproperlyConfigured
@@ -21,13 +22,14 @@ from django.views.generic.detail import SingleObjectMixin
 
 from django_ledger.forms.closing_entry import ClosingEntryCreateForm, ClosingEntryUpdateForm
 from django_ledger.io.io_core import get_localdate
+from django_ledger.models import EstimateModel, ClosingEntryModelQuerySet
 from django_ledger.models.closing_entry import ClosingEntryModel
 from django_ledger.models.entity import EntityModel
 from django_ledger.views import DjangoLedgerSecurityMixIn
 
 
 class ClosingEntryModelBaseView(DjangoLedgerSecurityMixIn):
-    queryset = None
+    queryset: Optional[ClosingEntryModelQuerySet] = None
 
     def get_queryset(self):
         if self.queryset is None:
@@ -75,16 +77,18 @@ class ClosingEntryModelCreateView(ClosingEntryModelBaseView, CreateView):
         'header_title': PAGE_TITLE,
         'header_subtitle_icon': 'file-icons:finaldraft'
     }
+    form_class = ClosingEntryCreateForm
 
     def get_initial(self):
         return {
-            'closing_date': get_localdate()
+            'closing_date': get_localdate(),
+            'entity_model': self.AUTHORIZED_ENTITY_MODEL
         }
 
-    def get_form(self, form_class=None, **kwargs):
-        return ClosingEntryCreateForm(
-            **self.get_form_kwargs()
-        )
+    def get_form_kwargs(self, **kwargs):
+        return super().get_form_kwargs(**kwargs) | {
+            'entity_model': self.AUTHORIZED_ENTITY_MODEL
+        }
 
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
@@ -100,7 +104,7 @@ class ClosingEntryModelCreateView(ClosingEntryModelBaseView, CreateView):
             force_update=True,
             post_closing_entry=False
         )
-        self.ce_model = ce_model
+        self.ce_model: EstimateModel = ce_model
         return HttpResponseRedirect(self.get_success_url())
 
     def get_success_url(self):

django_ledger/views/customer.py

@@ -6,44 +6,49 @@ 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
+from django.views.generic import (
+    CreateView,
+    DeleteView,
+    DetailView,
+    ListView,
+    UpdateView,
+)
 
 from django_ledger.forms.customer import CustomerModelForm
-from django_ledger.models.customer import CustomerModel
+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
 
 
-class CustomerModelModelViewQuerySetMixIn:
-    queryset = None
+class CustomerModelModelViewQuerySetMixIn(DjangoLedgerSecurityMixIn):
+    queryset: Optional[CustomerModelQueryset] = None
 
     def get_queryset(self):
         if self.queryset is None:
             self.queryset = CustomerModel.objects.for_entity(
-                entity_slug=self.kwargs['entity_slug'],
-                user_model=self.request.user
+                entity_model=self.kwargs['entity_slug'],
             ).order_by('-updated')
-        return super().get_queryset()
+        return self.queryset
 
 
-class CustomerModelListView(DjangoLedgerSecurityMixIn,
-                            CustomerModelModelViewQuerySetMixIn,
-                            ListView):
+class CustomerModelListView(CustomerModelModelViewQuerySetMixIn, ListView):
     template_name = 'django_ledger/customer/customer_list.html'
     PAGE_TITLE = _('Customer List')
     extra_context = {
         'page_title': PAGE_TITLE,
         'header_title': PAGE_TITLE,
-        'header_subtitle_icon': 'dashicons:businesswoman'
+        'header_subtitle_icon': 'dashicons:businesswoman',
     }
     context_object_name = 'customers'
 
 
-class CustomerModelCreateView(DjangoLedgerSecurityMixIn,
-                              CustomerModelModelViewQuerySetMixIn,
-                              CreateView):
+class CustomerModelCreateView(CustomerModelModelViewQuerySetMixIn, CreateView):
     template_name = 'django_ledger/customer/customer_create.html'
     PAGE_TITLE = _('Create New Customer')
     form_class = CustomerModelForm
@@ -51,28 +56,26 @@ class CustomerModelCreateView(DjangoLedgerSecurityMixIn,
     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)
 
 
-class CustomerModelUpdateView(DjangoLedgerSecurityMixIn,
-                              CustomerModelModelViewQuerySetMixIn,
-                              UpdateView):
+class CustomerModelUpdateView(CustomerModelModelViewQuerySetMixIn, UpdateView):
     template_name = 'django_ledger/customer/customer_update.html'
     PAGE_TITLE = _('Customer Update')
     form_class = CustomerModelForm
@@ -90,13 +93,48 @@ class CustomerModelUpdateView(DjangoLedgerSecurityMixIn,
         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()
         return super().form_valid(form)
 
-# todo: add CustomerDeleteView
+
+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