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

[minor] new global for query report filters

Browse Source
This commit is contained in:
Rushabh Mehta 2016-09-01 17:53:19 +05:30
parent 5a101ef4c6
commit b2f0920346
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/report/general_ledger/general_ledger.js
View File

@ -33,7 +33,7 @@ frappe.query_reports["General Ledger"] = {
"fieldtype": "Link", "fieldtype": "Link",
"options": "Account", "options": "Account",
"get_query": function() { "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 { return {
"doctype": "Account", "doctype": "Account",
"filters": { "filters": {
@ -62,8 +62,8 @@ frappe.query_reports["General Ledger"] = {
"label": __("Party"), "label": __("Party"),
"fieldtype": "Dynamic Link", "fieldtype": "Dynamic Link",
"get_options": function() { "get_options": function() {
var party_type = frappe.query_report.filters_by_name.party_type.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(); var party = frappe.query_report_filters_by_name.party.get_value();
if(party && !party_type) { if(party && !party_type) {
frappe.throw(__("Please select Party Type first")); frappe.throw(__("Please select Party Type first"));
} }

4
erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js
View File

@ -46,8 +46,8 @@ frappe.query_reports["Payment Period Based On Invoice Date"] = {
"label": __("Party"), "label": __("Party"),
"fieldtype": "Dynamic Link", "fieldtype": "Dynamic Link",
"get_options": function() { "get_options": function() {
var party_type = frappe.query_report.filters_by_name.party_type.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(); var party = frappe.query_report_filters_by_name.party.get_value();
if(party && !party_type) { if(party && !party_type) {
frappe.throw(__("Please select Party Type first")); frappe.throw(__("Please select Party Type first"));
} }

6
erpnext/accounts/report/profitability_analysis/profitability_analysis.js
View File

@ -34,8 +34,8 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() {
} }
frappe.model.with_doc("Fiscal Year", fiscal_year, function(r) { frappe.model.with_doc("Fiscal Year", fiscal_year, function(r) {
var fy = frappe.model.get_doc("Fiscal Year", fiscal_year); var fy = frappe.model.get_doc("Fiscal Year", fiscal_year);
query_report.filters_by_name.from_date.set_input(fy.year_start_date); frappe.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.to_date.set_input(fy.year_end_date);
query_report.trigger_refresh(); query_report.trigger_refresh();
}); });
} }
@ -84,7 +84,7 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() {
if (!data.account) return; if (!data.account) return;
frappe.route_options = { 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, "from_fiscal_year": data.fiscal_year,
"to_fiscal_year": data.fiscal_year "to_fiscal_year": data.fiscal_year
}; };

4
erpnext/accounts/report/trial_balance/trial_balance.js
View File

@ -26,8 +26,8 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() {
} }
frappe.model.with_doc("Fiscal Year", fiscal_year, function(r) { frappe.model.with_doc("Fiscal Year", fiscal_year, function(r) {
var fy = frappe.model.get_doc("Fiscal Year", fiscal_year); var fy = frappe.model.get_doc("Fiscal Year", fiscal_year);
query_report.filters_by_name.from_date.set_input(fy.year_start_date); frappe.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.to_date.set_input(fy.year_end_date);
query_report.trigger_refresh(); query_report.trigger_refresh();
}); });
} }

4
erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js
View File

@ -25,8 +25,8 @@ frappe.query_reports["Trial Balance for Party"] = {
} }
frappe.model.with_doc("Fiscal Year", fiscal_year, function(r) { frappe.model.with_doc("Fiscal Year", fiscal_year, function(r) {
var fy = frappe.model.get_doc("Fiscal Year", fiscal_year); var fy = frappe.model.get_doc("Fiscal Year", fiscal_year);
query_report.filters_by_name.from_date.set_input(fy.year_start_date); frappe.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.to_date.set_input(fy.year_end_date);
query_report.trigger_refresh(); query_report.trigger_refresh();
}); });
} }

2
erpnext/projects/doctype/task/task_list.js
View File

@ -1,5 +1,5 @@
frappe.listview_settings['Task'] = { 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"]], filters: [["status", "=", "Open"]],
onload: function(listview) { onload: function(listview) {
var method = "erpnext.projects.doctype.task.task.set_multiple_status"; var method = "erpnext.projects.doctype.task.task.set_multiple_status";

2
erpnext/public/js/financial_statements.js
View File

@ -29,7 +29,7 @@ erpnext.financial_statements = {
frappe.route_options = { frappe.route_options = {
"account": data.account, "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, "from_date": data.from_date || data.year_start_date,
"to_date": data.to_date || data.year_end_date "to_date": data.to_date || data.year_end_date
}; };