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

fix: display reconcile tool when closing balance 0 (#25417)

Browse Source 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
This commit is contained in:
Mohammad Hasnain Mohsin Rajan 2021-04-22 04:53:09 +05:30 committed by GitHub
parent 157b388209
commit 7f932cfb30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js
View File

@ -78,8 +78,7 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
if ( if (
frm.doc.bank_account && frm.doc.bank_account &&
frm.doc.bank_statement_from_date && frm.doc.bank_statement_from_date &&
frm.doc.bank_statement_to_date && frm.doc.bank_statement_to_date
frm.doc.bank_statement_closing_balance
) { ) {
frm.trigger("render_chart"); frm.trigger("render_chart");
frm.trigger("render"); frm.trigger("render");

9
erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json
View File

@ -39,13 +39,13 @@
"depends_on": "eval: doc.bank_account", "depends_on": "eval: doc.bank_account",
"fieldname": "bank_statement_from_date", "fieldname": "bank_statement_from_date",
"fieldtype": "Date", "fieldtype": "Date",
"label": "Bank Statement From Date" "label": "From Date"
}, },
{ {
"depends_on": "eval: doc.bank_statement_from_date", "depends_on": "eval: doc.bank_statement_from_date",
"fieldname": "bank_statement_to_date", "fieldname": "bank_statement_to_date",
"fieldtype": "Date", "fieldtype": "Date",
"label": "Bank Statement To Date" "label": "To Date"
}, },
{ {
"fieldname": "column_break_2", "fieldname": "column_break_2",
@ -63,11 +63,10 @@
"depends_on": "eval: doc.bank_statement_to_date", "depends_on": "eval: doc.bank_statement_to_date",
"fieldname": "bank_statement_closing_balance", "fieldname": "bank_statement_closing_balance",
"fieldtype": "Currency", "fieldtype": "Currency",
"label": "Bank Statement Closing Balance", "label": "Closing Balance",
"options": "Currency" "options": "Currency"
}, },
{ {
"depends_on": "eval: doc.bank_statement_closing_balance",
"fieldname": "section_break_1", "fieldname": "section_break_1",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Reconcile" "label": "Reconcile"
@ -90,7 +89,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2021-02-02 01:35:53.043578", "modified": "2021-04-21 11:13:49.831769",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Bank Reconciliation Tool", "name": "Bank Reconciliation Tool",