[MERGE]merged with trunk-survey-layout-tta

bzr revid: vba@tinyerp.com-20120709130113-3lchipgil9oqpglg

7 files changed, 73 insertions, 69 deletions

diff --git a/addons/caldav/caldav_node.py b/addons/caldav/caldav_node.py
index 71e9bdc2468..da5c5f017a6 100644
--- a/addons/caldav/caldav_node.py
+++ b/addons/caldav/caldav_node.py
@@ -23,6 +23,7 @@ from document_webdav import nodes
 from document.nodes import _str2time, nodefd_static
 import logging
 from orm_utils import get_last_modified
+_logger = logging.getLogger(__name__)
 
 try:
     from tools.dict_tools import  dict_merge2
@@ -223,7 +224,6 @@ class node_calendar(nodes.node_class):
         res = []
         if not filters:
             return res
-        _log = logging.getLogger('caldav.query')
         if filters.localName == 'calendar-query':
             res = []
             for filter_child in filters.childNodes:
diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index 94d28e4ad37..fb98e00a86f 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -34,6 +34,7 @@ import logging
 from caldav_node import res_node_calendar
 from orm_utils import get_last_modified
 from tools.safe_eval import safe_eval as eval
+_logger = logging.getLogger(__name__)
 
 try:
     import vobject
@@ -240,7 +241,6 @@ def map_data(cr, uid, obj, context=None):
 
 class CalDAV(object):
     __attribute__ = {}
