From 9e25dfddd091ce93e70abbd844263c13deef69f5 Mon Sep 17 00:00:00 2001 From: zainab2097 <149927291+zainab2097@users.noreply.github.com> Date: Tue, 20 Aug 2024 15:21:50 +0300 Subject: [PATCH] Update rental_contract.py --- .../property_management/models/rental_contract.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/odex25_realstate/property_management/models/rental_contract.py b/odex25_realstate/property_management/models/rental_contract.py index 7c529f109..c964bdb7c 100644 --- a/odex25_realstate/property_management/models/rental_contract.py +++ b/odex25_realstate/property_management/models/rental_contract.py @@ -556,7 +556,10 @@ class RentalContract(models.Model): rent_amount_per_payment = self.cal_rent_amount / (rent_factor / months) water_amount_per_payment = self.water_cost / (rent_factor / service_months) services_amount_per_payment = self.service_amount / (rent_factor / service_months) - + untaxed_amount = round(rent_amount_per_payment + water_amount_per_payment + services_amount_per_payment, 2) + tax_amount = round(self.tax_id.amount / 100 * rent_amount_per_payment, 2) + total_amount = round(untaxed_amount + tax_amount, 2) + next_date = date_from service_next_date = date_from payment = 0 @@ -568,9 +571,7 @@ class RentalContract(models.Model): if raise_line: rent_amount_per_payment = raise_line.rent_amount_after_raise / (rent_factor / months) # Calculate the amounts - untaxed_amount = round(rent_amount_per_payment + water_amount_per_payment + services_amount_per_payment, 2) - tax_amount = round(self.tax_id.amount / 100 * rent_amount_per_payment, 2) - total_amount = round(untaxed_amount + tax_amount, 2) + # Insert rent payment line self._cr.execute('INSERT INTO rent_payment \ (name, contract_id, due_date, property_id, amount, water_cost, service_cost, user_id, company_id, state, tax_id, untaxed_amount, tax_amount, total_amount) \