ismail/haikal
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Faheed 2025-09-11 17:42:05 +03:00
parent 48167d9fe4
commit a14b53e179
6 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inventory/views.py
View File

@ -503,9 +503,7 @@ def general_dashboard(request,dealer_slug):
total_vat_collected_from_services = sum([car.get_additional_services()['services_vat'] for car in cars_sold_filtered])
total_vat_collected = total_vat_collected_from_cars + total_vat_collected_from_services
total_revenue_generated = total_revenue_from_cars + total_revenue_from_services
expenses = models.ItemModel.objects.filter(entity__admin__dealer=dealer, item_role='expense')
total_expenses = expenses.aggregate(total=Sum('default_amount'))['total'] or 0
total_expenses=sum([x.amount_paid for x in dealer.entity.get_bills().filter(bill_items__item_role="expense")])
gross_profit = net_profit_from_cars - total_expenses
# ----------------------------------------------------

BIN
static/images/car_images/d004326438f695f30050fa1e7f252d9d2d60da4b7b26f49e42badcc0687ebb3c.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 386 KiB

44
templates/dashboards/partials/financial_data_cards.html
View File

@ -20,7 +20,7 @@
<div class="card-body p-4">
<p class="text-uppercase text-muted fw-bold small mb-1">{% trans "Total Revenue from Cars" %}</p>
<h4 class="fw-bolder text-primary mb-3">
{{ total_revenue_from_cars|floatformat:2 }}<span class="icon-saudi_riyal"></span>
{{ total_revenue_from_cars|floatformat:'2g' }}<span class="icon-saudi_riyal"></span>
</h4>
</div>
</div>
@ -30,7 +30,7 @@
<div class="card-body p-4">
<p class="text-uppercase text-muted fw-bold small mb-1">{% trans "Net Profit from Cars" %}</p>
<h4 class="fw-bolder text-success mb-3">
{{ net_profit_from_cars|floatformat:2 }}<span class="icon-saudi_riyal"></span>
{{ net_profit_from_cars|floatformat:'2g' }}<span class="icon-saudi_riyal"></span>
</h4>
</div>
</div>
@ -50,7 +50,7 @@
<div class="card-body p-4">
<p class="text-uppercase text-muted fw-bold small mb-1">{% trans "Total Cost of Cars Sold" %}</p>
<h4 class="fw-bolder text-primary mb-3">
{{ total_cost_of_cars_sold|floatformat:2 }}<span class="icon-saudi_riyal"></span>
{{ total_cost_of_cars_sold|floatformat:'2g' }}<span class="icon-saudi_riyal"></span>
</h4>
</div>
</div>
@ -60,7 +60,7 @@
<div class="card-body p-4">
<p class="text-uppercase text-muted fw-bold small mb-1">{% trans "Total VAT from Cars" %}</p>
<h4 class="fw-bolder text-primary mb-3">
{{ total_vat_collected_from_cars|floatformat:2 }}<span class="icon-saudi_riyal"></span>
{{ total_vat_collected_from_cars|floatformat:'2g' }}<span class="icon-saudi_riyal"></span>
</h4>
</div>
</div>
@ -81,7 +81,7 @@
<div class="card-body p-4">
<p class="text-uppercase text-muted fw-bold small mb-1">{% trans "New Cars Revenue" %}</p>
<h4 class="fw-bolder text-primary mb-3">
{{ total_revenue_from_new_cars|floatformat:2 }}<span class="icon-saudi_riyal"></span>
{{ total_revenue_from_new_cars|floatformat:'2g' }}<span class="icon-saudi_riyal"></span>
</h4>
</div>
</div>
@ -91,7 +91,7 @@
<div class="card-body p-4">
<p class="text-uppercase text-muted fw-bold small mb-1">{% trans "New Cars Net Profit" %}</p>
<h4 class="fw-bolder text-success mb-3">
{{ net_profit_from_new_cars|floatformat:2 }}<span class="icon-saudi_riyal"></span>
{{ net_profit_from_new_cars|floatformat:'2g' }}<span class="icon-saudi_riyal"></span>
</h4>
</div>
</div>
@ -101,7 +101,7 @@
<div class="card-body p-4">
<p class="text-uppercase text-muted fw-bold small mb-1">{% trans "New Cars VAT" %}</p>
<h4 class="fw-bolder text-primary mb-3">
{{ total_vat_collected_from_new_cars|floatformat:2 }}<span class="icon-saudi_riyal"></span>
{{ total_vat_collected_from_new_cars|floatformat:'2g' }}<span class="icon-saudi_riyal"></span>
</h4>
</div>
</div>
@ -111,7 +111,7 @@
<div class="card-body p-4">
<p class="text-uppercase text-muted fw-bold small mb-1">{% trans "New Cars Cost" %}</p>
<h4 class="fw-bolder text-primary mb-3">
{{ total_cost_of_new_cars_sold|floatformat:2 }}<span class="icon-saudi_riyal"></span>
{{ total_cost_of_new_cars_sold|floatformat:'2g' }}<span class="icon-saudi_riyal"></span>
</h4>
</div>
</div>
@ -132,7 +132,7 @@
<div class="card-body p-4">
<p class="text-uppercase text-muted fw-bold small mb-1">{% trans "Used Cars Revenue" %}</p>
<h4 class="fw-bolder text-primary mb-3">
{{ total_revenue_from_used_cars|floatformat:2 }}<span class="icon-saudi_riyal"></span>
{{ total_revenue_from_used_cars|floatformat:'2g' }}<span class="icon-saudi_riyal"></span>
</h4>
</div>
</div>
@ -142,7 +142,7 @@
<div class="card-body p-4">
<p class="text-uppercase text-muted fw-bold small mb-1">{% trans "Used Cars Net Profit" %}</p>
<h4 class="fw-bolder text-success mb-3">
{{ net_profit_from_used_cars|floatformat:2 }}<span class="icon-saudi_riyal"></span>
{{ net_profit_from_used_cars|floatformat:'2g' }}<span class="icon-saudi_riyal"></span>
</h4>
</div>
</div>
@ -152,7 +152,7 @@
<div class="card-body p-4">
<p class="text-uppercase text-muted fw-bold small mb-1">{% trans "Used Cars VAT" %}</p>
<h4 class="fw-bolder text-primary mb-3">
{{ total_vat_collected_from_used_cars|floatformat:2 }}<span class="icon-saudi_riyal"></span>
{{ total_vat_collected_from_used_cars|floatformat:'2g' }}<span class="icon-saudi_riyal"></span>
</h4>
</div>
</div>
@ -162,7 +162,7 @@
<div class="card-body p-4">
<p class="text-uppercase text-muted fw-bold small mb-1">{% trans "Used Cars Cost" %}</p>
<h4 class="fw-bolder text-primary mb-3">
{{ total_cost_of_used_cars_sold|floatformat:2 }}<span class="icon-saudi_riyal"></span>
{{ total_cost_of_used_cars_sold|floatformat:'2g' }}<span class="icon-saudi_riyal"></span>
</h4>
</div>
</div>
@ -185,7 +185,7 @@
<div class="card-body p-4">
<p class="text-uppercase text-muted fw-bold small mb-1">{% trans "Total Inventory Value" %}</p>
<h4 class="fw-bolder text-primary mb-3">
{{ total_inventory_value|floatformat:2 }}<span class="icon-saudi_riyal"></span>
{{ total_inventory_value|floatformat:'2g' }}<span class="icon-saudi_riyal"></span>
</h4>
</div>
</div>
@ -211,7 +211,7 @@
<div class="card-body p-4">
<p class="text-uppercase text-muted fw-bold small mb-1">{% trans "New Cars Inventory Value" %}</p>
<h4 class="fw-bolder text-primary mb-3">
{{ new_car_value|floatformat:2 }}<span class="icon-saudi_riyal"></span>
{{ new_car_value|floatformat:'2g' }}<span class="icon-saudi_riyal"></span>
</h4>
</div>
</div>
@ -221,7 +221,7 @@
<div class="card-body p-4">
<p class="text-uppercase text-muted fw-bold small mb-1">{% trans "Used Cars Inventory Value" %}</p>
<h4 class="fw-bolder text-primary mb-3">
{{ used_car_value|floatformat:2 }}<span class="icon-saudi_riyal"></span>
{{ used_car_value|floatformat:'2g' }}<span class="icon-saudi_riyal"></span>
</h4>
</div>
</div>
@ -254,7 +254,7 @@
<div class="card-body p-4">
<p class="text-uppercase text-muted fw-bold small mb-1">{% trans "Total Revenue from Services" %}</p>
<h4 class="fw-bolder text-info mb-3">
{{ total_revenue_from_services|floatformat:2 }}<span class="icon-saudi_riyal"></span>
{{ total_revenue_from_services|floatformat:'2g' }}<span class="icon-saudi_riyal"></span>
</h4>
</div>
</div>
@ -264,7 +264,7 @@
<div class="card-body p-4">
<p class="text-uppercase text-muted fw-bold small mb-1">{% trans "Total VAT from Services" %}</p>
<h4 class="fw-bolder text-primary mb-3">
{{ total_vat_collected_from_services|floatformat:2 }}<span class="icon-saudi_riyal"></span>
{{ total_vat_collected_from_services|floatformat:'2g' }}<span class="icon-saudi_riyal"></span>
</h4>
</div>
</div>
@ -274,7 +274,7 @@
<div class="card-body p-4">
<p class="text-uppercase text-muted fw-bold small mb-1">{% trans "Total Revenue Generated" %}</p>
<h4 class="fw-bolder text-success mb-3">
{{ total_revenue_generated|floatformat:2 }}<span class="icon-saudi_riyal"></span>
{{ total_revenue_generated|floatformat:'2g' }}<span class="icon-saudi_riyal"></span>
</h4>
</div>
</div>
@ -284,7 +284,7 @@
<div class="card-body p-4">
<p class="text-uppercase text-muted fw-bold small mb-1">{% trans "Total VAT Collected" %}</p>
<h4 class="fw-bolder text-primary mb-3">
{{ total_vat_collected|floatformat:2 }}<span class="icon-saudi_riyal"></span>
{{ total_vat_collected|floatformat:'2g' }}<span class="icon-saudi_riyal"></span>
</h4>
</div>
</div>
@ -294,7 +294,7 @@
<div class="card-body p-4">
<p class="text-uppercase text-muted fw-bold small mb-1">{% trans "Total Expenses" %}</p>
<h4 class="fw-bolder text-danger mb-3">
{{ total_expenses|floatformat:2 }}<span class="icon-saudi_riyal"></span>
{{ total_expenses|floatformat:'2g' }}<span class="icon-saudi_riyal"></span>
</h4>
</div>
</div>
@ -306,11 +306,11 @@
{% if gross_profit|is_negative %}
<h4 class="fw-bolder text-danger mb-3">
{{ gross_profit|floatformat:2 }}<span class="icon-saudi_riyal"></span>
{{ gross_profit|floatformat:'2g' }}<span class="icon-saudi_riyal"></span>
</h4>
{% else %}
<h4 class="fw-bolder text-success mb-3">
{{ gross_profit|floatformat:2 }}<span class="icon-saudi_riyal"></span>
{{ gross_profit|floatformat:'2g' }}<span class="icon-saudi_riyal"></span>
</h4>
{% endif %}
</div>

