Fix bug
This commit is contained in:
parent
2aa0bff4d8
commit
12873d5cb3
|
|
@ -6,6 +6,8 @@ import logging
|
||||||
_logger = logging.getLogger(__name__)
|
_logger = logging.getLogger(__name__)
|
||||||
import json
|
import json
|
||||||
from ..validator import validator
|
from ..validator import validator
|
||||||
|
from datetime import datetime
|
||||||
|
import pytz
|
||||||
|
|
||||||
|
|
||||||
class Timesheet(models.Model):
|
class Timesheet(models.Model):
|
||||||
|
|
@ -180,7 +182,15 @@ class HrPersonalPermission(models.Model):
|
||||||
'state': validator.get_state_name(self, self.state), 'early_exit': self.early_exit,
|
'state': validator.get_state_name(self, self.state), 'early_exit': self.early_exit,
|
||||||
'attachment': self.get_attchment(self)}
|
'attachment': self.get_attchment(self)}
|
||||||
|
|
||||||
_logger.warning("Write inner");
|
_logger.warning("Write inner")
|
||||||
|
user = self.employee_id.user_id
|
||||||
|
timezone = user.tz or 'GMT'
|
||||||
|
local_tz = pytz.timezone(timezone)
|
||||||
|
date_from_local = self.date_from.astimezone(local_tz) if self.date_from else None
|
||||||
|
date_to_local = self.date_to.astimezone(local_tz) if self.date_to else None
|
||||||
|
|
||||||
|
date_from_str = date_from_local.strftime('%Y-%m-%d %H:%M:%S') if date_from_local else ''
|
||||||
|
date_to_str = date_to_local.strftime('%Y-%m-%d %H:%M:%S') if date_to_local else ''
|
||||||
data = {
|
data = {
|
||||||
'meta': json.dumps({
|
'meta': json.dumps({
|
||||||
'type': 'permission',
|
'type': 'permission',
|
||||||
|
|
@ -193,9 +203,9 @@ class HrPersonalPermission(models.Model):
|
||||||
for part in partner:
|
for part in partner:
|
||||||
if not self.env.context.get('refuse'):
|
if not self.env.context.get('refuse'):
|
||||||
part.send_notification(_("Employee %s Permission Waiting Your Approve") % (self.employee_id.name),
|
part.send_notification(_("Employee %s Permission Waiting Your Approve") % (self.employee_id.name),
|
||||||
" %s - %s" % (self.date_from, self.date_to), data=data, all_device=True)
|
" %s - %s" % (date_from_str, date_to_str), data=data, all_device=True)
|
||||||
self.employee_id.user_id.partner_id.send_notification(
|
self.employee_id.user_id.partner_id.send_notification(
|
||||||
_("Permission Request has been updated to %s ") % (validator.get_state_name(self, self.state)) , " %s - %s" % (self.date_from, self.date_to),
|
_("Permission Request has been updated to %s ") % (validator.get_state_name(self, self.state)) , " %s - %s" % (date_from_str, date_to_str),
|
||||||
data=data, all_device=True)
|
data=data, all_device=True)
|
||||||
|
|
||||||
def get_attchment(self, res_id):
|
def get_attchment(self, res_id):
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue