From c287f2e5575b9c3e5de07084688210b5c6384d20 Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Tue, 8 Apr 2025 15:55:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../models/property_electric_reading.py | 2 +- .../models/property_evaluation_plan.py | 6 ++-- .../models/property_water_reading.py | 2 +- yuthon_property/models/yuthon_property.py | 8 ++--- .../views/property_electric_reading_views.xml | 4 +-- .../views/property_evaluation_plan_view.xml | 2 +- .../views/property_water_reading_views.xml | 4 +-- .../views/yuthon_property_views.xml | 32 ++++++++--------- .../wizard/evaluation_plan_wizard_views.xml | 2 +- .../wizard/yuthon_property_wizard.py | 4 +-- .../models/inherit_yuthon_property.py | 2 +- .../models/property_handover.py | 2 +- .../models/property_lease_contract.py | 10 +++--- .../models/property_record.py | 2 +- .../views/property_handover_views.xml | 2 +- .../views/property_lease_contract.xml | 6 ++-- yuthon_salary/models/inherit_hr_payslip.py | 27 ++++++++++++-- .../views/inherit_hr_payslip_views.xml | 36 +++++++++++++++++-- yuthon_salary/wizard/put_return_wizard.py | 2 +- yuthon_work_brand/views/hr_menus.xml | 2 +- 20 files changed, 105 insertions(+), 52 deletions(-) diff --git a/yuthon_property/models/property_electric_reading.py b/yuthon_property/models/property_electric_reading.py index b581c4532..14364b8a6 100644 --- a/yuthon_property/models/property_electric_reading.py +++ b/yuthon_property/models/property_electric_reading.py @@ -12,7 +12,7 @@ class PropertyElectricReading(models.Model): property_id = fields.Many2one('yuthon.property', string='地址') users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id) lessee_id = fields.Many2one('property.tenant.information', string='承租方') - state = fields.Char(string='状态') + property_state = fields.Char(string='状态') employee_ids = fields.Many2many('hr.employee', string='抄表人') meter_type = fields.Selection([('electric', '电表'), ('water', '水表')], string='仪表类型') payment_account = fields.Selection([('prepaid', '电费'), ('postpaid', '水费')], string='缴费科目') diff --git a/yuthon_property/models/property_evaluation_plan.py b/yuthon_property/models/property_evaluation_plan.py index 75dad1829..685f68747 100644 --- a/yuthon_property/models/property_evaluation_plan.py +++ b/yuthon_property/models/property_evaluation_plan.py @@ -21,7 +21,7 @@ class PropertyEvaluationPlan(models.Model): default='6') annual_increase_percentage = fields.Float(string='每年递增(%)', igits=(6, 2)) remake = fields.Text(string='备注') - state = fields.Selection([('to', '待审批'), ('done', '已审批')], string="状态", default='to') + property_state = fields.Selection([('to', '待审批'), ('done', '已审批')], string="状态", default='to') def put_assessment_approval(self): property_evaluation_ids = self.env["property.evaluation.plan"].browse( @@ -29,12 +29,12 @@ class PropertyEvaluationPlan(models.Model): form_id = self.env.ref('yuthon_property_approval.property_evaluate_application_form').id property_list = [] for i in property_evaluation_ids: - if i.state == 'done': + if i.property_state == 'done': raise UserError('该方案不可提交') property_list.append([0, 0, { 'property_evaluation_id': i.id, }]) - i.write({'state': 'done'}) + i.write({'property_state': 'done'}) return { 'name': '提交物业评估', 'view_mode': 'form', diff --git a/yuthon_property/models/property_water_reading.py b/yuthon_property/models/property_water_reading.py index 17a670b38..306592dd1 100644 --- a/yuthon_property/models/property_water_reading.py +++ b/yuthon_property/models/property_water_reading.py @@ -13,7 +13,7 @@ class PropertyWaterReading(models.Model): users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id) contract = fields.Char(string='合同') lessee_id = fields.Many2one('property.tenant.information', string='承租方') - state = fields.Char(string='状态') + property_state = fields.Char(string='状态') employee_ids = fields.Many2many('hr.employee', string='抄表人') maximum_count = fields.Float(string='最大计数', default=999999) meter_type = fields.Selection([('electric', '电表'), ('water', '水表')], string='仪表类型') diff --git a/yuthon_property/models/yuthon_property.py b/yuthon_property/models/yuthon_property.py index 3c87ef628..94a887e8d 100644 --- a/yuthon_property/models/yuthon_property.py +++ b/yuthon_property/models/yuthon_property.py @@ -33,7 +33,7 @@ class YuthonProperty(models.Model): property_orientation = fields.Selection([('north', '东'), ('south', '南'), ('east', '西'), ('west', '北')], string="朝向") street = fields.Char(string="街道") - state = fields.Selection([('to', '待评估'), ('done', '已评估'), ('ing', '评估中'), + property_state = fields.Selection([('to', '待评估'), ('done', '已评估'), ('ing', '评估中'), ('ing_handover', '移交中'), ('done_handover', '已移交'), ('filing', '备案中'), ('net', '挂网'), ('signing', '签约中'), ('signed', '已备案'), ('leased', '已租'), ('idle', '空置'), ('no_lease','不可租'), ('leasing', '在租'), ('self', '自用')], string='资产目前状态', default='to') @@ -212,7 +212,7 @@ class YuthonProperty(models.Model): for record in property_ids: property_list.append([0, 0, {'property_id': record.id}]) for i in property_ids: - i.write({'state': 'ing_handover'}) + i.write({'property_state': 'ing_handover'}) return { 'name': '提交物业移交', 'view_mode': 'form', @@ -239,7 +239,7 @@ class YuthonProperty(models.Model): 'assessment_category': 'rent_money', 'remake': record.remark, }) - record.write({'state': 'ing'}) + record.write({'property_state': 'ing'}) return { "name": "物业评估方案", 'type': 'ir.actions.act_window', @@ -266,7 +266,7 @@ class YuthonProperty(models.Model): 'assessment_category': 'rent_money', 'remake': record.remark, }) - record.write({'state': 'ing'}) + record.write({'property_state': 'ing'}) return { "name": "物业评估方案", 'type': 'ir.actions.act_window', diff --git a/yuthon_property/views/property_electric_reading_views.xml b/yuthon_property/views/property_electric_reading_views.xml index 093abbfa5..d93a9e58a 100644 --- a/yuthon_property/views/property_electric_reading_views.xml +++ b/yuthon_property/views/property_electric_reading_views.xml @@ -10,7 +10,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/yuthon_property/views/property_evaluation_plan_view.xml b/yuthon_property/views/property_evaluation_plan_view.xml index dcf6ed5ca..f7d91ba48 100644 --- a/yuthon_property/views/property_evaluation_plan_view.xml +++ b/yuthon_property/views/property_evaluation_plan_view.xml @@ -20,7 +20,7 @@ - +