xoliqberdiyev/ibapp-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

finance: fix income and expence logic

Browse Source
This commit is contained in:
behruz-dev
2025-10-31 22:36:04 +05:00
parent 73112a90de
commit f5cebc4f37
5 changed files with 492 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

208
core/apps/finance/serializers/income.py
View File

@@ -77,7 +77,6 @@ class IncomeListSerializer(serializers.ModelSerializer):
else None
)
class IncomeCreateSerializer(serializers.ModelSerializer):
class Meta:
model = Income
@@ -97,8 +96,23 @@ class IncomeCreateSerializer(serializers.ModelSerializer):
"audit",
]
def validate(self, data):
price = data.get('price')
exchange_rate = data.get('exchange_rate')
if price and price < 0:
raise serializers.ValidationError("Narxi manfiy bo'lishi mumkin emas")
if exchange_rate and exchange_rate < 0:
raise serializers.ValidationError("Kurs manfiy bo'lishi mumkin emas")
return data
def create(self, validated_data):
with transaction.atomic():
exchange_rate = validated_data.get("exchange_rate") or 1
final_price = validated_data.get("price") * exchange_rate
income = Income.objects.create(
user=self.context.get("user"),
cash_transaction=validated_data["cash_transaction"],
@@ -108,61 +122,60 @@ class IncomeCreateSerializer(serializers.ModelSerializer):
counterparty=validated_data.get("counterparty"),
type_income=validated_data.get("type_income"),
currency=validated_data.get("currency"),
price=(
validated_data.get("price") * validated_data.get("exchange_rate")
if validated_data.get("exchange_rate")
else validated_data.get("price")
),
exchange_rate=validated_data.get("exchange_rate"),
price=final_price,
exchange_rate=exchange_rate,
date=validated_data.get("date"),
comment=validated_data.get("comment"),
file=validated_data.get("file"),
audit=validated_data.get("audit"),
)
cash_transaction = income.cash_transaction
payment_type = income.payment_type
currency = validated_data.get("currency", "uzs").lower()
if validated_data.get("currency") == "uzs":
if currency == "uzs":
cash_transaction.income_balance_uzs += income.price
cash_transaction.total_balance_uzs = (
cash_transaction.income_balance_uzs
- cash_transaction.expence_balance_uzs
)
payment_type.total_uzs += income.price
if income.counterparty:
if income.counterparty.debit_uzs != 0:
if income.counterparty.debit_uzs > 0:
income.counterparty.debit_uzs -= income.price
income.counterparty.total_debit -= income.price
income.counterparty.kredit_uzs += (
income.counterparty.debit_uzs - income.price
)
income.counterparty.kredit_uzs += income.price
income.counterparty.total_kredit += income.price
else:
income.counterparty.kredit_uzs += income.price
income.counterparty.total_kredit += income.price
income.counterparty.save()
elif validated_data.get("currency") == "usd":
elif currency == "usd":
cash_transaction.income_balance_usd += income.price
cash_transaction.total_balance_usd = (
cash_transaction.income_balance_usd
- cash_transaction.expence_balance_usd
)
payment_type.total_usd += income.price
if income.counterparty:
if income.counterparty.debit_usd != 0:
income.counterparty.debit_usd -= validated_data.get("price")
if income.counterparty.debit_usd > 0:
income.counterparty.debit_usd -= income.price
income.counterparty.total_debit -= income.price
income.counterparty.kredit_usd += (
income.counterparty.debit_usd - validated_data.get("price")
)
income.counterparty.kredit_usd += income.price
income.counterparty.total_kredit += income.price
else:
income.counterparty.kredit_usd += validated_data.get("price")
income.counterparty.kredit_usd += income.price
income.counterparty.total_kredit += income.price
income.counterparty.save()
cash_transaction.save()
@@ -192,70 +205,97 @@ class IncomeUpdateSerializer(serializers.ModelSerializer):
"price": {"required": False},
}
def update(self, instance, validated_data):
old_price = instance.price
instance.project_folder = validated_data.get(
"project_folder", instance.project_folder
)
instance.project = validated_data.get("project", instance.project)
instance.price = validated_data.get("price", instance.price)
instance.type_income = validated_data.get("type_income", instance.type_income)
instance.counterparty = validated_data.get(
"counterparty", instance.counterparty
)
instance.date = validated_data.get("date", instance.date)
instance.comment = validated_data.get("comment", instance.comment)
instance.audit = validated_data.get("audit", instance.audit)
instance.file = validated_data.get("file", instance.file)
if validated_data.get("price"):
cash_transaction = instance.cash_transaction
payment_type = instance.payment_type
if old_price > validated_data.get("price"):
if instance.currency == "uzs":
cash_transaction.income_balance_uzs -= (
old_price - validated_data.get("price")
)
cash_transaction.total_balance_uzs -= (
old_price - validated_data.get("price")
)
payment_type.total_uzs -= (
(old_price - validated_data.get("price"))
if payment_type.total_uzs
> (old_price - validated_data.get("price"))
else 0
)
else:
cash_transaction.income_balance_usd -= (
old_price - validated_data.get("price")
)
cash_transaction.total_balance_usd -= (
old_price - validated_data.get("price")
)
payment_type.total_usd -= (
(old_price - validated_data.get("price"))
if payment_type.total_usd
> (old_price - validated_data.get("price"))
else 0
)
def validate_price(self, value):
if value and value < 0:
raise serializers.ValidationError("Narxi manfiy bo'lishi mumkin emas")
return value
elif old_price < validated_data.get("price"):
if instance.currency == "uzs":
cash_transaction.income_balance_uzs += (
old_price - validated_data.get("price")
def update(self, instance, validated_data):
with transaction.atomic():
old_price = instance.price
old_counterparty = instance.counterparty
new_price = validated_data.get("price", instance.price)
new_counterparty = validated_data.get("counterparty", instance.counterparty)
currency = instance.currency.lower()
instance.project_folder = validated_data.get(
"project_folder", instance.project_folder
)
instance.project = validated_data.get("project", instance.project)
instance.price = new_price
instance.type_income = validated_data.get("type_income", instance.type_income)
instance.counterparty = new_counterparty
instance.date = validated_data.get("date", instance.date)
instance.comment = validated_data.get("comment", instance.comment)
instance.audit = validated_data.get("audit", instance.audit)
instance.file = validated_data.get("file", instance.file)
if validated_data.get("price") and old_price != new_price:
price_difference = new_price - old_price
cash_transaction = instance.cash_transaction
payment_type = instance.payment_type
if currency == "uzs":
cash_transaction.income_balance_uzs += price_difference
cash_transaction.total_balance_uzs = (
cash_transaction.income_balance_uzs
- cash_transaction.expence_balance_uzs
)
cash_transaction.total_balance_uzs += (
old_price - validated_data.get("price")
payment_type.total_uzs += price_difference
elif currency == "usd":
cash_transaction.income_balance_usd += price_difference
cash_transaction.total_balance_usd = (
cash_transaction.income_balance_usd
- cash_transaction.expence_balance_usd
)
payment_type.total_uzs += old_price - validated_data.get("price")
else:
cash_transaction.income_balance_usd += (
old_price - validated_data.get("price")
)
cash_transaction.total_balance_usd += (
old_price - validated_data.get("price")
)
payment_type.total_usd += old_price - validated_data.get("price")
cash_transaction.save()
payment_type.save()
instance.save()
return instance
payment_type.total_usd += price_difference
cash_transaction.save()
payment_type.save()
if new_counterparty != old_counterparty:
if old_counterparty:
if currency == "uzs":
if old_counterparty.kredit_uzs > 0:
old_counterparty.kredit_uzs -= old_price
old_counterparty.total_kredit -= old_price
else:
old_counterparty.debit_uzs += old_price
old_counterparty.total_debit += old_price
else:
if old_counterparty.kredit_usd > 0:
old_counterparty.kredit_usd -= old_price
old_counterparty.total_kredit -= old_price
else:
old_counterparty.debit_usd += old_price
old_counterparty.total_debit += old_price
old_counterparty.save()
if new_counterparty:
if currency == "uzs":
if new_counterparty.debit_uzs > 0:
new_counterparty.debit_uzs -= new_price
new_counterparty.total_debit -= new_price
new_counterparty.kredit_uzs += new_price
new_counterparty.total_kredit += new_price
else:
new_counterparty.kredit_uzs += new_price
new_counterparty.total_kredit += new_price
else:
if new_counterparty.debit_usd > 0:
new_counterparty.debit_usd -= new_price
new_counterparty.total_debit -= new_price
new_counterparty.kredit_usd += new_price
new_counterparty.total_kredit += new_price
else:
new_counterparty.kredit_usd += new_price
new_counterparty.total_kredit += new_price
new_counterparty.save()
instance.save()
return instance