devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update rent_payment

This commit is contained in:
zainab2097 2024-08-30 12:49:25 +03:00 committed by GitHub
parent dfd552460d
commit 075dc42e8c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
odex25_realstate/property_management/models/rent_payment.py
View File

@ -106,7 +106,7 @@ class RentPayment(models.Model):
'price_unit': self.amount,
'quantity': 1.0,
'account_id': payment.contract_id.revenue_account_id.id,
'analytic_account_id': payment.property_id.analytic_account_id.id if property_id.analytic_account_id else False,
'analytic_account_id': payment.property_id.account_analy_id.id if property_id.account_analy_id else False,
'tax_ids': [(6, 0, [payment.tax_id.id])] if payment.tax_id else False, # Assigning tax_id to tax_ids
}))
if payment.water_cost>0.00:
@ -115,7 +115,7 @@ class RentPayment(models.Model):
'price_unit':self.water_cost,
'quantity': 1.0,
'account_id': payment.contract_id.revenue_account_id.id,
'analytic_account_id': payment.property_id.analytic_account_id.id if property_id.analytic_account_id else False,
'analytic_account_id': payment.property_id.account_analy_id.id if property_id.account_analy_id else False,
'tax_ids': [(6, 0, [payment.tax_id.id])] if payment.tax_id else False, # Assigning tax_id to tax_ids
}),)
if payment.service_cost>0.00:
@ -123,7 +123,7 @@ class RentPayment(models.Model):
'name':'قيمة الخدمات'+' - '+ self.name+' - '+payment.contract_id.name + ' - '+self.property_id.name+' - '+self.unit_ids[0].name+' - ' + payment.code + ' - ' + str(payment.due_date),
'price_unit': self.service_cost,
'quantity': 1.0,
'analytic_account_id': payment.property_id.analytic_account_id.id if property_id.analytic_account_id else False,
'analytic_account_id': payment.property_id.account_analy_id.id if property_id.account_analy_id else False,
'account_id': payment.contract_id.revenue_account_id.id,
'tax_ids': [(6, 0, [payment.tax_id.id])] if payment.tax_id else False, # Assigning tax_id to tax_ids
}))
@ -132,7 +132,7 @@ class RentPayment(models.Model):
'name':self.name + ' - ' +payment.contract_id.name + ' - '+self.property_id.name+' - '+self.unit_ids[0].name+' - '+payment.code + ' - ' + str(payment.due_date),
'price_unit':self.total_amount,
'quantity': 1.0,
'analytic_account_id': payment.property_id.analytic_account_id.id if property_id.analytic_account_id else False,
'analytic_account_id': payment.property_id.account_analy_id.id if property_id.account_analy_id else False,
'account_id': payment.contract_id.revenue_account_id.id,
'tax_ids': [(6, 0, [payment.tax_id.id])] if payment.tax_id else False, # Assigning tax_id to tax_ids
}))
@ -308,4 +308,4 @@ class RentPayment(models.Model):
@api.depends('amount', 'water_cost', 'service_cost','tax_id')
def get_total_amount(self):
for rec in self:
rec.total_amount = round(rec.untaxed_amount + rec.tax_amount,2)
rec.total_amount = round(rec.untaxed_amount + rec.tax_amount,2)