diff --git a/inventory/views.py b/inventory/views.py index 8aac9f89..697ea9b0 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -6094,7 +6094,7 @@ class BillListView(LoginRequiredMixin, PermissionRequiredMixin, ListView): def get_queryset(self): dealer = get_user_type(self.request) - qs = dealer.entity.get_bills() + qs = dealer.entity.get_bills() return qs def get_context_data(self, **kwargs): @@ -6121,7 +6121,7 @@ class BillDetailView(LoginRequiredMixin, PermissionRequiredMixin, DetailView): """ model = BillModel - template_name = "ledger/bills/bill_detail.html" + template_name = "bill/bill_detail.html" context_object_name = "bill" permission_required = ["django_ledger.view_billmodel"] @@ -9254,7 +9254,7 @@ def upload_cars(request,pk=None): manufacturer_name, model_name, year_model = result.values() car_make = get_make(manufacturer_name) car_model = get_model(model_name, car_make) - if not all([car_make, car_model]) or (make.pk != car_make.pk) or (model.pk != car_model.pk) or (int(year) != int(year_model)): + if not all([car_make, car_model]) or (make.pk != car_make.pk) or (model.pk != car_model.pk): messages.error(request, f"invalid data at vin {row['vin']}, Please upload a valid CSV file") return response @@ -9267,7 +9267,7 @@ def upload_cars(request,pk=None): id_car_model=model, id_car_serie=serie, id_car_trim=trim, - year=int(year), + year=int(year_model), vendor=vendor, receiving_date=receiving_date, ) diff --git a/static/images/logos/vendors/Screenshot_2025-04-09_124932.png b/static/images/logos/vendors/Screenshot_2025-04-09_124932.png new file mode 100644 index 00000000..d2fea983 Binary files /dev/null and b/static/images/logos/vendors/Screenshot_2025-04-09_124932.png differ diff --git a/templates/admin_management/auth_logs.html b/templates/admin_management/auth_logs.html index 8a153232..239b7f81 100644 --- a/templates/admin_management/auth_logs.html +++ b/templates/admin_management/auth_logs.html @@ -12,7 +12,7 @@
-

{% trans "Audit Log Dashboard" %}

+

{% trans "Audit Log Dashboard" %}

@@ -55,7 +55,7 @@
{% include 'partials/pagination.html' with q='loginEvents' %}
-
+ {% else %}

No authentication audit events found.

diff --git a/templates/admin_management/model_logs.html b/templates/admin_management/model_logs.html index 545665b2..01ba623b 100644 --- a/templates/admin_management/model_logs.html +++ b/templates/admin_management/model_logs.html @@ -12,7 +12,7 @@
-

{% trans "Audit Log Dashboard" %}

+

{% trans "Audit Log Dashboard" %}

diff --git a/templates/admin_management/request_logs.html b/templates/admin_management/request_logs.html index 8dd913aa..b6ce7cea 100644 --- a/templates/admin_management/request_logs.html +++ b/templates/admin_management/request_logs.html @@ -12,7 +12,7 @@
-

{% trans "Audit Log Dashboard" %}

+

{% trans "Audit Log Dashboard" %}

diff --git a/templates/bill/bill_detail.html b/templates/bill/bill_detail.html index 9abc9b17..dbd9cd7d 100644 --- a/templates/bill/bill_detail.html +++ b/templates/bill/bill_detail.html @@ -27,8 +27,8 @@ } #djl-vendor-card-widget{ - height:30rem; + max-height:30rem; } @@ -40,7 +40,7 @@
-
+
{% include 'bill/includes/card_bill.html' with bill=bill entity_slug=view.kwargs.entity_slug style='bill-detail' %}
@@ -141,18 +141,18 @@
- +
- + - + - + {% for bill_item in itemtxs_qs %} -
{% trans 'Item' %} {% trans 'Entity Unit' %} {% trans 'Unit Cost' %} {% trans 'Quantity' %} {% trans 'Total' %}{% trans 'PO' %}{% trans 'PO' %}
@@ -182,7 +182,7 @@ {% currency_symbol %}{{ bill_item.total_amount | currency_format }} + {% if bill_item.po_model_id %} @@ -218,7 +218,7 @@
{% trans 'Bill Transactions' %}
-
+
{% transactions_table bill %}
diff --git a/templates/bill/transactions/tags/txs_table.html b/templates/bill/transactions/tags/txs_table.html index 0e801373..ccf6762f 100644 --- a/templates/bill/transactions/tags/txs_table.html +++ b/templates/bill/transactions/tags/txs_table.html @@ -3,45 +3,45 @@ {% if style == 'detail' %}
- - - - - - - - - - +
{% trans 'Timestamp' %}{% trans 'Account' %}{% trans 'Account Name' %}{% trans 'Unit' %}{% trans 'Credit' %}{% trans 'Debit' %}{% trans 'Description' %}
+ + + + + + + + + {% for transaction_model in transaction_model_qs %} - - - - - - - + + + + + + + {% endfor %} - - - - - + + + + +
{% trans 'Timestamp' %}{% trans 'Account' %}{% trans 'Account Name' %}{% trans 'Unit' %}{% trans 'Credit' %}{% trans 'Debit' %}{% trans 'Description' %}
{{ transaction_model.timestamp }}{{ transaction_model.account_code }}{{ transaction_model.account_name }}{% if transaction_model.entity_unit_name %}{{ transaction_model.entity_unit_name }}{% endif %}{% if transaction_model.is_credit %}${{ transaction_model.amount | currency_format }}{% endif %}{% if transaction_model.is_debit %}${{ transaction_model.amount | currency_format }}{% endif %}{% if transaction_model.description %}{{ transaction_model.description }}{% endif %}{{ transaction_model.timestamp }}{{ transaction_model.account_code }}{{ transaction_model.account_name }}{% if transaction_model.entity_unit_name %}{{ transaction_model.entity_unit_name }}{% endif %}{% if transaction_model.is_credit %}${{ transaction_model.amount | currency_format }}{% endif %}{% if transaction_model.is_debit %}${{ transaction_model.amount | currency_format }}{% endif %}{% if transaction_model.description %}{{ transaction_model.description }}{% endif %}
{% trans 'Total' %}{% currency_symbol %}{{ total_credits | currency_format }}{% currency_symbol %}{{ total_debits | currency_format }}{% trans 'Total' %}{% currency_symbol %}{{ total_credits | currency_format }}{% currency_symbol %}{{ total_debits | currency_format }}
{% elif style == 'compact' %}
- - - +
+ + diff --git a/templates/customers/view_customer.html b/templates/customers/view_customer.html index 25006277..1ae426e5 100644 --- a/templates/customers/view_customer.html +++ b/templates/customers/view_customer.html @@ -27,7 +27,7 @@
{% if perms.django_ledger.change_customermodel %} - {{_("Update")}} + {{_("Update")}} {% endif %}
diff --git a/templates/groups/group_detail.html b/templates/groups/group_detail.html index 841c9714..1c2d9040 100644 --- a/templates/groups/group_detail.html +++ b/templates/groups/group_detail.html @@ -62,7 +62,7 @@ {% empty %} - + {% endfor %} diff --git a/templates/groups/group_permission_form.html b/templates/groups/group_permission_form.html index 7e54d7ca..b40b7775 100644 --- a/templates/groups/group_permission_form.html +++ b/templates/groups/group_permission_form.html @@ -32,7 +32,7 @@
{{ error }}
{% endfor %}
- {% trans "Cancel"|capfirst %} + {% trans "Cancel"|capfirst %}
- -

{% trans 'Exterior Colors' %}

diff --git a/templates/purchase_orders/po_upload_cars.html b/templates/purchase_orders/po_upload_cars.html index 95d3b2e6..cd767118 100644 --- a/templates/purchase_orders/po_upload_cars.html +++ b/templates/purchase_orders/po_upload_cars.html @@ -1,12 +1,35 @@ {% extends "base.html" %} {% block content %} -

{{po.po_number}}

-

{{po.po_status|capfirst}}

-
+
+

{{po.po_number}}

+ +
+

Status:

+ {% comment %} Apply appropriate text color based on po.po_status {% endcomment %} + {% if po.po_status == 'draft' %} +

{{ po.po_status|capfirst }}

+ {% elif po.po_status == 'in_review' %} +

{{ po.po_status|capfirst }}

+ {% elif po.po_status == 'approved' %} +

{{ po.po_status|capfirst }}

+ {% elif po.po_status == 'fulfilled' %} +

{{ po.po_status|capfirst }}

+ {% elif po.po_status == 'void' %} +

{{ po.po_status|capfirst }}

+ {% else %} +

{{ po.po_status|capfirst }}

{# Use muted for unknown/default status #} + {% endif %} +
+ + + + + +
{% trans 'Account' %} {% trans 'Account Name' %} {% trans 'Credit' %}
{% trans "No Permissions" %}{% trans "No User" %}
- + @@ -33,4 +56,5 @@
Name Quatnity Unit Cost
+
{% endblock content %} \ No newline at end of file