diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py index a83f7a9bc..8b470029b 100644 --- a/soong_workflow/models/soong_workflow_mixin.py +++ b/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") diff --git a/yuthon_hr_attendance/models/overtime_approval.py b/yuthon_hr_attendance/models/overtime_approval.py index 7b19873cb..bf55a6161 100644 --- a/yuthon_hr_attendance/models/overtime_approval.py +++ b/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([ diff --git a/yuthon_purchase/models/inherit_purchase_order.py b/yuthon_purchase/models/inherit_purchase_order.py index 90c59bc45..8de688802 100644 --- a/yuthon_purchase/models/inherit_purchase_order.py +++ b/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')