[MERGE] merged the team 2 branch

bzr revid: qdp-launchpad@tinyerp.com-20101018122814-xdlzhb1s6p2o1d96

addons/base_calendar/base_calendar.py

@@ -1531,6 +1531,9 @@ true, it will allow you to hide the event alarm information without removing it.
         result = []
         if fields and 'date' not in fields:
             fields.append('date')
+        if fields and 'duration' not in fields:
+            fields.append('duration')
+
 
         for base_calendar_id, real_id in select:
             #REVET: Revision ID: olt@tinyerp.com-20100924131709-cqsd1ut234ni6txn

addons/crm/crm_meeting.py

@@ -21,10 +21,8 @@
 
 from base_calendar import base_calendar
 from crm import crm_case
-from datetime import datetime, timedelta
 from osv import fields, osv
 from tools.translate import _
-import time
 import logging
 
 class crm_lead(crm_case, osv.osv):
@@ -187,7 +185,7 @@ class res_users(osv.osv):
         try:
             data_id = data_obj._get_id(cr, uid, 'crm', 'ir_ui_view_sc_calendar0')
             view_id  = data_obj.browse(cr, uid, data_id, context=context).res_id
-            copy_id = self.pool.get('ir.ui.view_sc').copy(cr, uid, view_id, default = {
+            self.pool.get('ir.ui.view_sc').copy(cr, uid, view_id, default = {
                                         'user_id': user_id}, context=context)
         except ValueError:
             # Tolerate a missing shortcut. See product/product.py for similar code.

addons/crm_caldav/crm_caldav.py

@@ -19,9 +19,8 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from osv import osv
 from base_calendar import base_calendar
-from crm import crm
 from caldav import calendar
 from datetime import datetime
 import re