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

[MOD] event module should be in marketing application IF Association is not installed. if asociation is installed, event has to be in this application.

Browse Source 
bzr revid: vir@tinyerp.com-20100728073710-xq8b0mgulndiva86
This commit is contained in:
Vir (Open ERP)
2010-07-28 13:07:10 +05:30
parent fda393ac2c
commit 46cbc4b22b
7 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/association/profile_association.xml
+5
View File
@@ -62,5 +62,10 @@
</xpath>
</field>
</record>
<menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
<menuitem name="Events Organisation" id="base.menu_event_main" parent="base.menu_association" />
<menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30" groups="base.group_extended"/>
<menuitem name="Reporting" id="base.menu_report_association" parent="base.menu_association" sequence="20"/>
</data>
</openerp>
addons/event/event_view.xml
+9 -7
View File
@@ -1,8 +1,10 @@
<?xml version="1.0"?>
<openerp>
<data>
<menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
<menuitem name="Events Organisation" id="menu_event_main" parent="base.menu_association" />
<!--menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
<menuitem name="Events Organisation" id="menu_event_main" parent="base.menu_association" /-->
<menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17"/>
<menuitem name="Events Organisation" id="base.menu_event_main" parent="base.marketing_menu" />
<!-- EVENTS -->
@@ -33,8 +35,8 @@
<field name="res_model">event.type</field>
<field name="view_type">form</field>
</record>
<menuitem name="Configuration" id="menu_event_config" parent="base.menu_association" sequence="30" groups="base.group_extended"/>
<menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="menu_event_config" groups="base.group_extended,crm.group_crm_manager"/>
<menuitem name="Configuration" id="base.menu_event_config" parent="base.marketing_menu" sequence="30" groups="base.group_extended"/>
<menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_event_config" groups="base.group_extended,crm.group_crm_manager"/>
<!-- Events Organisation/CONFIGURATION/EVENTS -->
@@ -276,7 +278,7 @@
domain="[('partner_id', '=', active_id)]"
view_type="form"/>
<menuitem name="Events" id="menu_event_event" action="action_event_view" parent="menu_event_main" />
<menuitem name="Events" id="menu_event_event" action="action_event_view" parent="base.menu_event_main" />
<!-- EVENTS/REGISTRATIONS/EVENTS -->
@@ -487,8 +489,8 @@
<menuitem
name="Registrations"
id="menu_action_registration" parent="menu_event_main"
id="menu_action_registration" parent="base.menu_event_main"
action="action_registration"/>
<menuitem name="Reporting" id="base.menu_report_association" parent="base.menu_association" sequence="20"/>
<menuitem name="Reporting" id="base.menu_report_association" parent="base.marketing_menu" sequence="20"/>
</data>
</openerp>
addons/event/report/report_event_registration_view.xml
+1 -1
View File
@@ -124,7 +124,7 @@
</record>
<!--<menuitem parent="menu_report_event" action="action_event_registration" id="menu_report_event_registration"/>-->
<menuitem parent="base.menu_report_association" action="action_report_event_registration" id="menu_report_event_registration" />
<menuitem parent="base.menu_report_association" action="action_report_event_registration" id="menu_report_event_registration" sequence="3"/>
<!-- end... -->
</data>
addons/marketing/marketing_view.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<openerp>
<data>
<menuitem name="Marketing" icon="terp-crm" id="marketing_menu" sequence="17"
<menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17"
groups="group_marketing_user"/>
<record id="view_marketing_installer" model="ir.ui.view">
addons/marketing_campaign/marketing_campaign_view.xml
+2 -2
View File
@@ -2,7 +2,7 @@
<openerp>
<data>
<menuitem name="Configuration" id="menu_marketing_configuration" parent="marketing.marketing_menu" sequence="1"/>
<menuitem name="Configuration" id="menu_marketing_configuration" parent="base.marketing_menu" sequence="1"/>
<!--
======================
@@ -106,7 +106,7 @@
</record>
<menuitem name="Campaigns" id="menu_marketing_campaign" parent="marketing.marketing_menu"/>
<menuitem name="Campaigns" id="menu_marketing_campaign" parent="base.marketing_menu"/>
<menuitem id="menu_marketing_campaign_form" parent="menu_marketing_campaign" action="action_marketing_campaign_form" sequence="10" />
<!--
addons/marketing_campaign/report/campaign_analysis_view.xml
+2 -2
View File
@@ -79,8 +79,8 @@
<field name="search_view_id" ref="view_campaign_analysis_search"/>
</record>
<menuitem name="Reporting" id="menu_marketing_reporting" parent="marketing.marketing_menu"/>
<menuitem action="action_campaign_analysis_all" id="menu_action_campaign_analysis_all" parent="menu_marketing_reporting" sequence="40"/>
<menuitem name="Reporting" id="base.menu_report_association" parent="base.marketing_menu"/>
<menuitem action="action_campaign_analysis_all" id="menu_action_campaign_analysis_all" parent="base.menu_report_association" sequence="2"/>
</data>
</openerp>
addons/membership/membership_view.xml
+1 -1
View File
@@ -80,7 +80,7 @@
</record>
<menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
<menuitem name="Membership" id="menu_membership" icon="terp-crm" sequence="0" parent="base.menu_association"/>
<menuitem name="Membership" id="menu_membership" sequence="0" parent="base.menu_association"/>
<menuitem name="Memberships" parent="menu_membership"
id="menu_membership_products"
action="action_membership_products" sequence="1"/>