diff --git a/yuthon_official/__manifest__.py b/yuthon_official/__manifest__.py index 58f28df2e..ff9081b27 100644 --- a/yuthon_official/__manifest__.py +++ b/yuthon_official/__manifest__.py @@ -10,7 +10,7 @@ 'category': 'Human Resources/Attendances', 'version': '0.1', 'license': 'LGPL-3', - 'depends': ['mail', 'hr', 'soong_workflow', 'room', 'yuthon_issue'], + 'depends': ['mail', 'hr', 'soong_workflow', 'room', 'yuthon_issue', 'yuthon_trade'], 'data': [ 'data/official_type_data.xml', 'security/ir.model.access.csv', diff --git a/yuthon_official/views/official_menus.xml b/yuthon_official/views/official_menus.xml index 6951518e1..7cbfa5bed 100644 --- a/yuthon_official/views/official_menus.xml +++ b/yuthon_official/views/official_menus.xml @@ -85,7 +85,21 @@ parent="administrative_offices_root_board" action="yuthon_trade.view_parking_fee_approval_action" sequence="85"/> - + + + - - - \ No newline at end of file diff --git a/yuthon_property/models/property_evaluation_plan.py b/yuthon_property/models/property_evaluation_plan.py index e71f65606..fa1218948 100644 --- a/yuthon_property/models/property_evaluation_plan.py +++ b/yuthon_property/models/property_evaluation_plan.py @@ -33,6 +33,8 @@ class PropertyEvaluationPlan(models.Model): record.lease_form = 'sublease' else: record.lease_form = 'whole' + else: + record.lease_form = False def put_assessment_approval(self): diff --git a/yuthon_property_approval/views/property_eligibility.xml b/yuthon_property_approval/views/property_eligibility.xml index 69f0b93a7..623fbfb0e 100644 --- a/yuthon_property_approval/views/property_eligibility.xml +++ b/yuthon_property_approval/views/property_eligibility.xml @@ -42,17 +42,14 @@ + + + - - - - - -