[MERGE] from master
authorFrédéric van der Essen <fvdessen@gmail.com>
Tue, 9 Dec 2014 22:38:33 +0000 (23:38 +0100)
committerFrédéric van der Essen <fvdessen@gmail.com>
Tue, 9 Dec 2014 22:38:33 +0000 (23:38 +0100)
commitc15f748be05b3709f5e16680569abdc2949468e2
tree789ba27f8b598d5133bfe2dbb2f78c9143fb09ea
parent1dbf153eb51303c4186ca5e2dacd729aadd95f28
parentb5164698f255633e68e6c3b75f30eae8492326dc
[MERGE] from master
12 files changed:
addons/account/account_view.xml
addons/point_of_sale/point_of_sale_view.xml
addons/point_of_sale/static/src/js/models.js
addons/point_of_sale/static/src/js/screens.js
addons/point_of_sale/static/src/js/widgets.js
addons/product/product.py
addons/product/product_view.xml
addons/stock/stock.py
addons/stock/stock_view.xml
addons/web/static/src/css/base.css
addons/web/static/src/css/base.sass
openerp/addons/base/res/res_partner.py