diff --git a/inventory/forms.py b/inventory/forms.py index 3debc3bf..31328ab2 100644 --- a/inventory/forms.py +++ b/inventory/forms.py @@ -1094,7 +1094,7 @@ class LeadForm(forms.ModelForm): # ) id_car_make = forms.ModelChoiceField( label=_("Make"), - queryset=CarMake.objects.all(), + queryset=CarMake.objects.filter(is_sa_import=True), widget=forms.Select( attrs={ "hx-get": "", @@ -1921,7 +1921,7 @@ class StaffTaskForm(forms.ModelForm): class ItemInventoryForm(forms.Form): make = forms.ModelChoiceField( - queryset=CarMake.objects.all(), + queryset=CarMake.objects.filter(is_sa_import=True), widget=forms.Select(attrs={"class": "form-control", "id": "make"}), label=_("Make"), ) diff --git a/inventory/views.py b/inventory/views.py index 7cb6b1dd..afe23776 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -9387,7 +9387,7 @@ def upload_cars(request, pk=None): if item: item = ItemTransactionModel.objects.get(pk=pk) data = [x.strip() for x in item.item_model.name.split("||")] - make = models.CarMake.objects.get(name=data[0]) + make = models.CarMake.objects.filter(is_sa_import=True).get(name=data[0]) model = make.carmodel_set.get(name=data[1]) trim = models.CarTrim.objects.filter( name=data[3], id_car_serie__id_car_model=model.id_car_model diff --git a/templates/base.html b/templates/base.html index d931f418..a5f389e7 100644 --- a/templates/base.html +++ b/templates/base.html @@ -40,7 +40,6 @@ - {% if LANGUAGE_CODE == 'ar' %} @@ -52,14 +51,7 @@ - + {% block customCSS %} {% endblock %} @@ -82,7 +74,7 @@ {% block body %} {% endblock body%} -
+ {% include 'footer.html' %} @@ -98,11 +90,6 @@ - - - - - diff --git a/templates/csv_upload.html b/templates/csv_upload.html index 28b18a6f..1ea1ba5c 100644 --- a/templates/csv_upload.html +++ b/templates/csv_upload.html @@ -167,7 +167,7 @@
- CSV should include columns: vin + {{ _("CSV should include columns: vin")}}
diff --git a/templates/dashboards/manager.html b/templates/dashboards/manager.html index 2b24a733..8abf93ee 100644 --- a/templates/dashboards/manager.html +++ b/templates/dashboards/manager.html @@ -37,7 +37,7 @@
-

{{ purchase_orders }}

+

{{ purchase_orders }}

{{ _("Purchase Orders")}}

diff --git a/templates/footer.html b/templates/footer.html index c4fbb04d..6b1b355f 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -6,7 +6,7 @@ Haikal | هيكل -
+
{{ _("Powered by")}} TENHAL | تنحل diff --git a/templates/inventory/car_detail.html b/templates/inventory/car_detail.html index effff5bd..194e36c1 100644 --- a/templates/inventory/car_detail.html +++ b/templates/inventory/car_detail.html @@ -78,11 +78,16 @@
-
+
+ {{ car.vin }} +
+
+

{% trans 'Car Details' %}

+ diff --git a/templates/inventory/car_list_view.html b/templates/inventory/car_list_view.html index 5bb57ba5..ab85c101 100644 --- a/templates/inventory/car_list_view.html +++ b/templates/inventory/car_list_view.html @@ -28,7 +28,7 @@
-

{{ _("Inventory") }}

+

{{ _("Inventory") }}

diff --git a/templates/purchase_orders/includes/card_po.html b/templates/purchase_orders/includes/card_po.html index baaef53a..b0470c5d 100644 --- a/templates/purchase_orders/includes/card_po.html +++ b/templates/purchase_orders/includes/card_po.html @@ -32,7 +32,7 @@ {% if not create_po %} {% if style == 'po-detail' %}
-
+
{% icon 'uil:bill' 36 %} diff --git a/templates/purchase_orders/includes/po_item_formset.html b/templates/purchase_orders/includes/po_item_formset.html index 32c3ffbd..bb6a6d41 100644 --- a/templates/purchase_orders/includes/po_item_formset.html +++ b/templates/purchase_orders/includes/po_item_formset.html @@ -16,7 +16,7 @@ {{ itemtxs_formset.non_form_errors }} {{ itemtxs_formset.management_form }}
{% trans "VIN" %} {{ car.vin }}
- +
{% trans 'Item' %} {% trans 'Unit Cost' %}