← Back to team overview

savoirfairelinux-openerp team mailing list archive

[Merge] lp:~savoirfairelinux-openerp/openerp-program/reorg-menus into lp:~savoirfairelinux-openerp/openerp-program/program

 

Sandy Carter (http://www.savoirfairelinux.com) has proposed merging lp:~savoirfairelinux-openerp/openerp-program/reorg-menus into lp:~savoirfairelinux-openerp/openerp-program/program.

Requested reviews:
  Savoir-faire Linux' OpenERP (savoirfairelinux-openerp)

For more details, see:
https://code.launchpad.net/~savoirfairelinux-openerp/openerp-program/reorg-menus/+merge/213910

Re-organize program menus, separate tree and list views, bump versions
-- 
https://code.launchpad.net/~savoirfairelinux-openerp/openerp-program/reorg-menus/+merge/213910
Your team Savoir-faire Linux' OpenERP is requested to review the proposed merge of lp:~savoirfairelinux-openerp/openerp-program/reorg-menus into lp:~savoirfairelinux-openerp/openerp-program/program.
=== modified file 'program/__openerp__.py'
--- program/__openerp__.py	2014-02-17 16:01:28 +0000
+++ program/__openerp__.py	2014-04-02 19:16:52 +0000
@@ -22,7 +22,7 @@
 
 {
     'name': 'Program',
-    'version': '0.1',
+    'version': '0.2',
     'category': 'Program',
     'summary': 'Results Based Management',
     'description': '''

=== modified file 'program/program_action_view.xml'
--- program/program_action_view.xml	2014-03-12 19:26:31 +0000
+++ program/program_action_view.xml	2014-04-02 19:16:52 +0000
@@ -108,9 +108,19 @@
     </record>
 
     <record id="action_program_action_tree" model="ir.actions.act_window">
+      <field name="name">Action Chains</field>
+      <field name="res_model">program.action</field>
+      <field name="view_type">tree</field>
+      <field name="view_mode">tree</field>
+      <field name="view_id" ref="view_program_action_tree" />
+      <field name="search_view_id" ref="view_program_action_search" />
+      <field name="target">current</field>
+    </record>
+
+    <record id="action_program_action_list" model="ir.actions.act_window">
       <field name="name">Actions</field>
       <field name="res_model">program.action</field>
-      <field name="view_type">tree</field>
+      <field name="view_type">form</field>
       <field name="view_mode">tree,form,calendar</field>
       <field name="view_id" ref="view_program_action_tree" />
       <field name="search_view_id" ref="view_program_action_search" />
@@ -153,15 +163,23 @@
       id="menu_program_action_action"
       name="Actions"
       parent="menu_program_action"
+      action="action_program_action_list"
+      groups="program_action_user"
+      sequence="1" />
+
+    <menuitem
+      id="menu_program_action_chain"
+      name="Action Chains"
+      parent="menu_program_action"
       action="action_program_action_tree"
       groups="program_action_user"
-      sequence="1" />
+      sequence="2" />
 
     <menuitem
       id="menu_program_configuration"
       name="Configuration"
       parent="menu_program"
       groups="program_action_user"
-      sequence="2" />
+      sequence="10" />
   </data>
 </openerp>

=== modified file 'program_evaluation/__openerp__.py'
--- program_evaluation/__openerp__.py	2014-02-17 16:01:28 +0000
+++ program_evaluation/__openerp__.py	2014-04-02 19:16:52 +0000
@@ -22,7 +22,7 @@
 
 {
     'name': 'Program Evaluation',
-    'version': '0.1',
+    'version': '0.2',
     'author': 'Savoir-faire Linux',
     'maintainer': 'Savoir-faire Linux',
     'website': 'http://www.savoirfairelinux.com',

=== modified file 'program_evaluation/program_evaluation_view.xml'
--- program_evaluation/program_evaluation_view.xml	2014-02-24 22:08:49 +0000
+++ program_evaluation/program_evaluation_view.xml	2014-04-02 19:16:52 +0000
@@ -147,11 +147,11 @@
     </record>
 
     <menuitem 
-	id="menu_program_evaluation_action"
-	name="Evaluations"
-	parent="program.menu_program"
-	groups="program.program_action_user"
-	sequence="1" />
+      id="menu_program_evaluation_action"
+      name="Evaluations"
+      parent="program.menu_program"
+      groups="program.program_action_user"
+      sequence="3" />
 
     <menuitem
       id="menu_program_evaluation_action_action"

=== modified file 'program_result/__openerp__.py'
--- program_result/__openerp__.py	2014-02-17 16:01:28 +0000
+++ program_result/__openerp__.py	2014-04-02 19:16:52 +0000
@@ -22,7 +22,7 @@
 
 {
     'name': 'Program Result',
-    'version': '0.1',
+    'version': '0.2',
     'category': 'Program',
     'summary': 'RBM Results',
     'description': '''

=== modified file 'program_result/program_result_view.xml'
--- program_result/program_result_view.xml	2014-02-27 20:14:58 +0000
+++ program_result/program_result_view.xml	2014-04-02 19:16:52 +0000
@@ -172,9 +172,16 @@
     </record>
 
     <menuitem
+      id="menu_program_result"
+      name="Results"
+      parent="program.menu_program"
+      groups="program_result_user"
+      sequence="2" />
+
+    <menuitem
       id="menu_program_action_result"
       name="Results"
-      parent="program.menu_program_action"
+      parent="menu_program_result"
       action="action_program_result_tree"
       groups="program_result_user"
       sequence="2" />


Follow ups