!4607 !4606 添加功能

Merge pull request !4607 from 李鹏宇/dev

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',
     ],

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
+from . import inherit_purchase_order
+from . import inherit_res_partner

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='类型')

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>

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>