diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 43e6e1e91d5..14011a8cabd 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -188,40 +188,27 @@ class res_company(osv.osv):
tools.config['root_path'], '..', 'pixmaps', 'openerp-header.png'),
'rb') .read().encode('base64')
- def _get_header3(self,cr,uid,ids):
- return """
+ _header = """
-
+
- [[ formatLang(time.strftime("%Y-%m-%d"), date=True) ]] [[ time.strftime("%H:%M") ]]
+ [[ formatLang(time.strftime("%%Y-%%m-%%d"), date=True) ]] [[ time.strftime("%%H:%%M") ]]
- [[ company.partner_id.name ]]
+ [[ company.partner_id.name ]]
- 25 550 818 550
+ %s
-
-"""
- def _get_header2(self,cr,uid,ids):
- return """
-
-
-
-
-
-
-
- [[ formatLang(time.strftime("%Y-%m-%d"), date=True) ]] [[ time.strftime("%H:%M") ]]
-
- [[ company.partner_id.name ]]
-
- 1.0cm 28.1cm 20.1cm 28.1cm
-
-
+
"""
+
+ _header2 = _header % (539, 772, "1.0cm", "28.3cm", "11.1cm", "28.3cm", "1.0cm 28.1cm 20.1cm 28.1cm")
+
+ _header3 = _header % (786, 525, 25, 555, 440, 555, "25 550 818 550")
+
def _get_header(self,cr,uid,ids):
try :
header_file = tools.file_open(os.path.join('base', 'report', 'corporate_rml_header.rml'))
@@ -267,8 +254,8 @@ class res_company(osv.osv):
_defaults = {
'currency_id': _get_euro,
'rml_header':_get_header,
- 'rml_header2': _get_header2,
- 'rml_header3': _get_header3,
+ 'rml_header2': _header2,
+ 'rml_header3': _header3,
#'logo':_get_logo
}