From 5f9e9361c4fe9cca0c263346abf534ebdf39132e Mon Sep 17 00:00:00 2001 From: ismail Date: Sun, 24 Aug 2025 13:22:55 +0300 Subject: [PATCH] add additional services and its vat to the invoice payment --- inventory/utils.py | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/inventory/utils.py b/inventory/utils.py index 660ea13a..43d4d252 100644 --- a/inventory/utils.py +++ b/inventory/utils.py @@ -1571,13 +1571,13 @@ def _post_sale_and_cogs(invoice, dealer): # calc = CarFinanceCalculator(invoice) data = get_finance_data(invoice,dealer) car = data.get("car") - cash_acc = entity.get_all_accounts().filter(role_default=True, role=roles.ASSET_CA_CASH).first() - ar_acc = entity.get_all_accounts().filter(role_default=True, role=roles.ASSET_CA_RECEIVABLES).first() - vat_acc = entity.get_all_accounts().filter(role_default=True, role=roles.LIABILITY_CL_TAXES_PAYABLE).first() - car_rev = entity.get_all_accounts().filter(role_default=True, role=roles.INCOME_OPERATIONAL).first() - add_rev = entity.get_all_accounts().filter(role_default=True, role=roles.INCOME_OPERATIONAL).first() - cogs_acc = entity.get_all_accounts().filter(role_default=True, role=roles.COGS).first() - inv_acc = entity.get_all_accounts().filter(role_default=True, role=roles.ASSET_CA_INVENTORY).first() + cash_acc = entity.get_default_coa_accounts().filter(role_default=True, role=roles.ASSET_CA_CASH).first() + ar_acc = entity.get_default_coa_accounts().filter(role_default=True, role=roles.ASSET_CA_RECEIVABLES).first() + vat_acc = entity.get_default_coa_accounts().filter(role_default=True, role=roles.LIABILITY_CL_TAXES_PAYABLE).first() + car_rev = entity.get_default_coa_accounts().filter(role_default=True, role=roles.INCOME_OPERATIONAL).first() + add_rev = entity.get_default_coa_accounts().filter(code="4020").first() + cogs_acc = entity.get_default_coa_accounts().filter(role_default=True, role=roles.COGS).first() + inv_acc = entity.get_default_coa_accounts().filter(role_default=True, role=roles.ASSET_CA_INVENTORY).first() # for car_data in data['cars']: # car = invoice.get_itemtxs_data()[0].filter( @@ -1632,17 +1632,25 @@ def _post_sale_and_cogs(invoice, dealer): journal_entry=je_sale, account=car_rev, amount=net_car_price, - tx_type='credit' + tx_type='credit', + description="Car Sale" ) - if net_additionals_price > 0: + if car.get_additional_services_amount > 0: # Cr Sales – Additional Services TransactionModel.objects.create( journal_entry=je_sale, account=add_rev, - amount=net_additionals_price, + amount=car.get_additional_services_amount, tx_type='credit' ) + TransactionModel.objects.create( + journal_entry=je_sale, + account=vat_acc, + amount=car.get_additional_services_vat, + tx_type='credit', + description="Additional Services VAT" + ) # ------------------------------------------------------------------ # 2B. Journal: COGS / Inventory reduction