1

yuthon_hr_attendance/models/yuthon_vacation_reports.py

@@ -33,7 +33,7 @@ class YuthonVacationReports(models.Model):
     compensatory_leave = fields.Integer(string="调休", compute='_compute_other_leave', store=True, group_operator=None)
     leave_of_absence = fields.Float(string="事假", digits=(16, 3), compute='_compute_other_leave', store=True,
                                     group_operator=None)
-    statutory_leave = fields.Integer(string="加班时(法定)", compute='_compute_other_leave', store=True, group_operator=None)
+    statutory_leave = fields.Integer(string="加班时(法定假)", compute='_compute_other_leave', store=True, group_operator=None)
     cop_leave = fields.Float(string='补休', digits=(16, 3), compute='_compute_other_leave', store=True,
                              group_operator=None)
     duty_off_leave = fields.Integer(string='值班调休', compute='_compute_other_leave', store=True, group_operator=None)

yuthon_hr_attendance/views/hr_attendance_month_views.xml

@@ -226,7 +226,7 @@
                             <field name="leave_of_absence"/>
                             <field name="come_late"/>
                             <field name="work_overtime"/>
-                            <field name="statutory_leave"/>
+                            <field name="statutory_leave" string="加班时(法定假)"/>
                             <field name="note"/>
                             <field name="state"/>
                         </group>

yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml

@@ -24,7 +24,7 @@
                 <field name="medical_fee" options='{ "fg_color": "white: medical_fee == False"}'/>
                 <field name="compensatory_leave" options='{ "fg_color": "white: compensatory_leave == False"}'/>
                 <field name="leave_of_absence" options='{ "fg_color": "white: leave_of_absence == False"}'/>
-                <field name="statutory_leave" options='{ "fg_color": "white: statutory_leave == False"}'/>
+                <field name="statutory_leave" string="加班时(法定假)" options='{ "fg_color": "white: statutory_leave == False"}'/>
                 <field name="cop_leave" options='{ "fg_color": "white: cop_leave == False"}'/>
                 <field name="duty_off_leave" options='{ "fg_color": "white: duty_off_leave == False"}'/>
                 <field name="marriage_leave" options='{ "fg_color": "white: marriage_leave == False"}'/>
@@ -49,7 +49,7 @@
         <field name="name">yuthon.vacation.my.reports.tree</field>
         <field name="model">yuthon.vacation.reports</field>
         <field name="arch" type="xml">
-            <tree string="我的假期额度记录" editable="bottom" default_order="vacation_date desc" create="0">
+            <tree string="我的假期额度记录" editable="bottom" edit="0" delete="0" default_order="vacation_date desc" create="0">
                 <field name="employee_id" options="{'no_open': True}"/>
                 <field name="department_id" column_invisible="1"/>
                 <field name="company_id" column_invisible="1"/>
@@ -69,7 +69,7 @@
                 <field name="medical_fee" options='{ "fg_color": "white: medical_fee == False"}'/>
                 <field name="compensatory_leave" options='{ "fg_color": "white: compensatory_leave == False"}'/>
                 <field name="leave_of_absence" options='{ "fg_color": "white: leave_of_absence == False"}'/>
-                <field name="statutory_leave" options='{ "fg_color": "white: statutory_leave == False"}'/>
+                <field name="statutory_leave" string="加班时(法定假)" options='{ "fg_color": "white: statutory_leave == False"}'/>
                 <field name="cop_leave" options='{ "fg_color": "white: cop_leave == False"}'/>
                 <field name="duty_off_leave" options='{ "fg_color": "white: duty_off_leave == False"}'/>
                 <field name="marriage_leave" options='{ "fg_color": "white: marriage_leave == False"}'/>

yuthon_purchase/__manifest__.py

@@ -6,7 +6,7 @@
     'category': 'zhou',
     'version': '0.1',
     'license': 'LGPL-3',
-    'depends': ['base', 'soong_workflow', 'hr', 'product',  'documents', 'purchase', ],
+    'depends': ['base', 'soong_workflow', 'hr', 'product',  'documents', 'purchase', 'contacts'],
     'data': [
         'security/ir.model.access.csv',
         'data/purchase_data.xml',

yuthon_purchase/models/__init__.py

@@ -3,4 +3,4 @@ from . import purchase_fixed_assets
 from . import purchase_low_orders
 from . import purchase_service_orders
 from . import inherit_purchase_order
-# from . import inherit_res_partner
+from . import inherit_res_partner

yuthon_purchase/models/inherit_res_partner.py

@@ -5,4 +5,4 @@ from odoo import api, fields, models
 class InheritResPartner(models.Model):
     _inherit = 'res.partner'
 
-    category1 = fields.Selection([('party', '乙方'), ('suppliers', '供应商')], string='类型')
+    partner_category = fields.Selection([('party', '乙方'), ('suppliers', '供应商')], string='类型')

yuthon_purchase/views/inherit_res_partner_views.xml

@@ -1,23 +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="category1" domain="[('|'), ('category', '=', 'party'), ('category', '=', 'suppliers')]"/>-->
-<!--            </xpath>-->
-<!--        </field>-->
-<!--    </record>-->
+    <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="partner_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="partner_category" domain="['|', ('category', '=', 'party'), ('category', '=', 'suppliers')]"/>
+            </xpath>
+        </field>
+    </record>
 </odoo>