[MERGE] Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons1

bzr revid: sbh@tinyerp.com-20101102090721-o4nael67xn9fxf72
2010-11-02 14:37:21 +05:30
parent 1066be5fda 89b403517a
commit 4d234e798e
1 changed files with 4 additions and 0 deletions
@@ -125,6 +125,10 @@
                    <field name="name"/>
                    <field name="type"/>
                    <field name="user_id"/>
+                    <field name="collection_id"/>
+                    <field name="calendar_color" />
+                    <field name="calendar_order"/>
+                    <field name="has_webcal" />
                    <field name="create_date"/>
                    <field name="write_date"/>
                </tree>