diff --git a/inventory/views.py b/inventory/views.py index 166e5b37..49d54ba6 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -505,7 +505,7 @@ def general_dashboard(request,dealer_slug): total_revenue_generated = total_revenue_from_cars + total_revenue_from_services # total_expenses=sum([x.amount_paid for x in dealer.entity.get_bills().filter(bill_items__item_role="expense")]) total_expenses=dealer.entity.get_bills().filter(bill_items__item_role="expense").aggregate(total=Sum('amount_paid'))['total'] or 0 - gross_profit = net_profit_from_cars - total_expenses + gross_profit = net_profit_from_cars+total_revenue_from_services - total_expenses # ---------------------------------------------------- # 4. Chart Data Aggregation diff --git a/static/images/car_images/9a64649a7390ccb91d272a5bc80696d1555d5c7be946b919a66328de8df9516a.png b/static/images/car_images/9a64649a7390ccb91d272a5bc80696d1555d5c7be946b919a66328de8df9516a.png new file mode 100644 index 00000000..4f4402f2 Binary files /dev/null and b/static/images/car_images/9a64649a7390ccb91d272a5bc80696d1555d5c7be946b919a66328de8df9516a.png differ diff --git a/static/images/car_images/e6958f37e5a69fc417aeb52a208f0aa9f1328cf5f38eaa2ae9d68a1a7d67487e.png b/static/images/car_images/e6958f37e5a69fc417aeb52a208f0aa9f1328cf5f38eaa2ae9d68a1a7d67487e.png new file mode 100644 index 00000000..e3faf26c Binary files /dev/null and b/static/images/car_images/e6958f37e5a69fc417aeb52a208f0aa9f1328cf5f38eaa2ae9d68a1a7d67487e.png differ diff --git a/static/images/car_images/f89b2f8db1f26281ab947580f1d854271c133f4e910f0b5ce2a55681566ba3c0.png b/static/images/car_images/f89b2f8db1f26281ab947580f1d854271c133f4e910f0b5ce2a55681566ba3c0.png new file mode 100644 index 00000000..1f77b631 Binary files /dev/null and b/static/images/car_images/f89b2f8db1f26281ab947580f1d854271c133f4e910f0b5ce2a55681566ba3c0.png differ diff --git a/templates/bill/bill_detail.html b/templates/bill/bill_detail.html index 391ccc45..c68457ef 100644 --- a/templates/bill/bill_detail.html +++ b/templates/bill/bill_detail.html @@ -3,6 +3,7 @@ {% load static %} {% load django_ledger %} {% load custom_filters %} +{% load tenhal_tag %} {% block title %}{% trans "Bill Details" %}{% endblock %} {% block content %}
- {% trans 'Amount Due' %}: {% currency_symbol %}{{ bill.get_amount_open | currency_format }} + {% trans 'Amount Due' %}: {{ bill.get_amount_open | currency_format }}
- {% trans 'Amount Paid' %}: {% currency_symbol %}{{ bill.amount_paid | currency_format }} + {% trans 'Amount Paid' %}: {{ bill.amount_paid | currency_format }}
{% trans 'Progress' %}: {{ bill.get_progress | percentage }}
{% trans 'Amount Due' %}: - {% currency_symbol %}{{ bill.amount_due | currency_format }} + {{ bill.amount_due | currency_format }}
{% trans 'Due Date' %}: @@ -178,7 +178,7 @@
{% trans 'Amount Paid' %}: - {% currency_symbol %}{{ bill.amount_paid | currency_format }} + {{ bill.amount_paid | currency_format }}
{% trans 'Paid Date' %}: @@ -192,7 +192,7 @@
{% trans 'Bill Amount' %}: - {% currency_symbol %}{{ bill.amount_due | currency_format }} + {{ bill.amount_due | currency_format }}
{{ bill.get_bill_status_display | upper }}
|
@@ -83,6 +83,21 @@
{{ opportunity.expected_revenue }}
|
+ |
|
+
+
+ + {% trans "Marked Price" %} + + + |
+
+ + {{ opportunity.car.marked_price }} + + |
diff --git a/templates/dashboards/aging_inventory_list.html b/templates/dashboards/aging_inventory_list.html
index ccc1009f..54e9f5c5 100644
--- a/templates/dashboards/aging_inventory_list.html
+++ b/templates/dashboards/aging_inventory_list.html
@@ -12,7 +12,7 @@
- {% trans "Aging Inventory Total" %} :: {{ total_aging_inventory_value|default:0.00 }} + {% trans "Aging Inventory Total" %} :: {{ total_aging_inventory_value|floatformat:'2g'|default:0.00 }}{% trans "Cars in inventory for more than 60 days." %} diff --git a/templates/inventory/car_detail.html b/templates/inventory/car_detail.html index 4b8b0c68..1de0c5a4 100644 --- a/templates/inventory/car_detail.html +++ b/templates/inventory/car_detail.html @@ -1,5 +1,6 @@ {% extends 'base.html' %} {% load i18n static custom_filters %} +{% load tenhal_tag %} {% block title %}{{ _("Car Details") }}{% endblock %} {% block customCSS %} |