Merge lp:~openerp-dev/openobject-server/6.0-opw-17683-rgo into lp:openobject-server/6.0

[Ravi Gohil (OpenERP)]

Hello,

There was as issue with pageCount tag in .rml files, pageCount tag returns 0.

This fixes the issue. The solution has been back-ported from Trunk.

Thanks.

[Raphael Collet (OpenERP) (rco-openerp)]

There is no else case in the two last nested 'if' statements.
- Can 'results' be empty? What should we return in that case?
- What should the method do if not results[0][1] == 'pdf' ?

Otherwise it looks okay.

review: Needs Fixing

[lp:~openerp-dev/openobject-server/6.0-opw-17683-rgo]

3500. By Launchpad Translations on behalf of openerp on 2011-09-28

Launchpad automatic translations update.

3501. By Launchpad Translations on behalf of openerp on 2011-09-29

Launchpad automatic translations update.

3502. By Launchpad Translations on behalf of openerp on 2011-09-30

Launchpad automatic translations update.

3503. By Jay Vora (Serpent Consulting Services) on 2011-09-30

[FIX] call to fields_get should always go with context attached

3504. By Jay Vora (Serpent Consulting Services) on 2011-09-30

[MERGE] Merged Rifakat's branch for the fix of domain and context over Accounting/Customers/Customers menu

3505. By Raphael Collet (OpenERP) on 2011-09-30

[MERGE] opw 17657

3506. By Launchpad Translations on behalf of openerp on 2011-10-01

Launchpad automatic translations update.

3507. By Launchpad Translations on behalf of openerp on 2011-10-02

Launchpad automatic translations update.

3508. By Launchpad Translations on behalf of openerp on 2011-10-03

Launchpad automatic translations update.

3509. By Ravi Gohil (OpenERP) on 2011-10-03

[FIX] report: change the code by returning 'False' at the end of method body

Unmerged revisions

=== modified file 'bin/report/render/rml2pdf/trml2pdf.py'
--- bin/report/render/rml2pdf/trml2pdf.py	2011-05-04 09:50:00 +0000
+++ bin/report/render/rml2pdf/trml2pdf.py	2011-10-03 06:26:19 +0000
@@ -118,7 +118,7 @@
     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):
 
=== modified file 'bin/report/report_sxw.py'
--- bin/report/report_sxw.py	2011-06-27 10:25:37 +0000
+++ bin/report/report_sxw.py	2011-10-03 06:26:19 +0000
@@ -434,9 +434,9 @@
             context={}
         pool = pooler.get_pool(cr.dbname)
         attach = report_xml.attachment
+        results = []
         if attach:
             objs = self.getObjects(cr, uid, ids, context)
-            results = []
             for obj in objs:
                 aname = eval(attach, {'object':obj, 'time':time})
                 result = False
@@ -467,18 +467,24 @@
                         #TODO: should probably raise a proper osv_except instead, shouldn't we? see LP bug #325632
                         logging.getLogger('report').error('Could not create saved report attachment', exc_info=True)
                 results.append(result)
-            if results:
-                if results[0][1]=='pdf':
-                    from pyPdf import PdfFileWriter, PdfFileReader
-                    output = PdfFileWriter()
-                    for r in results:
-                        reader = PdfFileReader(cStringIO.StringIO(r[0]))
-                        for page in range(reader.getNumPages()):
-                            output.addPage(reader.getPage(page))
-                    s = cStringIO.StringIO()
-                    output.write(s)
-                    return s.getvalue(), results[0][1]
-        return self.create_single_pdf(cr, uid, ids, data, report_xml, context)
+        else:
+            for id in ids:
+                result = self.create_single_pdf(cr, uid, [id], data, report_xml, context)
+                if not result:
+                    return False
+                results.append(result)
+        if results:
+            if results[0][1] == 'pdf':
+                from pyPdf import PdfFileWriter, PdfFileReader
+                output = PdfFileWriter()
+                for r in results:
+                    reader = PdfFileReader(cStringIO.StringIO(r[0]))
+                    for page in range(reader.getNumPages()):
+                        output.addPage(reader.getPage(page))
+                s = cStringIO.StringIO()
+                output.write(s)
+                return s.getvalue(), results[0][1]
+        return False
 
     def create_single_pdf(self, cr, uid, ids, data, report_xml, context=None):
         if not context: