diff --git a/addons/caldav/__openerp__.py b/addons/caldav/__openerp__.py
index cdb06a17a1f..40088cb0bac 100644
--- a/addons/caldav/__openerp__.py
+++ b/addons/caldav/__openerp__.py
@@ -21,12 +21,12 @@
{
- "name" : "Share Calendar using Caldav",
- "version" : "1.0",
+ "name" : "Share Calendar using CalDAV",
+ "version" : "1.1",
"depends" : [
"base",
"document_webdav",
- ],
+ ],
'description': """
This module Contains basic functionality for caldav system like:
- Webdav server that provides remote access to calendar
@@ -34,7 +34,10 @@
- Customize calendar event and todo attribute with any of OpenERP model
- Provides iCal Import/Export functionality
- To access OpenERP Calendar using caldav to remote site use the URL like:
+ To access Calendars using CalDAV clients, point them to:
+ http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c
+
+ To access OpenERP Calendar using WebCal to remote site use the URL like:
http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics
Where,
@@ -53,7 +56,8 @@
'wizard/calendar_event_export_view.xml',
'wizard/calendar_event_import_view.xml',
'wizard/calendar_event_subscribe_view.xml',
- 'caldav_view.xml'
+ 'caldav_view.xml',
+ 'caldav_setup.xml'
],
"installable" : True,
"active" : False,
diff --git a/addons/caldav/caldav_setup.xml b/addons/caldav/caldav_setup.xml
new file mode 100644
index 00000000000..c33edbc75f7
--- /dev/null
+++ b/addons/caldav/caldav_setup.xml
@@ -0,0 +1,88 @@
+
+
+
+
+
+ []
+
+
+
+
+
+ directory
+
+ calendars
+
+
+ []
+
+
+
+
+ directory
+
+ resources
+
+
+ []
+
+
+
+
+
+ ressource
+
+
+ __uids__
+
+
+ []
+
+
+
+
+
+
+ ressource
+
+
+ users
+
+
+
+ user_id
+ res_id
+
+
+ []
+
+
+
+
+
+ directory
+
+ c
+
+
+
+ []
+
+
+
+
+
+ directory
+
+ groups
+
+
+
+ urn:ietf:params:xml:ns:caldav
+
+ calendar-home-set
+ ('href','DAV:','/%s/%s/calendars/users/%s/c' % ('webdav',dbname,username) )
+
+
+
+
diff --git a/addons/crm_caldav/__openerp__.py b/addons/crm_caldav/__openerp__.py
index ce8f72a3e17..d0e04576b3b 100644
--- a/addons/crm_caldav/__openerp__.py
+++ b/addons/crm_caldav/__openerp__.py
@@ -22,24 +22,24 @@
{
'name': 'Extened Module to Add CalDav future on Meeting',
- 'version': '1.0',
+ 'version': '1.1',
'category': 'Generic Modules/CRM & SRM',
'description': """
- New Futures in Meeting:
- * Share meeting with other calendar clients like sunbird
-""",
- 'author': 'OpenERP SA',
- 'website': 'http://www.openerp.com',
- 'depends': ['caldav', 'crm'
- ],
- 'init_xml': [
- 'crm_caldav_data.xml',
- ],
+ New Futures in Meeting:
+ * Share meeting with other calendar clients like sunbird
+""",
+ 'author': 'OpenERP SA',
+ 'website': 'http://www.openerp.com',
+ 'depends': ['caldav', 'crm' ],
+ 'init_xml': [
+ 'crm_caldav_data.xml',
+ 'crm_caldav_setup.xml',
+ ],
'update_xml': [],
- 'demo_xml': [],
- 'installable': True,
- 'active': False,
+ 'demo_xml': [],
+ 'installable': True,
+ 'active': False,
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_caldav/crm_caldav_setup.xml b/addons/crm_caldav/crm_caldav_setup.xml
new file mode 100644
index 00000000000..1a103f61811
--- /dev/null
+++ b/addons/crm_caldav/crm_caldav_setup.xml
@@ -0,0 +1,287 @@
+
+
+
+
+
+
+ Meetings per user
+ #1E25FF
+
+ vevent
+ Meetings
+
+
+
+
+ []
+ attendee
+
+
+
+
+
+ []
+ valarm
+
+
+
+
+
+ [('user_id','=', dctx_user_id)]
+ vevent
+
+
+
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ {'tentative': 'draft', 'confirmed': 'open', 'cancelled': 'cancel'}
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py
index 3a573dc5a2b..1c2e232e914 100644
--- a/addons/document_webdav/__openerp__.py
+++ b/addons/document_webdav/__openerp__.py
@@ -30,7 +30,7 @@
{
"name" : "WebDAV server for Document Management",
- "version" : "2.1",
+ "version" : "2.2",
"author" : "OpenERP SA",
"category" : "Generic Modules/Others",
"website": "http://www.openerp.com",
@@ -41,7 +41,10 @@
""",
"depends" : ["base", "document"],
"init_xml" : [],
- "update_xml" : ['security/ir.model.access.csv', "webdav_view.xml", ],
+ "update_xml" : ['security/ir.model.access.csv',
+ 'webdav_view.xml',
+ 'webdav_setup.xml',
+ ],
"demo_xml" : [],
"active": False,
"installable": True
diff --git a/addons/document_webdav/webdav_demo.xml b/addons/document_webdav/webdav_demo.xml
new file mode 100644
index 00000000000..45cd17ed288
--- /dev/null
+++ b/addons/document_webdav/webdav_demo.xml
@@ -0,0 +1,22 @@
+
+
+
+
+ debug:
+ node_class
+ %(node_classname)s
+
+
+
+
+
+
+
diff --git a/addons/document_webdav/webdav_setup.xml b/addons/document_webdav/webdav_setup.xml
new file mode 100644
index 00000000000..2bd41ddb69c
--- /dev/null
+++ b/addons/document_webdav/webdav_setup.xml
@@ -0,0 +1,99 @@
+
+
+
+
+
+
+
+ []
+
+
+
+
+
+ directory
+
+ principals
+
+
+
+ []
+
+
+
+
+
+
+ directory
+
+ groups
+
+
+
+ []
+
+
+
+
+
+ directory
+
+ resources
+
+
+ []
+
+
+
+
+
+
+ ressource
+
+
+ __uids__
+
+
+ []
+
+
+
+
+
+
+
+ ressource
+
+
+ users
+
+
+ []
+
+
+
+
+
+ directory
+
+ locations
+
+
+ DAV:
+ current-user-principal
+ ('href','DAV:','/%s/%s/principals/users/%s' % ('webdav',dbname, username ) )
+
+
+
+ DAV:
+ principal-URL
+ ('href','DAV:','/%s/%s/principals/users/%s' % ('webdav',dbname, username ) )
+
+
+
+
+
diff --git a/addons/project_caldav/__openerp__.py b/addons/project_caldav/__openerp__.py
index 1e78db79bf0..f298fc9e1d5 100644
--- a/addons/project_caldav/__openerp__.py
+++ b/addons/project_caldav/__openerp__.py
@@ -20,13 +20,13 @@
##############################################################################
{
- "name": "Caldav task management",
- "version": "1.0",
+ "name": "CalDAV for task management",
+ "version": "1.1",
"author": "OpenERP SA",
"category": "Generic Modules/Others",
"description": """ Synchronize between Project task and Caldav Vtodo.""",
"depends": ["project", "caldav", "base_calendar"],
- "init_xml": ["project_caldav_data.xml"],
+ "init_xml": ["project_caldav_data.xml", 'project_caldav_setup.xml', ],
"demo_xml": [],
"update_xml": ["project_caldav_view.xml"],
"active": False,
diff --git a/addons/project_caldav/project_caldav_data.xml b/addons/project_caldav/project_caldav_data.xml
index 0a4d36580fc..3030b28dba9 100644
--- a/addons/project_caldav/project_caldav_data.xml
+++ b/addons/project_caldav/project_caldav_data.xml
@@ -3,10 +3,10 @@
- Tasks
-
- vtodo
-
+ Tasks
+
+ vtodo
+
vtodo
diff --git a/addons/project_caldav/project_caldav_setup.xml b/addons/project_caldav/project_caldav_setup.xml
new file mode 100644
index 00000000000..96d9c0ad3b6
--- /dev/null
+++ b/addons/project_caldav/project_caldav_setup.xml
@@ -0,0 +1,272 @@
+
+
+
+
+
+ Tasks per user
+ #FFEF74
+
+ vtodo
+ Tasks
+
+
+
+
+ []
+ attendee
+
+
+
+
+ []
+ valarm
+
+
+
+
+ [('user_id','=', dctx_user_id)]
+ vtodo
+
+
+
+
+
+
+
+ {'needs-action': 'draft', 'completed': 'done', 'in-process': 'open', 'cancelled': 'cancelled'}
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ {'1': '0', '2': '1', '3': '1','4': '1', '5': '2', '6': '3', '7': '3', '8': '3', '9': '4'}
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ hours
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
+
+ field
+
+
+
+
\ No newline at end of file