From 1adb3de371949866acbb1225e3bc5cdbab2d2fac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Maes?= <jem@openerp.com>
Date: Tue, 30 Dec 2014 11:24:55 +0100
Subject: [PATCH 1/3] [FIX] mail : close #2250. If trying to send empty message
 in chatter, no other messages can be send wihtout refreshing page. Moving the
 flag_post allow sending a new message only when the previous one is
 sucessufully sent. If case of empty message, nothing will happen, and the
 chatter will not be blocked.

---
 addons/mail/static/src/js/mail.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 1f65058d4af..824a6397dff 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -700,8 +700,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);
                 }

From 5906f10436652eac4a9f5c5e0c746181a383f950 Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Fri, 19 Dec 2014 10:53:25 +0100
Subject: [PATCH 2/3] [FIX] hr_holidays: Add missing context check

Backport of ead3f03
Fixes #4341
---
 addons/hr_holidays/hr_holidays.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 38130149825..cdfc86b8539 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -95,6 +95,8 @@ class hr_holidays_status(osv.osv):
     def name_get(self, cr, uid, ids, context=None):
         if not ids:
             return []
+        if context is None:
+            context = {}
 
         if not context.get('employee_id',False):
             # leave counts is based on empoyee_id, would be inaccurate if not based on correct employee

From d80c0ff6472082e97ef387b801fbf9511fb8b3d7 Mon Sep 17 00:00:00 2001
From: fka-odoo <fka@openerp.com>
Date: Fri, 26 Dec 2014 10:57:00 +0530
Subject: [PATCH 3/3] [FIX] product: Product Label report did not display
 product

The name of the product was stripped from the product label report
Fixes #3138 (only blank entries)
---
 addons/product/report/product_label.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 @@
                         <barCode><xsl:value-of select="ean13" /></barCode> 
                     </td>
                     <td>
-                        <para style="nospace"><xsl:value-of select="substring(product, 1, pmaxChars)"/></para><xsl:text>, </xsl:text>
+                        <para style="nospace"><xsl:value-of select="substring(product, 1, $pmaxChars)"/></para><xsl:text>, </xsl:text>
                         <para style="nospace"><xsl:value-of select="variant"/></para>
                     </td>
                 </tr>