diff --git a/yuthon_property/models/property_evaluation_plan.py b/yuthon_property/models/property_evaluation_plan.py index 76bfc6913..e71f65606 100644 --- a/yuthon_property/models/property_evaluation_plan.py +++ b/yuthon_property/models/property_evaluation_plan.py @@ -20,6 +20,8 @@ class PropertyEvaluationPlan(models.Model): increments_few_years = fields.Integer(string='每几年递增') lease_form = fields.Selection([('sublease', '分租'), ('whole', '整租')], string="租赁形式", compute='compute_lease_form') annual_increase_percentage = fields.Float(string='递增百分比', igits=(6, 2)) + annual_increase_amount = fields.Float(string='递增金额', igits=(6, 2)) + rent_unit = fields.Float(string='递增单价', igits=(6, 2)) remake = fields.Text(string='备注') property_state = fields.Selection([('to', '待审批'), ('done', '已审批')], string="状态", default='to') diff --git a/yuthon_property/models/yuthon_property.py b/yuthon_property/models/yuthon_property.py index 7652f0491..1f121dd27 100644 --- a/yuthon_property/models/yuthon_property.py +++ b/yuthon_property/models/yuthon_property.py @@ -85,14 +85,32 @@ class YuthonProperty(models.Model): owner_id = fields.Many2one('yuthon.owner.message', string="权属人") vacant_duration = fields.Float(string="空置时长", digits=(16, 2)) lease_period = fields.Integer(string='租赁期限（<=)') + rent_period = fields.Integer(string="免租期（<=）") + first_years_begin = fields.Integer(string='第几年开始') + increments_few_years = fields.Integer(string='每几年递增') + annual_increase_percentage = fields.Float(string='递增百分比', igits=(6, 2)) + annual_increase_amount = fields.Float(string='递增金额', igits=(6, 2)) + rent_unit = fields.Float(string='租金单价', igits=(6, 2)) @api.onchange('reference_ids') def _onchange_reference_ids(self): for record in self: if record.reference_ids: record.lease_period = record.reference_ids[-1].lease_period + record.rent_period = record.reference_ids[-1].rent_period + record.first_years_begin = record.reference_ids[-1].first_years_begin + record.increments_few_years = record.reference_ids[-1].increments_few_years + record.annual_increase_percentage = record.reference_ids[-1].annual_increase_percentage + record.annual_increase_amount = record.reference_ids[-1].annual_increase_amount + record.rent_unit = record.reference_ids[-1].rent_unit else: record.lease_period = 0.0 + record.rent_period = 0.0 + record.first_years_begin = 0.0 + record.increments_few_years = 0.0 + record.annual_increase_percentage = 0.0 + record.annual_increase_amount = 0.0 + record.rent_unit = 0.0 @api.depends('name') def _compute_first_letter(self): @@ -284,7 +302,11 @@ class YuthonProperty(models.Model): 'evaluation_area': record.rent_area, 'owner_id': record.owner_id.id if record.owner_id else None, 'registered_id': record.registered_id.id if record.registered_id else None, - 'lease_period': record.lease_period if record.lease_period else None, + 'lease_period': record.lease_period, + 'first_years_begin': record.first_years_begin, + 'increments_few_years': record.increments_few_years, + 'annual_increase_amount': record.annual_increase_amount, + 'rent_unit': record.rent_unit, 'annual_increase_percentage': record.reference_ids[-1].annual_increase_percentage if record.reference_ids else None, 'assessment_category': 'rent_money', 'remake': record.remark, @@ -309,7 +331,11 @@ class YuthonProperty(models.Model): 'evaluation_area': record.rent_area, 'owner_id': record.owner_id.id if record.owner_id else None, 'registered_id': record.registered_id.id if record.registered_id else None, - 'lease_period': record.lease_period if record.lease_period else None, + 'lease_period': record.lease_period, + 'first_years_begin': record.first_years_begin, + 'increments_few_years': record.increments_few_years, + 'annual_increase_amount': record.annual_increase_amount, + 'rent_unit': record.rent_unit, 'annual_increase_percentage': record.reference_ids[-1].annual_increase_percentage if record.reference_ids else None, 'assessment_category': 'rent_money', 'remake': record.remark, @@ -382,9 +408,20 @@ class YuthonProperty(models.Model): owner_id = record.title_information_ids[-1].owner_id.id if record.title_information_ids else '' company_id = record.manage_information_ids[-1].company_id.id if record.manage_information_ids else '' lease_period = record.reference_ids[-1].lease_period if record.reference_ids else '' + rent_period = record.reference_ids[-1].rent_period if record.reference_ids else '' + first_years_begin = record.reference_ids[-1].first_years_begin if record.reference_ids else '' + increments_few_years = record.reference_ids[-1].increments_few_years if record.reference_ids else '' + annual_increase_amount = record.reference_ids[-1].annual_increase_amount if record.reference_ids else '' + rent_unit = record.reference_ids[-1].rent_unit if record.reference_ids else '' title_deed = record.title_information_ids[-1].title_certificate if record.title_information_ids else '' registered_id = record.title_information_ids[-1].registered_id.id if record.title_information_ids else '' record.registered_id = registered_id + record.company_id = company_id + record.rent_period = rent_period + record.first_years_begin = first_years_begin + record.increments_few_years = increments_few_years + record.annual_increase_amount = annual_increase_amount + record.rent_unit = rent_unit record.owner_id = owner_id record.company_id = company_id record.lease_period = lease_period @@ -543,6 +580,8 @@ class YuthonReferenceConditions(models.Model): first_years_begin = fields.Integer(string='第几年开始') increments_few_years = fields.Integer(string='每几年递增') annual_increase_percentage = fields.Float(string='递增百分比', igits=(6, 2)) + annual_increase_amount = fields.Float(string='递增金额', igits=(6, 2)) + rent_unit = fields.Float(string='递增单价', igits=(6, 2)) class YuthonMajorEventLine(models.Model): _name = 'yuthon.major.event.line' diff --git a/yuthon_property/views/property_evaluation_plan_view.xml b/yuthon_property/views/property_evaluation_plan_view.xml index 771c53351..389e005fa 100644 --- a/yuthon_property/views/property_evaluation_plan_view.xml +++ b/yuthon_property/views/property_evaluation_plan_view.xml @@ -19,6 +19,8 @@ + + diff --git a/yuthon_property/views/yuthon_property_views.xml b/yuthon_property/views/yuthon_property_views.xml index 2f7a26eed..728bc8996 100644 --- a/yuthon_property/views/yuthon_property_views.xml +++ b/yuthon_property/views/yuthon_property_views.xml @@ -204,6 +204,8 @@ + + diff --git a/yuthon_property_approval/models/property_lease_contract.py b/yuthon_property_approval/models/property_lease_contract.py index 09e683f28..a0a132b50 100644 --- a/yuthon_property_approval/models/property_lease_contract.py +++ b/yuthon_property_approval/models/property_lease_contract.py @@ -113,7 +113,7 @@ class PropertyLeaseContract(models.Model): percentage_damages= fields.Float(string="违约金") date_of_payment = fields.Selection([('five', '5'), ('fifteen', '15'), ('twentyfive', '25')], string="支付日期") first_pay = fields.Date(string="首次付款日") - unit_price = fields.Float(string="单价", store=True, digits=(16, 2)) + unit_price = fields.Float(string="单价", store=True, digits=(16, 4)) deposit_type = fields.Selection([('deposit', '押金'), ('performance', '履约保证金')], string="押金/履约保证金") deposit_status = fields.Selection([('unpaid', '未支付'), ('paid', '已支付'), ('returned','已退'),('no_paid', '没收')], string='押金状态') deposit = fields.Float(string="押金/履约保证金", store=True)