From 595fdbde610ae81f7e986b5185d82b16dc560776 Mon Sep 17 00:00:00 2001
From: "PSI (Openerp)" <>
Date: Mon, 26 Jul 2010 11:45:27 +0530
Subject: [PATCH] [IMP] hr related modules improvements

bzr revid: mra@mra-laptop-20100726061527-xftwpfuimrs2bbo8
---
 addons/hr/hr.py                               |  6 ++
 addons/hr/hr_department.py                    | 35 ++++---
 addons/hr_attendance/hr_attendance.py         | 15 ++-
 .../wizard/hr_attendance_byweek.py            |  2 +
 .../wizard/hr_attendance_error.py             |  4 +-
 .../wizard/hr_attendance_sign_in_out.py       | 34 +++++--
 addons/hr_recruitment/__openerp__.py          |  2 +-
 addons/hr_recruitment/hr_recruitment.py       | 39 +++++---
 addons/hr_recruitment/hr_recruitment_data.xml | 12 +--
 addons/hr_recruitment/hr_recruitment_demo.xml | 14 +--
 addons/hr_recruitment/hr_recruitment_menu.xml |  4 +-
 addons/hr_recruitment/hr_recruitment_view.xml | 99 ++++++++++++++++---
 .../report/hr_recruitment_report_view.xml     |  6 +-
 ...hr_recruitment_create_partner_job_view.xml |  4 +-
 addons/hr_timesheet/hr_timesheet.py           | 24 +++--
 .../wizard/hr_timesheet_print_employee.py     |  5 +
 .../wizard/hr_timesheet_print_users.py        |  2 +
 .../wizard/hr_timesheet_sign_in_out.py        | 88 ++++++++++-------
 .../wizard/hr_timesheet_sign_in_out_view.xml  |  8 +-
 .../board_hr_timesheet_invoice.xml            | 16 +--
 20 files changed, 294 insertions(+), 125 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index ab7d6189621..a10c7cc29b1 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -34,6 +34,8 @@ class hr_employee_category(osv.osv):
     }
 
     def _check_recursion(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         level = 100
         while len(ids):
             cr.execute('select distinct parent_id from hr_employee_category where id IN %s', (tuple(ids), ))
@@ -62,6 +64,8 @@ hr_employee_marital_status()
 class hr_job(osv.osv):
 
     def _no_of_employee(self, cr, uid, ids, name, args, context=None):
+        if context is None:
+            context = {}
         res = {}
         for emp in self.browse(cr, uid, ids):
             res[emp.id] = len(emp.employee_ids or [])
@@ -133,6 +137,8 @@ class hr_employee(osv.osv):
     }
 
     def _get_photo(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         return open(os.path.join(
             tools.config['addons_path'], 'hr/image', 'photo.png'),
                     'rb') .read().encode('base64')
diff --git a/addons/hr/hr_department.py b/addons/hr/hr_department.py
index 47c4c0e0fc7..f304e994a1f 100644
--- a/addons/hr/hr_department.py
+++ b/addons/hr/hr_department.py
@@ -29,7 +29,7 @@ class hr_department(osv.osv):
             context = {}
         if not len(ids):
             return []
-        reads = self.read(cr, uid, ids, ['name','parent_id'], context)
+        reads = self.read(cr, uid, ids, ['name','parent_id'], context=context)
         res = []
         for record in reads:
             name = record['name']
@@ -39,6 +39,8 @@ class hr_department(osv.osv):
         return res
 
     def _dept_name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
+        if context is None:
+            context = {}
         res = self.name_get(cr, uid, ids, context=context)
         return dict(res)
 
@@ -59,7 +61,9 @@ class hr_department(osv.osv):
                 }
 
     def _get_members(self,cr, uid, context=None):
-        mids = self.search(cr, uid, [('manager_id', '=', uid)])
+        if context is None:
+            context = {}
+        mids = self.search(cr, uid, [('manager_id', '=', uid)], context=context)
         result = {uid: 1}
         for m in self.browse(cr, uid, mids, context=context):
             for user in m.member_ids:
@@ -67,6 +71,8 @@ class hr_department(osv.osv):
         return result.keys()
 
     def _check_recursion(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         level = 100
         while len(ids):
             cr.execute('select distinct parent_id from hr_department where id IN %s',(tuple(ids),))
@@ -89,6 +95,7 @@ class ir_action_window(osv.osv):
     def read(self, cr, uid, ids, fields=None, context=None, load='_classic_read'):
         if context is None:
             context = {}
+        obj_dept = self.pool.get('hr.department')
         select = ids
         if isinstance(ids, (int, long)):
             select = [ids]
@@ -96,7 +103,7 @@ class ir_action_window(osv.osv):
         for r in res:
             mystring = 'department_users_get()'
             if mystring in (r.get('domain', '[]') or ''):
-                r['domain'] = r['domain'].replace(mystring, str(self.pool.get('hr.department')._get_members(cr, uid)))
+                r['domain'] = r['domain'].replace(mystring, str(obj_dept._get_members(cr, uid)))
         if isinstance(ids, (int, long)):
             if res:
                 return res[0]
@@ -111,18 +118,22 @@ class res_users(osv.osv):
     _description = 'User'
 
     def _parent_compute(self, cr, uid, ids, name, args, context=None):
+        if context is None:
+            context = {}
         result = {}
         obj_dept = self.pool.get('hr.department')
         for user_id in ids:
-            ids_dept = obj_dept.search(cr, uid, [('member_ids', 'in', [user_id])])
+            ids_dept = obj_dept.search(cr, uid, [('member_ids', 'in', [user_id])], context=context)
             parent_ids = []
             if ids_dept:
-                data_dept = obj_dept.read(cr, uid, ids_dept, ['manager_id'])
+                data_dept = obj_dept.read(cr, uid, ids_dept, ['manager_id'], context=context)
                 parent_ids = map(lambda x: x['manager_id'][0], data_dept)
             result[user_id] = parent_ids
         return result
 
     def _parent_search(self, cr, uid, obj, name, args, context=None):
+        if context is None:
+            context = {}
         parent = []
         for arg in args:
             if arg[0] == 'parent_id':
@@ -133,20 +144,20 @@ class res_users(osv.osv):
         return [('id', 'in', child_ids.get(uid,[]))]
 
     def _child_compute(self, cr, uid, ids, name, args, context=None):
+        if context is None:
+            context = {}
         obj_dept = self.pool.get('hr.department')
         obj_user = self.pool.get('res.users')
         result = {}
-        if context is None:
-            context = {}
         for manager_id in ids:
             child_ids = []
-            mgnt_dept_ids = obj_dept.search(cr, uid, [('manager_id', '=', manager_id)])
-            ids_dept = obj_dept.search(cr, uid, [('id', 'child_of', mgnt_dept_ids)])
+            mgnt_dept_ids = obj_dept.search(cr, uid, [('manager_id', '=', manager_id)], context=context)
+            ids_dept = obj_dept.search(cr, uid, [('id', 'child_of', mgnt_dept_ids)], context=context)
             if ids_dept:
-                data_dept = obj_dept.read(cr, uid, ids_dept, ['member_ids'])
+                data_dept = obj_dept.read(cr, uid, ids_dept, ['member_ids'], context=context)
                 childs = map(lambda x: x['member_ids'], data_dept)
                 childs = tools.flatten(childs)
-                childs = obj_user.search(cr, uid, [('id', 'in', childs),('active', '=', True)])
+                childs = obj_user.search(cr, uid, [('id', 'in', childs),('active', '=', True)], context=context)
                 if manager_id in childs:
                     childs.remove(manager_id)
                 child_ids.extend(tools.flatten(childs))
@@ -159,6 +170,8 @@ class res_users(osv.osv):
         return result
 
     def _child_search(self, cr, uid, obj, name, args, context=None):
+        if context is None:
+            context = {}
         parent = []
         for arg in args:
             if arg[0] == 'child_ids':
diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index d5667051ae1..938df72d4e9 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -37,7 +37,9 @@ class hr_action_reason(osv.osv):
 hr_action_reason()
 
 def _employee_get(obj, cr, uid, context=None):
-    ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)])
+    if context is None:
+        context = {}
+    ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context)
     if ids:
         return ids[0]
     return False
