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

Compare commits

base: ismail:66e43ef8daad9a57d660e6c76bad9fae9e705ee7
Branches Tags
ismail:main
ismail:frontend
..
compare: ismail:380a23b7c63b2e3277382ee5f38a9a1d1ad1081e
Branches Tags
ismail:main
ismail:frontend

No commits in common. "66e43ef8daad9a57d660e6c76bad9fae9e705ee7" and "380a23b7c63b2e3277382ee5f38a9a1d1ad1081e" have entirely different histories.
66e43ef8da ... 380a23b7c6

1 changed files with 1 additions and 2 deletions
Show Stats Expand all files Collapse all files

3
inventory/views.py
View File

@ -503,8 +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
# 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
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
# ----------------------------------------------------