[MERGE]:merged from trunk
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 29 Jun 2012 12:50:49 +0000 (18:20 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 29 Jun 2012 12:50:49 +0000 (18:20 +0530)
commitd0858ba8917cccf6b5f2702ed4d11e080c965e8c
treed0cea55e58a529e596136b7910ba2c5e1402ca6d
parent7597d87357d678a475a3ff5b9557a8423d1b2c1e
parent37601079a987b0b20f22fff8963d22b1440b78b4
[MERGE]:merged from trunk

bzr revid: apa@tinyerp.com-20120629125049-mx9k8y8w2p8a7wxz
addons/procurement/procurement_view.xml
addons/procurement/wizard/schedulers_all_view.xml
addons/stock/stock_view.xml
addons/stock_planning/stock_planning_view.xml
addons/stock_planning/wizard/stock_planning_create_periods_view.xml
addons/stock_planning/wizard/stock_planning_createlines_view.xml