From 093beecd0a8a167ccb0a9f32a6d5271a9b1d41cd Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 26 May 2015 10:47:52 +0530 Subject: [PATCH] minor fix --- erpnext/patches/v5_0/set_footer_address.py | 1 + erpnext/public/js/controllers/transaction.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/patches/v5_0/set_footer_address.py b/erpnext/patches/v5_0/set_footer_address.py index 5eb5624987d..2779e48c597 100644 --- a/erpnext/patches/v5_0/set_footer_address.py +++ b/erpnext/patches/v5_0/set_footer_address.py @@ -1,6 +1,7 @@ import frappe def execute(): + frappe.reload_doctype("System Settings") ss = frappe.get_doc("System Settings", "System Settings") ss.email_footer_address = frappe.db.get_default("company") ss.save() diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index 7e5dc32139a..9f1a8eb161d 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -98,7 +98,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({ }, hide_currency_and_price_list: function() { - if(this.frm.doc.docstatus > 0) { + if(this.frm.doc.conversion_rate == 1 && this.frm.doc.docstatus > 0) { hide_field("currency_and_price_list"); } else { unhide_field("currency_and_price_list");