[IMP]:improved internal header for pagereset
authorapa-tiny <apa@tinyerp.com>
Mon, 27 Sep 2010 11:28:25 +0000 (16:58 +0530)
committerapa-tiny <apa@tinyerp.com>
Mon, 27 Sep 2010 11:28:25 +0000 (16:58 +0530)
bzr revid: apa@tinyerp.com-20100927112825-t8f7vkdut97fnfcv

bin/report/render/rml2pdf/trml2pdf.py

index 30df7b6..c7ffc96 100644 (file)
@@ -42,12 +42,11 @@ 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._pageCount))
+        self.canv.drawString(0, 0, str(self.canv.getPageNumber()))
         self.canv.endForm()
 
 class PageReset(platypus.Flowable):
     def draw(self):
-        self.canv._pageCount = self.canv.getPageNumber()
         self.canv._pageNumber = 0
 
 class _rml_styles(object,):
@@ -811,7 +810,8 @@ class _rml_template(object):
                 fis.append(platypus.PageBreak())
             fis += r.render(node_story)
             # Reset Page Number with new story tag
-            fis.append(PageReset())
+            if self.localcontext.has_key('active_ids') and len(self.localcontext.get('active_ids')) > 1:
+                fis.append(PageReset())
             story_cnt += 1
         if self.localcontext:
             fis.append(PageCount())