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

django_ledger/templates/django_ledger/account/tags/accounts_table.html

@@ -16,6 +16,7 @@
                             <td></td>
                             <td></td>
                             <td></td>
+                            <td></td>
                         </tr>
                     {% endif %}
 
@@ -37,7 +38,7 @@
                             <td></td>
                             <td></td>
                             <td></td>
-                            {#                            <td></td>#}
+                            <td></td>
                             <td></td>
                         </tr>
 
@@ -59,7 +60,7 @@
                                     </span>
                                     {% endif %}
                                 </td>
-                            
+
                                 <td class="has-text-centered">
                                     {% if account.is_locked %}
                                         <span class="icon has-text-success-dark">

django_ledger/templates/django_ledger/chart_of_accounts/coa_create.html

@@ -0,0 +1,25 @@
+{% extends 'django_ledger/layouts/content_layout_1.html' %}
+{% load i18n %}
+{% load static %}
+{% load django_ledger %}
+
+{% block view_content %}
+    <div class="box">
+        <div class="columns is-centered is-multiline">
+            <div class="column is-12 has-text-centered">
+                <h1 class="is-size-2">{% trans 'Create Chart of Accounts' %}</h1>
+            </div>
+            <div class="column is-8-tablet is-6-desktop">
+                <div class="box">
+                    <form method="post" id="{{ form.get_form_id }}">
+                        {% csrf_token %}
+                        {{ form.as_p }}
+                        <button type="submit" class="button is-primary is-fullwidth djetler_my_1">Submit</button>
+                        <a class="button is-dark is-small is-fullwidth"
+                           href="{{ entity_model.get_coa_list_url }}">Back</a>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}

django_ledger/templates/django_ledger/chart_of_accounts/coa_list.html

@@ -1,15 +1,34 @@
 {% extends 'django_ledger/layouts/content_layout_1.html' %}
 {% load i18n %}
 {% load static %}
+{% load icon from django_ledger %}
 
 {% block view_content %}
-    <div class="box">
-        <div class="columns is-centered is-multiline">
-            {% for coa_model in coa_list %}
-                <div class="column is-6">
-                    {% include 'django_ledger/chart_of_accounts/includes/coa_card.html' with coa_model=coa_model %}
+    <div class="card">
+        <div class="card-content">
+            <div class="columns">
+                <div class="column is-12">
+                    <h1 class="is-size-1">Chart of Accounts
+                        <a href="{{ entity_model.get_coa_create_url }}">
+                            <span class="icon is-large has-text-success">{% icon 'carbon:add-alt' 60 %}</span></a>
+                    </h1>
+                    {% if not inactive %}
+                        <a class="button is-warning" href="{{ entity_model.get_coa_list_inactive_url }}">
+                            {% trans 'Show Inactive' %}</a>
+                    {% else %}
+                        <a class="button is-warning" href="{{ entity_model.get_coa_list_url }}">
+                            {% trans 'Show Active' %}</a>
+                    {% endif %}
+
                 </div>
-            {% endfor %}
+            </div>
+            <div class="columns is-centered is-multiline">
+                {% for coa_model in coa_list %}
+                    <div class="column is-6">
+                        {% include 'django_ledger/chart_of_accounts/includes/coa_card.html' with coa_model=coa_model %}
+                    </div>
+                {% endfor %}
+            </div>
         </div>
     </div>
 {% endblock %}

django_ledger/templates/django_ledger/chart_of_accounts/coa_update.html

@@ -6,14 +6,14 @@
     <div class="columns is-centered">
         <div class="column is-8-tablet is-6-desktop">
             <div class="box">
-                <form action="{{ coa.get_update_url }}" method="post">
+                <form action="{{ coa_model.get_update_url }}" id="{{ form.form_id }}" method="post">
                     {% csrf_token %}
                     {{ form.as_p }}
                     <button class="button is-primary is-outlined is-fullwidth djetler_my_1"
                             type="submit">Update
                     </button>
                     <a class="button is-small is-dark is-fullwidth"
