From f5feee23721ff05927554fe426fdec469aa7e75f Mon Sep 17 00:00:00 2001 From: Faheedkhan Date: Wed, 16 Jul 2025 21:02:03 +0300 Subject: [PATCH] update for headers and forms and list and also the missing title --- inventory/views.py | 28 +++----- templates/bill/bill_create.html | 50 ++------------ templates/crm/leads/lead_form.html | 3 +- templates/csv_upload.html | 5 +- templates/customers/customer_form.html | 5 +- templates/dealers/dealer_form.html | 19 ------ templates/footer.html | 38 ++++++++++- templates/groups/group_form.html | 38 ----------- templates/groups/group_permission_form.html | 2 +- templates/header.html | 46 +++++++++++-- templates/inventory/car_edit.html | 18 +---- templates/inventory/car_finance_form.html | 35 ---------- templates/inventory/inventory_stats.html | 2 +- templates/items/expenses/expense_create.html | 28 +------- templates/items/expenses/expense_update.html | 3 +- templates/items/expenses/expenses_list.html | 2 +- templates/items/service/service_create.html | 32 +-------- templates/items/service/service_list.html | 2 +- .../bank_accounts/bank_account_form.html | 40 +---------- .../bank_accounts/bank_account_list.html | 2 +- templates/ledger/bills/bill_form.html | 2 +- templates/ledger/bills/bill_list.html | 2 +- .../ledger/coa_accounts/account_form.html | 44 ++---------- .../ledger/coa_accounts/account_list.html | 2 +- templates/ledger/ledger/ledger_form.html | 22 +----- templates/ledger/ledger/ledger_list.html | 2 +- templates/payment_success.html | 2 +- templates/purchase_orders/po_form.html | 8 ++- templates/purchase_orders/po_list.html | 2 +- .../sales/estimates/estimate_form-copy.html | 6 +- templates/sales/estimates/estimate_form.html | 68 +------------------ .../sales/estimates/sale_order_form.html | 1 + templates/sales/invoices/invoice_create.html | 2 +- templates/sales/sales_list.html | 2 +- templates/users/user_form.html | 46 ------------- templates/vendors/vendor_form.html | 46 +------------ templates/vendors/vendors_list.html | 3 +- 37 files changed, 141 insertions(+), 517 deletions(-) diff --git a/inventory/views.py b/inventory/views.py index 3f9cca3c..3057f378 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -4232,29 +4232,24 @@ def sales_list_view(request, dealer_slug): item transactions specific to the user's entity. :rtype: HttpResponse """ + dealer = get_object_or_404(models.Dealer, slug=dealer_slug) entity = dealer.entity + print(entity) staff = getattr(request.user.staffmember, "staff", None) + print(staff) qs = [] try: if any([request.is_dealer, request.is_manager, request.is_accountant]): qs = models.ExtraInfo.get_sale_orders(staff=staff,is_dealer=True) + print(qs) elif request.is_staff: qs = models.ExtraInfo.get_sale_orders(staff=staff) + print(qs) except Exception as e: print(e) - print(qs[0]) - # query = request.GET.get('q') - # # if query: - # # qs = qs.filter( - # # Q(order_number__icontains=query) | - # # Q(customer__name__icontains=query) | - # # Q(item_details__icontains=query) - - # # ).distinct() - # for so in qs: - # if query in so.customer_customer - + print(qs) + paginator = Paginator(qs, 30) page_number = request.GET.get("page") @@ -4334,6 +4329,7 @@ class EstimateListView(LoginRequiredMixin, PermissionRequiredMixin, ListView): content_type=ContentType.objects.get_for_model(EstimateModel), related_content_type=ContentType.objects.get_for_model(models.Staff), ) + eqs=qs print(qs) elif self.request.is_staff and self.request.is_sales: qs = models.ExtraInfo.objects.filter( @@ -4353,13 +4349,7 @@ class EstimateListView(LoginRequiredMixin, PermissionRequiredMixin, ListView): if status: queryset = queryset.filter(status=status) - # search_query = self.request.GET.get('q', '').strip() - # if search_query: - # queryset = queryset.filter( - # Q(quotation_number__icontains=search_query) | - # Q(customer__name__icontains=search_query) - - # ).distinct() # + return queryset diff --git a/templates/bill/bill_create.html b/templates/bill/bill_create.html index 1c790348..5d8d7f64 100644 --- a/templates/bill/bill_create.html +++ b/templates/bill/bill_create.html @@ -3,51 +3,11 @@ {% load static %} {% load django_ledger %} {% load crispy_forms_filters %} +{% block title %} + {{ _("Create Bill") |capfirst }} +{% endblock title %} {% block content %} - {% comment %}
-
-
-
-

{% trans 'Create Bill' %}

-
-
-
- - {% csrf_token %} - {% if po_model %} -
-

{% trans 'Bill for' %} {{ po_model.po_number }}

-

{% trans 'Bill for' %} {{ po_model.po_title }}

-
- {% for itemtxs in po_itemtxs_qs %} - {{ itemtxs }} - {% endfor %} -
-
- {% endif %} - -
- {{ form|crispy }} -
-
- -
-
- - {% trans 'Cancel' %} -
-
-
-
-
-
{% endcomment %} - @@ -56,8 +16,8 @@
-

- {% trans 'Create Bill' %} +

+ {% trans 'Create Bill' %}

diff --git a/templates/crm/leads/lead_form.html b/templates/crm/leads/lead_form.html index 285265cc..2ba44001 100644 --- a/templates/crm/leads/lead_form.html +++ b/templates/crm/leads/lead_form.html @@ -35,13 +35,14 @@
-
+

{% if object %} {{ _("Update Lead") }} {% else %} {{ _("Create New Lead") }} {% endif %} +

  • diff --git a/templates/csv_upload.html b/templates/csv_upload.html index 1407f81e..7926bdc1 100644 --- a/templates/csv_upload.html +++ b/templates/csv_upload.html @@ -1,5 +1,8 @@ {% extends "base.html" %} {% load static i18n %} +{% block title %} + {% trans "Car Bulk Upload"|capfirst %} +{% endblock %} {% block customCSS %}