From d2846ba983c8cf08fd77f54511bdf23ccfce6e7e Mon Sep 17 00:00:00 2001
From: nel <>
Date: Wed, 2 Jul 2008 12:25:13 +0000
Subject: [PATCH] headers(internal and external) modified Sale Order customized
bzr revid: nel-81c25dff5b798183bab0429267e6bd9c585bd35a
---
bin/addons/base/res/res_company.py | 66 ++++++++++++++++--------------
1 file changed, 36 insertions(+), 30 deletions(-)
diff --git a/bin/addons/base/res/res_company.py b/bin/addons/base/res/res_company.py
index e0c13d6c256..35031e0f963 100644
--- a/bin/addons/base/res/res_company.py
+++ b/bin/addons/base/res/res_company.py
@@ -111,51 +111,57 @@ class res_company(osv.osv):
return True
def _get_header2(self,cr,uid,ids):
- return """
-
-
+ return """
+
+
+
-
-
-
- [[ company.partner_id.name ]]
- 1cm 27.7cm 20cm 27.7cm
- /
-
+
+
+
+
+
+ [[ formatLang(time.strftime("%Y-%m-%d"), date=True) ]] [[ time.strftime("%H:%M") ]]
+
+ [[ company.partner_id.name ]]
+
+ /
+
+
+
+ 1cm 28.1cm 20cm 28.1cm
-
+
"""
def _get_header(self,cr,uid,ids):
try :
return tools.file_open('custom/corporate_rml_header.rml').read()
except:
- return """
+ return """
+
-
+
-
-
- [[company.logo]]
-
-
+
+ [[company.logo]]
-
- 1cm 27.1cm 20cm 27.1cm
+
+ 1cm 27.7cm 20cm 27.7cm
-
- [[ company.rml_header1 ]]
+
+ [[ company.rml_header1 ]]
- [[ company.partner_id.name ]]
- [[ company.partner_id.address and company.partner_id.address[0].street ]]
- [[ company.partner_id.address and company.partner_id.address[0].zip ]] [[ company.partner_id.address and company.partner_id.address[0].city ]] - [[ company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name ]]
- Phone:
- [[ company.partner_id.address and company.partner_id.address[0].phone ]]
- Mail:
- [[ company.partner_id.address and company.partner_id.address[0].email ]]
- 1cm 25.3cm 20cm 25.3cm
+ [[ company.partner_id.name ]]
+ [[ company.partner_id.address and company.partner_id.address[0].street ]]
+ [[ company.partner_id.address and company.partner_id.address[0].zip ]] [[ company.partner_id.address and company.partner_id.address[0].city ]] - [[ company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name ]]
+ Phone:
+ [[ company.partner_id.address and company.partner_id.address[0].phone ]]
+ Mail:
+ [[ company.partner_id.address and company.partner_id.address[0].email ]]
+ 1cm 25.5cm 7cm 25.5cm