Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang
This commit is contained in:
@@ -370,12 +370,12 @@ class HrAttendance(models.Model):
|
||||
description='考勤异常请尽快处理',
|
||||
exception_alerts = True,
|
||||
url=url, btntxt="查看详情")
|
||||
# self.sudo().env["wecom.apps"].sync_send_message_textcard(category='att',
|
||||
# user_id='18562027762',
|
||||
# title='【考勤异常提醒】',
|
||||
# exception_alerts=True,
|
||||
# description='考勤异常请尽快处理',
|
||||
# url=url, btntxt="查看详情")
|
||||
self.sudo().env["wecom.apps"].sync_send_message_textcard(category='att',
|
||||
user_id='18562027762',
|
||||
title='【考勤异常提醒】',
|
||||
exception_alerts=True,
|
||||
description='考勤异常请尽快处理',
|
||||
url=url, btntxt="查看详情")
|
||||
|
||||
def missing_card_judgment(self):
|
||||
today = fields.Date.today()
|
||||
|
||||
@@ -1251,12 +1251,12 @@ class YuthonVacationReports(models.Model):
|
||||
today = fields.Date.today()
|
||||
first_day = today.replace(day=1)
|
||||
current_date = first_day
|
||||
first_workday = None
|
||||
while True:
|
||||
if self._process_shift_days(current_date):
|
||||
first_workday = current_date
|
||||
break
|
||||
current_date += timedelta(days=1)
|
||||
|
||||
if today != first_workday:
|
||||
return
|
||||
last_month_first = first_day - relativedelta(months=1)
|
||||
@@ -1265,7 +1265,11 @@ class YuthonVacationReports(models.Model):
|
||||
('vacation_state', '=', 'not_sent'),
|
||||
])
|
||||
for report in report_objs:
|
||||
report.button_put()
|
||||
resource_user_ids = report.employee_id.resource_calendar_id.resource_user_ids.ids
|
||||
if report.employee_id.id in resource_user_ids:
|
||||
report.write({'vacation_state': 'confirmed'})
|
||||
else:
|
||||
report.button_put()
|
||||
|
||||
def button_put(self):
|
||||
we_id = self.employee_id.wecom_userid
|
||||
@@ -1383,7 +1387,7 @@ class YuthonVacationReports(models.Model):
|
||||
url = f'https://phone.thtzjt.com/phone/Notarize/{rec.id}/{rec.employee_id.user_id.id}'
|
||||
data = f"你{year}年{month}月的考勤确认单已经生成,请确认"
|
||||
self.sudo().env["wecom.apps"].sync_send_message_textcard(category='att_ok', user_id=we_id, title="考勤确认单", description=data, url=url, btntxt="详细信息")
|
||||
self.sudo().env["wecom.apps"].sync_send_message_textcard(category='att_ok', user_id="18562027762", title="考勤确认单", description=data, url=url, btntxt="详细信息")
|
||||
# self.sudo().env["wecom.apps"].sync_send_message_textcard(category='att_ok', user_id="18562027762", title="考勤确认单", description=data, url=url, btntxt="详细信息")
|
||||
rec.write({'vacation_state': 'pending'})
|
||||
return {
|
||||
'type': 'ir.actions.client',
|
||||
|
||||
Reference in New Issue
Block a user