update
This commit is contained in:
parent
23a67d22a0
commit
b33d928bcc
@ -2662,11 +2662,12 @@ class CustomGroup(models.Model):
|
|||||||
"staff",
|
"staff",
|
||||||
"schedule",
|
"schedule",
|
||||||
"activity",
|
"activity",
|
||||||
|
"lead",
|
||||||
"opportunity",
|
"opportunity",
|
||||||
"customer",
|
"customer",
|
||||||
"organization",
|
"organization",
|
||||||
"notes",
|
"notes",
|
||||||
"taska",
|
"tasks",
|
||||||
"activity",
|
"activity",
|
||||||
],
|
],
|
||||||
other_perms=[
|
other_perms=[
|
||||||
@ -2692,7 +2693,8 @@ class CustomGroup(models.Model):
|
|||||||
"carfinance",
|
"carfinance",
|
||||||
"notes",
|
"notes",
|
||||||
"tasks",
|
"tasks",
|
||||||
"activity",],
|
"activity",
|
||||||
|
"vendor"],
|
||||||
other_perms=[
|
other_perms=[
|
||||||
"view_car",
|
"view_car",
|
||||||
"view_carlocation",
|
"view_carlocation",
|
||||||
@ -2713,11 +2715,11 @@ class CustomGroup(models.Model):
|
|||||||
"itemmodel",
|
"itemmodel",
|
||||||
"invoicemodel",
|
"invoicemodel",
|
||||||
"vendormodel",
|
"vendormodel",
|
||||||
|
|
||||||
"journalentrymodel",
|
"journalentrymodel",
|
||||||
"purchaseordermodel",
|
"purchaseordermodel",
|
||||||
"estimatemodel",
|
"estimatemodel",
|
||||||
"customermodel",
|
"customermodel",
|
||||||
"vendormodel",
|
|
||||||
"ledgermodel",
|
"ledgermodel",
|
||||||
"transactionmodel"
|
"transactionmodel"
|
||||||
],
|
],
|
||||||
|
|||||||
@ -10234,7 +10234,6 @@ class BillModelActionForceMigrateView(BaseBillActionView):
|
|||||||
|
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
@permission_required("inventory.view_poitemsuploaded", raise_exception=True)
|
|
||||||
def view_items_inventory(request, dealer_slug, entity_slug, po_pk):
|
def view_items_inventory(request, dealer_slug, entity_slug, po_pk):
|
||||||
get_object_or_404(models.Dealer, slug=dealer_slug)
|
get_object_or_404(models.Dealer, slug=dealer_slug)
|
||||||
po = PurchaseOrderModel.objects.get(pk=po_pk)
|
po = PurchaseOrderModel.objects.get(pk=po_pk)
|
||||||
|
|||||||
@ -184,10 +184,12 @@
|
|||||||
</td>
|
</td>
|
||||||
<td class="align-items-start white-space-nowrap pe-2">
|
<td class="align-items-start white-space-nowrap pe-2">
|
||||||
{% if bill_item.po_model_id %}
|
{% if bill_item.po_model_id %}
|
||||||
|
{% if perms.django_ledger.view_purchaseordermodel%}
|
||||||
<a class="btn btn-sm btn-phoenix-primary"
|
<a class="btn btn-sm btn-phoenix-primary"
|
||||||
href="{% url 'purchase_order_detail' request.dealer.slug request.dealer.entity.slug bill_item.po_model_id %}">
|
href="{% url 'purchase_order_detail' request.dealer.slug request.dealer.entity.slug bill_item.po_model_id %}">
|
||||||
{% trans 'View PO' %}
|
{% trans 'View PO' %}
|
||||||
</a>
|
</a>
|
||||||
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@ -231,9 +233,11 @@
|
|||||||
<h5 class="mb-0">{% trans 'Bill Notes' %}</h5>
|
<h5 class="mb-0">{% trans 'Bill Notes' %}</h5>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{% if perms.django_ledger.change_billmodel%}
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
{% include 'bill/includes/card_markdown.html' with style='card_1' title='' notes_html=bill.notes_html %}
|
{% include 'bill/includes/card_markdown.html' with style='card_1' title='' notes_html=bill.notes_html %}
|
||||||
</div>
|
</div>
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -207,7 +207,7 @@
|
|||||||
{% if perms.django_ledger.change_billmodel%}
|
{% if perms.django_ledger.change_billmodel%}
|
||||||
<a href="{% url 'bill-update' dealer_slug=dealer_slug entity_slug=entity_slug bill_pk=bill.uuid %}" class="btn btn-phoenix-primary">
|
<a href="{% url 'bill-update' dealer_slug=dealer_slug entity_slug=entity_slug bill_pk=bill.uuid %}" class="btn btn-phoenix-primary">
|
||||||
<i class="fas fa-edit me-2"></i>{% trans 'Update' %}
|
<i class="fas fa-edit me-2"></i>{% trans 'Update' %}
|
||||||
|
</a>
|
||||||
<!-- Mark as Draft -->
|
<!-- Mark as Draft -->
|
||||||
{% if bill.can_draft %}
|
{% if bill.can_draft %}
|
||||||
<button class="btn btn-phoenix-success"
|
<button class="btn btn-phoenix-success"
|
||||||
@ -223,7 +223,7 @@
|
|||||||
</button>
|
</button>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<!-- Mark as Approved -->
|
<!-- Mark as Approved -->
|
||||||
{% if bill.can_approve and perms.django_ledger.can_approve_bill %}
|
{% if bill.can_approve and perms.django_ledger.can_approve_billmodel %}
|
||||||
<button class="btn btn-phoenix-success"
|
<button class="btn btn-phoenix-success"
|
||||||
onclick="showPOModal('Mark as Approved', '{% url 'bill-action-mark-as-approved' dealer_slug=request.dealer.slug entity_slug=entity_slug bill_pk=bill.pk %}', 'Mark as Approved')">
|
onclick="showPOModal('Mark as Approved', '{% url 'bill-action-mark-as-approved' dealer_slug=request.dealer.slug entity_slug=entity_slug bill_pk=bill.pk %}', 'Mark as Approved')">
|
||||||
<i class="fas fa-check-circle me-2"></i>{% trans 'Mark as Approved' %}
|
<i class="fas fa-check-circle me-2"></i>{% trans 'Mark as Approved' %}
|
||||||
|
|||||||
@ -290,7 +290,7 @@
|
|||||||
<div class="tab-pane fade" id="tab-notes" role="tabpanel" aria-labelledby="notes-tab">
|
<div class="tab-pane fade" id="tab-notes" role="tabpanel" aria-labelledby="notes-tab">
|
||||||
<div class="mb-1 d-flex align-items-center justify-content-between">
|
<div class="mb-1 d-flex align-items-center justify-content-between">
|
||||||
<h3 class="mb-4" id="scrollspyNotes">{{ _("Notes") }}</h3>
|
<h3 class="mb-4" id="scrollspyNotes">{{ _("Notes") }}</h3>
|
||||||
{% if perms.inventory.change_lead%}
|
{% if perms.inventory.change_lead %}
|
||||||
<button class="btn btn-phoenix-primary btn-sm" type="button" onclick="reset_form()" data-bs-toggle="modal" data-bs-target="#noteModal"><span class="fas fa-plus me-1"></span>{{ _("Add Note") }}</button>
|
<button class="btn btn-phoenix-primary btn-sm" type="button" onclick="reset_form()" data-bs-toggle="modal" data-bs-target="#noteModal"><span class="fas fa-plus me-1"></span>{{ _("Add Note") }}</button>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -52,16 +52,20 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-footer d-flex ">
|
<div class="card-footer d-flex ">
|
||||||
|
{% if perms.django_ledger.change_bankaccountmodel%}
|
||||||
<a class="btn btn-sm btn-phoenix-primary me-1" href="{% url 'bank_account_update' request.dealer.slug bank_account.pk %}">
|
<a class="btn btn-sm btn-phoenix-primary me-1" href="{% url 'bank_account_update' request.dealer.slug bank_account.pk %}">
|
||||||
<!--<i class="bi bi-pencil-square"></i> -->
|
<!--<i class="bi bi-pencil-square"></i> -->
|
||||||
{{ _("Edit") }}
|
{{ _("Edit") }}
|
||||||
</a>
|
</a>
|
||||||
|
{% endif %}
|
||||||
|
{% if perms.django_ledger.delete_bankaccountmodel%}
|
||||||
<a class="btn btn-sm btn-phoenix-danger me-1"
|
<a class="btn btn-sm btn-phoenix-danger me-1"
|
||||||
data-bs-toggle="modal"
|
data-bs-toggle="modal"
|
||||||
data-bs-target="#deleteModal">
|
data-bs-target="#deleteModal">
|
||||||
<!--<i class="bi bi-trash-fill"></i>-->
|
<!--<i class="bi bi-trash-fill"></i>-->
|
||||||
{{ _("Delete") }}
|
{{ _("Delete") }}
|
||||||
</a>
|
</a>
|
||||||
|
{% endif %}
|
||||||
<a class="btn btn-sm btn-phoenix-secondary"
|
<a class="btn btn-sm btn-phoenix-secondary"
|
||||||
href="{% url 'bank_account_list' request.dealer.slug %}">
|
href="{% url 'bank_account_list' request.dealer.slug %}">
|
||||||
<!--<i class="bi bi-arrow-left-square-fill"></i>-->
|
<!--<i class="bi bi-arrow-left-square-fill"></i>-->
|
||||||
|
|||||||
@ -96,12 +96,14 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
<td class="align-middle white-space-nowrap text-start">
|
<td class="align-middle white-space-nowrap text-start">
|
||||||
|
{% if perms.django_ledger.view_transactionmodel%}
|
||||||
<div class="btn-reveal-trigger position-static">
|
<div class="btn-reveal-trigger position-static">
|
||||||
<button class="btn btn-sm dropdown-toggle dropdown-caret-none transition-none btn-reveal fs-10" type="button" data-bs-toggle="dropdown" data-boundary="window" aria-haspopup="true" aria-expanded="false" data-bs-reference="parent"><span class="fas fa-ellipsis-h fs-10"></span></button>
|
<button class="btn btn-sm dropdown-toggle dropdown-caret-none transition-none btn-reveal fs-10" type="button" data-bs-toggle="dropdown" data-boundary="window" aria-haspopup="true" aria-expanded="false" data-bs-reference="parent"><span class="fas fa-ellipsis-h fs-10"></span></button>
|
||||||
<div class="dropdown-menu dropdown-menu-end py-2">
|
<div class="dropdown-menu dropdown-menu-end py-2">
|
||||||
<a class="dropdown-item text-success-dark" href="{% url 'payment_details' request.dealer.slug tx.journal_entry.pk %}">{% trans 'view Transactions'|capfirst %}</a>
|
<a class="dropdown-item text-success-dark" href="{% url 'payment_details' request.dealer.slug tx.journal_entry.pk %}">{% trans 'view Transactions'|capfirst %}</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
@ -135,17 +137,21 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mt-3 d-flex">
|
<div class="mt-3 d-flex">
|
||||||
|
{% if perms.django_ledger.change_chartofaccountmodel%}
|
||||||
<a class="btn btn-sm btn-phoenix-primary me-1" href="{% url 'account_update' request.dealer.slug account.pk %}">
|
<a class="btn btn-sm btn-phoenix-primary me-1" href="{% url 'account_update' request.dealer.slug account.pk %}">
|
||||||
<!-- <i class="bi bi-pencil-square"></i> -->
|
<!-- <i class="bi bi-pencil-square"></i> -->
|
||||||
<i class="fa-solid fa-pen-to-square"></i> {{ _('Edit') }}
|
<i class="fa-solid fa-pen-to-square"></i> {{ _('Edit') }}
|
||||||
</a>
|
</a>
|
||||||
|
{% endif %}
|
||||||
|
{% if perms.django_ledger.delete_chartofaccountmodel%}
|
||||||
<a class="btn btn-sm btn-phoenix-danger me-1" data-bs-toggle="modal" data-bs-target="#deleteModal">
|
<a class="btn btn-sm btn-phoenix-danger me-1" data-bs-toggle="modal" data-bs-target="#deleteModal">
|
||||||
<!-- <i class="bi bi-trash-fill"></i> -->
|
<!-- <i class="bi bi-trash-fill"></i> -->
|
||||||
<i class="fa-solid fa-trash"></i> {{ _('Delete') }}
|
<i class="fa-solid fa-trash"></i> {{ _('Delete') }}
|
||||||
</a>
|
</a>
|
||||||
|
{% endif%}
|
||||||
<a class="btn btn-sm btn-phoenix-secondary" href="{% url 'account_list' request.dealer.slug %}">
|
<a class="btn btn-sm btn-phoenix-secondary" href="{% url 'account_list' request.dealer.slug %}">
|
||||||
<!-- <i class="bi bi-arrow-left-square-fill"></i> -->
|
<!-- <i class="bi bi-arrow-left-square-fill"></i> -->
|
||||||
<i class="fa-regular fa-circle-left"></i> {% trans 'Back to List' %}
|
<i class="fa-regular fa-circle-left"></i> {% trans 'Back to COA List' %}
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@ -11,7 +11,9 @@
|
|||||||
<div class="row mt-4">
|
<div class="row mt-4">
|
||||||
<div class="d-flex justify-content-between mb-2">
|
<div class="d-flex justify-content-between mb-2">
|
||||||
<h3 class=""><i class="fa-solid fa-book"></i> {% trans "Accounts" %}</h3>
|
<h3 class=""><i class="fa-solid fa-book"></i> {% trans "Accounts" %}</h3>
|
||||||
|
{% if perms.django_ledger.create_chartofaccountmodel %}
|
||||||
<a href="{% url 'account_create' request.dealer.slug %}" class="btn btn-md btn-phoenix-primary"><i class="fa fa-plus me-2"></i>{% trans 'New Account' %}</a>
|
<a href="{% url 'account_create' request.dealer.slug %}" class="btn btn-md btn-phoenix-primary"><i class="fa fa-plus me-2"></i>{% trans 'New Account' %}</a>
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Account Type Tabs -->
|
<!-- Account Type Tabs -->
|
||||||
@ -105,10 +107,12 @@
|
|||||||
<div class="modal-dialog modal-sm">
|
<div class="modal-dialog modal-sm">
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
|
{% if perms.django_ledger.delete_chartofaccountmodel %}
|
||||||
<h5 class="modal-title" id="deleteModalLabel">
|
<h5 class="modal-title" id="deleteModalLabel">
|
||||||
{% trans "Delete Account" %}
|
{% trans "Delete Account" %}
|
||||||
<span data-feather="alert-circle"></span>
|
<span data-feather="alert-circle"></span>
|
||||||
</h5>
|
</h5>
|
||||||
|
{% endif %}
|
||||||
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
|
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-body text-center">
|
<div class="modal-body text-center">
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user