diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js index 2e5d6b3847b..ccfdfceadb3 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.js +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js @@ -12,7 +12,7 @@ frappe.ui.form.on("Journal Entry", { refresh: function(frm) { erpnext.toggle_naming_series(); - + if(frm.doc.docstatus==1) { frm.add_custom_button(__('Ledger'), function() { frappe.route_options = { @@ -144,7 +144,7 @@ frappe.ui.form.on("Journal Entry", { } } }); - } + } else if(frm.doc.voucher_type=="Opening Entry") { return frappe.call({ type:"GET", diff --git a/erpnext/accounts/doctype/journal_entry_template/journal_entry_template.js b/erpnext/accounts/doctype/journal_entry_template/journal_entry_template.js index 2a549778d7e..13e9a3d80c2 100644 --- a/erpnext/accounts/doctype/journal_entry_template/journal_entry_template.js +++ b/erpnext/accounts/doctype/journal_entry_template/journal_entry_template.js @@ -30,8 +30,8 @@ frappe.ui.form.on("Journal Entry Template", { row.account = d.account; }); refresh_field("accounts"); - } - + }; + if(!frm.doc.company) return; frm.trigger("clear_child");