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

Merge pull request #1662 from expsa/odex25_realstate_dev 

Odex25 realstate dev
This commit is contained in:
esraa8mostafa 2024-10-30 16:41:43 +03:00 committed by GitHub
parent cf69eaf773 dedadbb642
commit 013cbf05cd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
odex25_realstate/property_management/models/annual_raise.py
View File

@ -35,7 +35,7 @@ class AnnualRaise(models.Model):
compute='get_rent_amount_after_raise', store=True)
meter_price = fields.Float(string="Meter price", related='contract_id.meter_price')
meter_price_after_raise = fields.Float(string="Meter price after raise", compute='get_raise_amount', store=True)
due_date_raise = fields.Date(string='Due Date', compute='get_due_date', store=True)
due_date_raise = fields.Date(string='Due Date', compute='get_due_date')
@api.depends('raise_val', 'raise_type', 'raise_on', 'rent_amount')
def get_raise_amount(self):
@ -53,16 +53,16 @@ class AnnualRaise(models.Model):
if rec.raise_on == 'rent_amount':
raise_amount = (
rec.contract_id.rent_amount if rec.contract_id.change_price else rec.contract_id.cal_rent_amount) * (
rec.raise_val / 100)
rec.raise_val / 100)
rec.raise_amount = raise_amount
else:
raise_amount = ((
rec.contract_id.new_price if rec.contract_id.change_price else rec.contract_id.meter_price) * (
rec.raise_val / 100)) * rec.contract_id.space
rec.raise_val / 100)) * rec.contract_id.space
rec.raise_amount = raise_amount
meter_price_after_raise = ((
rec.contract_id.new_price if rec.contract_id.change_price else rec.contract_id.meter_price) * (
rec.raise_val / 100)) + rec.meter_price
rec.raise_val / 100)) + rec.meter_price
rec.meter_price_after_raise = meter_price_after_raise
elif rec.raise_type == 'fixed':
if rec.raise_on == 'rent_amount':
@ -95,19 +95,16 @@ class AnnualRaise(models.Model):
# record.raise_amount = 0.0
# record.raise_val = 0.0
@api.depends('year', 'contract_id')
@api.depends('year','contract_id')
def get_due_date(self):
if self._context.get('contract_id'):
contract_object = self.env['rental.contract'].search([('id', '=', self._context.get('contract_id'))])
for rec in self:
if not self._context.get('contract_id'):
contract_object = self.env['rental.contract'].search([('id', '=', rec.contract_id.id)])
date = contract_object.date_from
date = self.contract_id.date_from
rec.due_date_raise = date
date_from = datetime.strptime(datetime.strftime(date, '%Y-%m-%d'), '%Y-%m-%d').date()
due_date = date_from + relativedelta(years=rec.year)
due_date_raise = due_date.strftime('%Y-%m-%d')
rec.due_date_raise = due_date_raise
print(rec.due_date_raise, 'rec.due_date_raise')
def check_concatenate_date_to(self, year, month, day):
concatenated_date = ''