diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py index 685bd7d9af5..c033a2b3ba4 100644 --- a/addons/hr_holidays/hr_holidays.py +++ b/addons/hr_holidays/hr_holidays.py @@ -90,6 +90,8 @@ class hr_holidays_status(osv.osv): } def name_get(self, cr, uid, ids, context=None): + if context is None: + context = {} if not context.get('employee_id',False): # leave counts is based on employee_id, would be inaccurate if not based on correct employee diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 5d7f6f0afbe..130aaa82d7c 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -655,8 +655,8 @@ openerp.mail = function (session) { if (self.flag_post) { return; } - self.flag_post = true; if (this.do_check_attachment_upload() && (this.attachment_ids.length || this.$('textarea').val().match(/\S+/))) { + self.flag_post = true; if (this.is_log) { this.do_send_message_post([], this.is_log); } diff --git a/addons/product/report/product_label.xsl b/addons/product/report/product_label.xsl index 30fe282b0c9..2fcc5d92d6f 100644 --- a/addons/product/report/product_label.xsl +++ b/addons/product/report/product_label.xsl @@ -77,7 +77,7 @@ - , + ,