Merge branch 'master' into master-pos-new-payment-screen-fva
authorFrederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com>
Mon, 25 Aug 2014 14:42:57 +0000 (16:42 +0200)
committerFrederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com>
Mon, 25 Aug 2014 14:42:57 +0000 (16:42 +0200)
commitd7f93defb899b2b48a14d679e5dffffdb4a00eff
treef8572183b480477622917a1f504cf49a8e202f6e
parent2b67528fe9e366829d44d8aba756bc6e359b4c61
parent36146b3fadc47543f4b696ab75c31b3459afb15b
Merge branch 'master' into master-pos-new-payment-screen-fva

Conflicts:
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_view.xml
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_view.xml