From 788396eee4a6750b3419c43c9e4ab7052496298d Mon Sep 17 00:00:00 2001
From: Faheedkhan <faheedk215@gmail.com>
Date: Wed, 30 Jul 2025 12:54:56 +0300
Subject: [PATCH 1/4] plans history ui

---
 inventory/views.py                   | 2 ++
 templates/dealers/dealer_detail.html | 2 +-
 templates/plans/order_list.html      | 2 +-
 templates/users/user_detail.html     | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/inventory/views.py b/inventory/views.py
index f8ba32eb..2d7a7533 100644
--- a/inventory/views.py
+++ b/inventory/views.py
@@ -10365,7 +10365,9 @@ def upload_cars(request, dealer_slug, pk=None):
             f"User {user_username}  retrieved ItemTransactionModel PK: {pk} for car upload."
         )
         item = get_object_or_404(ItemTransactionModel, pk=pk)
+       
         po_item = models.PoItemsUploaded.objects.get(dealer=dealer, item=item)
+      
         response = redirect("upload_cars", dealer_slug=dealer_slug, pk=pk)
         if po_item.status == "uploaded":
             messages.add_message(request, messages.ERROR, "Item already uploaded.")
diff --git a/templates/dealers/dealer_detail.html b/templates/dealers/dealer_detail.html
index 59bab6df..525520b7 100644
--- a/templates/dealers/dealer_detail.html
+++ b/templates/dealers/dealer_detail.html
@@ -11,7 +11,7 @@
                 <div class="col-auto">
                     <div class="row g-2 g-sm-3">
                         <div class="col-auto">
-                            <a href="{% url 'order_list' %}" class="btn btn-phoenix-success"><span class="fas fa-list me-2"></span>{{ _("Orders") }}</a>
+                            <a href="{% url 'order_list' %}" class="btn btn-phoenix-success"><span class="fas fa-clipboard-list me-2"></span>{{ _("Plans History") }}</a>
                         </div>
                         <div class="col-auto">
                             <a href="{% url 'billing_info' %}" class="btn btn-phoenix-info"><span class="fas fa-credit-card me-2"></span>{{ _("Billing Information") }}</a>
diff --git a/templates/plans/order_list.html b/templates/plans/order_list.html
index 4f6f4132..7874a3ee 100644
--- a/templates/plans/order_list.html
+++ b/templates/plans/order_list.html
@@ -5,7 +5,7 @@
     {% block body %}
         {% block order_header %}
             <h3 class="mt-4">
-                <i class="fa-solid fa-list me-2"></i>{% trans "List of orders" %}
+                {% trans "Plan Purchase History" %}<i class="fa-solid fa-clipboard-list ms-2 text-primary"></i>
             </h3>
         {% endblock %}
         {% if object_list %}
diff --git a/templates/users/user_detail.html b/templates/users/user_detail.html
index 46663f81..9246bfc9 100644
--- a/templates/users/user_detail.html
+++ b/templates/users/user_detail.html
@@ -92,7 +92,7 @@
                     {{ _("Delete") }}
                     <i class="fas fa-trash"></i>
                 </button>
-                <a class="btn btn-sm btn-phoenix-secondary"
+                <a class="btn btn-sm btn-phoenix-secondary me-1"
                    href="{% url 'user_list' request.dealer.slug %}">
                     {{ _("Back to List") }}
                     <i class="fa-regular fa-circle-left"></i>
-- 
2.39.5


From 499de137ba11099b96233a7da58dfe384123e6e6 Mon Sep 17 00:00:00 2001
From: Faheedkhan <faheedk215@gmail.com>
Date: Thu, 31 Jul 2025 13:53:00 +0300
Subject: [PATCH 2/4] update

