diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py index b694b882ca9..91867143890 100644 --- a/addons/hr_holidays/hr_holidays.py +++ b/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() diff --git a/doc/cla/individual/lbaldi.md b/doc/cla/individual/lbaldi.md new file mode 100644 index 00000000000..22f9a22c90c --- /dev/null +++ b/doc/cla/individual/lbaldi.md @@ -0,0 +1,11 @@ +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 diff --git a/openerp/addons/base/res/res_currency.py b/openerp/addons/base/res/res_currency.py index 2517bbb316d..bb87426b21a 100644 --- a/openerp/addons/base/res/res_currency.py +++ b/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`. """