* Added relaxng rule for button in tree view

* Improved report_sxw.py to use other model then active one

bzr revid: fabian@tinyerp.com-20081211174628-m6dr3wdal9ntrpff

diff --git a/bin/addons/base/rng/view.rng b/bin/addons/base/rng/view.rng
index 717ce00..a02a3f3 100644 (file)
--- a/bin/addons/base/rng/view.rng
+++ b/bin/addons/base/rng/view.rng
@@ -41,6 +41,7 @@
                     <rng:ref name="field"/>
                     <rng:ref name="separator"/>
                     <rng:ref name="tree"/>
+                    <rng:ref name="button"/>
                     <rng:ref name="group"/>
                     <rng:element name="newline"><rng:empty/></rng:element>
                 </rng:choice>

diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index ddf0393..416db51 100644 (file)
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -610,6 +610,7 @@ class report_sxw(report_rml):
             attach = report_xml.attachment
             rml = report_xml.report_rml_content
             report_type = report_xml.report_type
+            context['actual_model']=report_xml.actual_model
         else:
             ir_menu_report_obj = pool.get('ir.ui.menu')
             report_menu_ids = ir_menu_report_obj.search(cr, uid,