Merge pull request #611 from expsa/zainab2097-patch-3

Update end_rental_contract.py
This commit is contained in:
zainab2097 2024-08-08 16:30:24 +03:00 committed by GitHub
commit d04d14b83c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 9 deletions

View File

@ -131,21 +131,14 @@ class EndOfRent(models.Model):
rec.maintenance_id = maintenance_id.id
self.write({'state': 'check'})
@api.depends('end_line_ids.cost','maintenance_cost', 'hand_cost', 'end_line_ids', 'end_line_ids.total')
@api.depends('maintenance_cost', 'hand_cost', 'end_line_ids', 'end_line_ids.total')
def _get_total_amount(self):
for rec in self:
if rec.end_line_ids:
rec.maintenance_cost = sum([line.total for line in rec.end_line_ids])
rec.total_amount = rec.maintenance_cost + rec.hand_cost
@api.onchange('end_line_ids.cost','maintenance_cost','end_line_ids.total', 'hand_cost', 'end_line_ids')
def _onchange_get_total_amount(self):
for rec in self:
if rec.end_line_ids:
rec.maintenance_cost = sum([line.total for line in rec.end_line_ids])
rec.total_amount = rec.maintenance_cost + rec.hand_cost
class EndRentLine(models.Model):
_name = "end.rent.line"
_description = "End Of Rent Line"
@ -294,3 +287,10 @@ class PropertyManagementMaintenance(models.Model):
if rec.end_line_ids:
rec.maintenance_cost = sum([line.total for line in rec.end_line_ids])
rec.total_amount = rec.maintenance_cost + rec.hand_cost
@api.depends('maintenance_cost', 'hand_cost', 'end_line_ids','end_line_ids.cost', 'end_line_ids.total')
def _get_total_amount(self):
for rec in self:
# تأكد من إعادة حساب maintenance_cost باستخدام المجموع الصحيح لجميع الأسطر
rec.maintenance_cost = sum(line.total for line in rec.end_line_ids)
rec.total_amount = rec.maintenance_cost + rec.hand_cost