[MERGE]Merged with lp:addons
authorron@tinyerp.com <>
Fri, 16 Sep 2011 06:56:38 +0000 (12:26 +0530)
committerron@tinyerp.com <>
Fri, 16 Sep 2011 06:56:38 +0000 (12:26 +0530)
commit24b6a02bd064159a3995d7f762ba555ff8ed02f0
tree57c90c276944cb3a16d14dc34738edf6e1a1cddc
parent8b055bc7c9285542a2ea301bbb61ab3748e51b32
parentd101d3fbaaffe2d0219ac6cfeef50338a2501664
[MERGE]Merged with lp:addons

bzr revid: ron@tinyerp.com-20110916065638-lxitbqcmqqh7e2qa
addons/stock/stock.py
addons/stock/stock_view.xml