[MERGE] merge report branch

bzr revid: qdp-launchpad@tinyerp.com-20100916110150-gyl2l75ugeg2thcg

bin/addons/base/res/res_company.py

@@ -203,7 +203,7 @@ class res_company(osv.osv):
         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"/>

bin/report/render/rml2pdf/trml2pdf.py

@@ -64,7 +64,7 @@ class _rml_styles(object,):
             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 @@ class _rml_template(object):
             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())