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

bank reconciliation fix

Browse Source
This commit is contained in:
Nabin Hait 2015-01-19 14:21:02 +05:30
parent 71a6b93d89
commit 0a3e5653ba
2 changed files with 99 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js
View File

@ -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()
}
})
})

164
erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json
View File

@ -1,108 +1,108 @@
{ {
"allow_copy": 1, "allow_copy": 1,
"allow_email": 1, "allow_email": 1,
"allow_print": 1, "allow_print": 1,
"creation": "2013-01-10 16:34:05", "creation": "2013-01-10 16:34:05",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"fields": [ "fields": [
{ {
"description": "Select account head of the bank where cheque was deposited.", "description": "Select account head of the bank where cheque was deposited.",
"fieldname": "bank_account", "fieldname": "bank_account",
"fieldtype": "Link", "fieldtype": "Link",
"in_list_view": 1, "in_list_view": 1,
"label": "Bank Account", "label": "Bank Account",
"options": "Account", "options": "Account",
"permlevel": 0, "permlevel": 0,
"reqd": 1 "reqd": 1
}, },
{ {
"fieldname": "company", "fieldname": "company",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 1, "hidden": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Company", "label": "Company",
"options": "Company", "options": "Company",
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
"reqd": 0 "reqd": 0
}, },
{ {
"fieldname": "from_date", "fieldname": "from_date",
"fieldtype": "Date", "fieldtype": "Date",
"in_list_view": 1, "in_list_view": 1,
"label": "From Date", "label": "From Date",
"permlevel": 0, "permlevel": 0,
"reqd": 1 "reqd": 1
}, },
{ {
"fieldname": "to_date", "fieldname": "to_date",
"fieldtype": "Date", "fieldtype": "Date",
"in_list_view": 1, "in_list_view": 1,
"label": "To Date", "label": "To Date",
"permlevel": 0, "permlevel": 0,
"reqd": 1 "reqd": 1
}, },
{ {
"fieldname": "include_reconciled_entries", "fieldname": "include_reconciled_entries",
"fieldtype": "Check", "fieldtype": "Check",
"in_list_view": 1, "in_list_view": 1,
"label": "Include Reconciled Entries", "label": "Include Reconciled Entries",
"permlevel": 0 "permlevel": 0
}, },
{ {
"fieldname": "get_relevant_entries", "fieldname": "get_relevant_entries",
"fieldtype": "Button", "fieldtype": "Button",
"label": "Get Relevant Entries", "label": "Get Relevant Entries",
"options": "get_details", "options": "",
"permlevel": 0 "permlevel": 0
}, },
{ {
"fieldname": "journal_entries", "fieldname": "journal_entries",
"fieldtype": "Table", "fieldtype": "Table",
"label": "Journal Entries", "label": "Journal Entries",
"options": "Bank Reconciliation Detail", "options": "Bank Reconciliation Detail",
"permlevel": 0 "permlevel": 0
}, },
{ {
"fieldname": "update_clearance_date", "fieldname": "update_clearance_date",
"fieldtype": "Button", "fieldtype": "Button",
"label": "Update Clearance Date", "label": "Update Clearance Date",
"options": "update_details", "options": "",
"permlevel": 0 "permlevel": 0
}, },
{ {
"fieldname": "total_amount", "fieldname": "total_amount",
"fieldtype": "Currency", "fieldtype": "Currency",
"label": "Total Amount", "label": "Total Amount",
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
"read_only": 1 "read_only": 1
} }
], ],
"hide_heading": 1, "hide_heading": 1,
"hide_toolbar": 1, "hide_toolbar": 1,
"icon": "icon-check", "icon": "icon-check",
"idx": 1, "idx": 1,
"issingle": 1, "issingle": 1,
"modified": "2014-12-25 13:16:16.711609", "modified": "2015-01-19 07:49:15.830001",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Bank Reconciliation", "name": "Bank Reconciliation",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 0, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"permlevel": 0, "permlevel": 0,
"read": 1, "read": 1,
"report": 0, "report": 0,
"role": "Accounts User", "role": "Accounts User",
"submit": 0, "submit": 0,
"write": 1 "write": 1
} }
], ],
"read_only": 1 "read_only": 1
} }