merge data
authorjke-openerp <jke@openerp.com>
Wed, 9 Oct 2013 13:30:39 +0000 (15:30 +0200)
committerjke-openerp <jke@openerp.com>
Wed, 9 Oct 2013 13:30:39 +0000 (15:30 +0200)
commit27f2eb58fcf2c78b277ba59152e74c5c6ddd7f9a
treefb3f47b88a9f4116b7f90dadadfdd1fb9037c5cd
parentb31a674c4245344131f859c986e1378cda40292c
merge data

bzr revid: jke@openerp.com-20131009133039-z6gj37omov4xh1qu
addons/stock/__openerp__.py
addons/stock/product.py
addons/stock/product_view.xml
addons/stock/stock.py
addons/stock/stock_data.xml
addons/stock/stock_data.yml [new file with mode: 0644]
addons/stock/stock_location_data.xml
addons/stock/stock_view.xml