diff --git a/yuthon_property/models/yuthon_property.py b/yuthon_property/models/yuthon_property.py
index a9589c960..89b76a7de 100644
--- a/yuthon_property/models/yuthon_property.py
+++ b/yuthon_property/models/yuthon_property.py
@@ -332,6 +332,7 @@ class ManageInformationLine(models.Model):
start_time = fields.Date(string="生效日期", default=fields.Date.today)
end_date = fields.Date(string="失效日期")
+
class DisassemblyInformationLine(models.Model):
_name = 'disassembly.information.line'
_description = '拆分信息明细行'
diff --git a/yuthon_property_approval/models/property_handover.py b/yuthon_property_approval/models/property_handover.py
index 2acf02d63..c06c5fe94 100644
--- a/yuthon_property_approval/models/property_handover.py
+++ b/yuthon_property_approval/models/property_handover.py
@@ -20,9 +20,8 @@ class PropertyHandoverLine(models.Model):
property_handover_id = fields.Many2one('property.handover', string="审批信息")
property_id = fields.Many2one('yuthon.property', string="关联物业信息")
- property_address = fields.Char(related='property_id.name',string="物业地址")
+ property_address = fields.Char(related='property_id.name',string="资产名称")
is_affirmation = fields.Boolean(related='property_id.is_confirm_authorization',string="是否确权")
- owner = fields.Many2one(related='property_id.owner_id',string="权属人")
title_number = fields.Char(string="产权编号")
area = fields.Float(related='property_id.actual_area',string="面积")
purposes = fields.Many2one(related='property_id.asset_type_id',string="用途")
diff --git a/yuthon_property_approval/models/property_merge_approval.py b/yuthon_property_approval/models/property_merge_approval.py
index a4ccd0482..424f12664 100644
--- a/yuthon_property_approval/models/property_merge_approval.py
+++ b/yuthon_property_approval/models/property_merge_approval.py
@@ -41,7 +41,7 @@ class PropertyMergeApproval(models.Model):
property_id = self.env['yuthon.property'].create({
'name': self.property_name,
'building_area': self.merge_building_area,
- 'rentable_area': self.merge_rent_area,
+ 'rent_area': self.merge_rent_area,
'asset_type_id': self.merge_asset_type_id.id,
'is_done_split':True,
})
@@ -64,7 +64,7 @@ class PropertyMergeApprovalLine(models.Model):
property_floor = fields.Integer(related='property_id.property_floor', string='楼层')
asset_type_id = fields.Many2one(related='property_id.asset_type_id', string='资产类型')
building_area = fields.Float(related='property_id.building_area', string='建筑面积')
- rent_area = fields.Float(related='property_id.rentable_area', string='可租面积')
+ rent_area = fields.Float(related='property_id.rent_area', string='可租面积')
remarks = fields.Char(string='备注')
diff --git a/yuthon_property_approval/models/property_rental_conditions.py b/yuthon_property_approval/models/property_rental_conditions.py
index 057b3cc0e..cc7e75ead 100644
--- a/yuthon_property_approval/models/property_rental_conditions.py
+++ b/yuthon_property_approval/models/property_rental_conditions.py
@@ -12,7 +12,6 @@ class PropertyRentalConditions(models.Model):
registered_use = fields.Char(related='property_id.registered_use',string='证载用途')
evaluation_area = fields.Float(related='property_id.actual_area',string='出租面积(m²)')
lease_expiration_date = fields.Date(string='租赁到期日')
- original_tenant = fields.Many2one(related='property_id.owner_id',string='原租户')
now_rent_price = fields.Float(related='property_id.current_rent',string='现租价(元/m² •月)')
appraisal_price = fields.Float(string='评估价(元/m² •月)')
now_rental_conditions_line_ids = fields.One2many('now.rental.conditions.line', 'property_rental_conditions_id', string='关联目前出租条件')
diff --git a/yuthon_property_approval/models/property_rental_form.py b/yuthon_property_approval/models/property_rental_form.py
index d487738e8..b0f191274 100644
--- a/yuthon_property_approval/models/property_rental_form.py
+++ b/yuthon_property_approval/models/property_rental_form.py
@@ -24,7 +24,6 @@ class PropertyRentalFormLine(models.Model):
registered_use = fields.Char(related='property_id.registered_use', string='证载用途')
evaluation_area = fields.Float(related='property_id.evaluation_area', string='出租面积(m²)')
current_status = fields.Date(related='property_id.current_status', string='租聘到期日')
- owner_id = fields.Many2one(related='property_id.owner_id',string='原租户')
now_rent_price = fields.Float(related='property_id.rental_unit_price',string='现租价(元/m² •月)')
evaluate_rent_price = fields.Float(string='评估租(元/m² •月)')
upset_square = fields.Float(string='底价(元/m² •月)')
diff --git a/yuthon_property_approval/models/property_split_approval.py b/yuthon_property_approval/models/property_split_approval.py
index d9cf22018..bed1a0115 100644
--- a/yuthon_property_approval/models/property_split_approval.py
+++ b/yuthon_property_approval/models/property_split_approval.py
@@ -15,7 +15,7 @@ class PropertySplitApproval(models.Model):
property_floor = fields.Integer(related='property_id.property_floor', string='楼层')
asset_type_id = fields.Many2one(related='property_id.asset_type_id', string='资产类型')
building_area = fields.Float(related='property_id.building_area', string='建筑面积')
- rent_area = fields.Float(related='property_id.rentable_area', string='可租面积')
+ rent_area = fields.Float(related='property_id.rent_area', string='可租面积')
remarks = fields.Char(string='备注')
is_issues = fields.Boolean(string='是否上会')
related_issues_id = fields.Many2one('issue.library', string="关联议题")
@@ -44,7 +44,7 @@ class PropertySplitApproval(models.Model):
property_id = self.env['yuthon.property'].create({
'name': property_split.split_property,
'building_area': property_split.split_building_area,
- 'rentable_area': property_split.split_rent_area,
+ 'rent_area': property_split.split_rent_area,
'asset_type_id': property_split.split_asset_type_id.id,
'property_merge_approval_id':self.property_id.id,
'is_done_merge': True
diff --git a/yuthon_property_approval/views/property_handover_views.xml b/yuthon_property_approval/views/property_handover_views.xml
index 4cc2ffcc3..c289508eb 100644
--- a/yuthon_property_approval/views/property_handover_views.xml
+++ b/yuthon_property_approval/views/property_handover_views.xml
@@ -46,7 +46,6 @@
-
diff --git a/yuthon_property_approval/views/property_rental_conditions.xml b/yuthon_property_approval/views/property_rental_conditions.xml
index 5a82f2af9..cdf67d03b 100644
--- a/yuthon_property_approval/views/property_rental_conditions.xml
+++ b/yuthon_property_approval/views/property_rental_conditions.xml
@@ -8,7 +8,6 @@
-
diff --git a/yuthon_property_approval/views/property_rental_form_views.xml b/yuthon_property_approval/views/property_rental_form_views.xml
index 98348b7c9..5128713b7 100644
--- a/yuthon_property_approval/views/property_rental_form_views.xml
+++ b/yuthon_property_approval/views/property_rental_form_views.xml
@@ -35,7 +35,6 @@
-