django-ledger 0.5.5.5__py3-none-any.whl → 0.5.6.0__py3-none-any.whl

django_ledger/models/ledger.py

@@ -38,7 +38,7 @@ from django.db.models import Q, Min, F, Count
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
-from django_ledger.io.io_mixin import IOMixIn
+from django_ledger.io.io_core import IOMixIn
 from django_ledger.models import lazy_loader
 from django_ledger.models.mixins import CreateUpdateMixIn
 
@@ -54,6 +54,28 @@ class LedgerModelQuerySet(models.QuerySet):
     Custom defined LedgerModel QuerySet.
     """
 
+    def locked(self):
+        """
+        Filters the QuerySet to only locked LedgerModel.
+
+        Returns
+        -------
+        LedgerModelQuerySet
+            A QuerySet with applied filters.
+        """
+        return self.filter(locked=True)
+
+    def unlocked(self):
+        """
+        Filters the QuerySet to only un-locked LedgerModel.
+
+        Returns
+        -------
+        LedgerModelQuerySet
+            A QuerySet with applied filters.
+        """
+        return self.filter(locked=False)
+
     def posted(self):
         """
         Filters the QuerySet to only posted LedgerModel.
@@ -65,6 +87,17 @@ class LedgerModelQuerySet(models.QuerySet):
         """
         return self.filter(posted=True)
 
+    def unposted(self):
+        """
+        Filters the QuerySet to only un-posted LedgerModel.
+
+        Returns
+        -------
+        LedgerModelQuerySet
+            A QuerySet with applied filters.
+        """
+        return self.filter(posted=True)
+
     def hidden(self):
         return self.filter(hidden=True)
 
@@ -73,7 +106,8 @@ class LedgerModelQuerySet(models.QuerySet):
 
     def current(self):
         return self.filter(
-            earliest_timestamp__gt=F('entity__last_closing_date')
+            Q(earliest_timestamp__gt=F('entity__last_closing_date'))
+            | Q(earliest_timestamp__isnull=True)
         )
 
 
@@ -92,6 +126,8 @@ class LedgerModelManager(models.Manager):
 
     def for_user(self, user_model):
         qs = self.get_queryset()
+        if user_model.is_superuser:
+            return qs
         return qs.filter(
             Q(entity__admin=user_model) |
             Q(entity__managers__in=[user_model])
@@ -114,21 +150,13 @@ class LedgerModelManager(models.Manager):
         LedgerModelQuerySet
             A Filtered LedgerModelQuerySet.
         """
-        qs = self.get_queryset()
+        qs = self.for_user(user_model)
         if isinstance(entity_slug, lazy_loader.get_entity_model()):
             return qs.filter(
-                Q(entity=entity_slug) &
-                (
-                        Q(entity__admin=user_model) |
-                        Q(entity__managers__in=[user_model])
-                )
+                Q(entity=entity_slug)
             )
         return qs.filter(
-            Q(entity__slug__exact=entity_slug) &
-            (
-                    Q(entity__admin=user_model) |
-                    Q(entity__managers__in=[user_model])
-            )
+            Q(entity__slug__exact=entity_slug)
         )
 
 
@@ -142,6 +170,8 @@ class LedgerModelAbstract(CreateUpdateMixIn, IOMixIn):
         This is a unique primary key generated for the table. The default value of this field is uuid4().
     name: str
         Human-readable name of the LedgerModel. Maximum 150 characters.
+    ledger_xid: str
+        A unique user-defined identifier for the LedgerModel. Unique for the Entity Model.
     entity: EntityModel
         The EntityModel associated with the LedgerModel instance.
     posted: bool
@@ -153,6 +183,9 @@ class LedgerModelAbstract(CreateUpdateMixIn, IOMixIn):
     """
     _WRAPPED_MODEL_KEY = 'wrapped_model'
     uuid = models.UUIDField(default=uuid4, editable=False, primary_key=True)
+    ledger_xid = models.SlugField(allow_unicode=True, max_length=150, null=True, blank=True,
+                                  verbose_name=_('Ledger Slug'),
+                                  help_text=_('User Defined Ledger ID'))
     name = models.CharField(max_length=150, null=True, blank=True, verbose_name=_('Ledger Name'))
 
     # todo: rename to entity_model...
@@ -180,6 +213,9 @@ class LedgerModelAbstract(CreateUpdateMixIn, IOMixIn):
             models.Index(fields=['entity', 'posted']),
             models.Index(fields=['entity', 'locked']),
         ]
+        unique_together = [
+            ('entity', 'ledger_xid')
+        ]
 
     def __str__(self):
         return self.name
@@ -509,9 +545,8 @@ class LedgerModelAbstract(CreateUpdateMixIn, IOMixIn):
         str
             URL as a string.
         """
