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/90048
Hello,
I have made changes as per your suggestion.
Thank you,
kbh.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-calendar-phase1-category_demo-kbh/+merge/90048
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-25 04:18:38 +0000
+++ base_calendar/calendar_alarm.py 2012-01-25 06:20:37 +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'),('weeks', 'Weeks'), ('months', 'Months')],
+=======
+ ('hours', 'Hours'), ('work_days','Work Days'), ('days', 'Days'),('weeks', 'Weeks'), ('months', 'Months')],
+>>>>>>> MERGE-SOURCE
'Interval', \
required=True),
'action_occurs': fields.selection([('before', 'Before'), \
=== modified file 'base_calendar/calendar_attendee_view.xml'
--- base_calendar/calendar_attendee_view.xml 2011-08-04 12:58:47 +0000
+++ base_calendar/calendar_attendee_view.xml 2012-01-25 06:20:37 +0000
@@ -106,14 +106,5 @@
<field name="view_id" ref="calendar_attendee_tree_view" />
</record>
-
-
- <!-- Invitation menu -->
-
- <menuitem id="menu_attendee_invitations"
- parent="base.menu_calendar_configuration"
- groups="base.group_extended"
- sequence="10" action="action_view_attendee_form" />
-
</data>
</openerp>
=== modified file 'base_calendar/calendar_demo.xml'
--- base_calendar/calendar_demo.xml 2012-01-24 12:17:46 +0000
+++ base_calendar/calendar_demo.xml 2012-01-25 06:20:37 +0000
@@ -13,6 +13,7 @@
<field eval="10" name="priority"/>
<field name="type">vevent</field>
</record>
+<<<<<<< TREE
<record id="calendar_event_demoevent0" model="calendar.event">
<field eval="1" name="active"/>
<field eval="1.0" name="duration"/>
@@ -70,5 +71,64 @@
<field name="select1">date</field>
<field name="rrule">FREQ=DAILY;INTERVAL=2;UNTIL=20120111T235959Z</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_event_demoevent0"/>
+ <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>
+>>>>>>> MERGE-SOURCE
</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
