optimised the code for expense total
This commit is contained in:
parent
a14b53e179
commit
17a881f20a
@ -503,7 +503,8 @@ 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_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_vat_collected = total_vat_collected_from_cars + total_vat_collected_from_services
|
||||||
total_revenue_generated = total_revenue_from_cars + total_revenue_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=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_expenses
|
||||||
|
|
||||||
# ----------------------------------------------------
|
# ----------------------------------------------------
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user