From 173ffb995f511e8a42b56c9e75d9dc25b1fa4fb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Sat, 7 Dec 2013 18:00:14 +0100 Subject: [PATCH] [WIP] point_of_sale: making the standalone pos launchable from the pos backend bzr revid: fva@openerp.com-20131207170014-9pctopzgx5ahtb21 --- addons/point_of_sale/__openerp__.py | 5 ----- addons/point_of_sale/controllers/main.py | 6 ++---- addons/point_of_sale/point_of_sale.py | 14 ++++++-------- addons/point_of_sale/point_of_sale_view.xml | 5 +++-- addons/point_of_sale/wizard/pos_session_opening.py | 7 +++---- 5 files changed, 14 insertions(+), 23 deletions(-) diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py index 44ceb83b02d..fa42a19e209 100644 --- a/addons/point_of_sale/__openerp__.py +++ b/addons/point_of_sale/__openerp__.py @@ -100,11 +100,6 @@ Main Features 'static/src/js/tests.js', 'static/src/js/main.js', ], - 'css': [ - 'static/src/css/pos.css', # this is the default css with hover effects - #'static/src/css/pos_nohover.css', # this css has no hover effects (for resistive touchscreens) - 'static/src/css/keyboard.css' - ], 'qweb': ['static/src/xml/pos.xml'], 'auto_install': False, } diff --git a/addons/point_of_sale/controllers/main.py b/addons/point_of_sale/controllers/main.py index 4871997f5de..24cd29f6a69 100644 --- a/addons/point_of_sale/controllers/main.py +++ b/addons/point_of_sale/controllers/main.py @@ -32,7 +32,9 @@ html_template = """ + + %(js)s