[MERGE]:trunk
authorAmit Patel <apa@tinyerp.com>
Tue, 30 Oct 2012 04:54:57 +0000 (10:24 +0530)
committerAmit Patel <apa@tinyerp.com>
Tue, 30 Oct 2012 04:54:57 +0000 (10:24 +0530)
bzr revid: apa@tinyerp.com-20121030045457-4hyfaqx3xwx6jqhe

1  2 
addons/sale/sale_view.xml

Simple merge