Fixing 1140, exchange rate problems with shipto

--HG--
extra : source : 74bf162d8063670d5350905a7e81e9b1f470d366