---
 inventory/signals.py                          |  2 +-
 inventory/views.py                            |  1 +
 templates/base.html                           |  2 +-
 .../crm/opportunities/opportunity_detail.html |  6 +++---
 .../sales/estimates/estimate_detail.html      | 19 +++++++++----------
 templates/sales/invoices/invoice_create.html  |  2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/inventory/signals.py b/inventory/signals.py
index e62fafde..dfc90c1f 100644
--- a/inventory/signals.py
+++ b/inventory/signals.py
@@ -1032,7 +1032,7 @@ def po_fullfilled_notification(sender, instance, created, **kwargs):
                 ).format(
                     url=reverse(
                         "purchase_order_detail",
-                        kwargs={"dealer_slug": dealer.slug, "pk": instance.pk},
+                        kwargs={"dealer_slug": dealer.slug,"entity_slug":instance.entity.slug, "pk": instance.pk},
                     ),
                 ),
             )
diff --git a/inventory/views.py b/inventory/views.py
index 8c3ea172..39cb9a47 100644
--- a/inventory/views.py
+++ b/inventory/views.py
@@ -4798,6 +4798,7 @@ class EstimateDetailView(LoginRequiredMixin, PermissionRequiredMixin, DetailView
             finance_data = calculator.get_finance_data()
             invoice_obj = InvoiceModel.objects.all().filter(ce_model=estimate).first()
             kwargs["data"] = finance_data
+            print(kwargs["data"])
             kwargs["invoice"] = invoice_obj
             try:
                 car_finances = estimate.get_itemtxs_data()[0].first().item_model.car.finances
diff --git a/templates/base.html b/templates/base.html
index 45491024..53d4dbdf 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -84,7 +84,7 @@
                 {% include "plans/expiration_messages.html" %}
                 {% block period_navigation %}
                 {% endblock period_navigation %}
-                <div id="main_content" class="fade-me-in" hx-boost="true" hx-target="#main_content" hx-select="#main_content" hx-swap="innerHTML transition:true" hx-select-oob="#toast-container" hx-history-elt>
+                <div id="main_content" class="fade-me-in" hx-boost="false" hx-target="#main_content" hx-select="#main_content" hx-swap="innerHTML transition:true" hx-select-oob="#toast-container" hx-history-elt>
                      <div id="spinner" class="htmx-indicator spinner-bg">
                         <img src="{% static 'spinner.svg' %}" width="100" height="100" alt="">
                     </div>
diff --git a/templates/crm/opportunities/opportunity_detail.html b/templates/crm/opportunities/opportunity_detail.html
index 229bf23f..c09af69e 100644
--- a/templates/crm/opportunities/opportunity_detail.html
+++ b/templates/crm/opportunities/opportunity_detail.html
@@ -178,9 +178,9 @@
                                         <div class="d-flex flex-wrap justify-content-between mb-2">
                                             <h5 class="mb-0 text-body-highlight me-2">{{ _("Invoice") }}</h5>
                                         </div>
-                                        {% if opportunity.estimate.invoice %}
+                                        {% if opportunity.estimate.invoicemodel_set.all %}
                                             <a class="dropdown-item"
-                                               href="{% url 'invoice_detail' request.dealer.slug request.entity.slug opportunity.estimate.invoice.pk %}">{{ _("View Invoice") }}</a>
+                                               href="{% url 'invoice_detail' request.dealer.slug request.entity.slug opportunity.estimate.invoicemodel_set.first.pk %}">{{ _("View Invoice") }}</a>
                                         {% else %}
                                             <p>{{ _("No Invoice") }}</p>
                                         {% endif %}
@@ -1020,7 +1020,7 @@
 </div>
 <div class="tab-pane fade"
      id="tab-activity"
-     hx-get="{% url 'lead_detail' request.dealer.slug lead.slug %}"
+     hx-get="{% url 'opportunity_detail' request.dealer.slug opportunity.slug %}"
         hx-trigger="htmx:afterRequest from:"
         hx-select="#tab-activity"
         hx-target="this"
diff --git a/templates/sales/estimates/estimate_detail.html b/templates/sales/estimates/estimate_detail.html
index 2dcd4f25..2bd457cb 100644
--- a/templates/sales/estimates/estimate_detail.html
+++ b/templates/sales/estimates/estimate_detail.html
@@ -240,7 +240,9 @@
                 <tbody>
                     {% for item in data.cars %}
                         <tr>
-                            <td class="align-middle"></td>
+                            <td class="align-middle">
+                                <img src="{{item.logo}}" width="40" height="40" class="ps-2"></img>
+                            </td>
                             <td class="align-middle">{{ item.make }}</td>
                             <td class="align-middle">{{ item.model }}</td>
                             <td class="align-middle">{{ item.year }}</td>
@@ -273,7 +275,7 @@
                     <tr class="bg-body-secondary total-sum">
                         <td class="align-middle ps-4 fw-semibold text-body-highlight" colspan="7">{% trans "Vat" %} ({{ data.vat }})</td>
                         <td class="align-middle text-start fw-semibold">
-                            <span id="grand-total">+ {{ data.total_vat_amount|floatformat }}<span class="icon-saudi_riyal"></span></span>
+                            <span id="">+ {{ data.total_vat_amount }}<span class="icon-saudi_riyal"></span></span>
                         </td>
                     </tr>
                     <tr class="bg-body-secondary total-sum">
@@ -336,19 +338,14 @@
 {% endblock %}
 {% block customJS %}
 <script>
-// Initialize when page loads and after HTMX swaps
+
+    // Initialize when page loads and after HTMX swaps
 document.addEventListener('DOMContentLoaded', initEstimateFunctions);
 document.addEventListener('htmx:afterSwap', initEstimateFunctions);
 
 function initEstimateFunctions() {
     // Initialize calculateTotals if estimate table exists
-    const estimateTable = document.getElementById('estimate-table');
-    if (estimateTable) {
-        calculateTotals();
-
-        // Optional: If you need to recalculate when table content changes
-        estimateTable.addEventListener('change', calculateTotals);
-    }
+   
 
     // Initialize form action setter if form exists
     const confirmForm = document.getElementById('confirmForm');
@@ -359,6 +356,7 @@ function initEstimateFunctions() {
             button.addEventListener('click', setFormActionHandler);
         });
     }
