[MERGE] from upstream
authorFrédéric van der Essen <fva@openerp.com>
Tue, 17 Sep 2013 10:19:10 +0000 (12:19 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Tue, 17 Sep 2013 10:19:10 +0000 (12:19 +0200)
commitc33fd59465e4be249f739aa9775c37e702ad159d
treefa8a433f7225035860a913a47624d7b4a7efd784
parent65c70b85a701575a1a464e4d561f184cec018885
parentbc0d066505a054389525cdf7601b35751ea3efbb
[MERGE] from upstream

bzr revid: fva@openerp.com-20130917101910-4h2g2njs2e9toc36
addons/point_of_sale/static/src/css/pos.css
addons/point_of_sale/static/src/js/models.js
addons/point_of_sale/static/src/js/screens.js
addons/point_of_sale/static/src/js/widgets.js