Merge lp:~openerp-dev/openobject-addons/trunk-bug-798739-mtr into lp:openobject-addons

[Meera Trambadia (OpenERP)]

hr_holidays:-Exception raised on confirmation of leave request is now translated in user's lang." --fixes=lp:798739

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

No need to initialize context={}. you can direct write context={'lang': lang}

And No need to check whether context is none or not as you are not using the context below code in check_holidays
+ if context is None:
+ context = {}

Thanks,
mra

review: Needs Fixing

[Meera Trambadia (OpenERP) (mtr-openerp)]

Hello sir,

I have made the changes as mentioned above.

Thanks,
mtr

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

I have improved the code to make generic method to get user lang in context.

Thanks,
mra

review: Approve

[tfr (Openerp) (tfr)]

Why create a function to get the lang of the res user when this value is already in the context, you just need to replace definition of method and pass the context :

def holidays_validate(self, cr, uid, ids, context=None):
       self.check_holidays(cr, uid, ids, context=context)

review: Needs Fixing

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

As passing context from workflow method does not work.

But after fixing the framework bug: https://bugs.launchpad.net/openobject-server/+bug/710533 workflow will pass the context.

So as per tfr suggestion we can use context now for workflow method instead of args.

Thanks tfr for review,
mra

[Meera Trambadia (OpenERP) (mtr-openerp)]

Hello sir,

I have passed context in the methods as suggested by you.

Thanks,
mtr

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

remove from methods
+ if context is None:
  + context = {}

we can only use it where we are fetching from context dictionary so keep it where its used.

review: Needs Fixing

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

+ <field name="date_from" on_change="onchange_date_from(date_to, date_from, context)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>

why you pass context in onchange ?

review: Needs Information

[Meera Trambadia (OpenERP) (mtr-openerp)]

Hello sir,

I have made changes as suggested by you.

Thanks,
mtr

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

[qdp (OpenERP) (qdp)]

I remove unneeded code in onchanges + optimized a little the refusal. The rest is unchanged and merged. Note that this will only work once the server will propagate the context through the workflow triggers (still planned for 6.1)

review: Approve

=== modified file 'hr_holidays/hr_holidays.py'
--- hr_holidays/hr_holidays.py	2011-07-08 09:22:32 +0000
+++ hr_holidays/hr_holidays.py	2011-09-16 05:14:25 +0000
@@ -161,7 +161,7 @@
         leave_ids = obj_res_leave.search(cr, uid, [('holiday_id', 'in', ids)], context=context)
         return obj_res_leave.unlink(cr, uid, leave_ids)
 
-    def onchange_type(self, cr, uid, ids, holiday_type):
+    def onchange_type(self, cr, uid, ids, holiday_type, context=None):
         result = {'value': {'employee_id': False}}
         if holiday_type == 'employee':
             ids_employee = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
@@ -172,7 +172,7 @@
         return result
 
     # TODO: can be improved using resource calendar method
-    def _get_number_of_days(self, date_from, date_to):
+    def _get_number_of_days(self, date_from, date_to, context=None):
         """Returns a float equals to the timedelta between two dates given as string."""
 
         DATETIME_FORMAT = "%Y-%m-%d %H:%M:%S"
@@ -188,10 +188,10 @@
                 raise osv.except_osv(_('Warning!'),_('You cannot delete a leave which is not in draft state !'))
         return super(hr_holidays, self).unlink(cr, uid, ids, context)
 
-    def onchange_date_from(self, cr, uid, ids, date_to, date_from):
+    def onchange_date_from(self, cr, uid, ids, date_to, date_from, context=None):
         result = {}
         if date_to and date_from:
-            diff_day = self._get_number_of_days(date_from, date_to)
+            diff_day = self._get_number_of_days(date_from, date_to, context=context)
             result['value'] = {
                 'number_of_days_temp': round(diff_day)+1
             }
@@ -212,7 +212,7 @@
                 }
         return {'warning': warning}
 
-    def set_to_draft(self, cr, uid, ids, *args):
+    def set_to_draft(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {
             'state': 'draft',
             'manager_id': False,
@@ -223,15 +223,15 @@
             wf_service.trg_create(uid, 'hr.holidays', id, cr)
         return True
 
-    def holidays_validate(self, cr, uid, ids, *args):
-        self.check_holidays(cr, uid, ids)
+    def holidays_validate(self, cr, uid, ids, context=None):
+        self.check_holidays(cr, uid, ids, context=context)
         obj_emp = self.pool.get('hr.employee')
         ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
         manager = ids2 and ids2[0] or False
         return self.write(cr, uid, ids, {'state':'validate1', 'manager_id': manager})
 
-    def holidays_validate2(self, cr, uid, ids, *args):
-        self.check_holidays(cr, uid, ids)
+    def holidays_validate2(self, cr, uid, ids, context=None):
+        self.check_holidays(cr, uid, ids, context=context)
         obj_emp = self.pool.get('hr.employee')
         ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
         manager = ids2 and ids2[0] or False
@@ -276,19 +276,19 @@
                     wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'second_validate', cr)
         return True
 
-    def holidays_confirm(self, cr, uid, ids, *args):
-        self.check_holidays(cr, uid, ids)
+    def holidays_confirm(self, cr, uid, ids, context=None):
+        self.check_holidays(cr, uid, ids, context=context)
         return self.write(cr, uid, ids, {'state':'confirm'})
 
-    def holidays_refuse(self, cr, uid, ids, *args):
+    def holidays_refuse(self, cr, uid, ids, context=None):
         obj_emp = self.pool.get('hr.employee')
         ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
         manager = ids2 and ids2[0] or False
         self.write(cr, uid, ids, {'state': 'refuse', 'manager_id2': manager})
-        self.holidays_cancel(cr, uid, ids)
+        self.holidays_cancel(cr, uid, ids, context=context)
         return True
 
-    def holidays_cancel(self, cr, uid, ids, *args):
+    def holidays_cancel(self, cr, uid, ids, context=None):
         obj_crm_meeting = self.pool.get('crm.meeting')
         for record in self.browse(cr, uid, ids):
             # Delete the meeting
@@ -302,7 +302,7 @@
 
         return True
 
-    def check_holidays(self, cr, uid, ids):
+    def check_holidays(self, cr, uid, ids, context=None):
         holi_status_obj = self.pool.get('hr.holidays.status')
         for record in self.browse(cr, uid, ids):
             if record.holiday_type == 'employee' and record.type == 'remove':