From deea17ff25010ad6465c6c278081d33705c49ec5 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Wed, 23 Jan 2013 15:38:02 +0100 Subject: [PATCH] [FIX] base, res.company: fixed overlapping in company header when display_address() returns a 5 lines text (UK for example) bzr revid: qdp-launchpad@openerp.com-20130123143802-n9nbwm18xn6xh7z3 --- openerp/addons/base/res/res_company.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py index 6b90a612fb9..21c9b854ca3 100644 --- a/openerp/addons/base/res/res_company.py +++ b/openerp/addons/base/res/res_company.py @@ -318,7 +318,7 @@ class res_company(osv.osv): 1.3cm %s 20cm %s [[ company.rml_header1 ]] [[ company.partner_id.name ]] - + [[ display_address(company.partner_id) or '' ]] Phone: @@ -344,8 +344,8 @@ class res_company(osv.osv): """ - _header_a4 = _header_main % ('23.0cm', '27.6cm', '27.7cm', '27.7cm', '27.8cm', '27.4cm', '25.8cm', '26.0cm', '26.0cm', '25.6cm', '25.6cm', '25.5cm', '25.5cm') - _header_letter = _header_main % ('21.3cm', '25.9cm', '26.0cm', '26.0cm', '26.1cm', '25.7cm', '24.1cm', '24.3cm', '24.3cm', '23.9cm', '23.9cm', '23.8cm', '23.8cm') + _header_a4 = _header_main % ('23.0cm', '27.6cm', '27.7cm', '27.7cm', '27.8cm', '27.3cm', '25.3cm', '25.0cm', '25.0cm', '24.6cm', '24.6cm', '24.5cm', '24.5cm') + _header_letter = _header_main % ('21.3cm', '25.9cm', '26.0cm', '26.0cm', '26.1cm', '25.6cm', '23.6cm', '23.3cm', '23.3cm', '22.9cm', '22.9cm', '22.8cm', '22.8cm') def onchange_paper_format(self, cr, uid, ids, paper_format, context=None): if paper_format == 'us_letter':