Jagdish Panchal (Open ERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-settings-wizards-improvements-jap into
lp:~openerp-dev/openobject-server/trunk-settings-configuration-improvements.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-settings-wizards-improvements-jap/+merge/103855
Hello,
Improve usability as specified in Applications settings wizards part 2 pad.
Thanks,
JAP
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-settings-wizards-improvements-jap/+merge/103855
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-server/trunk-settings-wizards-improvements-jap into
lp:~openerp-dev/openobject-server/trunk-settings-configuration-improvements.
=== modified file 'openerp/addons/base/base_menu.xml'
--- openerp/addons/base/base_menu.xml 2012-04-26 12:14:38 +0000
+++ openerp/addons/base/base_menu.xml 2012-04-27 11:38:37 +0000
@@ -6,8 +6,13 @@
<menuitem id="menu_reporting_config" name="Configuration" parent="menu_reporting" sequence="100" groups="base.group_system"/>
<menuitem id="menu_administration" name="Settings" sequence="100" icon="terp-administration"/>
<menuitem id="menu_management" name="Modules" parent="menu_administration" sequence="0"/>
+<<<<<<< TREE
<menuitem id="menu_config" name="Configuration" parent="menu_administration" sequence="1"/>
<menuitem id="menu_custom" name="Technical" parent="menu_config" sequence="110" groups="base.group_no_one"/>
+=======
+ <menuitem id="menu_config" name="General Settings" parent="menu_administration" sequence="1"/>
+ <menuitem id="menu_custom" name="Technical" parent="menu_config" sequence="8" groups="base.group_no_one"/>
+>>>>>>> MERGE-SOURCE
<menuitem id="next_id_2" name="User Interface" parent="menu_custom"/>
<menuitem id="menu_email" name="Email" parent="menu_custom" sequence="1"/>
<menuitem id="menu_security" name="Security" parent="menu_custom" sequence="25"/>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