+    htmx.process(confirmForm)
 }
 
 function calculateTotals() {
@@ -412,6 +410,7 @@ function setFormActionHandler(event) {
 
 function setFormAction(action) {
     const form = document.getElementById('confirmForm');
+    htmx.process(form)
     if (!form) return;
 
     const baseUrl = "{% url 'estimate_mark_as' request.dealer.slug estimate.pk %}";
diff --git a/templates/sales/invoices/invoice_create.html b/templates/sales/invoices/invoice_create.html
index 6d5bb2a1..ac9e4bd1 100644
--- a/templates/sales/invoices/invoice_create.html
+++ b/templates/sales/invoices/invoice_create.html
@@ -10,7 +10,7 @@
         <div class="col-lg-8 col-md-10">
             <div class="card shadow-sm border-0 rounded-3">
                 <div class="card-header bg-gray-200  py-3 border-0 rounded-top-3">
-                    <h3 class="mb-0 fs-4 text-center text-white">
+                    <h3 class="mb-0 fs-4 text-center">
                        {{ _("Add Invoice") }}<i class="fa-solid fa-receipt ms-2 text-primary"></i>
                    </h3>
             </div>
-- 
2.39.5


From 834ca81296c4bc376963117384fd4ec623b026a7 Mon Sep 17 00:00:00 2001
From: Faheedkhan <faheedk215@gmail.com>
Date: Sun, 3 Aug 2025 13:17:05 +0300
Subject: [PATCH 3/4] search fixes

---
 templates/customers/customer_list.html        |  2 +-
 .../bank_accounts/bank_account_list.html      |  2 +-
 templates/message-illustration.html           | 33 +------------------
 templates/sales/estimates/estimate_list.html  |  2 +-
 templates/sales/sales_list.html               |  2 +-
 templates/vendors/vendors_list.html           |  2 +-
 6 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/templates/customers/customer_list.html b/templates/customers/customer_list.html
index e532fd84..5163d5fc 100644
--- a/templates/customers/customer_list.html
+++ b/templates/customers/customer_list.html
@@ -6,7 +6,7 @@
 {% endblock title %}
 {% block vendors %}<a class="nav-link active">{{ _("Customers") |capfirst }}</a>{% endblock %}
 {% block content %}
-{% if customers or request.GET.q%}
+{% if customers or request.GET.q %}
     <div class="row g-3 mt-4">
         <h2 class="mb-2">
             {{ _("Customers") |capfirst }}
diff --git a/templates/ledger/bank_accounts/bank_account_list.html b/templates/ledger/bank_accounts/bank_account_list.html
index ec3badd9..de6aaac3 100644
--- a/templates/ledger/bank_accounts/bank_account_list.html
+++ b/templates/ledger/bank_accounts/bank_account_list.html
@@ -4,7 +4,7 @@
     {{ _("Bank Accounts") }}
 {% endblock title %}
 {% block content %}
-{% if bank_accounts %}
+{% if bank_accounts or request.GET.q%}
     <div class="row mt-4">
         <div class="d-flex justify-content-between mb-2">
             <h3 class="">{% trans "Bank Accounts" %}<span class="fas fa-bank ms-2 text-primary"></span></h3>
diff --git a/templates/message-illustration.html b/templates/message-illustration.html
index 720992ff..edc13595 100644
--- a/templates/message-illustration.html
+++ b/templates/message-illustration.html
@@ -2,38 +2,7 @@
 {% load i18n %}
 
 <style>
-  {% comment %} .empty-state-container {
-        background-color: #ffffff;
-        padding: 50px;
-        border-radius: 5px; /* Rounded corners */
-        box-shadow: 0 1px 2px rgba(0, 0, 0, 0.08); /* Subtle shadow */
-        text-align: center;
-        max-width: 70rem; /* Max width for content - made wider */
-        width: 90%; /* Fluid width */
-        margin: 0px auto; /* Added margin-top and auto for horizontal centering */
-        max-height: 40vh; /* Added min-height to control the height */
-        display: flex; /* Use flexbox for vertical centering of content */
-        flex-direction: column; /* Stack children vertically */
-        justify-content: center; /* Center content vertically */
-        align-items: center; /* Center content horizontally */
-    }
-    .empty-state-image {
-        max-width: 90%; /* Responsive image size */
-        height: 90%;
-
-        border-radius: 10px; /* Rounded corners for image */
-    }
-    .empty-state-title {
-        color: #343a40; /* Dark text for title */
-        font-weight: 600;
-        margin-bottom: 15px;
-    }
-    .empty-state-text {
-        color: #6c757d; /* Muted text for description */
-        margin-bottom: 30px;
-        line-height: 1.6;
-    }
-    /* No specific styles for .btn-add-new or .message-box are needed here as per previous updates */ {% endcomment %}
+ 
 
       .empty-state-container {
         background-color: #ffffff;
diff --git a/templates/sales/estimates/estimate_list.html b/templates/sales/estimates/estimate_list.html
index 9c488ba8..aca6b96d 100644
--- a/templates/sales/estimates/estimate_list.html
+++ b/templates/sales/estimates/estimate_list.html
@@ -4,7 +4,7 @@
     {{ _("Quotations") }}
 {% endblock title %}
 {% block content %}
-{% if estimates %}
+{% if estimates or request.GET.q %}
     <div class="row g-3 mt-4 mb-4">
         <div class="row g-3 justify-content-between mb-4">
             <div class="col-auto">
diff --git a/templates/sales/sales_list.html b/templates/sales/sales_list.html
index c4aa4697..88253e43 100644
--- a/templates/sales/sales_list.html
+++ b/templates/sales/sales_list.html
@@ -4,7 +4,7 @@
 {%block title%} {%trans 'Sale Orders'%} {%endblock%}
 
 {% block content %}
-{% if txs %}
+{% if txs or request.GET.q%}
   <section class="mt-2">
     <div class="row overflow-x-auto whitespace-nowrap -mx-2 sm:mx-0">
       
diff --git a/templates/vendors/vendors_list.html b/templates/vendors/vendors_list.html
index 00cad6a4..215a8c20 100644
--- a/templates/vendors/vendors_list.html
+++ b/templates/vendors/vendors_list.html
@@ -7,7 +7,7 @@
 {% block vendors %}<a class="nav-link active">{{ _("Vendors") |capfirst }}</a>{% endblock %}
 {% block content %}
 
-{% if vendors %}
+{% if vendors or request.GET.q%}
     <div class="row mt-4">
         <div class="d-flex justify-content-between mb-2">
             <h3 class="">
-- 
2.39.5


From b9f6018e9a983c45f1a65d4f4bfec788e9cc85d4 Mon Sep 17 00:00:00 2001
From: Faheedkhan <faheedk215@gmail.com>
Date: Sun, 3 Aug 2025 14:25:31 +0300
Subject: [PATCH 4/4] bill_number for search

---
 inventory/views.py                            | 50 ++-----------------
 templates/crm/leads/lead_list.html            |  6 ++-
 templates/customers/customer_list.html        |  7 ++-
 templates/items/expenses/expenses_list.html   |  4 +-
 templates/items/service/service_list.html     |  4 +-
 .../bank_accounts/bank_account_list.html      |  2 +-
 .../ledger/coa_accounts/account_list.html     |  6 +--
 .../organizations/organization_list.html      |  7 ++-
 templates/vendors/vendors_list.html           |  4 +-
 9 files changed, 32 insertions(+), 58 deletions(-)

diff --git a/inventory/views.py b/inventory/views.py
index 8b6318ed..434a540b 100644
--- a/inventory/views.py
+++ b/inventory/views.py
@@ -7464,7 +7464,8 @@ class BillListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
         qs = dealer.entity.get_bills()
         query = self.request.GET.get("q")
         if query:
-            qs = qs.filter(vendor__vendor_name__icontains=query)
+            qs = qs.filter(Q(bill_number__icontains=query)|
+                           Q(vendor__vendor_name__icontains=query))
         return qs
 
     def get_context_data(self, **kwargs):
@@ -10152,49 +10153,10 @@ def InventoryItemCreateView(request, dealer_slug):
     )
 
 
-# def inventory_items_filter(request):
-#     year = request.GET.get("year")
-#     make = request.GET.get("make")
-#     model = request.GET.get("model")
-#     serie = request.GET.get("serie")
-
-#     # Get all makes for initial dropdown
-#     makes = models.CarMake.objects.all()
-#     print(make)
-#     model_data = models.CarModel.objects.none()
-#     serie_data = models.CarSerie.objects.none()
-#     trim_data = models.CarTrim.objects.none()
-
-#     if make:
-#         make_obj = models.CarMake.objects.get(pk=int(make))
-#         model_data = make_obj.carmodel_set.all()
-#     if model:
-#         model_obj = models.CarModel.objects.get(pk=model)
-#         serie_data = model_obj.carserie_set.all()
-#         if year:
-#             serie_data = serie_data.filter(year_begin__lte=year, year_end__gte=year)
-#     if serie:
-#         serie_obj = models.CarSerie.objects.get(pk=serie)
-#         trim_data = serie_obj.cartrim_set.all()
-
-#     # Generate year choices (adjust range as needed)
-#     current_year = datetime.now().year
-#     year_choices = range(current_year, current_year - 10, -1)
-
-#     context = {
-#         "makes": makes,
-#         "model_data": model_data,
-#         "serie_data": serie_data,
-#         "trim_data": trim_data,
-#         "year_choices": year_choices,
-#         "selected_make": make,
-#         "selected_model": model,
-#         "selected_serie": serie,
-#         "selected_year": year,
-#     }
-#     return render(request, "cars/partials/recall_filter_form.html", context)
 @login_required
-def inventory_items_filter(request,dealer_slug=None):
+@permission_required("django_ledger.view_purchaseordermodel", raise_exception=True)
+def inventory_items_filter(request, dealer_slug):
+    dealer = get_object_or_404(models.Dealer, slug=dealer_slug)
     year = request.GET.get("year", None)
     make = request.GET.get("make")
     model = request.GET.get("model")
@@ -10807,8 +10769,6 @@ def staff_password_reset_view(request, dealer_slug, user_pk):
     form = forms.CustomSetPasswordForm(staff.user)
     return render(request, 'users/user_password_reset.html', {'form': form})
 
-
-
 class RecallListView(ListView):
     model = models.Recall
     template_name = 'recalls/recall_list.html'
diff --git a/templates/crm/leads/lead_list.html b/templates/crm/leads/lead_list.html
index 926654d4..2592ffa1 100644
--- a/templates/crm/leads/lead_list.html
+++ b/templates/crm/leads/lead_list.html
@@ -33,7 +33,7 @@
 
         <div class="row g-3">
             <div class="col-12">
-                {% if page_obj.object_list %}
+                {% if page_obj.object_list or request.GET.q%}
                     <div class="table-responsive scrollbar mx-n1 px-1">
                         <table class="table align-items-center table-flush table-hover">
                             <thead>
@@ -245,6 +245,10 @@
                                                 {% endif %}
                                             </td>
                                         </tr>
+                                     {% empty %}
+                                         <tr>
+                                          <td colspan="6" class="text-center">{% trans "No Leads found." %}</td>
+                                        </tr>
                                     {% endfor %}
                                 </tbody>
                             </table>
diff --git a/templates/customers/customer_list.html b/templates/customers/customer_list.html
index 5163d5fc..15aee501 100644
--- a/templates/customers/customer_list.html
+++ b/templates/customers/customer_list.html
@@ -27,7 +27,7 @@
                 <div class="d-flex">{% include 'partials/search_box.html' %}</div>
             </div>
         </div>
-        {% if page_obj.object_list %}
+        {% if page_obj.object_list or request.GET.q%}
             <div class="table-responsive scrollbar transition">
                 <table class="table align-items-center table-flush table-hover">
                     <thead>
@@ -159,6 +159,11 @@
                                     {% endif %}
                                 </td>
                             </tr>
+                             {% empty %}
+                                         <tr>
+                                          <td colspan="6" class="text-center">{% trans "No Customers found." %}</td>
+                                        </tr>
+                                  
                         {% endfor %}
                     </tbody>
                 {% endif %}
diff --git a/templates/items/expenses/expenses_list.html b/templates/items/expenses/expenses_list.html
index 0f34ce85..1fcb90c4 100644
--- a/templates/items/expenses/expenses_list.html
+++ b/templates/items/expenses/expenses_list.html
@@ -16,7 +16,7 @@
             {% endif %}
         </div>
         {% include "partials/search_box.html" %}
-        {% if page_obj.object_list %}
+        {% if page_obj.object_list or request.GET.q%}
             <div class="table-responsive px-1 scrollbar mt-3">
                 <table class="table align-items-center table-flush">
                     <thead>
@@ -44,7 +44,7 @@
                             </tr>
                         {% empty %}
                             <tr>
-                                <td colspan="6" class="text-center text-muted">{% trans "No Accounts Found" %}</td>
+                                <td colspan="6" class="text-center text-muted">{% trans "No Expenses Found" %}</td>
                             </tr>
                         {% endfor %}
                     </tbody>
diff --git a/templates/items/service/service_list.html b/templates/items/service/service_list.html
index 0de3164a..aa472e9f 100644
--- a/templates/items/service/service_list.html
+++ b/templates/items/service/service_list.html
@@ -15,7 +15,7 @@
             {% endif %}
         </div>
         {% include "partials/search_box.html" %}
-        {% if page_obj.object_list %}
+        {% if page_obj.object_list or request.GET.q %}
             <div class="table-responsive px-1 scrollbar mt-3">
                 <table class="table align-items-center table-flush">
                     <thead>
@@ -45,7 +45,7 @@
                             </tr>
                         {% empty %}
                             <tr>
-                                <td colspan="6" class="text-center text-muted">{% trans "No Accounts Found" %}</td>
+                                <td colspan="6" class="text-center text-muted">{% trans "No Services Found" %}</td>
                             </tr>
                         {% endfor %}
                     </tbody>
diff --git a/templates/ledger/bank_accounts/bank_account_list.html b/templates/ledger/bank_accounts/bank_account_list.html
index de6aaac3..0049bf7b 100644
--- a/templates/ledger/bank_accounts/bank_account_list.html
+++ b/templates/ledger/bank_accounts/bank_account_list.html
@@ -13,7 +13,7 @@
             {% endif %}
         </div>
         {% include "partials/search_box.html" %}
-        {% if page_obj.object_list %}
+        {% if page_obj.object_list or request.GET.q%}
             <div class="table-responsive px-1 scrollbar mt-3">
                 <table class="table align-items-center table-flush">
                     <thead>
diff --git a/templates/ledger/coa_accounts/account_list.html b/templates/ledger/coa_accounts/account_list.html
index 6c49cae8..32d1b973 100644
--- a/templates/ledger/coa_accounts/account_list.html
+++ b/templates/ledger/coa_accounts/account_list.html
@@ -201,10 +201,10 @@
     </div>
 
 {% else %}
-
-{% endif %}
-  {% url "account_create" request.dealer.slug as create_account_url %}
+ {% url "account_create" request.dealer.slug as create_account_url %}
   {% include "empty-illustration-page.html" with value="account" url=create_account_url %}
+{% endif %}
+ 
 {% endblock %}
 {% block customerJS %}
     <script>
diff --git a/templates/organizations/organization_list.html b/templates/organizations/organization_list.html
index e1bc7d21..3dc1308d 100644
--- a/templates/organizations/organization_list.html
+++ b/templates/organizations/organization_list.html
@@ -172,7 +172,12 @@
                                     {% endif %}
                                 </td>
                             </tr>
-                        {% endfor %}
+                             {% empty %}
+                                         <tr>
+                                          <td colspan="6" class="text-center">{% trans "No Organizations found." %}</td>
+                                        </tr>
+        
+                             {% endfor %}
                     </tbody>
                 </table>
             </div>
diff --git a/templates/vendors/vendors_list.html b/templates/vendors/vendors_list.html
index 215a8c20..e8df6baf 100644
--- a/templates/vendors/vendors_list.html
+++ b/templates/vendors/vendors_list.html
@@ -22,7 +22,7 @@
             {% endif %}
         </div>
         {% include "partials/search_box.html" %}
-        {% if page_obj.object_list %}
+        {% if page_obj.object_list or request.GET.q%}
             <div class="table-responsive px-1 scrollbar mt-3">
                 <table class= "table align-items-center table-flush table-hover">
                     <thead>
@@ -147,7 +147,7 @@
                                 </tr>
                             {% empty %}
                                 <tr>
-                                    <td colspan="6" class="text-center text-muted">{% trans "No Accounts Found" %}</td>
+                                    <td colspan="6" class="text-center text-muted">{% trans "No Vendors Found" %}</td>
                                 </tr>
                             {% endfor %}
                         </tbody>
-- 
2.39.5