Ajay Chauhan(OpenERP) has proposed merging
lp:~openerp-commiter/openobject-addons/trunk-search-imp-event-cha into
lp:~openerp-dev/openobject-addons/trunk-review_all_search.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-search-imp-event-cha/+merge/110525
Hello,
here i have updated code for 'search' in view xml for 'event_*' modules.
i followed this steps:
1) char field at top
2) date field
3) filter tag
4) m2o fields
Thanks,
Ajay Chauhan
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-search-imp-event-cha/+merge/110525
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-commiter/openobject-addons/trunk-search-imp-event-cha into
lp:~openerp-dev/openobject-addons/trunk-review_all_search.
=== modified file 'event/event_view.xml'
--- event/event_view.xml 2012-06-11 09:07:01 +0000
+++ event/event_view.xml 2012-06-15 13:32:22 +0000
@@ -265,21 +265,21 @@
<field name="arch" type="xml">
<search string="Events">
<group>
+ <field name="name" string="Events" filter_domain="[('name','ilike',self)]"/>
+ <separator orientation="vertical"/>
<filter icon="terp-check" string="Unconfirmed" name="draft" domain="[('state','=','draft')]" help="Events in New state"/>
<filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
- <separator orientation="vertical"/>
+ <filter icon="terp-personal"
+ string="My Events"
+ help="My Events"
+ domain="[('user_id','=',uid)]"/>
<filter icon="terp-go-today" string="Upcoming"
name="upcoming"
domain="[('date_begin','>=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
help="Upcoming events from today" />
- <field name="name"/>
+ <separator orientation="vertical"/>
<field name="type" widget="selection"/>
- <field name="user_id" widget="selection">
- <filter icon="terp-personal"
- string="My Events"
- help="My Events"
- domain="[('user_id','=',uid)]"/>
- </field>
+ <field name="user_id" widget="selection"/>
</group>
<newline/>
<group expand="0" string="Group By...">
@@ -337,6 +337,7 @@
<field name="arch" type="xml">
<tree string="Registration" >
<field name="create_date"/>
+ <field name="partner_id"/>
<field name="name"/>
<field name="email"/>
<field name="event_id" />
@@ -448,19 +449,18 @@
<field name="arch" type="xml">
<search string="Event Registration">
<group>
+ <field name="name" string="Participant"
+ filter_domain="['|','|','|', ('name','ilike',self), ('partner_id','ilike',self), ('email','ilike',self), ('origin','ilike',self)]"/>
+ <separator orientation="vertical"/>
<filter icon="terp-check" string="New" name="draft" domain="[('state','=','draft')]" help="Registrations in unconfirmed state"/>
<filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
- <separator orientation="vertical"/>
- <field name="event_id" widget="selection"/>
- <field name="name" string="Participant"
- filter_domain="['|','|', ('name','ilike',self), ('partner_id','ilike',self), ('email','ilike',self)]"/>
- <field name="user_id">
<filter icon="terp-personal"
string="My Registrations"
help="My Registrations"
domain="[('user_id','=',uid)]"/>
- </field>
- <field name="origin"/>
+ <separator orientation="vertical"/>
+ <field name="event_id" widget="selection"/>
+ <field name="user_id"/>
</group>
<newline/>
<group expand="0" string="Group By...">
=== modified file 'event/report/report_event_registration_view.xml'
--- event/report/report_event_registration_view.xml 2012-05-22 06:48:28 +0000
+++ event/report/report_event_registration_view.xml 2012-06-15 13:32:22 +0000
@@ -53,27 +53,21 @@
<field name="arch" type="xml">
<search string="Event on Registration">
<group>
- <filter icon="terp-document-new"
- string="New"
- domain="[('event_state','=','draft')]"
- help="Events which are in New state"/>
- <filter icon="terp-check"
- string="Confirm"
- domain="[('event_state','=','confirm')]"
- help="Events which are in confirm state"/>
- <separator orientation="vertical"/>
- <filter icon="terp-camera_test"
- string="Confirmed Registrations"
- help="Registrations in confirmed or done state"
- context="{'no_of_draft_invisible':1}"/>
- <separator orientation="vertical"/>
- <field name="event_id" string="Event"/>
- <field name="user_id" widget="selection">
+ <filter icon="terp-document-new"
+ string="New"
+ domain="[('event_state','=','draft')]"
+ help="Events which are in New state"/>
+ <filter icon="terp-check"
+ string="Confirm"
+ domain="[('event_state','=','confirm')]"
+ help="Events which are in confirm state"/>
<filter icon="terp-personal"
- string="My Events"
- help="My Events"
- domain="[('user_id','=',uid)]"/>
- </field>
+ string="My Events"
+ help="My Events"
+ domain="[('user_id','=',uid)]"/>
+ <separator orientation="vertical"/>
+ <field name="event_id" string="Event"/>
+ <field name="user_id" widget="selection"/>
</group>
<newline/>
<group expand="0" string="Extended Filters...">
@@ -81,7 +75,6 @@
<field name="event_date"/>
</group>
<newline/>
-
<group expand="1" string="Group By...">
<filter string="Participant / Contact" icon="terp-personal" context="{'group_by':'name_registration'}" help="Registration contact"/>
<filter string="Register" icon="terp-personal" context="{'group_by':'user_id_registration'}" help="Registration contact" groups="base.extended"/>
@@ -103,6 +96,12 @@
<filter string="Year" icon="terp-go-year"
domain="[]" context="{'group_by':'year'}" help="Event Beginning Date"/>
</group>
+ <group expand="0" string="Display">
+ <filter icon="terp-camera_test"
+ string="Show Confirmed Registrations"
+ help="Registrations in confirmed or done state"
+ context="{'no_of_draft_invisible':1}"/>
+ </group>
</search>
</field>
</record>
_______________________________________________
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
