subh_pal_org
/
cor
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cor_cr' of https://gitlab.sunarctechnologies.com/prakash.jain/cor-odoo into cor_cr

This commit is contained in:
root 2022-09-29 15:28:16 +05:30
parent 4fe3e8bf15 85d06ae068
commit d8b4184acc
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
timesheet_entry_block/models/timesheet.py
View File

@ -38,8 +38,7 @@ class TimehseetBlock(models.Model):
entry_end_date = datetime.strptime(values['end_datetime'], format).date()
emp_obj = self.env['hr.employee'].search([('user_id', '=', self.env.uid)])
# project_manager_group = self.env.ref('hr_timesheet.group_timesheet_manager')
block_obj = emp_obj.permission_block_history.search(
[('employee_id', '=', emp_obj.id)], order='create_date desc', limit=1)
block_obj = emp_obj.permission_block_history.search([('employee_id', '=', emp_obj.id)], order='create_date desc', limit=1)
if block_obj:
if (block_obj.start_date <= entry_start_date and block_obj.end_date >= entry_start_date) or (
block_obj.start_date <= entry_end_date and block_obj.end_date >= entry_end_date) or (
@ -48,8 +47,6 @@ class TimehseetBlock(models.Model):
block_obj.end_date >= entry_start_date and block_obj.end_date <= entry_end_date
):
raise AccessError('You are not allowed to create entry for this date!')
else:
pass
return super(TimehseetBlock, self).create(values)
def write(self, record):
@ -80,9 +77,7 @@ class TimehseetBlock(models.Model):
block_obj.start_date >= entry_start_date and block_obj.end_date <= entry_end_date) or (
block_obj.end_date >= entry_start_date and block_obj.end_date <= entry_end_date):
raise AccessError('You are not allowed to edit entry for this date!')
else:
pass
return super(TimehseetBlock, self).write(record)
return super(TimehseetBlock, self).write(record)
# @api.constrains('unit_amount')
# def _check_unit_amount(self):