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

!1098 11

Browse Source 
Merge pull request !1098 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-01-03 12:19:46 +00:00
committed by Gitee
parent dddb1d07df 467377d97a
commit 3f71f2437c
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_holiday/views/yuthon_fixes_approval_views.xml
+4 -2
View File
@@ -26,8 +26,10 @@
<field name="related_issues_id" invisible="not is_issues"/>
</group>
<group>
<field name="original_days"/>
<field name="now_days"/>
<field name="original_days" invisible="now_type != 'days'"/>
<field name="now_days" invisible="now_type != 'days'"/>
<field name="original_hours" invisible="now_type != 'hours'"/>
<field name="now_hours" invisible="now_type != 'hours'"/>
<field name="remarks" invisible="1"/>
<field name="yuthon_company" invisible="1"/>
<field name="department_id" invisible="1"/>
yuthon_hr_attendance/controllers/attendance_banner_route.py
+2 -2
View File
@@ -16,8 +16,8 @@ class AttendanceBannerRoute(Controller):
last_day_of_month = next_month_first_day - timedelta(days=1)
domain = [
('employee_id.user_id', '=', request.env.user.id),
('check_in', '>=', first_day_of_month),
('check_in', '<=', last_day_of_month),
('current_data', '>=', first_day_of_month.date()),
('current_data', '<=', last_day_of_month.date()),
('week', 'not in', ['seven', 'six'])
]
attendance = request.env['hr.attendance'].sudo().search(domain)