django-ledger 0.6.4__py3-none-any.whl → 0.7.0__py3-none-any.whl

django_ledger/views/account.py

@@ -3,12 +3,11 @@ 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>
+    * Miguel Sanda <msanda@arrobalytics.com>
 """
 from django.contrib import messages
 from django.core.exceptions import ImproperlyConfigured, ValidationError
 from django.http import HttpResponseRedirect
-from django.shortcuts import get_object_or_404
 from django.urls import reverse
 from django.utils.translation import gettext as _
 from django.views.generic import ListView, UpdateView, CreateView, DetailView
@@ -17,7 +16,7 @@ from django.views.generic.detail import SingleObjectMixin
 
 from django_ledger.forms.account import AccountModelUpdateForm, AccountModelCreateForm
 from django_ledger.io.io_core import get_localdate
-from django_ledger.models import ChartOfAccountModel
+from django_ledger.models import EntityModel, ChartOfAccountModel
 from django_ledger.models.accounts import AccountModel
 from django_ledger.views.mixins import (
     YearlyReportMixIn, MonthlyReportMixIn, QuarterlyReportMixIn, DjangoLedgerSecurityMixIn,
@@ -25,58 +24,51 @@ from django_ledger.views.mixins import (
 )
 
 
-class BaseAccountModelViewQuerySetMixIn:
+class BaseAccountModelBaseView(DjangoLedgerSecurityMixIn):
     queryset = None
     coa_model = None
 
-    def get_coa_model(self) -> ChartOfAccountModel:
-        if self.coa_model is None:
-            coa_slug = self.kwargs.get('coa_slug')
-            if coa_slug:
-                coa_model_qs = self.AUTHORIZED_ENTITY_MODEL.chartofaccountmodel_set.all().active()
-                coa_model = get_object_or_404(coa_model_qs, slug__exact=coa_slug)
-            else:
-                coa_model = self.AUTHORIZED_ENTITY_MODEL.default_coa
-            self.coa_model = coa_model
+    def get_authorized_entity_queryset(self):
+        qs = super().get_authorized_entity_queryset()
+        return qs.select_related('admin', 'default_coa', 'default_coa__entity')
+
+    def get_coa_model(self):
+        if not self.coa_model:
+            entity_model: EntityModel = self.get_authorized_entity_instance()
+            self.coa_model = entity_model.chartofaccountmodel_set.get(slug__exact=self.kwargs['coa_slug'])
         return self.coa_model
 
     def get_queryset(self):
         if self.queryset is None:
-            qs = AccountModel.objects.for_entity(
-                entity_slug=self.kwargs['entity_slug'],
-                user_model=self.request.user,
-            ).select_related(
+            entity_model: EntityModel = self.get_authorized_entity_instance()
+            coa_slug = self.kwargs['coa_slug']
+
+            coa_model, account_model_qs = entity_model.get_coa_accounts(
+                coa_model=entity_model.default_coa if coa_slug == entity_model.default_coa_slug else coa_slug,
+                return_coa_model=True,
+                active=False
+            )
+
+            account_model_qs = account_model_qs.select_related(
                 'coa_model',
                 'coa_model__entity'
             ).order_by(
-                'coa_model', 'role', 'code').not_coa_root()
+                'coa_model', 'role', 'code'
+            ).not_coa_root()
 
-            coa_slug = self.kwargs.get('coa_slug')
-            account_pk = self.kwargs.get('account_pk')
-
-            if coa_slug:
-                qs = qs.filter(coa_model__slug__exact=coa_slug)
-            elif account_pk:
-                qs = qs.filter(uuid__exact=account_pk)
-            else:
-                qs = qs.filter(coa_model__slug__exact=self.AUTHORIZED_ENTITY_MODEL.default_coa.slug)
+            self.coa_model = coa_model
+            self.queryset = account_model_qs
 
-            self.queryset = qs
         return super().get_queryset()
 
-    def get_context_data(self, *args, **kwargs):
-        context = super().get_context_data(*args, **kwargs)
-        entity_model = self.get_authorized_entity_instance()
-        if self.kwargs.get('coa_slug'):
-            coa_model_qs = entity_model.chartofaccountmodel_set.all()
-            context['coa_model'] = get_object_or_404(coa_model_qs, slug__exact=self.kwargs['coa_slug'])
-        else:
-            context['coa_model'] = entity_model.default_coa
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['coa_model'] = self.get_coa_model()
         return context
 
 
 # Account Views ----
-class AccountModelListView(DjangoLedgerSecurityMixIn, BaseAccountModelViewQuerySetMixIn, ListView):
+class AccountModelListView(BaseAccountModelBaseView, ListView):
     template_name = 'django_ledger/account/account_list.html'
     context_object_name = 'accounts'
     PAGE_TITLE = _('Entity Accounts')
@@ -93,40 +85,7 @@ class AccountModelListView(DjangoLedgerSecurityMixIn, BaseAccountModelViewQueryS
         return qs
 
 
-class AccountModelUpdateView(DjangoLedgerSecurityMixIn, BaseAccountModelViewQuerySetMixIn, UpdateView):
-    context_object_name = 'account'
-    template_name = 'django_ledger/account/account_update.html'
-    slug_url_kwarg = 'account_pk'
-    slug_field = 'uuid'
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['page_title'] = _('Update Account')
-        context['header_title'] = _(f'Update Account: {self.object.code} - {self.object.name}')
-        context['header_subtitle_icon'] = 'ic:twotone-account-tree'
-        return context
-
-    def get_form(self, form_class=None):
-        account_model = self.object
-
-        # Set here because user_model is needed to instantiate an instance of MoveNodeForm (AccountModelUpdateForm)
-        account_model.USER_MODEL = self.request.user
-        return AccountModelUpdateForm(
-            entity_model=self.AUTHORIZED_ENTITY_MODEL,
-            coa_model=self.get_coa_model(),
-            user_model=self.request.user,
-            **self.get_form_kwargs()
-        )
-
-    def get_success_url(self):
-        entity_slug = self.kwargs['entity_slug']
-        return reverse('django_ledger:account-list',
-                       kwargs={
-                           'entity_slug': entity_slug,
-                       })
-
-
-class AccountModelCreateView(DjangoLedgerSecurityMixIn, BaseAccountModelViewQuerySetMixIn, CreateView):
+class AccountModelCreateView(BaseAccountModelBaseView, CreateView):
     template_name = 'django_ledger/account/account_create.html'
     PAGE_TITLE = _('Create Account')
     extra_context = {
@@ -138,58 +97,63 @@ class AccountModelCreateView(DjangoLedgerSecurityMixIn, BaseAccountModelViewQuer
 
     def get_form(self, form_class=None):
         return AccountModelCreateForm(
-            user_model=self.request.user,
-            entity_model=self.AUTHORIZED_ENTITY_MODEL,
             coa_model=self.get_coa_model(),
             **self.get_form_kwargs()
         )
 
     def get_context_data(self, *args, **kwargs):
         context = super().get_context_data(*args, **kwargs)
-        context['header_subtitle'] = f'CoA: {context["coa_model"].name}'
+        coa_model = self.get_coa_model()
+        context['coa_model'] = coa_model
+        context['header_subtitle'] = f'CoA: {coa_model.name}'
         return context
 
-    def form_valid(self, form):
-        entity_model = self.AUTHORIZED_ENTITY_MODEL
+    def form_valid(self, form: AccountModelCreateForm):
         account_model: AccountModel = form.save(commit=False)
-
-        if not entity_model.has_default_coa():
-            entity_model.create_chart_of_accounts(assign_as_default=True, commit=True)
-
-        coa_model = self.get_coa_model()
+        coa_model = account_model.coa_model
         coa_model.insert_account(account_model=account_model)
         return HttpResponseRedirect(self.get_success_url())
 
     def get_success_url(self):
-        entity_slug = self.kwargs.get('entity_slug')
-        coa_slug = self.kwargs.get('coa_slug')
-        if coa_slug:
-            return reverse('django_ledger:account-list-coa',
-                           kwargs={
-                               'entity_slug': entity_slug,
-                               'coa_slug': coa_slug
-                           })
-        return reverse('django_ledger:account-list',
-                       kwargs={
-                           'entity_slug': entity_slug,
-                       })
+        coa_model: ChartOfAccountModel = self.get_coa_model()
+        return coa_model.get_account_list_url()
+
+
+class AccountModelUpdateView(BaseAccountModelBaseView, UpdateView):
+    context_object_name = 'account'
+    template_name = 'django_ledger/account/account_update.html'
+    slug_url_kwarg = 'account_pk'
+    slug_field = 'uuid'
+    form_class = AccountModelUpdateForm
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['page_title'] = _('Update Account')
+        context['header_title'] = _(f'Update Account: {self.object.code} - {self.object.name}')
+        context['header_subtitle_icon'] = 'ic:twotone-account-tree'
+        return context
+
+    def get_success_url(self):
+        coa_model: ChartOfAccountModel = self.get_coa_model()
+        return coa_model.get_account_list_url()
 
 
-class AccountModelDetailView(DjangoLedgerSecurityMixIn, BaseAccountModelViewQuerySetMixIn, RedirectView):
+class AccountModelDetailView(BaseAccountModelBaseView, RedirectView):
 
     def get_redirect_url(self, *args, **kwargs):
         loc_date = get_localdate()
+        entity_model: EntityModel = self.get_authorized_entity_instance()
         return reverse('django_ledger:account-detail-month',
                        kwargs={
-                           'entity_slug': self.kwargs['entity_slug'],
+                           'entity_slug': entity_model.slug,
                            'account_pk': self.kwargs['account_pk'],
+                           'coa_slug': self.kwargs['coa_slug'],
                            'year': loc_date.year,
                            'month': loc_date.month,
                        })
 
 
-class AccountModelYearDetailView(DjangoLedgerSecurityMixIn,
-                                 BaseAccountModelViewQuerySetMixIn,
+class AccountModelYearDetailView(BaseAccountModelBaseView,
                                  BaseDateNavigationUrlMixIn,
                                  EntityUnitMixIn,
                                  YearlyReportMixIn,
@@ -205,23 +169,23 @@ class AccountModelYearDetailView(DjangoLedgerSecurityMixIn,
     }
 
     def get_context_data(self, **kwargs):
-        account = self.object
         context = super().get_context_data(**kwargs)
-        context['header_title'] = f'Account {account.code} - {account.name}'
-        context['page_title'] = f'Account {account.code} - {account.name}'
-        account_model: AccountModel = self.object
+        account_model: AccountModel = context['object']
+        context['header_title'] = f'Account {account_model.code} - {account_model.name}'
+        context['page_title'] = f'Account {account_model.code} - {account_model.name}'
         txs_qs = account_model.transactionmodel_set.all().posted().order_by(
-            'journal_entry__timestamp').select_related(
-            'journal_entry', 'journal_entry__entity_unit')
+            'journal_entry__timestamp'
+        ).select_related(
+            'journal_entry',
+            'journal_entry__entity_unit',
+            'journal_entry__ledger__billmodel',
+            'journal_entry__ledger__invoicemodel',
+        )
         txs_qs = txs_qs.from_date(self.get_from_date())
         txs_qs = txs_qs.to_date(self.get_to_date())
         context['transactions'] = txs_qs
         return context
 
-    def get_queryset(self):
-        qs = super().get_queryset()
-        return qs.prefetch_related('transactionmodel_set')
-
 
 class AccountModelQuarterDetailView(QuarterlyReportMixIn, AccountModelYearDetailView):
     """
