From 35bfe16a4f24a92d406d876fd8012168f24922ba Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Sun, 19 Jan 2025 20:08:48 +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
---
.../models/inherit_hr_leave_allocation.py | 1 +
.../models/yuthon_fixes_approval.py | 1 +
.../views/yuthon_fixes_approval_views.xml | 29 +++++++++----------
yuthon_hr_attendance/views/card_approval.xml | 14 ++++-----
.../views/overtime_approval.xml | 12 ++++----
.../views/yuthon_abnormal_approval_views.xml | 14 ++++-----
.../yuthon_adjustments_approval_views.xml | 14 ++++-----
.../views/yuthon_customer_approval_views.xml | 15 ++++------
.../models/yuthon_appointment_approval.py | 2 +-
.../models/yuthon_leaving_approval.py | 2 +-
.../models/yuthon_reassignment_approval.py | 2 +-
.../models/yuthon_regularization_approval.py | 2 +-
.../models/yuthon_reward_approval.py | 2 +-
.../models/yuthon_service_approval.py | 2 +-
.../models/yuthon_transfer_approval.py | 3 +-
.../yuthon_appointment_approval_views.xml | 2 +-
.../views/yuthon_leaving_approval_views.xml | 2 +-
.../yuthon_reassignment_approval_views.xml | 2 +-
.../yuthon_recruitment_approval_views.xml | 10 +++----
.../yuthon_regularization_approval_views.xml | 2 +-
.../views/yuthon_reward_approval_views.xml | 8 ++---
.../views/yuthon_service_approval_views.xml | 14 ++++-----
.../views/yuthon_transfer_approval_views.xml | 11 +++----
yuthon_issue/views/issue_approval_views.xml | 10 +++----
.../models/yuthon_lessee_notice.py | 2 +-
.../views/yuthon_lessee_notice.xml | 2 +-
.../views/property_eligibility.xml | 14 +++++----
.../property_evaluate_application_views.xml | 13 +++------
.../views/property_intention_views.xml | 14 +++++----
.../views/property_merge_approval_views.xml | 4 ++-
.../views/property_split_approval_views.xml | 4 ++-
.../views/property_transfer_views.xml | 10 +++----
.../views/yuthon_office_supplies_views.xml | 14 +++++----
33 files changed, 126 insertions(+), 127 deletions(-)
diff --git a/yuthon_holiday/models/inherit_hr_leave_allocation.py b/yuthon_holiday/models/inherit_hr_leave_allocation.py
index 28d2692c8..f819aee03 100644
--- a/yuthon_holiday/models/inherit_hr_leave_allocation.py
+++ b/yuthon_holiday/models/inherit_hr_leave_allocation.py
@@ -96,6 +96,7 @@ class HrLeaveAllocation(models.Model):
'default_users_id': self.employee_id.user_id.id,
'default_leave_id': self.id,
'default_now_type': now_type,
+ 'default_holiday_status_id': self.holiday_status_id.id,
'default_original_days': self.number_of_days_display,
'default_original_hours': self.number_of_days_display,
}
diff --git a/yuthon_holiday/models/yuthon_fixes_approval.py b/yuthon_holiday/models/yuthon_fixes_approval.py
index d6d402403..59c2a0ba4 100644
--- a/yuthon_holiday/models/yuthon_fixes_approval.py
+++ b/yuthon_holiday/models/yuthon_fixes_approval.py
@@ -16,6 +16,7 @@ class YuthonFixesApproval(models.Model):
now_type = fields.Selection([('days', '按天'), ('hours', '按小时')], string="修正类型")
now_days = fields.Float(string="现休假时长(天)")
now_hours = fields.Float(string="现休假时长(小时)")
+ holiday_status_id = fields.Many2one('hr.leave.type', string="休假类型")
department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
is_issues = fields.Boolean(string='是否上会')
related_issues_id = fields.Many2one('issue.library', string="关联议题")
diff --git a/yuthon_holiday/views/yuthon_fixes_approval_views.xml b/yuthon_holiday/views/yuthon_fixes_approval_views.xml
index 79628d5f8..3294b201a 100644
--- a/yuthon_holiday/views/yuthon_fixes_approval_views.xml
+++ b/yuthon_holiday/views/yuthon_fixes_approval_views.xml
@@ -18,21 +18,28 @@
diff --git a/yuthon_hr_attendance/views/card_approval.xml b/yuthon_hr_attendance/views/card_approval.xml
index 76a887b5c..e9a5f05a8 100644
--- a/yuthon_hr_attendance/views/card_approval.xml
+++ b/yuthon_hr_attendance/views/card_approval.xml
@@ -21,11 +21,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -42,10 +42,6 @@
-
-
-
-
diff --git a/yuthon_hr_attendance/views/overtime_approval.xml b/yuthon_hr_attendance/views/overtime_approval.xml
index bd73595dd..e6da12fd7 100644
--- a/yuthon_hr_attendance/views/overtime_approval.xml
+++ b/yuthon_hr_attendance/views/overtime_approval.xml
@@ -30,6 +30,12 @@
+
+
+
+
+
+
@@ -46,12 +52,6 @@
-
-
-
-
-
-
diff --git a/yuthon_hr_attendance/views/yuthon_abnormal_approval_views.xml b/yuthon_hr_attendance/views/yuthon_abnormal_approval_views.xml
index 7667d3ca6..6dd9ec82f 100644
--- a/yuthon_hr_attendance/views/yuthon_abnormal_approval_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_abnormal_approval_views.xml
@@ -21,6 +21,13 @@
+
+
+
+
+
+
+
@@ -32,13 +39,6 @@
-
-
-
-
-
-
-
diff --git a/yuthon_hr_attendance/views/yuthon_adjustments_approval_views.xml b/yuthon_hr_attendance/views/yuthon_adjustments_approval_views.xml
index 380d82a5b..0b63f2973 100644
--- a/yuthon_hr_attendance/views/yuthon_adjustments_approval_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_adjustments_approval_views.xml
@@ -21,6 +21,13 @@
+
+
+
+
+
+
+
@@ -33,13 +40,6 @@
-
-
-
-
-
-
-
diff --git a/yuthon_hr_attendance/views/yuthon_customer_approval_views.xml b/yuthon_hr_attendance/views/yuthon_customer_approval_views.xml
index 15d5388cc..e62128380 100644
--- a/yuthon_hr_attendance/views/yuthon_customer_approval_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_customer_approval_views.xml
@@ -19,12 +19,11 @@
-
-
-
-
-
-
+
+
+
+
+
@@ -37,10 +36,6 @@
-
-
-
-
diff --git a/yuthon_hr_employee_approval/models/yuthon_appointment_approval.py b/yuthon_hr_employee_approval/models/yuthon_appointment_approval.py
index 06dcb5be8..84b85ac2b 100644
--- a/yuthon_hr_employee_approval/models/yuthon_appointment_approval.py
+++ b/yuthon_hr_employee_approval/models/yuthon_appointment_approval.py
@@ -59,5 +59,5 @@ class YuthonAppointmentResultIsDetailed(models.Model):
is_other = fields.Boolean(string="新增其他专业职称")
cert_code = fields.Char(string="证书编号")
- notice_documents_ids = fields.Many2many('documents.document', string="附件")
+ notice_documents_ids = fields.Many2many('ir.attachment', string="附件")
remarks = fields.Char(string="备注")
\ No newline at end of file
diff --git a/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py b/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py
index 01caed4a4..fba07172b 100644
--- a/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py
+++ b/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py
@@ -25,7 +25,7 @@ class YuthonLeavingApproval(models.Model):
use_user_type = fields.Selection(related="users_id.employee_id.use_user_type", string="聘用形式")
type_resignation = fields.Selection([('1', '个人辞职'), ('2', '被动离职')], string="辞职类型")
application_data = fields.Date(string="申请日期")
- notice_documents_ids= fields.Many2many('documents.document', string="辞职申请")
+ notice_documents_ids= fields.Many2many('ir.attachment', string="辞职申请")
resignation_reason = fields.Text(string="辞职原因")
is_issues = fields.Boolean(string='是否上会')
related_issues_id = fields.Many2one('issue.library', string="关联议题")
diff --git a/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py b/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py
index 16b36849f..ac168c4b5 100644
--- a/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py
+++ b/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py
@@ -35,7 +35,7 @@ class YuthonReassignmentApproval(models.Model):
handover_date = fields.Date(string="移交日期")
handover_person_id = fields.Many2one("hr.employee", string="工作接交人")
notification_change_id = fields.Many2one("hr.employee", string="异动告知人员")
- notice_documents_ids = fields.Many2many('documents.document', string="附件")
+ notice_documents_ids = fields.Many2many('ir.attachment', string="附件")
change_parent_id = fields.Many2one("hr.employee", string="直线上级")
change_business_superior_id = fields.Many2one("hr.employee", string="业务上级")
change_duties = fields.Char(string="职务")
diff --git a/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py b/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py
index 83f37426d..9105b55d5 100644
--- a/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py
+++ b/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py
@@ -33,7 +33,7 @@ class YuthonRegularizationPrepareApproval(models.Model):
self_evaluation = fields.Text(string="自我评价")
employee_pros = fields.Text(string="员工优点")
improvements = fields.Text(string="需改进事项")
- notice_documents_ids = fields.Many2many('documents.document', string="考核文档")
+ notice_documents_ids = fields.Many2many('ir.attachment', string="考核文档")
#转正结果
positive_results = fields.Char(string="转正结果")
positive_date = fields.Date(string="转正日期")
diff --git a/yuthon_hr_employee_approval/models/yuthon_reward_approval.py b/yuthon_hr_employee_approval/models/yuthon_reward_approval.py
index dc89c6b17..ffe795398 100644
--- a/yuthon_hr_employee_approval/models/yuthon_reward_approval.py
+++ b/yuthon_hr_employee_approval/models/yuthon_reward_approval.py
@@ -18,7 +18,7 @@ class YuthonRewardApproval(models.Model):
department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
entrant_date = fields.Date(string="录入日期")
entrant_illustrate = fields.Text(string="录入说明")
- notice_documents_ids = fields.Many2many('documents.document', string="附件")
+ notice_documents_ids = fields.Many2many('ir.attachment', string="附件")
is_issues = fields.Boolean(string='是否上会')
related_issues_id = fields.Many2one('issue.library', string="关联议题")
reward_results_ids = fields.One2many('yuthon.reward.punishment.details', 'reward_punishment_id', string="奖罚明细")
diff --git a/yuthon_hr_employee_approval/models/yuthon_service_approval.py b/yuthon_hr_employee_approval/models/yuthon_service_approval.py
index 8abd79afe..04b7347eb 100644
--- a/yuthon_hr_employee_approval/models/yuthon_service_approval.py
+++ b/yuthon_hr_employee_approval/models/yuthon_service_approval.py
@@ -13,7 +13,7 @@ class YuthonServiceApproval(models.Model):
service_type = fields.Selection([('done', '在职证明'), ('leaving', '离职证明'), ('income', '收入类型')], string="服务类型")
users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
- tenant_user_card = fields.Char(string="身份证")
+ tenant_user_card = fields.Many2one('ir.attachment', string="身份证")
onboarding_time = fields.Date(string="入职时间")
job_id = fields.Many2one('hr.job', string="岗位")
reason_issuance = fields.Char(string="开证原因")
diff --git a/yuthon_hr_employee_approval/models/yuthon_transfer_approval.py b/yuthon_hr_employee_approval/models/yuthon_transfer_approval.py
index 9f7ebe517..3c503f043 100644
--- a/yuthon_hr_employee_approval/models/yuthon_transfer_approval.py
+++ b/yuthon_hr_employee_approval/models/yuthon_transfer_approval.py
@@ -27,7 +27,8 @@ class YutransferApproval(models.Model):
handover_person_id = fields.Many2one("hr.employee", string="工作接交人")
notification_change_id = fields.Many2one("hr.employee", string="告知人员")
handover_reason = fields.Text(string="移交原因")
- notice_documents_ids = fields.Many2many('documents.document', string="附件")
+ notice_documents_ids = fields.Many2many('ir.attachment', string="附件")
+ reason = fields.Html(string="正文")
is_issues = fields.Boolean(string='是否上会')
related_issues_id = fields.Many2one('issue.library', string="关联议题")
transfer_ids = fields.One2many('yuthon.transfer.infor.detail.lines', 'transfer_id')
diff --git a/yuthon_hr_employee_approval/views/yuthon_appointment_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_appointment_approval_views.xml
index 07b3ee2b2..232066ffc 100644
--- a/yuthon_hr_employee_approval/views/yuthon_appointment_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_appointment_approval_views.xml
@@ -55,7 +55,7 @@
-
+
diff --git a/yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml
index 61c580a1f..62cb6cb15 100644
--- a/yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml
@@ -54,7 +54,7 @@
-
+
diff --git a/yuthon_hr_employee_approval/views/yuthon_reassignment_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_reassignment_approval_views.xml
index c9e5c1b4f..d682c4784 100644
--- a/yuthon_hr_employee_approval/views/yuthon_reassignment_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_reassignment_approval_views.xml
@@ -82,7 +82,7 @@
-
+
diff --git a/yuthon_hr_employee_approval/views/yuthon_recruitment_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_recruitment_approval_views.xml
index c4c01e771..b015439a1 100644
--- a/yuthon_hr_employee_approval/views/yuthon_recruitment_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_recruitment_approval_views.xml
@@ -20,6 +20,11 @@
+
+
+
+
+
@@ -31,11 +36,6 @@
-
-
-
-
-
diff --git a/yuthon_hr_employee_approval/views/yuthon_regularization_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_regularization_approval_views.xml
index 4f9b67125..97a90e2c8 100644
--- a/yuthon_hr_employee_approval/views/yuthon_regularization_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_regularization_approval_views.xml
@@ -58,7 +58,7 @@
-
+
diff --git a/yuthon_hr_employee_approval/views/yuthon_reward_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_reward_approval_views.xml
index 2fa080dba..6f53b1291 100644
--- a/yuthon_hr_employee_approval/views/yuthon_reward_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_reward_approval_views.xml
@@ -23,6 +23,10 @@
+
+
+
+
@@ -38,10 +42,6 @@
-
-
-
-
diff --git a/yuthon_hr_employee_approval/views/yuthon_service_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_service_approval_views.xml
index 95b956529..00fe82c34 100644
--- a/yuthon_hr_employee_approval/views/yuthon_service_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_service_approval_views.xml
@@ -23,27 +23,27 @@
+
+
+
+
+
+
-
-
+
-
-
-
-
-
diff --git a/yuthon_hr_employee_approval/views/yuthon_transfer_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_transfer_approval_views.xml
index 8c5b22470..215d99ce4 100644
--- a/yuthon_hr_employee_approval/views/yuthon_transfer_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_transfer_approval_views.xml
@@ -23,6 +23,12 @@
+
+
+
+
+
+
@@ -57,11 +63,6 @@
-
-
-
-
-
diff --git a/yuthon_issue/views/issue_approval_views.xml b/yuthon_issue/views/issue_approval_views.xml
index f0b5ca00a..5cd8a7802 100644
--- a/yuthon_issue/views/issue_approval_views.xml
+++ b/yuthon_issue/views/issue_approval_views.xml
@@ -25,6 +25,11 @@
+
+
+
+
+
@@ -40,11 +45,6 @@
-
-
-
-
-
diff --git a/yuthon_lessee_service/models/yuthon_lessee_notice.py b/yuthon_lessee_service/models/yuthon_lessee_notice.py
index 7e50619b1..3bbe65e3c 100644
--- a/yuthon_lessee_service/models/yuthon_lessee_notice.py
+++ b/yuthon_lessee_service/models/yuthon_lessee_notice.py
@@ -23,7 +23,7 @@ class YuthonLesseeNotice(models.Model):
end_date = fields.Date(string="终止日期")
sequence = fields.Integer(string="顺序", default=1, compute='_compute_sequence')
notice_state = fields.Selection([('no', '未发布'), ('yes', '已发布'), ('stop', '已终止')], default='no', string="公告状态")
- notice_documents_ids = fields.Many2many('documents.document', string="附件")
+ notice_documents_ids = fields.Many2many('ir.attachment', string="附件")
is_notice_roger = fields.Selection([('yes', '已读'), ('no', '未读')], default='no', string="确认状态")
is_change_notice = fields.Boolean(string="是否发送通知", default=True)
attn_notice = fields.Html(string="经办人意见")
diff --git a/yuthon_lessee_service/views/yuthon_lessee_notice.xml b/yuthon_lessee_service/views/yuthon_lessee_notice.xml
index 7c96dbded..0f0bbac03 100644
--- a/yuthon_lessee_service/views/yuthon_lessee_notice.xml
+++ b/yuthon_lessee_service/views/yuthon_lessee_notice.xml
@@ -50,7 +50,7 @@
-
+
diff --git a/yuthon_property_approval/views/property_eligibility.xml b/yuthon_property_approval/views/property_eligibility.xml
index 40afecc05..9f1584442 100644
--- a/yuthon_property_approval/views/property_eligibility.xml
+++ b/yuthon_property_approval/views/property_eligibility.xml
@@ -16,6 +16,14 @@