fix
This commit is contained in:
@@ -23,7 +23,7 @@ from core.apps.finance.serializers.income import IncomeListSerializer
|
||||
from core.apps.finance.serializers.expence import ExpenceListSerializer
|
||||
# orders
|
||||
from core.apps.orders.models import Party
|
||||
from core.apps.orders.serializers.party import PartyDetailSerializer
|
||||
from core.apps.orders.serializers.party import PartyAKTSerializer
|
||||
|
||||
|
||||
class CounterpartyListApiView(generics.ListAPIView):
|
||||
@@ -362,7 +362,7 @@ class CounterpartyAKTApiView(views.APIView):
|
||||
date_key = party.closed_date.strftime('%Y-%m-%d')
|
||||
daily_data[date_key]['parties'].append(party)
|
||||
|
||||
party_total = getattr(party, 'total_price', 0) or 0
|
||||
party_total = getattr(party.party_amount, 'calculated_amount', 0) or 0
|
||||
daily_data[date_key]['parties_total'] = daily_data[date_key].get('parties_total', Decimal('0')) + Decimal(party_total)
|
||||
|
||||
for income in incomes:
|
||||
@@ -391,7 +391,7 @@ class CounterpartyAKTApiView(views.APIView):
|
||||
)
|
||||
|
||||
daily_data[date_key].update({
|
||||
'parties': PartyDetailSerializer(parties_list, many=True).data,
|
||||
'parties': PartyAKTSerializer(parties_list, many=True).data,
|
||||
'expences': ExpenceListSerializer(expences_list, many=True).data,
|
||||
'incomes': IncomeListSerializer(incomes_list, many=True).data,
|
||||
'day_kredit': str(day_kredit),
|
||||
|
||||
Reference in New Issue
Block a user