From 9481e037d22c576c70270671c320d9dcfec47374 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Mon, 22 Jul 2013 17:28:11 +0530
Subject: [PATCH] [minor] [fix] pull uom conversion factor in purchase cycle

---
 buying/utils.py                                              | 2 +-
 .../doctype/uom_conversion_detail/uom_conversion_detail.txt  | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/buying/utils.py b/buying/utils.py
index 886b460e935..d7db1d5fa29 100644
--- a/buying/utils.py
+++ b/buying/utils.py
@@ -207,7 +207,7 @@ def get_last_purchase_details(item_code, doc_name, conversion_rate=1.0):
 @webnotes.whitelist()
 def get_conversion_factor(item_code, uom):
 	return {"conversion_factor": webnotes.conn.get_value("UOM Conversion Detail",
-		{"parent": item_code, "uom": uom})}
+		{"parent": item_code, "uom": uom}, "conversion_factor")}
 		
 @webnotes.whitelist()
 def get_projected_qty(item_code, warehouse):
diff --git a/stock/doctype/uom_conversion_detail/uom_conversion_detail.txt b/stock/doctype/uom_conversion_detail/uom_conversion_detail.txt
index 8b35f64cfb7..d775513cd40 100644
--- a/stock/doctype/uom_conversion_detail/uom_conversion_detail.txt
+++ b/stock/doctype/uom_conversion_detail/uom_conversion_detail.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-02-22 01:28:04", 
   "docstatus": 0, 
-  "modified": "2013-07-10 14:54:25", 
+  "modified": "2013-07-22 17:17:53", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -15,6 +15,7 @@
  }, 
  {
   "doctype": "DocField", 
+  "in_list_view": 1, 
   "name": "__common__", 
   "parent": "UOM Conversion Detail", 
   "parentfield": "fields", 
@@ -29,7 +30,6 @@
   "doctype": "DocField", 
   "fieldname": "uom", 
   "fieldtype": "Link", 
-  "in_list_view": 0, 
   "label": "UOM", 
   "oldfieldname": "uom", 
   "oldfieldtype": "Link", 
@@ -39,7 +39,6 @@
   "doctype": "DocField", 
   "fieldname": "conversion_factor", 
   "fieldtype": "Float", 
-  "in_list_view": 1, 
   "label": "Conversion Factor", 
   "oldfieldname": "conversion_factor", 
   "oldfieldtype": "Float"