-                       href="{% url 'django_ledger:entity-dashboard' entity_slug=view.kwargs.entity_slug %}"
+                       href="{{ coa_model.get_coa_list_url }}"
                        type="submit">Back</a>
                 </form>
             </div>

django_ledger/templates/django_ledger/chart_of_accounts/includes/coa_card.html

@@ -4,7 +4,7 @@
 
 
 <div class="card">
-    <div class="card-header" {% if coa_model.is_default %}style="background-color: #04e304"{% endif %}>
+    <div class="card-header" {% if coa_model.is_default %}style="background-color: #04e304" {% elif not coa_model.is_active %}style="background-color: #d34e4e"{% endif %}>
         <div class="card-header-icon">
             {% icon "ic:baseline-business" 36 %}
         </div>
@@ -42,6 +42,12 @@
         </p>
     </div>
 
+    <footer class="card-footer">
+        <a href="{{ coa_model.get_update_url }}"
+           class="card-footer-item has-text-warning has-text-weight-bold">
+            {% trans 'Update' %}
+        </a>
+    </footer>
     <footer class="card-footer">
         <a href="{{ coa_model.get_account_list_url }}"
            class="card-footer-item has-text-success has-text-weight-bold">
@@ -51,14 +57,14 @@
            class="card-footer-item has-text-info has-text-weight-bold">
             {% trans 'Add Account' %}
         </a>
-
-        {% if not coa_model.is_default %}
+    </footer>
+    <footer class="card-footer">
+        {% if coa_model.can_mark_as_default %}
             <a href="{{ coa_model.mark_as_default_url }}"
                class="card-footer-item has-text-danger has-text-weight-bold">
                 {% trans 'Mark as Default' %}
             </a>
         {% endif %}
-
         {% if coa_model.can_deactivate %}
             <a href="{{ coa_model.mark_as_inactive_url }}"
                class="card-footer-item has-text-warning has-text-weight-bold">

django_ledger/templates/django_ledger/financial_statements/tags/balance_sheet_statement.html

@@ -60,9 +60,9 @@
                                     </div>
                                     <div class="dropdown-menu" id="dropdown-menu-{{ acc.uuid }}" role="menu">
                                         <div class="dropdown-content">
-                                            <a href="{% url 'django_ledger:account-detail' entity_slug=tx_digest.entity_slug account_pk=acc.account_uuid %}"
+                                            <a href="{{ acc.get_absolute_url }}"
                                                class="dropdown-item has-text-success">{% trans 'Detail' %}</a>
-                                            <a href="{% url 'django_ledger:account-update' entity_slug=tx_digest.entity_slug account_pk=acc.account_uuid %}"
+                                            <a href="{{ acc.get_update_url }}"
                                                class="dropdown-item has-text-warning">{% trans 'Update' %}</a>
                                         </div>
                                     </div>

django_ledger/templates/django_ledger/includes/footer.html

@@ -1,8 +1,8 @@
 <footer class="footer">
     <div class="content has-text-centered">
         <p>
-            <strong>Django Ledger</strong> by <a href="https://miguelsanda.com" target="_blank">Miguel Sanda</a> and
-            <a href="https://arrobalytics.com" target="_blank">Arrobalytics</a>. The source code is licensed
+            <strong>Django Ledger</strong> by <a href="https://www.miguelsanda.com" target="_blank">Miguel Sanda</a> and
+            <a href="https://miguelsanda.com" target="_blank">EDMA Group Inc</a>. The source code is licensed
             <a href="https://opensource.org/licenses/GPL-3.0" target="_blank">GPL 3.0</a>
         </p>
         {% if user.is_superuser %}

django_ledger/urls/chart_of_accounts.py

@@ -6,6 +6,12 @@ urlpatterns = [
     path('<slug:entity_slug>/list/',
          views.ChartOfAccountModelListView.as_view(),
          name='coa-list'),
+    path('<slug:entity_slug>/list/inactive/',
+         views.ChartOfAccountModelListView.as_view(inactive=True),
+         name='coa-list-inactive'),
+    path('<slug:entity_slug>/create/',
+         views.ChartOfAccountModelCreateView.as_view(),
+         name='coa-create'),
     path('<slug:entity_slug>/detail/<slug:coa_slug>/',
          views.ChartOfAccountModelListView.as_view(),
          name='coa-detail'),

django_ledger/utils.py

@@ -18,7 +18,6 @@ from django.db.models import QuerySet
 from django.utils.dateparse import parse_date
 
 from django_ledger.io.io_core import get_localdate
-from django_ledger.models import EntityModel
 
 UserModel = get_user_model()
 
@@ -52,7 +51,7 @@ def get_default_unit_session_key():
     return 'djl_default_unit_model'
 
 
-def set_default_entity(request, entity_model: EntityModel):
+def set_default_entity(request, entity_model):
     session_key = get_default_entity_session_key()
     if not request.session.get(session_key):
         request.session[session_key] = {
@@ -111,37 +110,3 @@ def get_end_date_from_session(entity_slug: str, request) -> date:
     end_date = request.session.get(session_end_date_filter)
     end_date = parse_date(end_date) if end_date else get_localdate()
     return end_date
-
-
-def load_model_class(model_path: str):
-    """
-    Loads a Python Model Class by using a string.
-    This functionality is inspired by the Django Blog Zinnia project.
-    This function allows for extension and customization of the stardard Django Ledger Models.
-
-    Examples
-    ________
-    >>> model_class = load_model_class(model_path='module.models.MyModel')
-
-    Parameters
-    ----------
-    model_path: str
-        The model path to load.
-
-    Returns
-    -------
-    The loaded Python model Class.
-
-    Raises
-    ______
-    ImportError or AttributeError if unable to load model.
-    """
-    dot = model_path.rindex('.')
-    module_name = model_path[:dot]
-    klass_name = model_path[dot + 1:]
-    try:
-        klass = getattr(import_module(module_name), klass_name)
-        return klass
-    except (ImportError, AttributeError) as e:
-        print(e)
-        raise ImproperlyConfigured(f'Model {model_path} cannot be imported!')

django_ledger/views/__init__.py

@@ -10,7 +10,7 @@ from django_ledger.views.account import *
 from django_ledger.views.auth import *
 from django_ledger.views.bank_account import *
 from django_ledger.views.bill import *
-from django_ledger.views.coa import *
+from django_ledger.views.chart_of_accounts import *
 from django_ledger.views.customer import *
 from django_ledger.views.data_import import *
 from django_ledger.views.djl_api import *

django_ledger/views/account.py

@@ -1,10 +1,8 @@
 """
 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.contrib import messages
 from django.core.exceptions import ImproperlyConfigured, ValidationError
 from django.http import HttpResponseRedirect
@@ -85,6 +83,16 @@ class AccountModelListView(BaseAccountModelBaseView, ListView):
         return qs
 
 
+
+    def get(self, request, *args, **kwargs):
+        response = super().get(request, *args, **kwargs)
+        chart_of_accounts_model: ChartOfAccountModel = self.get_coa_model()
+        if not chart_of_accounts_model.is_active():
+            messages.error(request, _('WARNING: The chart of accounts list is inactive.'), extra_tags='is-danger')
+        return response
+
+
+
 class AccountModelCreateView(BaseAccountModelBaseView, CreateView):
     template_name = 'django_ledger/account/account_create.html'
     PAGE_TITLE = _('Create Account')
@@ -101,6 +109,11 @@ class AccountModelCreateView(BaseAccountModelBaseView, CreateView):
             **self.get_form_kwargs()
         )
 
+    def get_initial(self):
+        return {
+            'coa_model': self.get_coa_model(),
+        }
+
     def get_context_data(self, *args, **kwargs):
         context = super().get_context_data(*args, **kwargs)
         coa_model = self.get_coa_model()

django_ledger/views/{coa.py → chart_of_accounts.py}

@@ -1,21 +1,16 @@
 """
 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.contrib import messages
 from django.core.exceptions import ImproperlyConfigured, ValidationError
-from django.db.models import Count, Q
-from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
-from django.views.generic import UpdateView, ListView, RedirectView
+from django.views.generic import UpdateView, ListView, RedirectView, CreateView
 from django.views.generic.detail import SingleObjectMixin
 
-from django_ledger.forms.coa import ChartOfAccountsModelUpdateForm
-from django_ledger.models.coa import ChartOfAccountModel
+from django_ledger.forms.chart_of_accounts import ChartOfAccountsModelUpdateForm, ChartOfAccountsModelCreateForm
+from django_ledger.models.chart_of_accounts import ChartOfAccountModel
 from django_ledger.views.mixins import DjangoLedgerSecurityMixIn
 
 
@@ -25,65 +20,76 @@ class ChartOfAccountModelModelBaseViewMixIn(DjangoLedgerSecurityMixIn):
     def get_queryset(self):
         if self.queryset is None:
             entity_model = self.get_authorized_entity_instance()
-            self.queryset = entity_model.chartofaccountmodel_set.all().select_related(
-                'entity').order_by('-updated')
+            self.queryset = entity_model.chartofaccountmodel_set.all().order_by('-updated')
         return super().get_queryset()
 
 
 class ChartOfAccountModelListView(ChartOfAccountModelModelBaseViewMixIn, ListView):
     template_name = 'django_ledger/chart_of_accounts/coa_list.html'
-    extra_context = {
-        'page_title': _('Chart of Account List'),
-        'header_title': _('Chart of Account List'),
-    }
     context_object_name = 'coa_list'
+    inactive = False
+
+    def get_queryset(self):
+        qs = super().get_queryset()
+        if self.inactive:
+            return qs.filter(active=False)
+        return qs.active()
 
     def get_context_data(self, *, object_list=None, **kwargs):
         context = super().get_context_data(object_list=None, **kwargs)
+        context['inactive'] = self.inactive
         context['header_subtitle'] = self.AUTHORIZED_ENTITY_MODEL.name
         context['header_subtitle_icon'] = 'gravity-ui:hierarchy'
+        context['page_title'] = 'Inactive Chart of Account List' if self.inactive else 'Chart of Accounts List'
+        context['header_title'] = 'Inactive Chart of Account List' if self.inactive else 'Chart of Accounts List'
         return context
 
-    def get_queryset(self):
-        qs = super().get_queryset()
-        return qs.annotate(
-            accountmodel_total__count=Count(
-                'accountmodel',
-                # excludes coa root accounts...
-                filter=Q(accountmodel__depth__gt=2)
-            ),
-            accountmodel_locked__count=Count(
-                'accountmodel',
-                # excludes coa root accounts...
-                filter=Q(accountmodel__depth__gt=2) & Q(accountmodel__locked=True)
-            ),
-            accountmodel_active__count=Count(
-                'accountmodel',
-                # excludes coa root accounts...
-                filter=Q(accountmodel__depth__gt=2) & Q(accountmodel__active=True)
-            ),
 
+class ChartOfAccountModelCreateView(ChartOfAccountModelModelBaseViewMixIn, CreateView):
+    template_name = 'django_ledger/chart_of_accounts/coa_create.html'
+    extra_context = {
+        'header_title': _('Create Chart of Accounts'),
+        'page_title': _('Create Chart of Account'),
+    }
+
+    def get_initial(self):
+        return {
+            'entity': self.get_authorized_entity_instance(),
+        }
+
+    def get_form(self, form_class=None):
+        return ChartOfAccountsModelCreateForm(
+            entity_model=self.get_authorized_entity_instance(),
+            **self.get_form_kwargs()
         )
 
+    def get_context_data(self, *, object_list=None, **kwargs):
+        context = super().get_context_data(object_list=None, **kwargs)
+        context['header_subtitle'] = f'New Chart of Accounts: {self.AUTHORIZED_ENTITY_MODEL.name}'
+        context['header_subtitle_icon'] = 'gravity-ui:hierarchy'
+        return context
+
+    def get_success_url(self):
+        chart_of_accounts_model: ChartOfAccountModel = self.object
+        return chart_of_accounts_model.get_coa_list_url()
+
 
 class ChartOfAccountModelUpdateView(ChartOfAccountModelModelBaseViewMixIn, UpdateView):
-    context_object_name = 'coa'
+    context_object_name = 'coa_model'
     slug_url_kwarg = 'coa_slug'
     template_name = 'django_ledger/chart_of_accounts/coa_update.html'
     form_class = ChartOfAccountsModelUpdateForm
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context['page_title'] = _('CoA: ') + self.object.name
-        context['header_title'] = _('CoA: ') + self.object.name
+        chart_of_accounts_model: ChartOfAccountModel = self.object
+        context['page_title'] = f'Update Chart of Account {chart_of_accounts_model.name}'
+        context['header_title'] = f'Update Chart of Account {chart_of_accounts_model.name}'
         return context
 
     def get_success_url(self):
-        entity_slug = self.kwargs.get('entity_slug')
-        return reverse('django_ledger:entity-dashboard',
-                       kwargs={
-                           'entity_slug': entity_slug
-                       })
+        chart_of_accounts_model: ChartOfAccountModel = self.object
+        return chart_of_accounts_model.get_coa_list_url()
 
 
 # todo: centralize this functionality into a separate class for ALL Action views...
@@ -96,10 +102,8 @@ class CharOfAccountModelActionView(ChartOfAccountModelModelBaseViewMixIn,
     commit = True
 
     def get_redirect_url(self, *args, **kwargs):
-        return reverse('django_ledger:coa-list',
-                       kwargs={
-                           'entity_slug': kwargs['entity_slug']
-                       })
+        chart_of_accounts_model: ChartOfAccountModel = self.get_object()
+        return chart_of_accounts_model.get_coa_list_url()
 
     def get(self, request, *args, **kwargs):
         kwargs['user_model'] = self.request.user

django_ledger/views/mixins.py

@@ -314,10 +314,20 @@ class SuccessUrlNextMixIn:
 
 class DjangoLedgerSecurityMixIn(LoginRequiredMixin, PermissionRequiredMixin):
     ENTITY_SLUG_URL_KWARG = 'entity_slug'
-    AUTHORIZED_ENTITY_MODEL: Optional[EntityModel] = None
+    ENTITY_MODEL_CONTEXT_NAME = 'entity_model'
     AUTHORIZE_SUPERUSER: bool = DJANGO_LEDGER_AUTHORIZED_SUPERUSER
     permission_required = []
 
+    def __init__(self, *args, **kwargs):
+        self.AUTHORIZED_ENTITY_MODEL: Optional[EntityModel] = None
+        super().__init__(*args, **kwargs)
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context[self.ENTITY_MODEL_CONTEXT_NAME] = self.get_authorized_entity_instance(raise_exception=False)
+        return context
+
+
     def get_login_url(self):
         return reverse('django_ledger:login')
 
@@ -355,12 +365,13 @@ class DjangoLedgerSecurityMixIn(LoginRequiredMixin, PermissionRequiredMixin):
         return EntityModel.objects.for_user(
             user_model=self.request.user,
             authorized_superuser=self.get_superuser_authorization(),
-        ).only(
-            'uuid', 'slug', 'name', 'default_coa', 'admin')
+        )
 
-    def get_authorized_entity_instance(self) -> Optional[EntityModel]:
+    def get_authorized_entity_instance(self, raise_exception: bool = True) -> Optional[EntityModel]:
         if self.AUTHORIZED_ENTITY_MODEL is None:
-            raise Http404()
+            if raise_exception:
+                raise Http404()
+            return
         return self.AUTHORIZED_ENTITY_MODEL
 
 

{django_ledger-0.7.0.dist-info → django_ledger-0.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-ledger
-Version: 0.7.0
+Version: 0.7.1
 Summary: Double entry accounting system built on the Django Web Framework.
 Author-email: Miguel Sanda <msanda@arrobalytics.com>
 Maintainer-email: Miguel Sanda <msanda@arrobalytics.com>
@@ -41,8 +41,6 @@ Requires-Dist: furo ; extra == 'dev'
 
 ![django ledger logo](https://us-east-1.linodeobjects.com/django-ledger/logo/django-ledger-logo@2x.png)
 
-Here's a more concise and readable version of the Django Ledger README:
-
 # Django Ledger
 
 ## A Double Entry Accounting Engine for Django