new small fixes regarding the filtering in the form and the po delete #279
@ -11152,7 +11152,6 @@ class BasePurchaseOrderActionActionView(BasePurchaseOrderActionActionViewBase):
|
||||
|
||||
|
||||
class PurchaseOrderModelDeleteView(PurchaseOrderModelDeleteViewBase):
|
||||
template_name = "purchase_orders/po_delete.html"
|
||||
permission_required = "django_ledger.delete_purchaseordermodel"
|
||||
|
||||
def get_success_url(self):
|
||||
@ -11162,8 +11161,9 @@ class PurchaseOrderModelDeleteView(PurchaseOrderModelDeleteViewBase):
|
||||
level=messages.SUCCESS,
|
||||
)
|
||||
return reverse(
|
||||
"purchase_order_list", kwargs={"dealer_slug": self.kwargs["dealer_slug"]}
|
||||
"purchase_order_list", kwargs={"dealer_slug": self.kwargs["dealer_slug"],"entity_slug":self.kwargs['entity_slug']}
|
||||
)
|
||||
|
||||
|
||||
|
||||
class PurchaseOrderMarkAsDraftView(BasePurchaseOrderActionActionView):
|
||||
|
||||
@ -94,6 +94,7 @@
|
||||
<th class="sort white-space-nowrap align-middle " scope="col">{% trans 'PO' %}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody class="list fs-9" id="project-list-table-body">
|
||||
{% for bill_item in itemtxs_qs %}
|
||||
<tr>
|
||||
|
||||
@ -19,6 +19,7 @@
|
||||
method="post" class="needs-validation" novalidate>
|
||||
{% csrf_token %}
|
||||
{{ form|crispy }}
|
||||
|
||||
<hr class="my-4">
|
||||
<div class="d-grid gap-2 d-md-flex justify-content-md-center mt-3">
|
||||
<button class="btn btn-phoenix-primary btn-lg me-md-2" type="submit">
|
||||
@ -27,7 +28,7 @@
|
||||
</button>
|
||||
<a href="{% url 'dealer_detail' request.dealer.slug %}"
|
||||
class="btn btn-lg btn-phoenix-secondary md-me-2"
|
||||
type="submit"><i class="fa-solid fa-ban me-1"></i>{{ _("Cancel") }}</a>
|
||||
type="submit"><i class="fa-solid fa-ban me-1"></i>{{ _("Go Back") }}</a>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
@ -45,7 +45,7 @@
|
||||
href="{% url 'purchase_order_list' request.dealer.slug request.dealer.entity.slug %}"
|
||||
title="Click to view the complete list of Purchase Orders"
|
||||
role="button">
|
||||
<i class="fas fa-list me-2"></i>{% trans 'PO List' %}
|
||||
<i class="fas fa-list me-2"></i>{% trans 'Purchase Order List' %}
|
||||
</a>
|
||||
</p>
|
||||
</div>
|
||||
@ -135,15 +135,29 @@
|
||||
{% endif %}
|
||||
{% if po_model.can_delete %}
|
||||
{% if perms.django_ledger.delete_purchaseordermodel %}
|
||||
<button class="btn btn-phoenix-danger"
|
||||
onclick="showPOModal('Delete PO', '{% url 'po-delete' request.dealer.slug entity_slug po_model.pk %}', 'Delete')">
|
||||
<i class="fas fa-trash me-2"></i>{% trans 'Delete' %}
|
||||
<button type="button" class="btn btn-phoenix-danger" data-bs-toggle="modal" data-bs-target="#exampleModal">
|
||||
{% trans "Delete" %}
|
||||
</button>
|
||||
|
||||
<div class="modal fade" id="exampleModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title" id="exampleModalLabel">{% trans "Purchase Order Delete" %}</h5>
|
||||
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
{% include 'purchase_orders/po_confirm_delete.html' %}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% if po_model.can_void %}
|
||||
<button class="btn btn-phoenix-danger"
|
||||
onclick="showPOModal('Void PO', '{% url 'po-action-mark-as-void' request.dealer.slug entity_slug po_model.pk %}', 'Mark As Void')">
|
||||
onclick="showPOModal('{% trans "Void Purchase Order" %}', '{% url 'po-action-mark-as-void' request.dealer.slug entity_slug po_model.pk %}', 'Mark As Void')">
|
||||
<i class="fas fa-times-circle me-2"></i>{% trans 'Void' %}
|
||||
</button>
|
||||
{% endif %}
|
||||
|
||||
@ -1,19 +1,12 @@
|
||||
<!-- templates/purchase_orders/po_confirm_delete.html -->
|
||||
{% extends "base.html" %}
|
||||
{%load i18n %}
|
||||
{% block title %}{% trans "Confirm Delete"%} - {{ block.super }}{% endblock %}
|
||||
{% block content %}
|
||||
<div class="container mt-4">
|
||||
<h2>{% trans "Confirm Deletion" %}</h2>
|
||||
<p>
|
||||
{% trans "Are you sure you want to delete the Purchase Order" %} <strong>"{{ object.po_number }}"</strong>?
|
||||
</p>
|
||||
<form method="post">
|
||||
{% csrf_token %}
|
||||
<button type="submit" class="btn btn-phoenix-danger">{% trans "Yes, Delete" %}</button>
|
||||
<a href="{% url 'purchase_order_detail' request.dealer.slug request.dealer.entity.slug object.pk %}"
|
||||
class="btn btn-phoenix-secondary">{% trans "Cancel" %}</a>
|
||||
</form>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% load i18n %}
|
||||
<form action="{% url 'po-delete' dealer_slug entity_slug po_model.pk %}" method="post">
|
||||
{% csrf_token %}
|
||||
<p>
|
||||
{% blocktrans with po_number=po_model.po_number %}
|
||||
Are you sure you want to delete #{{ po_number }}?
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
<button type="submit" class="btn btn-phoenix-danger">{% trans "Yes, Delete" %}</button>
|
||||
<a href="{% url 'purchase_order_detail' request.dealer.slug request.dealer.entity.slug po_model.pk %}"
|
||||
class="btn btn-phoenix-secondary">{% trans "No" %}</a>
|
||||
</form>
|
||||
@ -1,37 +0,0 @@
|
||||
{% extends 'base.html' %}
|
||||
{% load i18n %}
|
||||
{% load static %}
|
||||
{% load django_ledger %}
|
||||
{% block title %}
|
||||
{% trans "Delete Purchase Order" %}
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-md-6">
|
||||
<form action="{% url 'po-delete' dealer_slug=request.dealer.slug entity_slug=view.kwargs.entity_slug po_pk=po_model.uuid %}"
|
||||
method="post">
|
||||
{% csrf_token %}
|
||||
<div class="card shadow">
|
||||
<div class="card-body text-center py-4">
|
||||
<h2 class="card-title h3 fw-light mb-4">
|
||||
{% blocktrans %}Are you sure you want to delete
|
||||
Purchase Order {{ po_model.po_number }}?{% endblocktrans %}
|
||||
</h2>
|
||||
<p class="card-text text-muted mb-4">
|
||||
{% trans "All transactions associated with this Purchase Order will be deleted.If you want to void the PO instead," %}
|
||||
<a href="{% url 'purchase_order_detail' dealer_slug=request.dealer.slug entity_slug=view.kwargs.entity_slug pk=po_model.uuid %}"
|
||||
class="text-decoration-none">{% trans "click here" %}</a>
|
||||
</p>
|
||||
<div class="d-flex justify-content-center gap-3 mt-4">
|
||||
<a href="{% url 'purchase_order_update' dealer_slug=request.dealer.slug entity_slug=view.kwargs.entity_slug po_pk=po_model.uuid %}"
|
||||
class="btn btn-phoenix-primary px-4">{% trans 'Go Back' %}</a>
|
||||
<button type="submit" class="btn btn-phoenix-danger px-4">{% trans 'Delete' %}</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
|
||||
@ -142,8 +142,8 @@
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
<a href="{% url 'invoice_preview' request.dealer.slug invoice.pk %}"
|
||||
class="btn btn-phoenix-primary"><span class="d-none d-sm-inline-block"><i class="fa-regular fa-eye"></i> {% trans 'Preview' %}</span></a>
|
||||
<a href="{% url 'invoice_preview' request.dealer.slug invoice.pk %}"
|
||||
class="btn btn-phoenix-primary" target="_blank" rel="noopener noreferrer"><span class="d-none d-sm-inline-block" ><i class="fa-regular fa-eye"></i> {% trans 'Preview' %}</span></a>
|
||||
<a href="{% url 'invoice_preview' request.dealer.slug invoice.pk %}?lang=en"
|
||||
class="btn btn-phoenix-secondary"
|
||||
target="_blank">
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user