diff --git a/inventory/urls.py b/inventory/urls.py index 5f5060c7..902e6690 100644 --- a/inventory/urls.py +++ b/inventory/urls.py @@ -933,6 +933,7 @@ urlpatterns = [ views.ItemServiceUpdateView.as_view(), name="item_service_update", ), + # Expanese path( "/items/expeneses/", diff --git a/inventory/views.py b/inventory/views.py index f0f19592..61e18314 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -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. diff --git a/templates/customers/view_customer.html b/templates/customers/view_customer.html index be7a2ec6..6ed96dba 100644 --- a/templates/customers/view_customer.html +++ b/templates/customers/view_customer.html @@ -180,22 +180,22 @@ {% for estimate in estimates %}
-
+
{{ estimate }}
{{ estimate.created|date:"d M Y" }}
-
    +
      {% for sale_order in estimate.sale_orders.all %} -
    • +
    • {{ sale_order }}
    • {% endfor %} {% for invoice in estimate.invoicemodel_set.all %} -
    • +
    • {{ invoice }} {% if invoice.is_paid %}{% trans "Paid" %}{% else %}{% trans "Unpaid" %}{% endif %}