diff --git a/yuthon_property/models/property_evaluation_plan.py b/yuthon_property/models/property_evaluation_plan.py index 5cda15983..300fb4171 100644 --- a/yuthon_property/models/property_evaluation_plan.py +++ b/yuthon_property/models/property_evaluation_plan.py @@ -8,7 +8,8 @@ class PropertyEvaluationPlan(models.Model): name = fields.Char(string='物业名称') evaluation_area = fields.Float(string='评估面积(m²)') - assessment_category = fields.Selection([('rent_money', '租金'), ('value', '价值')], string="评估类别") + property_ids = fields.Many2many('yuthon.property', string='物业') + assessment_category = fields.Selection([('rent_money', '租金'), ('value', '价值')], string="评估类别", default='rent_money') owner_id = fields.Many2one('yuthon.owner.message', string="权属人") registered_id = fields.Many2one('yuthon.purpose.evidence', string='证载用途') registered_id2 = fields.Many2one('yuthon.purpose.evidence', string='设定用途') @@ -18,7 +19,6 @@ class PropertyEvaluationPlan(models.Model): end_lease_period = fields.Selection(selection=[(str(i), str(i)) for i in range(1, 7)], string='租期结束', default='6') annual_increase_percentage = fields.Float(string='每年递增(%)', igits=(6, 2)) - is_pust = fields.Boolean(string='是否已提交') remake = fields.Text(string='备注') def put_assessment_approval(self): @@ -43,10 +43,23 @@ class PropertyEvaluationPlan(models.Model): } def rental_scheme_wizard(self): + property_evaluation_ids = self.env["property.evaluation.plan"].browse( + self._context.get('active_ids', self._context.get('active_id'))) + evaluation = [] + name_list = [] + for i in property_evaluation_ids: + name = i.name + name_list.append(name) + evaluation.append(i.id) + name = ','.join(name_list) return { 'name': '整租方案弹窗', 'type': 'ir.actions.act_window', 'view_mode': 'form', 'res_model': 'rental.scheme.wizard', 'target': 'new', + 'context': { + 'default_name': name, + 'default_property_ids': evaluation + } } diff --git a/yuthon_property/models/yuthon_property.py b/yuthon_property/models/yuthon_property.py index 201efcd38..208382cf7 100644 --- a/yuthon_property/models/yuthon_property.py +++ b/yuthon_property/models/yuthon_property.py @@ -209,7 +209,39 @@ class YuthonProperty(models.Model): def put_assessment_approval(self): for record in self: - pass + self.env['property.evaluation.plan'].create({ + 'name': record.name, + 'property_ids': [(6, 0, [record.id])], + 'evaluation_area': record.rent_area, + 'owner_id': record.title_information_ids[0].owner_id.id if record.title_information_ids else None, + 'registered_id': record.title_information_ids[0].registered_id.id if record.title_information_ids else None, + 'rent_id': record.reference_ids[0].rent_id.id if record.reference_ids else None, + 'start_lease_period': record.reference_ids[0].start_lease_period if record.reference_ids else None, + 'end_lease_period': record.reference_ids[0].end_lease_period if record.reference_ids else None, + 'annual_increase_percentage': record.reference_ids[0].annual_increase_percentage if record.reference_ids else None, + 'assessment_category': 'rent_money', + 'remake': record.remark, + }) + record.write({'state': 'ing'}) + + def all_assessment_approval(self): + property_ids = self.env["yuthon.property"].browse( + self._context.get('active_ids', self._context.get('active_id'))) + for record in property_ids: + self.env['property.evaluation.plan'].create({ + 'name': record.name, + 'property_ids': [(6, 0, [record.id])], + 'evaluation_area': record.rent_area, + 'owner_id': record.title_information_ids[0].owner_id.id if record.title_information_ids else None, + 'registered_id': record.title_information_ids[0].registered_id.id if record.title_information_ids else None, + 'rent_id': record.reference_ids[0].rent_id.id if record.reference_ids else None, + 'start_lease_period': record.reference_ids[0].start_lease_period if record.reference_ids else None, + 'end_lease_period': record.reference_ids[0].end_lease_period if record.reference_ids else None, + 'annual_increase_percentage': record.reference_ids[0].annual_increase_percentage if record.reference_ids else None, + 'assessment_category': 'rent_money', + 'remake': record.remark, + }) + record.write({'state': 'ing'}) # 拆分 def put_split_approval(self): diff --git a/yuthon_property/views/menuitem.xml b/yuthon_property/views/menuitem.xml index df86f8f72..21d8069e3 100644 --- a/yuthon_property/views/menuitem.xml +++ b/yuthon_property/views/menuitem.xml @@ -18,11 +18,11 @@ parent="yuthon_property_menu_root" /> - - + diff --git a/yuthon_property/views/yuthon_property_views.xml b/yuthon_property/views/yuthon_property_views.xml index 48f215e3e..6a43ce02f 100644 --- a/yuthon_property/views/yuthon_property_views.xml +++ b/yuthon_property/views/yuthon_property_views.xml @@ -16,7 +16,7 @@ -