@@ -47,6 +49,8 @@ class hr_attendance(osv.osv):
     _description = "Attendance"
 
     def _day_compute(self, cr, uid, ids, fieldnames, args, context=None):
+        if context is None:
+            context = {}
         res = dict.fromkeys(ids, '')
         for obj in self.browse(cr, uid, ids, context=context):
             res[obj.id] = time.strftime('%Y-%m-%d', time.strptime(obj.name, '%Y-%m-%d %H:%M:%S'))
@@ -89,6 +93,8 @@ class hr_employee(osv.osv):
     _description = "Employee"
 
     def _state(self, cr, uid, ids, name, args, context=None):
+        if context is None:
+            context = {}
         result = {}
         for id in ids:
             result[id] = 'absent'
@@ -112,11 +118,16 @@ class hr_employee(osv.osv):
      }
 
     def _action_check(self, cr, uid, emp_id, dt=False, context=None):
+        if context is None:
+            context = {}
         cr.execute('select max(name) from hr_attendance where employee_id=%s', (emp_id,))
         res = cr.fetchone()
         return not (res and (res[0]>=(dt or time.strftime('%Y-%m-%d %H:%M:%S'))))
 
     def attendance_action_change(self, cr, uid, ids, type='action', context=None, dt=False, *args):
+        obj_attendance = self.pool.get('hr.attendance')
+        if context is None:
+            context = {}
         id = False
         warning_sign = 'sign'
         res = {}
@@ -136,7 +147,7 @@ class hr_employee(osv.osv):
 
             if dt:
                 res['name'] = dt
-            id = self.pool.get('hr.attendance').create(cr, uid, res, context=context)
+            id = obj_attendance.create(cr, uid, res, context=context)
 
         if type != 'action':
             return id
diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek.py b/addons/hr_attendance/wizard/hr_attendance_byweek.py
index 9ef48f29fff..175ebf8a228 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek.py
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek.py
@@ -35,6 +35,8 @@ class hr_attendance_byweek(osv.osv_memory):
         }
 
     def print_report(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         datas = {
              'ids': [],
              'model': 'hr.employee',
diff --git a/addons/hr_attendance/wizard/hr_attendance_error.py b/addons/hr_attendance/wizard/hr_attendance_error.py
index 62689705c17..449fc4ca5c2 100644
--- a/addons/hr_attendance/wizard/hr_attendance_error.py
+++ b/addons/hr_attendance/wizard/hr_attendance_error.py
@@ -42,14 +42,14 @@ class hr_attendance_error(osv.osv_memory):
         if context is None:
             context = {}
         emp_ids = []
-        data_error = self.read(cr, uid, ids)[0]
+        data_error = self.read(cr, uid, ids, context=context)[0]
         date_from = data_error['init_date']
         date_to = data_error['end_date']
         cr.execute("select id from hr_attendance where employee_id IN %s and to_char(name,'YYYY-mm-dd')<=%s and to_char(name,'YYYY-mm-dd')>=%s and action IN %s order by name" ,(tuple(context['active_ids']), date_to, date_from, tuple(['sign_in','sign_out'])))
         attendance_ids = [x[0] for x in cr.fetchall()]
         if not attendance_ids:
             raise osv.except_osv(_('No Data Available'), _('No records found for your selection!'))
-        attendance_records = self.pool.get('hr.attendance').browse(cr, uid, attendance_ids)
+        attendance_records = self.pool.get('hr.attendance').browse(cr, uid, attendance_ids, context=context)
 
         for rec in attendance_records:
             if rec.employee_id.id not in emp_ids:
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
index 7ffd94dbca5..5ac041d7a42 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
@@ -53,11 +53,15 @@ class hr_si_so_ask(osv.osv_memory):
                  }
 
     def sign_in(self, cr, uid, ids, context=None):
-        data = self.read(cr, uid, ids, [])[0]
+        if context is None:
+            context = {}
+        data = self.read(cr, uid, ids, [], context=context)[0]
         return self.pool.get('hr.sign.in.out').sign_in(cr, uid, data, context)
 
     def sign_out(self, cr, uid, ids, context=None):
-        data = self.read(cr, uid, ids, [])[0]
+        if context is None:
+            context = {}
+        data = self.read(cr, uid, ids, [], context=context)[0]
         return self.pool.get('hr.sign.in.out').sign_out(cr, uid, data, context)
 
 hr_si_so_ask()
@@ -74,6 +78,8 @@ class hr_sign_in_out(osv.osv_memory):
                 }
 
     def _get_empid(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         emp_id = self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context)
         if emp_id:
             employee = self.pool.get('hr.employee').browse(cr, uid, emp_id, context=context)[0]
