diff --git a/accounts/doctype/pos_setting/pos_setting.txt b/accounts/doctype/pos_setting/pos_setting.txt
index d827490..9f5b246 100755
--- a/accounts/doctype/pos_setting/pos_setting.txt
+++ b/accounts/doctype/pos_setting/pos_setting.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-05-24 12:15:51", 
   "docstatus": 0, 
-  "modified": "2013-07-26 11:16:53", 
+  "modified": "2013-08-01 16:50:05", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -81,7 +81,6 @@
   "reqd": 1
  }, 
  {
-  "default": "1", 
   "doctype": "DocField", 
   "fieldname": "conversion_rate", 
   "fieldtype": "Float", 
diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.txt b/accounts/doctype/purchase_invoice/purchase_invoice.txt
index 6ed049e..47958cf 100755
--- a/accounts/doctype/purchase_invoice/purchase_invoice.txt
+++ b/accounts/doctype/purchase_invoice/purchase_invoice.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-05-21 16:16:39", 
   "docstatus": 0, 
-  "modified": "2013-07-25 16:08:44", 
+  "modified": "2013-08-01 16:49:49", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -223,7 +223,6 @@
   "read_only": 0
  }, 
  {
-  "default": "1", 
   "description": "The rate at which Bill Currency is converted into company's base currency", 
   "doctype": "DocField", 
   "fieldname": "conversion_rate", 
diff --git a/buying/doctype/purchase_order/purchase_order.txt b/buying/doctype/purchase_order/purchase_order.txt
index 95386bc..8f69a34 100644
--- a/buying/doctype/purchase_order/purchase_order.txt
+++ b/buying/doctype/purchase_order/purchase_order.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-05-21 16:16:39", 
   "docstatus": 0, 
-  "modified": "2013-08-01 12:27:13", 
+  "modified": "2013-08-01 16:49:16", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -191,7 +191,6 @@
   "reqd": 1
  }, 
  {
-  "default": "1", 
   "description": "Rate at which supplier's currency is converted to company's base currency", 
   "doctype": "DocField", 
   "fieldname": "conversion_rate", 
diff --git a/buying/doctype/supplier_quotation/supplier_quotation.txt b/buying/doctype/supplier_quotation/supplier_quotation.txt
index e18e011..8ac5060 100644
--- a/buying/doctype/supplier_quotation/supplier_quotation.txt
+++ b/buying/doctype/supplier_quotation/supplier_quotation.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-05-21 16:16:45", 
   "docstatus": 0, 
-  "modified": "2013-07-23 15:27:23", 
+  "modified": "2013-08-01 16:49:33", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -186,7 +186,6 @@
   "reqd": 1
  }, 
  {
-  "default": "1", 
   "description": "Rate at which supplier's currency is converted to company's base currency", 
   "doctype": "DocField", 
   "fieldname": "conversion_rate", 
diff --git a/controllers/accounts_controller.py b/controllers/accounts_controller.py
index 3d72e6f..e3e5d5e 100644
--- a/controllers/accounts_controller.py
+++ b/controllers/accounts_controller.py
@@ -67,6 +67,7 @@
 							self.doc.doctype + _(" can not be made."), raise_exception=1)
 			
 	def set_price_list_currency(self, buying_or_selling):
+		company_currency = get_company_currency(self.doc.company)
 		# TODO - change this, since price list now has only one currency allowed
 		if self.meta.get_field("price_list_name") and self.doc.price_list_name and \
 			not self.doc.price_list_currency:
@@ -74,7 +75,6 @@
 				
 				if self.doc.price_list_currency:
 					if not self.doc.plc_conversion_rate:
-						company_currency = get_company_currency(self.doc.company)
 						if self.doc.price_list_currency == company_currency:
 							self.doc.plc_conversion_rate = 1.0
 						else:
@@ -86,6 +86,12 @@
 						self.doc.currency = self.doc.price_list_currency
 						self.doc.conversion_rate = self.doc.plc_conversion_rate
 						
+		if self.meta.get_field("currency") and self.doc.currency != company_currency and \
+			not self.doc.conversion_rate:
+				exchange = self.doc.currency + "-" + company_currency
+				self.doc.conversion_rate = flt(webnotes.conn.get_value("Currency Exchange",
+					exchange, "exchange_rate"))
+						
 	def set_missing_item_details(self, get_item_details):
 		"""set missing item values"""
 		for item in self.doclist.get({"parentfield": self.fname}):