diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index e48736d169e..7b0681fd661 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -139,8 +139,14 @@ class ir_actions_report_xml(osv.osv):
         'name': fields.char('Name', size=64, required=True, translate=True),
 
         'model': fields.char('Model', required=True),
-        'report_type': fields.char('Report Type', required=True, help="Report Type: qweb-html, qweb-pdf, custom"),
-        'report_name': fields.char('Service Name', required=True, help="URL of the report is /report/<service name>/<ids>"),
+        'report_type': fields.selection([('qweb-pdf', 'PDF'),
+                    ('qweb-html', 'HTML'),
+                    ('other', 'Other'),
+                    ('pdf', 'RML pdf (deprecated)'),
+                    ('sxw', 'RML sxw (deprecated)'),
+                    ('webkit', 'Webkit (deprecated)'),
+                    ], 'Report Type', required=True, help="PDF will use wkhtmltopdf to render html to pdf, HTML will directly show html, Other will force download the controller output keeping the MIME type."),
+        'report_name': fields.char('Controller Name', required=True, help="URL of the report will be /report/<controller name>/<ids>, the default controller also use this field to get the name of the qweb ir.ui.view to render. For RML reports, this is the LocalService name."),
         'groups_id': fields.many2many('res.groups', 'res_groups_report_rel', 'uid', 'gid', 'Groups'),
 
         # options
diff --git a/openerp/addons/base/ir/ir_actions.xml b/openerp/addons/base/ir/ir_actions.xml
index 0bc8c9906a8..77d7eb23e8c 100644
--- a/openerp/addons/base/ir/ir_actions.xml
+++ b/openerp/addons/base/ir/ir_actions.xml
@@ -62,16 +62,16 @@
                             <field name="report_name"/>
                         </group>
                         <group>
-                            <field name="attachment"/>
-                            <field name="attachment_use"/>
                             <field name="multi"/>
+                            <field name="attachment_use"/>
+                            <field name="attachment"/>
                         </group>
                     </group>
                     <notebook>
                         <page string="Security">
                             <field name="groups_id"/>
                         </page>
-                        <page string="RML Configuration">
+                        <page string="RML Configuration" attrs="{'invisible':[('report_type','not in',['pdf','sxw'])]}">
                             <group>
                                 <group string="RML Report">
                                     <field name="header"/>
@@ -113,7 +113,8 @@
                         filter_domain="['|', '|', '|', '|', ('name','ilike',self), ('model','ilike',self), ('type','ilike',self), ('report_name','ilike',self), ('report_type','ilike',self)]"
                         string="Report"/>
                     <group expand="0" string="Group By" colspan="4">
-                        <filter string="Report Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'report_type'}"/>
+                        <filter string="Report Type" domain="[]" context="{'group_by':'report_type'}"/>
+                        <filter string="Report Model" domain="[]" context="{'group_by':'model'}"/>
                     </group>
                 </search>
             </field>