!7606 !7605 添加功能

Merge pull request !7606 from 李鹏宇/dev

soong_workflow/models/soong_workflow_mixin.py

@@ -1094,7 +1094,6 @@ class SoongWorkflowMixin(models.AbstractModel):
                                         field_attrs.group_ids or field_attrs.user_ids
                                 ):
                                     invisible_arr.append(node.node_name)
-                        read_num = ''
                         if readonly_arr:
                             id_el = etree.Element("field")
                             id_el.set("name", "log_ids")

yuthon_hr_attendance/models/overtime_approval.py

@@ -333,6 +333,9 @@ class OvertimeApprovals(models.Model):
                     existing_line.workday += workday
                     existing_line.legal_day += legal_day
                     existing_line.public_holidays += public_holidays
+                    existing_line.year_holiday += public_holidays
+                    existing_line.year_workday += workday
+
                 start_date = fields.Date.to_date(self.start_time)
                 end_date = fields.Date.to_date(self.end_time)
                 attendance_records = self.env['hr.attendance'].search([

yuthon_purchase/models/inherit_purchase_order.py

@@ -17,7 +17,7 @@ class InheritPurchaseOrder(models.Model):
     )
     name_title = fields.Char(string="默认标题", default='采购申请单', readonly=True)
     code = fields.Char(string="流水号", default=lambda self: self.env['ir.sequence'].next_by_code('purchase_workflow_approval_code'))
-    state = fields.Selection(selection_add=[('部门经理', '部门经理'),
+    state = fields.Selection(selection_add=[('部门经理', '部门经理'), ('工会主席', '工会主席'),
                                             ('协办', '协办'),
                                             ('分管领导', '分管领导'),
                                             ('总经理', '总经理')], default='draft')