diff options
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/base_calendar/base_calendar_view.xml | 19 | ||||
| -rw-r--r-- | addons/caldav/wizard/calendar_event_import.py | 16 |
2 files changed, 24 insertions, 11 deletions
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml index c8bba10ea16..d31266c9090 100644 --- a/addons/base_calendar/base_calendar_view.xml +++ b/addons/base_calendar/base_calendar_view.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> + + <!-- Attendee form view--> <record id="base_calendar_attendee_form_view" model="ir.ui.view"> <field name="name">calendar.attendee.form</field> @@ -65,6 +67,8 @@ </form> </field> </record> + + <!-- Attendee tree view--> <record id="base_calendar_attendee_tree_view" model="ir.ui.view"> <field name="name">calendar.attendee.tree</field> @@ -82,7 +86,9 @@ </tree> </field> </record> - + + <!-- Attendee search view--> + <record id="base_calendar_attendee_search_view" model="ir.ui.view"> <field name="name">calendar.attendee.search</field> <field name="model">calendar.attendee</field> @@ -119,7 +125,8 @@ </field> </record> - + <!-- Action for attendee view--> + <record id="action_view_attendee_form" model="ir.actions.act_window"> <field name="name">Event Invitations</field> <field name="type">ir.actions.act_window</field> @@ -131,10 +138,12 @@ </record> <!-- Calenadar's menu --> + <menuitem id="base.menu_calendar_configuration" name="Calendar" parent="base.menu_base_config" sequence="10" /> <!-- Invitation menu --> + <menuitem id="menu_attendee_invitations" name="Event Invitations" parent="base.menu_calendar_configuration" sequence="10" action="action_view_attendee_form" /> @@ -175,7 +184,8 @@ </field> </record> - + <!-- Action for alarms view--> + <record id="action_res_alarm_view" model="ir.actions.act_window"> <field name="name">Available Alarms</field> <field name="type">ir.actions.act_window</field> @@ -183,6 +193,8 @@ <field name="view_type">form</field> <field name="view_mode">tree,form</field> </record> + + <!-- Menu for Alarms--> <menuitem id="menu_crm_meeting_avail_alarm" groups="base.group_extended" @@ -418,6 +430,7 @@ </record> <!-- Event menu --> + <menuitem id="menu_events" name="Events" parent="base.menu_calendar_configuration" sequence="5" action="action_view_event" /> diff --git a/addons/caldav/wizard/calendar_event_import.py b/addons/caldav/wizard/calendar_event_import.py index 64a1990f00d..4418c669c9c 100644 --- a/addons/caldav/wizard/calendar_event_import.py +++ b/addons/caldav/wizard/calendar_event_import.py @@ -56,11 +56,11 @@ class calendar_event_import(osv.osv_memory): if vals: cnt = len(vals) value = { - 'view_type': 'form', - 'view_mode': 'form', - 'res_model': 'calendar.event.import', - 'views': [(id2,'form'),(False,'tree'),(False,'calendar'),(False,'graph')], - 'type': 'ir.actions.act_window', + 'view_type': 'form', + 'view_mode': 'form', + 'res_model': 'calendar.event.import', + 'views': [(id2, 'form'), (False, 'tree'), (False, 'calendar'), (False, 'graph')], + 'type': 'ir.actions.act_window', 'target': 'new' } return value @@ -69,12 +69,12 @@ class calendar_event_import(osv.osv_memory): _description = "Event Import" _columns = { - 'file_path': fields.binary('Select ICS file', filters='*.ics', required=True), - 'msg': fields.text('', readonly=True), + 'file_path': fields.binary('Select ICS file', filters='*.ics', required=True), + 'msg': fields.text('', readonly=True), } _defaults = { - 'msg':lambda *a:'Import Sucessful' + 'msg': lambda *a: 'Import Sucessful' } calendar_event_import() |