Merge remote-tracking branch 'origin/dev' into dev

2025-07-14 17:03:58 +08:00
parent cdda146422 c1feb3b944
commit 093f211ba7
1 changed files with 4 additions and 1 deletions
@@ -58,9 +58,12 @@ class PropertySplitApproval(models.Model):
                '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,
+                'effective_date':self.effective_date,
                'is_done_merge': True
            })
-            property_list.append([0, 0, {'property_id':property_id.id}])
+            property_list.append([0, 0, {'property_id':property_id.id,
+                                         'start_time': self.effective_date,
+                                         }])
        self.property_id.write({'is_done_split': True})
        self.property_id.disassembly_information_ids = property_list