Enhance account handling and transaction filtering

Added `entity_slug` and `user_model` to template context for better context data. Updated the form to include `balance_type` as a selectable field with proper styling. Adjusted transaction queryset to exclude closing entries in account views for more accurate filtering.
arrobalytics · Jan 6, 2025 · 515b3ad · 515b3ad
1 parent f6b9bce
commit 515b3ad
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/django_ledger/forms/account.py b/django_ledger/forms/account.py
@@ -145,13 +145,16 @@ def clean_role_default(self):
 
     class Meta:
         model = AccountModel
-        exclude = ('depth', 'numchild', 'path', 'balance_type')
+        exclude = ('depth', 'numchild', 'path')
         widgets = {
             'role': HiddenInput(),
             'coa_model': HiddenInput(),
             'parent': Select(attrs={
                 'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
             }),
+            'balance_type': Select(attrs={
+                'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
+            }),
             'code': TextInput(attrs={
                 'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
             }),

diff --git a/django_ledger/templatetags/django_ledger.py b/django_ledger/templatetags/django_ledger.py
@@ -133,6 +133,8 @@ def cash_flow_statement(context, io_model):
         process_groups=True)
 
     return {
+        'entity_slug': entity_slug,
+        'user_model': user_model,
         'tx_digest': io_digest.get_io_data()
     }
 
@@ -164,6 +166,8 @@ def income_statement_table(context, io_model, from_date=None, to_date=None):
     )
 
     return {
+        'entity_slug': entity_slug,
+        'user_model': user_model,
         'tx_digest': io_digest.get_io_data()
     }
 

diff --git a/django_ledger/views/account.py b/django_ledger/views/account.py
@@ -186,7 +186,7 @@ def get_context_data(self, **kwargs):
         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(
+        txs_qs = account_model.transactionmodel_set.all().not_closing_entry().posted().order_by(
             'journal_entry__timestamp'
         ).select_related(
             'journal_entry',