From 01bc147cc02e25ec3292785016f6004b455ec7a2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Fri, 18 Dec 2009 13:05:19 +0100
Subject: [PATCH] [imp] crm: simplify caldav config wizard

bzr revid: xmo@tinyerp.com-20091218120519-ko0pa4lyts2yga1z
---
 addons/crm/crm.py       | 2 +-
 addons/crm/crm_view.xml | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index bd04a6c2ce0..5b412ca4c42 100755
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -1113,7 +1113,7 @@ class crm_calendar_config_wizard(osv.osv_memory):
 
     _columns = {
         'name': fields.char('Name', size=64),
-        'caldav': fields.boolean('Caldav Properties View', help="Manages the fields required for Caldav Properties.")
+        'caldav': fields.boolean('Advanced View')
     }
 
     def execute(self, cr, uid, ids, context=None):
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 9f813791aa4..41b378bb413 100755
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -736,7 +736,7 @@
         <!-- Caldav configartion view -->
 
         <record id="view_config_crm_caldav_menu" model="ir.ui.view">
-            <field name="name">Configure Menu for Caldav Properites</field>
+            <field name="name">Configure Caldav Properties</field>
             <field name="model">crm.calendar.config_wizard</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.res_config_view_base"/>
@@ -749,17 +749,18 @@
                 <group string="res_config_contents" position="replace">
                   <separator colspan="4" string=""/>
                   <label colspan="4" align="0.0" string="
-                     Enable a detailed view of the caldav properties
-                     configuration."/>
+                     Enable a detailed view of the caldav configuration
+                     screens."/>
                   <newline/>
                   <field name="caldav"/>
                 </group>
+                <xpath expr='//button[@name="action_skip"]' position='replace'/>
               </data>
             </field>
         </record>
 
         <record id="action_view_config_crm_caldav_menu" model="ir.actions.act_window">
-            <field name="name">Configure Menu for Caldav Properites</field>
+            <field name="name">Configure Caldav Properties</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">crm.calendar.config_wizard</field>
             <field name="view_id" ref="view_config_crm_caldav_menu"/>