From f2c41053ea4d5216897d115df81662aad1d7d9b4 Mon Sep 17 00:00:00 2001
From: "Bhumika (OpenERP)" <sbh@tinyerp.com>
Date: Thu, 16 Jun 2011 18:04:36 +0530
Subject: [PATCH 01/15] [Fix]: mail_gateway : Fix  fetch attachement even if
 the check box add attachement is not checked

bzr revid: sbh@tinyerp.com-20110616123436-tclirmg6vju75i1j
---
 addons/mail_gateway/mail_gateway.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index c67a2668192..e891c081279 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -519,7 +519,7 @@ class mailgate_tool(osv.osv_memory):
                             body = content
                             has_plain_text = True
                 elif part.get_content_maintype() in ('application', 'image'):
-                    if filename :
+                    if filename and attach:
                         attachments[filename] = part.get_payload(decode=True)
                     else:
                         res = part.get_payload(decode=True)

From ca2598f997dbea98d9d9bad5f890cf3e872e129e Mon Sep 17 00:00:00 2001
From: "Bhumika (OpenERP)" <sbh@tinyerp.com>
Date: Fri, 17 Jun 2011 12:09:14 +0530
Subject: [PATCH 02/15] [IMP]: fetchmail: improve the log message

bzr revid: sbh@tinyerp.com-20110617063914-lue87brktmevt9a8
---
 addons/fetchmail/fetchmail.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 41f84cfdedd..58a580d79c3 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -199,7 +199,7 @@ class email_server(osv.osv):
 
                     pop_server.quit()
 
-                    logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail fetch %s email(s) from %s' % (numMsgs, server.name))
+                    logger.notifyChannel(server.type, netsvc.LOG_INFO, 'fetchmail fetch %s email(s) from %s' % (numMsgs, server.name))
 
             except Exception, e:
                 logger.notifyChannel(server.type, netsvc.LOG_WARNING, '%s' % (tools.ustr(e)))

From 6df880e9a4a092b1614154a68ef5f5eb31e1bf67 Mon Sep 17 00:00:00 2001
From: "Bhumika (OpenERP)" <sbh@tinyerp.com>
Date: Fri, 17 Jun 2011 13:57:38 +0530
Subject: [PATCH 03/15] [IMP]: fetchmail: improve the log message

bzr revid: sbh@tinyerp.com-20110617082738-i0umdo9cptek6l4j
---
 addons/fetchmail/fetchmail.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 58a580d79c3..386b48f1546 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -116,7 +116,7 @@ class email_server(osv.osv):
         if context is None:
             context = {}
         for server in self.browse(cr, uid, ids, context=context):
-            logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail start checking for new emails on %s' % (server.name))
+            logger.notifyChannel(server.type, netsvc.LOG_INFO, 'fetchmail start checking for new emails on %s' % (server.name))
             context.update({'server_id': server.id, 'server_type': server.type})
             try:
                 if server.type == 'imap':

From c89947c8fb60a3b2ae247a2a4d22f34c95a0de5c Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 20 Jun 2011 10:42:42 +0530
Subject: [PATCH 04/15] [FIX] Fix the new step in the configuration for host
 name

lp bug: https://launchpad.net/bugs/785673 fixed

bzr revid: dbr@tinyerp.com-20110620051242-irs0jljjfpbkdbaq
---
 addons/caldav/wizard/caldav_browse.py       | 24 ++++++++++++++++++---
 addons/caldav/wizard/caldav_browse_view.xml | 22 +++++++++++++++++++
 addons/crm_caldav/crm_caldav_view.xml       |  2 +-
 3 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/addons/caldav/wizard/caldav_browse.py b/addons/caldav/wizard/caldav_browse.py
