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

!12601 添加功能

Browse Source 
Merge pull request !12601 from 李鹏宇/dev_zhou
This commit is contained in:
李鹏宇
2026-08-11 08:16:08 +00:00
committed by Gitee
parent 01e922cdf2 1d9a973fce
commit f30ad3bb9f
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_attendance/models/duty_adjustment_schedule.py
+2 -1
View File
@@ -60,7 +60,8 @@ class DutyAdjustmentSchedule(models.Model):
over_record = self.env['vacation.over.line'].search([
('employee_id', '=', record.employee_id.id),
('update_date', '=', record.duty_date),
('vacation_id', '=', record.vacation_id.id)
('vacation_id', '=', record.vacation_id.id),
('text', '=', '值班调休'),
], limit=1)
if not over_record:
self.env['vacation.over.line'].create({
yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
+2 -1
View File
@@ -422,7 +422,7 @@
</page>
<page string="育儿假">
<field name="parenting_line_ids" context="{'default_employee_id': employee_id}">
<tree editable="bottom" delete="false" edit="false" create="false">
<tree editable="bottom" edit="false" create="false" delete="false">
<field name="employee_id" column_invisible="1"/>
<field name="vacation_id" column_invisible="1"/>
<field name="update_date"/>
@@ -430,6 +430,7 @@
<field name="lines"/>
<field name="text"/>
<field name="is_confirm" column_invisible="1"/>
<button name="unlink" string="删除" type="object" class="btn-primary" groups="yuthon_holiday.group_yuthon_holiday_admin"/>
</tree>
</field>
</page>