From a029fb22d0aeaf35027d1e18dc4ec2ab60135f5f Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 8 May 2014 12:08:56 +0200 Subject: [PATCH] [FIX] stock: fixed error 'cannot import name html_template' bzr revid: qdp-launchpad@openerp.com-20140508100856-jbitae0fzsdt7v78 --- addons/stock/controllers/main.py | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/addons/stock/controllers/main.py b/addons/stock/controllers/main.py index 21ee554d27a..48742c6c19a 100644 --- a/addons/stock/controllers/main.py +++ b/addons/stock/controllers/main.py @@ -1,14 +1,10 @@ # -*- coding: utf-8 -*- import logging import simplejson -import os -import openerp -import time -import random from openerp import http from openerp.http import request -from openerp.addons.web.controllers.main import manifest_list, module_boot, html_template +from openerp.addons.web.controllers.main import module_boot _logger = logging.getLogger(__name__) @@ -27,7 +23,7 @@ html_template = """ - + @@ -54,14 +50,7 @@ class BarcodeController(http.Controller): if not request.session.uid: return http.local_redirect('/web/login?redirect=/barcode/web') - js_list = manifest_list('js',db=request.db, debug=debug) - css_list = manifest_list('css',db=request.db, debug=debug) - - js = "\n".join('' % i for i in js_list) - #css = "\n".join('' % i for i in css_list) r = html_template % { - 'js': js, - # 'css': css, 'modules': simplejson.dumps(module_boot(request.db)), 'init': """ var wc = new s.web.WebClient();