← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-dev/openobject-addons/ssi-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1

 

ssi (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/ssi-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  #664773 [6.0RC1] caldav - tree missing fields
  https://bugs.launchpad.net/bugs/664773


caldav bug fix
https://bugs.launchpad.net/openobject-addons/+bug/664773
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/ssi-dev-addons1/+merge/39821
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/ssi-dev-addons1.
=== modified file 'caldav/caldav_view.xml'
--- caldav/caldav_view.xml	2010-10-22 06:45:53 +0000
+++ caldav/caldav_view.xml	2010-11-02 05:46:13 +0000
@@ -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>


Follow ups