openerp-dev-web team mailing list archive

["apa \(Open ERP\)" <apa@xxxxxxxxxxx>]

apa (Open ERP) has proposed merging lp:~openerp-dev/openobject-server/report_server into lp:openobject-server.

Requested reviews:
  OpenERP Core Team (openerp)


Changed the 'trml2pdf.py' for printing multiple report with correct order of the page number.
Ex:
print multiple page with Sale Order,purchase order. 
-- 
https://code.launchpad.net/~openerp-dev/openobject-server/report_server/+merge/35374
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-server/report_server.

=== modified file 'bin/addons/base/res/res_company.py'
--- bin/addons/base/res/res_company.py	2010-08-24 12:47:00 +0000
+++ bin/addons/base/res/res_company.py	2010-09-14 08:39:53 +0000
@@ -203,7 +203,7 @@
         return """
 <header>
 <pageTemplate>
-    <frame id="first" x1="25" y1="25" width="1070" height="717"/>
+    <frame id="first" x1="22.0" y1="22.0" width="1080" height="700"/>
     <pageGraphics>
         <fill color="black"/>
         <stroke color="black"/>

=== modified file 'bin/report/render/rml2pdf/trml2pdf.py'
--- bin/report/render/rml2pdf/trml2pdf.py	2010-08-30 09:59:46 +0000
+++ bin/report/render/rml2pdf/trml2pdf.py	2010-09-14 08:39:53 +0000
@@ -64,7 +64,7 @@
             for style in node.findall('paraStyle'):
                 sname = style.get('name')
                 self.styles[sname] = self._para_style_update(style)
-            
+
                 self.styles_obj[sname] = reportlab.lib.styles.ParagraphStyle(sname, self.default_style["Normal"], **self.styles[sname])
 
             for variable in node.findall('initialize'):
@@ -809,6 +809,8 @@
             if story_cnt > 0:
                 fis.append(platypus.PageBreak())
             fis += r.render(node_story)
+            # Reset Page Number with new story tag
+            fis.append(PageReset())
             story_cnt += 1
         if self.localcontext:
             fis.append(PageCount())