From 8736e1102aa681362377767d885b1e56826f1647 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 22 Aug 2012 19:44:13 +0200
Subject: [IMP] remove apps

bzr revid: chs@openerp.com-20120822174413-dln0k2refi86g0lj
---
 openerp/addons/base/module/module_view.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'openerp/addons/base/module/module_view.xml')

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 19f9dbdaa44..8aca2546f4f 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -2,6 +2,12 @@
 <openerp>
     <data>
 
+        <record model="ir.actions.client" id="modules_act_cl">
+            <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" type="client"/>
         <!-- Modules Categories -->
 
         <record id="view_module_category_form" model="ir.ui.view">
@@ -187,8 +193,8 @@
               <p>You should try others search criteria.</p>
             </field>
         </record>
-        <menuitem id="menu_module_tree" parent="base.menu_management" name="Modules"
-            sequence="1" action="open_module_tree"/>
+        <menuitem id="menu_module_tree" parent="base.menu_management" name="Local Modules"
+            sequence="2" action="open_module_tree" groups="group_no_one" />
 
     </data>
 </openerp>
-- 
cgit v1.2.3


From ca4c2b8c49840febc34ebbfbf94078b05e96bbf2 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 23 Aug 2012 18:03:08 +0200
Subject: [FIX] correct module menu

bzr revid: chs@openerp.com-20120823160308-23iwttphu7l3xan9
---
 openerp/addons/base/module/module_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'openerp/addons/base/module/module_view.xml')

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index bca4645b818..d18403cb5df 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -7,7 +7,7 @@
             <field name="tag">apps</field>
         </record>
 
-        <menuitem id="module_mi" parent="base.menu_management" sequence="1" action="modules_act_cl" type="client"/>
+        <menuitem id="module_mi" parent="base.menu_management" sequence="1" action="modules_act_cl"/>
         <!-- Modules Categories -->
 
         <record id="view_module_category_form" model="ir.ui.view">
-- 
cgit v1.2.3


From 3c8381c299e02be83fa0a5ea3409d68206ef9561 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Mon, 24 Sep 2012 17:08:21 +0200
Subject: [IMP] rearrange local modules menus

bzr revid: chs@openerp.com-20120924150821-de4sckxujgyhaoeq
---
 openerp/addons/base/module/module_view.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'openerp/addons/base/module/module_view.xml')

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 2f4ded8830e..d525d10987b 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -182,7 +182,7 @@
             </field>
         </record>
         <record id="open_module_tree" model="ir.actions.act_window">
-            <field name="name">Install a Module</field>
+            <field name="name">Modules</field>
             <field name="res_model">ir.module.module</field>
             <field name="view_type">form</field>
             <field name="view_mode">kanban,tree,form</field>
@@ -193,8 +193,9 @@
               <p>You should try others search criteria.</p>
             </field>
         </record>
-        <menuitem id="menu_module_tree" parent="base.menu_management" name="Local Modules"
-            sequence="2" action="open_module_tree" groups="group_no_one" />
+        <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" />
 
     </data>
 </openerp>
-- 
cgit v1.2.3


From 6d00f4e900c9cb5841b882b12487ea3cf8bf1f5c Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Fri, 28 Sep 2012 13:33:29 +0200
Subject: [IMP] modules: reorder menus

bzr revid: chs@openerp.com-20120928113329-26sip23spkkv01wm
---
 openerp/addons/base/module/module_view.xml | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'openerp/addons/base/module/module_view.xml')

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index d525d10987b..15a2673c910 100644
--- 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>
-- 
cgit v1.2.3


From 0f47c550ec8db2a6d724d433608601bff07020cb Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Fri, 28 Sep 2012 14:58:40 +0200
Subject: [IMP] apps: add new client action to show updates availables

bzr revid: chs@openerp.com-20120928125840-or2eql38s9mku6ab
---
 openerp/addons/base/module/module_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'openerp/addons/base/module/module_view.xml')

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 15a2673c910..4702473183c 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -11,8 +11,8 @@
 
         <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>
+            <field name="tag">apps.updates</field>
+            <field name="params">{}</field>
         </record>
 
         <menuitem id="module_updates" parent="base.menu_management" sequence="2" action="modules_updates_act_cl"/>
-- 
cgit v1.2.3


From 897a5afbdfa6d1e5f801104795efb4e368b3a2fe Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 2 Oct 2012 18:26:11 +0200
Subject: [IMP] modules: rename xmlid

bzr revid: chs@openerp.com-20121002162611-uf3hkas78epif0l2
---
 openerp/addons/base/module/module_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'openerp/addons/base/module/module_view.xml')

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 4702473183c..88d9313a5f7 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -15,7 +15,7 @@
             <field name="params">{}</field>
         </record>
 
-        <menuitem id="module_updates" parent="base.menu_management" sequence="2" action="modules_updates_act_cl"/>
+        <menuitem id="menu_module_updates" parent="base.menu_management" sequence="2" action="modules_updates_act_cl"/>
 
         <!-- Modules Categories -->
 
-- 
cgit v1.2.3


From e1329cc4e0b1997dd2811f075ce496ae1f63adad Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 20 Dec 2012 14:26:52 +0100
Subject: temp menu

bzr revid: al@openerp.com-20121220132652-01hgfi0q64zo02un
---
 openerp/addons/base/module/module_view.xml | 109 +++++++++++++++--------------
 1 file changed, 56 insertions(+), 53 deletions(-)

