ismail/haikal
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ismail 2025-07-06 13:54:49 +03:00
parent 0c56fcf50a
commit 1ae5f93f6c
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
inventory/models.py
View File

@ -2599,6 +2599,8 @@ class CustomGroup(models.Model):
"vendormodel", "vendormodel",
"journalentrymodel", "journalentrymodel",
"purchaseordermodel", "purchaseordermodel",
"ledgermodel",
"transactionmodel"
], ],
other_perms=["can_approve_estimatemodel","can_approve_billmodel","can_view_inventory","can_view_sales","can_view_crm","can_view_financials","can_view_reports"], other_perms=["can_approve_estimatemodel","can_approve_billmodel","can_view_inventory","can_view_sales","can_view_crm","can_view_financials","can_view_reports"],
@ -2706,7 +2708,8 @@ class CustomGroup(models.Model):
"estimatemodel", "estimatemodel",
"customermodel", "customermodel",
"vendormodel", "vendormodel",
"TransactionModel" "ledgermodel",
"transactionmodel"
], ],
other_perms=["view_customermodel", "view_estimatemodel","can_view_inventory","can_view_sales","can_view_crm","can_view_financials","can_view_reports"], other_perms=["view_customermodel", "view_estimatemodel","can_view_inventory","can_view_sales","can_view_crm","can_view_financials","can_view_reports"],
) )

2
inventory/views.py
View File

@ -8817,7 +8817,6 @@ class JournalEntryListView(LoginRequiredMixin,PermissionRequiredMixin, ListView)
template_name = "ledger/journal_entry/journal_entry_list.html" template_name = "ledger/journal_entry/journal_entry_list.html"
permission_required = ["django_ledger.view_journalentrymodel"] permission_required = ["django_ledger.view_journalentrymodel"]
ordering = ["-timestamp"] ordering = ["-timestamp"]
permission_required = "ledger.view_ledger"
def get_queryset(self): def get_queryset(self):
qs = super().get_queryset() qs = super().get_queryset()
@ -8858,7 +8857,6 @@ class JournalEntryCreateView(LoginRequiredMixin, PermissionRequiredMixin,Success
form_class = forms.JournalEntryModelCreateForm form_class = forms.JournalEntryModelCreateForm
ledger_model = None ledger_model = None
success_message = _("Journal Entry created") success_message = _("Journal Entry created")
permission_required = ["django_ledger.add_journalentrymodel"]
def get_form(self, form_class=None): def get_form(self, form_class=None):
dealer = get_user_type(self.request) dealer = get_user_type(self.request)

12
templates/ledger/journal_entry/journal_entry_list.html
View File

@ -36,7 +36,9 @@
<div class="d-flex justify-content-between mb-2"> <div class="d-flex justify-content-between mb-2">
<h3 class="">{% trans "Journal Entries" %}</h3> <h3 class="">{% trans "Journal Entries" %}</h3>
<a href="{% url 'journalentry_create' request.dealer.slug ledger.pk %}" class="btn btn-md btn-phoenix-primary"><i class="fa fa-plus me-2"></i>{% trans "Add Journal Entry" %}</a> {% if perms.django_ledger.add_journalentrymodel %}
<a href="{% url 'journalentry_create' request.dealer.slug ledger.pk %}" class="btn btn-md btn-phoenix-primary"><i class="fa fa-plus me-2"></i>{% trans "Add Journal Entry" %}</a>
{% endif %}
</div> </div>
@ -96,9 +98,11 @@
<span class="fas fa-ellipsis-h fs-10"></span> <span class="fas fa-ellipsis-h fs-10"></span>
</button> </button>
<div class="dropdown-menu dropdown-menu-end py-2"> <div class="dropdown-menu dropdown-menu-end py-2">
<a class="dropdown-item" href="{% url 'journalentry_transactions' request.dealer.slug je.pk %}">{% trans "View" %}</a> {% if perms.django_ledger.view_transactionmodel %}
<a class="dropdown-item" href="{% url 'journalentry_txs' request.dealer.slug je.entity_slug je.ledger_id je.pk %}">{% trans "Transactions" %}</a> <a class="dropdown-item" href="{% url 'journalentry_transactions' request.dealer.slug je.pk %}">{% trans "View" %}</a>
{% if je.can_delete %} <a class="dropdown-item" href="{% url 'journalentry_txs' request.dealer.slug je.entity_slug je.ledger_id je.pk %}">{% trans "Transactions" %}</a>
{% endif %}
{% if je.can_delete and perms.django_ledger.delete_journalentrymodel %}
<a class="dropdown-item" href="{% url 'journalentry_delete' request.dealer.slug je.pk %}">{% trans "Delete" %}</a> <a class="dropdown-item" href="{% url 'journalentry_delete' request.dealer.slug je.pk %}">{% trans "Delete" %}</a>
{% endif %} {% endif %}
</div> </div>