[MERGE] point_of_sale: regression fix
authorFrédéric van der Essen <fva@openerp.com>
Wed, 29 Jan 2014 14:00:26 +0000 (15:00 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Wed, 29 Jan 2014 14:00:26 +0000 (15:00 +0100)
bzr revid: fva@openerp.com-20140129133339-myxow8s1jyppg3zp
bzr revid: fva@openerp.com-20140129140026-87ehph86jx9ya263


Trivial merge