diff --git a/inventory/__pycache__/views.cpython-311.pyc b/inventory/__pycache__/views.cpython-311.pyc index 0bea3251..36fadac5 100644 Binary files a/inventory/__pycache__/views.cpython-311.pyc and b/inventory/__pycache__/views.cpython-311.pyc differ diff --git a/inventory/views.py b/inventory/views.py index 738c6bd3..db387c04 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -782,9 +782,7 @@ class CarFinanceUpdateView(LoginRequiredMixin, SuccessMessageMixin, UpdateView): def get_form(self, form_class=None): form = super().get_form(form_class) dealer = get_user_type(self.request) - form.fields[ - "additional_finances" - ].queryset = models.AdditionalServices.objects.filter(dealer=dealer) + form.fields["additional_finances"].queryset = models.AdditionalServices.objects.filter(dealer=dealer) return form @@ -866,13 +864,13 @@ class CarTransferCreateView(CreateView): # transfer = get_object_or_404(models.CarTransfer, pk=pk) # context = {"transfer": transfer} # return render(request, "inventory/transfer_details.html", context) + class CarTransferDetailView(LoginRequiredMixin, SuccessMessageMixin, DetailView): model = models.CarTransfer template_name = "inventory/transfer_details.html" context_object_name = "transfer" - def car_transfer_approve(request, car_pk, transfer_pk): car = get_object_or_404(models.Car, pk=car_pk) transfer = get_object_or_404(models.CarTransfer, pk=transfer_pk) @@ -1862,9 +1860,7 @@ def OrganizationUpdateView(request,pk): instance.phone = organization_dict["phone_number"] instance.email = organization_dict["email"] - organization_dict["logo"] = organization.additional_info["organization_info"][ - "logo" - ] + organization_dict["logo"] = organization.additional_info["organization_info"]["logo"] organization_dict["pk"] = str(instance.pk) instance.additional_info["organization_info"] = organization_dict instance.additional_info["type"] = "organization" diff --git a/templates/sales/invoices/invoice_preview.html b/templates/sales/invoices/invoice_preview.html index 62d538d7..61157ad9 100644 --- a/templates/sales/invoices/invoice_preview.html +++ b/templates/sales/invoices/invoice_preview.html @@ -1,4 +1,4 @@ -{% load i18n static%} +{% load i18n static custom_filters%} @@ -222,7 +222,8 @@
-

VAT/ضريبة القيمة المضافة ({{vat}}%): {{data.vat}} {{ _("SAR") }}

+ +

VAT/ضريبة القيمة المضافة ({{vat}}%): {{data.vat|percentage}} {{ _("SAR") }}

Additional Services/ الخدمات الإضافية
{% for service in data.additional_services %} @@ -246,30 +247,26 @@

- -