Khushboo Bhatt(openerp) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-calendar-phase1-category_demo-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-category_demo-kbh/+merge/89877
Hello,
=====base_calendar module======
I have added demo data and categories for meeting.and also change the location
of calendar menu in settings.
Thank you,
kbh.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-calendar-phase1-category_demo-kbh/+merge/89877
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-calendar-phase1.
=== modified file 'base_calendar/calendar_alarm.py'
--- base_calendar/calendar_alarm.py 2012-01-24 11:24:01 +0000
+++ base_calendar/calendar_alarm.py 2012-01-24 12:29:35 +0000
@@ -58,7 +58,11 @@
string='Action Date', type="datetime",
multi='action_date'),
'interval_type': fields.selection([('minutes', 'Minutes'),
+<<<<<<< TREE
('hours', 'Hours'), ('work_days','Work Days'), ('days', 'Days'),('weeks', 'Weeks'), ('months', 'Months')],
+=======
+ ('hours', 'Hours'), ('work_days','Work Days'),('weeks', 'Weeks'), ('months', 'Months')],
+>>>>>>> MERGE-SOURCE
'Interval', \
required=True),
'action_occurs': fields.selection([('before', 'Before'), \
=== modified file 'base_calendar/calendar_data.xml'
--- base_calendar/calendar_data.xml 2011-12-28 10:16:21 +0000
+++ base_calendar/calendar_data.xml 2012-01-24 12:29:35 +0000
@@ -5,17 +5,60 @@
<!-- CASE CATEGORY(category) -->
<record model="calendar.event.category" id="categ_meet1">
+ <field name="name">None</field>
+ </record>
+
+ <record model="calendar.event.category" id="categ_meet2">
<field name="name">Customer Meeting</field>
</record>
- <record model="calendar.event.category" id="categ_meet2">
+ <record model="calendar.event.category" id="categ_meet3">
<field name="name">Internal Meeting</field>
</record>
- <record model="calendar.event.category" id="categ_meet3">
+ <record model="calendar.event.category" id="categ_meet4">
<field name="name">Phone Call</field>
</record>
+ <record model="calendar.event.category" id="categ_meet5">
+ <field name="name">Business</field>
+ </record>
+
+ <record model="calendar.event.category" id="categ_meet6">
+ <field name="name">Clients</field>
+ </record>
+
+ <record model="calendar.event.category" id="categ_meet7">
+ <field name="name">Competitions</field>
+ </record>
+ <record model="calendar.event.category" id="categ_meet8">
+ <field name="name">Follow up</field>
+ </record>
+
+ <record model="calendar.event.category" id="categ_meet9">
+ <field name="name">Holidays</field>
+ </record>
+
+ <record model="calendar.event.category" id="categ_meet10">
+ <field name="name">Ideas</field>
+ </record>
+
+ <record model="calendar.event.category" id="categ_meet11">
+ <field name="name">Issues</field>
+ </record>
+
+ <record model="calendar.event.category" id="categ_meet12">
+ <field name="name">Personal</field>
+ </record>
+
+ <record model="calendar.event.category" id="categ_meet13">
+ <field name="name">Projects</field>
+ </record>
+
+ <record model="calendar.event.category" id="categ_meet14">
+ <field name="name">Suppliers</field>
+ </record>
+
<record model="res.request.link" id="request_link_meeting">
<field name="name">Event</field>
<field name="object">calendar.event</field>
=== modified file 'base_calendar/calendar_demo.xml'
--- base_calendar/calendar_demo.xml 2011-12-28 11:03:01 +0000
+++ base_calendar/calendar_demo.xml 2012-01-24 12:29:35 +0000
@@ -13,5 +13,62 @@
<field eval="10" name="priority"/>
<field name="type">vevent</field>
</record>
+ <record id="calendar_event_demoevent0" model="calendar.event">
+ <field eval="1" name="active"/>
+ <field eval="1.0" name="duration"/>
+ <field name="user_id" ref="base.user_admin"/>
+ <field eval="1" name="notification"/>
+ <field eval="0" name="recurrency"/>
+ <field name="class">public</field>
+ <field name="state">confirm</field>
+ <field name="end_type">forever</field>
+ <field eval="0" name="edit_all"/>
+ <field name="date">2012-01-04 15:48:00</field>
+ <field name="calendar_id" ref="base_calendar.calendar_calendar_administrator0"/>
+ <field name="freq">None</field>
+ <field name="show_as">busy</field>
+ <field name="name">initial event</field>
+ <field name="date_deadline">2012-01-04 16:48:00</field>
+ <field eval="1" name="interval"/>
+ <field name="organizer_id" ref="base.user_admin"/>
+ <field name="rrule_type">none</field>
+ <field name="select1">date</field>
+ </record>
+ <record id="calendar_alarm_0" model="calendar.alarm">
+ <field name="user_id" ref="base.user_admin"/>
+ <field name="action_occurs">before</field>
+ <field model="calendar.event" name="event_id" ref="base_calendar.calendar_alarm_0""/>
+ <field name="interval_type">minutes</field>
+ <field name="action">internal</field>
+ <field eval="2" name="interval_number"/>
+ </record>
+ <record id="calendar_event_add_attendee_0" model="calendar_event.add.attendee">
+ <field eval="[(6,0,[])]" name="contact_ids"/>
+ <field eval="[(6,0,[ref('base.user_admin')])]" name="user_ids"/>
+ <field name="type">internal</field>
+ </record>
+ <record id="calendar_event_demoeventforrecurrent0" model="calendar.event">
+ <field eval="1" name="active"/>
+ <field eval="1.0" name="duration"/>
+ <field name="user_id" ref="base.user_admin"/>
+ <field eval="1" name="notification"/>
+ <field eval="1" name="recurrency"/>
+ <field name="state">draft</field>
+ <field name="end_date">2012-01-11</field>
+ <field name="end_type">end_date</field>
+ <field eval="0" name="edit_all"/>
+ <field name="date">2012-01-04 16:46:00</field>
+ <field name="calendar_id" ref="base_calendar.calendar_calendar_administrator0"/>
+ <field name="freq">None</field>
+ <field name="show_as">busy</field>
+ <field name="name">follow-up</field>
+ <field name="date_deadline">2012-01-04 17:46:00</field>
+ <field eval="2" name="interval"/>
+ <field name="organizer_id" ref="base.user_admin"/>
+ <field name="category_id" ref="base_calendar.categ_meet13"/>
+ <field name="rrule_type">daily</field>
+ <field name="select1">date</field>
+ <field name="rrule">FREQ=DAILY;INTERVAL=2;UNTIL=20120111T235959Z</field>
+ </record>
</data>
</openerp>
=== modified file 'base_calendar/calendar_event_view.xml'
--- base_calendar/calendar_event_view.xml 2011-12-28 13:21:42 +0000
+++ base_calendar/calendar_event_view.xml 2012-01-24 12:29:35 +0000
@@ -294,10 +294,9 @@
<!-- Event menu -->
<menuitem name="Meetings" id="menu_calendar_event"
- action="action_view_event" icon="terp-go-today" parent="base.menu_calendar"
- sequence="1" />
+ action="action_view_event" icon="terp-go-today" parent="base.menu_calendar"/>
- <menuitem name="Event Category" id="menu_calender_event_category"
- action="action_view_event_category" parent="base.menu_calendar_configuration" />
+ <menuitem name="Meeting Category" id="menu_calender_event_category"
+ action="action_view_event_category" parent="base.menu_calendar" sequence="10"/>
</data>
</openerp>
=== modified file 'base_calendar/calendar_view.xml'
--- base_calendar/calendar_view.xml 2011-12-30 13:17:36 +0000
+++ base_calendar/calendar_view.xml 2012-01-24 12:29:35 +0000
@@ -77,14 +77,11 @@
<!-- Calenadar's menu -->
- <menuitem id="base.menu_calendar" icon="terp-go-today" name="Calendars"
- parent="base.menu_config" sequence="6"/>
-
- <menuitem id="base.menu_calendar_configuration" name="Configuration"
- parent="base.menu_calendar" sequence="6"/>
+ <menuitem id="base.menu_calendar" name="Calendars"
+ parent="base.menu_config"/>
<menuitem action="action_calendar_form"
- id="menu_calendar_form" parent="base.menu_calendar_configuration" />
+ id="base.menu_calendar_form" parent="base.menu_calendar" sequence="1"/>
</data>
</openerp>
_______________________________________________
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