index 9e67f972216..134454627c1 100644
--- a/addons/caldav/wizard/caldav_browse.py
+++ b/addons/caldav/wizard/caldav_browse.py
@@ -197,8 +197,9 @@ configuration
             host = config.get('xmlrpc_interface', None)
             port = config.get('xmlrpc_port',8069)
         if host ==  '' or None:
-                host = 'localhost'
-                port = 8069
+            obj = self.pool.get('user.preference').browse(cr,uid,uid,context)
+            host = obj.host_name
+            port = 8069
         if not config.get_misc('webdav','enable',True):
             raise Exception("WebDAV is disabled, cannot continue")
         user_pool = self.pool.get('res.users')
@@ -238,6 +239,7 @@ class user_preference(osv.osv_memory):
                '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"),
+               'host_name': fields.char('Host Name', size=64, required=True),  
     }
     
     def _get_default_calendar(self, cr, uid, context):
@@ -278,6 +280,22 @@ class user_preference(osv.osv_memory):
             'target': 'new',
             'context': context,
         }
-    
+        
+    def next_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','=','user_prefernce_form')])
+        resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])
+        context.update({'res_id': ids})
+        resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+        
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'user.preference',
+            '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
index 53af6029883..18429232de0 100644
--- a/addons/caldav/wizard/caldav_browse_view.xml
+++ b/addons/caldav/wizard/caldav_browse_view.xml
@@ -24,6 +24,28 @@
             </field>
         </record>
 
+ 		<record id="host_prefernce_form" model="ir.ui.view">
+            <field name="name">host_preference</field>
+           <field name="model">user.preference</field>
+           <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Host name configuration for caldev synchronization">
+                   <separator string="Hostname example : " colspan="4"/>
+                    <newline/>
+                    <label string="database.my.openerp.com" colspan="4"/>
+                    <newline/>
+                    <label string=" or companyserver.com" colspan="4"/>
+                    <newline/>
+                    <field name="host_name"  colspan="4" width="250" />
+                    <separator colspan="4"/>
+                    <group col="4" colspan="4">
+                       <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                       <button name="next_window" string="Next" type="object" icon="gtk-go-forward"/>
+                    </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>
diff --git a/addons/crm_caldav/crm_caldav_view.xml b/addons/crm_caldav/crm_caldav_view.xml
index b8b0ffdea03..a610095d6a6 100644
--- a/addons/crm_caldav/crm_caldav_view.xml
+++ b/addons/crm_caldav/crm_caldav_view.xml
@@ -5,7 +5,7 @@
             <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="view_id" ref="caldav.host_prefernce_form"/>
             <field name="context">{'cal_name' : 'Meetings'}</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>

From b0c833492adb5cca3031c8b33aa7d0b519c2d48b Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 20 Jun 2011 15:04:41 +0530
Subject: [PATCH 05/15] [IMP]Resubmit the changes

bzr revid: dbr@tinyerp.com-20110620093441-l68jgqg6d4temrvl
---
 addons/caldav/wizard/caldav_browse.py | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/addons/caldav/wizard/caldav_browse.py b/addons/caldav/wizard/caldav_browse.py
index 134454627c1..9f6ed7858cd 100644
--- a/addons/caldav/wizard/caldav_browse.py
+++ b/addons/caldav/wizard/caldav_browse.py
@@ -181,30 +181,24 @@ configuration
     }
 
     def default_get(self, cr, uid, fields, context=None):
+        pref_obj = self.pool.get('user.preference')
+        obj_ids = pref_obj.browse(cr, uid ,context.get('res_id'), context=context)
         res = {}
-        host = ''
+        host = obj_ids[0].host_name
         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:
-            obj = self.pool.get('user.preference').browse(cr,uid,uid,context)
-            host = obj.host_name
-            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']

From 7883f13e68ce498ba1978885ff4f47f321c2c278 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 21 Jun 2011 11:22:41 +0530
Subject: [PATCH 06/15] [IMP]Remove the extra space,browse() and use context

