[Remove] caldav doc link

bzr revid: tfr@openerp.com-20110117220345-37a0e6nbcgbex2nr

diff --git a/addons/caldav/wizard/caldav_browse.py b/addons/caldav/wizard/caldav_browse.py
index a71f604..9e67f97 100644 (file)
--- a/addons/caldav/wizard/caldav_browse.py
+++ b/addons/caldav/wizard/caldav_browse.py
@@ -176,7 +176,7 @@ configuration
 
     _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."),
+        #'doc_link':fields.char('Caldav Documentation', size="264", help="The link to Caldav Online Documentation.", readonly=True),
         'description':fields.text('Description', readonly=True)
     }
 
@@ -218,7 +218,7 @@ configuration
         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
 
@@ -238,7 +238,6 @@ 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"),
-               'doc_link':fields.char('Caldav Documentation', size="264", help="The link to Caldav Online Documentation.", readonly=True),
     }
     
     def _get_default_calendar(self, cr, uid, context):
@@ -262,7 +261,7 @@ class user_preference(osv.osv_memory):
               'collection' : _get_default_collection,
               'calendar' : _get_default_calendar,
               'device' : 'other',
-              'doc_link' : 'http://doc.openerp.com/'
+              
     }    
    
     def open_window(self, cr, uid, ids, context=None):

diff --git a/addons/caldav/wizard/caldav_browse_view.xml b/addons/caldav/wizard/caldav_browse_view.xml
index 29a0675..0a7e626 100644 (file)
--- a/addons/caldav/wizard/caldav_browse_view.xml
+++ b/addons/caldav/wizard/caldav_browse_view.xml
@@ -15,11 +15,8 @@
                         <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>
@@ -37,7 +34,7 @@
                     <field name="calendar"  colspan="4" width="250" domain="[('collection_id','=', collection)]" readonly="1"/>
                     <field name="device"  colspan="4" width="250" />
                     <separator colspan="4"/>
-                    <field name="doc_link" widget="url"/>
+                    
                     <group col="4" colspan="4">
                         <label string="" colspan="2"/>
                         <button special="cancel" string="_Cancel" icon="gtk-cancel"/>

diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index a755288..dac6c4a 100644 (file)
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -52,7 +52,8 @@
         <field name="view_id" ref="crm_case_calendar_view_meet"/>
         <field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id}</field>
         <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
-        <field name="help">The meeting calendar is shared between the sales teams and fully integrated with other applications such as the employee holidays or the business opportunities. You can also synchronize meetings with your mobile phone using the caldav interface.</field>
+        <field name="help">The meeting calendar is shared between the sales teams and fully integrated with other applications such as the employee holidays or the business opportunities. You can also synchronize meetings with your mobile phone using the caldav interface.
+        </field>
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet">