From 2d57e511122c0cf4c3b428da70853416d71b59a4 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Wed, 31 Jul 2013 17:31:23 +0530
Subject: [PATCH 1/2] [fix] [minor] null issue

---
 selling/utils.py                        | 2 +-
 stock/doctype/item_price/item_price.txt | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/selling/utils.py b/selling/utils.py
index d24a35072f..43a5ad84c4 100644
--- a/selling/utils.py
+++ b/selling/utils.py
@@ -153,7 +153,7 @@ def _get_price_list_rate(args, item_bean, meta):
 	from utilities.transaction_base import validate_currency
 	validate_currency(args, item_bean.doc, meta)
 	
-	return {"ref_rate": flt(base_ref_rate[0].ref_rate * args.plc_conversion_rate / args.conversion_rate)}
+	return {"ref_rate": flt(base_ref_rate[0].ref_rate) * flt(args.plc_conversion_rate) / flt(args.conversion_rate)}
 	
 def _get_item_discount(item_group, customer):
 	parent_item_groups = [x[0] for x in webnotes.conn.sql("""SELECT parent.name 
diff --git a/stock/doctype/item_price/item_price.txt b/stock/doctype/item_price/item_price.txt
index 8062b5722a..7e23fb69f4 100644
--- a/stock/doctype/item_price/item_price.txt
+++ b/stock/doctype/item_price/item_price.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-05-02 16:29:48", 
   "docstatus": 0, 
-  "modified": "2013-07-10 14:54:09", 
+  "modified": "2013-07-31 17:30:34", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -49,7 +49,7 @@
   "oldfieldname": "ref_rate", 
   "oldfieldtype": "Currency", 
   "options": "ref_currency", 
-  "reqd": 0, 
+  "reqd": 1, 
   "search_index": 0
  }, 
  {

From 8608f0e9fa23ccd9039ee5b7515a526b32c38521 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Wed, 31 Jul 2013 18:00:25 +0530
Subject: [PATCH 2/2] [fix] [minor] error display in voucher import tool

---
 accounts/page/voucher_import_tool/voucher_import_tool.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/accounts/page/voucher_import_tool/voucher_import_tool.js b/accounts/page/voucher_import_tool/voucher_import_tool.js
index ffa230dd21..56cd5d74d5 100644
--- a/accounts/page/voucher_import_tool/voucher_import_tool.js
+++ b/accounts/page/voucher_import_tool/voucher_import_tool.js
@@ -33,7 +33,7 @@ wn.pages['voucher-import-tool'].onload = function(wrapper) {
 		callback: function(fid, filename, r) {
 			wrapper.waiting.toggle(false);
 			$(wrapper).find(".messages").toggle(true).html(
-				r.join("<div style='margin:4px; border-top:1px solid #aaa;'></div>"))
+				r.message.join("<div style='margin:4px; border-top:1px solid #aaa;'></div>"))
 		}
 	});