[MERGE] OPW 383649

[odoo/odoo.git] / addons / hr / hr.py

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 113dc31..fd4826a 100644 (file)
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -28,7 +28,7 @@ class hr_employee_category(osv.osv):
     def name_get(self, cr, uid, ids, context=None):
         if not 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']
@@ -37,8 +37,8 @@ class hr_employee_category(osv.osv):
             res.append((record['id'], name))
         return res
 
-    def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context):
-        res = self.name_get(cr, uid, ids, context)
+    def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
+        res = self.name_get(cr, uid, ids, context=context)
         return dict(res)
 
     _name = "hr.employee.category"
@@ -70,7 +70,7 @@ class hr_employee_marital_status(osv.osv):
     _name = "hr.employee.marital.status"
     _description = "Employee Marital Status"
     _columns = {
-        'name': fields.char('Marital Status', size=32, required=True),
+        'name': fields.char('Marital Status', size=32, required=True, translate=True),
         'description': fields.text('Status Description'),
     }
 
@@ -80,13 +80,13 @@ class hr_job(osv.osv):
 
     def _no_of_employee(self, cr, uid, ids, name, args, context=None):
         res = {}
-        for job in self.browse(cr, uid, ids, context):
+        for job in self.browse(cr, uid, ids, context=context):
             res[job.id] = len(job.employee_ids or [])
         return res
 
     def _no_of_recruitement(self, cr, uid, ids, name, args, context=None):
         res = {}
-        for job in self.browse(cr, uid, ids, context):
+        for job in self.browse(cr, uid, ids, context=context):
             res[job.id] = job.expected_employees - job.no_of_employee
         return res
 
@@ -148,8 +148,9 @@ class hr_employee(osv.osv):
         'address_id': fields.many2one('res.partner.address', 'Working Address'),
         'address_home_id': fields.many2one('res.partner.address', 'Home Address'),
         'partner_id': fields.related('address_home_id', 'partner_id', type='many2one', relation='res.partner', readonly=True, help="Partner that is related to the current employee. Accounting transaction will be written on this partner belongs to employee."),
-        'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account', domain="[('partner_id','=',partner_id)]", help="Employee bank salary account"),
+        'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account Number', domain="[('partner_id','=',partner_id)]", help="Employee bank salary account"),
         'work_phone': fields.char('Work Phone', size=32, readonly=False),
+        'mobile_phone': fields.char('Mobile', size=32, readonly=False),
         'work_email': fields.char('Work E-mail', size=240),
         'work_location': fields.char('Office Location', size=32),
         'notes': fields.text('Notes'),
@@ -172,7 +173,7 @@ class hr_employee(osv.osv):
     def onchange_company(self, cr, uid, ids, company, context=None):
         address_id = False
         if company:
-            company_id = self.pool.get('res.company').browse(cr,uid,company)
+            company_id = self.pool.get('res.company').browse(cr, uid, company, context=context)
             address = self.pool.get('res.partner').address_get(cr, uid, [company_id.partner_id.id], ['default'])
             address_id = address and address['default'] or False
         return {'value': {'address_id' : address_id}}
@@ -180,7 +181,7 @@ class hr_employee(osv.osv):
     def onchange_user(self, cr, uid, ids, user_id, context=None):
         work_email = False
         if user_id:
-            work_email = self.pool.get('res.users').browse(cr, uid, user_id).user_email
+            work_email = self.pool.get('res.users').browse(cr, uid, user_id, context=context).user_email
         return {'value': {'work_email' : work_email}}
 
     def _get_photo(self, cr, uid, context=None):
@@ -190,7 +191,6 @@ class hr_employee(osv.osv):
     _defaults = {
         'active': 1,
         'photo': _get_photo,
-        'address_id': lambda self,cr,uid,c: self.pool.get('res.partner.address').browse(cr, uid, uid, c).partner_id.id
     }
 
     def _check_recursion(self, cr, uid, ids, context=None):
@@ -221,7 +221,7 @@ class hr_department(osv.osv):
     _inherit = 'hr.department'
     _columns = {
         'manager_id': fields.many2one('hr.employee', 'Manager'),
-        'member_ids': fields.one2many('hr.employee', 'department_id', 'Members'),
+        'member_ids': fields.one2many('hr.employee', 'department_id', 'Members', readonly=True),
     }
 
 hr_department()