[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
authormso <mso@mso>
Thu, 13 May 2010 13:07:01 +0000 (18:37 +0530)
committermso <mso@mso>
Thu, 13 May 2010 13:07:01 +0000 (18:37 +0530)
commit431559c80a030183f505bb614168b3bca970124a
tree9292558c9cf96534600e4d25234917b0919d8280
parent236e0e35d74af3f7e0b707748e0f165c4c1c7baf
parent7173e1179805fe19a864280c7eb0977441bb2714
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons1

bzr revid: mso@mso-20100513130701-zso2mtxy0etqrv0x
addons/stock/report/report_stock_move_view.xml
addons/stock/stock.py
addons/stock/stock_view.xml