Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[hot] [fix] journal entry

Browse Source
This commit is contained in:
Rushabh Mehta 2015-04-16 15:35:49 +05:30
parent d839a730cf
commit acf489c5ef
1 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
erpnext/accounts/doctype/journal_entry/journal_entry.js
View File

@ -138,6 +138,8 @@ cur_frm.script_manager.make(erpnext.accounts.JournalVoucher);
cur_frm.cscript.refresh = function(doc) { cur_frm.cscript.refresh = function(doc) {
cur_frm.cscript.is_opening(doc) cur_frm.cscript.is_opening(doc)
erpnext.toggle_naming_series(); erpnext.toggle_naming_series();
cur_frm.cscript.voucher_type();
if(doc.docstatus==1) { if(doc.docstatus==1) {
cur_frm.add_custom_button(__('View Ledger'), function() { cur_frm.add_custom_button(__('View Ledger'), function() {
frappe.route_options = { frappe.route_options = {
@ -235,37 +237,37 @@ cur_frm.cscript.voucher_type = function(doc, cdt, cdn) {
refresh_field("accounts"); refresh_field("accounts");
} }
if(in_list(["Bank Entry", "Cash Entry"], doc.voucher_type)) { if(!(doc.accounts || []).length) {
cur_frm.clear_table("accounts"); if(in_list(["Bank Entry", "Cash Entry"], doc.voucher_type)) {
return frappe.call({ return frappe.call({
type: "GET", type: "GET",
method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_default_bank_cash_account", method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_default_bank_cash_account",
args: { args: {
"voucher_type": doc.voucher_type, "voucher_type": doc.voucher_type,
"company": doc.company "company": doc.company
}, },
callback: function(r) { callback: function(r) {
if(r.message) { if(r.message) {
update_jv_details(doc, [r.message]); update_jv_details(doc, [r.message]);
}
} }
} })
}) } else if(doc.voucher_type=="Opening Entry") {
} else if(doc.voucher_type=="Opening Entry") { return frappe.call({
cur_frm.clear_table("accounts"); type:"GET",
return frappe.call({ method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_opening_accounts",
type:"GET", args: {
method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_opening_accounts", "company": doc.company
args: { },
"company": doc.company callback: function(r) {
}, frappe.model.clear_table(doc, "accounts");
callback: function(r) { if(r.message) {
frappe.model.clear_table(doc, "accounts"); update_jv_details(doc, r.message);
if(r.message) { }
update_jv_details(doc, r.message); cur_frm.set_value("is_opening", "Yes")
} }
cur_frm.set_value("is_opening", "Yes") })
} }
})
} }
} }