[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 18 Jul 2012 04:48:20 +0000 (10:18 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 18 Jul 2012 04:48:20 +0000 (10:18 +0530)
commit4e975bdd14698f6954fee0c60bbb27bfa72e6ea8
treeef7922279e4a3e407edd175cc43fa294dcaeee5b
parent6c0781ef8634f918b97aa53aec5219f9ca9985a8
parent2a89c6079c9f7f5d9135bcda777fda3f3ed8d859
[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20120718044820-s4r6iiuxh8zk8db2
addons/procurement/procurement_view.xml
addons/stock/stock_view.xml