diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py
index 315fa814f..73f7ee770 100644
--- a/soong_workflow/models/soong_workflow_record.py
+++ b/soong_workflow/models/soong_workflow_record.py
@@ -13,7 +13,13 @@ class SoongWorkflowRecord(models.Model):
_order = 'write_date2'
def get_no_read_count(self):
- return self.search_count([('approve_state', '=', 'pending'), ('employee_ids', 'in', [self.env.user.employee_id.id])])
+ domain = [
+ '|',
+ ('approve_state', '=', 'pending'),
+ ('approve_state', '=', 'start'),
+ ('employee_ids', 'in', [self.env.user.employee_id.id])
+ ]
+ return self.search_count(domain)
def read(self, fields=None, load='_classic_read'):
for re in self:
diff --git a/soong_workflow/views/soong_workflow_record.xml b/soong_workflow/views/soong_workflow_record.xml
index e1064b671..22c14e85e 100644
--- a/soong_workflow/views/soong_workflow_record.xml
+++ b/soong_workflow/views/soong_workflow_record.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/yuthon_holiday/models/inherit_hr_leave.py b/yuthon_holiday/models/inherit_hr_leave.py
index 0cbd72a01..83c95a8d9 100644
--- a/yuthon_holiday/models/inherit_hr_leave.py
+++ b/yuthon_holiday/models/inherit_hr_leave.py
@@ -407,6 +407,9 @@ class HolidaysRequestBatch(models.Model):
if leave.request_date_to:
all_dates.append(leave.request_date_to)
total_days += leave.number_of_days_display if hasattr(leave, 'number_of_days_display') else 0
+ for line in self.hour_leave_ids:
+ if line.request_date_from:
+ all_dates.append(line.request_date_from)
if all_dates:
self.start_date = min(all_dates)
@@ -419,7 +422,7 @@ class HolidaysRequestBatch(models.Model):
if self.hour_leave_ids and not self.leave_ids:
# 只按小时请假的情况
first_hour_leave = self.hour_leave_ids[0]
- date_str = first_hour_leave.request_date_from.strftime('%Y/%m/%d')
+ date_str = first_hour_leave.request_date_from.strftime('%Y%-m%-%d')
start_time = first_hour_leave.request_hour_from
end_time = first_hour_leave.request_hour_to
hours = first_hour_leave.number_of_hours_text if first_hour_leave.number_of_hours_text else 0
@@ -429,16 +432,16 @@ class HolidaysRequestBatch(models.Model):
self.name = title
elif self.leave_ids and not self.hour_leave_ids:
# 只按天请假的情况
- start_date_str = self.start_date.strftime('%Y/%m/%d')
- end_date_str = self.end_date.strftime('%Y/%m/%d')
+ start_date_str = self.start_date.strftime('%Y-%m-%d')
+ end_date_str = self.end_date.strftime('%Y-%m-%d')
self.name = f"{self.employee_id.name}的请假 {start_date_str}-{end_date_str}"
elif self.leave_ids and self.hour_leave_ids:
# 混合请假的情况
- start_date_str = self.start_date.strftime('%Y/%m/%d')
- end_date_str = self.end_date.strftime('%Y/%m/%d')
+ start_date_str = self.start_date.strftime('%Y-%m-%d')
+ end_date_str = self.end_date.strftime('%Y-%m-%d')
first_hour_leave = self.hour_leave_ids[0]
hours = first_hour_leave.number_of_hours_text if first_hour_leave.number_of_hours_text else 0
- title = f"{self.employee_id.name}的请假 {start_date_str}-{end_date_str},{total_days}天"
+ title = f"{self.employee_id.name}的请假 {start_date_str}~{end_date_str}共计{total_days}天"
if hours:
title += f"{hours}"
self.name = title
diff --git a/yuthon_hr_attendance/models/remove_holiday_approval.py b/yuthon_hr_attendance/models/remove_holiday_approval.py
index 7a608dad2..c8dec8da4 100644
--- a/yuthon_hr_attendance/models/remove_holiday_approval.py
+++ b/yuthon_hr_attendance/models/remove_holiday_approval.py
@@ -17,11 +17,7 @@ class RemoveHolidayApprovals(models.Model):
department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
statu = fields.Selection([('drft', '草稿'), ('going', '执行中'), ('cancel', '已取消'), ('done', '已完成')], string="状态",
default='drft')
- type_remove_holiday = fields.Char(string="销假类型")
role_id = fields.Many2one('yuthon.user.role', string="岗位")
- date_start = fields.Datetime(string="开始时间", default=fields.Datetime.now)
- date_end = fields.Datetime(string="结束时间")
- duration = fields.Float(string="时长")
reason_application = fields.Html(string="申请事由")
is_issues = fields.Boolean(string='是否上会')
issues_result = fields.Html(string="会议结果")
diff --git a/yuthon_hr_attendance/views/remove_holiday_approval.xml b/yuthon_hr_attendance/views/remove_holiday_approval.xml
index e6dfb28e2..1340f3bf4 100644
--- a/yuthon_hr_attendance/views/remove_holiday_approval.xml
+++ b/yuthon_hr_attendance/views/remove_holiday_approval.xml
@@ -9,7 +9,6 @@
-
@@ -47,23 +46,13 @@
-
-
-
-
-
-
-
+
+
-
-
-
-
-
+
+
-
-
-
+
diff --git a/yuthon_hr_employee/wizard/hr_employee_wizard.py b/yuthon_hr_employee/wizard/hr_employee_wizard.py
index 2dadefc3d..5f8c55613 100644
--- a/yuthon_hr_employee/wizard/hr_employee_wizard.py
+++ b/yuthon_hr_employee/wizard/hr_employee_wizard.py
@@ -285,9 +285,19 @@ class YuthonHrEmployeeWizard(models.Model):
'phone_number': phone_number,
}])
write_uid = self.env['res.users'].search([('id', '=', employee_id.user_id.id)])
+ user_type_dict = {
+ '正式合同（一签）': 'formal_one',
+ '劳务协议': 'labor',
+ '正式合同（二签）': 'formal_two',
+ '正式合同（无固定）': 'formal_none',
+ '兼职协议': 'part_time',
+ '用工协议': 'employment',
+ '实习协议': 'internship',
+ }
+ use_user_type = user_type_dict[row[34].value]
- #
employee_date= {
+ 'use_user_type': use_user_type,
'company_id': company_id.id,
'work_phone': work_phone,
'mobile_phone': mobile_phone,
diff --git a/yuthon_official/data/official_type_data.xml b/yuthon_official/data/official_type_data.xml
index ff9085678..b34e164e8 100644
--- a/yuthon_official/data/official_type_data.xml
+++ b/yuthon_official/data/official_type_data.xml
@@ -6,8 +6,8 @@
official_code
GW%(y)s%(month)s%(day)s
3
+
-
决议
适用于会议讨论通过的重大决策事项
diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml
index c7f15ad4f..00dbedec8 100644
--- a/yuthon_work_brand/views/hr_menus.xml
+++ b/yuthon_work_brand/views/hr_menus.xml
@@ -341,26 +341,30 @@
parent="human_resources_salary_root_board"
action="yuthon_salary.action_view_hr_payslip_month_form2"
sequence="3"/>
+
+
-
-
-
+ sequence="10"/>
+