[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 28 Mar 2012 06:38:14 +0000 (12:08 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 28 Mar 2012 06:38:14 +0000 (12:08 +0530)
commit0b73e7eda26a67f3b37b8e6d310a2e02c2a1fa12
treea334b31a874e4df6419d7ad745fa6d13da555682
parent4f61360c4f766faf3579531c91b145c8a431c79e
parentb7f2284d7f4056501efbde6b92954c1b16a59bf5
[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20120328063814-3uni052uwdnk0cpv
addons/sale/sale_view.xml
addons/stock/stock_view.xml