merge upstream
authorChristophe Simonis <chs@odoo.com>
Wed, 25 Jun 2014 17:08:49 +0000 (19:08 +0200)
committerChristophe Simonis <chs@odoo.com>
Wed, 25 Jun 2014 17:08:49 +0000 (19:08 +0200)
commit8cabd5eac98f71a146f9b61c6d7f09b9cc5205f9
tree945767e0ffe46d22916f1ceab3e2a448b89a4cfe
parent49d7b107d11b5ac63d5b2f615ecc3703d618b992
parent668b8c2b2df61de1e6df5ff009157cf37271c914
merge upstream
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_view.xml