Merge pull request #19505 from rohitwaghchaure/credit_limit_not_defined_in_accounts_receivable_report

fix: unknown column credit limit in accounts receivable report
This commit is contained in:
rohitwaghchaure 2019-11-06 17:26:35 +05:30 committed by GitHub
commit 0c12eded05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -79,13 +79,20 @@ frappe.query_reports["Accounts Receivable"] = {
"options": "Customer", "options": "Customer",
on_change: () => { on_change: () => {
var customer = frappe.query_report.get_filter_value('customer'); var customer = frappe.query_report.get_filter_value('customer');
var company = frappe.query_report.get_filter_value('company');
if (customer) { 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('tax_id', value["tax_id"]);
frappe.query_report.set_filter_value('customer_name', value["customer_name"]); 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.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) {
frappe.query_report.set_filter_value('credit_limit', value["credit_limit"]);
}
}, "Customer");
} else { } else {
frappe.query_report.set_filter_value('tax_id', ""); frappe.query_report.set_filter_value('tax_id', "");
frappe.query_report.set_filter_value('customer_name', ""); frappe.query_report.set_filter_value('customer_name', "");