diff --git a/inventory/models.py b/inventory/models.py index 0cddfef4..8a85fd29 100644 --- a/inventory/models.py +++ b/inventory/models.py @@ -589,7 +589,7 @@ class AdditionalServices(models.Model, LocalizedNameMixin): verbose_name_plural = _("Additional Services") def __str__(self): - return self.name + " - " + str(self.price) + return self.name + " - " + str(self.price_) class Car(Base): diff --git a/inventory/views.py b/inventory/views.py index 39fa981b..b035c995 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -4446,7 +4446,9 @@ class EstimateListView(LoginRequiredMixin, PermissionRequiredMixin, ListView): related_content_type=ContentType.objects.get_for_model(models.Staff), related_object_id=self.request.staff.pk, ) - context["staff_estimates"] = qs + # context["staff_estimates"] = qs + print(qs) + context["staff_estimates"] = EstimateModel.objects.filter(pk__in=[x.content_object.pk for x in qs]) return context def get_queryset(self): @@ -4457,6 +4459,7 @@ class EstimateListView(LoginRequiredMixin, PermissionRequiredMixin, ListView): if status: queryset = queryset.filter(status=status) search_query = self.request.GET.get('q', None) + if search_query: queryset = queryset.filter( Q(estimate_number__icontains=search_query) @@ -4821,7 +4824,7 @@ def create_sale_order(request, dealer_slug, pk): estimate.save() for item in estimate.get_itemtxs_data()[0].all(): try: - item.item_model.additional_info["car_info"]["status"] = "sold" + # item.item_model.additional_info["car_info"]["status"] = "sold" item.item_model.save() logger.debug( f"Car status updated to 'sold' for item.item_model PK: {getattr(item.item_model, 'pk', 'N/A')}." @@ -7170,8 +7173,8 @@ class ItemServiceCreateView( dealer = get_user_type(self.request) vat = models.VatRate.objects.get(dealer=dealer, is_active=True) form.instance.dealer = dealer - if form.instance.taxable: - form.instance.price = (form.instance.price * vat.rate) + form.instance.price + # if form.instance.taxable: + # form.instance.price = (form.instance.price * vat.rate) + form.instance.price return super().form_valid(form) def get_success_url(self): @@ -7219,8 +7222,8 @@ class ItemServiceUpdateView( dealer = get_user_type(self.request) vat = models.VatRate.objects.get(dealer=dealer, is_active=True) form.instance.dealer = dealer - if form.instance.taxable: - form.instance.price = (form.instance.price * vat.rate) + form.instance.price + # if form.instance.taxable: + # form.instance.price = (form.instance.price * vat.rate) + form.instance.price return super().form_valid(form) def get_success_url(self): diff --git a/templates/base.html b/templates/base.html index dca51f9f..baaa7add 100644 --- a/templates/base.html +++ b/templates/base.html @@ -66,6 +66,7 @@ rel="stylesheet" id="user-style-default"> {% endif %} + @@ -82,7 +83,7 @@ {% include "plans/expiration_messages.html" %} {% block period_navigation %} {% endblock period_navigation %} -
+
diff --git a/templates/crm/leads/lead_detail.html b/templates/crm/leads/lead_detail.html index 88c85092..05f6839c 100644 --- a/templates/crm/leads/lead_detail.html +++ b/templates/crm/leads/lead_detail.html @@ -51,7 +51,7 @@
-
+
diff --git a/templates/organizations/organization_detail.html b/templates/organizations/organization_detail.html index 3ab5283a..8a54d906 100644 --- a/templates/organizations/organization_detail.html +++ b/templates/organizations/organization_detail.html @@ -5,7 +5,7 @@ {% endblock title %} {% block content %}
-

{{ organization.get_local_name }}

+

{{ organization.get_local_name }}