diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
index 490593bfd..605330c4a 100644
--- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py
+++ b/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)
diff --git a/yuthon_hr_attendance/views/hr_attendance_month_views.xml b/yuthon_hr_attendance/views/hr_attendance_month_views.xml
index da1827b6e..8068ae02e 100644
--- a/yuthon_hr_attendance/views/hr_attendance_month_views.xml
+++ b/yuthon_hr_attendance/views/hr_attendance_month_views.xml
@@ -226,7 +226,7 @@
-
+
diff --git a/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml b/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
index 7229bf0a4..c4dfcf378 100644
--- a/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
@@ -24,7 +24,7 @@
-
+
@@ -49,7 +49,7 @@
yuthon.vacation.my.reports.tree
yuthon.vacation.reports
-
+
@@ -69,7 +69,7 @@
-
+
diff --git a/yuthon_purchase/__manifest__.py b/yuthon_purchase/__manifest__.py
index 5d33968f4..4a46e0157 100644
--- a/yuthon_purchase/__manifest__.py
+++ b/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',
diff --git a/yuthon_purchase/models/__init__.py b/yuthon_purchase/models/__init__.py
index fd6feeedb..1cfaf3745 100644
--- a/yuthon_purchase/models/__init__.py
+++ b/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
\ No newline at end of file
+from . import inherit_res_partner
diff --git a/yuthon_purchase/models/inherit_res_partner.py b/yuthon_purchase/models/inherit_res_partner.py
index e1aeb14ff..fc27c18d5 100644
--- a/yuthon_purchase/models/inherit_res_partner.py
+++ b/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='类型')
\ No newline at end of file
+ partner_category = fields.Selection([('party', '乙方'), ('suppliers', '供应商')], string='类型')
diff --git a/yuthon_purchase/views/inherit_res_partner_views.xml b/yuthon_purchase/views/inherit_res_partner_views.xml
index c86dda9a7..f7a14737a 100644
--- a/yuthon_purchase/views/inherit_res_partner_views.xml
+++ b/yuthon_purchase/views/inherit_res_partner_views.xml
@@ -1,23 +1,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ res.partner.form.inherit
+ res.partner
+
+
+
+
+
+
+
+
+ res.partner.search.inherit
+ res.partner
+
+
+
+
+
+
+