@@ -81,6 +87,8 @@ class hr_sign_in_out(osv.osv_memory):
         return {}
 
     def default_get(self, cr, uid, fields_list, context=None):
+        if context is None:
+            context = {}
         res = super(hr_sign_in_out, self).default_get(cr, uid, fields_list, context=context)
         res_emp = self._get_empid(cr, uid, context=context)
         res.update(res_emp)
@@ -89,10 +97,12 @@ class hr_sign_in_out(osv.osv_memory):
     def si_check(self, cr, uid, ids, context=None):
         obj_model = self.pool.get('ir.model.data')
         att_obj = self.pool.get('hr.attendance')
-        data = self.read(cr, uid, ids, [])[0]
+        if context is None:
+            context = {}
+        data = self.read(cr, uid, ids, [], context=context)[0]
         emp_id = data['emp_id']
         att_id = att_obj.search(cr, uid, [('employee_id', '=', emp_id)], limit=1, order='name desc')
-        last_att = att_obj.browse(cr, uid, att_id)
+        last_att = att_obj.browse(cr, uid, att_id, context=context)
         if last_att:
             last_att = last_att[0]
         cond = not last_att or last_att.action == 'sign_out'
@@ -113,8 +123,10 @@ class hr_sign_in_out(osv.osv_memory):
 
     def so_check(self, cr, uid, ids, context=None):
         obj_model = self.pool.get('ir.model.data')
-        data = self.read(cr, uid, ids, [])[0]
         att_obj = self.pool.get('hr.attendance')
+        if context is None:
+            context = {}
+        data = self.read(cr, uid, ids, [], context=context)[0]
         emp_id = data['emp_id']
         att_id = att_obj.search(cr, uid, [('employee_id', '=', emp_id),('action', '!=', 'action')], limit=1, order='name desc')
         last_att = att_obj.browse(cr, uid, att_id, context=context)
@@ -137,8 +149,8 @@ class hr_sign_in_out(osv.osv_memory):
         if cond:
             return self.sign_out(cr, uid, data, context)
         else:
-            model_data_ids = self.pool.get('ir.model.data').search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_hr_attendance_si_ask')], context=context)
-            resource_id = self.pool.get('ir.model.data').read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+            model_data_ids = att_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_hr_attendance_si_ask')], context=context)
+            resource_id = att_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
             return {
                 'name': _('Sign in / Sign out'),
                 'view_type': 'form',
@@ -150,12 +162,14 @@ class hr_sign_in_out(osv.osv_memory):
             }
 
     def sign_in(self, cr, uid, data, context=None):
+        if context is None:
+            context = {}
         emp_id = data['emp_id']
         if 'last_time' in data:
             if data['last_time'] > time.strftime('%Y-%m-%d %H:%M:%S'):
                 raise osv.except_osv(_('UserError'), _('The sign-out date must be in the past'))
             self.pool.get('hr.attendance').create(cr, uid, {'name': data['last_time'], 'action': 'sign_out',
-                'employee_id': emp_id})
+                'employee_id': emp_id}, context=context)
         try:
             success = self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_in')
         except:
@@ -163,11 +177,13 @@ class hr_sign_in_out(osv.osv_memory):
         return {} # To do: Return Success message
 
     def sign_out(self, cr, uid, data, context=None):
+        if context is None:
+            context = {}
         emp_id = data['emp_id']
         if 'last_time' in data:
             if data['last_time'] > time.strftime('%Y-%m-%d %H:%M:%S'):
                 raise osv.except_osv(_('UserError'), _('The Sign-in date must be in the past'))
-            self.pool.get('hr.attendance').create(cr, uid, {'name':data['last_time'], 'action':'sign_in',  'employee_id':emp_id})
+            self.pool.get('hr.attendance').create(cr, uid, {'name':data['last_time'], 'action':'sign_in',  'employee_id':emp_id}, context=context)
         try:
             success = self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_out')
         except:
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index 0d10ba0f248..7779a1db90d 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -36,6 +36,7 @@ system to store and search in your CV base.
     'depends': ['hr','survey','crm'],
     'update_xml': [
         'wizard/hr_recruitment_phonecall_view.xml',
+        'wizard/hr_recruitment_create_partner_job_view.xml',
         'hr_recruitment_view.xml',
         'hr_recruitment_menu.xml',
 #        'report_hr_recruitment_view.xml',
@@ -43,7 +44,6 @@ system to store and search in your CV base.
         'security/ir.model.access.csv',
         'board_hr_recruitment_statistical_view.xml',
         'report/hr_recruitment_report_view.xml',
-        'wizard/hr_recruitment_create_partner_job_view.xml',
      ],
     'init_xml': [
         'hr_recruitment_data.xml'
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 178fdbffb09..4297f8eb6c5 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -59,6 +59,19 @@ class hr_recruitment_stage(osv.osv):
     }
 hr_recruitment_stage()
 
+class hr_recruitment_degree(osv.osv):
+    """ Degree of HR Recruitment """
+    _name = "hr.recruitment.degree"
+    _description = "Degree of Recruitment"
+    _columns = {
+        'name': fields.char('Name', size=64, required=True, translate=True),
+        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of degrees."),
+    }
+    _defaults = {
+        'sequence': 1,
+    }
+hr_recruitment_degree()
+
 class hr_applicant(osv.osv, crm.crm_case):
     _name = "hr.applicant"
     _description = "Applicant"
@@ -88,6 +101,8 @@ class hr_applicant(osv.osv, crm.crm_case):
         # Applicant Columns
         'date_closed': fields.datetime('Closed', readonly=True),
         'date': fields.datetime('Date'),
+        'date_action': fields.date('Next Action Date'),
+        'title_action': fields.char('Next Action', size=64),
         'priority': fields.selection(AVAILABLE_PRIORITIES, 'Appreciation'),
         'job_id': fields.many2one('hr.job', 'Applied Job'),
         'salary_proposed': fields.float('Proposed Salary', help="Salary Proposed by the Organisation"),
