[MERGE] latest trunk
authorAntonin Bourguignon <abo@openerp.com>
Wed, 18 Jul 2012 10:37:36 +0000 (12:37 +0200)
committerAntonin Bourguignon <abo@openerp.com>
Wed, 18 Jul 2012 10:37:36 +0000 (12:37 +0200)
commit78e98fbfd7118742045c3c3ad24774f236a8305b
tree86dc04991f0e3011be6aa0df095f99bc0acf9a7a
parentc7f4b5ead1edbd30cd0c43fc3fec8c45327e452a
parent2a89c6079c9f7f5d9135bcda777fda3f3ed8d859
[MERGE] latest trunk

bzr revid: abo@openerp.com-20120718103736-8alnc11l9uqaskpl
addons/purchase/stock_view.xml
addons/stock/stock_view.xml