Merge pull request #2062 from expsa/transaction_tasks_1_1

Fix Issue in date

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:

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'])]}"/>

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

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">