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/90049
Hello,
I have remove conflicts from calendar_alarm.py.
Thank you.
kbh.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-calendar-phase1-category_demo-kbh/+merge/90049
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-calendar-phase1.
=== 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:30:30 +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:30:30 +0000
@@ -37,7 +37,7 @@
<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 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"/>
_______________________________________________
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
