schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor fix

Browse Source
This commit is contained in:
Nabin Hait
2015-05-26 10:47:52 +05:30
parent 822fd7747a
commit 093beecd0a
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/patches/v5_0/set_footer_address.py
View File

@@ -1,6 +1,7 @@
import frappe import frappe
def execute(): def execute():
frappe.reload_doctype("System Settings")
ss = frappe.get_doc("System Settings", "System Settings") ss = frappe.get_doc("System Settings", "System Settings")
ss.email_footer_address = frappe.db.get_default("company") ss.email_footer_address = frappe.db.get_default("company")
ss.save() ss.save()

2
erpnext/public/js/controllers/transaction.js
View File

@@ -98,7 +98,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
}, },
hide_currency_and_price_list: function() { 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"); hide_field("currency_and_price_list");
} else { } else {
unhide_field("currency_and_price_list"); unhide_field("currency_and_price_list");