-    _logger = logging.getLogger('document.caldav')
 
     def ical_set(self, name, value, type):
         """ set calendar Attribute
@@ -725,13 +725,13 @@ class Calendar(CalDAV, osv.osv):
                 objs.append(cal_children[child.name.lower()])
             elif child.name.upper() == 'CALSCALE':
                 if child.value.upper() != 'GREGORIAN':
-                    self._logger.warning('How do I handle %s calendars?',child.value)
+                    _logger.warning('How do I handle %s calendars?',child.value)
             elif child.name.upper() in ('PRODID', 'VERSION'):
                 pass
             elif child.name.upper().startswith('X-'):
-                self._logger.debug("skipping custom node %s", child.name)
+                _logger.debug("skipping custom node %s", child.name)
             else:
-                self._logger.debug("skipping node %s", child.name)
+                _logger.debug("skipping node %s", child.name)
         
         res = []
         for obj_name in list(set(objs)):
diff --git a/addons/caldav/calendar_collection.py b/addons/caldav/calendar_collection.py
index 1abbf573ef0..3a5604b2f67 100644
--- a/addons/caldav/calendar_collection.py
+++ b/addons/caldav/calendar_collection.py
@@ -23,6 +23,7 @@ from osv import osv, fields
 from tools.translate import _
 import caldav_node
 import logging
+_logger = logging.getLogger(__name__)
 
 class calendar_collection(osv.osv):
     _inherit = 'document.directory' 
@@ -44,8 +45,7 @@ class calendar_collection(osv.osv):
             root_cal_dir = self.browse(cr,uid, root_id, context=context) 
             return root_cal_dir.name
         except Exception:
-            logger = logging.getLogger('document')
-            logger.warning('Cannot set root directory for Calendars:', exc_info=True)
+            _logger.warning('Cannot set root directory for Calendars:', exc_info=True)
             return False
         return False
 
diff --git a/addons/caldav/wizard/caldav_browse_view.xml b/addons/caldav/wizard/caldav_browse_view.xml
index 9d088ae55f6..29f455d764f 100644
--- a/addons/caldav/wizard/caldav_browse_view.xml
+++ b/addons/caldav/wizard/caldav_browse_view.xml
@@ -7,18 +7,36 @@
             <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"/>
-                        <group col="4" colspan="4">
-                            <label string="" colspan="2"/>
-                            <button special="cancel" string="_Close" icon="gtk-close"/>
+                <form string="Browse Caldav" version="7.0">
+                    <header>
+                        <button special="cancel" string="_Close" icon="gtk-close"/>
+                    </header>
+                    <sheet>
+                        <group>
+                            <separator string="Browse Caldav" colspan="4"/>
+                            <field name="url" colspan="2" />
+                            <separator string="Help" colspan="4"/>
+                            <group colspan="4"><div>
+                                1. Webdav server that provides remote access to calendar<br/>
+                                2. Synchronisation of calendar using WebDAV<br/>
+                                3. Customize calendar event and todo attribute with any of OpenERP model<br/>
+                                4. Provides iCal Import/Export functionality
+                           <br/></div></group>
+                           <group colspan="4"><div>
+                           To access Calendars using CalDAV clients, point them to:
+        http://<i>HOSTNAME</i>:<i>PORT</i>/webdav/<i>DATABASE_NAME</i>/calendars/users/<i>USERNAME</i>/c</div></group>
+                            <group colspan="4"><div>
+                            To access OpenERP Calendar using WebCal to remote site use the URL like:
+        http://<i>HOSTNAME</i>:<i>PORT</i>/webdav/<i>DATABASE_NAME</i>/Calendars/<i>CALENDAR_NAME</i>.ics</div></group>
+                            <group colspan="4"><div>
+                            <i>
+        HOSTNAME: Host on which OpenERP server(With webdav) is running<br/>
+        PORT : Port on which OpenERP server is running (By Default : 8069)<br/>
+        DATABASE_NAME: Name of database on which OpenERP Calendar is created</i>
+        </div></group>
+                            
                         </group>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -28,18 +46,17 @@
            <field name="model">user.preference</field>
            <field name="type">form</field>
             <field name="arch" type="xml">
-               <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">
-                       <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
-                       <button name="next_window" string="Next" type="object" icon="gtk-go-forward"/>
-                    </group>
+               <form string="Caldav's host name configuration" version="7.0">
+                    <header>
+                        <button name="next_window" string="Next" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </header>
+                    <sheet>
+                        <group>
+                            <field name="host_name"  colspan="2" width="250" placeholder="For example : database.my.openerp.com or companyserver.com"/>
+                        </group>
+                    </sheet>
                </form>
             </field>
         </record>
@@ -49,19 +66,20 @@
             <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 string="User Preference" version="7.0">
+                    <header>
+                        <button name="open_window" string="_Open" type="object" icon="gtk-ok" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </header>
+                    <sheet>
+                        <group>
+                            <field name="service" readonly="1"/>
+                            <field name="collection" invisible="1" />
+                            <field name="calendar"  domain="[('collection_id','=', collection)]" readonly="1"/>
+                            <field name="device"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/caldav/wizard/calendar_event_export_view.xml b/addons/caldav/wizard/calendar_event_export_view.xml
index 8b74e29a98e..92e4504db02 100644
--- a/addons/caldav/wizard/calendar_event_export_view.xml
+++ b/addons/caldav/wizard/calendar_event_export_view.xml
@@ -11,11 +11,6 @@
                          <field name="name"/>
                          <field name="file_path" colspan="4" width="300"/>
                     </group>
-                        <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                        <label string=""/>
-                        <button  icon="gtk-close" special="cancel" string="_Close"/>
-                   </group>
                </form>
             </field>
         </record>
diff --git a/addons/caldav/wizard/calendar_event_import_view.xml b/addons/caldav/wizard/calendar_event_import_view.xml
index bda2c122e65..3f498504444 100644
--- a/addons/caldav/wizard/calendar_event_import_view.xml
+++ b/addons/caldav/wizard/calendar_event_import_view.xml
@@ -6,16 +6,16 @@
             <field name="model">calendar.event.import</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Import ICS">
+                <form string="Import ICS" version="7.0">
+                    <header>
+                        <button name="process_imp_ics"  string="_Import" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </header>
                     <group colspan="4" >
                          <separator string="Select ICS File"/>
                          <field name="file_path" colspan="4" width="500" nolabel="1"/>
                     </group>
-                        <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                        <button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
-                        <button  icon="gtk-ok"  name="process_imp_ics"  string="_Import" type="object"/>
-                   </group>
                </form>
             </field>
         </record>
@@ -29,10 +29,6 @@
                     <group colspan="4" >
                           <field name="msg" colspan="4" width="300" nolabel="1"/>
                     </group>
-                        <separator string="" colspan="4" />
-                    <group colspan="4">
-                        <button  icon="gtk-ok" special="cancel" string="Ok"/>
-                   </group>
                </form>
             </field>
         </record>
@@ -42,6 +38,5 @@
             res_model="calendar.event.import" src_model="basic.calendar"
             view_id="view_calendar_event_import"
             view_mode="form" target="new" view_type="form" />
-        
     </data>
 </openerp>
diff --git a/addons/caldav/wizard/calendar_event_subscribe_view.xml b/addons/caldav/wizard/calendar_event_subscribe_view.xml
index 244e471df0e..590daa34561 100644
--- a/addons/caldav/wizard/calendar_event_subscribe_view.xml
+++ b/addons/caldav/wizard/calendar_event_subscribe_view.xml
@@ -6,16 +6,16 @@
             <field name="model">calendar.event.subscribe</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Subscribe to Remote Calendar">
+                <form string="Subscribe to Remote Calendar" version="7.0">
+                    <header>
+                        <button name="process_imp_ics"  string="_Subscribe" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </header>
                     <group colspan="4" >
                          <separator string="Provide Path for Remote Calendar"/>
                           <field name="url_path" colspan="4" width="300" nolabel="1" widget="url"/>
                     </group>
-                        <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                        <button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
-                        <button  icon="gtk-ok"  name="process_imp_ics"  string="_Subscribe" type="object"/>
-                   </group>
                </form>
             </field>
         </record>
@@ -29,10 +29,6 @@
                     <group colspan="4" >
                           <field name="msg" colspan="4" width="300" nolabel="1"/>
                     </group>
-                        <separator string="" colspan="4" />
-                    <group colspan="4">
-                        <button  icon="gtk-ok" special="cancel" string="Ok"/>
-                   </group>
                </form>
             </field>
         </record>