[MERGE] merge with main branch

bzr revid: mra@mra-laptop-20100728133657-ntfa8lhyiaa58ab9
This commit is contained in:
Mustufa Rangwala
2010-07-28 19:06:57 +05:30
2 changed files with 4 additions and 4 deletions
@@ -3,7 +3,7 @@
<data>
<menuitem id="menu_base_action_rule" name="Action Rule"
groups="base.group_extended"
parent="base.menu_base_config" sequence="0" />
parent="base.menu_base_config" sequence="500" />
<!--
Action Rule Form View
+3 -3
View File
@@ -17,11 +17,11 @@
<menuitem id="base.next_id_64" name="Reporting"
parent="base.menu_base_partner" sequence="11" />
<menuitem action="crm_custom_create_menu_action"
<!--menuitem action="crm_custom_create_menu_action"
id="crm_case_create_custom_menu"
parent="base.menu_crm_config_sales"
groups="base.group_extended"
name="Create Menu for Custom Cases" />
name="Create Menu for Custom Cases" /-->
<!-- Case Sections Form View -->
@@ -342,7 +342,7 @@
<menuitem action="crm_segmentation_tree-act"
id="menu_crm_segmentation-act"
groups="base.group_extended" sequence="3"
groups="base.group_extended" sequence="6"
parent="base.menu_config_address_book" />
<record model="ir.ui.view" id="view_users_form_simple_modif_inherited1">