Khushboo Bhatt(openerp) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-calendar-phase1-demo_data-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-demo_data-kbh/+merge/87002
Hello,
===========base_calendar module==========
- Added calender_demo.xml file for creating demo data for administrator and
for demo user.
- Added form view and tree view for event category in calendar_event_view.xml
- Added data for selection of category in calendar_data.xml
kindly review this.
Thank you,
KBH.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-calendar-phase1-demo_data-kbh/+merge/87002
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-calendar-phase1.
=== modified file 'base_calendar/__openerp__.py'
--- base_calendar/__openerp__.py 2011-12-04 06:22:14 +0000
+++ base_calendar/__openerp__.py 2011-12-28 10:28:24 +0000
@@ -38,9 +38,10 @@
'category': 'Tools',
'website': 'http://www.openerp.com',
"init_xml" : [
- 'calendar_event_data.xml'
+ 'calendar_event_data.xml',
+ 'calendar_data.xml'
],
- "demo_xml" : [],
+ "demo_xml" : ['calendar_demo.xml'],
"update_xml" : [
'security/calendar_security.xml',
'security/ir.model.access.csv',
=== modified file 'base_calendar/calendar_data.xml'
--- base_calendar/calendar_data.xml 2011-07-22 07:16:51 +0000
+++ base_calendar/calendar_data.xml 2011-12-28 10:28:24 +0000
@@ -1,12 +1,25 @@
<?xml version="1.0"?>
<openerp>
- <data noupdate="1">
-
- <record model="res.request.link" id="request_link_meeting">
- <field name="name">Event</field>
- <field name="object">calendar.event</field>
- </record>
-
-
- </data>
+ <data noupdate="1">
+
+ <!-- CASE CATEGORY(category) -->
+
+ <record model="calendar.event.category" id="categ_meet1">
+ <field name="name">Customer Meeting</field>
+ </record>
+
+ <record model="calendar.event.category" id="categ_meet2">
+ <field name="name">Internal Meeting</field>
+ </record>
+
+ <record model="calendar.event.category" id="categ_meet3">
+ <field name="name">Phone Call</field>
+ </record>
+
+ <record model="res.request.link" id="request_link_meeting">
+ <field name="name">Event</field>
+ <field name="object">calendar.event</field>
+ </record>
+
+ </data>
</openerp>
=== added file 'base_calendar/calendar_demo.xml'
--- base_calendar/calendar_demo.xml 1970-01-01 00:00:00 +0000
+++ base_calendar/calendar_demo.xml 2011-12-28 10:28:24 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<openerp>
+ <data noupdate="1">
+ <record id="calendar_calendar_administrator0" model="calendar.calendar">
+ <field name="user_id" ref="base.user_admin"/>
+ <field name="name">Administrator calendar</field>
+ <field eval="10" name="priority"/>
+ <field name="type">vevent</field>
+ </record>
+ <record id="calendar_calendar_demo0" model="calendar.calendar">
+ <field name="user_id" ref="base.user_demo"/>
+ <field name="name">Demo calendar</field>
+ <field eval="10" name="priority"/>
+ <field name="type">vevent</field>
+ </record>
+ </data>
+</openerp>
=== modified file 'base_calendar/calendar_event_view.xml'
--- base_calendar/calendar_event_view.xml 2011-12-26 09:00:00 +0000
+++ base_calendar/calendar_event_view.xml 2011-12-28 10:28:24 +0000
@@ -217,6 +217,32 @@
</field>
</record>
+ <!-- Event category Form View-->
+
+ <record model="ir.ui.view" id="category_form_view">
+ <field name="name">Category Form</field>
+ <field name="model">calendar.event.category</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="Category">
+ <field name="name" select="1" />
+ <field name="parent_id" />
+ </form>
+ </field>
+ </record>
+
+ <!-- Event category Tree View-->
+
+ <record model="ir.ui.view" id="category_tree_view">
+ <field name="name">Category Tree</field>
+ <field name="model">calendar.event.category</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <tree string="Category">
+ <field name="name"/>
+ </tree>
+ </field>
+ </record>
<!-- Event action -->
@@ -228,13 +254,22 @@
<field name="view_mode">calendar,tree,form</field>
<field name="context">{"search_default_user_id":uid, 'virtual_id' : True}</field>
<field name="search_view_id" ref="view_calendar_event_filter"/>
- </record>
+ </record>
+ <record id="action_view_event_category" model="ir.actions.act_window">
+ <field name="name">Category </field>
+ <field name="type">ir.actions.act_window</field>
+ <field name="res_model">calendar.event.category</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ </record>
<!-- Event menu -->
-
+
<menuitem name="Meetings" id="menu_calendar_event"
action="action_view_event" icon="terp-go-today" parent="base.menu_calendar"
sequence="1" />
+ <menuitem name="Event Category" id="menu_calender_event_category"
+ action="action_view_event_category" parent="base.menu_calendar_configuration" />
</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
