[MERGE] backport trunk revisions
authorChristophe Simonis <chs@openerp.com>
Thu, 6 Feb 2014 13:20:39 +0000 (14:20 +0100)
committerChristophe Simonis <chs@openerp.com>
Thu, 6 Feb 2014 13:20:39 +0000 (14:20 +0100)
commit1e4d99eeded6df021628e87bd2c644d09d3a63c4
tree83d9a926a5e8aed8ec9b4081f11d54df6bda3e2f
parent5a022d6ab338533c105410eed96f6e5822aef457
[MERGE] backport trunk revisions
 * 9094 fva@openerp.com-20140203144847-21cv7pt7lnlxdsve
 * 9095 fva@openerp.com-20140203153233-zj12w2o1uxyz5hoq

bzr revid: chs@openerp.com-20140206132039-y1whtc8qqqs8ey92
addons/hw_escpos/controllers/main.py
addons/point_of_sale/static/src/js/screens.js