diff --git a/inventory/middleware.py b/inventory/middleware.py index e35e80f2..f0467a55 100644 --- a/inventory/middleware.py +++ b/inventory/middleware.py @@ -122,9 +122,12 @@ class DealerSlugMiddleware: return response def process_view(self, request, view_func, view_args, view_kwargs): - if request.user.is_authenticated: - dealer = get_user_type(request) - if view_kwargs.get("dealer_slug"): - if view_kwargs["dealer_slug"] != dealer.slug: - raise Http404("Dealer slug mismatch") - return None + if not request.user.is_authenticated: + return None + if request.path.startswith('/en/ledger/') or request.path.startswith('/ar/ledger/'): + return None + if not view_kwargs.get("dealer_slug"): + return None + dealer = get_user_type(request) + if view_kwargs["dealer_slug"] != dealer.slug: + raise Http404("Dealer slug mismatch") diff --git a/inventory/views.py b/inventory/views.py index 37e3adb4..73c5cafa 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -2898,7 +2898,7 @@ class UserCreateView( success_message = _("User created successfully") def form_valid(self, form): - dealer = get_user_type(self.request) + dealer = get_object_or_404(models.Dealer, slug=self.kwargs["dealer_slug"]) # quota_dict = get_user_quota(dealer.user) # allowed_users = quota_dict.get("Users") @@ -5565,7 +5565,7 @@ def schedule_lead(request, dealer_slug,slug): messages.success(request, _("Appointment Created Successfully")) try: if lead.opportunity: - return redirect("opportunity_detail", slug=lead.opportunity.slug) + return redirect("opportunity_detail", dealer_slug=lead.dealer.slug, slug=lead.opportunity.slug) except models.Lead.opportunity.RelatedObjectDoesNotExist: return redirect("lead_list", dealer_slug=lead.dealer.slug) else: diff --git a/templates/inventory/tags/inventory_table.html b/templates/inventory/tags/inventory_table.html index 9ff9e909..e61a29d9 100644 --- a/templates/inventory/tags/inventory_table.html +++ b/templates/inventory/tags/inventory_table.html @@ -5,7 +5,6 @@ - @@ -17,8 +16,6 @@ {% for i in inventory_list %} - - diff --git a/templates/sales/invoices/invoice_detail.html b/templates/sales/invoices/invoice_detail.html index a97dd8a9..73dd158a 100644 --- a/templates/sales/invoices/invoice_detail.html +++ b/templates/sales/invoices/invoice_detail.html @@ -102,7 +102,7 @@
-
+

{% trans 'Paid Amount' %}

{{invoice.amount_paid}} 

{% trans "Created at" %} {% trans "Item" %} {% trans "UOM" %} {% trans "Quantity" %}
{{ i.item_model__name }} {{ i.item_model__name }} {{ i.item_model__uom__name }} {{ i.total_quantity | floatformat:3 }}