[MERGE] Resolve conflicts 8.0
authorJosse Colpaert <jco@odoo.com>
Sun, 13 Jul 2014 07:27:20 +0000 (09:27 +0200)
committerJosse Colpaert <jco@odoo.com>
Sun, 13 Jul 2014 07:27:20 +0000 (09:27 +0200)
commit32dd003d60f4e28626bdd44880d95e393f0dab50
tree7d99894a8ac2cc4b8e27efd0fafcc9ec0193ff4d
parentbeb12f71f17cfb2dea0e52cf2e4c863da4bfcc86
parent5f5e18f9bbe8c2a69adc72cf54d099b4bf04f609
[MERGE] Resolve conflicts 8.0
addons/mrp/mrp_view.xml
addons/product/product_view.xml
addons/purchase/purchase.py
addons/purchase/purchase_view.xml
addons/sale/sale_view.xml
addons/stock/product_view.xml
addons/stock/wizard/stock_change_product_qty.py