!11439 增加字段，议题

Merge pull request !11439 from 李鹏宇/dev_wang

yuthon_issue/views/issue_library_views.xml

@@ -588,7 +588,7 @@
             ['draft', 'to_draft'])]
         </field>
         <field name="search_view_id" ref="view_issue_library_filter"/>
-        <field name="context">{'from_action': 'issue_library_action3', 'search_default_to_approval': 1}</field>
+        <field name="context">{'from_action': 'issue_library_action3'}</field>
         <field name="view_ids" eval="[(5, 0, 0),
          (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree2')}),
          (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form3')})]"/>
@@ -601,7 +601,7 @@
         <field name="domain">[('is_push_party', '=', True),('issue_state', 'not in', ['draft', 'to_draft']),
             ('is_push_depart', '=', True), ('company_id.name', '!=', '集团本部')]
         </field>
-         <field name="context">{'from_action': 'issue_library_action3', 'search_default_to_approval': 1}</field>
+         <field name="context">{'from_action': 'issue_library_action8'}</field>
         <field name="search_view_id" ref="view_issue_library_filter"/>
         <field name="view_ids" eval="[(5, 0, 0),
          (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree3')}),
@@ -769,7 +769,7 @@
             ('is_push_depart', '=', True)]
         </field>
         <field name="search_view_id" ref="view_issue_library_filter"/>
-         <field name="context">{'from_action': 'issue_library_action4', 'search_default_to_approval': 1}</field>
+         <field name="context">{'from_action': 'issue_library_action4'}</field>
         <field name="view_ids" eval="[(5, 0, 0),
          (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree4')}),
          (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form4')})]"/>
@@ -935,7 +935,7 @@
             ('is_push_depart', '=', True)]
         </field>
         <field name="search_view_id" ref="view_issue_library_filter"/>
-         <field name="context">{'from_action': 'issue_library_action5', 'search_default_to_approval': 1}</field>
+         <field name="context">{'from_action': 'issue_library_action5'}</field>
         <field name="view_ids" eval="[(5, 0, 0),
          (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree5')}),
          (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form5')})]"/>

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

yuthon_property_approval/views/property_bills_payable_views.xml

@@ -56,6 +56,7 @@
                             <field name="property_name"/>
                             <field name="lessee_id"/>
                             <field name="amount_payable"/>
+                            <field name="payment_type"/>
                             <field name="deduction_amount"/>
                              <field name="remake" invisible="not deduction_amount"/>
                             <field name="actual_amount"/>