From 5031f90ac179f2866c92246dbbcc19f232d4b3a6 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 19 Jan 2015 14:21:02 +0530 Subject: [PATCH] bank reconciliation fix --- .../bank_reconciliation.js | 17 ++ .../bank_reconciliation.json | 164 +++++++++--------- 2 files changed, 99 insertions(+), 82 deletions(-) diff --git a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js index b4e8f1d90e..972eece1d9 100644 --- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js +++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js @@ -16,3 +16,20 @@ cur_frm.cscript.onload = function(doc, cdt, cdn){ }; }); } + +frappe.ui.form.on("Bank Reconciliation", "update_clearance_date", function(frm) { + return frappe.call({ + method: "update_details", + doc: frm.doc + }) +}) + +frappe.ui.form.on("Bank Reconciliation", "get_relevant_entries", function(frm) { + return frappe.call({ + method: "get_details", + doc: frm.doc, + callback: function(r, rt) { + frm.refresh() + } + }) +}) diff --git a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json index 8e02873b77..c5a2a96a73 100644 --- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json +++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json @@ -1,108 +1,108 @@ { - "allow_copy": 1, - "allow_email": 1, - "allow_print": 1, - "creation": "2013-01-10 16:34:05", - "docstatus": 0, - "doctype": "DocType", + "allow_copy": 1, + "allow_email": 1, + "allow_print": 1, + "creation": "2013-01-10 16:34:05", + "docstatus": 0, + "doctype": "DocType", "fields": [ { - "description": "Select account head of the bank where cheque was deposited.", - "fieldname": "bank_account", - "fieldtype": "Link", - "in_list_view": 1, - "label": "Bank Account", - "options": "Account", - "permlevel": 0, + "description": "Select account head of the bank where cheque was deposited.", + "fieldname": "bank_account", + "fieldtype": "Link", + "in_list_view": 1, + "label": "Bank Account", + "options": "Account", + "permlevel": 0, "reqd": 1 - }, + }, { - "fieldname": "company", - "fieldtype": "Link", - "hidden": 1, - "in_list_view": 1, - "label": "Company", - "options": "Company", - "permlevel": 0, - "print_hide": 1, + "fieldname": "company", + "fieldtype": "Link", + "hidden": 1, + "in_list_view": 1, + "label": "Company", + "options": "Company", + "permlevel": 0, + "print_hide": 1, "reqd": 0 - }, + }, { - "fieldname": "from_date", - "fieldtype": "Date", - "in_list_view": 1, - "label": "From Date", - "permlevel": 0, + "fieldname": "from_date", + "fieldtype": "Date", + "in_list_view": 1, + "label": "From Date", + "permlevel": 0, "reqd": 1 - }, + }, { - "fieldname": "to_date", - "fieldtype": "Date", - "in_list_view": 1, - "label": "To Date", - "permlevel": 0, + "fieldname": "to_date", + "fieldtype": "Date", + "in_list_view": 1, + "label": "To Date", + "permlevel": 0, "reqd": 1 - }, + }, { - "fieldname": "include_reconciled_entries", - "fieldtype": "Check", - "in_list_view": 1, - "label": "Include Reconciled Entries", + "fieldname": "include_reconciled_entries", + "fieldtype": "Check", + "in_list_view": 1, + "label": "Include Reconciled Entries", "permlevel": 0 - }, + }, { - "fieldname": "get_relevant_entries", - "fieldtype": "Button", - "label": "Get Relevant Entries", - "options": "get_details", + "fieldname": "get_relevant_entries", + "fieldtype": "Button", + "label": "Get Relevant Entries", + "options": "", "permlevel": 0 - }, + }, { - "fieldname": "journal_entries", - "fieldtype": "Table", - "label": "Journal Entries", - "options": "Bank Reconciliation Detail", + "fieldname": "journal_entries", + "fieldtype": "Table", + "label": "Journal Entries", + "options": "Bank Reconciliation Detail", "permlevel": 0 - }, + }, { - "fieldname": "update_clearance_date", - "fieldtype": "Button", - "label": "Update Clearance Date", - "options": "update_details", + "fieldname": "update_clearance_date", + "fieldtype": "Button", + "label": "Update Clearance Date", + "options": "", "permlevel": 0 - }, + }, { - "fieldname": "total_amount", - "fieldtype": "Currency", - "label": "Total Amount", - "options": "Company:company:default_currency", - "permlevel": 0, + "fieldname": "total_amount", + "fieldtype": "Currency", + "label": "Total Amount", + "options": "Company:company:default_currency", + "permlevel": 0, "read_only": 1 } - ], - "hide_heading": 1, - "hide_toolbar": 1, - "icon": "icon-check", - "idx": 1, - "issingle": 1, - "modified": "2014-12-25 13:16:16.711609", - "modified_by": "Administrator", - "module": "Accounts", - "name": "Bank Reconciliation", - "owner": "Administrator", + ], + "hide_heading": 1, + "hide_toolbar": 1, + "icon": "icon-check", + "idx": 1, + "issingle": 1, + "modified": "2015-01-19 07:49:15.830001", + "modified_by": "Administrator", + "module": "Accounts", + "name": "Bank Reconciliation", + "owner": "Administrator", "permissions": [ { - "amend": 0, - "apply_user_permissions": 0, - "cancel": 0, - "create": 1, - "permlevel": 0, - "read": 1, - "report": 0, - "role": "Accounts User", - "submit": 0, + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 1, + "permlevel": 0, + "read": 1, + "report": 0, + "role": "Accounts User", + "submit": 0, "write": 1 } - ], + ], "read_only": 1 -} +} \ No newline at end of file