[FIX] Merge Diff
authorKuldeep Joshi (OpenERP) <kjo@tinyerp.com>
Fri, 23 Sep 2011 13:31:43 +0000 (19:01 +0530)
committerKuldeep Joshi (OpenERP) <kjo@tinyerp.com>
Fri, 23 Sep 2011 13:31:43 +0000 (19:01 +0530)
commitf66f72c14d29b34cd8033269cf96ca5ad44f558c
tree8a820068c0251e0646fed0a0c3b72ca5c8534fb8
parenta4e8d1589e9c2293dcab63a06c3934f6fd29ad09
[FIX] Merge Diff

bzr revid: kjo@tinyerp.com-20110923133143-bow7devd85xo7qoa
addons/stock/stock_view.xml