diff --git a/inventory/views.py b/inventory/views.py index b5c58929..7938414f 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -1091,7 +1091,7 @@ class CarListView(LoginRequiredMixin, PermissionRequiredMixin, ListView): "sold": cars.filter(status="sold").count(), "transfer": cars.filter(status="transfer").count(), } - context["make"] = models.CarMake.objects.filter(car__in=cars).distinct() + context["make"] = models.CarMake.objects.filter(is_sa_import=True,car__in=cars).distinct() context["model"] = models.CarModel.objects.none() context["year"] = models.Car.objects.none() make = self.request.GET.get("make") @@ -1573,7 +1573,7 @@ class CarDeleteView( model = models.Car template_name = "inventory/car_confirm_delete.html" - + permission_required = ["inventory.delete_car"] def delete(self, request, *args, **kwargs): @@ -1584,14 +1584,14 @@ class CarDeleteView( Returns the URL to redirect to after a successful car deletion. It dynamically includes the dealer_slug from the URL. """ - + dealer_slug = self.kwargs.get('dealer_slug') if dealer_slug: return reverse_lazy("car_list", kwargs={'dealer_slug': dealer_slug}) else: - + messages.error(self.request, _("Could not determine dealer for redirection.")) - return reverse_lazy("home") + return reverse_lazy("home") class CarLocationCreateView(LoginRequiredMixin, PermissionRequiredMixin, CreateView): @@ -2068,7 +2068,7 @@ class DealerDetailView(LoginRequiredMixin, DetailView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) dealer = self.object - car_makes = models.CarMake.objects.filter(car_dealers__dealer=dealer) + car_makes = models.CarMake.objects.filter(car_dealers__dealer=dealer,is_sa_import=True) staff_count = dealer.staff_count cars_count = models.Car.objects.filter(dealer=dealer).count() @@ -9251,7 +9251,7 @@ def InventoryItemCreateView(request, dealer_slug): form = forms.CSVUploadForm() form.fields["vendor"].queryset = dealer.vendors.filter(active=True) context = { - "make_data": models.CarMake.objects.all(), + "make_data": models.CarMake.objects.filter(is_sa_import=True), "inventory_accounts": inventory_accounts, "cogs_accounts": cogs_accounts, "form": form, @@ -9261,7 +9261,7 @@ def InventoryItemCreateView(request, dealer_slug): request, "purchase_orders/inventory_item_form.html", { - "make_data": models.CarMake.objects.all(), + "make_data": models.CarMake.objects.filter(is_sa_import=True), "inventory_accounts": inventory_accounts, "cogs_accounts": cogs_accounts, }, @@ -9535,7 +9535,7 @@ class PurchaseOrderMarkAsApprovedView(BasePurchaseOrderActionActionView): class PurchaseOrderMarkAsFulfilledView(BasePurchaseOrderActionActionView): action_name = "mark_as_fulfilled" - + class PurchaseOrderMarkAsCanceledView(BasePurchaseOrderActionActionView): action_name = "mark_as_canceled" diff --git a/templates/purchase_orders/car_inventory_item_form.html b/templates/purchase_orders/car_inventory_item_form.html index 9a9137f9..9b037b4c 100644 --- a/templates/purchase_orders/car_inventory_item_form.html +++ b/templates/purchase_orders/car_inventory_item_form.html @@ -96,7 +96,6 @@ -
- {% for account in inventory_accounts %} - - {% endfor %} - + +
diff --git a/templates/purchase_orders/includes/po_item_formset.html b/templates/purchase_orders/includes/po_item_formset.html index da6dfb61..13ca5c3b 100644 --- a/templates/purchase_orders/includes/po_item_formset.html +++ b/templates/purchase_orders/includes/po_item_formset.html @@ -20,16 +20,18 @@ {% trans 'Item' %} + {% if po_model.is_draft %} + class="btn btn-sm btn-phoenix-success" + data-bs-toggle="modal" + data-bs-target="#mainModal" + hx-get="{% url 'inventory_item_create' dealer_slug %}?for_po=1" + hx-target=".main-modal-body" + hx-select="form" + hx-swap="innerHTML"> + {% trans 'Add Item' %} + + {% endif %} {% trans 'Unit Cost' %} {% trans 'Quantity' %}