Merge pull request #4096 from expsa/younes_dev_odex25_mobile
Younes dev odex25 mobile
This commit is contained in:
commit
a0c169f1a3
|
|
@ -389,8 +389,7 @@ class PermissionController(http.Controller):
|
|||
success=False)
|
||||
try:
|
||||
permission_type_id = http.request.env['hr.personal.permission.type'].browse(int(body.get('permission_type_id')))
|
||||
permission_hours = self.permission_number_decrement(employee, body['date_from'], body['date_to'],
|
||||
permission_type_id)
|
||||
permission_hours = self.permission_number_decrement(employee, body['date_from'], body['date_to'],permission_type_id)
|
||||
|
||||
return http_helper.response(message="Data Found", data={'balance': permission_hours,
|
||||
'permission_limit': permission_type_id.daily_hours})
|
||||
|
|
@ -407,8 +406,7 @@ class PermissionController(http.Controller):
|
|||
def permission_number_decrement(self, employee_id, permission_date_from, permission_date_to, permission_type_id):
|
||||
if employee_id:
|
||||
if not employee_id.first_hiring_date:
|
||||
raise Warning(
|
||||
_('You can not Request Permission The Employee have Not First Hiring Date'))
|
||||
raise Warning(_('You can not Request Permission The Employee have Not First Hiring Date'))
|
||||
if permission_date_to:
|
||||
current_date = datetime.strptime(permission_date_to, DEFAULT_SERVER_DATETIME_FORMAT)
|
||||
current_month = current_date.month
|
||||
|
|
@ -432,12 +430,10 @@ class PermissionController(http.Controller):
|
|||
all_perission += rec.duration
|
||||
if rec.date_to and permission_date_to:
|
||||
permission_date1 = rec.date_to.date() if isinstance(rec.date_to,datetime) else datetime.strptime(str(rec.date_to), DEFAULT_SERVER_DATETIME_FORMAT).date()
|
||||
date_to_value1 = permission_date_to.date() if isinstance(permission_date_to, datetime) else datetime.strptime(
|
||||
permission_date_to, DEFAULT_SERVER_DATETIME_FORMAT).date()
|
||||
date_to_value1 = permission_date_to.date() if isinstance(permission_date_to, datetime) else datetime.strptime(permission_date_to, DEFAULT_SERVER_DATETIME_FORMAT).date()
|
||||
|
||||
if permission_date1 == date_to_value1:
|
||||
raise Warning(
|
||||
_('Sorry You Have Used All Your Permission In This Day you have one permission per a Day'))
|
||||
raise Warning(_('Sorry You Have Used All Your Permission In This Day you have one permission per a Day'))
|
||||
|
||||
if number_of_per > all_perission:
|
||||
return round(number_of_per - all_perission, 2)
|
||||
|
|
|
|||
Loading…
Reference in New Issue