@@ -96,7 +111,7 @@ class hr_applicant(osv.osv, crm.crm_case):
         'partner_name': fields.char("Applicant's Name", size=64),
         'partner_phone': fields.char('Phone', size=32),
         'partner_mobile': fields.char('Mobile', size=32),
-        'type_id': fields.many2one('crm.case.resource.type', 'Degree', domain="[('object_id.model', '=', 'hr.applicant')]"),
+        'type_id': fields.many2one('hr.recruitment.degree', 'Degree'),
         'department_id':fields.many2one('hr.department', 'Department'),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
         'survey' : fields.related('job_id', 'survey_id', type='many2one', relation='survey', string='Survey'),
@@ -237,7 +252,7 @@ class hr_applicant(osv.osv, crm.crm_case):
     def message_new(self, cr, uid, msg, context):
         """
         Automatically calls when new email message arrives
-        
+
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks
@@ -249,7 +264,7 @@ class hr_applicant(osv.osv, crm.crm_case):
         body = msg.get('body')
         msg_from = msg.get('from')
         priority = msg.get('priority')
-        
+
         vals = {
             'name': subject,
             'email_from': msg_from,
@@ -259,15 +274,15 @@ class hr_applicant(osv.osv, crm.crm_case):
         }
         if msg.get('priority', False):
             vals['priority'] = priority
-        
+
         res = mailgate_pool.get_partner(cr, uid, msg.get('from'))
         if res:
             vals.update(res)
         res = self.create(cr, uid, vals, context)
-        
+
         message = _('A Job Request created') + " '" + subject + "' " + _("from Mailgate.")
         self.log(cr, uid, res, message)
-        
+
         attachents = msg.get('attachments', [])
         for attactment in attachents or []:
             data_attach = {
@@ -283,16 +298,16 @@ class hr_applicant(osv.osv, crm.crm_case):
         return res
 
     def message_update(self, cr, uid, ids, vals={}, msg="", default_act='pending', context={}):
-        """ 
+        """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of update mail’s IDs 
+        @param ids: List of update mail’s IDs
         """
-        
+
         if isinstance(ids, (str, int, long)):
             ids = [ids]
-        
+
         msg_from = msg['from']
         vals.update({
             'description': msg['body']
@@ -312,7 +327,7 @@ class hr_applicant(osv.osv, crm.crm_case):
             if res and maps.get(res.group(1).lower(), False):
                 key = maps.get(res.group(1).lower())
                 vls[key] = res.group(2).lower()
-        
+
         vals.update(vls)
         res = self.write(cr, uid, ids, vals)
         return res
@@ -328,7 +343,7 @@ class hr_applicant(osv.osv, crm.crm_case):
             @param **args: Return Dictionary of Keyword Value
         """
         return True
-    
+
     def case_open(self, cr, uid, ids, *args):
         """
         @param self: The object pointer
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index 8a4ddb93428..aaa386356c5 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -17,17 +17,17 @@
 
         <!--    Resource(type_id)        -->
 
-    <record model="crm.case.resource.type" id="type_job1">
+    <record model="hr.recruitment.degree" id="degree_graduate">
         <field name="name">Graduate</field>
-        <field name="object_id" search="[('model','=','hr.applicant')]" model="ir.model"/>
+        <field name="sequence">1</field>
     </record>
-    <record model="crm.case.resource.type" id="type_job2">
+    <record model="hr.recruitment.degree" id="degree_licenced">
         <field name="name">Licenced</field>
-        <field name="object_id" search="[('model','=','hr.applicant')]" model="ir.model"/>
+        <field name="sequence">2</field>
     </record>
-    <record model="crm.case.resource.type" id="type_job3">
+    <record model="hr.recruitment.degree" id="degree_bac5">
         <field name="name"> > Bac +5</field>
-        <field name="object_id" search="[('model','=','hr.applicant')]" model="ir.model"/>
+        <field name="sequence">3</field>
     </record>
 
     <record model="hr.recruitment.stage" id="stage_job1">
diff --git a/addons/hr_recruitment/hr_recruitment_demo.xml b/addons/hr_recruitment/hr_recruitment_demo.xml
index 3eba3bc17de..52603d7b8fa 100644
--- a/addons/hr_recruitment/hr_recruitment_demo.xml
+++ b/addons/hr_recruitment/hr_recruitment_demo.xml
@@ -9,7 +9,7 @@
     <record id="hr_case_salesman0" model="hr.applicant">
         <field eval="time.strftime('%Y-%m-01 10:35:50')" name="date"/>
         <field eval="time.strftime('%Y-%m-03')" name="date_deadline"/>
-        <field name="type_id" ref="type_job1"/>
+        <field name="type_id" ref="degree_graduate"/>
         <field name="partner_id" ref="base.res_partner_asus"/>
         <field eval="'2'" name="priority"/>
         <field name="user_id" ref="base.user_root"/>
@@ -29,7 +29,7 @@
         <field name="partner_address_id" ref="base.res_partner_address_14"/>
         <field name="som" ref="base.som_fury"/>
         <field eval="time.strftime('%Y-%m-10 18:15:00')" name="date"/>
-        <field name="type_id" ref="type_job3"/>
+        <field name="type_id" ref="degree_bac5"/>
         <field name="partner_id" ref="base.res_partner_15"/>
         <field eval="'3'" name="priority"/>
         <field name="user_id" ref="base.user_root"/>
@@ -50,7 +50,7 @@
         <field name="som" ref="base.som_happy"/>
         <field eval="time.strftime('%Y-%m-15 16:10:00')" name="date"/>
         <field eval="time.strftime('%Y-%m-18')" name="date_deadline"/>
-        <field name="type_id" ref="type_job2"/>
+        <field name="type_id" ref="degree_licenced"/>
         <field name="partner_id" ref="base.res_partner_5"/>
         <field eval="'1'" name="priority"/>
         <field name="user_id" ref="base.user_root"/>
@@ -68,7 +68,7 @@
         <field eval="time.strftime('%Y-%m-25 16:25:52')" name="date"/>
         <field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
         <field name="categ_id" ref="categ_job2"/>
-        <field name="type_id" ref="type_job3"/>
+        <field name="type_id" ref="degree_bac5"/>
         <field name="partner_id" ref="base.res_partner_10"/>
         <field eval="'3'" name="priority"/>
         <field name="user_id" ref="base.user_root"/>
@@ -83,7 +83,7 @@
     <record id="hr_case_marketingjob0" model="hr.applicant">
         <field eval="time.strftime('%Y-%m-26 17:15:32')" name="date"/>
         <field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
-        <field name="type_id" ref="type_job2"/>
+        <field name="type_id" ref="degree_licenced"/>
         <field name="partner_id" ref="base.res_partner_11"/>
         <field eval="'4'" name="priority"/>
         <field name="user_id" ref="base.user_demo"/>
@@ -101,7 +101,7 @@
     <record id="hr_case_financejob0" model="hr.applicant">
         <field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
         <field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
-        <field name="type_id" ref="type_job2"/>
+        <field name="type_id" ref="degree_licenced"/>
         <field name="partner_id" ref="base.res_partner_11"/>
         <field eval="'4'" name="priority"/>
         <field name="user_id" ref="base.user_root"/>
@@ -121,7 +121,7 @@
         <field name="partner_address_id" ref="base.res_partner_address_14"/>
         <field name="som" ref="base.som_fury"/>
         <field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
-        <field name="type_id" ref="type_job3"/>
+        <field name="type_id" ref="degree_bac5"/>
         <field name="partner_id" ref="base.res_partner_15"/>
         <field eval="'3'" name="priority"/>
         <field name="user_id" ref="base.user_root"/>
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index 971423d45a7..ec6b719c973 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -7,9 +7,9 @@
      <record model="ir.actions.act_window" id="crm_case_categ0_act_job">
         <field name="name">Applicants</field>
         <field name="res_model">hr.applicant</field>
-        <field name="view_mode">tree,form,graph</field>
+        <field name="view_mode">tree,form,graph,calendar</field>
         <field name="view_id" ref="crm_case_tree_view_job"/>
-        <field name="context">{"search_default_user_id":uid}</field>
+        <field name="context">{"search_default_user_id":uid, 'search_default_current': 1}</field>
         <field name="search_view_id" ref="view_crm_case_jobs_filter"/>
 
     </record>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index b4b1a434700..6a622a09ddf 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -55,6 +55,8 @@
                 <field name="stage_id"/>
                 <button name="stage_previous" string="Previous" states="open,pending" type="object" icon="gtk-go-back"/>
                 <button name="stage_next" string="Next" states="open,pending" type="object" icon="gtk-go-forward"/>
+                <field name="title_action" invisible="context.get('invisible_next_action', True)"/>
+                <field name="date_action" invisible="context.get('invisible_next_date', True)"/>
                 <field name="survey" invisible="1"/>
                 <field name="response" invisible="1"/>
                 <field name="priority"/>
@@ -67,7 +69,6 @@
                 <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
                 <button name="case_close" string="Hired" states="open,draft,pending" type="object" icon="terp-partner"/>
                 <button name="case_cancel" string="Refused" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-
             </tree>
         </field>
     </record>
@@ -94,16 +95,23 @@
                     <field name="user_id"/>
                     <button name="action_print_survey" string="Print Interview" type="object" icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}"/>
                     <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant', 'cur_id' :active_id}" attrs="{'readonly':[('survey','=',False)]}" groups="base.group_extended"/>
+                    <newline/>
+					<field name="date_action"/>
+					<field name="title_action"/>
                 </group>
                 <notebook colspan="4">
                     <page string="Job Info">
-                        <group col="2" colspan="2">
-                            <separator colspan="2" string="Contact"/>
+                        <group col="3" colspan="2">
+                            <separator colspan="3" string="Contact"/>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" />
-                            <field name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
-                            <field name="email_from"/>
-                            <field name="partner_phone"/>
-                            <field name="partner_mobile"/>
+                            <button string="Create Partner"
+                                    name="%(action_hr_recruitment_partner_create)d"
+                                    icon="terp-mail-replied" type="action"/>
+                            <newline/>
+                            <field name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="3"/>
+                            <field name="email_from" colspan="3"/>
+                            <field name="partner_phone" colspan="3"/>
+                            <field name="partner_mobile" colspan="3"/>
                         </group>
                         <group col="2" colspan="2">
                             <separator colspan="2" string="Contract Data"/>
@@ -113,7 +121,8 @@
                         </group>
                         <group col="2" colspan="2">
                             <separator colspan="2" string="Qualification"/>
-                            <field name="type_id" domain="[('object_id.model', '=', 'hr.applicant')]"/>
+                            <!-- <field name="type_id" domain="[('object_id.model', '=', 'hr.applicant')]"/>-->
+                            <field name="type_id"/>
                             <field name="priority" string="Appreciation"/>
                             <field name="reference"/>
                         </group>
@@ -133,13 +142,13 @@
                             <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
                         </group>
                    </page>
-                   <page string="Internal Notes">
+                   <page string="Notes">
                        <field name="description" nolabel="1" colspan="4"/>
                    </page>
-                   <page string="History" groups="base.group_extended">
+<!--                <page string="History" groups="base.group_extended">
                        <field name="id"/>
                        <field name="active"/>
-                    </page>
+                    </page>  -->
                    <page string="Emails" groups="base.group_extended">
                        <group colspan="4">
                            <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
@@ -176,10 +185,13 @@
                                     icon="terp-mail-replied" type="action" />
                             </form>
                         </field>
-                       <button colspan="4" string="Send New Email"
+                       <button colspan="2" string="Send New Email"
                            name="%(crm.action_crm_send_mail)d"
                            context="{'mail':'new', 'model': 'hr.applicant'}"
                            icon="terp-mail-message-new" type="action" />
+                       <button colspan="2" string="Forward"
+                           name="%(crm.crm_lead_forward_to_partner_act)d"
+                           icon="terp-mail-forward" type="action" />
                  </page>
                 </notebook>
             </form>
@@ -210,6 +222,7 @@
                    domain="[('state','in',('draft','open'))]"
                    help="All new and in progress jobs"
                    default="1"
+                   name="current"
                />
                <filter icon="terp-document-new" string="New"
                    domain="[('state','=','draft')]"
@@ -224,10 +237,15 @@
                    help="Pending Jobs"
                />
                <separator orientation="vertical"/>
+               <filter icon="terp-check" string="Next Actions"
+                    context="{'invisible_next_action':False, 'invisible_next_date':False}"
+                    domain="[]"
+                    help="View Next Action and Date"/>
+               <separator orientation="vertical"/>
                <field name="partner_name"/>
                <field name="email_from"/>
                <field name="job_id" widget="selection"/>
-               <field name="user_id" widget="selection">
+               <field name="user_id">
                     <filter domain="[('user_id','=',False)]" help="Unassigned Recruitements" icon="terp-personal-" separator="1"/>
                </field>
                <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
@@ -254,6 +272,24 @@
         </field>
     </record>
 
+    <!-- CRM Lead Calendar View -->
+
+    <record model="ir.ui.view" id="hr_applicant_calendar_view">
+        <field name="name">Hr Applicants Calendar</field>
+        <field name="model">hr.applicant</field>
+        <field name="type">calendar</field>
+        <field name="priority" eval="2"/>
+        <field name="arch" type="xml">
+            <calendar string="Applicants"
+                date_start="date_action" color="user_id">
+                <field name="name" />
+                <field name="partner_name" />
+                <field name="stage_id" />
+            </calendar>
+        </field>
+    </record>
+
+
     # ------------------------------------------------------
     # HR Job
     # ------------------------------------------------------
@@ -321,5 +357,42 @@
         action="hr_recruitment_stage_act"
         sequence="1"/>
 
+<!-- Degree Tree View -->
+
+    <record model="ir.ui.view" id="hr_recruitment_degree_tree">
+        <field name="name">hr.recruitment.degree.tree</field>
+        <field name="model">hr.recruitment.degree</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Degree">
+                <field name="sequence" invisible="1"/>
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+
+<!-- Degree Form View -->
+
+    <record model="ir.ui.view" id="hr_recruitment_degree_form">
+        <field name="name">hr.recruitment.degree.form</field>
+        <field name="model">hr.recruitment.degree</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Degree">
+                    <field name="name" select="1"/>
+                    <field name="sequence"/>
+            </form>
+        </field>
+    </record>
+
+<!-- Degree Action -->
+
+    <record id="hr_recruitment_degree_action" model="ir.actions.act_window">
+        <field name="name">Degree</field>
+        <field name="res_model">hr.recruitment.degree</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="hr_recruitment_degree_tree"/>
+    </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 83fb9e6d9b0..3ebdfdf8a0f 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -60,7 +60,7 @@
 	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
 	                    help="Recruitment during last 7 days"/>
 	                <separator orientation="vertical"/>
-	                <filter string="Draft"
+	                <filter string="New"
                     	icon="terp-document-new"
                     	domain="[('state','=','draft')]"
                     	help = "Draft recruitment"/>
@@ -73,9 +73,9 @@
                    		domain="[('state','=','pending')]"
                    		help = "Pending recruitment"/>
   					<separator orientation="vertical"/>
-  					<field name="partner_id"/>
+  					<field name="job_id"/>
 					<field name="department_id" widget="selection"/>
-                    <field name="user_id" widget="selection">
+                    <field name="user_id">
                         <filter icon="terp-hr"
                             string="My Recruitment"
                             help="My Recruitment"
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
index 1eaaa2fefdd..63aaed34493 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
+++ b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
@@ -31,7 +31,7 @@
             <field name="target">new</field>
         </record>
 
-		<record model="ir.values" id="hr_recruitment_partner_create_values">
+	<!--	<record model="ir.values" id="hr_recruitment_partner_create_values">
             <field name="model_id" ref="model_hr_applicant" />
             <field name="object" eval="1" />
             <field name="name">Create Partner</field>
@@ -39,7 +39,7 @@
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_recruitment_partner_create'))" />
             <field name="key">action</field>
             <field name="model">hr.applicant</field>
-        </record>
+        </record> -->
 
 	</data>
 </openerp>
\ No newline at end of file
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index ea13dba89e6..ec6fbc2d1fc 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -47,7 +47,9 @@ class hr_analytic_timesheet(osv.osv):
         'partner_id': fields.related('account_id', 'partner_id', type='many2one', string='Partner Id', relation='account.analytic.account', store=True),
     }
 