bzr revid: dbr@tinyerp.com-20110621055241-5pblbhewnz8pl0bq
---
 addons/caldav/wizard/caldav_browse.py | 90 +++++++++++++--------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/addons/caldav/wizard/caldav_browse.py b/addons/caldav/wizard/caldav_browse.py
index 9f6ed7858cd..f6f64900c1f 100644
--- a/addons/caldav/wizard/caldav_browse.py
+++ b/addons/caldav/wizard/caldav_browse.py
@@ -26,9 +26,9 @@ 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
@@ -47,9 +47,9 @@ class caldav_browse(osv.osv_memory):
         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
 
@@ -60,7 +60,7 @@ Now, to setup the calendars, you need to:
 3. Click on "Other"
 4. From the "Calendars" group, select "Add CalDAV Account"
 
-5. Enter the host's name 
+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
@@ -71,8 +71,8 @@ Now, to setup the calendars, you need to:
 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. 
-    
+    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:
@@ -99,13 +99,13 @@ steps:
       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.   
+      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) 
+So you need to install a third part software : Calendar (CalDav)
 for now it's the only one
 
 configuration
@@ -114,7 +114,7 @@ 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
@@ -122,15 +122,15 @@ configuration
 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 
+    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
@@ -140,10 +140,10 @@ configuration
 
     4. Click ok and give your openerp password
 
-    5. A new calendar named with the name you gave should appear on the left side.     
+    5. A new calendar named with the name you gave should appear on the left side.
      """),
-     
-     
+
+
      'thunderbird' : _("""
 Prerequire
 ----------
@@ -161,7 +161,7 @@ configuration
 
 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"
