bug fixes
This commit is contained in:
parent
e1b680603e
commit
f16c6b6a51
@ -933,6 +933,7 @@ urlpatterns = [
|
||||
views.ItemServiceUpdateView.as_view(),
|
||||
name="item_service_update",
|
||||
),
|
||||
|
||||
# Expanese
|
||||
path(
|
||||
"<slug:dealer_slug>/items/expeneses/",
|
||||
|
||||
@ -7358,10 +7358,15 @@ class ItemServiceListView(LoginRequiredMixin, PermissionRequiredMixin, ListView)
|
||||
query = self.request.GET.get("q")
|
||||
qs = models.AdditionalServices.objects.filter(dealer=dealer).all()
|
||||
if query:
|
||||
qs = apply_search_filters(qs, query)
|
||||
qs = qs.filter(Q(name__icontains=query)|
|
||||
Q(id__icontains=query)|
|
||||
Q(uom__icontains=query)
|
||||
)
|
||||
return qs
|
||||
|
||||
|
||||
|
||||
|
||||
class ItemExpenseCreateView(LoginRequiredMixin, PermissionRequiredMixin,SuccessMessageMixin, CreateView):
|
||||
"""
|
||||
Represents a view for creating item expense entries.
|
||||
@ -7453,6 +7458,9 @@ class ItemExpenseUpdateView(LoginRequiredMixin, PermissionRequiredMixin, UpdateV
|
||||
)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
class ItemExpenseListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
|
||||
"""
|
||||
Handles the display of a list of item expenses.
|
||||
|
||||
@ -180,22 +180,22 @@
|
||||
{% for estimate in estimates %}
|
||||
<div class="card mb-3 shadow-sm">
|
||||
<div class="card-body p-3">
|
||||
<div class="d-flex align-items-center justify-content-between mb-2">
|
||||
<div class="d-flex align-items-center justify-content-between mb-3">
|
||||
<h6 class="mb-0">
|
||||
<i class="fas fa-file-invoice me-2 text-info"></i>
|
||||
<a href="{% url 'estimate_detail' request.dealer.slug estimate.pk %}" class="text-decoration-none">{{ estimate }}</a>
|
||||
</h6>
|
||||
<span class="badge bg-success">{{ estimate.created|date:"d M Y" }}</span>
|
||||
</div>
|
||||
<ul class="list-unstyled mb-0 ms-3">
|
||||
<ul class="list-unstyled mb-0 ms-5">
|
||||
{% for sale_order in estimate.sale_orders.all %}
|
||||
<li>
|
||||
<li class="mb-2">
|
||||
<i class="fas fa-truck-moving me-2 text-success"></i>
|
||||
<a href="{% url 'order_detail' request.dealer.slug sale_order.pk %}">{{ sale_order }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
{% for invoice in estimate.invoicemodel_set.all %}
|
||||
<li>
|
||||
<li class="mb-2">
|
||||
<i class="fas fa-receipt me-2 {% if invoice.is_paid %}text-success{% else %}text-warning{% endif %}"></i>
|
||||
<a href="{% url 'invoice_detail' request.dealer.slug request.entity.slug invoice.pk %}" class="text-decoration-none">{{ invoice }}</a>
|
||||
<span class="badge rounded-pill {% if invoice.is_paid %}bg-success{% else %}bg-warning{% endif %} ms-2">{% if invoice.is_paid %}{% trans "Paid" %}{% else %}{% trans "Unpaid" %}{% endif %}</span>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user