[IMP] adaptto upstream changes

database_cleanup/view/purge_columns.xml

@@ -35,19 +35,7 @@
             <field name="type">ir.actions.server</field>
             <field name="state">code</field>
             <field name="model_id" ref="database_cleanup.model_cleanup_purge_wizard_column" />
-            <field name="code">
-wizard_id = self.create(cr, uid, {}, context=context)
-action = {
-    'type': 'ir.actions.act_window',
-    'views': [(False, 'form')],
-    'res_model': 'cleanup.purge.wizard.column',
-    'res_id': wizard_id,
-    'flags': {
-        'action_buttons': False,
-        'sidebar': False,
-    },
-}
-            </field>
+            <field name="code">action = self.get_wizard_action(cr, uid, context=context)</field>
         </record>
 
         <record id="purge_column_line_tree" model="ir.ui.view">
@@ -69,9 +57,7 @@ action = {
             <field name="type">ir.actions.server</field>
             <field name="state">code</field>
             <field name="model_id" ref="database_cleanup.model_cleanup_purge_line_column" />
-            <field name="code">
-self.purge(cr, uid, context.get('active_ids', []), context)
-            </field>
+            <field name="code">self.purge(cr, uid, context.get('active_ids', []), context)</field>
         </record>
 
         <record id="action_purge_column_line_value" model="ir.values">

database_cleanup/view/purge_data.xml

@@ -35,19 +35,7 @@
             <field name="type">ir.actions.server</field>
             <field name="state">code</field>
             <field name="model_id" ref="database_cleanup.model_cleanup_purge_wizard_data" />
-            <field name="code">
-wizard_id = self.create(cr, uid, {}, context=context)
-action = {
-    'type': 'ir.actions.act_window',
-    'views': [(False, 'form')],
-    'res_model': 'cleanup.purge.wizard.data',
-    'res_id': wizard_id,
-    'flags': {
-        'action_buttons': False,
-        'sidebar': False,
-    },
-}
-            </field>
+            <field name="code">action = self.get_wizard_action(cr, uid, context=context)</field>
         </record>
 
         <record id="purge_data_line_tree" model="ir.ui.view">
@@ -69,9 +57,7 @@ action = {
             <field name="type">ir.actions.server</field>
             <field name="state">code</field>
             <field name="model_id" ref="database_cleanup.model_cleanup_purge_line_data" />
-            <field name="code">
-self.purge(cr, uid, context.get('active_ids', []), context)
-            </field>
+            <field name="code">self.purge(cr, uid, context.get('active_ids', []), context)</field>
         </record>
 
         <record id="action_purge_data_line_value" model="ir.values">

database_cleanup/view/purge_menus.xml

@@ -10,18 +10,24 @@
                         <field name="name"/>
                     </h1>
                     <button type="object" name="purge_all" string="Purge all menus" />
+                    <button type="object" name="select_lines" string="Select lines" />
                     <field name="purge_line_ids">
-                        <tree>
-                            <field name="name" />
-                            <field name="purged" invisible="0" />
-                            <button type="object" name="purge"
-                                    icon="gtk-cancel" string="Purge this model"
+                        <form>
+                            <group>
+                                <field name="name" />
+                                <field name="purged" invisible="0" />
+                            </group>
+                            <footer>
+                                <button type="object" name="purge"
+                                    icon="gtk-cancel" string="Purge this menu"
                                     attrs="{'invisible': [('purged', '=', True)]}"/>
-                        </tree>
+                            </footer>
+                        </form>
                     </field>
                 </form>
             </field>
         </record>
+
         <record id="action_purge_menus" model="ir.actions.server">
             <field name="name">Purge menus</field>
             <field name="type">ir.actions.server</field>
@@ -29,5 +35,35 @@
             <field name="model_id" ref="database_cleanup.model_cleanup_purge_wizard_menu" />
             <field name="code">action = self.get_wizard_action(cr, uid, context=context)</field>
         </record>
+
+        <record id="purge_menu_line_tree" model="ir.ui.view">
+            <field name="model">cleanup.purge.line.menu</field>
+            <field name="arch" type="xml">
+                <tree>
+                    <field name="name" />
+                    <field name="purged" invisible="0" />
+                    <button type="object" name="purge"
+                        icon="gtk-cancel" string="Purge this model"
+                        attrs="{'invisible': [('purged', '=', True)]}"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="action_purge_menu_line" model="ir.actions.server">
+            <field name="name">Purge</field>
+            <field name="type">ir.actions.server</field>
+            <field name="state">code</field>
+            <field name="model_id" ref="database_cleanup.model_cleanup_purge_line_menu" />
+            <field name="code">self.purge(cr, uid, context.get('active_ids', []), context)</field>
+        </record>
+
+        <record id="action_purge_menu_line_value" model="ir.values">
+            <field name="name">Purge</field>
+            <field name="key">action</field>
+            <field name="key2">client_action_multi</field>
+            <field name="model">cleanup.purge.line.menu</field>
+            <field name="value" eval="'ir.actions.server,%d' % ref('database_cleanup.action_purge_menu_line')" />
+        </record>
+
     </data>
 </openerp>

database_cleanup/view/purge_models.xml

@@ -34,19 +34,7 @@
             <field name="type">ir.actions.server</field>
             <field name="state">code</field>
             <field name="model_id" ref="database_cleanup.model_cleanup_purge_wizard_model" />
-            <field name="code">
-wizard_id = self.create(cr, uid, {}, context=context)
-action = {
-    'type': 'ir.actions.act_window',
-    'views': [(False, 'form')],
-    'res_model': 'cleanup.purge.wizard.model',
-    'res_id': wizard_id,
-    'flags': {
-        'action_buttons': False,
-        'sidebar': False,
-    },
-}
-            </field>
+            <field name="code">action = self.get_wizard_action(cr, uid, context=context)</field>
         </record>
 
         <record id="purge_model_line_tree" model="ir.ui.view">
@@ -67,9 +55,7 @@ action = {
             <field name="type">ir.actions.server</field>
             <field name="state">code</field>
             <field name="model_id" ref="database_cleanup.model_cleanup_purge_line_model" />
-            <field name="code">
-self.purge(cr, uid, context.get('active_ids', []), context)
-            </field>
+            <field name="code">self.purge(cr, uid, context.get('active_ids', []), context)</field>
         </record>
 
         <record id="action_purge_model_line_value" model="ir.values">

database_cleanup/view/purge_modules.xml

@@ -34,19 +34,7 @@
             <field name="type">ir.actions.server</field>
             <field name="state">code</field>
             <field name="model_id" ref="database_cleanup.model_cleanup_purge_wizard_module" />
-            <field name="code">
-wizard_id = self.create(cr, uid, {}, context=context)
-action = {
-    'type': 'ir.actions.act_window',
-    'views': [(False, 'form')],
-    'res_model': 'cleanup.purge.wizard.module',
-    'res_id': wizard_id,
-    'flags': {
-        'action_buttons': False,
-        'sidebar': False,
-    },
-}
-            </field>
+            <field name="code">action = self.get_wizard_action(cr, uid, context=context)</field>
         </record>
 
         <record id="purge_module_line_tree" model="ir.ui.view">
@@ -67,9 +55,7 @@ action = {
             <field name="type">ir.actions.server</field>
             <field name="state">code</field>
             <field name="model_id" ref="database_cleanup.model_cleanup_purge_line_module" />
-            <field name="code">
-self.purge(cr, uid, context.get('active_ids', []), context)
-            </field>
+            <field name="code">self.purge(cr, uid, context.get('active_ids', []), context)</field>
         </record>
 
         <record id="action_purge_module_line_value" model="ir.values">

database_cleanup/view/purge_tables.xml

@@ -30,19 +30,7 @@
             <field name="type">ir.actions.server</field>
             <field name="state">code</field>
             <field name="model_id" ref="database_cleanup.model_cleanup_purge_wizard_table" />
-            <field name="code">
-wizard_id = self.create(cr, uid, {}, context=context)
-action = {
-    'type': 'ir.actions.act_window',
-    'views': [(False, 'form')],
-    'res_model': 'cleanup.purge.wizard.table',
-    'res_id': wizard_id,
-    'flags': {
-        'action_buttons': False,
-        'sidebar': False,
-    },
-}
-            </field>
+            <field name="code">action = self.get_wizard_action(cr, uid, context=context)</field>
         </record>
 
         <record id="purge_table_line_tree" model="ir.ui.view">
@@ -63,9 +51,7 @@ action = {
             <field name="type">ir.actions.server</field>
             <field name="state">code</field>
             <field name="model_id" ref="database_cleanup.model_cleanup_purge_line_table" />
-            <field name="code">
-self.purge(cr, uid, context.get('active_ids', []), context)
-            </field>
+            <field name="code">self.purge(cr, uid, context.get('active_ids', []), context)</field>
         </record>
 
         <record id="action_purge_table_line_value" model="ir.values">