[MERGE]upstream
authorHarry (OpenERP) <hmo@tinyerp.com>
Thu, 12 Jul 2012 07:05:50 +0000 (12:35 +0530)
committerHarry (OpenERP) <hmo@tinyerp.com>
Thu, 12 Jul 2012 07:05:50 +0000 (12:35 +0530)
commitaa15bf9f2bbc5a822e452d03352943de86c0f57b
tree4db5eac1016f14501b2d0356a7c72ea60918d433
parentd7bcb161d7b03603d4f4c8b6f07fe96a787264ec
parentb0b5a5988f613350d16d50d09adc9c12eb15022a
[MERGE]upstream

bzr revid: hmo@tinyerp.com-20120712070550-8uo8461srpen6332
addons/delivery/delivery_view.xml
addons/stock_planning/wizard/stock_planning_create_periods_view.xml
addons/stock_planning/wizard/stock_planning_createlines_view.xml