diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml index 943c14798..d77ac0eb5 100644 --- a/yuthon_issue/views/issue_library_views.xml +++ b/yuthon_issue/views/issue_library_views.xml @@ -588,7 +588,7 @@ ['draft', 'to_draft'])] - {'from_action': 'issue_library_action3', 'search_default_to_approval': 1} + {'from_action': 'issue_library_action3'} @@ -601,7 +601,7 @@ [('is_push_party', '=', True),('issue_state', 'not in', ['draft', 'to_draft']), ('is_push_depart', '=', True), ('company_id.name', '!=', '集团本部')] - {'from_action': 'issue_library_action3', 'search_default_to_approval': 1} + {'from_action': 'issue_library_action8'} - {'from_action': 'issue_library_action4', 'search_default_to_approval': 1} + {'from_action': 'issue_library_action4'} @@ -935,7 +935,7 @@ ('is_push_depart', '=', True)] - {'from_action': 'issue_library_action5', 'search_default_to_approval': 1} + {'from_action': 'issue_library_action5'} diff --git a/yuthon_property_approval/models/property_bills_payable.py b/yuthon_property_approval/models/property_bills_payable.py index 97dbea493..49c4c642c 100644 --- a/yuthon_property_approval/models/property_bills_payable.py +++ b/yuthon_property_approval/models/property_bills_payable.py @@ -28,6 +28,13 @@ class PropertyBillsPayable(models.Model): document_ids = fields.Many2many('ir.attachment', string="附件") active = fields.Boolean('Active', default=True, tracking=True) work_end = fields.Boolean(string="结束") + payment_type = fields.Selection([ + ('deposit_refund', '退押'), + ('lease_refund', '退租'), + ('engineering', '工程款'), + ('agency_fee', '中介费'), + ('other', '其他') + ], string='付款类型') def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/views/property_bills_payable_views.xml b/yuthon_property_approval/views/property_bills_payable_views.xml index 45f1367c8..d2cfa7c5d 100644 --- a/yuthon_property_approval/views/property_bills_payable_views.xml +++ b/yuthon_property_approval/views/property_bills_payable_views.xml @@ -56,6 +56,7 @@ +