diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py index b619f7e3a3f..4daeabb9129 100644 --- a/addons/point_of_sale/__openerp__.py +++ b/addons/point_of_sale/__openerp__.py @@ -22,7 +22,7 @@ { 'name': 'Point Of Sale', - 'version': '1.0', + 'version': '1.0.1', 'category': 'Point Of Sale', 'description': """ This module provides a quick and easy sale process. diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index 8b5b11cc01e..24eb704b7dc 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -6,7 +6,9 @@ font-family: "Lucida Grande", Helvetica, Verdana, Arial; color: #555555; font-size: 12px; - position: relative; + position: absolute; + left: 0; + top: 0; width: 100%; height: 100%; } diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js index 0347447c912..57c47f741ec 100644 --- a/addons/point_of_sale/static/src/js/pos.js +++ b/addons/point_of_sale/static/src/js/pos.js @@ -1183,10 +1183,15 @@ openerp.point_of_sale = function(db) { }; return App; })(); - + + db.web.client_actions.add('pos.ui', 'db.point_of_sale.PointOfSale'); db.point_of_sale.PointOfSale = db.web.Widget.extend({ template: "PointOfSale", start: function() { + // FIXME: absolutely horrible hack to avoid conflict + // between backbone's history and al's action + // thingie + window.location.hash = ''; var self = this; if (pos)