From 780d30e4ea19c97ee00b88fd4953af8657d88624 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 11 Aug 2010 15:02:23 +0530
Subject: [PATCH] [IMP]: caldav: Added description field in calendar

bzr revid: rpa@tinyerp.com-20100811093223-lixibo7upw4ebubk
---
 addons/caldav/caldav_view.xml | 68 +++++++++++++++++++----------------
 addons/caldav/calendar.py     |  1 +
 2 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 9184a0aadd2..2e9719efead 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -74,37 +74,45 @@
                     <field name="type"/>
                     <field name="user_id"/>
                     <field name="collection_id" required="1"/>
-                    <field name="line_ids" mode="form,tree" colspan="4" nolabel="1">
-                        <form string="Calendar Lines">
-                            <field name="name" required="1" select="1" />
-                            <field name="object_id" required="1" select="1" />
-                            <field name="domain" select="1" />
-                            <field name="mapping_ids" select="1" colspan="4" nolabel="1">
-                                <tree string="Attributes Mapping" editable="bottom">
-                                    <field name="name" required="1" domain="[('type', '=', parent.name)]"/>
-                                    <field name="fn" select="1" />
-                                    <field name="field_id" select="1" required="1" domain="[('model_id', '=', parent.object_id)]" />
-                                    <field name="expr" />
-                                </tree>
-                                <form string="Attributes Mapping">
-                                    <field name="name" select="1" required="1" domain="[('type', '=', parent.name)]"/>
-                                    <field name="field_id" select="1" domain="[('model_id', '=', parent.object_id)]"
-                                        required="1" />
-                                    <field name="fn" select="1" required="1" />
-                                    <field name="expr" />
-                                    <separator string="Value Mapping" colspan="4" />
-                                    <field name="mapping" select="1" colspan="4" nolabel="1" />
+                    <notebook colspan="4">
+                        <page string="Calendar Lines">
+                            <field name="line_ids" mode="form,tree" colspan="4" nolabel="1">
+                                <form string="Calendar Lines">
+                                    <field name="name" required="1" select="1" />
+                                    <field name="object_id" required="1" select="1" />
+                                    <field name="domain" select="1" />
+                                    <field name="mapping_ids" select="1" colspan="4" nolabel="1">
+                                        <tree string="Attributes Mapping" editable="bottom">
+                                            <field name="name" required="1" domain="[('type', '=', parent.name)]"/>
+                                            <field name="fn" select="1" />
+                                            <field name="field_id" select="1" required="1" domain="[('model_id', '=', parent.object_id)]" />
+                                            <field name="expr" />
+                                        </tree>
+                                        <form string="Attributes Mapping">
+                                            <field name="name" select="1" required="1" domain="[('type', '=', parent.name)]"/>
+                                            <field name="field_id" select="1" domain="[('model_id', '=', parent.object_id)]"
+                                                required="1" />
+                                            <field name="fn" select="1" required="1" />
+                                            <field name="expr" />
+                                            <separator string="Value Mapping" colspan="4" />
+                                            <field name="mapping" select="1" colspan="4" nolabel="1" />
+                                        </form>
+                                   </field>
                                 </form>
-                           </field>
-                        </form>
-                        <tree string="Calendar Lines" editable="bottom">
-                            <field name="name" select="1" />
-                            <field name="object_id" select="1" />
-                        </tree>
-                    </field>
-            </form>
-        </field>
-    </record>
+                                <tree string="Calendar Lines" editable="bottom">
+                                    <field name="name" select="1" />
+                                    <field name="object_id" select="1" />
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="Other Info">
+                            <separator string="Description" colspan="4" />
+                            <field name="description" colspan="4" nolabel="1" />
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
 
 
     <record model="ir.ui.view" id="view_caldav_tree">
diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index ab247cd9090..ab768f86c51 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -486,6 +486,7 @@ class Calendar(CalDAV, osv.osv):
             'line_ids': fields.one2many('basic.calendar.lines', 'calendar_id', 'Calendar Lines'),
             'create_date': fields.datetime('Created Date', readonly=True),
             'write_date': fields.datetime('Modifided Date', readonly=True),
+            'description': fields.text("description"),
     }
 
     def get_calendar_objects(self, cr, uid, ids, parent=None, domain=None, context=None):