Compare commits

..

No commits in common. "1e7ed1f88d3784b003cbd46dd7a76222ff8be446" and "eb326597a51d8650077caf562890b5567341f88b" have entirely different histories.

4 changed files with 27 additions and 28 deletions

View File

@ -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(is_sa_import=True,car__in=cars).distinct()
context["make"] = models.CarMake.objects.filter(car__in=cars).distinct()
context["model"] = models.CarModel.objects.none()
context["year"] = models.Car.objects.none()
make = self.request.GET.get("make")
@ -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,is_sa_import=True)
car_makes = models.CarMake.objects.filter(car_dealers__dealer=dealer)
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.filter(is_sa_import=True),
"make_data": models.CarMake.objects.all(),
"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.filter(is_sa_import=True),
"make_data": models.CarMake.objects.all(),
"inventory_accounts": inventory_accounts,
"cogs_accounts": cogs_accounts,
},
@ -9726,7 +9726,7 @@ def upload_cars(request, dealer_slug, pk=None):
return render(
request,
"csv_upload.html",
{"make_data": models.CarMake.objects.filter(is_sa_import=True), "form": form, "item": item},
{"make_data": models.CarMake.objects.all(), "form": form, "item": item},
)

View File

@ -96,6 +96,7 @@
</div>
</div>
<div class="form-group">
<label for="account">Account</label>
<select class="form-control" name="account" id="account">

View File

@ -3,7 +3,7 @@
{% block content %}
<form action="{% url 'inventory_item_create' request.dealer.slug po_model.pk %}" method="post">
<form action="{% url 'inventory_item_create' request.dealer.slug po_model.pk %}" method="post">
{% csrf_token %}
{% include "purchase_orders/partials/po-select.html" with name="make" target="model" data=make_data pk=po_model.pk %}
{% include "purchase_orders/partials/po-select.html" with name="model" target="serie" data=model_data pk=po_model.pk %}

View File

@ -20,7 +20,6 @@
<tr>
<th class="d-flex justify-content-between align-items-center">
{% trans 'Item' %}
{% if po_model.is_draft %}
<button type="button"
class="btn btn-sm btn-phoenix-success"
data-bs-toggle="modal"
@ -31,7 +30,6 @@
hx-swap="innerHTML">
<i class="fas fa-plus me-1"></i>{% trans 'Add Item' %}
</button>
{% endif %}
</th>
<th>{% trans 'Unit Cost' %}</th>
<th>{% trans 'Quantity' %}</th>