Merge lp:~kangol/openobject-server/6.0-context-report into lp:openobject-server/6.0

[Christophe Simonis (OpenERP)]

[Naresh(OpenERP) (nch-openerp)]

Hello Christophe,

if we talk about passing the missing context the merge proposal seems Good ! :)

But at the end you removed the 'internal_header' from the localcontext, doing so will not print the page number formatting on right top corner (page 1 out of 10) which is supposed to be printed when internal header is selected. The condition is needed here

if self.localcontext and not self.localcontext.get('internal_header',False):
    self.localcontext.pop('internal_header', None)

Thanks,

review: Needs Fixing

[Vo Minh Thu (thu)]

Naresh,

If there is *no* internal_header in the dict, remove it from the dict? This doesn't make any sense.

So we need to know when the internal_header is present and what is the complete behavior. The previous code never entered the if body (or it would have broke), so it seems the internal_header was always present in the dict with a non-False value. We need to know if we can assume the internal_header is always there.

[Naresh(OpenERP) (nch-openerp)]

Hello Thu,

Yes, the localcontext dict will always have the key 'internal_header' present with value True / False
depending on the report's parser 'header' argument. if you specify header = 'internal' or 'internal landscape' the key will have value as True else False. If its true You will see a different header format on the final output.
for eg:
report_sxw.report_sxw('report.account.aged_trial_balance', 'res.partner',
        'addons/account/report/account_aged_partner_balance.rml',parser=aged_trial_report, header="internal landscape")

The previous code do enters *IF* body if you print something there you will see the output(but only when you shut your server down dont know why:(

Thanks

Unmerged revisions

3433. By Christophe Simonis (OpenERP) on 2011-05-23

[FIX] report: correct context cleaning when render RML

3432. By Christophe Simonis (OpenERP) on 2011-05-23

[FIX] report: pass context when render RML

=== modified file 'bin/report/custom.py'
--- bin/report/custom.py	2010-09-23 10:01:45 +0000
+++ bin/report/custom.py	2011-05-23 09:14:23 +0000
@@ -340,7 +340,7 @@
                                      'addons/base/report/custom_new.xsl')))
         rml = etree.tostring(transform(new_doc))
 
-        self.obj = render.rml(rml)
+        self.obj = render.rml(rml, context)
         self.obj.render()
         return True
 
@@ -620,7 +620,7 @@
                                      'addons/base/report/custom_new.xsl')))
         rml = etree.tostring(transform(new_doc))
 
-        self.obj = render.rml(rml)
+        self.obj = render.rml(rml, context)
         self.obj.render()
         return True
 report_custom('report.custom')

=== modified file 'bin/report/interface.py'
--- bin/report/interface.py	2011-01-17 18:44:44 +0000
+++ bin/report/interface.py	2011-05-23 09:14:23 +0000
@@ -93,7 +93,7 @@
         report_xml_ids = ir_actions_report_xml_obj.search(cr, uid, [('report_name', '=', self.name[7:])], context=context)
         self.title = report_xml_ids and ir_actions_report_xml_obj.browse(cr,uid,report_xml_ids)[0].name or 'OpenERP Report'
         create_doc = self.generators[report_type]
-        pdf = create_doc(rml, title=self.title)
+        pdf = create_doc(rml, context, title=self.title)
         return (pdf, report_type)
 
     def create_xml(self, cr, uid, ids, datas, context=None):

=== modified file 'bin/report/printscreen/ps_form.py'
--- bin/report/printscreen/ps_form.py	2010-09-06 08:11:04 +0000
+++ bin/report/printscreen/ps_form.py	2011-05-23 09:14:23 +0000
@@ -127,7 +127,7 @@
                                      'addons/base/report/custom_new.xsl')))
         rml = etree.tostring(transform(new_doc))
 
-        self.obj = render.rml(rml, self.title)
+        self.obj = render.rml(rml, context, self.title)
         self.obj.render()
         return True
 report_printscreen_list('report.printscreen.form')

=== modified file 'bin/report/printscreen/ps_list.py'
--- bin/report/printscreen/ps_list.py	2010-10-11 09:37:09 +0000
+++ bin/report/printscreen/ps_list.py	2011-05-23 09:14:23 +0000
@@ -262,7 +262,7 @@
             etree.parse(os.path.join(tools.config['root_path'],
                                      'addons/base/report/custom_new.xsl')))
         rml = etree.tostring(transform(new_doc))
-        self.obj = render.rml(rml, title=self.title)
+        self.obj = render.rml(rml, context, title=self.title)
         self.obj.render()
         return True
 report_printscreen_list('report.printscreen.list')

=== 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-05-23 09:14:23 +0000
@@ -931,8 +931,8 @@
         self.doc_tmpl.addPageTemplates(self.page_templates)
 
     def render(self, node_stories):
-        if self.localcontext and not self.localcontext.get('internal_header',False):
-            del self.localcontext['internal_header']
+        if self.localcontext:
+            self.localcontext.pop('internal_header', None)
         fis = []
         r = _rml_flowable(self.doc,self.localcontext, images=self.images, path=self.path, title=self.title)
         story_cnt = 0