6
templates/items/expenses/expenses_list.html
View File

@ -51,9 +51,9 @@
href="{% url 'item_expense_update' request.dealer.slug expense.pk %}">
<i class="fa fa-edit me-2"></i>{% trans "Update" %}
</a>
{% comment %} <a class="text-danger dropdown-item" href="#">
<i class="fa fa-trash me-2"></i>{% trans "Delete" %}
</a> {% endcomment %}
<a class="text-info dropdown-item" href="{% url 'bill-create' request.dealer.slug request.entity.slug %}">
<i class="fa fa-plus me-2"></i>{% trans "Create Expense Bill" %}
</a>
</div>
</div>
{% endif %}

14
templates/ledger/reports/car_sale_report.html
View File

@ -121,7 +121,7 @@
<span>{% trans 'Total Revenue from Cars' %}<span class="icon-saudi_riyal"></span></span>
</h5>
<p class="card-text">
<span>{{ total_revenue_from_cars|floatformat:2 }} <span class="icon-saudi_riyal"></span></span>
<span>{{ total_revenue_from_cars|floatformat:'2g' }} <span class="icon-saudi_riyal"></span></span>
</p>
</div>
</div>
@ -133,7 +133,7 @@
<span>{% trans 'Total Revenue from Services' %}<span class="icon-saudi_riyal"></span></span>
</h5>
<p class="card-text">
<span>{{ total_revenue_from_additonals|floatformat:2 }} <span class="icon-saudi_riyal"></span></span>
<span>{{ total_revenue_from_additonals|floatformat:'2g' }} <span class="icon-saudi_riyal"></span></span>
</p>
</div>
</div>
@ -145,7 +145,7 @@
<span>{% trans 'Total Revenue' %}<span class="icon-saudi_riyal"></span></span>
</h5>
<p class="card-text">
<span>{{ total_revenue_collected|floatformat:2 }} <span class="icon-saudi_riyal"></span></span>
<span>{{ total_revenue_collected|floatformat:'2g' }} <span class="icon-saudi_riyal"></span></span>
</p>
</div>
</div>
@ -157,7 +157,7 @@
{% trans 'Total VAT from Cars' %}<i class="fas fa-percent ms-2"></i>
</h5>
<p class="card-text">
<span>{{ total_vat_on_cars|floatformat:2 }} <span class="icon-saudi_riyal"></span></span>
<span>{{ total_vat_on_cars|floatformat:'2g' }} <span class="icon-saudi_riyal"></span></span>
</p>
</div>
</div>
@ -169,7 +169,7 @@
{% trans 'Total VAT from Services' %}<i class="fas fa-percent ms-2"></i>
</h5>
<p class="card-text">
<span>{{ total_vat_from_additonals|floatformat:2 }} <span class="icon-saudi_riyal"></span></span>
<span>{{ total_vat_from_additonals|floatformat:'2g' }} <span class="icon-saudi_riyal"></span></span>
</p>
</div>
</div>
@ -181,7 +181,7 @@
{% trans 'Total VAT' %}<i class="fas fa-percent ms-2"></i>
</h5>
<p class="card-text">
<span>{{ total_vat_collected|floatformat:2 }} <span class="icon-saudi_riyal"></span></span>
<span>{{ total_vat_collected|floatformat:'2g' }} <span class="icon-saudi_riyal"></span></span>
</p>
</div>
</div>
@ -193,7 +193,7 @@
{% trans 'Total Discount Amount' %}<i class="fas fa-tag ms-2"></i>
</h5>
<p class="card-text">
<span>{{ total_discount|floatformat:2 }} <span class="icon-saudi_riyal"></span></span>
<span>{{ total_discount|floatformat:'2g' }} <span class="icon-saudi_riyal"></span></span>
</p>
</div>
</div>

2
templates/ledger/reports/purchase_report.html
View File

@ -75,7 +75,7 @@
<h5 class="card-title">
{% trans 'Total Purchase Amount' %}<span class="fas fa-money-bill ms-2"></span>
</h5>
<p class="card-text">{{ total_po_amount }}</p>
<p class="card-text">{{ total_po_amount|floatformat:'2g' }}</p>
</div>
</div>
</div>