Ravish Murari(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-polish2_association_module-rmu into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-polish2_association_module-rmu/+merge/81687
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-polish2_association_module-rmu/+merge/81687
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-polish2_association_module-rmu.
=== modified file 'event/board_association_view.xml'
--- event/board_association_view.xml 2011-07-26 10:46:13 +0000
+++ event/board_association_view.xml 2011-11-09 08:00:34 +0000
@@ -69,9 +69,8 @@
<field name="view_mode">form</field>
<field name="view_id" ref="board_associations_manager_form"/>
</record>
- <menuitem id="board_associations" name="Dashboard" parent="base.menu_report_association" sequence="0"/>
<menuitem
- name="Events" parent="board_associations"
+ name="Event Dashboard" parent="base.menu_report_association"
action="open_board_associations_manager"
sequence="1"
id="menu_board_associations_manager"
=== modified file 'event/event_view.xml'
--- event/event_view.xml 2011-10-02 17:31:16 +0000
+++ event/event_view.xml 2011-11-09 08:00:34 +0000
@@ -6,7 +6,7 @@
<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" />
- <menuitem name="Events Organisation" id="base.menu_event_association" parent="base.menu_association" />
+ <menuitem name="Events" id="base.menu_event_association" parent="base.menu_association" />
<!-- EVENTS -->
@@ -42,7 +42,7 @@
<menuitem name="Configuration" id="base.menu_marketing_config_association" parent="base.menu_association" sequence="30" groups="base.group_extended"/>
<menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_marketing_config_root" groups="base.group_extended"/>
- <menuitem name="Types of Events" id="menu_event_type_association" action="action_event_type" parent="base.menu_marketing_config_association" groups="base.group_extended"/>
+ <menuitem name="Events Type" id="menu_event_type_association" action="action_event_type" parent="base.menu_marketing_config_association" groups="base.group_extended"/>
<!-- Events Organisation/CONFIGURATION/EVENTS -->
=== modified file 'membership/membership_view.xml'
--- membership/membership_view.xml 2011-08-04 10:26:35 +0000
+++ membership/membership_view.xml 2011-11-09 08:00:34 +0000
@@ -128,7 +128,7 @@
<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="Membership Products"
- parent="menu_membership"
+ parent="base.menu_marketing_config_association"
id="menu_membership_products"
action="action_membership_products"
sequence="1"
=== modified file 'membership/report/report_membership_view.xml'
--- membership/report/report_membership_view.xml 2011-10-02 17:31:16 +0000
+++ membership/report/report_membership_view.xml 2011-11-09 08:00:34 +0000
@@ -96,7 +96,7 @@
<field name="res_model">report.membership</field>
<field name="view_type">form</field>
<field name="search_view_id" ref="view_report_membership_search"/>
- <field name="context">{"search_default_member":1, 'search_default_Revenue':1, 'search_default_this_month':1, 'search_default_salesman':1, }</field>
+ <field name="context">{"search_default_member":1, 'search_default_Revenue':1, 'search_default_this_month':1, 'search_default_salesman':1,'group_by_no_leaf':1}</field>
</record>
<record model="ir.actions.act_window.view" id="action_report_membership_tree_view1">
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
