Conflict resolving
authorRucha Patel <ruchakpatel@gmail.com>
Tue, 23 Sep 2008 05:49:30 +0000 (11:19 +0530)
committerRucha Patel <ruchakpatel@gmail.com>
Tue, 23 Sep 2008 05:49:30 +0000 (11:19 +0530)
commit61d1209619aae53f3b6c9505f7f14a195176ed54
tree41c4abf84595c076f0ab820e47792cc8a5cda05d
parentbc6d378757021174712ad27a1ac84340ba52ab91
Conflict resolving

bzr revid: ruchakpatel@gmail.com-20080923054930-ovwk0h8puiex3zsf
addons/product/product.py
addons/stock/stock.py
addons/stock/stock_view.xml