From 7ae9b3a5d1326b6f3e116d1e26bdfbe4ce56dc19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Mon, 13 Apr 2026 14:43:28 +0800 Subject: [PATCH 01/23] =?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 --- yuthon_hr_employee_approval/models/yuthon_renewal_approval.py | 1 + 1 file changed, 1 insertion(+) diff --git a/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py b/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py index aa475709c..43e080004 100644 --- a/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py @@ -74,6 +74,7 @@ class YuthonRenewalApproval(models.Model): 'state': 'open', 'job_id': self.job_id.id, 'version': new_version, + 'is_probation': False, 'contract_type_id': new_contract_type_id, 'structure_type_id': self.payroll_structure_id.type_id.id, 'department_id': self.department1_id.id From 0e22f72a13abf0acd193b74c37e276e32f6b7fd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Mon, 13 Apr 2026 14:45:47 +0800 Subject: [PATCH 02/23] =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/description/icon.png | Bin 4093 -> 3320 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ks_dashboard_ninja/static/description/icon.png b/ks_dashboard_ninja/static/description/icon.png index 56dd2d024edfa8aa7c5db78ce4cbeeed1e07b447..cf1cc0f112803782364a85bb4910b37dd7327951 100644 GIT binary patch literal 3320 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 Date: Mon, 13 Apr 2026 14:57:16 +0800 Subject: [PATCH 03/23] =?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 --- soong_workflow/models/soong_workflow_mixin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py index 1e9d6f5df..3d9cc0bc5 100644 --- a/soong_workflow/models/soong_workflow_mixin.py +++ b/soong_workflow/models/soong_workflow_mixin.py @@ -1084,7 +1084,7 @@ class SoongWorkflowMixin(models.AbstractModel): btn_exec_action_el.set("icon", button.icon) # 接下来是隐藏的配置 invisible = "state != '{0}' ".format(str(node.node_name)) - if button.review_type == 'user_role': + if button.review_type == 'user_role' and model != 'yuthon.seals.approval': # 构建角色条件 role_domain = [] if button.users_role_id: From 01fd4458764cf5ac0b6ff81348793417c257afaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Mon, 13 Apr 2026 15:04:10 +0800 Subject: [PATCH 04/23] 1 --- yuthon_issue/static/description/icon.png | Bin 5889 -> 3460 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/yuthon_issue/static/description/icon.png b/yuthon_issue/static/description/icon.png index 63bebae6a8004d16fb0cba4cec4b3c20094653e0..3c67a108979178b074751b8749d9764d788d1f1a 100644 GIT binary patch literal 3460 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 H1V{b{4JH;H literal 5889 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 Xor&g< Date: Mon, 13 Apr 2026 15:28:54 +0800 Subject: [PATCH 05/23] =?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 --- yuthon_hr_attendance/models/yuthon_vacation_reports.py | 2 +- yuthon_hr_employee_approval/models/yuthon_renewal_approval.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py index cfa6c72bd..546c58f01 100644 --- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py +++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py @@ -891,7 +891,7 @@ class YuthonVacationReports(models.Model): if attendances: # 过滤有效考勤记录 valid_attendances = [att for att in attendances if ( - att.check_in or att.check_out) and att.shift_name != '休息' and not att.is_abnormal] + att.check_in or att.check_out or att.workflow_id.workflow_id.name == '外出') and att.shift_name != '休息' and not att.is_abnormal] leave_days = 0 processed_leave_codes = set() diff --git a/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py b/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py index 43e080004..6d2489897 100644 --- a/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py @@ -53,6 +53,7 @@ class YuthonRenewalApproval(models.Model): def end_approval(self): self.ensure_one() original_contract = self.employee_id.contract_id + resource_calendar_id = self.env['resource.calendar'].search([('company_id', '=', self.company_id.id)], limit=1) version_num = float(self.employee_id.contract_id.version.lstrip('Vv')) new_version_num = version_num + 1.0 new_version = f"V{new_version_num:.1f}" @@ -73,6 +74,7 @@ class YuthonRenewalApproval(models.Model): 'date_start': self.renewal_date, 'state': 'open', 'job_id': self.job_id.id, + 'resource_calendar_id': resource_calendar_id.id, 'version': new_version, 'is_probation': False, 'contract_type_id': new_contract_type_id, From bcbd18682b17cfbff810b248d9a8af146404b6ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Mon, 13 Apr 2026 16:20:25 +0800 Subject: [PATCH 06/23] =?UTF-8?q?=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/yuthon_will_task_views.xml | 51 ++++++++++++++++++- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/yuthon_will_task/views/yuthon_will_task_views.xml b/yuthon_will_task/views/yuthon_will_task_views.xml index d72228a0d..d13033f25 100644 --- a/yuthon_will_task/views/yuthon_will_task_views.xml +++ b/yuthon_will_task/views/yuthon_will_task_views.xml @@ -246,6 +246,49 @@ + + yuthon.will.task.kanban + yuthon.will.task + + + + + + + + + +
+ +
+
+ +
+
+ +
+
+ +
+ +
+ +
+ 经办人： + +  | 共人 + +
+
+ + + + + + yuthon.will.task.calendar yuthon.will.task @@ -275,9 +318,11 @@ 日程管理 yuthon.will.task - tree,calendar,form + tree,kanban,calendar,form [('task_state', '!=', 'cancel')] {'search_default_next_seven_days': 1} + 领导日程 @@ -289,11 +334,13 @@ 领导日程 yuthon.will.task - tree,calendar,form + tree,kanban,calendar,form [('user_role_ids.name', 'in', ['董事长', '分管领导', '总经理', '部门副经理', '副总经理', '司机']), ('task_state', '!=', 'cancel')] {'search_default_next_seven_days': 1} + 更新 From 1db29f378eb7e8c5bde95a958faf26844ea20066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Mon, 13 Apr 2026 16:24:07 +0800 Subject: [PATCH 07/23] =?UTF-8?q?=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_will_task/views/yuthon_will_task_views.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/yuthon_will_task/views/yuthon_will_task_views.xml b/yuthon_will_task/views/yuthon_will_task_views.xml index d13033f25..bd3c98b1f 100644 --- a/yuthon_will_task/views/yuthon_will_task_views.xml +++ b/yuthon_will_task/views/yuthon_will_task_views.xml @@ -308,12 +308,13 @@ 我的日程 yuthon.will.task - tree,calendar,form + tree,kanban,calendar,form [('users_ids', 'in', [uid]), ('task_state', '!=', 'cancel')] {'search_default_next_seven_days': 1} + (0, 0, {'view_mode': 'kanban', 'view_id': ref('yuthon_will_task.view_yuthon_will_task_kanban')}), + (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_will_task.view_yuthon_will_task_form2')})]" /> 日程管理 From 8b8e38c2e2861fd6b1888ed5177b672bed8f023c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Mon, 13 Apr 2026 18:35:46 +0800 Subject: [PATCH 08/23] =?UTF-8?q?=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- soong_workflow/templates/soong_workflow_templates.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/soong_workflow/templates/soong_workflow_templates.xml b/soong_workflow/templates/soong_workflow_templates.xml index b81123d57..6a96ee73b 100644 --- a/soong_workflow/templates/soong_workflow_templates.xml +++ b/soong_workflow/templates/soong_workflow_templates.xml @@ -34,7 +34,7 @@