Turkesh Patel (openERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-clean-search-base_calendar-tpa into
lp:~openerp-dev/openobject-addons/trunk-clean-search.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-clean-search-base_calendar-tpa/+merge/115889
[IMP] improved search views of base_clendar module.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-clean-search-base_calendar-tpa/+merge/115889
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-clean-search.
=== modified file 'base_calendar/base_calendar_view.xml'
--- base_calendar/base_calendar_view.xml 2012-07-02 16:37:25 +0000
+++ base_calendar/base_calendar_view.xml 2012-07-20 06:01:24 +0000
@@ -84,40 +84,20 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Invitations">
- <field name="email" string="Email"/>
- <separator orientation="vertical"/>
- <field name="event_date"/>
- <separator orientation="vertical"/>
- <filter icon="terp-gtk-jump-to-ltr" name="toreview" string="To Review"
- domain="[('state','=', 'needs-action')]"
- help="Invitations To Review" />
- <filter icon="terp-check" string="Accepted"
- domain="[('state','=', 'accepted')]"
- help="Accepted Invitations" />
- <filter icon="terp-dialog-close" string="Declined"
- domain="[('state','=', 'declined')]"
- help="Declined Invitations" />
- <filter icon="gtk-sort-descending" string="Delegated"
- domain="[('state','=', 'delegated')]"
- help="Delegated Invitations" />
- <separator orientation="vertical"/>
- <field name="user_id" string="Responsible"/>
- <separator orientation="vertical"/>
- <field name="cutype" string="Invitation type"/>
- <newline/>
+ <field name="email" string="Email"/>
+ <field name="event_date"/>
+ <field name="user_id" string="Responsible"/>
+ <field name="cutype" string="Invitation type"/>
+ <filter icon="terp-gtk-jump-to-ltr" name="toreview" string="To Review" domain="[('state','=', 'needs-action')]" help="Invitations To Review" />
+ <filter icon="terp-check" string="Accepted" domain="[('state','=', 'accepted')]" help="Accepted Invitations" />
+ <filter icon="terp-dialog-close" string="Declined" domain="[('state','=', 'declined')]" help="Declined Invitations" />
+ <filter icon="gtk-sort-descending" string="Delegated" domain="[('state','=', 'delegated')]" help="Delegated Invitations" />
<group expand="0" string="Group By...">
- <filter string="Responsible" icon="terp-personal" domain="[]"
- context="{'group_by':'user_id'}" />
- <filter string="Contact" icon="terp-personal" domain="[]"
- context="{'group_by':'partner_id'}" />
- <separator orientation="vertical" />
- <filter string="Type" icon="terp-stock_symbol-selection" help="Invitation Type"
- domain="[]" context="{'group_by':'cutype'}" />
- <filter string="Role" icon="terp-gtk-select-all"
- domain="[]" context="{'group_by':'role'}" />
- <filter string="Required Reply" icon="terp-mail-replied"
- domain="[]" context="{'group_by':'rsvp'}" />
- <separator orientation="vertical" />
+ <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
+ <filter string="Contact" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}" />
+ <filter string="Type" icon="terp-stock_symbol-selection" help="Invitation Type" domain="[]" context="{'group_by':'cutype'}" />
+ <filter string="Role" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'role'}" />
+ <filter string="Required Reply" icon="terp-mail-replied" domain="[]" context="{'group_by':'rsvp'}" />
<filter string="Status" icon="terp-stock_effects-object-colorize" help="Invitation Type"
domain="[]" context="{'group_by':'state'}" />
</group>
@@ -414,37 +394,20 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Events">
- <group>
- <field name="name" filter_domain="['|',('name','ilike',self),('location','ilike',self)]" string="Event"/>
- <separator orientation="vertical"/>
- <filter icon="terp-go-today" string="My Events"
- domain="[('user_id','=',uid)]"
- help="My Events" />
- <separator orientation="vertical"/>
- <filter icon="terp-check" string="Confirmed"
- domain="[('state','=','confirmed')]"
- help="Confirmed Events" />
- <separator orientation="vertical"/>
- <field name="user_id"/>
- <separator orientation="vertical"/>
- <field name="show_as"/>
- <field name="class" string="Privacy"/>
- </group>
- <newline/>
- <group expand="0" string="Group By...">
- <filter string="Responsible" icon="terp-personal" domain="[]"
- context="{'group_by':'user_id'}" />
- <separator orientation="vertical" />
- <filter string="Availability" icon="terp-camera_test"
- domain="[]" context="{'group_by':'show_as'}" />
- <filter string="Privacy" icon="terp-locked"
- domain="[]" context="{'group_by':'class'}" />
- <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"
- context="{'group_by':'state'}" />
- <separator orientation="vertical" />
- <filter string="Date" icon="terp-go-month"
- domain="[]" context="{'group_by':'date'}" />
- </group>
+ <field name="name" filter_domain="['|',('name','ilike',self),('location','ilike',self)]" string="Event"/>
+ <field name="user_id"/>
+ <field name="show_as"/>
+ <field name="class" string="Privacy"/>
+ <filter icon="terp-go-today" string="My Events" domain="[('user_id','=',uid)]" help="My Events" />
+ <separator/>
+ <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Events" />
+ <group expand="0" string="Group By...">
+ <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
+ <filter string="Availability" icon="terp-camera_test" domain="[]" context="{'group_by':'show_as'}" />
+ <filter string="Privacy" icon="terp-locked" domain="[]" context="{'group_by':'class'}" />
+ <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
+ <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" />
+ </group>
</search>
</field>
</record>
=== modified file 'base_calendar/crm_meeting_view.xml'
--- base_calendar/crm_meeting_view.xml 2012-07-14 15:33:50 +0000
+++ base_calendar/crm_meeting_view.xml 2012-07-20 06:01:24 +0000
@@ -302,18 +302,12 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Meetings">
- <group>
- <field name="name" string="Meeting"
- filter_domain="[('name','ilike',self)]"/>
- <filter string="Inbox" help="Unread messages" icon="terp-mail-message-new"
- name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
- <separator orientation="vertical"/>
- <filter string="My Meetings" help="My Meetings" icon="terp-personal"
- domain="[('user_id','=',uid)]"/>
- <separator orientation="vertical"/>
- <field name="user_id"/>
- <field name="partner_ids"/>
- </group>
+ <field name="name" string="Meeting" filter_domain="[('name','ilike',self)]"/>
+ <field name="user_id"/>
+ <field name="partner_ids"/>
+ <filter string="Inbox" help="Unread messages" icon="terp-mail-message-new" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+ <separator/>
+ <filter string="My Meetings" help="My Meetings" icon="terp-personal" domain="[('user_id','=',uid)]"/>
</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
