Devishree Brahmbhatt (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-search_views-events-dbr into
lp:~openerp-dev/openobject-addons/trunk-search_views.
Requested reviews:
Bhumika (OpenERP) (sbh-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-search_views-events-dbr/+merge/76190
Hello Ma'am,
I have improved search views as per the suggestions.
so, Kindly review it.
Thanks.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-search_views-events-dbr/+merge/76190
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-search_views.
=== modified file 'event/event_view.xml'
--- event/event_view.xml 2011-09-17 11:03:17 +0000
+++ event/event_view.xml 2011-09-20 11:04:49 +0000
@@ -229,7 +229,7 @@
<field name="arch" type="xml">
<search string="Events">
<group>
- <filter icon="terp-check" string="Current" name="draft" domain="[('state','in',('draft', 'confirm'))]" help="Events in draft or confirmed state"/>
+ <filter icon="terp-check" string="New" name="draft" domain="[('state','in',('draft', 'confirm'))]" help="Events in draft or confirmed state"/>
<filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
<separator orientation="vertical"/>
<field name="name"/>
@@ -475,7 +475,7 @@
<field name="arch" type="xml">
<search string="Event Registration">
<group>
- <filter icon="terp-check" string="Current" name="draft" domain="[('state','in',('draft', 'open'))]" help="Registrations in unconfirmed or confirmed state"/>
+ <filter icon="terp-check" string="New" name="draft" domain="[('state','in',('draft', 'open'))]" help="Registrations in unconfirmed or confirmed state"/>
<filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
<separator orientation="vertical"/>
<field name="partner_id" />
=== modified file 'event/report/report_event_registration_view.xml'
--- event/report/report_event_registration_view.xml 2011-09-17 11:03:17 +0000
+++ event/report/report_event_registration_view.xml 2011-09-20 11:04:49 +0000
@@ -53,21 +53,24 @@
<field name="arch" type="xml">
<search string="Event on Registration">
<group>
- <filter icon="terp-go-year" string="Last 365 Days" name="365day"
- domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
- help="Events with beginning date in last 365 days"/>
- <filter icon="terp-go-month" string="Last 30 Days"
- name="month"
- domain="[('date','<=', time.strftime('%%Y-%%m-%%d')), ('date','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
- help="Events with beginning date in last 30 days"/>
- <filter icon="terp-go-week"
- string="Last 7 Days"
- domain="[('date','<=', time.strftime('%%Y-%%m-%%d')), ('date','>',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
- help="Events with beginning date in last 7 days"/>
+ <filter string=" Year " icon="terp-go-year"
+ domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>=',time.strftime('%%Y-01-01'))]"
+ help="Events created in current year"/>
+ <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"/>
+ <filter icon="terp-go-month" string=" Month-1 "
+ domain="[('date','<=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+ help="Events created in last month"/>
<separator orientation="vertical"/>
+ <filter icon="terp-document-new"
+ string="New"
+ domain="[('state','=','draft')]"
+ help="Events which are in draft state"/>
<filter icon="terp-check"
- string="Current Events" name="draft"
- domain="[('state','in',('draft', 'confirm'))]" help="Events in draft or confirmed state"/>
+ string="Confirm"
+ domain="[('state','=','confirm')]"
+ help="Events which are in confirm state"/>
<separator orientation="vertical"/>
<filter icon="terp-camera_test"
string="Confirmed Registrations"
=== modified file 'membership/report/report_membership_view.xml'
--- membership/report/report_membership_view.xml 2011-09-17 11:03:17 +0000
+++ membership/report/report_membership_view.xml 2011-09-20 11:04:49 +0000
@@ -36,14 +36,19 @@
<field name="arch" type="xml">
<search string="Membership">
<group>
- <filter string="Last 365 Days" icon="terp-go-year"
- domain="[('date_from','<=', time.strftime('%%Y-%%m-%%d')), ('date_from','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
- <filter string="Last 30 Days" icon="terp-go-month" name="month"
- domain="[('date_from','<=', time.strftime('%%Y-%%m-%%d')), ('date_from','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
- <separator orientation="vertical"/>
+ <filter string=" Year " icon="terp-go-year"
+ domain="[('date_from','<=', time.strftime('%%Y-%%m-%%d')),('date_from','>=',time.strftime('%%Y-01-01'))]"
+ help="Events created in current year"/>
+ <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"/>
+ <filter icon="terp-go-month" string=" Month-1 "
+ domain="[('date_from','<=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_from','>=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+ help="Events created in last month"/>
+ <separator orientation="vertical"/>
<filter string="Forecast" icon="terp-gtk-jump-to-ltr" context="{'waiting_invoiced_totpending_visible':0}" help="This will display waiting, invoiced and total pending columns"/>
+ <separator orientation="vertical"/>
<filter string="Revenue Done" name="Revenue" icon="terp-dolar" context="{'paid_old_totearned_visible':0}" help="This will display paid, old and total earned columns"/>
- <separator orientation="vertical"/>
<field name="partner_id"/>
<field name="membership_id"/>
<field name="user_id"/>
@@ -91,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_salesman':1, }</field>
+ <field name="context">{"search_default_member":1, 'search_default_Revenue':1, 'search_default_this_month':1, 'search_default_salesman':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
