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

[IMP]: Improvement in preview report function 

bzr revid: rpa@tinyerp.com-20110428115237-awuvi6fqhnnb03u9
This commit is contained in:
Rucha (Open ERP) 2011-04-28 17:22:37 +05:30
parent 3057ec29af
commit e8644a9e8b
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openerp/addons/base/base_update.xml
View File

@ -203,7 +203,6 @@
<field name="rml_footer1" colspan="4"/>
<field name="rml_footer2" colspan="4"/>
<field name="currency_id" colspan="2"/>
<button name="createReport" string="Preview Report" type="object" icon="gtk-print"/>
</page>
<page string="Header/Footer" groups="base.group_extended">
<field colspan="4" name="rml_header" nolabel="1"/>

11
openerp/addons/base/res/res_company.py
View File

@ -26,11 +26,10 @@ import tools
from tools.translate import _
from tools.safe_eval import safe_eval as eval
from lxml import etree
import tempfile
import pooler
import netsvc
from report.interface import report_rml
from tools import to_xml
from report import report_sxw
class multi_company_default(osv.osv):
@ -302,7 +301,7 @@ class res_company(osv.osv):
(osv.osv._check_recursion, 'Error! You can not create recursive companies.', ['parent_id'])
]
def createReport(self, cr, uid, ids, context=None):
def preview_report(self, cr, uid, ids, context=None):
# Used new cursor as it was closed explicitly somewhere and because of this partner data was not printed
# Tocheck: its not closed
cr = pooler.get_db(cr.dbname).cursor()
@ -312,6 +311,7 @@ class res_company(osv.osv):
def __init__(self, cr, uid, name, context):
super(company_parser, self).__init__(cr, uid, name, context=context)
self.setCompany(company)
rml = etree.XML(company.rml_header)
rml = rml.getchildren()[0]
header_xml = """<document filename="Preview Report.pdf">
@ -319,12 +319,14 @@ class res_company(osv.osv):
</template>
</document>
"""
tempfilename= '/tmp/previews.rml'
tempfileid, tempfilename= tempfile.mkstemp('.rml', 'openerp_')
fp = open(tempfilename, 'wb+')
fp.write(header_xml)
fp.close()
if netsvc.Service._services.get('report.company.report'):
netsvc.Service._services.pop('report.company.report')
myreport = report_sxw.report_sxw('report.company.report', 'res.company', tempfilename, parser=company_parser)
return {
'type': 'ir.actions.report.xml',
@ -339,3 +341,4 @@ res_company()