Khushboo Bhatt(openerp) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-polish2_analysis_view_association-kbh
into lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-polish2_analysis_view_association-kbh/+merge/82261
==== summury ===
== association(event,membership) Analysis Report ===
*changes in report_event_registration_view.xml , report_membership_view.xml
- putting separator between year and month button in search view.
- make year,month button Default_search_year:1,Default_search_month:1 in these
files.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-polish2_analysis_view_association-kbh/+merge/82261
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-polish2_analysis_view_association-kbh.
=== modified file 'event/report/report_event_registration_view.xml'
--- event/report/report_event_registration_view.xml 2011-10-16 01:28:00 +0000
+++ event/report/report_event_registration_view.xml 2011-11-15 09:36:29 +0000
@@ -53,9 +53,10 @@
<field name="arch" type="xml">
<search string="Event on Registration">
<group>
- <filter string=" Year " icon="terp-go-year"
+ <filter string=" Year " icon="terp-go-year" name="year"
domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>=',time.strftime('%%Y-01-01'))]"
help="Events created in current year"/>
+ <separator orientation="vertical"/>
<filter string=" Month " icon="terp-go-month" name="this_month"
domain="[('date','<=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
help="Events created in current month"/>
@@ -126,7 +127,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="search_view_id" ref="view_report_event_registration_search"/>
- <field name="context">{"search_default_365day":1, "search_default_invoiced":1, "search_default_event":1, 'group_by_no_leaf':1, 'group_by':[]}</field>
+ <field name="context">{"search_default_year":1,"search_default_this_month":1,"search_default_365day":1, "search_default_invoiced":1, "search_default_event":1, 'group_by_no_leaf':1, 'group_by':[]}</field>
</record>
<record model="ir.actions.act_window.view" id="action_report_event_registration_tree">
=== modified file 'membership/report/report_membership_view.xml'
--- membership/report/report_membership_view.xml 2011-11-11 14:54:10 +0000
+++ membership/report/report_membership_view.xml 2011-11-15 09:36:29 +0000
@@ -36,9 +36,10 @@
<field name="arch" type="xml">
<search string="Membership">
<group>
- <filter string=" Year " icon="terp-go-year"
+ <filter string=" Year " icon="terp-go-year" name="year"
domain="[('date_from','<=', time.strftime('%%Y-%%m-%%d')),('date_from','>=',time.strftime('%%Y-01-01'))]"
help="Events created in current year"/>
+ <separator orientation="vertical"/>
<filter string=" Month " icon="terp-go-month" name="this_month"
domain="[('date_from','<=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','>=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
help="Events created in current month"/>
@@ -96,7 +97,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,'group_by_no_leaf':1}</field>
+ <field name="context">{"search_default_year":1,"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 : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
