diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 795058c3ebd..efa14365d17 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -94,42 +94,29 @@ class report_xml(osv.osv):
     _sequence = 'ir_actions_id_seq'
     _columns = {
         'name': fields.char('Name', size=64, required=True, translate=True),
-        'type': fields.char('Report Type', size=32, required=True),
         'model': fields.char('Object', size=64, required=True),
-        'report_name': fields.char('Internal Name', size=64, required=True),
-        'report_xsl': fields.char('XSL path', size=256),
-        'report_xml': fields.char('XML path', size=256),
-        'report_rml': fields.char('RML path', size=256,
-            help="The .rml path of the file or NULL if the content is in report_rml_content"),
-        'report_sxw': fields.function(_report_sxw, method=True, type='char',
-            string='SXW path'),
-        'report_sxw_content_data': fields.binary('SXW content'),
-        'report_rml_content_data': fields.binary('RML content'),
-        'report_sxw_content': fields.function(_report_content,
-            fnct_inv=_report_content_inv, method=True,
-            type='binary', string='SXW content',),
-        'report_rml_content': fields.function(_report_content,
-            fnct_inv=_report_content_inv, method=True,
-            type='binary', string='RML content'),
-        'auto': fields.boolean('Automatic XSL:RML', required=True),
+        'type': fields.char('Action Type', size=32, required=True),
+        'report_name': fields.char('Service Name', size=64, required=True),
         'usage': fields.char('Action Usage', size=32),
-        'header': fields.boolean('Add RML header',
-            help="Add or not the coporate RML header"),
-        'multi': fields.boolean('On multiple doc.',
-            help="If set to true, the action will not be displayed on the right toolbar of a form view."),
-        'report_type': fields.selection([
-            ('pdf', 'pdf'),
-            ('html', 'html'),
-            ('raw', 'raw'),
-            ('sxw', 'sxw'),
-            ('txt', 'txt'),
-            ('odt', 'odt'),
-            ('html2html','HTML from HTML'),
-            ('mako2html','HTML from HTML(Mako)'),
-            ], string='Type', required=True),
+        'report_type': fields.selection([ ('pdf','pdf'), ('html','html'), ('raw','raw'), ('sxw','sxw'), ('txt','txt'), ('odt','odt'), ('html2html','HTML from HTML'), ('mako2html','HTML from Mako'), ], string='Report Type', required=True),
         'groups_id': fields.many2many('res.groups', 'res_groups_report_rel', 'uid', 'gid', 'Groups'),
+        'multi': fields.boolean('On multiple doc.', help="If set to true, the action will not be displayed on the right toolbar of a form view."),
         'attachment': fields.char('Save As Attachment Prefix', size=128, help='This is the filename of the attachment used to store the printing result. Keep empty to not save the printed reports. You can use a python expression with the object and time variables.'),
         'attachment_use': fields.boolean('Reload from Attachment', help='If you check this, then the second time the user prints with same attachment name, it returns the previous report.')
+        'auto': fields.boolean('Custom python parser', required=True),
+
+        'header': fields.boolean('Add RML header', help="Add or not the coporate RML header"),
+
+        'report_xsl': fields.char('XSL path', size=256),
+        'report_xml': fields.char('XML path', size=256, help=''),
+        'report_rml': fields.char('RML path', size=256, help="The .rml path of the file or NULL if the content is in report_rml_content"),
+        'report_sxw': fields.function(_report_sxw, method=True, type='char', string='SXW path'),
+
+        'report_sxw_content_data': fields.binary('SXW content'),
+        'report_rml_content_data': fields.binary('RML content'),
+        'report_sxw_content': fields.function(_report_content, fnct_inv=_report_content_inv, method=True, type='binary', string='SXW content',),
+        'report_rml_content': fields.function(_report_content, fnct_inv=_report_content_inv, method=True, type='binary', string='RML content'),
+
     }
     _defaults = {
         'type': lambda *a: 'ir.actions.report.xml',