[MERGE] merged with trunk up to revision 9425. Needs to find another icon for Traceab...
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 7 May 2014 18:29:17 +0000 (20:29 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 7 May 2014 18:29:17 +0000 (20:29 +0200)
commit70eb74a260cd64b9f108bad5231eff606d317392
tree072da5988cb0d770ac0fd67dea3eb8155a5a55ec
parent5b939810875d58c2667caf45c6d66d7967578140
parent95e1bd0612d69b875e840f1d37e9c0e4a7b43a54
[MERGE] merged with trunk up to revision 9425. Needs to find another icon for Traceability on lot, though

bzr revid: qdp-launchpad@openerp.com-20140507182917-erjammra4okyei1c
15 files changed:
addons/claim_from_delivery/claim_delivery_view.xml
addons/mrp/mrp.py
addons/mrp/mrp_view.xml
addons/multi_company/multi_company_demo.xml
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_view.xml
addons/purchase/purchase.py
addons/purchase/purchase_view.xml
addons/purchase/stock_view.xml
addons/report/models/report.py
addons/sale/sale.py
addons/sale/sale_view.xml
addons/stock/stock.py
addons/stock/stock_view.xml
addons/warning/warning.py