From 21e520e2f280316420332bf4ae42c28e63dd6588 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Mon, 18 Aug 2025 16:24:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_purchase/__manifest__.py               |  1 +
 yuthon_purchase/models/__init__.py            |  3 ++-
 yuthon_purchase/models/inherit_res_partner.py |  8 +++++++
 .../views/inherit_res_partner_views.xml       | 23 +++++++++++++++++++
 .../views/purchase_service_orders_views.xml   | 20 ++++++++--------
 5 files changed, 44 insertions(+), 11 deletions(-)
 create mode 100644 yuthon_purchase/models/inherit_res_partner.py
 create mode 100644 yuthon_purchase/views/inherit_res_partner_views.xml

diff --git a/yuthon_purchase/__manifest__.py b/yuthon_purchase/__manifest__.py
index 6f868e07d..5d33968f4 100644
--- a/yuthon_purchase/__manifest__.py
+++ b/yuthon_purchase/__manifest__.py
@@ -12,6 +12,7 @@
         'data/purchase_data.xml',
         'views/purchase_fixed_assets_views.xml',
         'views/purchase_low_orders_views.xml',
+        'views/inherit_res_partner_views.xml',
         'views/purchase_service_orders_views.xml',
         'views/menu.xml',
     ],
diff --git a/yuthon_purchase/models/__init__.py b/yuthon_purchase/models/__init__.py
index 8ba4ff994..0db799b6a 100644
--- a/yuthon_purchase/models/__init__.py
+++ b/yuthon_purchase/models/__init__.py
@@ -2,4 +2,5 @@
 from . import purchase_fixed_assets
 from . import purchase_low_orders
 from . import purchase_service_orders
-from . import inherit_purchase_order
\ No newline at end of file
+from . import inherit_purchase_order
+from . import inherit_res_partner
\ No newline at end of file
diff --git a/yuthon_purchase/models/inherit_res_partner.py b/yuthon_purchase/models/inherit_res_partner.py
new file mode 100644
index 000000000..07df1fc85
--- /dev/null
+++ b/yuthon_purchase/models/inherit_res_partner.py
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+from odoo import api, fields, models
+
+
+class InheritResPartner(models.Model):
+    _inherit = 'res.partner'
+
+    category = fields.Selection([('party', '乙方'), ('suppliers', '供应商')], string='类型')
\ No newline at end of file
diff --git a/yuthon_purchase/views/inherit_res_partner_views.xml b/yuthon_purchase/views/inherit_res_partner_views.xml
new file mode 100644
index 000000000..dcd022720
--- /dev/null
+++ b/yuthon_purchase/views/inherit_res_partner_views.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="view_res_partner_form_inherit" model="ir.ui.view">
+        <field name="name">res.partner.form.inherit</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="base.view_partner_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='vat']" position="after">
+                <field name="category" widget="radio"/>
+            </xpath>
+        </field>
+    </record>
+    <record id="view_res_partner_search_inherit" model="ir.ui.view">
+        <field name="name">res.partner.search.inherit</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="base.view_res_partner_filter"/>
+        <field name="arch" type="xml">
+            <xpath expr="//filter[@name='type_person']" position="after">
+                <filter string="供应商" name="category" domain="[('|'), ('category', '=', 'party'), ('category', '=', 'suppliers')]"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/yuthon_purchase/views/purchase_service_orders_views.xml b/yuthon_purchase/views/purchase_service_orders_views.xml
index f6442b743..1c9a79460 100644
--- a/yuthon_purchase/views/purchase_service_orders_views.xml
+++ b/yuthon_purchase/views/purchase_service_orders_views.xml
@@ -63,16 +63,6 @@
                             </div>
                         <field name="reason_application"/>
                     </group>
-                    <group col="2">
-                        <group>
-                            <field name="license_id" widget="preview_many2one"/>
-                            <field name="aptitude_id" widget="preview_many2one"/>
-                        </group>
-                        <group>
-                            <field name="contract_id" widget="preview_many2one"/>
-                            <field name="other_id" widget="preview_many2one"/>
-                        </group>
-                    </group>
                     <group string="服务项目">
                     </group>
                     <group col="2">
@@ -112,6 +102,16 @@
                             </field>
                         </page>
                     </notebook>
+                    <group col="2">
+                        <group>
+                            <field name="license_id" widget="preview_many2one"/>
+                            <field name="aptitude_id" widget="preview_many2one"/>
+                        </group>
+                        <group>
+                            <field name="contract_id" widget="preview_many2one"/>
+                            <field name="other_id" widget="preview_many2one"/>
+                        </group>
+                    </group>
                 </sheet>
             </form>
         </field>