From 28625a26306a684300f5f3b51d3612ac4af24c22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <pengyuthon@163.com>
Date: Mon, 11 May 2026 17:48:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?=E8=AE=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_issue/views/issue_library_views.xml                | 8 ++++----
 yuthon_property_approval/models/property_bills_payable.py | 7 +++++++
 .../views/property_bills_payable_views.xml                | 1 +
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml
index d5e8d768f..71e079c80 100644
--- a/yuthon_issue/views/issue_library_views.xml
+++ b/yuthon_issue/views/issue_library_views.xml
@@ -584,7 +584,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')})]"/>
@@ -597,7 +597,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')}),
@@ -765,7 +765,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')})]"/>
@@ -931,7 +931,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')})]"/>
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 @@
                             <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"/>