Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/accounts/page/voucher_import_tool/voucher_import_tool.js b/accounts/page/voucher_import_tool/voucher_import_tool.js
index ffa230d..56cd5d7 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 @@
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>"))
}
});
diff --git a/selling/utils.py b/selling/utils.py
index d24a350..43a5ad8 100644
--- a/selling/utils.py
+++ b/selling/utils.py
@@ -153,7 +153,7 @@
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 8062b57..7e23fb6 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
},
{