[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Tue, 26 Nov 2013 14:23:28 +0000 (15:23 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Tue, 26 Nov 2013 14:23:28 +0000 (15:23 +0100)
commit28c074dcb265d595fa373e2730763c0a4849628e
treeda0b3ebb6eb3815539c80261608f163428da7644
parent1a96fe1402a7c1bb3ef26b424ba60e1b21b65a2b
parentbb1e256f5b24bb4fc4b64e1fa973f86a30e4bace
[MERGE] from trunk

bzr revid: fva@openerp.com-20131126142328-26gdibac45v17djm
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_view.xml