From 218f4e1c80eca00b0d230bcdddcc7d8b82f62273 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
<9664676+pengyuthon@user.noreply.gitee.com>
Date: Fri, 29 Aug 2025 11:08:37 +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
---
yuthon_property_approval/models/property_merge_approval.py | 5 ++++-
.../views/property_merge_approval_views.xml | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
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 @@
-
-
+
+