commit c62b6a815b80a509c85ffeac3aee83dbbf3d43ee
author Rushabh Mehta <rmehta@gmail.com> Tue Oct 07 17:15:30 2014 +0530
committer Rushabh Mehta <rmehta@gmail.com> Tue Oct 07 17:15:30 2014 +0530
tree 25e7f643075afc017e91264b2281d036325c16cb
parent b31e90c7a57031654a722cf9e92bc38b154c7c4c

[tests] fixes to stock entry

erpnext/controllers/buying_controller.py

diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
index 85c1449..b279d94 100644
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -195,7 +195,7 @@
 
 				self.round_floats_in(item)
 
-				item.conversion_factor = get_conversion_factor(item.item_code, item.uom).get("conversion_factor")
+				item.conversion_factor = get_conversion_factor(item.item_code, item.uom).get("conversion_factor") or 1.0
 
 				qty_in_stock_uom = flt(item.qty * item.conversion_factor)
 				rm_supp_cost = flt(item.rm_supp_cost) if self.doctype=="Purchase Receipt" else 0.0