diff --git a/inventory/models.py b/inventory/models.py index 2c190588..e3700eb9 100644 --- a/inventory/models.py +++ b/inventory/models.py @@ -742,7 +742,9 @@ class Car(Base): ) except Exception: return False - + @property + def invoice(self): + return self.item_model.invoicemodel_set.first if self.item_model.invoicemodel_set.first() else None def get_transfer(self): return self.transfer_logs.filter(active=True).first() diff --git a/inventory/urls.py b/inventory/urls.py index 6a7b02a9..c92f9901 100644 --- a/inventory/urls.py +++ b/inventory/urls.py @@ -1282,8 +1282,8 @@ urlpatterns = [ ), path('car-sale-report//csv/', views.car_sale_report_csv_export, name='car-sale-report-csv-export'), - path('feature/recalls/', views.RecallListView.as_view(), name='recall_list'), - path('feature/recall/', views.RecallFilterView, name='recall_filter'), + path('feature/recall/', views.RecallListView.as_view(), name='recall_list'), + path('feature/recall/filter/', views.RecallFilterView, name='recall_filter'), path('feature/recall//view/', views.RecallDetailView.as_view(), name='recall_detail'), path('feature/recall/create/', views.RecallCreateView.as_view(), name='recall_create'), path('feature/recall/success/', views.RecallSuccessView.as_view(), name='recall_success'), diff --git a/templates/header.html b/templates/header.html index 941a4f44..e63d64d2 100644 --- a/templates/header.html +++ b/templates/header.html @@ -47,13 +47,13 @@ {% endif %} {% if perms.inventory.add_car %} -
  • + {% comment %}
  • {% trans "Bulk Upload"|capfirst %}
    -
    • + {% endcomment %} {% endif %} {% if perms.django_ledger.view_purchaseordermodel %}
  • diff --git a/templates/ledger/reports/car_sale_report.html b/templates/ledger/reports/car_sale_report.html index f3eb846b..87ea336b 100644 --- a/templates/ledger/reports/car_sale_report.html +++ b/templates/ledger/reports/car_sale_report.html @@ -127,7 +127,11 @@ + + + +
    @@ -137,47 +141,48 @@ {% trans 'Download as CSV' %} -
    - - +
    +
    + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + {% for car in cars_sold %} + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + {% endfor %} diff --git a/templates/recalls/recall_list.html b/templates/recalls/recall_list.html index ad1307cb..333cb77a 100644 --- a/templates/recalls/recall_list.html +++ b/templates/recalls/recall_list.html @@ -4,8 +4,10 @@ {% block content %}
    -

    {% trans "Recall History" %}

    - +
    +

    {% trans "Recall History" %}

    + {% trans "Create Recall" %} +
    @@ -13,7 +15,7 @@
    - + @@ -28,7 +30,7 @@ diff --git a/templates/recalls/recall_success.html b/templates/recalls/recall_success.html index da8cd331..2338be35 100644 --- a/templates/recalls/recall_success.html +++ b/templates/recalls/recall_success.html @@ -8,7 +8,7 @@

    {% trans "Recall Initiated Successfully!" %}

    {% trans "The recall has been created and notifications have been sent to all affected dealers." %}

    - + {% trans "Back to Recall Management" %} diff --git a/templates/sales/estimates/estimate_form.html b/templates/sales/estimates/estimate_form.html index e9beb8b0..6eff6ba3 100644 --- a/templates/sales/estimates/estimate_form.html +++ b/templates/sales/estimates/estimate_form.html @@ -137,7 +137,7 @@ {% endif %}
    -
    +

    @@ -148,7 +148,6 @@
    - {% csrf_token %}
    {{ form|crispy }}

    {% trans 'VIN' %}{% trans 'Make' %}{% trans 'Model' %}{% trans 'Year' %}{% trans 'Serie' %}{% trans 'Trim' %}{% trans 'Mileage' %}{% trans 'Stock Type' %}{% trans 'Created Date' %}{% trans 'Sold Date' %}{% trans 'Cost Price' %}{% trans 'Marked Price' %}{% trans 'Discount Amount' %}{% trans 'Selling Price' %}{% trans 'Tax Amount' %}{% trans 'Invoice Number' %}{% trans 'VIN' %}{% trans 'Make' %}{% trans 'Model' %}{% trans 'Year' %}{% trans 'Serie' %}{% trans 'Trim' %}{% trans 'Mileage' %}{% trans 'Stock Type' %}{% trans 'Created Date' %}{% trans 'Sold Date' %}{% trans 'Cost Price' %}{% trans 'Marked Price' %}{% trans 'Discount Amount' %}{% trans 'Selling Price' %}{% trans 'Tax Amount' %}{% trans 'Invoice Number' %}
    {{ car.vin }}{{ car.id_car_make.name }}{{ car.id_car_model.name }}{{ car.year }}{{ car.id_car_serie.name }}{{ car.id_car_trim.name }}{{ car.mileage }}{{ car.stock_type }}{{ car.created_at }}{{ car.sold_date }}{{ car.finances.cost_price }}{{ car.finances.marked_price }}{{ car.finances.discount_amount }}{{ car.finances.selling_price }}{{ car.finances.vat_amount }}{{ car.item_model.invoicemodel_set.first.invoice_number }}{{ car.vin }}{{ car.id_car_make.name }}{{ car.id_car_model.name }}{{ car.year }}{{ car.id_car_serie.name }}{{ car.id_car_trim.name }}{{ car.mileage }}{{ car.stock_type }}{{ car.created_at|date }}{{ car.invoice.date_paid|date|default_if_none:"-" }}{{ car.finances.cost_price }}{{ car.finances.marked_price }}{{ car.finances.discount_amount }}{{ car.finances.selling_price }}{{ car.finances.vat_amount }}{{ car.invoice.invoice_number }}
    {% trans "Title" %}{% trans "Sent" %}{% trans "Sent At" %} {% trans "Make" %} {% trans "Model" %} {% trans "Series" %}{{ recall.title }} - {{ recall.created_at|naturaltime }} + {{ recall.created_at|date }}  {{ recall.make|default:"-" }}