@@ -242,9 +206,8 @@ class AccountModelDateDetailView(DateReportMixIn, AccountModelYearDetailView):
 
 
 # ACTIONS...
-class AccountModelModelActionView(DjangoLedgerSecurityMixIn,
+class AccountModelModelActionView(BaseAccountModelBaseView,
                                   RedirectView,
-                                  BaseAccountModelViewQuerySetMixIn,
                                   SingleObjectMixin):
     http_method_names = ['get']
     pk_url_kwarg = 'account_pk'
@@ -252,11 +215,8 @@ class AccountModelModelActionView(DjangoLedgerSecurityMixIn,
     commit = True
 
     def get_redirect_url(self, *args, **kwargs):
-        return reverse('django_ledger:account-list',
-                       kwargs={
-                           'entity_slug': kwargs['entity_slug'],
-                           # 'account_pk': kwargs['account_pk']
-                       })
+        account_model: AccountModel = self.get_object()
+        return account_model.get_coa_account_list_url()
 
     def get(self, request, *args, **kwargs):
         kwargs['user_model'] = self.request.user
@@ -268,8 +228,10 @@ class AccountModelModelActionView(DjangoLedgerSecurityMixIn,
         try:
             getattr(account_model, self.action_name)(commit=self.commit, **kwargs)
         except ValidationError as e:
-            messages.add_message(request,
-                                 message=e.message,
-                                 level=messages.ERROR,
-                                 extra_tags='is-danger')
+            messages.add_message(
+                request,
+                message=e.message,
+                level=messages.ERROR,
+                extra_tags='is-danger'
+            )
         return response

django_ledger/views/auth.py

@@ -3,7 +3,7 @@ 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>
+    * Miguel Sanda <msanda@arrobalytics.com>
 """
 
 from django.contrib.auth.views import LoginView, LogoutView

django_ledger/views/bank_account.py

@@ -3,7 +3,7 @@ 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>
+    * Miguel Sanda <msanda@arrobalytics.com>
 """
 from django.contrib import messages
 from django.core.exceptions import ImproperlyConfigured, ValidationError
@@ -13,23 +13,22 @@ from django.views.generic import ListView, CreateView, UpdateView, RedirectView
 from django.views.generic.detail import SingleObjectMixin
 
 from django_ledger.forms.bank_account import BankAccountCreateForm, BankAccountUpdateForm
+from django_ledger.models import EntityModel
 from django_ledger.models.bank_account import BankAccountModel
 from django_ledger.views.mixins import DjangoLedgerSecurityMixIn
 
 
-class BankAccountModelModelViewQuerySetMixIn:
+class BankAccountModelModelBaseView(DjangoLedgerSecurityMixIn):
     queryset = None
 
     def get_queryset(self):
         if self.queryset is None:
-            self.queryset = BankAccountModel.objects.for_entity(
-                entity_slug=self.kwargs['entity_slug'],
-                user_model=self.request.user
-            ).select_related('cash_account', 'entity_model')
+            entity_model: EntityModel = self.get_authorized_entity_instance()
+            self.queryset = entity_model.bankaccountmodel_set.select_related('cash_account', 'entity_model')
         return super().get_queryset()
 
 
-class BankAccountModelListView(DjangoLedgerSecurityMixIn, BankAccountModelModelViewQuerySetMixIn, ListView):
+class BankAccountModelListView(BankAccountModelModelBaseView, ListView):
     template_name = 'django_ledger/bank_account/bank_account_list.html'
     PAGE_TITLE = _('Bank Accounts')
     context_object_name = 'bank_accounts'
@@ -40,7 +39,7 @@ class BankAccountModelListView(DjangoLedgerSecurityMixIn, BankAccountModelModelV
     }
 
 
-class BankAccountModelCreateView(DjangoLedgerSecurityMixIn, BankAccountModelModelViewQuerySetMixIn, CreateView):
+class BankAccountModelCreateView(BankAccountModelModelBaseView, CreateView):
     template_name = 'django_ledger/bank_account/bank_account_create.html'
     PAGE_TITLE = _('Create Bank Account')
     extra_context = {
@@ -71,7 +70,7 @@ class BankAccountModelCreateView(DjangoLedgerSecurityMixIn, BankAccountModelMode
         return super(BankAccountModelCreateView, self).form_valid(form)
 
 
-class BankAccountModelUpdateView(DjangoLedgerSecurityMixIn, BankAccountModelModelViewQuerySetMixIn, UpdateView):
+class BankAccountModelUpdateView(BankAccountModelModelBaseView, UpdateView):
     template_name = 'django_ledger/bank_account/bank_account_update.html'
     pk_url_kwarg = 'bank_account_pk'
     PAGE_TITLE = _('Update Bank Account')
@@ -97,8 +96,7 @@ class BankAccountModelUpdateView(DjangoLedgerSecurityMixIn, BankAccountModelMode
 
 
 # ACTION VIEWS...
-class BaseBankAccountModelActionView(DjangoLedgerSecurityMixIn,
-                                     BankAccountModelModelViewQuerySetMixIn,
+class BaseBankAccountModelActionView(BankAccountModelModelBaseView,
                                      RedirectView,
                                      SingleObjectMixin):
     http_method_names = ['get']