diff --git a/soong_workflow/templates/soong_workflow_templates.xml b/soong_workflow/templates/soong_workflow_templates.xml index bbe65ebcf..e0dc4d759 100644 --- a/soong_workflow/templates/soong_workflow_templates.xml +++ b/soong_workflow/templates/soong_workflow_templates.xml @@ -6,10 +6,10 @@ - - + + + - @@ -20,8 +20,8 @@ - - + + diff --git a/yuthon_property/views/yuthon_property_views.xml b/yuthon_property/views/yuthon_property_views.xml index 2596c34ae..74061f4bf 100644 --- a/yuthon_property/views/yuthon_property_views.xml +++ b/yuthon_property/views/yuthon_property_views.xml @@ -232,7 +232,7 @@ - + diff --git a/yuthon_property_approval/models/property_lease_contract.py b/yuthon_property_approval/models/property_lease_contract.py index 547e2fd74..e18ffc1ce 100644 --- a/yuthon_property_approval/models/property_lease_contract.py +++ b/yuthon_property_approval/models/property_lease_contract.py @@ -1550,6 +1550,7 @@ class PropertyLeaseContract(models.Model): # 变更 def button_lease_change(self): form_id = self.env.ref('yuthon_property_approval.view_property_lease_renewal_form').id + address_ids = self.lease_ids.mapped('address_id').ids return { 'name': '变更申请', "type": "ir.actions.act_window", @@ -1559,6 +1560,7 @@ class PropertyLeaseContract(models.Model): "context": { 'default_renewal_type': 'lease', 'default_contract_id': self.id, + 'default_property_ids': [(6, 0, address_ids)] if address_ids else False }, } diff --git a/yuthon_property_approval/models/property_lease_renewal.py b/yuthon_property_approval/models/property_lease_renewal.py index 65987c952..eeb1b4f50 100644 --- a/yuthon_property_approval/models/property_lease_renewal.py +++ b/yuthon_property_approval/models/property_lease_renewal.py @@ -35,6 +35,7 @@ class PropertyLeaseRenewal(models.Model): cycle_dict = fields.Selection(related="contract_id.cycle_dict", string='租金支付周期') original_start_date = fields.Date(related="contract_id.term_start_time", string='原租赁期开始时间') original_end_date = fields.Date(related="contract_id.term_end_time", string='原租赁期结束时间') + property_ids = fields.Many2many('yuthon.property', string='物业信息') # 变更信息 new_lessee_name = fields.Char(string='新承租方') 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_approval_views.xml b/yuthon_property_approval/views/property_approval_views.xml index 7d8439792..c01ca7809 100644 --- a/yuthon_property_approval/views/property_approval_views.xml +++ b/yuthon_property_approval/views/property_approval_views.xml @@ -56,10 +56,8 @@ - - - + diff --git a/yuthon_property_approval/views/property_lease_renewal.xml b/yuthon_property_approval/views/property_lease_renewal.xml index e8cd498c1..39d548a86 100644 --- a/yuthon_property_approval/views/property_lease_renewal.xml +++ b/yuthon_property_approval/views/property_lease_renewal.xml @@ -61,6 +61,7 @@ + diff --git a/yuthon_property_approval/views/property_merge_approval_views.xml b/yuthon_property_approval/views/property_merge_approval_views.xml index e4bb3b821..db0825cfe 100644 --- a/yuthon_property_approval/views/property_merge_approval_views.xml +++ b/yuthon_property_approval/views/property_merge_approval_views.xml @@ -57,7 +57,7 @@ - + @@ -72,12 +72,12 @@ - + - - + +