pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!7980 !7979 添加功能

Browse Source 
Merge pull request !7980 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2026-01-14 13:11:39 +00:00
committed by Gitee
parent f01d1e1f4c e3f8de9f7b
commit 140a1dae37
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soong_workflow/views/soong_workflow_views.xml
+1 -1
View File
@@ -30,7 +30,7 @@
<field name="remove_default_btn_until_end"/>
<field name="is_enable_return_button"/>
<field name="is_enable_transmitted_button"/>
<field name="is_ease"/>
<!-- <field name="is_ease"/>-->
<field name="archive_type" widget="radio"/>
<field name="employee_ids" widget="many2many_tags" options="{'no_create': True}" invisible="archive_type != 'employee'"/>
<field name="role_ids" widget="many2many_tags" options="{'no_create': True}" invisible="archive_type != 'role'"/>
soong_workflow/wizard/soong_workflow_comment_wizard.py
+1 -1
View File
@@ -700,7 +700,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa',
user_id=employee.wecom_userid,
title=record_id._description,
description=f"编号为{record_id.code}的{record_id._description}已结束，请归档",
description=f"标题为{record_id.name}的{record_id._description}已结束，请归档",
url=url, btntxt="查看详情")
self.node_btn_id.with_context(cx).run()
if self.node_btn_name == "分发":
yuthon_holiday/models/inherit_hr_leave.py
+7 -2
View File
@@ -399,8 +399,13 @@ class HolidaysRequestBatch(models.Model):
}
self.env['soong.workflow.entrust'].create(entrust_vals)
self.leave_ids.action_validate()
self.hour_leave_ids.action_validate()
if self.leave_ids:
for record in self.leave_ids:
record.write({'state': 'validate'})
if self.hour_leave_ids:
for record in self.hour_leave_ids:
record.write({'state': 'validate'})
"""提交请假申请，区分年假和其他假期处理"""
self._process_specific_leaves('年假', is_annual_leave=True)
other_leave_types = [
yuthon_hr_employee_approval/views/yuthon_renewal_approval_views.xml
+5 -5
View File
@@ -49,7 +49,7 @@
<group string="审批事项">
<group>
<field name="is_back" invisible="1"/>
<field name="users_id"/>
<field name="users_id" options="{'no_create': True}"/>
<field name="work_end" invisible="1"/>
<field name="reason_application"/>
<!-- <field name="documents_ids" widget="preview_many2many"/>-->
@@ -60,9 +60,9 @@
</group>
<group string="续签员工" col="2">
<group>
<field name="employee_id"/>
<field name="employee_id" options="{'no_create': True}"/>
<field name="card"/>
<field name="department1_id"/>
<field name="department1_id" options="{'no_create': True}"/>
<field name="current_status"/>
<field name="renewal_date"/>
</group>
@@ -75,8 +75,8 @@
<group string="合同信息">
<field name="contract"/>
<field name="condition_review"/>
<field name="job_id"/>
<field name="payroll_structure_id"/>
<field name="job_id" options="{'no_create': True}"/>
<field name="payroll_structure_id" options="{'no_create': True}"/>
</group>
</sheet>
</form>