[MERGE] forward port of branch saas-6 up to 0de30f40

addons/hr_holidays/hr_holidays.py

@@ -478,7 +478,7 @@ class hr_holidays(osv.osv):
         return True
 
     def holidays_cancel(self, cr, uid, ids, context=None):
-        for record in self.browse(cr, uid, ids):
+        for record in self.browse(cr, uid, ids, context=context):
             # Delete the meeting
             if record.meeting_id:
                 record.meeting_id.unlink()

doc/cla/individual/lbaldi.md

+Argentina, 19/05/2016
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Baldi Leandro baldileandro@gmail.com https://github.com/lbaldi

openerp/addons/base/res/res_currency.py

@@ -104,16 +104,6 @@ class res_currency(osv.osv):
         reads = self.read(cr, uid, ids, ['name','symbol'], context=context, load='_classic_write')
         return [(x['id'], tools.ustr(x['name'])) for x in reads]
 
-    def copy(self, cr, uid, id, default=None, context=None):
-        if context is None:
-            context = {}
-        if not default:
-            default = {}
-        default.update(name=_("%s (copy)")
-                       % (self.browse(cr, uid, id, context=context).name))
-        return super(res_currency, self).copy(
-            cr, uid, id, default=default, context=context)
-
     @api.v8
     def round(self, amount):
         """ Return `amount` rounded according to currency `self`. """