[update]
This commit is contained in:
parent
25bd78a545
commit
58b59a03b4
|
|
@ -567,12 +567,15 @@ class RentalContract(models.Model):
|
|||
raise_line = next((line for line in self.annual_raise_ids if line.due_date_raise == next_date), None)
|
||||
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) \
|
||||
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) RETURNING id',
|
||||
(
|
||||
(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) \
|
||||
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) RETURNING id',
|
||||
(
|
||||
_('Payment %s') % (payment + 1),
|
||||
self.id,
|
||||
next_date.strftime('%Y-%m-%d'),
|
||||
|
|
@ -583,7 +586,10 @@ class RentalContract(models.Model):
|
|||
self.user_id.id,
|
||||
self.env.user.company_id.id,
|
||||
'draft',
|
||||
self.tax_id.id
|
||||
self.tax_id.id,
|
||||
untaxed_amount,
|
||||
tax_amount,
|
||||
total_amount
|
||||
))
|
||||
|
||||
# Move to the next payment date
|
||||
|
|
|
|||
Loading…
Reference in New Issue