[minor] new global for query report filters
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.js b/erpnext/accounts/report/general_ledger/general_ledger.js
index 79bea22..0fca7dc 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.js
+++ b/erpnext/accounts/report/general_ledger/general_ledger.js
@@ -33,7 +33,7 @@
"fieldtype": "Link",
"options": "Account",
"get_query": function() {
- var company = frappe.query_report.filters_by_name.company.get_value();
+ var company = frappe.query_report_filters_by_name.company.get_value();
return {
"doctype": "Account",
"filters": {
@@ -62,8 +62,8 @@
"label": __("Party"),
"fieldtype": "Dynamic Link",
"get_options": function() {
- var party_type = frappe.query_report.filters_by_name.party_type.get_value();
- var party = frappe.query_report.filters_by_name.party.get_value();
+ var party_type = frappe.query_report_filters_by_name.party_type.get_value();
+ var party = frappe.query_report_filters_by_name.party.get_value();
if(party && !party_type) {
frappe.throw(__("Please select Party Type first"));
}
diff --git a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js
index 0408361..5c20510 100644
--- a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js
+++ b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js
@@ -46,8 +46,8 @@
"label": __("Party"),
"fieldtype": "Dynamic Link",
"get_options": function() {
- var party_type = frappe.query_report.filters_by_name.party_type.get_value();
- var party = frappe.query_report.filters_by_name.party.get_value();
+ var party_type = frappe.query_report_filters_by_name.party_type.get_value();
+ var party = frappe.query_report_filters_by_name.party.get_value();
if(party && !party_type) {
frappe.throw(__("Please select Party Type first"));
}
diff --git a/erpnext/accounts/report/profitability_analysis/profitability_analysis.js b/erpnext/accounts/report/profitability_analysis/profitability_analysis.js
index 48924b5..4b9a1af 100644
--- a/erpnext/accounts/report/profitability_analysis/profitability_analysis.js
+++ b/erpnext/accounts/report/profitability_analysis/profitability_analysis.js
@@ -34,8 +34,8 @@
}
frappe.model.with_doc("Fiscal Year", fiscal_year, function(r) {
var fy = frappe.model.get_doc("Fiscal Year", fiscal_year);
- query_report.filters_by_name.from_date.set_input(fy.year_start_date);
- query_report.filters_by_name.to_date.set_input(fy.year_end_date);
+ frappe.query_report_filters_by_name.from_date.set_input(fy.year_start_date);
+ frappe.query_report_filters_by_name.to_date.set_input(fy.year_end_date);
query_report.trigger_refresh();
});
}
@@ -84,7 +84,7 @@
if (!data.account) return;
frappe.route_options = {
- "company": frappe.query_report.filters_by_name.company.get_value(),
+ "company": frappe.query_report_filters_by_name.company.get_value(),
"from_fiscal_year": data.fiscal_year,
"to_fiscal_year": data.fiscal_year
};
diff --git a/erpnext/accounts/report/trial_balance/trial_balance.js b/erpnext/accounts/report/trial_balance/trial_balance.js
index a20b1cb..9943e5d 100644
--- a/erpnext/accounts/report/trial_balance/trial_balance.js
+++ b/erpnext/accounts/report/trial_balance/trial_balance.js
@@ -26,8 +26,8 @@
}
frappe.model.with_doc("Fiscal Year", fiscal_year, function(r) {
var fy = frappe.model.get_doc("Fiscal Year", fiscal_year);
- query_report.filters_by_name.from_date.set_input(fy.year_start_date);
- query_report.filters_by_name.to_date.set_input(fy.year_end_date);
+ frappe.query_report_filters_by_name.from_date.set_input(fy.year_start_date);
+ frappe.query_report_filters_by_name.to_date.set_input(fy.year_end_date);
query_report.trigger_refresh();
});
}
diff --git a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js
index f479c93..4d2efad 100644
--- a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js
+++ b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js
@@ -25,8 +25,8 @@
}
frappe.model.with_doc("Fiscal Year", fiscal_year, function(r) {
var fy = frappe.model.get_doc("Fiscal Year", fiscal_year);
- query_report.filters_by_name.from_date.set_input(fy.year_start_date);
- query_report.filters_by_name.to_date.set_input(fy.year_end_date);
+ frappe.query_report_filters_by_name.from_date.set_input(fy.year_start_date);
+ frappe.query_report_filters_by_name.to_date.set_input(fy.year_end_date);
query_report.trigger_refresh();
});
}
diff --git a/erpnext/projects/doctype/task/task_list.js b/erpnext/projects/doctype/task/task_list.js
index 212aec0..d24e1ac 100644
--- a/erpnext/projects/doctype/task/task_list.js
+++ b/erpnext/projects/doctype/task/task_list.js
@@ -1,5 +1,5 @@
frappe.listview_settings['Task'] = {
- add_fields: ["project", "status", "priority", "exp_end_date"],
+ add_fields: ["project", "status", "priority", "exp_start_date", "exp_end_date", "subject"],
filters: [["status", "=", "Open"]],
onload: function(listview) {
var method = "erpnext.projects.doctype.task.task.set_multiple_status";
diff --git a/erpnext/public/js/financial_statements.js b/erpnext/public/js/financial_statements.js
index 4127e6e..16385e1 100644
--- a/erpnext/public/js/financial_statements.js
+++ b/erpnext/public/js/financial_statements.js
@@ -29,7 +29,7 @@
frappe.route_options = {
"account": data.account,
- "company": frappe.query_report.filters_by_name.company.get_value(),
+ "company": frappe.query_report_filters_by_name.company.get_value(),
"from_date": data.from_date || data.year_start_date,
"to_date": data.to_date || data.year_end_date
};