Merge pull request #1998 from expsa/transaxtion_29_12

Transaction tasks

odex25_transactions/exp_transaction_leave/models/leave.py

@@ -40,9 +40,9 @@ class Leave(models.Model):
     def set_is_manager(self):
         user_id = self.env['res.users'].browse(self.env.uid)
         if self.employee_id.parent_id.manager_id.user_id == user_id:
-            self.current_is_manager = False
-        else:
             self.current_is_manager = True
+        else:
+            self.current_is_manager = False
 
     ####################################################
     # Business methods
@@ -112,7 +112,7 @@ class LeaveLine(models.Model):
         domain = {}
         if self.leave_id:
             domain = {'unit_id': [('id', 'in', self.env['cm.entity'].search([('type', '=', 'unit'),
-                                                                             ('secretary_id', '=',
+                                                                             ('parent_id', '=',
                                                                               self.leave_id.employee_id.id)]).ids)]}
         return {'domain': domain}
 

odex25_transactions/exp_transaction_leave/views/leave.xml

@@ -51,7 +51,7 @@
                                     </field>
                                 </group>
                             </page>
-                            <page string="Alternative Mangers">
+                            <page string="Alternative Mangers" invisible="1">
                                 <group>
                                     <field name="alternative_manager_ids" attrs="{'readonly':[('state','!=','draft')]}" nolabel="1" required="1" context="{ 'default_leave_id': id}">
                                         <tree editable="bottom">