From dec5bead9c4c553e627a1f8087267b02d39b5c28 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Wed, 6 Nov 2019 13:13:31 +0530 Subject: [PATCH 1/2] fix: unknown column credit limit in accounts receivable report --- .../accounts_receivable/accounts_receivable.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js index 228be18d21..11e13b5208 100644 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js @@ -79,13 +79,21 @@ frappe.query_reports["Accounts Receivable"] = { "options": "Customer", on_change: () => { var customer = frappe.query_report.get_filter_value('customer'); + var company = frappe.query_report.get_filter_value('company'); if (customer) { - frappe.db.get_value('Customer', customer, ["tax_id", "customer_name", "credit_limit", "payment_terms"], function(value) { + frappe.db.get_value('Customer', customer, ["tax_id", "customer_name", "payment_terms"], function(value) { frappe.query_report.set_filter_value('tax_id', value["tax_id"]); frappe.query_report.set_filter_value('customer_name', value["customer_name"]); - frappe.query_report.set_filter_value('credit_limit', value["credit_limit"]); frappe.query_report.set_filter_value('payment_terms', value["payment_terms"]); }); + + frappe.db.get_value('Customer Credit Limit', {'parent': customer, 'company': company}, + ["credit_limit"], function(value) { + if (value) { + debugger + frappe.query_report.set_filter_value('credit_limit', value["credit_limit"]); + } + }, "Customer"); } else { frappe.query_report.set_filter_value('tax_id', ""); frappe.query_report.set_filter_value('customer_name', ""); From 6a50c920878b503370116ec7aff9e0401038d082 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Wed, 6 Nov 2019 16:34:17 +0530 Subject: [PATCH 2/2] Update accounts_receivable.js --- .../accounts/report/accounts_receivable/accounts_receivable.js | 1 - 1 file changed, 1 deletion(-) diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js index 11e13b5208..9b4dda2f69 100644 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js @@ -90,7 +90,6 @@ frappe.query_reports["Accounts Receivable"] = { frappe.db.get_value('Customer Credit Limit', {'parent': customer, 'company': company}, ["credit_limit"], function(value) { if (value) { - debugger frappe.query_report.set_filter_value('credit_limit', value["credit_limit"]); } }, "Customer");