[MERGE] latest trunk
authorAntonin Bourguignon <abo@openerp.com>
Fri, 10 Aug 2012 15:39:57 +0000 (17:39 +0200)
committerAntonin Bourguignon <abo@openerp.com>
Fri, 10 Aug 2012 15:39:57 +0000 (17:39 +0200)
commit72fdeea2d8c2eb4effa47d91989efb8cc1e7ee41
treed3e93215e2fea7b453f61b714c9dd1a3e37d5994
parentf2fd44d85b7eed3eda1716474d29a46358abdb7d
parent8b47fc9a321f3a3071955d809e2b5994d052b2b2
[MERGE] latest trunk

bzr revid: abo@openerp.com-20120810153957-asszi74t9dxrzhx7
addons/point_of_sale/point_of_sale_view.xml