diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index a94d1a36a9d..03e9a9608cd 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -208,6 +208,10 @@ class account_analytic_account(osv.osv):
             args=[]
         if context is None:
             context={}
+        if context.get('current_model') == 'project.project':
+            cr.execute("select analytic_account_id from project_project")
+            project_ids = [x[0] for x in cr.fetchall()]
+            return self.name_get(cr, uid, project_ids, context=context)
         account = self.search(cr, uid, [('code', '=', name)]+args, limit=limit, context=context)
         if not account:
             account = self.search(cr, uid, [('name', 'ilike', '%%%s%%' % name)]+args, limit=limit, context=context)
diff --git a/addons/caldav/__openerp__.py b/addons/caldav/__openerp__.py
index 40088cb0bac..8f0d00034a8 100644
--- a/addons/caldav/__openerp__.py
+++ b/addons/caldav/__openerp__.py
@@ -56,6 +56,7 @@
                     'wizard/calendar_event_export_view.xml',
                     'wizard/calendar_event_import_view.xml',
                     'wizard/calendar_event_subscribe_view.xml',
+                    'wizard/caldav_browse_view.xml',
                     'caldav_view.xml',
                     'caldav_setup.xml'
                     ], 
diff --git a/addons/caldav/doc/all.rst b/addons/caldav/doc/all.rst
new file mode 100644
index 00000000000..d4bdd31f66a
--- /dev/null
+++ b/addons/caldav/doc/all.rst
@@ -0,0 +1,50 @@
+==========================
+CalDAV How-To
+==========================
+
+
+As from OpenERP v6.0, document_webdav v2.2, the iPhone has been thoroughly
+tested and supported as a Calendaring client for the OpenERP CalDAV module.
+
+However, keep in mind that OpenERP is not a straightforward calendaring
+server, but an ERP application (with more data + structure) which exposes
+that data to calendar clients. That said, the full features that would be
+accessible through the Gtk or Web OpenERP clients cannot be crammed into
+the Calendar clients (such as the iPhone). 
+
+OpenERP server Setup
+--------------------
+Some modules need to be installed at the OpenERP server. These are:
+    - caldav: Required, has the reference setup and the necessary
+            underlying code. Will also cause document, document_webdav
+            to be installed.
+    - crm_caldav: Optional, will export the CRM Meetings as a calendar.
+    - project_caldav: Optional, will export project tasks as calendar.
+    - http_well_known: Optional, experimental. Will ease bootstrapping,
+            but only when a DNS srv record is also used.
+
+These will also install a reference setup of the folders, ready to go.
+The administrator of OpenERP can add more calendars and structure, if
+needed.
+
+DNS server setup
+------------------
+To be documented.
+
+SSL setup
+----------
+It is highly advisable that you also setup SSL to work for the OpenERP
+server. HTTPS is a server-wide feature in OpenERP, which means a 
+certificate will be set at the openerp-server.conf and will be the same
+for XML-RPC, HTTP, WebDAV and CalDAV.
+The iPhone also supports secure connections with SSL, although it does
+not expect a self-signed certificate (or one that is not verified by
+one of the "big" certificate authorities [1] ).
+
+
+[1] I remember one guy that made *lots* of money selling his CA business
+off, and since then uses this money to create a software monopoly.
+
+
+
+
diff --git a/addons/caldav/doc/android.rst b/addons/caldav/doc/android.rst
new file mode 100644
index 00000000000..976ff9b4e27
--- /dev/null
+++ b/addons/caldav/doc/android.rst
@@ -0,0 +1,27 @@
+==================================
+Synchronization with Android phone
+==================================
+
+Prerequire
+----------
+There is no buit-in way to synchronize calendar with caldav.
+So you need to install a third part software : Calendar (CalDav) 
+for now it's the only one
+
+configuration
+-------------
+
+1. Open Calendar Sync
+   I'll get an interface with 2 tabs
+   Stay on the first one
+   
+2. CaDAV Calendar URL : put the URL given above (ie : http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)
+
+3. Put your openerp username and password
+
+4. If your server don't use SSL, you'll get a warnign, say "Yes"
+
+5. Then you can synchronize manually or custom the settings to synchronize every x minutes.
+
+
+
diff --git a/addons/caldav/doc/caldav_doc.pdf b/addons/caldav/doc/caldav_doc.pdf
new file mode 100644
index 00000000000..a9f269aa273
--- /dev/null
+++ b/addons/caldav/doc/caldav_doc.pdf
@@ -0,0 +1,1899 @@
+%PDF-1.3
+%“Œ‹ž ReportLab Generated PDF document http://www.reportlab.com
+% 'BasicFonts': class PDFDictionary 
+1 0 obj
+% The standard fonts dictionary
+<< /F1 2 0 R
+ /F2 3 0 R
+ /F3 4 0 R
+ /F4 5 0 R >>
+endobj
+% 'F1': class PDFType1Font 
+2 0 obj
+% Font Helvetica
+<< /BaseFont /Helvetica
+ /Encoding /WinAnsiEncoding
+ /Name /F1
+ /Subtype /Type1
+ /Type /Font >>
+endobj
+% 'F2': class PDFType1Font 
+3 0 obj
+% Font Helvetica-Bold
+<< /BaseFont /Helvetica-Bold
+ /Encoding /WinAnsiEncoding
+ /Name /F2
+ /Subtype /Type1
+ /Type /Font >>
+endobj
+% 'F3': class PDFType1Font 
+4 0 obj
+% Font Times-Roman
+<< /BaseFont /Times-Roman
+ /Encoding /WinAnsiEncoding
+ /Name /F3
+ /Subtype /Type1
+ /Type /Font >>
+endobj
+% 'F4': class PDFType1Font 
+5 0 obj
+% Font Helvetica-Oblique
+<< /BaseFont /Helvetica-Oblique
+ /Encoding /WinAnsiEncoding
+ /Name /F4
+ /Subtype /Type1
+ /Type /Font >>
+endobj
+% 'Annot.NUMBER1': class PDFDictionary 
+6 0 obj
+<< /A << /S /URI
+ /Type /Action
+ /URI (http://openerp.com:8069/webdav/db_1/calendars/) >>
+ /Border [ 0
+ 0
+ 0 ]
+ /Rect [ 302.5236
+ 129.5936
+ 529.8027
+ 141.5936 ]
+ /Subtype /Link
+ /Type /Annot >>
+endobj
+% 'Page1': class PDFPage 
+7 0 obj
+% Page dictionary
+<< /Annots [ 6 0 R ]
+ /Contents 33 0 R
+ /MediaBox [ 0
+ 0
+ 595.2756
+ 841.8898 ]
+ /Parent 32 0 R
+ /Resources << /Font 1 0 R
+ /ProcSet [ /PDF
+ /Text
+ /ImageB
+ /ImageC
+ /ImageI ] >>
+ /Rotate 0
+ /Trans <<  >>
+ /Type /Page >>
+endobj
+% 'Annot.NUMBER2': class PDFDictionary 
+8 0 obj
+<< /A << /S /URI
+ /Type /Action
+ /URI (http://my.server.ip:8069/webdav/dbname/calendars/) >>
+ /Border [ 0
+ 0
+ 0 ]
+ /Rect [ 85.69291
+ 663.5936
+ 318.0229
+ 675.5936 ]
+ /Subtype /Link
+ /Type /Annot >>
+endobj
+% 'Annot.NUMBER3': class PDFDictionary 
+9 0 obj
+<< /A << /S /URI
+ /Type /Action
+ /URI (https://my.server.ip:8071/) >>
+ /Border [ 0
+ 0
+ 0 ]
+ /Rect [ 92.69291
+ 516.5936
+ 208.6562
+ 528.5936 ]
+ /Subtype /Link
+ /Type /Annot >>
+endobj
+% 'Annot.NUMBER4': class PDFDictionary 
+10 0 obj
+<< /A << /S /URI
+ /Type /Action
+ /URI (http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings) >>
+ /Border [ 0
+ 0
+ 0 ]
+ /Rect [ 85.69291
+ 294.5936
+ 379.7229
+ 306.5936 ]
+ /Subtype /Link
+ /Type /Annot >>
+endobj
+% 'Page2': class PDFPage 
+11 0 obj
+% Page dictionary
+<< /Annots [ 8 0 R
+ 9 0 R
+ 10 0 R ]
+ /Contents 34 0 R
+ /MediaBox [ 0
+ 0
+ 595.2756
+ 841.8898 ]
+ /Parent 32 0 R
+ /Resources << /Font 1 0 R
+ /ProcSet [ /PDF
+ /Text
+ /ImageB
+ /ImageC
+ /ImageI ] >>
+ /Rotate 0
+ /Trans <<  >>
+ /Type /Page >>
+endobj
+% 'Annot.NUMBER5': class PDFDictionary 
+12 0 obj
+<< /A << /S /URI
+ /Type /Action
+ /URI (http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings) >>
+ /Border [ 0
+ 0
+ 0 ]
+ /Rect [ 162.2528
+ 690.5936
+ 503.8577
+ 702.5936 ]
+ /Subtype /Link
+ /Type /Annot >>
+endobj
+% 'Annot.NUMBER6': class PDFDictionary 
+13 0 obj
+<< /A << /S /URI
+ /Type /Action
+ /URI (http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) >>
+ /Border [ 0
+ 0
+ 0 ]
+ /Rect [ 118.6929
+ 678.5936
+ 422.7329
+ 690.5936 ]
+ /Subtype /Link
+ /Type /Annot >>
+endobj
+% 'Annot.NUMBER7': class PDFDictionary 
+14 0 obj
+<< /A << /S /URI
+ /Type /Action
+ /URI (http://www.mozilla.org/projects/calendar/lightning/) >>
+ /Border [ 0
+ 0
+ 0 ]
+ /Rect [ 62.69291
+ 477.5936
+ 282.2129
+ 489.5936 ]
+ /Subtype /Link
+ /Type /Annot >>
+endobj
+% 'Annot.NUMBER8': class PDFDictionary 
+15 0 obj
+<< /A << /S /URI
+ /Type /Action
+ /URI (http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings) >>
+ /Border [ 0
+ 0
+ 0 ]
+ /Rect [ 85.69291
+ 354.5936
+ 379.7229
+ 366.5936 ]
+ /Subtype /Link
+ /Type /Annot >>
+endobj
+% 'Page3': class PDFPage 
+16 0 obj
+% Page dictionary
+<< /Annots [ 12 0 R
+ 13 0 R
+ 14 0 R
+ 15 0 R ]
+ /Contents 35 0 R
+ /MediaBox [ 0
+ 0
+ 595.2756
+ 841.8898 ]
+ /Parent 32 0 R
+ /Resources << /Font 1 0 R
+ /ProcSet [ /PDF
+ /Text
+ /ImageB
+ /ImageC
+ /ImageI ] >>
+ /Rotate 0
+ /Trans <<  >>
+ /Type /Page >>
+endobj
+% 'R17': class PDFCatalog 
+17 0 obj
+% Document Root
+<< /Outlines 19 0 R
+ /PageLabels 36 0 R
+ /PageMode /UseNone
+ /Pages 32 0 R
+ /Type /Catalog >>
+endobj
+% 'R18': class PDFInfo 
+18 0 obj
+<< /Author ()
+ /CreationDate (D:20110107162650-01'00')
+ /Keywords ()
+ /Producer (ReportLab http://www.reportlab.com)
+ /Subject (\(unspecified\))
+ /Title () >>
+endobj
+% 'R19': class PDFOutlines 
+19 0 obj
+<< /Count 15
+ /First 20 0 R
+ /Last 29 0 R
+ /Type /Outlines >>
+endobj
+% 'Outline.0': class OutlineEntryObject 
+20 0 obj
+<< /Count 3
+ /Dest [ 7 0 R
+ /XYZ
+ 62.69291
+ 765.0236
+ 0 ]
+ /First 21 0 R
+ /Last 23 0 R
+ /Next 24 0 R
+ /Parent 19 0 R
+ /Title (CalDAV How-To) >>
+endobj
+% 'Outline.13.0': class OutlineEntryObject 
+21 0 obj
+<< /Dest [ 7 0 R
+ /XYZ
+ 62.69291
+ 648.0236
+ 0 ]
+ /Next 22 0 R
+ /Parent 20 0 R
+ /Title (OpenERP server Setup) >>
+endobj
+% 'Outline.13.1': class OutlineEntryObject 
+22 0 obj
+<< /Dest [ 7 0 R
+ /XYZ
+ 62.69291
+ 450.0236
+ 0 ]
+ /Next 23 0 R
+ /Parent 20 0 R
+ /Prev 21 0 R
+ /Title (DNS server setup) >>
+endobj
+% 'Outline.13.2': class OutlineEntryObject 
+23 0 obj
+<< /Dest [ 7 0 R
+ /XYZ
+ 62.69291
+ 402.0236
+ 0 ]
+ /Parent 20 0 R
+ /Prev 22 0 R
+ /Title (SSL setup) >>
+endobj
+% 'Outline.1': class OutlineEntryObject 
+24 0 obj
+<< /Dest [ 7 0 R
+ /XYZ
+ 62.69291
+ 276.0236
+ 0 ]
+ /Next 25 0 R
+ /Parent 19 0 R
+ /Prev 20 0 R
+ /Title (CalDAV with iPhone How-To) >>
+endobj
+% 'Outline.2': class OutlineEntryObject 
+25 0 obj
+<< /Count 2
+ /Dest [ 11 0 R
+ /XYZ
+ 62.69291
+ 459.0236
+ 0 ]
+ /First 26 0 R
+ /Last 27 0 R
+ /Next 28 0 R
+ /Parent 19 0 R
+ /Prev 24 0 R
+ /Title (Synchronization with Android phone) >>
+endobj
+% 'Outline.14.0': class OutlineEntryObject 
+26 0 obj
+<< /Dest [ 11 0 R
+ /XYZ
+ 62.69291
+ 426.0236
+ 0 ]
+ /Next 27 0 R
+ /Parent 25 0 R
+ /Title (Prerequire) >>
+endobj
+% 'Outline.14.1': class OutlineEntryObject 
+27 0 obj
+<< /Dest [ 11 0 R
+ /XYZ
+ 62.69291
+ 366.0236
+ 0 ]
+ /Parent 25 0 R
+ /Prev 26 0 R
+ /Title (configuration) >>
+endobj
+% 'Outline.3': class OutlineEntryObject 
+28 0 obj
+<< /Dest [ 11 0 R
+ /XYZ
+ 62.69291
+ 222.0236
+ 0 ]
+ /Next 29 0 R
+ /Parent 19 0 R
+ /Prev 25 0 R
+ /Title (Synchronization with Evolution's calendar) >>
+endobj
+% 'Outline.4': class OutlineEntryObject 
+29 0 obj
+<< /Count 2
+ /Dest [ 16 0 R
+ /XYZ
+ 62.69291
+ 555.0236
+ 0 ]
+ /First 30 0 R
+ /Last 31 0 R
+ /Parent 19 0 R
+ /Prev 28 0 R
+ /Title (Synchronization with Sunbird/Lightning) >>
+endobj
+% 'Outline.15.0': class OutlineEntryObject 
+30 0 obj
+<< /Dest [ 16 0 R
+ /XYZ
+ 62.69291
+ 522.0236
+ 0 ]
+ /Next 31 0 R
+ /Parent 29 0 R
+ /Title (Prerequire) >>
+endobj
+% 'Outline.15.1': class OutlineEntryObject 
+31 0 obj
+<< /Dest [ 16 0 R
+ /XYZ
+ 62.69291
+ 462.0236
+ 0 ]
+ /Parent 29 0 R
+ /Prev 30 0 R
+ /Title (configuration) >>
+endobj
+% 'R32': class PDFPages 
+32 0 obj
+% page tree
+<< /Count 3
+ /Kids [ 7 0 R
+ 11 0 R
+ 16 0 R ]
+ /Type /Pages >>
+endobj
+% 'R33': class PDFStream 
+33 0 obj
+% page stream
+<< /Length 7905 >>
+stream
+1 0 0 1 0 0 cm BT /F1 12 Tf 14.4 TL ET
+q
+1 0 0 1 62.69291 744.0236 cm
+q
+BT 1 0 0 1 0 8.435 Tm 21 TL /F2 17.5 Tf 0 0 0 rg (CalDAV How-To) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 714.0236 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 16.82 Tm /F1 10 Tf 12 TL .869213 Tw (As from OpenERP v6.0, document_webdav v2.2, the iPhone has been thoroughly tested and supported) Tj T* 0 Tw (as a Calendaring client for the OpenERP CalDAV module.) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 660.0236 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 40.82 Tm /F1 10 Tf 12 TL .312651 Tw (However, keep in mind that OpenERP is not a straightforward calendaring server, but an ERP application) Tj T* 0 Tw .814104 Tw (\(with more data + structure\) which exposes that data to calendar clients. That said, the full features that) Tj T* 0 Tw 1.645984 Tw (would be accessible through the Gtk or Web OpenERP clients cannot be crammed into the Calendar) Tj T* 0 Tw (clients \(such as the iPhone\).) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 630.0236 cm
+q
+BT 1 0 0 1 0 7.23 Tm 18 TL /F2 15 Tf 0 0 0 rg (OpenERP server Setup) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 492.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 0 117 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F2 10 Tf 12 TL (Some modules need to be installed at the OpenERP server. These are:) Tj T* ET
+Q
+Q
+BT 1 0 0 1 0 104 Tm  T* ET
+q
+1 0 0 1 10 108 cm
+Q
+q
+1 0 0 1 10 108 cm
+Q
+q
+1 0 0 1 10 72 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 21 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 0 15 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F2 10 Tf 12 TL (caldav: Required, has the reference setup and the necessary) Tj T* ET
+Q
+Q
+BT 1 0 0 1 0 2 Tm  T* ET
+q
+1 0 0 1 10 0 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (underlying code. Will also cause document, document_webdav to be installed.) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 10 72 cm
+Q
+q
+1 0 0 1 10 72 cm
+Q
+q
+1 0 0 1 10 54 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (crm_caldav: Optional, will export the CRM Meetings as a calendar.) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 10 54 cm
+Q
+q
+1 0 0 1 10 54 cm
+Q
+q
+1 0 0 1 10 36 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (project_caldav: Optional, will export project tasks as calendar.) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 10 36 cm
+Q
+q
+1 0 0 1 10 36 cm
+Q
+q
+1 0 0 1 10 0 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 21 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 0 15 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F2 10 Tf 12 TL (http_well_known: Optional, experimental. Will ease bootstrapping,) Tj T* ET
+Q
+Q
+BT 1 0 0 1 0 2 Tm  T* ET
+q
+1 0 0 1 10 0 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (but only when a DNS srv record is also used.) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 10 0 cm
+Q
+q
+1 0 0 1 10 0 cm
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 462.0236 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 16.82 Tm /F1 10 Tf 12 TL 1.059986 Tw (These will also install a reference setup of the folders, ready to go. The administrator of OpenERP can) Tj T* 0 Tw (add more calendars and structure, if needed.) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 432.0236 cm
+q
+BT 1 0 0 1 0 7.23 Tm 18 TL /F2 15 Tf 0 0 0 rg (DNS server setup) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 414.0236 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (To be documented.) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 384.0236 cm
+q
+BT 1 0 0 1 0 7.23 Tm 18 TL /F2 15 Tf 0 0 0 rg (SSL setup) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 318.0236 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 52.82 Tm /F1 10 Tf 12 TL .909987 Tw (It is highly advisable that you also setup SSL to work for the OpenERP server. HTTPS is a server-wide) Tj T* 0 Tw .112339 Tw (feature in OpenERP, which means a certificate will be set at the openerp-server.conf and will be the same) Tj T* 0 Tw 1.645366 Tw (for XML-RPC, HTTP, WebDAV and CalDAV. The iPhone also supports secure connections with SSL,) Tj T* 0 Tw .017356 Tw (although it does not expect a self-signed certificate \(or one that is not verified by one of the "big" certificate) Tj T* 0 Tw (authorities [1] \).) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 288.0236 cm
+q
+BT 1 0 0 1 0 16.82 Tm 1.298935 Tw 12 TL /F1 10 Tf 0 0 0 rg ([1] I remember one guy that made ) Tj /F4 10 Tf (lots ) Tj /F1 10 Tf (of money selling his CA business off, and since then uses this) Tj T* 0 Tw (money to create a software monopoly.) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 255.0236 cm
+q
+BT 1 0 0 1 0 8.435 Tm 21 TL /F2 17.5 Tf 0 0 0 rg (CalDAV with iPhone How-To) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 237.0236 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (For SSL specific configuration see the documentation below) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 219.0236 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Now, to setup the calendars, you need to:) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 213.0236 cm
+Q
+q
+1 0 0 1 62.69291 213.0236 cm
+Q
+q
+1 0 0 1 62.69291 195.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (1.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Click on the "Settings" and go to the "Mail, Contacts, Calendars" page.) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 195.0236 cm
+Q
+q
+1 0 0 1 62.69291 195.0236 cm
+Q
+q
+1 0 0 1 62.69291 177.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (2.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Go to "Add account...") Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 177.0236 cm
+Q
+q
+1 0 0 1 62.69291 177.0236 cm
+Q
+q
+1 0 0 1 62.69291 159.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (3.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Click on "Other") Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 159.0236 cm
+Q
+q
+1 0 0 1 62.69291 159.0236 cm
+Q
+q
+1 0 0 1 62.69291 141.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (4.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (From the "Calendars" group, select "Add CalDAV Account") Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 141.0236 cm
+Q
+q
+1 0 0 1 62.69291 141.0236 cm
+Q
+q
+1 0 0 1 62.69291 111.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 15 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (5.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+BT 1 0 0 1 0 16.82 Tm 4.929069 Tw 12 TL /F1 10 Tf 0 0 0 rg (Enter the host's name \(ie : if the url is ) Tj 0 0 .501961 rg (http://openerp.com:8069/webdav/db_1/calendars/ ) Tj 0 0 0 rg (,) Tj T* 0 Tw (openerp.com is the host\)) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 111.0236 cm
+Q
+q
+1 0 0 1 62.69291 111.0236 cm
+Q
+q
+1 0 0 1 62.69291 93.02362 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (6.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Fill Username and password with your openerp login and password) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 93.02362 cm
+Q
+q
+1 0 0 1 62.69291 93.02362 cm
+Q
+ 
+endstream
+
+endobj
+% 'R34': class PDFStream 
+34 0 obj
+% page stream
+<< /Length 8788 >>
+stream
+1 0 0 1 0 0 cm BT /F1 12 Tf 14.4 TL ET
+q
+1 0 0 1 62.69291 747.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (7.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (As a description, you can either leave the server's name or something like "OpenERP calendars".) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 747.0236 cm
+Q
+q
+1 0 0 1 62.69291 747.0236 cm
+Q
+q
+1 0 0 1 62.69291 741.0236 cm
+Q
+q
+1 0 0 1 62.69291 741.0236 cm
+Q
+q
+1 0 0 1 62.69291 723.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (9.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (If you are not using a SSL server, you'll get an error, do not worry and push "Continue") Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 723.0236 cm
+Q
+q
+1 0 0 1 62.69291 723.0236 cm
+Q
+q
+1 0 0 1 62.69291 705.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL .1 0 Td (10.) Tj T* -0.1 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Then click to "Advanced Settings" to specify the right ports and paths.) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 705.0236 cm
+Q
+q
+1 0 0 1 62.69291 705.0236 cm
+Q
+q
+1 0 0 1 62.69291 687.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL .1 0 Td (11.) Tj T* -0.1 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Specify the port for the OpenERP server: 8071 for SSL, 8069 without.) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 687.0236 cm
+Q
+q
+1 0 0 1 62.69291 687.0236 cm
+Q
+q
+1 0 0 1 62.69291 657.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 15 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL .1 0 Td (12.) Tj T* -0.1 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+BT 1 0 0 1 0 16.82 Tm 1.059461 Tw 12 TL /F1 10 Tf 0 0 0 rg (Set the "Account URL" to the right path of the OpenERP webdav: the url given by the wizard \(ie :) Tj T* 0 Tw 0 0 .501961 rg (http://my.server.ip:8069/webdav/dbname/calendars/ ) Tj 0 0 0 rg (\)) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 657.0236 cm
+Q
+q
+1 0 0 1 62.69291 657.0236 cm
+Q
+q
+1 0 0 1 62.69291 651.0236 cm
+Q
+q
+1 0 0 1 62.69291 651.0236 cm
+Q
+q
+1 0 0 1 62.69291 621.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 15 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL .1 0 Td (11.) Tj T* -0.1 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 16.82 Tm /F1 10 Tf 12 TL 1.14528 Tw (Click on Done. The phone will hopefully connect to the OpenERP server and verify it can use the) Tj T* 0 Tw (account.) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 621.0236 cm
+Q
+q
+1 0 0 1 62.69291 621.0236 cm
+Q
+q
+1 0 0 1 62.69291 579.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 27 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL .1 0 Td (12.) Tj T* -0.1 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 28.82 Tm /F1 10 Tf 12 TL 1.036651 Tw (Go to the main menu of the iPhone and enter the Calendar application. Your OpenERP calendars) Tj T* 0 Tw .321235 Tw (will be visible inside the selection of the "Calendars" button. Note that when creating a new calendar) Tj T* 0 Tw (entry, you will have to specify which calendar it should be saved at.) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 579.0236 cm
+Q
+q
+1 0 0 1 62.69291 579.0236 cm
+Q
+q
+1 0 0 1 62.69291 549.0236 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 16.82 Tm /F1 10 Tf 12 TL 1.121894 Tw (IF you need SSL \(and your certificate is not a verified one, as usual\), then you first will need to let the) Tj T* 0 Tw (iPhone trust that. Follow these steps:) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 543.0236 cm
+Q
+q
+1 0 0 1 62.69291 471.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+BT 1 0 0 1 0 2 Tm  T* ET
+q
+1 0 0 1 20 30 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 0 27 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F2 10 Tf 12 TL (s1. Open Safari and enter the https location of the OpenERP server:) Tj T* ET
+Q
+Q
+BT 1 0 0 1 0 14 Tm  T* ET
+q
+1 0 0 1 10 0 cm
+q
+BT 1 0 0 1 0 16.82 Tm .913314 Tw 12 TL /F1 10 Tf 0 0 .501961 rg (https://my.server.ip:8071/ ) Tj 0 0 0 rg (\(assuming you have the server at "my.server.ip" and the HTTPS port is) Tj T* 0 Tw (the default 8071\)) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 20 0 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 0 15 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F2 10 Tf 12 TL (s2. Safari will try to connect and issue a warning about the certificate) Tj T* ET
+Q
+Q
+BT 1 0 0 1 0 2 Tm  T* ET
+q
+1 0 0 1 10 0 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (used. Inspect the certificate and click "Accept" so that iPhone now trusts it.) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 471.0236 cm
+Q
+q
+1 0 0 1 62.69291 438.0236 cm
+q
+BT 1 0 0 1 0 8.435 Tm 21 TL /F2 17.5 Tf 0 0 0 rg (Synchronization with Android phone) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 408.0236 cm
+q
+BT 1 0 0 1 0 7.23 Tm 18 TL /F2 15 Tf 0 0 0 rg (Prerequire) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 378.0236 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 16.82 Tm /F1 10 Tf 12 TL .568409 Tw (There is no buit-in way to synchronize calendar with caldav. So you need to install a third part software :) Tj T* 0 Tw (Calendar \(CalDav\) for now it's the only one) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 348.0236 cm
+q
+BT 1 0 0 1 0 7.23 Tm 18 TL /F2 15 Tf 0 0 0 rg (configuration) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 336.0236 cm
+Q
+q
+1 0 0 1 62.69291 336.0236 cm
+Q
+q
+1 0 0 1 62.69291 318.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (1.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Open Calendar Sync I'll get an interface with 2 tabs Stay on the first one) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 318.0236 cm
+Q
+q
+1 0 0 1 62.69291 318.0236 cm
+Q
+q
+1 0 0 1 62.69291 288.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 15 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (2.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+BT 1 0 0 1 0 16.82 Tm 20.95698 Tw 12 TL /F1 10 Tf 0 0 0 rg (CaDAV Calendar URL : put the URL given above \(ie :) Tj T* 0 Tw 0 0 .501961 rg (http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings) Tj 0 0 0 rg (\)) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 288.0236 cm
+Q
+q
+1 0 0 1 62.69291 288.0236 cm
+Q
+q
+1 0 0 1 62.69291 270.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (3.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Put your openerp username and password) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 270.0236 cm
+Q
+q
+1 0 0 1 62.69291 270.0236 cm
+Q
+q
+1 0 0 1 62.69291 252.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (4.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (If your server don't use SSL, you'll get a warnign, say "Yes") Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 252.0236 cm
+Q
+q
+1 0 0 1 62.69291 252.0236 cm
+Q
+q
+1 0 0 1 62.69291 234.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (5.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Then you can synchronize manually or custom the settings to synchronize every x minutes.) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 234.0236 cm
+Q
+q
+1 0 0 1 62.69291 234.0236 cm
+Q
+q
+1 0 0 1 62.69291 201.0236 cm
+q
+BT 1 0 0 1 0 8.435 Tm 21 TL /F2 17.5 Tf 0 0 0 rg (Synchronization with Evolution's calendar) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 189.0236 cm
+Q
+q
+1 0 0 1 62.69291 189.0236 cm
+Q
+q
+1 0 0 1 62.69291 171.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (1.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Go to Calendar View) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 171.0236 cm
+Q
+q
+1 0 0 1 62.69291 171.0236 cm
+Q
+q
+1 0 0 1 62.69291 153.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (2.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+BT 1 0 0 1 0 4.82 Tm 12 TL /F1 10 Tf 0 0 0 rg (File -) Tj (> New -) Tj (> Calendar) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 153.0236 cm
+Q
+q
+1 0 0 1 62.69291 153.0236 cm
+Q
+ 
+endstream
+
+endobj
+% 'R35': class PDFStream 
+35 0 obj
+% page stream
+<< /Length 7419 >>
+stream
+1 0 0 1 0 0 cm BT /F1 12 Tf 14.4 TL ET
+q
+1 0 0 1 62.69291 603.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 147 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (3.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 0 141 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F2 10 Tf 12 TL (Fill the form) Tj T* ET
+Q
+Q
+BT 1 0 0 1 0 128 Tm  T* ET
+q
+1 0 0 1 10 132 cm
+Q
+q
+1 0 0 1 10 132 cm
+Q
+q
+1 0 0 1 10 114 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (type : CalDav) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 10 114 cm
+Q
+q
+1 0 0 1 10 114 cm
+Q
+q
+1 0 0 1 10 96 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (name : Whaterver you want \(ie : Meeting\)) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 10 96 cm
+Q
+q
+1 0 0 1 10 96 cm
+Q
+q
+1 0 0 1 10 54 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 27 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+BT 1 0 0 1 0 28.82 Tm 12.05494 Tw 12 TL /F1 10 Tf 0 0 0 rg (url : ) Tj 0 0 .501961 rg (http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings ) Tj 0 0 0 rg (\(ie :) Tj T* 0 Tw 2.623953 Tw 0 0 .501961 rg (http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) Tj 0 0 0 rg (\) the one given on the) Tj T* 0 Tw (top of this window) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 10 54 cm
+Q
+q
+1 0 0 1 10 54 cm
+Q
+q
+1 0 0 1 10 36 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (uncheck "User SSL") Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 10 36 cm
+Q
+q
+1 0 0 1 10 36 cm
+Q
+q
+1 0 0 1 10 18 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Username : Your username \(ie : Demo\)) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 10 18 cm
+Q
+q
+1 0 0 1 10 18 cm
+Q
+q
+1 0 0 1 10 0 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Refresh : everytime you want that evolution synchronize the data with the server) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 10 0 cm
+Q
+q
+1 0 0 1 10 0 cm
+Q
+q
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 603.0236 cm
+Q
+q
+1 0 0 1 62.69291 603.0236 cm
+Q
+q
+1 0 0 1 62.69291 585.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (4.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Click ok and give your openerp password) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 585.0236 cm
+Q
+q
+1 0 0 1 62.69291 585.0236 cm
+Q
+q
+1 0 0 1 62.69291 567.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (5.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (A new calendar named with the name you gave should appear on the left side.) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 567.0236 cm
+Q
+q
+1 0 0 1 62.69291 567.0236 cm
+Q
+q
+1 0 0 1 62.69291 534.0236 cm
+q
+BT 1 0 0 1 0 8.435 Tm 21 TL /F2 17.5 Tf 0 0 0 rg (Synchronization with Sunbird/Lightning) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 504.0236 cm
+q
+BT 1 0 0 1 0 7.23 Tm 18 TL /F2 15 Tf 0 0 0 rg (Prerequire) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 474.0236 cm
+q
+BT 1 0 0 1 0 16.82 Tm 12.56998 Tw 12 TL /F1 10 Tf 0 0 0 rg (If you are using thunderbird, first you need to install the lightning module) Tj T* 0 Tw 0 0 .501961 rg (http://www.mozilla.org/projects/calendar/lightning/) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 444.0236 cm
+q
+BT 1 0 0 1 0 7.23 Tm 18 TL /F2 15 Tf 0 0 0 rg (configuration) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 432.0236 cm
+Q
+q
+1 0 0 1 62.69291 432.0236 cm
+Q
+q
+1 0 0 1 62.69291 414.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (1.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Go to Calendar View) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 414.0236 cm
+Q
+q
+1 0 0 1 62.69291 414.0236 cm
+Q
+q
+1 0 0 1 62.69291 396.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (2.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+BT 1 0 0 1 0 4.82 Tm 12 TL /F1 10 Tf 0 0 0 rg (File -) Tj (> New Calendar) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 396.0236 cm
+Q
+q
+1 0 0 1 62.69291 396.0236 cm
+Q
+q
+1 0 0 1 62.69291 378.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (3.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Chosse "On the Network") Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 378.0236 cm
+Q
+q
+1 0 0 1 62.69291 378.0236 cm
+Q
+q
+1 0 0 1 62.69291 348.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 15 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (4.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+BT 1 0 0 1 0 16.82 Tm 13.06331 Tw 12 TL /F1 10 Tf 0 0 0 rg (for format choose CalDav and as location the url given above \(ie :) Tj T* 0 Tw 0 0 .501961 rg (http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings) Tj 0 0 0 rg (\)) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 348.0236 cm
+Q
+q
+1 0 0 1 62.69291 348.0236 cm
+Q
+q
+1 0 0 1 62.69291 330.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (5.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Choose a name and a color for the Calendar, and we advice you to uncheck "alarm") Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 330.0236 cm
+Q
+q
+1 0 0 1 62.69291 330.0236 cm
+Q
+q
+1 0 0 1 62.69291 300.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 15 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (6.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 16.82 Tm /F1 10 Tf 12 TL .23061 Tw (Then put your openerp login and password \(to give the password only check the box "Use password) Tj T* 0 Tw (Manager to remember this password") Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 300.0236 cm
+Q
+q
+1 0 0 1 62.69291 300.0236 cm
+Q
+q
+1 0 0 1 62.69291 282.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (7.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Then Finish, your meetings should appear now in your calendar view) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 282.0236 cm
+Q
+q
+1 0 0 1 62.69291 282.0236 cm
+Q
+ 
+endstream
+
+endobj
+% 'R36': class PDFPageLabels 
+36 0 obj
+% Document Root
+<< /Nums [ 0
+ 37 0 R
+ 1
+ 38 0 R
+ 2
+ 39 0 R ] >>
+endobj
+% 'R37': class PDFPageLabel 
+37 0 obj
+% None
+<< /S /D
+ /St 1 >>
+endobj
+% 'R38': class PDFPageLabel 
+38 0 obj
+% None
+<< /S /D
+ /St 2 >>
+endobj
+% 'R39': class PDFPageLabel 
+39 0 obj
+% None
+<< /S /D
+ /St 3 >>
+endobj
+xref
+0 40
+0000000000 65535 f
+0000000113 00000 n
+0000000245 00000 n
+0000000410 00000 n
+0000000585 00000 n
+0000000754 00000 n
+0000000947 00000 n
+0000001197 00000 n
+0000001510 00000 n
+0000001777 00000 n
+0000002021 00000 n
+0000002288 00000 n
+0000002619 00000 n
+0000002901 00000 n
+0000003185 00000 n
+0000003455 00000 n
+0000003722 00000 n
+0000004051 00000 n
+0000004210 00000 n
+0000004422 00000 n
+0000004548 00000 n
+0000004766 00000 n
+0000004949 00000 n
+0000005143 00000 n
+0000005312 00000 n
+0000005512 00000 n
+0000005767 00000 n
+0000005941 00000 n
+0000006115 00000 n
+0000006332 00000 n
+0000006576 00000 n
+0000006750 00000 n
+0000006908 00000 n
+0000007033 00000 n
+0000015039 00000 n
+0000023928 00000 n
+0000031452 00000 n
+0000031571 00000 n
+0000031648 00000 n
+0000031725 00000 n
+trailer
+<< /ID 
+ % ReportLab generated PDF document -- digest (http://www.reportlab.com) 
+ [(mv%4\225;\371K\301E+\242\376\216\356E) (mv%4\225;\371K\301E+\242\376\216\356E)] 
+
+ /Info 18 0 R
+ /Root 17 0 R
+ /Size 40 >>
+startxref
+31772
+%%EOF
diff --git a/addons/caldav/doc/evolution.rst b/addons/caldav/doc/evolution.rst
new file mode 100644
index 00000000000..11580ae02ef
--- /dev/null
+++ b/addons/caldav/doc/evolution.rst
@@ -0,0 +1,23 @@
+=========================================
+Synchronization with Evolution's calendar
+=========================================
+
+1. Go to Calendar View
+
+2. File -> New -> Calendar
+
+3. Fill the form 
+    - type : CalDav
+    - name : Whaterver you want (ie : Meeting)
+    - url : http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie :
+      http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) 
+      the one given on the top of this window
+    - uncheck "User SSL"
+    - Username : Your username (ie : Demo)
+    - Refresh : everytime you want that evolution synchronize the data with the server
+
+4. Click ok and give your openerp password
+
+5. A new calendar named with the name you gave should appear on the left side.
+
+
diff --git a/addons/caldav/doc/iPhone.rst b/addons/caldav/doc/iPhone.rst
index 76941bfeb8b..62e66412d56 100644
--- a/addons/caldav/doc/iPhone.rst
+++ b/addons/caldav/doc/iPhone.rst
@@ -2,67 +2,55 @@
 CalDAV with iPhone How-To
 ==========================
 
-As from OpenERP v6.0, document_webdav v2.2, the iPhone has been thoroughly
-tested and supported as a Calendaring client for the OpenERP CalDAV module.
-
-However, keep in mind that OpenERP is not a straightforward calendaring
-server, but an ERP application (with more data + structure) which exposes
-that data to calendar clients. That said, the full features that would be
-accessible through the Gtk or Web OpenERP clients cannot be crammed into
-the Calendar clients (such as the iPhone).
-
-
-Phone setup
--------------
-The iPhone is fairly easy to setup.
-IF you need SSL (and your certificate is not a verified one, as usual),
-then you first will need to let the iPhone trust that. Follow these
-steps:
-  s1. Open Safari and enter the https location of the OpenERP server:
-      https://my.server.ip:8071/
-      (assuming you have the server at "my.server.ip" and the HTTPS port
-      is the default 8071)
-  s2. Safari will try to connect and issue a warning about the certificate
-      used. Inspect the certificate and click "Accept" so that iPhone
-      now trusts it.
+For SSL specific configuration see the documentation below
 
 Now, to setup the calendars, you need to:
+
 1. Click on the "Settings" and go to the "Mail, Contacts, Calendars" page.
 2. Go to "Add account..."
 3. Click on "Other"
 4. From the "Calendars" group, select "Add CalDAV Account"
-5. Enter the server's name or IP address at the "Server" entry, the
-      OpenERP username and password at the next ones.
-      As a description, you can either leave the server's name or
-      something like "OpenERP calendars".
-6. You _will_ get the "Unable to verify account" error message. That is
-      because our server is not at the port iPhone expects[2]. But no
-      need to worry, click OK.
-7. At the next page, enter the "Advanced Settings" to specify the right
-      ports and paths 
-8. If you have SSL, turn the switch on. Note that port will be changed
-      to 8443.
-9. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.
-10. Set the "Account URL" to the right path of the OpenERP webdav:
-      https://my.server.ip:8071/webdav/dbname/calendars
-      Where "https://my.server.ip:8071" is the protocol, server name 
-      and port as discussed above, "dbname" is the name of the database.
-      [Note that the default 
-      "https://my.server.ip:8071/principals/users/username" might also
-      be edited to 
-      "https://my.server.ip:8071/webdav/dbname/principals/users/username" ]
+
+5. Enter the host's name 
+   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , openerp.com is the host)
+
+6. Fill Username and password with your openerp login and password
+
+7. As a description, you can either leave the server's name or
+   something like "OpenERP calendars".
+
+9. If you are not using a SSL server, you'll get an error, do not worry and push "Continue"
+
+10. Then click to "Advanced Settings" to specify the right
+    ports and paths. 
+    
+11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.
+
+12. Set the "Account URL" to the right path of the OpenERP webdav:
+    the url given by the wizard (ie : http://my.server.ip:8069/webdav/dbname/calendars/ )
+
 11. Click on Done. The phone will hopefully connect to the OpenERP server
-      and verify it can use the account.
+    and verify it can use the account.
+
 12. Go to the main menu of the iPhone and enter the Calendar application.
-      Your OpenERP calendars will be visible inside the selection of the
-      "Calendars" button.
+    Your OpenERP calendars will be visible inside the selection of the
+    "Calendars" button.
     Note that when creating a new calendar entry, you will have to specify
     which calendar it should be saved at.
 
 
 
+IF you need SSL (and your certificate is not a verified one, as usual),
+then you first will need to let the iPhone trust that. Follow these
+steps:
+
+    s1. Open Safari and enter the https location of the OpenERP server:
+      https://my.server.ip:8071/
+      (assuming you have the server at "my.server.ip" and the HTTPS port
+      is the default 8071)
+    s2. Safari will try to connect and issue a warning about the certificate
+      used. Inspect the certificate and click "Accept" so that iPhone
+      now trusts it.
+
 
 
-[2] This may not happen if the SRV records at DNS and the well-known URIs
-are setup right. But we appreciate that a default OpenERP installation will
-not have the DNS server of the company's domain configured.
diff --git a/addons/caldav/doc/makefile b/addons/caldav/doc/makefile
new file mode 100644
index 00000000000..4424647b08d
--- /dev/null
+++ b/addons/caldav/doc/makefile
@@ -0,0 +1,15 @@
+all: compile clean
+
+concat: all.rst
+	cat all.rst iPhone.rst android.rst evolution.rst sunbird.rst  > compile.rst
+    
+compile: concat
+	rst2pdf compile.rst -o caldav_doc.pdf 
+	
+debug: compile
+
+clean:
+	rm compile.rst 
+
+del: 
+	rm caldav_doc.pdf
diff --git a/addons/caldav/doc/sunbird.rst b/addons/caldav/doc/sunbird.rst
new file mode 100644
index 00000000000..03af175eccc
--- /dev/null
+++ b/addons/caldav/doc/sunbird.rst
@@ -0,0 +1,28 @@
+======================================
+Synchronization with Sunbird/Lightning
+======================================
+
+Prerequire
+----------
+If you are using thunderbird, first you need to install the lightning module
+http://www.mozilla.org/projects/calendar/lightning/
+
+configuration
+-------------
+
+1. Go to Calendar View
+
+2. File -> New Calendar
+
+3. Chosse "On the Network"
+
+4. for format choose CalDav
+   and as location the url given above (ie : http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)
+   
+5. Choose a name and a color for the Calendar, and we advice you to uncheck "alarm"
+
+6. Then put your openerp login and password (to give the password only check the box "Use password Manager to remember this password"
+
+7. Then Finish, your meetings should appear now in your calendar view
+
+
diff --git a/addons/caldav/wizard/__init__.py b/addons/caldav/wizard/__init__.py
index 1c45cb2a191..059be057b61 100644
--- a/addons/caldav/wizard/__init__.py
+++ b/addons/caldav/wizard/__init__.py
@@ -22,5 +22,5 @@
 import calendar_event_export
 import calendar_event_import
 import calendar_event_subscribe
-
+import caldav_browse
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/wizard/caldav_browse.py b/addons/caldav/wizard/caldav_browse.py
new file mode 100644
index 00000000000..dfb7385931f
--- /dev/null
+++ b/addons/caldav/wizard/caldav_browse.py
@@ -0,0 +1,282 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools import config
+import base64
+import addons
+from tools.translate import _
+
+class caldav_browse(osv.osv_memory):
+    
+    __doc = {
+    
+    'other' : _("""
+  * Webdav server that provides remote access to calendar
+  * Synchronisation of calendar using WebDAV
+  * Customize calendar event and todo attribute with any of OpenERP model
+  * Provides iCal Import/Export functionality
+
+    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,
+        HOSTNAME: Host on which OpenERP server(With webdav) is running
+        PORT : Port on which OpenERP server is running (By Default : 8069)
+        DATABASE_NAME: Name of database on which OpenERP Calendar is created
+        CALENDAR_NAME: Name of calendar to access
+     """),
+     
+     
+     
+     'iphone' : _("""
+    For SSL specific configuration see the documentation below
+
+Now, to setup the calendars, you need to:
+
+1. Click on the "Settings" and go to the "Mail, Contacts, Calendars" page.
+2. Go to "Add account..."
+3. Click on "Other"
+4. From the "Calendars" group, select "Add CalDAV Account"
+
+5. Enter the host's name 
+   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , openerp.com is the host)
+
+6. Fill Username and password with your openerp login and password
+
+7. As a description, you can either leave the server's name or
+   something like "OpenERP calendars".
+
+9. If you are not using a SSL server, you'll get an error, do not worry and push "Continue"
+
+10. Then click to "Advanced Settings" to specify the right
+    ports and paths. 
+    
+11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.
+
+12. Set the "Account URL" to the right path of the OpenERP webdav:
+    the url given by the wizard (ie : http://my.server.ip:8069/webdav/dbname/calendars/ )
+
+11. Click on Done. The phone will hopefully connect to the OpenERP server
+    and verify it can use the account.
+
+12. Go to the main menu of the iPhone and enter the Calendar application.
+    Your OpenERP calendars will be visible inside the selection of the
+    "Calendars" button.
+    Note that when creating a new calendar entry, you will have to specify
+    which calendar it should be saved at.
+
+
+
+IF you need SSL (and your certificate is not a verified one, as usual),
+then you first will need to let the iPhone trust that. Follow these
+steps:
+
+    s1. Open Safari and enter the https location of the OpenERP server:
+      https://my.server.ip:8071/
+      (assuming you have the server at "my.server.ip" and the HTTPS port
+      is the default 8071)
+    s2. Safari will try to connect and issue a warning about the certificate
+      used. Inspect the certificate and click "Accept" so that iPhone
+      now trusts it.   
+    """),
+    'android' : _("""
+Prerequire
+----------
+There is no buit-in way to synchronize calendar with caldav.
+So you need to install a third part software : Calendar (CalDav) 
+for now it's the only one
+
+configuration
+-------------
+
+1. Open Calendar Sync
+   I'll get an interface with 2 tabs
+   Stay on the first one
+   
+2. CaDAV Calendar URL : put the URL given above (ie : http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)
+
+3. Put your openerp username and password
+
+4. If your server don't use SSL, you'll get a warnign, say "Yes"
+
+5. Then you can synchronize manually or custom the settings to synchronize every x minutes.
+    
+    """),
+    
+     'evolution' : _("""
+    1. Go to Calendar View
+
+    2. File -> New -> Calendar
+
+    3. Fill the form 
+        - type : CalDav
+        - name : Whaterver you want (ie : Meeting)
+        - url : http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one given on the top of this window
+        - uncheck "User SSL"
+        - Username : Your username (ie : Demo)
+        - Refresh : everytime you want that evolution synchronize the data with the server
+
+    4. Click ok and give your openerp password
+
+    5. A new calendar named with the name you gave should appear on the left side.     
+     """),
+     
+     
+     'thunderbird' : _("""
+Prerequire
+----------
+If you are using thunderbird, first you need to install the lightning module
+http://www.mozilla.org/projects/calendar/lightning/
+
+configuration
+-------------
+
+1. Go to Calendar View
+
+2. File -> New Calendar
+
+3. Chosse "On the Network"
+
+4. for format choose CalDav
+   and as location the url given above (ie : http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)
+   
+5. Choose a name and a color for the Calendar, and we advice you to uncheck "alarm"
+
+6. Then put your openerp login and password (to give the password only check the box "Use password Manager to remember this password"
+
+7. Then Finish, your meetings should appear now in your calendar view
+"""),
+    }
+    
+    
+    _name = 'caldav.browse'
+    _description = 'Caldav Browse'
+
+    _columns = {
+        'url' : fields.char('Caldav Server', size=264, required=True, help="Url of the caldav server, use for synchronization"),
+        'caldav_doc_file':fields.binary('Caldav Document', readonly=True, help="download full caldav Documentation."),
+        'description':fields.text('Description', readonly=True)
+    }
+
+    def default_get(self, cr, uid, fields, context=None):
+        res = {}
+        host = ''
+        port = ''
+        prefix = 'http://'  
+        if not config.get('xmlrpc'):
+            if not config.get('netrpc'):
+                prefix = 'https://' 
+                host = config.get('xmlrpcs_interface', None)
+                port = config.get('xmlrpcs_port', 8071)
+            else:
+                host = config.get('netrpc_interface', None)
+                port = config.get('netrpc_port',8070) 
+        else: 
+            host = config.get('xmlrpc_interface', None)
+            port = config.get('xmlrpc_port',8069)
+        if host ==  '' or None:
+                host = 'localhost'
+                port = 8069
+        if not config.get_misc('webdav','enable',True):
+            raise Exception("WebDAV is disabled, cannot continue")
+        user_pool = self.pool.get('res.users')
+        current_user = user_pool.browse(cr, uid, uid, context=context)
+        pref_obj = self.pool.get('user.preference')
+        pref_ids = pref_obj.browse(cr, uid ,context.get('rec_id',False), context=context)
+        #TODO write documentation
+        res['description'] = self.__doc['other']
+        if pref_ids:
+            pref_ids = pref_ids[0] 
+            if pref_ids.device == 'iphone':
+                url = host + ':' + str(port) + '/'+ pref_ids.service + '/' + cr.dbname + '/'+'calendars/'
+            else :
+                url = host + ':' + str(port) + '/'+ pref_ids.service + '/' + cr.dbname + '/'+'calendars/'+ 'users/'+ current_user.login + '/'+ pref_ids.collection.name+ '/'+ pref_ids.calendar.name
+            
+            res['description'] = self.__doc.get(pref_ids.device , self.__doc['other'])
+        file = open(addons.get_module_resource('caldav','doc', 'caldav_doc.pdf'),'rb')
+        res['caldav_doc_file'] = base64.encodestring(file.read())
+        
+        
+        res['url'] = prefix+url
+        return res
+
+    def browse_caldav(self, cr, uid, ids, context):
+
+        return {}
+
+caldav_browse()
+
+class user_preference(osv.osv_memory):
+    
+    _name = 'user.preference'
+    _description = 'User preference Form'
+
+    _columns = {
+               'collection' :fields.many2one('document.directory', "Calendar Collection", required=True, domain = [('calendar_collection', '=', True)]),
+               'calendar' :fields.many2one('basic.calendar', 'Calendar', required=True),
+               'service': fields.selection([('webdav','CalDAV')], "Services"),
+               'device' : fields.selection([('other', 'Other'), ('iphone', 'iPhone'), ('android', 'Android based device'),('thunderbird', 'Sunbird/Thunderbird'), ('evolution','Evolution')], "Software/Devices")
+    }
+    
+    def _get_default_calendar(self, cr, uid, context):
+        if context == None:
+            context = {}
+        name = context.get('cal_name')
+        
+        collection_obj = self.pool.get('basic.calendar')
+        ids = collection_obj.search(cr, uid, [('name', '=', name)])
+        return ids[0]
+       
+        
+    def _get_default_collection(self, cr, uid, context):
+        collection_obj = self.pool.get('document.directory')
+        ids = collection_obj.search(cr, uid, [('name', '=', 'c')])
+        return ids[0]
+    
+        
+    _defaults={
+              'service': 'webdav',
+              'collection' : _get_default_collection,
+              'calendar' : _get_default_calendar,
+              'device' : 'other'
+    }    
+   
+    def open_window(self, cr, uid, ids, context=None):
+        obj_model = self.pool.get('ir.model.data')
+        model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','caldav_Browse')])
+        resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])
+        context.update({'rec_id': ids})
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'caldav.browse',
+            'views': [(resource_id,'form')],
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'context': context,
+        }
+    
+    
+user_preference()
diff --git a/addons/caldav/wizard/caldav_browse_view.xml b/addons/caldav/wizard/caldav_browse_view.xml
new file mode 100644
index 00000000000..dc3e53b0627
--- /dev/null
+++ b/addons/caldav/wizard/caldav_browse_view.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+    <record id="caldav_browse_form" model="ir.ui.view">
+            <field name="name">caldav_Browse</field>
+            <field name="model">caldav.browse</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Browse caldav" >
+                    <group colspan="4" width="700" height="500">
+                        <separator string="Browse caldav" colspan="4"/>
+                        <field name="url" colspan="4" />
+                        
+                        <separator string="Description" colspan="4"/>
+                        <field name="description"  colspan="4"  nolabel="1"/>
+                        <separator colspan="4"/>
+                        <field name="caldav_doc_file"  colspan="4" />
+                        <group col="4" colspan="4">
+                            <label string="" colspan="2"/>
+                            <button name="browse_caldav" string="_Ok" type="object" icon="gtk-ok"/>
+                        </group>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+     <record id="user_prefernce_form" model="ir.ui.view">
+            <field name="name">user_preference</field>
+            <field name="model">user.preference</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="User Preference">
+                    <separator string="" colspan="4"/>
+                    <field name="service"  colspan="4" width="250" readonly="1"/>
+                    <field name="collection"  colspan="4" width="250" invisible="1" />
+                    <field name="calendar"  colspan="4" width="250" domain="[('collection_id','=', collection)]" readonly="1"/>
+                    <field name="device"  colspan="4" width="250" />
+                    <separator colspan="4"/>
+                    <group col="4" colspan="4">
+                        <label string="" colspan="2"/>
+                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                        <button name="open_window" string="_Open" type="object" icon="gtk-ok"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        
+    </data>
+</openerp>
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 89dc61bef59..74eb1a95b23 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -125,6 +125,7 @@ Create dashboard for CRM that includes:
             'test/test_crm_meeting.yml',
             'test/test_crm_opportunity.yml',
             'test/test_crm_phonecall.yml',
+            'test/test_crm_recurrent_meeting.yml',
              ],
     'installable': True,
     'active': False,
diff --git a/addons/crm/test/test_crm_recurrent_meeting.yml b/addons/crm/test/test_crm_recurrent_meeting.yml
new file mode 100644
index 00000000000..297ca8d5e4e
--- /dev/null
+++ b/addons/crm/test/test_crm_recurrent_meeting.yml
@@ -0,0 +1,106 @@
+-
+  In order to test recurrent meetings in OpenERP, I create meetings with different recurrency.
+-
+  I create a customer meeting record with daily recurrency.
+- 
+  !record {model: crm.meeting, id: crm_meeting_pricelistdiscussion0}:
+    categ_id: crm.categ_meet1
+    count: 0.0
+    date: '2011-01-05 00:00:00'
+    date_deadline: '2011-01-05 01:00:00'
+    day: 0.0
+    duration: 1.0
+    end_date: '2011-01-12'
+    end_type: end_date
+    name: Pricelist Discussion
+    recurrency: true
+    recurrent_uid: 0.0
+    rrule: FREQ=DAILY;INTERVAL=1;UNTIL=20110112T235959Z
+    rrule_type: daily
+    sequence: 0.0
+- 
+  I create another meeting record with weekly recurrency.
+- 
+  !record {model: crm.meeting, id: crm_meeting_changesindesigning0}:
+    categ_id: crm.categ_meet2
+    count: 15
+    date: '2011-01-22 11:05:05'
+    date_deadline: '2011-01-22 16:05:05'
+    day: 0.0
+    duration: 5.0
+    email_from: info@opensides.be
+    end_type: count
+    fr: true
+    mo: true
+    name: Changes in Designing
+    partner_address_id: base.res_partner_address_1
+    partner_id: base.res_partner_9
+    recurrency: true
+    recurrent_uid: 0.0
+    rrule: FREQ=WEEKLY;BYDAY=FR,TU,TH,WE,MO;INTERVAL=1;COUNT=15
+    rrule_type: weekly
+    section_id: crm.section_sales_department
+    sequence: 0.0
+    th: true
+    tu: true
+    user_id: base.user_demo
+    we: true
+-
+  I create a meeting record with monthly recurrency.
+- 
+  !record {model: crm.meeting, id: crm_meeting_reviewneeds0}:
+    categ_id: crm.categ_meet3
+    count: 0.0
+    date: '2011-01-20 10:02:02'
+    date_deadline: '2011-01-20 16:02:02'
+    day: 15
+    duration: 6.0
+    end_date: '2011-05-31'
+    end_type: end_date
+    name: Review needs
+    partner_address_id: base.res_partner_address_15
+    partner_id: base.res_partner_11
+    recurrency: true
+    recurrent_uid: 0.0
+    rrule: FREQ=MONTHLY;INTERVAL=1;UNTIL=20110531T235959Z;BYMONTHDAY=15
+    rrule_type: monthly
+    section_id: crm.section_sales_department
+    sequence: 0.0
+    user_id: base.user_demo
+- 
+  I create a record for daily scrum meeting.
+- 
+  !record {model: crm.meeting, id: crm_meeting_scrummeeting0}:
+    categ_id: crm.categ_meet2
+    count: 0.0
+    date: '2011-01-06 00:00:00'
+    date_deadline: '2011-01-06 01:00:00'
+    day: 0.0
+    duration: 1.0
+    name: Scrum meeting
+    recurrency: true
+    recurrent_uid: 0.0
+    rrule: FREQ=DAILY;INTERVAL=1
+    rrule_type: daily
+    sequence: 0.0    
+-
+  I create a meeting record for yearly recurrency.
+- 
+  !record {model: crm.meeting, id: crm_meeting_updatethedata0}:
+    categ_id: crm.categ_meet2
+    count: 0.0
+    date: '2011-01-18 13:12:49'
+    date_deadline: '2011-01-19 02:30:49'
+    day: 0.0
+    duration: 13.300000000000001
+    end_date: '2015-01-06'
+    end_type: end_date
+    name: Update the data
+    partner_address_id: base.res_partner_address_7
+    partner_id: base.res_partner_4
+    recurrency: true
+    recurrent_uid: 0.0
+    rrule: FREQ=YEARLY;INTERVAL=1;UNTIL=20150106T235959Z
+    rrule_type: yearly
+    section_id: crm.section_sales_department
+    sequence: 0.0
diff --git a/addons/crm_caldav/__openerp__.py b/addons/crm_caldav/__openerp__.py
index fa3a9fc4335..7b2c5fcfcca 100644
--- a/addons/crm_caldav/__openerp__.py
+++ b/addons/crm_caldav/__openerp__.py
@@ -1,3 +1,4 @@
+
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
@@ -36,7 +37,7 @@
                 'crm_caldav_setup.xml',
                 ],
 
-    'update_xml': [],
+    'update_xml': ['crm_caldav_view.xml'],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/crm_caldav/crm_caldav_view.xml b/addons/crm_caldav/crm_caldav_view.xml
new file mode 100644
index 00000000000..cc1b6d00396
--- /dev/null
+++ b/addons/crm_caldav/crm_caldav_view.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record id="action_caldav_browse" model="ir.actions.act_window">
+            <field name="name">Caldav Browse</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">user.preference</field>
+            <field name="view_id" ref="caldav.user_prefernce_form"/>
+            <field name="context">{'cal_name' : 'Meetings'}</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+    
+        <menuitem
+            name="Synchronyze this calendar"
+            action="action_caldav_browse"
+            id="menu_caldav_browse"
+            icon="STOCK_EXECUTE"
+            parent="crm.menu_meeting_sale" sequence="1"/>
+            
+        
+    </data>
+</openerp> 
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index cff66049d3b..6f82dde0a4f 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -108,7 +108,7 @@
                             <field name="extension"/>
                             <field name="include_name"/>
                             <separator string="PDF Report" colspan="4"/>
-                            <field name="report_id" domain="[ ('type','=','ressource'),('model_id','=',parent.ressource_type_id)]"/>
+                            <field name="report_id" domain="[('model_id','=',parent.ressource_type_id)]"/>
                         </form>
                         <tree string="Contents">
                             <field name="sequence" string="Seq."/>
diff --git a/addons/project/project.py b/addons/project/project.py
index c076ed764d4..dda6819839a 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -129,7 +129,6 @@ class project(osv.osv):
         'priority': fields.integer('Sequence', help="Gives the sequence order when displaying a list of task"),
         'warn_manager': fields.boolean('Warn Manager', help="If you check this field, the project manager will receive a request each time a task is completed by his team.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members', help="Project's member. Not used in any computation, just for information purpose.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-        'parent_id': fields.many2one('project.project', 'Parent Project'),
         'tasks': fields.one2many('project.task', 'project_id', "Project tasks"),
         'planned_hours': fields.function(_progress_rate, multi="progress", method=True, string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects.",
             store = {
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index c3f14a5356c..8ede2ce7955 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -15,13 +15,17 @@
             <field name="object">project.task</field>
         </record>
         
+
+        <!--
         Resource: project.project
-        
+        -->
+
         <record id="all_projects_account" model="account.analytic.account">
             <field name="name">Projects</field>
             <field name="code">3</field>
         </record>
     
         <function eval="('default',False,'parent_id', [('project.project', False)], all_projects_account, True, False, False, False, True)" id="parent_project_default_set" model="ir.values" name="set"/>
+
     </data>
 </openerp>
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 98efff361b3..29063588ef7 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -216,13 +216,13 @@
         </record>
 
         <!--
-	Resource: project.project
-	-->
+    Resource: project.project
+    -->
         <record id="base.main_company" model="res.company">
             <field name="project_time_mode_id" ref="product.uom_hour"></field>
         </record>
 
-		<!-- Task Types -->
+        <!-- Task Types -->
         <record id="project_tt_specification" model="project.task.type">
             <field name="sequence">1</field>
             <field name="name">Specification</field>
@@ -232,7 +232,7 @@
             <field name="name">Development</field>
         </record>
         <record id="project_tt_testing" model="project.task.type">
-        	<field name="sequence">3</field>
+            <field name="sequence">3</field>
             <field name="name">Testing</field>
         </record>
         <record id="project_tt_merge" model="project.task.type">
@@ -241,6 +241,13 @@
         </record>
 
         <!-- Projects -->
+        <!-- Projects -->
+        <!-- <record id="all_projects_account" model="project.project">
+            <field name="name">Projects</field>
+            <field name="code">3</field>
+        </record> -->
+        
+
         <record id="project_project_9" model="project.project">
             <field name="warn_manager">1</field>
             <field name="name">OpenERP Integration</field>
@@ -270,7 +277,7 @@
             <field eval="[(6, 0, [ref('project_tt_development')])]" name="type_ids"/>
         </record>
 
-		<!-- Tasks -->
+        <!-- Tasks -->
         <record id="project_task_116" model="project.task">
             <field name="planned_hours">38.0</field>
             <field name="remaining_hours">38.0</field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 20cdf9e9bd5..9539bd9acad 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -21,7 +21,7 @@
                 <form string="Project">
                     <group colspan="6" col="6">
                         <field name="name" string="Project Name" select="1"/>
-                        <field name="parent_id" domain="[('id','!=',active_id)]"/>
+                        <field name="parent_id" string="Parent Project" domain="[('id','!=',active_id)]" context="{'current_model': 'project.project'}"/>
                         <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                         <field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                         <field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
@@ -143,7 +143,7 @@
                     <field name="name" string="Project Name"/>
                     <field name="user_id" string="Project Manager"/>
                     <field name="partner_id" string="Partner"/>
-                    <field name="parent_id" invisible="1"/>
+                    <field name="parent_id" string="Parent Project" invisible="1"/>
                     <field name="planned_hours" widget="float_time"/>
                     <field name="total_hours" widget="float_time"/>
                     <field name="effective_hours" widget="float_time"/>
diff --git a/addons/project_caldav/project_caldav_view.xml b/addons/project_caldav/project_caldav_view.xml
index 0c072458acc..9c4e34be0f8 100644
--- a/addons/project_caldav/project_caldav_view.xml
+++ b/addons/project_caldav/project_caldav_view.xml
@@ -80,45 +80,45 @@
             <field name="arch" type="xml">
                 <notebook colspan="4" position="inside">
                     <page string="Recurrency Option" attrs="{'invisible':[('recurrency','=',False)]}">
-	                    <group colspan="2" col="4" >
-	                         <field name="rrule_type" string="Recurrency" colspan="1" attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
-	                    </group>
-	                    <newline/>
-	                    <group col="4" colspan="6" name="rrule">
-	                        <separator string="Recurrency Rule" colspan="8"/>
-	                        <group col="6" colspan="4">
+                        <group colspan="2" col="4" >
+                             <field name="rrule_type" string="Recurrency" colspan="1" attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
+                        </group>
+                        <newline/>
+                        <group col="4" colspan="6" name="rrule">
+                            <separator string="Recurrency Rule" colspan="8"/>
+                            <group col="6" colspan="4">
                                 <field name="interval" string="Repeat Times" attrs="{'readonly': [('end_date','!=',False)]}"/>
                                 <field name="count" attrs="{'readonly': [('end_date','!=',False)]}"/>
                                 <field name="end_date" attrs="{'invisible': [('readonly','!=',False)]}"/>
-	                        </group>
-	                        <group col="14" colspan="4" name="Select weekdays" 
-	                                attrs="{'invisible' :[('rrule_type','not in', ['weekly','daily_working'])]}">
-		                        <field name="mo" colspan="1" />
-		                        <field name="tu" colspan="1" />
-		                        <field name="we" colspan="1" />
-		                        <field name="th" colspan="1" />
-		                        <newline/>
-		                        <field name="fr" colspan="1" />
-		                        <field name="sa" colspan="1"  attrs="{'invisible': [('rrule_type','=','daily_working')]}"/>
-		                        <field name="su" colspan="1"  attrs="{'invisible': [('rrule_type','=','daily_working')]}"/>
-		                        <newline />
-	                        </group>
-	                        <group col="10" colspan="4" attrs="{'invisible': [('rrule_type','!=','monthly'), ('rrule_type','!=','yearly')]}">
-	                            <group col="2" colspan="1">
-	                            <field name="select1" />
-	                            </group>
-	                            <group col="2" colspan="1" attrs="{'invisible' : [('select1','=','day')]}">
-	                            <field name="day" attrs="{'required' : [('select1','=','date')]}" />
-	                            </group>
-	                            <group col="3" colspan="1" attrs="{'invisible' : [('select1','=','date')]}">
-	                            <field name="byday" string="The" attrs="{'required' : [('select1','=','day')]}" />
-	                            <field name="week_list" nolabel="1" attrs="{'required' : [('select1','=','day')]}" />
-	                            </group>
-	                            <group col="1" colspan="1" attrs="{'invisible' : [('rrule_type','!=','yearly')]}">
-	                            <field name="month_list" string="of" colspan="1" attrs="{'required' : [('rrule_type','=','yearly')]}" />
-	                            </group>
-	                        </group>
-	                    </group>
+                            </group>
+                            <group col="14" colspan="4" name="Select weekdays" 
+                                    attrs="{'invisible' :[('rrule_type','not in', ['weekly','daily_working'])]}">
+                                <field name="mo" colspan="1" />
+                                <field name="tu" colspan="1" />
+                                <field name="we" colspan="1" />
+                                <field name="th" colspan="1" />
+                                <newline/>
+                                <field name="fr" colspan="1" />
+                                <field name="sa" colspan="1"  attrs="{'invisible': [('rrule_type','=','daily_working')]}"/>
+                                <field name="su" colspan="1"  attrs="{'invisible': [('rrule_type','=','daily_working')]}"/>
+                                <newline />
+                            </group>
+                            <group col="10" colspan="4" attrs="{'invisible': [('rrule_type','!=','monthly'), ('rrule_type','!=','yearly')]}">
+                                <group col="2" colspan="1">
+                                <field name="select1" />
+                                </group>
+                                <group col="2" colspan="1" attrs="{'invisible' : [('select1','=','day')]}">
+                                <field name="day" attrs="{'required' : [('select1','=','date')]}" />
+                                </group>
+                                <group col="3" colspan="1" attrs="{'invisible' : [('select1','=','date')]}">
+                                <field name="byday" string="The" attrs="{'required' : [('select1','=','day')]}" />
+                                <field name="week_list" nolabel="1" attrs="{'required' : [('select1','=','day')]}" />
+                                </group>
+                                <group col="1" colspan="1" attrs="{'invisible' : [('rrule_type','!=','yearly')]}">
+                                <field name="month_list" string="of" colspan="1" attrs="{'required' : [('rrule_type','=','yearly')]}" />
+                                </group>
+                            </group>
+                        </group>
                     </page>
                  </notebook>
             </field>
@@ -140,5 +140,4 @@
             </field>
     </record>
 
-    </data>
 </openerp>