diff --git a/odex25_transactions/exp_transaction_documents/models/entity.py b/odex25_transactions/exp_transaction_documents/models/entity.py index 8fa479c4e..08834dfa1 100644 --- a/odex25_transactions/exp_transaction_documents/models/entity.py +++ b/odex25_transactions/exp_transaction_documents/models/entity.py @@ -96,6 +96,7 @@ class Entity(models.Model): delegate_employee_id = fields.Many2one('cm.entity') from_date = fields.Datetime(string='Delegation From Date') to_date = fields.Datetime(string='Delegation To Date') + date_now = fields.Datetime(string='Date now',default=datetime.datetime.now()) to_delegate = fields.Boolean(string='To Delegate?', compute="_compute_to_delegate") def _compute_to_delegate(self): diff --git a/odex25_transactions/exp_transaction_documents/views/entity.xml b/odex25_transactions/exp_transaction_documents/views/entity.xml index 81315b505..95dcf2ffa 100644 --- a/odex25_transactions/exp_transaction_documents/views/entity.xml +++ b/odex25_transactions/exp_transaction_documents/views/entity.xml @@ -27,8 +27,9 @@ - - + + + diff --git a/odex25_transactions/exp_transaction_leave/models/leave.py b/odex25_transactions/exp_transaction_leave/models/leave.py index 2ee96eae9..96795fdc1 100644 --- a/odex25_transactions/exp_transaction_leave/models/leave.py +++ b/odex25_transactions/exp_transaction_leave/models/leave.py @@ -182,11 +182,11 @@ class Transaction(models.Model): record = self.env['employee.leave'].search([('employee_id', '=', employee_id), ('from_date', '<=', transaction_date), ('to_date', '>=', transaction_date), - ('state', '=', 'approve')]) + ('state', '=', 'approve')],limit=1) if record: employee_records = self.env['employee.leave.line'].search([('leave_id', '=', record.id), ('unit_id', '=', - unit_id)],limit=1).employee_id.id + unit_id)]).employee_id.id return employee_records