!1845 1

Merge pull request !1845 from 李鹏宇/dev

soong_workflow/models/soong_workflow_record.py

@@ -31,7 +31,7 @@ class SoongWorkflowRecord(models.Model):
     employee_ids = fields.Many2many('hr.employee', string="当前经办人")
     workflow_id = fields.Many2one(comodel_name="soong.workflow", string="审批类型", ondelete="restrict")
     node_id = fields.Many2one(comodel_name="soong.workflow.node", string="当前节点")
-    approve_state = fields.Selection([("start", "开始"), ("pending", "审批中"), ("end", "结束")], default="start", string="审批状态", compute="_compute_node_id")
+    approve_state = fields.Selection([("start", "草稿"), ("pending", "审批中"), ("end", "结束")], default="start", string="审批状态", compute="_compute_node_id")
     reclaim_state = fields.Boolean(string="回收")
     done_by = fields.Many2one(comodel_name="res.users", string="发起人")
     is_department_record = fields.Boolean(string="是否是本部门的数据", store=False, search="_search_is_department_record")

yuthon_hr_attendance/models/hr_attendance_month.py

@@ -123,7 +123,7 @@ class HrAttendanceMonthDetail(models.Model):
     is_no_card = fields.Integer(string="缺卡")
     is_work = fields.Integer(string='旷工')
     # 假期
-    unpaid_leave = fields.Integer(string="无薪假")
+    unpaid_leave = fields.Integer(string="事假")
 
 
     note = fields.Char(string='备注')
@@ -350,7 +350,7 @@ class HrAttendanceMonthDetail(models.Model):
             # 迟到, 早退， 缺卡
             self.come_late, self.is_early_card, self.is_no_card  = self._get_come_late(self.employee_id)
             # 无薪假：hr.leave表
-            days, hours = self._get_hr_leave_type(self.employee_id, ['无薪假'])
+            days, hours = self._get_hr_leave_type(self.employee_id, ['事假'])
             self.unpaid_leave = hours
 
         # 行政的进行统计
@@ -359,7 +359,7 @@ class HrAttendanceMonthDetail(models.Model):
             # 迟到, 早退, 缺卡
             self.come_late, self.is_early_card, self.is_no_card = self._get_come_late(self.employee_id)
             # 无薪假：hr.leave表
-            days, hours = self._get_hr_leave_type(self.employee_id, ['无薪假'])
+            days, hours = self._get_hr_leave_type(self.employee_id, ['事假'])
             self.unpaid_leave = hours
 
         return True

yuthon_hr_attendance/models/overtime_approval.py

@@ -108,8 +108,7 @@ class OvertimeApprovals(models.Model):
         for record in self:
             overtime_id = record.env['overtime.page'].search([('yuthon_company', '=', record.yuthon_company)])
             record.details = (f"1、每天加班不得超过{overtime_id.day_time}\n"
-                              f"2、每月加班不得超过{overtime_id.month_time}\n"
-                              f"3、每年加班不得超过{overtime_id.year_time}")
+                              f"2、每月加班不得超过{overtime_id.month_time}\n")
 
     def put_hr_employee(self):
         for record in self:

yuthon_hr_attendance/views/overtime_page_views.xml

@@ -27,7 +27,7 @@
                     <group>
                         <field name="day_time"/>
                         <field name="month_time"/>
-                        <field name="year_time"/>
+<!--                        <field name="year_time"/>-->
                     </group>
                 </sheet>
             </form>