-    def unlink(self, cr, uid, ids, context={}):
+    def unlink(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         toremove = {}
         for obj in self.browse(cr, uid, ids, context=context):
             toremove[obj.line_id.id] = True
@@ -55,7 +57,9 @@ class hr_analytic_timesheet(osv.osv):
         return super(hr_analytic_timesheet, self).unlink(cr, uid, ids, context=context)
 
 
-    def on_change_unit_amount(self, cr, uid, id, prod_id, unit_amount, unit, context={}):
+    def on_change_unit_amount(self, cr, uid, id, prod_id, unit_amount, unit, context=None):
+        if context is None:
+            context = {}
         res = {}
         if prod_id and unit_amount:
             # find company
@@ -63,9 +67,11 @@ class hr_analytic_timesheet(osv.osv):
             res = self.pool.get('account.analytic.line').on_change_unit_amount(cr, uid, id, prod_id, unit_amount, company_id, unit, context=context)
         return res
 
-    def _getEmployeeProduct(self, cr, uid, context={}):
+    def _getEmployeeProduct(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         emp_obj = self.pool.get('hr.employee')
-        emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))])
+        emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
         if emp_id:
             emp=emp_obj.browse(cr, uid, emp_id[0], context=context)
             if emp.product_id:
@@ -76,7 +82,7 @@ class hr_analytic_timesheet(osv.osv):
         emp_obj = self.pool.get('hr.employee')
         if context is None:
             context = {}
-        emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))])
+        emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
         if emp_id:
             emp=emp_obj.browse(cr, uid, emp_id[0], context=context)
             if emp.product_id:
@@ -87,7 +93,7 @@ class hr_analytic_timesheet(osv.osv):
         emp_obj = self.pool.get('hr.employee')
         if context is None:
             context = {}
-        emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))])
+        emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
         if emp_id:
             emp = emp_obj.browse(cr, uid, emp_id[0], context=context)
             if bool(emp.product_id):
@@ -102,7 +108,7 @@ class hr_analytic_timesheet(osv.osv):
         emp_obj = self.pool.get('hr.employee')
         if context is None:
             context = {}
-        emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))])
+        emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
         if emp_id:
             emp = emp_obj.browse(cr, uid, emp_id[0], context=context)
             if emp.journal_id:
