From 83a1255311f65e4596c20f25de8ec3d65464ebf9 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 27 Sep 2010 15:27:48 +0530
Subject: [PATCH] [IMP]:improved internal header and print pagecount without
 black square on the right of the page number

bzr revid: apa@tinyerp.com-20100927095748-9927u4i2y1rmmo9f
---
 bin/addons/base/res/res_company.py    | 6 +++---
 bin/report/render/rml2pdf/trml2pdf.py | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bin/addons/base/res/res_company.py b/bin/addons/base/res/res_company.py
index 1bc0f7372ee..2f0b567666e 100644
--- a/bin/addons/base/res/res_company.py
+++ b/bin/addons/base/res/res_company.py
@@ -212,8 +212,8 @@ class res_company(osv.osv):
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="490" y="725">[[ company.partner_id.name ]]</drawString>
         <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="1065" y="725"><pageNumber/>/  </drawRightString>
-        <drawString x="1065" y="725"><pageCount/></drawString>
+        <drawRightString x="1073" y="725"><pageNumber/>/  </drawRightString>
+        <drawString x="1073" y="725"><pageCount/></drawString>
         <stroke color="#000000"/>
         <lines>25 720 1085 720</lines>
     </pageGraphics>
@@ -233,7 +233,7 @@ class res_company(osv.osv):
         <drawString x="9.8cm" y="28.3cm">[[ company.partner_id.name ]]</drawString>
         <setFont name="DejaVu Sans" size="8"/>
         <drawRightString x="19.7cm" y="28.3cm"><pageNumber/> /  </drawRightString>
-        <drawString x="19.8cm" y="28.3cm"><pageCount/></drawString>
+        <drawString x="19.7cm" y="28.3cm"><pageCount/></drawString>
         <stroke color="#000000"/>
         <lines>1.3cm 28.1cm 20cm 28.1cm</lines>
         </pageGraphics>
diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index ca47423008b..be8cde09259 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -42,11 +42,12 @@ class PageCount(platypus.Flowable):
     def draw(self):
         self.canv.beginForm("pageCount")
         self.canv.setFont("Helvetica", utils.unit_get(str(8)))
-        self.canv.drawString(0, 0, str(self.canv.getPageNumber()))
+        self.canv.drawString(0, 0, str(self.canv._pageCount))
         self.canv.endForm()
 
 class PageReset(platypus.Flowable):
     def draw(self):
+        self.canv._pageCount = self.canv.getPageNumber()
         self.canv._pageNumber = 0
 
 class _rml_styles(object,):
@@ -261,7 +262,7 @@ class _rml_canvas(object):
             if n.tag == 'pageNumber':
                 rc += str(self.canvas.getPageNumber())
             rc += utils._process_text(self, n.tail)
-        return rc
+        return rc.replace(' ','').replace('\n','')
 
     def _drawString(self, node):
         v = utils.attr_get(node, ['x','y'])