[IMP]: caldav modules, document_webdav: Minor improvement in wizard

bzr revid: rpa@openerp.co.in-20100127050704-440o05f3n924kij5

diff --git a/addons/base_calendar/base_calendar_wizard.xml b/addons/base_calendar/base_calendar_wizard.xml
index 1c20f80..eaebba4 100644 (file)
--- a/addons/base_calendar/base_calendar_wizard.xml
+++ b/addons/base_calendar/base_calendar_wizard.xml
@@ -4,7 +4,7 @@
                <wizard string="Import .ics File" model="basic.calendar"
                        name="calendar.event.import" id="wizard_cal_event_import" />
 
                <wizard string="Import .ics File" model="basic.calendar"
                        name="calendar.event.import" id="wizard_cal_event_import" />
 

-               <wizard string="Subscribe to a Remote calendar"
+               <wizard string="Subscribe"

                        model="basic.calendar" name="calendar.event.subscribe"
                        id="wizard_cal_event_subscribe" multi="True" />
 
                        model="basic.calendar" name="calendar.event.subscribe"
                        id="wizard_cal_event_subscribe" multi="True" />
 

diff --git a/addons/base_calendar/wizard/wizard_cal_subscribe.py b/addons/base_calendar/wizard/wizard_cal_subscribe.py
index c4dceab..8146e7b 100644 (file)
--- a/addons/base_calendar/wizard/wizard_cal_subscribe.py
+++ b/addons/base_calendar/wizard/wizard_cal_subscribe.py
@@ -27,7 +27,7 @@ import wizard
 
 class cal_event_subscribe_wizard(wizard.interface):
     form1 = '''<?xml version="1.0"?>
 
 class cal_event_subscribe_wizard(wizard.interface):
     form1 = '''<?xml version="1.0"?>

-    <form string="Subscribe to Remote ICS">
+    <form string="Subscribe to Remote Calendar">

         <separator string="Provide path for Remote Calendar"/>
         <field name="url_path" colspan="4" width="300" nolabel="1" widget="url"/>
     </form>'''
         <separator string="Provide path for Remote Calendar"/>
         <field name="url_path" colspan="4" width="300" nolabel="1" widget="url"/>
     </form>'''

@@ -64,7 +64,8 @@ class cal_event_subscribe_wizard(wizard.interface):
             raise wizard.except_wizard(_('Error!'), _('Please provide Proper URL !'))
         model = data.get('model')
         model_obj = pooler.get_pool(cr.dbname).get(model)
             raise wizard.except_wizard(_('Error!'), _('Please provide Proper URL !'))
         model = data.get('model')
         model_obj = pooler.get_pool(cr.dbname).get(model)

-        context.update({'url': data['form']['url_path']})
+        context.update({'url': data['form']['url_path'],
+                                    'model': data.get('model')})

         vals = model_obj.import_cal(cr, uid, base64.encodestring(caldata), context)
         if vals:
             cnt = vals['count']
         vals = model_obj.import_cal(cr, uid, base64.encodestring(caldata), context)
         if vals:
             cnt = vals['count']

diff --git a/addons/crm/crm_meeting_data.xml b/addons/crm/crm_meeting_data.xml
index e13346a..e1c6a9c 100644 (file)
--- a/addons/crm/crm_meeting_data.xml
+++ b/addons/crm/crm_meeting_data.xml
@@ -55,6 +55,7 @@
                        <field name="name" ref="base_calendar.field_event_status"/>
                    <field name="type_id" ref="caldav.calendar_lines_event" />
                        <field name="field_id" search="[('name','=','state'),('model_id.model','=','crm.meeting')]" />
                        <field name="name" ref="base_calendar.field_event_status"/>
                    <field name="type_id" ref="caldav.calendar_lines_event" />
                        <field name="field_id" search="[('name','=','state'),('model_id.model','=','crm.meeting')]" />

+                       <field name="mapping">{'tentative': 'draft', 'confirmed': 'open', 'cancelled': 'cancel'}</field>

                    <field name="fn">field</field>
                </record>
 
                    <field name="fn">field</field>
                </record>
 

