[MERGE]: Merged with team1 branch.
authoruco (OpenERP) <uco@tinyerp.com>
Fri, 11 Jun 2010 05:14:39 +0000 (10:44 +0530)
committeruco (OpenERP) <uco@tinyerp.com>
Fri, 11 Jun 2010 05:14:39 +0000 (10:44 +0530)
commit3efc370713927c20b3c91c9d990478a53ee2dd44
treeca45f41f0b14790b7c5d9c2d909ca2b17023172a
parent297da6d3c9419d3b33358c8d54670ec255966cd2
parentb5215f17fd6bf4a6ec154bdc4a038c947fe8753c
[MERGE]: Merged with team1 branch.

bzr revid: uco@tinyerp.com-20100611051439-2miynuot8etuwc3o
addons/mrp/mrp.py
addons/mrp/mrp_view.xml
addons/stock/stock.py