Khushboo Bhatt(openerp) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-calendar-phase1-event_search-kanban_view-kbh
into lp:~openerp-dev/openobject-addons/trunk-calendar-phase1.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-calendar-phase1-event_search-kanban_view-kbh/+merge/87126
Hello,
========== base_calendar module ===========
- Extends search view for calendar.event as per requirement in
calendar_event_view.xml.
- Extends tree view for same.
Thank you,
kbh.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-calendar-phase1-event_search-kanban_view-kbh/+merge/87126
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-calendar-phase1.
=== modified file 'base_calendar/calendar_event_view.xml'
--- base_calendar/calendar_event_view.xml 2011-12-28 10:16:21 +0000
+++ base_calendar/calendar_event_view.xml 2011-12-30 10:02:24 +0000
@@ -154,7 +154,28 @@
<field name="calendar_id" />
<field name="organizer_id"/>
<field name="user_id" invisible="1"/>
- <field name="state" invisible="1"/>
+ <field name="category_id" invisible="1"/>
+ <field name="state" select="1" />
+ <button name="do_done"
+ string="_Done"
+ states="confirm"
+ type="object"
+ icon="gtk-apply"/>
+ <button name="set_as_draft"
+ string="Set _As Unconfirmed"
+ states="confirm,done"
+ type="object"
+ icon="gtk-convert" />
+ <button name="do_cancel"
+ string="_Cancel"
+ states="confirm"
+ type="object"
+ icon="gtk-cancel"/>
+ <button name="do_confirm"
+ string="C_onfirm"
+ states="draft"
+ type="object"
+ icon="gtk-apply" />
</tree>
</field>
</record>
@@ -182,35 +203,42 @@
<field name="arch" type="xml">
<search string="Search Events">
<group col="12" colspan="4">
- <filter icon="terp-go-today" string="My Events"
- domain="[('user_id','=',uid)]"
- help="My Events" />
- <separator orientation="vertical"/>
- <filter icon="terp-check" string="Confirmed"
+ <filter icon="terp-check" string="Unconfirmed"
+ domain="[('state','=','draft')]"
+ help="Unconfirmed Events" />
+ <filter icon="terp-check" string="Upcoming"
domain="[('state','=','confirm')]"
+ help="Upcoming Events" />
+ <filter icon="terp-check" string="Done"
+ domain="[('state','=','done')]"
help="Confirmed Events" />
<separator orientation="vertical"/>
+ <field name="name" string="Meeting"
+ filter_domain="['|', ('name','ilike',self)]"/>
+ <field name="user_id" groups="base.group_extended">
+ <filter icon="terp-personal" groups="base.group_extended"
+ domain="[('user_id','=',uid)]"
+ help="My Meetings" />
+ </field>
+ <separator orientation="vertical"/>
<field name="name" string="Summary"/>
+ <separator orientation="vertical"/>
<field name="location" string="Location"/>
- <field name="category_id"/>
- <separator orientation="vertical"/>
- <field name="calendar_id" />
- <field name="user_id" />
- <separator orientation="vertical"/>
- <field name="show_as"/>
</group>
<newline/>
<group expand="0" string="Group By...">
+ <filter string="Calendar" icon="terp-personal" domain="[]"
+ context="{'group_by':'calendar_id'}" />
+ <separator orientation="vertical" />
<filter string="Responsible" icon="terp-personal" domain="[]"
context="{'group_by':'user_id'}" />
+ <filter string="Organizer" icon="terp-personal"
+ context="{'group_by':'organizer_id'}" />
<separator orientation="vertical" />
- <filter string="Availability" icon="terp-camera_test"
- domain="[]" context="{'group_by':'show_as'}" />
<filter string="State" 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'}" />
+ <filter string="Category" icon="terp-stock_symbol-selection"
+ context="{'group_by':'category_id'}" />
</group>
</search>
_______________________________________________
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
