[MERGE] from master
authorFrederic van der Essen <fva@fva-laptop>
Tue, 1 Jul 2014 11:32:28 +0000 (13:32 +0200)
committerFrederic van der Essen <fva@fva-laptop>
Tue, 1 Jul 2014 11:32:28 +0000 (13:32 +0200)
commit7842b628809f2590cc9ed3e19f4b4820ed6d37b6
tree189f543e2e12b544381187d3813ae86661c368b9
parentc4049bc356cc66da516618c7d3c725c3fcf1af38
parentc9c5f6231f476f3114d13e74f62dcae91142e23c
[MERGE] from master
addons/point_of_sale/controllers/main.py
addons/point_of_sale/point_of_sale.py