diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py index 3f78580b958..1b6a6f1390f 100644 --- a/addons/point_of_sale/__openerp__.py +++ b/addons/point_of_sale/__openerp__.py @@ -83,7 +83,6 @@ Main features: 'application': True, # Web client 'js': [ - 'static/lib/backbone/backbone-0.9.2.js', 'static/lib/mousewheel/jquery.mousewheel-3.0.6.js', 'static/src/js/pos_db.js', 'static/src/js/pos_models.js', diff --git a/addons/point_of_sale/controllers/__init__.py b/addons/point_of_sale/controllers/__init__.py new file mode 100644 index 00000000000..b5f0bcc9ec6 --- /dev/null +++ b/addons/point_of_sale/controllers/__init__.py @@ -0,0 +1,3 @@ +import main +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/point_of_sale/controllers.py b/addons/point_of_sale/controllers/main.py similarity index 66% rename from addons/point_of_sale/controllers.py rename to addons/point_of_sale/controllers/main.py index 33a96dacf84..7fb417e92c2 100644 --- a/addons/point_of_sale/controllers.py +++ b/addons/point_of_sale/controllers/main.py @@ -1,14 +1,44 @@ # -*- coding: utf-8 -*- import logging +import simplejson try: import openerp.addons.web.common.http as openerpweb + from openerp.addons.web.controllers.main import manifest_list, module_boot, html_template except ImportError: import web.common.http as openerpweb class PointOfSaleController(openerpweb.Controller): _cp_path = '/pos' + @openerpweb.httprequest + def app(self, req, s_action=None, **kw): + js = "\n ".join('' % i for i in manifest_list(req, None, 'js')) + css = "\n ".join('' % i for i in manifest_list(req, None, 'css')) + + cookie = req.httprequest.cookies.get("instance0|session_id") + session_id = cookie.replace("%22","") + template = html_template.replace('