pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!2743 !2742 添加功能

Browse Source 
Merge pull request !2743 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-05-15 12:47:48 +00:00
committed by Gitee
parent 996e471d92 7b6f37ddfc
commit acec19b5b4
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_property_approval/models/property_lease_contract.py
+9 -8
View File
@@ -68,9 +68,9 @@ class PropertyLeaseContract(models.Model):
active = fields.Boolean('Active', default=True, tracking=True)
lease_term = fields.Float(string="租期")
lease_term_year = fields.Integer(string="租期(年)",default=lambda self: datetime.now().year)
lease_term_month = fields.Integer(string="租期(月)",default=lambda self: datetime.now().month)
lease_term_day = fields.Integer(string="租期(日)",default=lambda self: datetime.now().day)
lease_term_year = fields.Integer(string="租期(年)")
lease_term_month = fields.Integer(string="租期(月)")
lease_term_day = fields.Integer(string="租期(日)")
term_start_time = fields.Date(string="合约开始时间", default=fields.Datetime.now)
term_end_time = fields.Date(string="合约结束时间")
actual_start_time = fields.Date(string="实际开始时间")
@@ -447,6 +447,7 @@ class PropertyLeaseContract(models.Model):
# todo 还没有计算递增递减
# todo 还没有计算首月优惠
# todo 还没有计算开始和结束不足月份和季度的计算比例
for record in self:
if record.term_start_time and record.term_end_time:
record.write({'breakdown_ids': [(5, 0, 0)]})
@@ -887,7 +888,7 @@ class PropertyLeaseContract(models.Model):
rec.electricity_fee_ids = [(5, 0, 0)]
rec.mange_fee_ids = [(5, 0, 0)]
rec.admin_id = rec.lease_ids[0].admin_id.id if rec.lease_ids else ''
rec.admin_id = rec.lease_ids[0].admin_line_id.id if rec.lease_ids else ''
rec.company_id = rec.lease_ids[0].address_id.company_id.id if rec.lease_ids else ''
rec.precinct_id = rec.lease_ids[0].address_id.precinct_id.id if rec.lease_ids else ''
rec.total_area = sum([lease.property_area for lease in rec.lease_ids])
@@ -898,7 +899,7 @@ class PropertyLeaseContract(models.Model):
property_ids = self.env["property.lease.contract"].browse(self._context.get('active_ids', self._context.get('active_id')))
for record in property_ids:
company_id = record.lease_ids[0].address_id.company_id.id if record.lease_ids else ''
admin_id = record.lease_ids[0].admin_id.id if record.lease_ids else ''
admin_id = record.lease_ids[0].admin_line_id.id if record.lease_ids else ''
record.write({'company_id': company_id,
'admin_id': admin_id,
'actual_end_time': datetime.now(),
@@ -1125,7 +1126,7 @@ class PropertyLeaseContract(models.Model):
def _compute_admin_id(self):
for record in self:
if record.lease_ids:
record.admin_id = record.lease_ids[0].admin_id.id
record.admin_id = record.lease_ids[0].admin_line_id.id
def get_property_contract_time(self):
unique_property_ids = set()
@@ -1196,7 +1197,7 @@ class PropertyLeaseContract(models.Model):
for record in self:
property_ids = []
rent_area = 0
first_address_id = record.lease_ids[0].address_id if record.lease_ids else None
first_address_id = record.lease_ids[0].admin_line_id if record.lease_ids else None
for lease_id in record.lease_ids:
property_ids.append(lease_id.address_id.id)
rent_area += lease_id.address_id.rent_area
@@ -1224,7 +1225,7 @@ class PropertyLeaseContract(models.Model):
contract_ids = self.env["property.lease.contract"].browse(self._context.get('active_ids', self._context.get('active_id')))
for record in contract_ids:
property_ids = []
property_id = record.lease_ids[0].address_id
property_id = record.lease_ids[0].admin_line_id
if record.property_state == 'done':
raise UserError(f'{record.name}该物业已评估，请勿重复评估')
rent_area = 0