From cb0074ab15efd5e98ca0472ec66a8a89fef42719 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 18 Dec 2013 12:24:16 +0100
Subject: [PATCH 1/2] [FIX] web: context propagation was broken on buttons of
 action and object type.

The context on the button must be propagated to the resulting action

bzr revid: dle@openerp.com-20131218112416-2vtaq442qo8opq4u
---
 addons/web/static/src/js/views.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 1d7ed406378..c9584002472 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1364,10 +1364,11 @@ instance.web.View = instance.web.Widget.extend({
                 // Wrong default_* and search_default_* values will no give the expected result
                 // Wrong group_by values will simply fail and forbid rendering of the destination view
                 var ncontext = new instance.web.CompoundContext(
-                    _.object(_.reject(_.pairs(context.eval()), function(pair) {
+                    _.object(_.reject(_.pairs(dataset.get_context().eval()), function(pair) {
                       return pair[0].match('^(?:(?:default_|search_default_).+|group_by|group_by_no_leaf|active_id|active_ids)$') !== null;
                     }))
                 );
+                ncontext.add(action_data.context || {});
                 ncontext.add({active_model: dataset.model});
                 if (record_id) {
                     ncontext.add({

From 44006349afc1961e1e53e1f57c858aaa56c1bcfa Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 18 Dec 2013 13:31:30 +0100
Subject: [PATCH 2/2] [FIX] base: size of partner address labels, according to
 standard 24 labels per page

bzr revid: dle@openerp.com-20131218123130-vlejjv7r2klkzoj0
---
 .../addons/base/res/report/partner_address.xsl   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/openerp/addons/base/res/report/partner_address.xsl b/openerp/addons/base/res/report/partner_address.xsl
index ca212f2d2b0..83fb709e356 100644
--- a/openerp/addons/base/res/report/partner_address.xsl
+++ b/openerp/addons/base/res/report/partner_address.xsl
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
-	<xsl:variable name="initial_bottom_pos">20.5</xsl:variable>
-	<xsl:variable name="initial_left_pos">1</xsl:variable>
-	<xsl:variable name="height_increment">6.5</xsl:variable>
-	<xsl:variable name="width_increment">10</xsl:variable>
-	<xsl:variable name="frame_height">5.5cm</xsl:variable>
-	<xsl:variable name="frame_width">10cm</xsl:variable>
-	<xsl:variable name="number_columns">2</xsl:variable>
-	<xsl:variable name="max_frames">8</xsl:variable>
+	<xsl:variable name="initial_bottom_pos">24.5</xsl:variable>
+	<xsl:variable name="initial_left_pos">0.5</xsl:variable>
+	<xsl:variable name="height_increment">3.5</xsl:variable>
+	<xsl:variable name="width_increment">7</xsl:variable>
+	<xsl:variable name="frame_height">3.7cm</xsl:variable>
+	<xsl:variable name="frame_width">7cm</xsl:variable>
+	<xsl:variable name="number_columns">3</xsl:variable>
+	<xsl:variable name="max_frames">24</xsl:variable>
 
 	<xsl:template match="/">
 		<xsl:apply-templates select="addresses"/>