@@ -169,8 +169,8 @@ configuration
 7. Then Finish, your meetings should appear now in your calendar view
 """),
     }
-    
-    
+
+
     _name = 'caldav.browse'
     _description = 'Caldav Browse'
 
@@ -182,37 +182,36 @@ configuration
 
     def default_get(self, cr, uid, fields, context=None):
         pref_obj = self.pool.get('user.preference')
-        obj_ids = pref_obj.browse(cr, uid ,context.get('res_id'), context=context)
+        pref_ids = pref_obj.browse(cr, uid ,context.get('rec_id',False), context=context)
         res = {}
-        host = obj_ids[0].host_name
+        host = context.get('host')
         port = ''
-        prefix = 'http://'  
+        prefix = 'http://'
         if not config.get('xmlrpc'):
             if not config.get('netrpc'):
-                prefix = 'https://' 
+                prefix = 'https://'
                 port = config.get('xmlrpcs_port', 8071)
             else:
-                port = config.get('netrpc_port',8070) 
-        else: 
+                port = config.get('netrpc_port',8070)
+        else:
             port = config.get('xmlrpc_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_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] 
+            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['doc_link'] = 'http://doc.openerp.com/'
         res['url'] = prefix+url
         return res
@@ -224,7 +223,7 @@ configuration
 caldav_browse()
 
 class user_preference(osv.osv_memory):
-    
+
     _name = 'user.preference'
     _description = 'User preference Form'
 
@@ -233,33 +232,33 @@ class user_preference(osv.osv_memory):
                '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"),
-               'host_name': fields.char('Host Name', size=64, required=True),  
+               'host_name': fields.char('Host Name', size=64, required=True),
     }
-    
+
     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')])
@@ -274,14 +273,15 @@ class user_preference(osv.osv_memory):
             'target': 'new',
             'context': context,
         }
-        
+
     def next_window(self, cr, uid, ids, context=None):
         obj_model = self.pool.get('ir.model.data')
+        host_name  = self.browse (cr,uid,ids)[0].host_name
         model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','user_prefernce_form')])
         resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])
-        context.update({'res_id': ids})
+        context.update({'res_id': ids,'host':host_name})
         resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-        
+
         return {
             'view_type': 'form',
             'view_mode': 'form',
@@ -291,5 +291,5 @@ class user_preference(osv.osv_memory):
             'target': 'new',
             'context': context,
         }
-    
+
 user_preference()

From 12bdf16ed26bcaac1b0fe591485ec8abf4201efa Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 21 Jun 2011 15:50:42 +0530
Subject: [PATCH 07/15] [IMP]caldev : change in label

bzr revid: dbr@tinyerp.com-20110621102042-e34d8zug4m07siee
---
 addons/caldav/wizard/caldav_browse_view.xml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/addons/caldav/wizard/caldav_browse_view.xml b/addons/caldav/wizard/caldav_browse_view.xml
index 18429232de0..18a0a61baec 100644
--- a/addons/caldav/wizard/caldav_browse_view.xml
+++ b/addons/caldav/wizard/caldav_browse_view.xml
@@ -11,30 +11,27 @@
                     <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"/>
-                      <group col="4" colspan="4">
-                        <label string="" colspan="2"/>
-                        <button special="cancel" string="_Close" icon="gtk-close"/>
-                      </group>
+                        <group col="4" colspan="4">
+                            <label string="" colspan="2"/>
+                            <button special="cancel" string="_Close" icon="gtk-close"/>
+                        </group>
                     </group>
                 </form>
             </field>
         </record>
 
- 		<record id="host_prefernce_form" model="ir.ui.view">
+        <record id="host_prefernce_form" model="ir.ui.view">
             <field name="name">host_preference</field>
            <field name="model">user.preference</field>
            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Host name configuration for caldev synchronization">
-                   <separator string="Hostname example : " colspan="4"/>
+                    <separator string="Hostname example : " colspan="4"/>
                     <newline/>
-                    <label string="database.my.openerp.com" colspan="4"/>
-                    <newline/>
-                    <label string=" or companyserver.com" colspan="4"/>
+                    <label string="database.my.openerp.com  or companyserver.com" colspan="4"/>
                     <newline/>
                     <field name="host_name"  colspan="4" width="250" />
                     <separator colspan="4"/>

From f9c9c79bbfdd3b65b0edd3416c1c12c0fcb994bb Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 21 Jun 2011 17:28:09 +0530
Subject: [PATCH 08/15] [IMP]caldev : Remove extra lines

bzr revid: dbr@tinyerp.com-20110621115809-p3e0ut8r4a6gvzyk
---
 addons/caldav/wizard/caldav_browse.py | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/addons/caldav/wizard/caldav_browse.py b/addons/caldav/wizard/caldav_browse.py
index f6f64900c1f..d1f58592de7 100644
--- a/addons/caldav/wizard/caldav_browse.py
+++ b/addons/caldav/wizard/caldav_browse.py
@@ -28,7 +28,6 @@ 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
@@ -45,11 +44,8 @@ class caldav_browse(osv.osv_memory):
         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
 
@@ -87,8 +83,6 @@ Now, to setup the calendars, you need to:
     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:
@@ -124,7 +118,7 @@ configuration
 5. Then you can synchronize manually or custom the settings to synchronize every x minutes.
 
     """),
-
+    
      'evolution' : _("""
     1. Go to Calendar View
 
@@ -143,7 +137,6 @@ configuration
     5. A new calendar named with the name you gave should appear on the left side.
      """),
 
-
      'thunderbird' : _("""
 Prerequire
 ----------
@@ -169,8 +162,6 @@ configuration
 7. Then Finish, your meetings should appear now in your calendar view
 """),
     }
-
-
     _name = 'caldav.browse'
     _description = 'Caldav Browse'
 
@@ -217,7 +208,6 @@ configuration
         return res
 
     def browse_caldav(self, cr, uid, ids, context):
-
         return {}
 
 caldav_browse()
@@ -239,18 +229,15 @@ class user_preference(osv.osv_memory):
         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,
