pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] branch merged with trunk-menus-improvements-association-jap

Browse Source 
bzr revid: mtr@tinyerp.com-20120305094041-nkobqsrvqbdv6lm8
This commit is contained in:
Meera Trambadia (OpenERP)
2012-03-05 15:10:41 +05:30
parent 86a3d2638f 211341b41a
commit 7bb7fbbb19
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/event/event_view.xml
+6 -1
View File
@@ -5,8 +5,12 @@
<menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
<menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17"/>
<<<<<<< TREE
<menuitem name="Events" id="base.menu_event_main" parent="base.marketing_menu" />
<menuitem name="Events" id="base.menu_event_association" parent="base.menu_association" />
=======
<menuitem name="Events Organisation" id="base.menu_event_main" parent="base.marketing_menu" />
>>>>>>> MERGE-SOURCE
<!-- EVENTS -->
@@ -258,7 +262,8 @@
<menuitem name="Events" id="menu_event_event" action="action_event_view" parent="base.menu_event_main" />
<!-- EVENTS/REGISTRATIONS/EVENTS -->
<!-- EVENTS/REGISTRATIONS/EVENTS -->
<record model="ir.ui.view" id="view_event_registration_tree">
<field name="name">event.registration.tree</field>
<field name="model">event.registration</field>
addons/membership/membership_view.xml
+1 -1
View File
@@ -126,7 +126,7 @@
</record>
<menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
<menuitem name="Membership" id="menu_membership" sequence="0" parent="base.menu_association"/>
<menuitem name="Members" id="menu_membership" sequence="0" parent="base.menu_association"/>
<menuitem name="Configuration" id="base.menu_marketing_config_association"
parent="base.menu_association" sequence="30" groups="base.group_extended"/>