From e666f2b478c544d5a8be11c893fd7fc0a3f2d8cd Mon Sep 17 00:00:00 2001
From: eman <e.nagah@exp-sa.com>
Date: Sat, 4 Jan 2025 02:47:00 +0200
Subject: [PATCH] Fix Issue in date

---
 odex25_transactions/exp_transaction_documents/models/entity.py | 1 -
 odex25_transactions/exp_transaction_documents/views/entity.xml | 1 -
 odex25_transactions/exp_transaction_leave/models/leave.py      | 2 +-
 odex25_transactions/exp_transaction_leave/views/leave.xml      | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/odex25_transactions/exp_transaction_documents/models/entity.py b/odex25_transactions/exp_transaction_documents/models/entity.py
index 8351a07de..4e85e0276 100644
--- a/odex25_transactions/exp_transaction_documents/models/entity.py
+++ b/odex25_transactions/exp_transaction_documents/models/entity.py
@@ -97,7 +97,6 @@ class Entity(models.Model):
     from_date = fields.Datetime(string='Delegation From Date')
     to_date = fields.Datetime(string='Delegation To Date')
     to_delegate = fields.Boolean(string='To Delegate?', compute="_compute_to_delegate")
-    now_date = fields.Datetime(string='Now Date', default=fields.Datetime.now())
 
     def _compute_to_delegate(self):
         for rec in self:
diff --git a/odex25_transactions/exp_transaction_documents/views/entity.xml b/odex25_transactions/exp_transaction_documents/views/entity.xml
index 947bcdb7f..81315b505 100644
--- a/odex25_transactions/exp_transaction_documents/views/entity.xml
+++ b/odex25_transactions/exp_transaction_documents/views/entity.xml
@@ -29,7 +29,6 @@
                                 <field name="delegate_employee_id" attrs="{'invisible':['|',('type','not in',['employee']),('to_delegate','=',False)]}"/>
                                 <field name="from_date" attrs="{'invisible':['|',('type','not in',['employee']),('to_delegate','=',False)]}" readonly="1" force_save="1"/>
                                 <field name="to_date" attrs="{'invisible':['|',('type','not in',['employee']),('to_delegate','=',False)]}" readonly="1" force_save="1"/>
-                                <field name="now_date"/>
                                 <field name="department_id" attrs="{'invisible': [('type','not in',['unit'])]}"/>
                                 <field name="partner_id"
                                        attrs="{'invisible': [('type','not in',['external'])]}"/>
diff --git a/odex25_transactions/exp_transaction_leave/models/leave.py b/odex25_transactions/exp_transaction_leave/models/leave.py
index d26769fc1..c2ccc76fc 100644
--- a/odex25_transactions/exp_transaction_leave/models/leave.py
+++ b/odex25_transactions/exp_transaction_leave/models/leave.py
@@ -28,7 +28,7 @@ class Leave(models.Model):
         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:
+                if rec.from_date <= fields.Datetime.now() < rec.to_date:
                     rec.to_delegate = True
                 else:
                     rec.to_delegate = False
diff --git a/odex25_transactions/exp_transaction_leave/views/leave.xml b/odex25_transactions/exp_transaction_leave/views/leave.xml
index b094e2b13..80defa15c 100644
--- a/odex25_transactions/exp_transaction_leave/views/leave.xml
+++ b/odex25_transactions/exp_transaction_leave/views/leave.xml
@@ -38,7 +38,7 @@
                         <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"/>
+                            <field name="to_delegate" invisible="1"/>
                         </group>
                         <notebook>
                             <page string="Alternative Employees">