diff options
| author | bhumi195 <bhumi195@gmail.com> | 2008-11-15 11:44:55 +0530 |
|---|---|---|
| committer | bhumi195 <bhumi195@gmail.com> | 2008-11-15 11:44:55 +0530 |
| commit | ec3fba4e2f35e1e7f155cf0ea2a4c76698205db7 (patch) | |
| tree | ed37e40847d2f3b93ca34dd21e705446bebdea1a | |
| parent | 6c92455cd787ff0f1274ffba49480b96a90ce40b (diff) | |
bug fix :
1. now it will print title of the report where pagegraphic tag not used
2. report title now also print on the report in menu
bzr revid: bhumi195@gmail.com-20081115061455-ckmw8whckz0lpcrp
| -rw-r--r-- | bin/report/render/rml2pdf/trml2pdf.py | 5 | ||||
| -rw-r--r-- | bin/report/report_sxw.py | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py index e5c615f82fe..2d6fd6ed1ae 100644 --- a/bin/report/render/rml2pdf/trml2pdf.py +++ b/bin/report/render/rml2pdf/trml2pdf.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- ############################################################################## # -# OpenERP, Open Source Management Solution +# OpenERP, Open Source Management Solution # Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved # $Id$ # @@ -769,7 +769,8 @@ class _rml_template(object): drw = _rml_draw(gr[0], self.doc, images=images, path=self.path, title=self.title) self.page_templates.append( platypus.PageTemplate(frames=frames, onPage=drw.render, **utils.attr_get(pt, [], {'id':'str'}) )) else: - self.page_templates.append( platypus.PageTemplate(frames=frames, **utils.attr_get(pt, [], {'id':'str'}) )) + drw = _rml_draw(node,self.doc,title=self.title) + self.page_templates.append( platypus.PageTemplate(frames=frames,onPage=drw.render, **utils.attr_get(pt, [], {'id':'str'}) )) self.doc_tmpl.addPageTemplates(self.page_templates) def render(self, node_stories): diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py index 9c6981570e7..203eca102c8 100644 --- a/bin/report/report_sxw.py +++ b/bin/report/report_sxw.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- ############################################################################## # -# OpenERP, Open Source Management Solution +# OpenERP, Open Source Management Solution # Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved # $Id$ # @@ -579,6 +579,13 @@ class report_sxw(report_rml): rml = report_xml.report_rml_content report_type = report_xml.report_type else: + ir_menu_report_obj = pool.get('ir.ui.menu') + report_menu_ids = ir_menu_report_obj.search(cr, uid, + [('id', '=', ids)], context=context) + if report_menu_ids: + report_name = ir_menu_report_obj.browse(cr, uid, report_menu_ids[0], + context=context) + title = report_name.name rml = tools.file_open(self.tmpl, subdir=None).read() report_type= data.get('report_type', report_type) |