-        return reverse('django_ledger:ledger-update',
+        return reverse(viewname='django_ledger:je-list',
                        kwargs={
-                           # pylint: disable=no-member
                            'entity_slug': self.entity.slug,
                            'ledger_pk': self.uuid
                        })
@@ -547,6 +582,21 @@ class LedgerModelAbstract(CreateUpdateMixIn, IOMixIn):
                            'ledger_pk': self.uuid
                        })
 
+    def get_list_url(self) -> str:
+        """
+        Determines the list URL of the LedgerModel instances.
+        Results in additional Database query if entity field is not selected in QuerySet.
+
+        Returns
+        -------
+        str
+            URL as a string.
+        """
+        return reverse('django_ledger:ledger-list',
+                       kwargs={
+                           'entity_slug': self.entity.slug
+                       })
+
     def get_balance_sheet_url(self):
         return reverse(
             viewname='django_ledger:ledger-bs',

django_ledger/models/mixins.py

@@ -13,7 +13,7 @@ from collections import defaultdict
 from datetime import timedelta, date, datetime
 from decimal import Decimal
 from itertools import groupby
-from typing import Optional, Union, Dict, List
+from typing import Optional, Union, Dict
 from uuid import UUID
 
 from django.conf import settings
@@ -27,8 +27,7 @@ from django.utils.timezone import localdate, localtime
 from django.utils.translation import gettext_lazy as _
 from markdown import markdown
 
-from django_ledger.io import (check_tx_balance, ASSET_CA_CASH, ASSET_CA_PREPAID, LIABILITY_CL_DEFERRED_REVENUE,
-                              validate_io_date)
+from django_ledger.io.io_core import validate_io_date, check_tx_balance
 from django_ledger.models.utils import lazy_loader
 
 logging.basicConfig(format='%(asctime)s %(message)s', datefmt='%m/%d/%Y %I:%M:%S %p')

django_ledger/models/purchase_order.py

@@ -101,6 +101,15 @@ class PurchaseOrderModelManager(models.Manager):
     A custom defined PurchaseOrderModel Manager.
     """
 
+    def for_user(self, user_model):
+        qs = self.get_queryset()
+        if user_model.is_superuser:
+            return qs
+        return qs.filter(
+            Q(entity__admin=user_model) |
+            Q(entity__managers__in=[user_model])
+        )
+
     def for_entity(self, entity_slug, user_model) -> PurchaseOrderModelQuerySet:
         """
         Fetches a QuerySet of PurchaseOrderModel associated with a specific EntityModel & UserModel.
@@ -111,15 +120,10 @@ class PurchaseOrderModelManager(models.Manager):
         PurchaseOrderModelQuerySet
             A PurchaseOrderModelQuerySet with applied filters.
         """
-        qs = self.get_queryset()
+        qs = self.for_user(user_model)
         if isinstance(entity_slug, EntityModel):
             qs = qs.filter(entity=entity_slug)
-        elif isinstance(entity_slug, str):
-            qs = qs.filter(entity__slug__exact=entity_slug)
-        return qs.filter(
-            Q(entity__admin=user_model) |
-            Q(entity__managers__in=[user_model])
-        )
+        return qs.filter(entity__slug__exact=entity_slug)
 
 
 class PurchaseOrderModelAbstract(CreateUpdateMixIn,

django_ledger/models/transactions.py

@@ -26,7 +26,7 @@ from django.db import models
 from django.db.models import Q, QuerySet
 from django.utils.translation import gettext_lazy as _
 
-from django_ledger.io import validate_io_date
+from django_ledger.io.io_core import validate_io_date
 from django_ledger.models.accounts import AccountModel
 from django_ledger.models.bill import BillModel
 from django_ledger.models.entity import EntityModel
@@ -220,6 +220,8 @@ class TransactionModelAdmin(models.Manager):
             Returns a TransactionModelQuerySet with applied filters.
         """
         qs = self.get_queryset()
+        if user_model.is_superuser:
+            return qs
         return qs.filter(
             Q(journal_entry__ledger__entity__admin=user_model) |
             Q(journal_entry__ledger__entity__managers__in=[user_model])

django_ledger/models/unit.py

@@ -34,7 +34,7 @@ from django.utils.text import slugify
 from django.utils.translation import gettext_lazy as _
 from treebeard.mp_tree import MP_Node, MP_NodeManager, MP_NodeQuerySet
 
-from django_ledger.io.io_mixin import IOMixIn
+from django_ledger.io.io_core import IOMixIn
 from django_ledger.models import lazy_loader
 from django_ledger.models.mixins import CreateUpdateMixIn, SlugNameMixIn
 
@@ -53,6 +53,15 @@ class EntityUnitModelQuerySet(MP_NodeQuerySet):
 
 class EntityUnitModelManager(MP_NodeManager):
 
+    def for_user(self, user_model):
+        qs = self.get_queryset()
+        if user_model.is_superuser:
+            return qs
+        return qs.filter(
+            Q(entity__admin=user_model) |
+            Q(entity__managers__in=[user_model])
+        )
+
     def for_entity(self, entity_slug: str, user_model):
         """
         Fetches a QuerySet of EntityUnitModels associated with a specific EntityModel & UserModel.
@@ -76,23 +85,14 @@ class EntityUnitModelManager(MP_NodeManager):
         EntityUnitModelQuerySet
             Returns a EntityUnitModelQuerySet with applied filters.
         """
-        qs = self.get_queryset()
+        qs = self.for_user(user_model)
         if isinstance(entity_slug, lazy_loader.get_entity_model()):
             return qs.filter(
-                Q(entity=entity_slug) &
-                (
-                        Q(entity__admin=user_model) |
-                        Q(entity__managers__in=[user_model])
-                )
+                Q(entity=entity_slug)
 
             )
         return qs.filter(
-            Q(entity__slug__exact=entity_slug) &
-            (
-                    Q(entity__admin=user_model) |
-                    Q(entity__managers__in=[user_model])
-            )
-
+            Q(entity__slug__exact=entity_slug)
         )
 
 
@@ -222,7 +222,6 @@ class EntityUnitModelAbstract(MP_Node,
         )
 
 
-
 class EntityUnitModel(EntityUnitModelAbstract):
     """
     Base Model Class for EntityUnitModel

django_ledger/models/vendor.py

@@ -91,6 +91,15 @@ class VendorModelManager(models.Manager):
     Custom defined VendorModel Manager, which defines many methods for initial query of the Database.
     """
 
+    def for_user(self, user_model):
+        qs = self.get_queryset()
+        if user_model.is_superuser:
+            return qs
+        return qs.filter(
+            Q(entity_model__admin=user_model) |
+            Q(entity_model__managers__in=[user_model])
+        )
+
     def for_entity(self, entity_slug, user_model) -> VendorModelQuerySet:
         """
         Fetches a QuerySet of VendorModel associated with a specific EntityModel & UserModel.
@@ -114,21 +123,13 @@ class VendorModelManager(models.Manager):
         VendorModelQuerySet
             A filtered VendorModel QuerySet.
         """
-        qs = self.get_queryset()
+        qs = self.for_user(user_model)
         if isinstance(entity_slug, lazy_loader.get_entity_model()):
             return qs.filter(
-                Q(entity_model=entity_slug) &
-                (
-                        Q(entity_model__admin=user_model) |
-                        Q(entity_model__managers__in=[user_model])
-                )
+                Q(entity_model=entity_slug)
             )
         return qs.filter(
-            Q(entity_model__slug__exact=entity_slug) &
-            (
-                    Q(entity_model__admin=user_model) |
-                    Q(entity_model__managers__in=[user_model])
-            )
+            Q(entity_model__slug__exact=entity_slug)
         )
 
 

django_ledger/templates/django_ledger/journal_entry/je_list.html

@@ -4,6 +4,9 @@
 {% load django_ledger %}
 
 {% block view_content %}
+    
+{#    {% include 'django_ledger/journal_entry/includes/card_journal_entry.html' je_model= %}#}
+    
     <div class="card">
         <div class="card-content">
             <div class="level">

django_ledger/templatetags/django_ledger.py

@@ -19,7 +19,7 @@ from django_ledger import __version__
 from django_ledger.forms.app_filters import EntityFilterForm, ActivityFilterForm
 from django_ledger.forms.feedback import BugReportForm, RequestNewFeatureForm
 from django_ledger.io import CREDIT, DEBIT, ROLES_ORDER_ALL
-from django_ledger.io.io_mixin import validate_activity
+from django_ledger.io.io_core import validate_activity
 from django_ledger.models import TransactionModel, BillModel, InvoiceModel, EntityUnitModel
 from django_ledger.settings import (
     DJANGO_LEDGER_FINANCIAL_ANALYSIS, DJANGO_LEDGER_CURRENCY_SYMBOL,

django_ledger/tests/base.py

@@ -12,7 +12,7 @@ from django.test import TestCase
 from django.test.client import Client
 from django.utils.timezone import get_default_timezone
 
-from django_ledger.io.data_generator import EntityDataGenerator
+from django_ledger.io.io_generator import EntityDataGenerator
 from django_ledger.models.entity import EntityModel, EntityModelQuerySet
 
 UserModel = get_user_model()

django_ledger/urls/ledger.py

@@ -20,6 +20,9 @@ urlpatterns = [
     path('<slug:entity_slug>/create/',
          views.LedgerModelCreateView.as_view(),
          name='ledger-create'),
+    path('<slug:entity_slug>/detail/<uuid:ledger_pk>/',
+         views.LedgerModelUpdateView.as_view(),
+         name='ledger-detail'),
     path('<slug:entity_slug>/update/<uuid:ledger_pk>/',
          views.LedgerModelUpdateView.as_view(),
          name='ledger-update'),

django_ledger/views/entity.py

@@ -17,8 +17,14 @@ from django.utils.translation import gettext_lazy as _
 from django.views.generic import ListView, DetailView, UpdateView, CreateView, RedirectView, DeleteView
 
 from django_ledger.forms.entity import EntityModelUpdateForm, EntityModelCreateForm
-from django_ledger.io.data_generator import EntityDataGenerator
-from django_ledger.models import (EntityModel, ItemTransactionModel, TransactionModel)
+from django_ledger.io.io_generator import EntityDataGenerator
+from django_ledger.models import (
+    EntityModel,
+    ItemTransactionModel,
+    TransactionModel,
+    InvoiceModel,
+    BillModel
+)
 from django_ledger.views.mixins import (
     QuarterlyReportMixIn, YearlyReportMixIn,
     MonthlyReportMixIn, DateReportMixIn, DjangoLedgerSecurityMixIn, EntityUnitMixIn,
@@ -97,7 +103,7 @@ class EntityModelCreateView(DjangoLedgerSecurityMixIn, EntityModelModelViewQuery
                 start_dttm=localtime() - timedelta(days=30 * 8),
                 capital_contribution=Decimal.from_float(50000),
                 days_forward=30 * 7,
-                tx_quantity=cleaned_data['tx_quantity']
+                tx_quantity=50
             )
             entity_generator.populate_entity()
 

django_ledger/views/ledger.py

@@ -7,7 +7,6 @@ Miguel Sanda <msanda@arrobalytics.com>
 """
 from django.contrib import messages
 from django.core.exceptions import ImproperlyConfigured, ValidationError
-from django.db.models import Count
 from django.urls import reverse
 from django.utils.timezone import localdate
 from django.utils.translation import gettext_lazy as _
@@ -18,12 +17,12 @@ from django.views.generic import (
 from django.views.generic.detail import SingleObjectMixin
 
 from django_ledger.forms.ledger import LedgerModelCreateForm, LedgerModelUpdateForm
-from django_ledger.models.entity import EntityModel
 from django_ledger.models.ledger import LedgerModel
 from django_ledger.views.mixins import (
     YearlyReportMixIn, QuarterlyReportMixIn,
     MonthlyReportMixIn, DjangoLedgerSecurityMixIn, DateReportMixIn, BaseDateNavigationUrlMixIn,
-    EntityUnitMixIn, PDFReportMixIn)
+    EntityUnitMixIn, PDFReportMixIn
+)
 
 
 class LedgerModelModelViewQuerySetMixIn:
@@ -42,7 +41,7 @@ class LedgerModelListView(DjangoLedgerSecurityMixIn, LedgerModelModelViewQuerySe
     context_object_name = 'ledger_list'
     template_name = 'django_ledger/ledger/ledger_list.html'
     PAGE_TITLE = _('Entity Ledgers')
-    paginate_by = 15
+    paginate_by = 30
     extra_context = {
         'page_title': PAGE_TITLE,
         'header_title': PAGE_TITLE
@@ -106,10 +105,8 @@ class LedgerModelCreateView(DjangoLedgerSecurityMixIn, LedgerModelModelViewQuery
         )
 
     def form_valid(self, form):
-        entity = EntityModel.objects.for_user(
-            user_model=self.request.user).get(slug__exact=self.kwargs['entity_slug'])
         instance = form.save(commit=False)
-        instance.entity = entity
+        instance.entity = self.AUTHORIZED_ENTITY_MODEL
         self.object = form.save()
         return super().form_valid(form)
 
@@ -120,6 +117,16 @@ class LedgerModelCreateView(DjangoLedgerSecurityMixIn, LedgerModelModelViewQuery
                        })
 
 
+class LedgerModelDetailView(DjangoLedgerSecurityMixIn, LedgerModelModelViewQuerySetMixIn, RedirectView):
+
+    def get_redirect_url(self, *args, **kwargs):
+        return reverse('django_ledger:je-list',
+                       kwargs={
+                           'ledger_pk': self.kwargs['ledger_pk'],
+                           'entity_slug': self.kwargs['entity_slug']
+                       })
+
+
 class LedgerModelUpdateView(DjangoLedgerSecurityMixIn, LedgerModelModelViewQuerySetMixIn, UpdateView):
     context_object_name = 'ledger'
     pk_url_kwarg = 'ledger_pk'

django_ledger/views/mixins.py

@@ -305,7 +305,15 @@ class DjangoLedgerSecurityMixIn(PermissionRequiredMixin):
             'uuid', 'slug', 'name', 'default_coa', 'admin')
 
     def has_permission(self):
-        if self.request.user.is_authenticated:
+        if self.request.user.is_superuser:
+            if 'entity_slug' in self.kwargs:
+                try:
+                    entity_model_qs = self.get_authorized_entity_queryset()
+                    self.AUTHORIZED_ENTITY_MODEL = entity_model_qs.get(slug__exact=self.kwargs['entity_slug'])
+                except ObjectDoesNotExist:
+                    return False
+            return True
+        elif self.request.user.is_authenticated:
             has_perm = super().has_permission()
             if not has_perm:
                 return False

{django_ledger-0.5.5.5.dist-info → django_ledger-0.5.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-ledger
-Version: 0.5.5.5
+Version: 0.5.6.0
 Summary: Bookkeeping & Financial analysis backend for Django. Balance Sheet, Income Statements, Chart of Accounts, Entities
 Author-email: Miguel Sanda <msanda@arrobalytics.com>
 Maintainer-email: Miguel Sanda <msanda@arrobalytics.com>
@@ -132,13 +132,13 @@ More details available in the [Django Ledger v0.5 Page](https://www.arrobalytics
     * Generate all Django Ledger Model documentation.
 * ~~__0.5.3__~~: High Level EntityModel API.
 * ~~__0.5.4__~~: Balance Sheet Statement, Income Statement & Cash Flow Statement API & PDF report export.
-* __0.5.5__: Closing Entries.
-    * 0.5.5.1: Open Financial Exchange Imports (OFX) Bugfixes and Optimizations.
-    * 0.5.5.2: BugFixes and Optimizations..
-    * 0.5.5.3: Closing Entries will be used if requested date is present. Documentation Update.
-* __0.5.6__: Chart of Accounts Import.
-* __0.5.7__: Trial Balance Import.
-* __0.5.8__: GraphQL API.
+* ~~__0.5.5__~~: Closing Entries.
+    * ~~0.5.5.1~~: Open Financial Exchange Imports (OFX) Bugfixes and Optimizations.
+    * ~~0.5.5.2~~: BugFixes and Optimizations..
+    * ~~0.5.5.3~~: Closing Entries will be used if requested date is present. Documentation Update.
+* __0.5.6__: Transaction Library & Blueprints.
+* __0.5.7__: Chart of Accounts Import.
+* __0.5.8__: Trial Balance Import.
 
 ### Version 0.6