@@ -281,7 +268,6 @@ class user_preference(osv.osv_memory):
         resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])
         context.update({'res_id': ids,'host':host_name})
         resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-
         return {
             'view_type': 'form',
             'view_mode': 'form',

From ffe4df20d4f4097a52b49c5aa310dc707cd7cee8 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 30 Jun 2011 14:11:24 +0530
Subject: [PATCH 09/15] [IMP]Improve code : save the host name value to avoid
 writing each time.

bzr revid: dbr@tinyerp.com-20110630084124-gd84vzblzarth5lg
---
 addons/caldav/wizard/caldav_browse.py       | 10 ++++++++++
 addons/caldav/wizard/caldav_browse_view.xml |  5 +++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/addons/caldav/wizard/caldav_browse.py b/addons/caldav/wizard/caldav_browse.py
index d1f58592de7..a345c9a95bf 100644
--- a/addons/caldav/wizard/caldav_browse.py
+++ b/addons/caldav/wizard/caldav_browse.py
@@ -237,12 +237,22 @@ class user_preference(osv.osv_memory):
         collection_obj = self.pool.get('document.directory')
         ids = collection_obj.search(cr, uid, [('name', '=', 'c')])
         return ids[0]
+    
+    def _get_default_host(self, cr, uid, context):
+        ids=self.search(cr,uid,[])
+        host_name = ''
+        if ids:
+            ids = len(ids)> 1 and len(ids)-1 or ids[0] # Use len(ids)-1 for taking the value of last id 
+            host_obj = self.browse(cr, uid,[ids],context=context)[0]
+            host_name = host_obj.host_name
+        return host_name
 
     _defaults={
               'service': 'webdav',
               'collection' : _get_default_collection,
               'calendar' : _get_default_calendar,
               'device' : 'other',
+              'host_name':_get_default_host
 
     }
 
diff --git a/addons/caldav/wizard/caldav_browse_view.xml b/addons/caldav/wizard/caldav_browse_view.xml
index 18a0a61baec..565e3a44407 100644
--- a/addons/caldav/wizard/caldav_browse_view.xml
+++ b/addons/caldav/wizard/caldav_browse_view.xml
@@ -28,11 +28,12 @@
            <field name="model">user.preference</field>
            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Host name configuration for caldev synchronization">
-                    <separator string="Hostname example : " colspan="4"/>
+               <form string="Caldav's host name configuration">
+                	<label string="Configure your openerp hostname. For example : " colspan="4"></label>
                     <newline/>
                     <label string="database.my.openerp.com  or companyserver.com" colspan="4"/>
                     <newline/>
+                    <separator colspan="4"/>
                     <field name="host_name"  colspan="4" width="250" />
                     <separator colspan="4"/>
                     <group col="4" colspan="4">

From c7b27ed02784e39ac3617dc4b95680478905a706 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 30 Jun 2011 14:31:52 +0530
Subject: [PATCH 10/15] [IMP] Improve the code

bzr revid: dbr@tinyerp.com-20110630090152-rgfh2y8wvs6l8omj
---
 addons/caldav/wizard/caldav_browse.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/caldav/wizard/caldav_browse.py b/addons/caldav/wizard/caldav_browse.py
index a345c9a95bf..f6ecc5dccd5 100644
--- a/addons/caldav/wizard/caldav_browse.py
+++ b/addons/caldav/wizard/caldav_browse.py
@@ -243,8 +243,7 @@ class user_preference(osv.osv_memory):
         host_name = ''
         if ids:
             ids = len(ids)> 1 and len(ids)-1 or ids[0] # Use len(ids)-1 for taking the value of last id 
-            host_obj = self.browse(cr, uid,[ids],context=context)[0]
-            host_name = host_obj.host_name
+            host_name = self.browse(cr, uid,[ids],context=context)[0].host_name
         return host_name
 
     _defaults={

From d9d9fa18cf645069a829d095af7044d342aa2063 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 30 Jun 2011 11:40:53 +0200
Subject: [PATCH 11/15] [FIX] Date form widgets does not handle readonly
 property

bzr revid: fme@openerp.com-20110630094053-ci91lzfg1cc5qtzu
---
 addons/base/static/src/js/form.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 3fd50f86c7c..9b6367e52ca 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -904,6 +904,10 @@ openerp.base.form.FieldDatetime = openerp.base.form.Field.extend({
             this.value = this.format(this.value);
         }
     },
+    update_dom: function() {
+        this._super.apply(this, arguments);
+        this.$element.find('input').attr('disabled', this.readonly);
+    },
     validate: function() {
         this.invalid = this.required && !this.$element.find('input')[this.jqueryui_object]('getDate');
     },

From 3a179446710daf50fb228122d72bdb8603700537 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 30 Jun 2011 11:51:42 +0200
Subject: [PATCH 12/15] [IMP] view_id should really be a m2o-style pair of (id,
 name).

And replace the and/or hack by an if expression, because it's more fool-proof

bzr revid: xmo@openerp.com-20110630095142-g600bg6nqvnnpkw5
---
 openerp/addons/base/res/res_config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py
index f5dbdb4aaed..1dc84ce865f 100644
--- a/openerp/addons/base/res/res_config.py
+++ b/openerp/addons/base/res/res_config.py
@@ -104,7 +104,7 @@ class res_config_configurable(osv.osv_memory):
             return {
                 'view_mode': action.view_mode,
                 'view_type': action.view_type,
-                'view_id': action.view_id and action.view_id.id or False,
+                'view_id': (action.view_id.id, 'Next Setup Action') if action.view_id else False,
                 'res_model': action.res_model,
                 'type': action.type,
                 'target': action.target,

From 987b8f1e9fdc223e516d7337dfae530d8908486d Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 30 Jun 2011 11:59:31 +0200
Subject: [PATCH 13/15] [FIX] Need time & datetime modules for evaluation

bzr revid: fme@openerp.com-20110630095931-nysrcqz8666gafgb
---
 addons/base/static/src/js/list.js | 2 ++
 openerpweb/nonliterals.py         | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 62bedf8784d..dab8eef596d 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -427,6 +427,7 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
 
         if (_.isEmpty(records)) {
             records = this.groups.get_records();
+            if (records.constructor != Array) debugger
         }
 
         var count = 0, sums = {};
@@ -934,6 +935,7 @@ openerp.base.ListView.Groups = Class.extend( /** @lends openerp.base.ListView.Gr
     },
     get_records: function () {
         if (_(this.children).isEmpty()) {
+            alert("HERE")
             return {
                 count: this.datagroup.length,
                 values: this.datagroup.aggregates
diff --git a/openerpweb/nonliterals.py b/openerpweb/nonliterals.py
index a99e2215a00..1465123eba8 100644
--- a/openerpweb/nonliterals.py
+++ b/openerpweb/nonliterals.py
@@ -7,6 +7,8 @@ can't be sent there themselves).
 import binascii
 import hashlib
 import simplejson.encoder
+import time
+import datetime
 
 __all__ = ['Domain', 'Context', 'NonLiteralEncoder, non_literal_decoder', 'CompoundDomain', 'CompoundContext']
 

From f84f7f5729272d5d429207cd236d233a643bc81c Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 30 Jun 2011 14:10:08 +0200
Subject: [PATCH 14/15] [IMP] Improved dates widgets

bzr revid: fme@openerp.com-20110630121008-qt4yr12z6sk70yua
---
 addons/base/static/src/css/base.css | 13 +++++++------
 addons/base/static/src/js/form.js   | 18 ++++++++++++++++--
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 84b51b2cd54..32a335d7eb8 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -773,13 +773,14 @@ background: linear-gradient(top, #ffffff 0%,#d8d8d8 11%,#afafaf 86%,#333333 91%,
     position: relative;
     vertical-align: top;
 }
-.openerp input.field_date, .openerp input.field_datetime {
-    background: #fff url('../img/ui/field_calendar.png') no-repeat right center;
-    background-origin: content-box;
-    -moz-background-origin: content;
-    -moz-background-origin: content-box;
-    -webkit-background-origin: content-box;
+.openerp img.ui-datepicker-trigger, .openerp img.ui-datepicker-trigger {
+    margin-left: -20px;
+    vertical-align: middle;
+    cursor: pointer;
+    position: relative;
+    top: -1px;
 }
+
 /* http://www.quirksmode.org/dom/inputfile.html
  * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
  */
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 9b6367e52ca..79f2a610e44 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -879,12 +879,17 @@ openerp.base.form.FieldDatetime = openerp.base.form.Field.extend({
         this._super(view, node);
         this.template = "FieldDate";
         this.jqueryui_object = 'datetimepicker';
+        this.validation_regex = /^\d+-\d+-\d+( \d+:\d+(:\d+)?)?$/;
     },
     start: function() {
         this._super.apply(this, arguments);
         this.$element.find('input').change(this.on_ui_change)[this.jqueryui_object]({
             dateFormat: 'yy-mm-dd',
-            timeFormat: 'hh:mm:ss'
+            timeFormat: 'hh:mm:ss',
+            showOn: 'button',
+            buttonImage: '/base/static/src/img/ui/field_calendar.png',
+            buttonImageOnly: true,
+            constrainInput: false
         });
     },
     set_value: function(value) {
@@ -909,7 +914,15 @@ openerp.base.form.FieldDatetime = openerp.base.form.Field.extend({
         this.$element.find('input').attr('disabled', this.readonly);
     },
     validate: function() {
-        this.invalid = this.required && !this.$element.find('input')[this.jqueryui_object]('getDate');
+        this.invalid = false;
+        var value = this.$element.find('input').val();
+        if (value === "") {
+            this.invalid = this.required;
+        } else if (this.validation_regex) {
+            this.invalid = !this.validation_regex.test(value);
+        } else {
+            this.invalid = !this.$element.find('input')[this.jqueryui_object]('getDate');
+        }
     },
     focus: function() {
         this.$element.find('input').focus();
@@ -922,6 +935,7 @@ openerp.base.form.FieldDate = openerp.base.form.FieldDatetime.extend({
     init: function(view, node) {
         this._super(view, node);
         this.jqueryui_object = 'datepicker';
+        this.validation_regex = /^\d+-\d+-\d+$/;
     },
     parse: openerp.base.parse_date,
     format: openerp.base.format_date

From a394f6b1419747a1eff264466f6d507286ceef00 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 30 Jun 2011 14:15:34 +0200
Subject: [PATCH 15/15] [FIX] dashboard should go through full action
 resolution via the ActionManager, as it may get non-window actions

bzr revid: xmo@openerp.com-20110630121534-ay6g9f207snfelca
---
 addons/base_dashboard/static/src/js/dashboard.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/base_dashboard/static/src/js/dashboard.js b/addons/base_dashboard/static/src/js/dashboard.js
index feb4e92d8a9..fe52f1affd9 100644
--- a/addons/base_dashboard/static/src/js/dashboard.js
+++ b/addons/base_dashboard/static/src/js/dashboard.js
@@ -225,10 +225,10 @@ openerp.base.form.DashBoard = openerp.base.form.Widget.extend({
             views_switcher : false,
             action_buttons : false,
             pager: false
-        }
-        var element_id = this.view.element_id + '_action_' + action.id;
-        var view = new openerp.base.ViewManagerAction(this.session, element_id, action);
-        view.start();
+        };
+        new openerp.base.ActionManager(
+                this.session, this.view.element_id + '_action_' + action.id)
+            .do_action(action);
     },
     render: function() {
         // We should start with three columns available