Ravi Gohil (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/6.0-opw-17683-rgo into
lp:openobject-server/6.0.
Requested reviews:
Raphael Collet (OpenERP) (rco-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/6.0-opw-17683-rgo/+merge/77108
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.
--
https://code.launchpad.net/~openerp-dev/openobject-server/6.0-opw-17683-rgo/+merge/77108
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/6.0-opw-17683-rgo.
=== 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-09-27 07:29:56 +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-09-27 07:29:56 +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,23 @@
#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]
def create_single_pdf(self, cr, uid, ids, data, report_xml, context=None):
if not context:
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