@@ -129,7 +135,9 @@ class hr_analytic_timesheet(osv.osv):
                 return {'value':{},'warning':warning}
         return {'value':{}}
 
-    def create(self, cr, uid, vals, context={}):
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
         emp_obj = self.pool.get('hr.employee')
         emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
         ename = ''
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
index d2e9a54f836..4bcdb614e2f 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
@@ -33,6 +33,8 @@ class analytical_timesheet_employee(osv.osv_memory):
                 }
 
     def _get_user(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         return uid
 
     _defaults = {
@@ -42,6 +44,8 @@ class analytical_timesheet_employee(osv.osv_memory):
              }
 
     def print_report(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         data = self.read(cr, uid, ids, context=context)[0]
         datas = {
              'ids': [],
@@ -54,4 +58,5 @@ class analytical_timesheet_employee(osv.osv_memory):
             'datas': datas,
             }
 analytical_timesheet_employee()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users.py b/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
index f7358eca990..1f3bd0ddf74 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
@@ -39,6 +39,8 @@ class analytical_timesheet_employees(osv.osv_memory):
              }
 
     def print_report(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         data = self.read(cr, uid, ids, context=context)[0]
         datas = {
              'ids': [],
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
index 58bd24680dd..47645ce11c3 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
@@ -33,31 +33,37 @@ class hr_so_project(osv.osv_memory):
         'date': fields.datetime('Closing Date'),
         'analytic_amount': fields.float('Minimum Analytic Amount'),
         'name': fields.char('Employees name', size=32, required=True, readonly=True),
-        'state': fields.char('Current state', size=32, required=True, readonly=True),
+#        'state': fields.char('Current state', size=32, required=True, readonly=True),
+        'state': fields.related('emp_id', 'state', string='Current state', type='char', required=True, readonly=True),
         'server_date': fields.datetime('Current Date', required=True, readonly=True),
         'emp_id': fields.many2one('hr.employee', 'Employee ID')
                 }
-    
+
     def _get_empid(self, cr, uid, context=None):
         emp_obj = self.pool.get('hr.employee')
-        emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)])
-        if emp_id:
-            for employee in emp_obj.browse(cr, uid, emp_id):
-                return {'name': employee.name, 'state': employee.state, 'emp_id': emp_id[0], 'server_date':time.strftime('%Y-%m-%d %H:%M:%S')}
+        if context is None:
+            context = {}
+        emp_ids = emp_obj.search(cr, uid, [('user_id', '=', uid)], context=context)
+        if emp_ids:
+            for employee in emp_obj.browse(cr, uid, emp_ids, context=context):
+                return {'name': employee.name, 'state': employee.state, 'emp_id': emp_ids[0], 'server_date':time.strftime('%Y-%m-%d %H:%M:%S')}
 
-    def _get_empid2(self, cr, uid, context):
-        
-        res = self._get_empid(cr, uid, context)
+    def _get_empid2(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        res = self._get_empid(cr, uid, context=context)
         cr.execute('select name,action from hr_attendance where employee_id=%s order by name desc limit 1', (res['emp_id'],))
-                
+
         res['server_date'] = time.strftime('%Y-%m-%d %H:%M:%S')
         date_start = cr.fetchone()
-               
+
         if date_start:
             res['date_start'] = date_start[0]
         return res
 
     def default_get(self, cr, uid, fields_list, context=None):
+        if context is None:
+            context = {}
         res = super(hr_so_project, self).default_get(cr, uid, fields_list, context=context)
         res.update(self._get_empid2(cr, uid, context=context))
         return res
@@ -65,41 +71,44 @@ class hr_so_project(osv.osv_memory):
     def _write(self, cr, uid, data, emp_id, context=None):
         timesheet_obj = self.pool.get('hr.analytic.timesheet')
         emp_obj = self.pool.get('hr.employee')
+        if context is None:
+            context = {}
         hour = (time.mktime(time.strptime(data['date'] or time.strftime('%Y-%m-%d %H:%M:%S'), '%Y-%m-%d %H:%M:%S')) -
             time.mktime(time.strptime(data['date_start'], '%Y-%m-%d %H:%M:%S'))) / 3600.0
         minimum = data['analytic_amount']
         if minimum:
             hour = round(round((hour + minimum / 2) / minimum) * minimum, 2)
-        res = timesheet_obj.default_get(cr, uid, ['product_id','product_uom_id'])
-        
+        res = timesheet_obj.default_get(cr, uid, ['product_id','product_uom_id'], context=context)
+
         if not res['product_uom_id']:
             raise osv.except_osv(_('UserError'), _('No cost unit defined for this employee !'))
         up = timesheet_obj.on_change_unit_amount(cr, uid, False, res['product_id'], hour, res['product_uom_id'])['value']
-        
+
         res['name'] = data['info']
         res['account_id'] = data['account_id'].id
         res['unit_amount'] = hour
-        emp_journal = emp_obj.browse(cr, uid, emp_id, context).journal_id
+        emp_journal = emp_obj.browse(cr, uid, emp_id, context=context).journal_id
         res['journal_id'] = emp_journal and emp_journal.id or False
         res.update(up)
         up = timesheet_obj.on_change_account_id(cr, uid, [], res['account_id']).get('value', {})
         res.update(up)
         return timesheet_obj.create(cr, uid, res, context=context)
-    
+
     def sign_out_result_end(self, cr, uid, ids, context=None):
-        
+        if context is None:
+            context = {}
         emp_obj = self.pool.get('hr.employee')
-        
-        for data in self.browse(cr, uid, ids): 
+        for data in self.browse(cr, uid, ids, context=context):
             emp_id = data.emp_id.id
-            emp_obj.attendance_action_change(cr, uid, [emp_id], type='sign_out',dt=data.date)
+            emp_obj.attendance_action_change(cr, uid, [emp_id], type='sign_out', dt=data.date)
             self._write(cr, uid, data, emp_id, context=context)
         return {}
 
     def sign_out_result(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         emp_obj = self.pool.get('hr.employee')
-        
-        for data in self.browse(cr, uid, ids):
+        for data in self.browse(cr, uid, ids, context=context):
             emp_id = data.emp_id.id
             emp_obj.attendance_action_change(cr, uid, [emp_id], type='action', dt=data.date)
             self._write(cr, uid, data, emp_id, context=context)
@@ -108,7 +117,7 @@ class hr_so_project(osv.osv_memory):
 hr_so_project()
 
 class hr_si_project(osv.osv_memory):
-    
+
     _name = 'hr.sign.in.project'
     _description = 'Sign In By Project'
     _columns = {
@@ -117,9 +126,9 @@ class hr_si_project(osv.osv_memory):
         'date': fields.datetime('Starting Date'),
         'server_date': fields.datetime('Current Date',  readonly=True),
        # 'emp_id': fields.char('Employee ID', size=512, required=False),
-        'emp_id': fields.many2one('hr.employee', 'Employee ID') 
+        'emp_id': fields.many2one('hr.employee', 'Employee ID')
                 }
-    
+
     def view_init(self, cr, uid, fields, context=None):
         """
         This function checks for precondition before wizard executes
@@ -130,22 +139,25 @@ class hr_si_project(osv.osv_memory):
         @param context: A standard dictionary for contextual values
         """
         emp_obj = self.pool.get('hr.employee')
-        emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)])
+        if context is None:
+            context = {}
+        emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)], context=context)
         if not emp_id:
             raise osv.except_osv(_('UserError'), _('No employee defined for your user !'))
