diff --git a/soong_workflow/wizard/soong_bounced_wizard.py b/soong_workflow/wizard/soong_bounced_wizard.py index ef03f7582..f7246c0cf 100644 --- a/soong_workflow/wizard/soong_bounced_wizard.py +++ b/soong_workflow/wizard/soong_bounced_wizard.py @@ -29,4 +29,6 @@ class SoongBouncedWizard(models.Model): related_record.self_users_ids = [(6, 0, [self.env.user.id])] log_ids[-1].unlink() log_ids[-2].write({'approval_state': '1'}) - record.write({'state': log_ids[-2].name}) \ No newline at end of file + record.write({'state': log_ids[-2].name, + 'work_end': False + }) \ No newline at end of file diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml index fcd144827..0e83a94c9 100644 --- a/yuthon_property_approval/views/property_lease_contract.xml +++ b/yuthon_property_approval/views/property_lease_contract.xml @@ -438,13 +438,13 @@ + invisible="contact_state != 'to'"/> + invisible="contact_state != 'complete'"/> + invisible="contact_state != 'terminate'"/> + invisible="contact_state != 'early_termination'"/>