[Merge] Merge with main branch.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Thu, 22 Mar 2012 05:14:21 +0000 (10:44 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Thu, 22 Mar 2012 05:14:21 +0000 (10:44 +0530)
commit94f77531c688c1bb552f502d1bfd95e341838264
tree96af8bbdbb1ac83e82f76b0b18da60c8ea63a463
parent022aff0ac9adcd69729fc7199e3585ba371eff0c
parent7299209ef362a385c95afa2eb06630f5f3c485a3
[Merge] Merge with main branch.

bzr revid: mdi@tinyerp.com-20120322051421-pm26lpk88ya19qg1
addons/stock/stock.py