-        return False    
+        return False
 
     def check_state(self, cr, uid, ids, context=None):
-        
         obj_model = self.pool.get('ir.model.data')
+        if context is None:
+            context = {}
         emp_id = self.default_get(cr, uid, context)['emp_id']
         # get the latest action (sign_in or out) for this employee
         cr.execute('select action from hr_attendance where employee_id=%s and action in (\'sign_in\',\'sign_out\') order by name desc limit 1', (emp_id,))
         res = (cr.fetchone() or ('sign_out',))[0]
         in_out = res == 'sign_out' and 'out' or 'in'
         #TODO: invert sign_in et sign_out
-        model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_hr_timesheet_sign_%s' % in_out)])
-        resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])[0]['res_id']
+        model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_hr_timesheet_sign_%s' % in_out)], context=context)
+        resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
         return {
             'name': 'Sign in / Sign out',
             'view_type': 'form',
@@ -156,20 +168,24 @@ class hr_si_project(osv.osv_memory):
             'target': 'new'
         }
 
-    def sign_in_result(self, cr, uid, ids, context):
+    def sign_in_result(self, cr, uid, ids, context=None):
         emp_obj = self.pool.get('hr.employee')
-        for data in self.browse(cr, uid, ids, context):
+        if context is None:
+            context = {}
+        for data in self.browse(cr, uid, ids, context=context):
             emp_id = data.emp_id.id
             success = emp_obj.attendance_action_change(cr, uid, [emp_id], type = 'sign_in' ,dt=data.date or False)
         return {}
 
     def default_get(self, cr, uid, fields_list, context=None):
         res = super(hr_si_project, self).default_get(cr, uid, fields_list, context=context)
+        if context is None:
+            context = {}
         emp_obj = self.pool.get('hr.employee')
-        emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)])
-        if emp_id: 
-            for employee in emp_obj.browse(cr, uid, emp_id):
-                res.update({'emp_id': employee.name, 'state': employee.state, 'emp_id': emp_id[0], 'server_date':time.strftime('%Y-%m-%d %H:%M:%S')})
+        emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)], context=context)
+        if emp_id:
+            for employee in emp_obj.browse(cr, uid, emp_id, context=context):
+                res.update({'name': employee.name, 'state': employee.state, 'emp_id': emp_id[0], 'server_date':time.strftime('%Y-%m-%d %H:%M:%S')})
         return res
 
 hr_si_project()
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
index 9a77ae938f3..18e5e4f11df 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
@@ -70,11 +70,13 @@
 					    <field name="date_start"/>
 					    <field name="server_date"/>
 					    <separator string="Work done in the last period" colspan="4" />
-					    <field name="account_id" colspan="3"/>
-					    <field name="info" colspan="3"/>
+					    <field name="account_id" colspan="2"/>
+					    <field name="info" colspan="2"/>
 					    <field name="date"/>
 					    <label string="(Keep empty for current_time)" colspan="2"/>
-					    <field name="analytic_amount"/>                	</group>
+					    <field name="analytic_amount"/>
+					</group>
+					<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     	<button icon="gtk-ok" string="Change Work" name="sign_out_result" type="object"/>
diff --git a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml b/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml
index 7a7fbce1024..e54e95c3a17 100644
--- a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml
+++ b/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml
@@ -14,26 +14,26 @@
         <record id="board_hr_timesheet_invoice_form" model="ir.ui.view">
             <field name="name">board.hr.timesheet.invoice</field>
             <field name="model">board.board</field>
-             <field name="type">form</field>            
-            <field name="inherit_id" ref="account.board_account_form"/>              
+             <field name="type">form</field>
+            <field name="inherit_id" ref="account.board_account_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/hpaned/child1/action[@string='Draft Customer Invoices']" position="before">     
+                <xpath expr="/form/vpaned/child1/action[@string='Draft Customer Invoices']" position="before">
                     <action colspan="4" height="160" name="%(hr_timesheet_invoice.action_analytic_account_tree)d" string="Analytic accounts to close" width="510"/>
                     <action colspan="4" height="160" name="%(act_my_account)d" string="Accounts to invoice" width="510"/>
                 </xpath>
             </field>
         </record>
-        
+
         <!-- Need to merge in above view -->
         <record id="board_hr_timesheet_invoice_report_form1" model="ir.ui.view">
             <field name="name">board.hr.timesheet.invoice</field>
             <field name="model">board.board</field>
-             <field name="type">form</field>            
-            <field name="inherit_id" ref="account.board_account_form"/>              
+             <field name="type">form</field>
+            <field name="inherit_id" ref="account.board_account_form"/>
             <field name="arch" type="xml">
-                  <xpath expr="/form/hpaned/child2/action[@string='Aged receivables']" position="before">          
+                  <xpath expr="/form/vpaned/child2/group/action[@string='Aged receivables']" position="before">
                 <action colspan="4" height="220" name="%(action_account_analytic_line_to_invoice)d" string="Costs to invoice"/>
-                </xpath>  
+                </xpath>
             </field>
         </record>
     </data>