Merge pull request #2058 from expsa/transaction_tasks_1_1

Fix Issue in date
This commit is contained in:
enagahh 2025-01-04 02:06:18 +02:00 committed by GitHub
commit 90ca76680c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 2 deletions

View File

@ -22,6 +22,25 @@ class Leave(models.Model):
alternative_employee_ids = fields.One2many('employee.leave.line', 'leave_id', string='Alternative Employees')
alternative_manager_ids = fields.One2many('manager.leave.line', 'leave_id', string='Alternative Mangers')
current_is_manager = fields.Boolean(string='Is Manager', compute="set_is_manager")
to_delegate = fields.Boolean(string='To Delegate?', compute="_compute_to_delegate")
def _compute_to_delegate(self):
for rec in self:
rec.to_delegate = False
if rec.from_date and rec.to_date:
if rec.from_date <= fields.Datetime.now() < rec.to_date:
rec.to_delegate = True
else:
rec.to_delegate = False
rec.state = 'expired'
@api.model
def search(self, args, offset=0, limit=None, order=None, count=False):
unit_id = self.env['cm.entity'].search([('user_id','=',self.env.uid)],limit=1).parent_id
if self.env['cm.entity'].search([('user_id','=',self.env.uid)],limit=1).parent_id.manager_id.user_id.id == self.env.uid:
args += [('employee_id.parent_id', '=', unit_id.id)]
else:
args += [('employee_id.user_id', '=', self.env.user.id)]
return super(Leave, self).search(args, offset, limit, order, count)
def default_employee_id(self):
user = self.env.user

View File

@ -38,14 +38,15 @@
<group col ="4">
<field name="from_date" attrs="{'readonly':[('state','!=','draft')]}" required="1"/>
<field name="to_date" attrs="{'readonly':[('state','!=','draft')]}" required="1"/>
<field name="to_delegate"/>
</group>
<notebook>
<page string="Alternative Employees">
<group>
<field name="alternative_employee_ids" attrs="{'readonly':[('state','!=','draft')]}" nolabel="1" required="1" context="{ 'default_leave_id': id}">
<tree editable="bottom">
<field name="unit_id" required="1"/>
<field name="employee_id" required="1"/>
<field name="unit_id" required="1" options="{'no_create': True, 'no_create_edit':True, 'no_open': True}"/>
<field name="employee_id" required="1" options="{'no_create': True, 'no_create_edit':True, 'no_open': True}"/>
<field name="leave_id" invisible="1"/>
</tree>
</field>