diff --git a/addons/crm/crm_meeting_wizard.xml b/addons/crm/crm_meeting_wizard.xml
index 4f6f2e9..e53d311 100644 (file)
--- a/addons/crm/crm_meeting_wizard.xml
+++ b/addons/crm/crm_meeting_wizard.xml
@@ -2,14 +2,14 @@
 <openerp>
        <data>
                <wizard string="Import .ics File" model="crm.meeting"
 <openerp>
        <data>
                <wizard string="Import .ics File" model="crm.meeting"

-                       name="calendar.event.import" id="base_calendar.wizard_cal_event_import" multi="True" />
+                       name="calendar.event.import" id="base_calendar.wizard_cal_event_import" />

 
 

-               <wizard string="Subscribe to a Remote calendar"
+               <wizard string="Subscribe"

                        model="crm.meeting" name="calendar.event.subscribe"
                        model="crm.meeting" name="calendar.event.subscribe"

-                       id="base_calendar.wizard_cal_event_subscribe" multi="True" />
+                       id="base_calendar.wizard_cal_event_subscribe" />

 
                <wizard string="Export .ics File" model="crm.meeting"
 
                <wizard string="Export .ics File" model="crm.meeting"

-                       name="calendar.event.export" id="base_calendar.wizard_cal_event_export" multi="True" />
+                       name="calendar.event.export" id="base_calendar.wizard_cal_event_export" />

 
                <wizard string="Edit this event" model="crm.meeting"
                        name="calendar.event.edit.this" id="base_calendar.wizard_edit_this_event"
 
                <wizard string="Edit this event" model="crm.meeting"
                        name="calendar.event.edit.this" id="base_calendar.wizard_edit_this_event"

diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 750b06a..1acbfd7 100644 (file)
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -129,7 +129,7 @@ class tinydav_handler(dav_interface):
 
     @memoize(4)
     def db_list(self):
 
     @memoize(4)
     def db_list(self):

-        s = netsvc.LocalService('db')
+        s = netsvc.ExportService.getService('db')

         result = s.list()
         self.db_name_list=[]
         for db_name in result:
         result = s.list()
         self.db_name_list=[]
         for db_name in result:

@@ -149,7 +149,7 @@ class tinydav_handler(dav_interface):
         cr, uid, pool, dbname, uri2 = self.get_cr(uri)
         
         if not dbname:
         cr, uid, pool, dbname, uri2 = self.get_cr(uri)
         
         if not dbname:

-            s = netsvc.LocalService('db')
+            s = netsvc.ExportService.getService('db')

             cr.close()
             return map(lambda x: self.urijoin(x), self.db_list())
         result = []
             cr.close()
             return map(lambda x: self.urijoin(x), self.db_list())
         result = []

diff --git a/addons/project_calendar/project_calendar_wizard.xml b/addons/project_calendar/project_calendar_wizard.xml
index 25ac4cf..7928ff3 100644 (file)
--- a/addons/project_calendar/project_calendar_wizard.xml
+++ b/addons/project_calendar/project_calendar_wizard.xml
@@ -1,14 +1,14 @@
 <openerp>
        <data>
                <wizard string="Import .ics File" model="project.task"
 <openerp>
        <data>
                <wizard string="Import .ics File" model="project.task"

-                       name="calendar.event.import" id="base_calendar.wizard_cal_event_import" multi="True" />
+                       name="calendar.event.import" id="base_calendar.wizard_cal_event_import" />

 
 

-               <wizard string="Subscribe to a Remote calendar"
+               <wizard string="Subscribe"

                        model="project.task" name="calendar.event.subscribe"
                        model="project.task" name="calendar.event.subscribe"

-                       id="base_calendar.wizard_cal_event_subscribe" multi="True" />
+                       id="base_calendar.wizard_cal_event_subscribe" />

 
                <wizard string="Export .ics File" model="project.task"
 
                <wizard string="Export .ics File" model="project.task"

-                       name="calendar.event.export" id="base_calendar.wizard_cal_event_export" multi="True" />
+                       name="calendar.event.export" id="base_calendar.wizard_cal_event_export" />

 
                <wizard string="Edit this event" model="project.task"
                        name="calendar.event.edit.this" id="base_calendar.wizard_edit_this_event"
 
                <wizard string="Edit this event" model="project.task"
                        name="calendar.event.edit.this" id="base_calendar.wizard_edit_this_event"