Add the CN translation and the purchase requisition's inventory column
Merge branch 'master' of github.com:john-wang-metro/metro-openerp

Conflicts:
	metro_purchase/pur_req_view.xml