From 53bb687009d8bc3ccd2b02c291cf6d6dc263e1ec Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Tue, 1 Nov 2016 13:21:43 +0530 Subject: [PATCH] hotfix issues --- erpnext/accounts/doctype/journal_entry/journal_entry.py | 3 ++- erpnext/accounts/page/pos/pos.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index 083ba6ff61..145ed81564 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -763,7 +763,8 @@ def get_party_account_and_balance(company, party_type, party): return { "account": account, "balance": account_balance, - "party_balance": party_balance + "party_balance": party_balance, + "account_currency": frappe.db.get_value("Account", account, "account_currency") } @frappe.whitelist() diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js index f43a43602b..4c13fe3720 100644 --- a/erpnext/accounts/page/pos/pos.js +++ b/erpnext/accounts/page/pos/pos.js @@ -392,7 +392,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ if(index < 30){ $(frappe.render_template("pos_item", { item_code: obj.name, - item_price: format_currency(obj.price_list_rate, obj.currency), + item_price: format_currency(obj.price_list_rate, me.frm.doc.currency), item_name: obj.name===obj.item_name ? "" : obj.item_name, item_image: obj.image ? "url('" + obj.image + "')" : null, color: frappe.get_palette(obj.item_name),