[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Mon, 25 Nov 2013 10:36:55 +0000 (11:36 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Mon, 25 Nov 2013 10:36:55 +0000 (11:36 +0100)
commit3fe26a6bb72979b7c3bcf179c43a5c4832cf05b8
tree630a337e056a99d10d88e2dd8a431316b01923f5
parenta05ac84aea53e888ca39193a6b15371221d51593
parentbba9e86c416e76725a4130eff6f4df1d694efdf2
[MERGE] from trunk

bzr revid: fva@openerp.com-20131125103655-2w83i8oy6ebtruin
addons/point_of_sale/static/src/css/pos.css
addons/point_of_sale/static/src/js/screens.js
addons/point_of_sale/static/src/js/widgets.js
addons/point_of_sale/static/src/xml/pos.xml