(limited to 'openerp/addons/base/module/module_view.xml')

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 6ec7fcd7167..3a43a2591ba 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -1,24 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-        <record model="ir.actions.client" id="modules_act_cl">
-            <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.updates</field>
-            <field name="params">{}</field>
-        </record>
-
-        <menuitem id="menu_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">
             <field name="name">ir.module.category.form</field>
             <field name="model">ir.module.category</field>
@@ -47,7 +30,6 @@
         </record>
 
         <!-- Click on a category -->
-
         <record id="view_module_filter" model="ir.ui.view">
             <field name="name">ir.module.module.list.select</field>
             <field name="model">ir.module.module</field>
@@ -68,37 +50,6 @@
                </search>
             </field>
         </record>
-
-        <record model="ir.ui.view" id="module_view_kanban">
-            <field name="name">Modules Kanban</field>
-            <field name="model">ir.module.module</field>
-            <field name="arch" type="xml">
-                <kanban create="false">
-                  <field name="icon"/>
-                  <field name="name"/>
-                  <field name="state"/>
-                  <field name="summary"/>
-                  <templates>
-                    <t t-name="kanban-box">
-                      <div class="oe_module_vignette">
-                        <t t-set="installed" t-value="record.state.raw_value == 'installed'"/>
-                        <img t-attf-src="#{record.icon.value}" class="oe_module_icon"/>
-                        <div class="oe_module_desc">
-                          <h4><a type="open"><field name="shortdesc"/></a></h4>
-                          <p class="oe_module_name">
-                             <t t-if="record.summary.raw_value"><field name="summary"/><br/></t>
-                             <i><field name="name" groups="base.group_no_one"/></i>
-                          </p>
-                          <button type="object" name="button_immediate_install" states="uninstalled">Install</button>
-                          <button t-if="installed" disabled="disabled">Installed</button>
-                        </div>
-                      </div>
-                    </t>
-                  </templates>
-                </kanban>
-            </field>
-        </record>
-
         <record id="action_module_open_categ" model="ir.actions.act_window">
             <field name="name">Modules</field>
             <field name="res_model">ir.module.module</field>
@@ -115,7 +66,6 @@
 
 
         <!-- Modules -->
-
         <record id="module_form" model="ir.ui.view">
             <field name="name">ir.module.module.form</field>
             <field name="model">ir.module.module</field>
@@ -191,21 +141,74 @@
                 </tree>
             </field>
         </record>
-
+        <record model="ir.ui.view" id="module_view_kanban">
+            <field name="name">Modules Kanban</field>
+            <field name="model">ir.module.module</field>
+            <field name="arch" type="xml">
+                <kanban create="false">
+                  <field name="icon"/>
+                  <field name="name"/>
+                  <field name="state"/>
+                  <field name="summary"/>
+                  <templates>
+                    <t t-name="kanban-box">
+                      <div class="oe_module_vignette">
+                        <t t-set="installed" t-value="record.state.raw_value == 'installed'"/>
+                        <img t-attf-src="#{record.icon.value}" class="oe_module_icon"/>
+                        <div class="oe_module_desc">
+                          <h4><a type="open"><field name="shortdesc"/></a></h4>
+                          <p class="oe_module_name">
+                             <t t-if="record.summary.raw_value"><field name="summary"/><br/></t>
+                             <i><field name="name" groups="base.group_no_one"/></i>
+                          </p>
+                          <button type="object" name="button_immediate_install" states="uninstalled">Install</button>
+                          <button t-if="installed" disabled="disabled">Installed</button>
+                        </div>
+                      </div>
+                    </t>
+                  </templates>
+                </kanban>
+            </field>
+        </record>
         <record id="open_module_tree" model="ir.actions.act_window">
+            <!-- uncomment on released
             <field name="name">Installed Modules</field>
+            -->
+            <field name="name">Modules</field>
             <field name="res_model">ir.module.module</field>
             <field name="view_type">form</field>
             <field name="view_mode">kanban,tree,form</field>
+            <!-- uncomment on released
             <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_module_tree" parent="menu_management" name="Installed Modules"
-            sequence="3" action="open_module_tree" groups="group_no_one"/>
+        <menuitem id="menu_module_tree" parent="menu_management" name="Installed Modules" sequence="10" action="open_module_tree"/>
+
+
+        <!-- Apps modules -->
+        <record model="ir.actions.client" id="modules_act_cl">
+            <field name="name">Apps</field>
+            <field name="tag">apps</field>
+        </record>
+        <!-- uncomment on released
+        <menuitem id="module_mi" parent="base.menu_management" sequence="3" action="modules_act_cl"/>
+        -->
+        <menuitem id="module_mi" parent="base.menu_management" sequence="20" action="modules_act_cl"/>
+
+        <record model="ir.actions.client" id="modules_updates_act_cl">
+            <field name="name">Updates</field>
+            <field name="tag">apps.updates</field>
+            <field name="params">{}</field>
+        </record>
+        <!-- uncomment on released
+        <menuitem id="menu_module_updates" parent="base.menu_management" sequence="7" action="modules_updates_act_cl"/>
+        -->
+        <menuitem id="menu_module_updates" parent="base.menu_management" sequence="30" action="modules_updates_act_cl"/>
 
     </data>
 </openerp>
-- 
cgit v1.2.3