From 53363b7a8dcc65842049b35cd61f0678247be18e Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Thu, 26 Dec 2024 15:18:04 +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_report_repair.py | 2 ++ .../data/yuthon_property_approval_data.xml | 7 +++++++ yuthon_property/models/yuthon_property.py | 6 ++++-- .../models/yuthon_resource_mgmt_config.py | 8 +++++++- yuthon_property/security/ir.model.access.csv | 3 ++- yuthon_property/views/menuitem.xml | 2 ++ yuthon_property/views/yuthon_property_views.xml | 10 +++++++--- .../views/yuthon_resource_mgmt_config_views.xml | 14 ++++++++++++++ 8 files changed, 45 insertions(+), 7 deletions(-) diff --git a/yuthon_lessee_service/models/property_report_repair.py b/yuthon_lessee_service/models/property_report_repair.py index e25a7d49f..18d618e65 100644 --- a/yuthon_lessee_service/models/property_report_repair.py +++ b/yuthon_lessee_service/models/property_report_repair.py @@ -24,6 +24,8 @@ class PropertyRentRelief(models.Model): warehouse_management = fields.Char(string="库管") property_repair_relief_ids = fields.One2many('property.repair.relief.line', 'property_repair_relief_id', string="物料清单") total = fields.Float(string="总价") + + class PropertyRepairReliefLine(models.Model): _name = 'property.repair.relief.line' _description = '物料清单明细' diff --git a/yuthon_property/data/yuthon_property_approval_data.xml b/yuthon_property/data/yuthon_property_approval_data.xml index c13930e45..bd3308ec9 100644 --- a/yuthon_property/data/yuthon_property_approval_data.xml +++ b/yuthon_property/data/yuthon_property_approval_data.xml @@ -7,4 +7,11 @@ 3 + + 物业编号 + yuthon_property_message_code + WY + 4 + + \ No newline at end of file diff --git a/yuthon_property/models/yuthon_property.py b/yuthon_property/models/yuthon_property.py index 3083d4735..0b1345468 100644 --- a/yuthon_property/models/yuthon_property.py +++ b/yuthon_property/models/yuthon_property.py @@ -9,7 +9,8 @@ class YuthonProperty(models.Model): _rec_name = 'name' name = fields.Char(string="资产名称") - referred = fields.Char(string="简称") + code = fields.Char(string="物业编号", default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_property_message_code')) + referred_id = fields.Many2one('yuthon.lot.setting', string="地段") premises = fields.Char(string="楼盘小区") units = fields.Char(string="单元") house_type_id = fields.Many2one('yuthon.resource.house.type', string="户型") @@ -18,6 +19,7 @@ class YuthonProperty(models.Model): property_room = fields.Text(string="区") # 删除要去掉关联 building_area = fields.Float(string="建筑面积") + title_deed = fields.Char(string="房产证编号") actual_area = fields.Float(string="实际面积") management_area = fields.Float(string="管理面积") effective_date = fields.Date(string="生效日期") @@ -26,7 +28,7 @@ class YuthonProperty(models.Model): ('entrust', '委托'), ('Rent', '租入')], string='资产来源') remark = fields.Char(string="备注") vr_link = fields.Char(string="VR链接") - notice_documents_ids = fields.Many2many('ir.attachment', string='附件') + notice_documents_ids = fields.Many2many('ir.attachment', string='产权证附件') current_rent = fields.Float(string="现租金") is_done_split = fields.Boolean(string="已拆分") is_done_merge = fields.Boolean(string="已合并") diff --git a/yuthon_property/models/yuthon_resource_mgmt_config.py b/yuthon_property/models/yuthon_resource_mgmt_config.py index 4860b2a9d..4c37677d0 100644 --- a/yuthon_property/models/yuthon_resource_mgmt_config.py +++ b/yuthon_property/models/yuthon_resource_mgmt_config.py @@ -78,4 +78,10 @@ class YuthonPropertySetting(models.Model): _name = 'yuthon.property.setting' _description = '物业费标准配置' - name = fields.Char(string="物业费标准") \ No newline at end of file + name = fields.Char(string="物业费标准") + +class YuthonLotSetting(models.Model): + _name = 'yuthon.lot.setting' + _description = '地段配置' + + name = fields.Char(string="地段") \ No newline at end of file diff --git a/yuthon_property/security/ir.model.access.csv b/yuthon_property/security/ir.model.access.csv index 18b221d3c..1c9ee5730 100644 --- a/yuthon_property/security/ir.model.access.csv +++ b/yuthon_property/security/ir.model.access.csv @@ -51,4 +51,5 @@ access_yuthon_property_lessee, yuthon_property_lessee,model_yuthon_property_less access_yuthon_property_lessee,yuthon_property_lessee,model_yuthon_property_lessee,base.group_user,1,1,1,1 access_yuthon_electricity_setting,yuthon_electricity_setting,model_yuthon_electricity_setting,base.group_user,1,1,1,1 access_yuthon_water_setting,yuthon_water_setting,model_yuthon_water_setting,base.group_user,1,1,1,1 -access_manage_information_fee_line,manage.information.fee.line,model_manage_information_fee_line,base.group_user,1,1,1,1 \ No newline at end of file +access_manage_information_fee_line,manage.information.fee.line,model_manage_information_fee_line,base.group_user,1,1,1,1 +access_yuthon_lot_setting,yuthon_lot_setting,model_yuthon_lot_setting,base.group_user,1,1,1,1 \ No newline at end of file diff --git a/yuthon_property/views/menuitem.xml b/yuthon_property/views/menuitem.xml index d05e298b8..afed2b7e4 100644 --- a/yuthon_property/views/menuitem.xml +++ b/yuthon_property/views/menuitem.xml @@ -334,6 +334,8 @@ action="view_yuthon_electricity_setting_action" sequence="45"/> + diff --git a/yuthon_property/views/yuthon_property_views.xml b/yuthon_property/views/yuthon_property_views.xml index 302bf48fa..c87367cdf 100644 --- a/yuthon_property/views/yuthon_property_views.xml +++ b/yuthon_property/views/yuthon_property_views.xml @@ -11,8 +11,9 @@ - + +