[MERGE] from trunk, need point_of_sale updates
authorFrédéric van der Essen <fva@openerp.com>
Mon, 27 Jan 2014 16:09:46 +0000 (17:09 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Mon, 27 Jan 2014 16:09:46 +0000 (17:09 +0100)
commit5585a38ecc4d4963c02257a4afd1d2eb63c2cf97
tree991f0c065d3d99130d68204dfc05b14a259e8719
parent4c2cc018b12469f93dfa13defd50f61e5885eb50
parent1d7caa58bc6aa0345df16fde9c621d2f0c744d6a
[MERGE] from trunk, need point_of_sale updates

bzr revid: fva@openerp.com-20140127160946-yeswyv4o7t2tfbqt
addons/account/res_config_view.xml
addons/email_template/email_template.py
addons/point_of_sale/controllers/main.py
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_view.xml