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

!597 pengyuthon

Browse Source 
Merge pull request !597 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2024-11-27 13:05:42 +00:00
committed by Gitee
parent ec168b732d c699a8844b
commit f33b1ce3f8
3 changed files with 51 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_attendance/views/hr_attendance_views.xml
+33
View File
@@ -37,6 +37,39 @@
<field name="res_model">hr.attendance</field>
<field name="view_mode">tree,form</field>
</record>
<record id="action_attendance_yuthon_company_form1" model="ir.actions.act_window">
<field name="name">天河投资</field>
<field name="res_model">hr.attendance</field>
<field name="view_mode">tree,form</field>
<field name="context">
{
"search_default_employee": 1
}
</field>
<field name="domain">[('employee_id.yuthon_company','=','thtz')]</field>
</record>
<record id="action_attendance_yuthon_company_form2" model="ir.actions.act_window">
<field name="name">天河粮储</field>
<field name="res_model">hr.attendance</field>
<field name="view_mode">tree,form</field>
<field name="context">
{
"search_default_employee": 1
}
</field>
<field name="domain">[('employee_id.yuthon_company', '=', 'thlc')]</field>
</record>
<record id="action_attendance_yuthon_company_form3" model="ir.actions.act_window">
<field name="name">天河物管</field>
<field name="res_model">hr.attendance</field>
<field name="view_mode">tree,form</field>
<field name="context">
{
"search_default_employee": 1
}
</field>
<field name="domain">[('employee_id.yuthon_company', '=', 'thwg')]</field>
</record>
<record id="hr_attendance_action1" model="ir.actions.act_window">
<field name="name">我的考勤</field>
<field name="res_model">hr.attendance</field>
yuthon_will_task/models/yuthon_will_task.py
+2 -2
View File
@@ -5,7 +5,6 @@ from odoo.exceptions import UserError
import logging
_logger = logging.getLogger(__name__)
now = datetime.now() + timedelta(hours=8)
class YuthonWillTask(models.Model):
@@ -23,11 +22,12 @@ class YuthonWillTask(models.Model):
employee_ids = fields.Many2many('hr.employee', string='人员', default=lambda self: self.env.user.employee_id)
task_time_ids = fields.Many2many('yuthon.task.time', string='提醒')
start_time = fields.Datetime(string='开始时间', default=fields.Date.today())
end_time = fields.Datetime(string='结束时间', default=lambda self: datetime.combine(now.date(), time(11, 0, 0)))
end_time = fields.Datetime(string='结束时间', default=lambda self: datetime.combine(datetime.now().date(), time(11, 0, 0)))
def will_task_time(self):
tasks = self.env['yuthon.will.task'].search([])
for task in tasks:
now = datetime.now() + timedelta(hours=8)
start_time = task.start_time + timedelta(hours=8)
_logger.info("定时任务执行中")
_logger.info("判断前now:{}---start:{}".format(now, start_time))
yuthon_work_brand/views/attendance_menu.xml
+16 -1
View File
@@ -162,8 +162,23 @@
<menuitem id="menu_hr_attendance_all_record_board"
name="全部考勤"
parent="hr_attendance_record_root_board"
action="hr_attendance.hr_attendance_action"
action="hr_attendance.hr_attendance_action"
sequence="1"/>
<menuitem id="menu_hr_attendance_tt_record_board"
name="天河投资"
parent="hr_attendance_record_root_board"
action="yuthon_hr_attendance.action_attendance_yuthon_company_form1"
sequence="3"/>
<menuitem id="menu_hr_attendance_lc_record_board"
name="天河粮储"
parent="hr_attendance_record_root_board"
action="yuthon_hr_attendance.action_attendance_yuthon_company_form2"
sequence="5"/>
<menuitem id="menu_hr_attendance_wg_record_board"
name="天河物管"
parent="hr_attendance_record_root_board"
action="yuthon_hr_attendance.action_attendance_yuthon_company_form3"
sequence="7"/>
<!-- 值班相关 -->
<menuitem id="menu_hr_attendance_duty_summary_menu_board"
name="粮库值班管理"