diff --git a/yuthon_property_approval/models/property_merge_approval.py b/yuthon_property_approval/models/property_merge_approval.py index b0fb173cc..f8657b420 100644 --- a/yuthon_property_approval/models/property_merge_approval.py +++ b/yuthon_property_approval/models/property_merge_approval.py @@ -55,11 +55,14 @@ class PropertyMergeApproval(models.Model): def put_merge_message(self): property_list = [] + merge_asset_type_id = self.property_merge_approval_line_ids[0].property_id.asset_type_id + merge_property_floor_id = self.property_merge_approval_line_ids[0].property_id.property_floor_id property_id = self.env['yuthon.property'].create({ 'name': self.property_name, 'building_area': self.merge_building_area, + 'property_floor_id': merge_property_floor_id.id, 'rent_area': self.merge_rent_area, - 'asset_type_id': self.merge_asset_type_id.id, + 'asset_type_id': merge_asset_type_id.id , 'is_done_split':True, }) for record in self.property_merge_approval_line_ids: diff --git a/yuthon_property_approval/views/property_merge_approval_views.xml b/yuthon_property_approval/views/property_merge_approval_views.xml index 3f826d264..db0825cfe 100644 --- a/yuthon_property_approval/views/property_merge_approval_views.xml +++ b/yuthon_property_approval/views/property_merge_approval_views.xml @@ -76,8 +76,8 @@ - - + +