odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Merge 

bzr revid: stephane@tinyerp.com-20081115090709-nm34cwp6auar1gvx
This commit is contained in:
Stephane Wirtel 2008-11-15 10:07:09 +01:00
parent b71edc84a3 ec3fba4e2f
commit 235032e4fc
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/report/render/rml2pdf/trml2pdf.py
View File

@ -1,7 +1,7 @@
# -*- encoding: utf-8 -*- # -*- 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 # Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$ # $Id$
# #
@ -769,7 +769,8 @@ class _rml_template(object):
drw = _rml_draw(gr[0], self.doc, images=images, path=self.path, title=self.title) 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'}) )) self.page_templates.append( platypus.PageTemplate(frames=frames, onPage=drw.render, **utils.attr_get(pt, [], {'id':'str'}) ))
else: 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) self.doc_tmpl.addPageTemplates(self.page_templates)
def render(self, node_stories): def render(self, node_stories):

9
bin/report/report_sxw.py
View File

@ -1,7 +1,7 @@
# -*- encoding: utf-8 -*- # -*- 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 # Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$ # $Id$
# #
@ -579,6 +579,13 @@ class report_sxw(report_rml):
rml = report_xml.report_rml_content rml = report_xml.report_rml_content
report_type = report_xml.report_type report_type = report_xml.report_type
else: 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() rml = tools.file_open(self.tmpl, subdir=None).read()
report_type= data.get('report_type', report_type) report_type= data.get('report_type', report_type)