[Fix] crm, email_template: fix the warining of the buildbot

bzr revid: sbh@tinyerp.com-20101006060425-due2y7k9tsnpzt7x

addons/crm/crm_opportunity.py

@@ -19,8 +19,7 @@
 #
 ##############################################################################
 
-from datetime import datetime
-from osv import fields,osv,orm
+from osv import fields,osv
 from tools.translate import _
 import crm
 import time
@@ -121,7 +120,7 @@ class crm_opportunity(osv.osv):
         """
         res = super(crm_opportunity, self).case_reset(cr, uid, ids, *args)
         self.write(cr, uid, ids, {'stage_id': False})
-        return True
+        return res
    
  
     def case_open(self, cr, uid, ids, *args):

addons/email_template/email_template.py

@@ -31,10 +31,8 @@ TEMPLATE_ENGINES = []
 
 from osv import osv, fields
 from tools.translate import _
-from mako.template import Template  #For backward combatibility
 try:
     from mako.template import Template as MakoTemplate
-    from mako import exceptions
     TEMPLATE_ENGINES.append(('mako', 'Mako Templates'))
 except:
     LOGGER.notifyChannel(
@@ -302,7 +300,6 @@ This is useful for CRM leads for example"),
 
     def unlink_action(self, cr, uid, ids, context):
         for template in self.browse(cr, uid, ids, context):
-            obj = self.pool.get(template.object_name.model)
             try:
                 if template.ref_ir_act_window:
                     self.pool.get('ir.actions.act_window').unlink(cr, uid, template.ref_ir_act_window.id, context)