[MERGE]

bzr revid: jam@tinyerp.com-20101230121125-7c434cjezbe0wyfn

addons/base_crypt/crypt.py

@@ -40,9 +40,7 @@ from random import seed, sample
 from string import letters, digits
 from osv import fields,osv
 import pooler
-import tools
 from tools.translate import _
-from service import security
 
 magic_md5 = '$1$'
 

addons/hr_holidays/hr_holidays.py

@@ -21,7 +21,6 @@
 #
 ##############################################################################
 
-import time
 import datetime
 from itertools import groupby
 from operator import itemgetter

addons/mrp/report/price.py

@@ -18,8 +18,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import time
-import ir
 import pooler
 from report.interface import report_rml
 from report.interface import toxml
@@ -52,7 +50,6 @@ class report_custom(report_rml):
             prod_name = bom['name']
             prod_qtty = factor * bom['product_qty']
             product_uom = product_uom_pool.browse(cr, uid, bom['product_uom'], context=context)
-            level = 1
             main_sp_price, main_sp_name , main_strd_price = '','',''
             sellers, sellers_price = '',''
 

addons/point_of_sale/wizard/pos_sales_user_today.py

@@ -20,7 +20,6 @@
 ##############################################################################
 
 from osv import osv, fields
-from tools.translate import _
 
 
 class pos_sales_user_today(osv.osv_memory):

addons/survey/report/survey_analysis_report.py

@@ -317,7 +317,6 @@ class survey_analysis(report_rml):
                                     rating_weight_sum += int(col_weight[1]) * tot_res
                                     tot_per = round((float(tot_res) * 100) / int(res_count), 2)
                                 else:
-                                    tor_res = 0
                                     tot_per = 0.0
                                 if tot_res:
                                     rml += """<td><para style="answer_bold">""" + tools.ustr(tot_per) + "%(" + tools.ustr(tot_res) + """)</para></td>"""

addons/survey/report/survey_browse_response.py

@@ -198,7 +198,6 @@ class survey_browse_response(report_rml):
 
         surv_resp_line_obj = pooler.get_pool(cr.dbname).get('survey.response.line')
         surv_obj = pooler.get_pool(cr.dbname).get('survey')
-        surv_ans_obj = pooler.get_pool(cr.dbname).get('survey.answer')
 
         for response in surv_resp_obj.browse(cr, uid, response_id):
             for survey in surv_obj.browse(cr, uid, [response.survey_id.id]):