[MERGE] point_of_sale, hw_escpos: fixes from the pos-restaurant branch
authorFrédéric van der Essen <fva@openerp.com>
Fri, 28 Mar 2014 13:45:08 +0000 (14:45 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Fri, 28 Mar 2014 13:45:08 +0000 (14:45 +0100)
bzr revid: fva@openerp.com-20140328134508-sriewvh13q45xhac


Trivial merge