update the coa filter
This commit is contained in:
parent
5d79ea90d7
commit
4998888172
@ -710,3 +710,13 @@ def invoice_item_formset_table(context, itemtxs_formset):
|
|||||||
"total_amount__sum": context["total_amount__sum"],
|
"total_amount__sum": context["total_amount__sum"],
|
||||||
"itemtxs_formset": itemtxs_formset,
|
"itemtxs_formset": itemtxs_formset,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@register.filter
|
||||||
|
def filter_by_status(queryset, status):
|
||||||
|
if status == "active":
|
||||||
|
return queryset.filter(active=True)
|
||||||
|
elif status == "locked":
|
||||||
|
return queryset.filter(locked=True)
|
||||||
|
else:
|
||||||
|
return queryset
|
||||||
|
|||||||
@ -4412,17 +4412,7 @@ class AccountCreateView(
|
|||||||
|
|
||||||
def form_valid(self, form):
|
def form_valid(self, form):
|
||||||
dealer = get_user_type(self.request)
|
dealer = get_user_type(self.request)
|
||||||
instance = form.save(commit=False)
|
|
||||||
coa = ChartOfAccountModel.objects.get(entity=dealer.entity,pk=self.kwargs["coa_pk"]) or self.request.entity.get_default_coa()
|
coa = ChartOfAccountModel.objects.get(entity=dealer.entity,pk=self.kwargs["coa_pk"]) or self.request.entity.get_default_coa()
|
||||||
# coa.insert_account(account_model=instance)
|
|
||||||
account = coa.entity.create_account(
|
|
||||||
coa_model=coa,
|
|
||||||
code=instance.code,
|
|
||||||
name=instance.name,
|
|
||||||
role=instance.role,
|
|
||||||
balance_type=_(instance.balance_type),
|
|
||||||
active=True,
|
|
||||||
)
|
|
||||||
form.instance.entity_model = dealer.entity
|
form.instance.entity_model = dealer.entity
|
||||||
form.instance.coa_model = coa
|
form.instance.coa_model = coa
|
||||||
form.instance.depth = 0
|
form.instance.depth = 0
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
{% load django_ledger %}
|
{% load django_ledger %}
|
||||||
|
{% load custom_filters %}
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
{% now "Y" as current_year %}
|
{% now "Y" as current_year %}
|
||||||
<div class="card shadow-sm border-0 mb-4">
|
<div class="card shadow-sm border-0 mb-4">
|
||||||
@ -47,15 +48,15 @@
|
|||||||
<div class="col-sm-6">
|
<div class="col-sm-6">
|
||||||
<div class="mb-2">
|
<div class="mb-2">
|
||||||
<span class="fw-bold"><i class="fas fa-list-alt me-1"></i> {% trans 'Total Accounts' %}:</span>
|
<span class="fw-bold"><i class="fas fa-list-alt me-1"></i> {% trans 'Total Accounts' %}:</span>
|
||||||
<span class="ms-2">{{ coa_model.accountmodel_total__count }}</span>
|
<span class="ms-2">{{ coa_model.accountmodel_set.all|length }}</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="mb-2">
|
<div class="mb-2">
|
||||||
<span class="fw-bold text-info"><i class="fas fa-check-circle me-1"></i> {% trans 'Active Accounts' %}:</span>
|
<span class="fw-bold text-info"><i class="fas fa-check-circle me-1"></i> {% trans 'Active Accounts' %}:</span>
|
||||||
<span class="ms-2">{{ coa_model.accountmodel_active__count }}</span>
|
<span class="ms-2">{{ coa_model.accountmodel_set|filter_by_status:'active'|length }}</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="mb-2">
|
<div class="mb-2">
|
||||||
<span class="fw-bold text-danger"><i class="fas fa-lock me-1"></i> {% trans 'Locked Accounts' %}:</span>
|
<span class="fw-bold text-danger"><i class="fas fa-lock me-1"></i> {% trans 'Locked Accounts' %}:</span>
|
||||||
<span class="ms-2">{{ coa_model.accountmodel_locked__count }}</span>
|
<span class="ms-2">{{ coa_model.accountmodel_set|filter_by_status:'locked'|length }}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user