[IMP] modules: reorder menus

bzr revid: chs@openerp.com-20120928113329-26sip23spkkv01wm

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index d525d10..15a2673 100644 (file)
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -3,11 +3,20 @@
     <data>
 
         <record model="ir.actions.client" id="modules_act_cl">
-            <field name="name">Modules</field> 
+            <field name="name">Modules</field>
             <field name="tag">apps</field>
         </record>
 
         <menuitem id="module_mi" parent="base.menu_management" sequence="1" action="modules_act_cl"/>
+
+        <record model="ir.actions.client" id="modules_updates_act_cl">
+            <field name="name">Updates Available</field>
+            <field name="tag">apps</field>
+            <field name="params">{'updates': 1}</field>
+        </record>
+
+        <menuitem id="module_updates" parent="base.menu_management" sequence="2" action="modules_updates_act_cl"/>
+
         <!-- Modules Categories -->
 
         <record id="view_module_category_form" model="ir.ui.view">
@@ -49,7 +58,7 @@
                     <filter name="app" icon="terp-check" string="Apps" domain="[('application', '=', 1)]"/>
                     <filter name="extra" icon="terp-check" string="Extra" domain="[('application', '=', 0)]"/>
                     <separator/>
-                    <filter icon="terp-check" string="Installed" domain="[('state', 'in', ['installed', 'to upgrade', 'to remove'])]"/>
+                    <filter name="installed" icon="terp-check" string="Installed" domain="[('state', 'in', ['installed', 'to upgrade', 'to remove'])]"/>
                     <filter icon="terp-dialog-close" string="Not Installed" domain="[('state', 'in', ['uninstalled', 'uninstallable', 'to install'])]"/>
                     <field name="category_id"/>
                     <group expand="0" string="Group By...">
@@ -181,21 +190,21 @@
                 </tree>
             </field>
         </record>
+
         <record id="open_module_tree" model="ir.actions.act_window">
-            <field name="name">Modules</field>
+            <field name="name">Installed Modules</field>
             <field name="res_model">ir.module.module</field>
             <field name="view_type">form</field>
             <field name="view_mode">kanban,tree,form</field>
-            <field name="context">{'search_default_app':1}</field>
+            <field name="context">{'search_default_installed':1}</field>
             <field name="search_view_id" ref="view_module_filter"/>
             <field name="help" type="html">
               <p><b>No module found!</b></p>
               <p>You should try others search criteria.</p>
             </field>
         </record>
-        <menuitem id="menu_local_modules" parent="base.menu_management" name="Local Modules" sequence="2" groups="group_no_one"/>
-        <menuitem id="menu_module_tree" parent="menu_local_modules" name="Modules"
-            sequence="1" action="open_module_tree" />
+        <menuitem id="menu_module_tree" parent="menu_management" name="Installed Modules"
+            sequence="3" action="open_module_tree" groups="group_no_one"/>
 
     </data>
 </openerp>

diff --git a/openerp/addons/base/module/wizard/base_module_import_view.xml b/openerp/addons/base/module/wizard/base_module_import_view.xml
index 59c781c..d9d6bb6 100644 (file)
--- a/openerp/addons/base/module/wizard/base_module_import_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_import_view.xml
@@ -41,9 +41,9 @@
             name="Import Module"
             action="action_view_base_module_import"
             id="menu_view_base_module_import"
-            parent="menu_local_modules"
+            parent="menu_management"
             groups="base.group_no_one"
-            sequence="1"/>
+            sequence="6"/>
     -->
 
     </data>

diff --git a/openerp/addons/base/module/wizard/base_module_update_view.xml b/openerp/addons/base/module/wizard/base_module_update_view.xml
index 841f773..64461e1 100644 (file)
--- a/openerp/addons/base/module/wizard/base_module_update_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_update_view.xml
@@ -18,17 +18,17 @@
                     </group>
                     <footer>
                         <div states="init">
-                            <button name="update_module" string="Update" type="object" class="oe_highlight"/> or 
+                            <button name="update_module" string="Update" type="object" class="oe_highlight"/> or
                             <button special="cancel" string="Cancel" class="oe_link"/>
                         </div>
                         <div states="done">
-                            <button name="action_module_open" string="Open Modules" type="object" class="oe_highlight"/> or 
+                            <button name="action_module_open" string="Open Modules" type="object" class="oe_highlight"/> or
                             <button special="cancel" string="Close" class="oe_link"/>
                         </div>
                     </footer>
                 </form>
             </field>
-        </record>        
+        </record>
 
         <record id="action_view_base_module_update" model="ir.actions.act_window">
             <field name="name">Module Update</field>
@@ -44,8 +44,8 @@
             action="action_view_base_module_update"
             id="menu_view_base_module_update"
             groups="base.group_no_one"
-            parent="menu_local_modules"
-            sequence="2"
+            parent="menu_management"
+            sequence="4"
             icon="STOCK_CONVERT"/>
 
     </data>

diff --git a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
index 9e785d7..9b45c49 100644 (file)
--- a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
@@ -34,8 +34,8 @@
            action="action_view_base_module_upgrade"
            groups="base.group_no_one"
            id="menu_view_base_module_upgrade"
-           parent="menu_local_modules"
-           sequence="3"/>
+           parent="menu_management"
+           sequence="5"/>
 
        <record id="view_base_module_upgrade_install" model="ir.ui.view">
             <field name="name">Module Upgrade Install</field>