From 69a2c25ca5e2c4726db240be08ba2d4c074a436a Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 25 Apr 2014 18:35:45 +0530 Subject: [PATCH] Fixed set_query --- erpnext/accounts/doctype/account/account.js | 2 +- erpnext/accounts/doctype/journal_voucher/journal_voucher.js | 2 +- erpnext/accounts/report/accounts_payable/accounts_payable.js | 4 ++-- .../report/accounts_receivable/accounts_receivable.js | 2 +- .../report/bank_clearance_summary/bank_clearance_summary.js | 2 +- .../bank_reconciliation_statement.js | 2 +- .../item_wise_purchase_register.js | 2 +- .../item_wise_sales_register/item_wise_sales_register.js | 2 +- .../payment_period_based_on_invoice_date.js | 2 +- .../accounts/report/purchase_register/purchase_register.js | 2 +- erpnext/accounts/report/sales_register/sales_register.js | 2 +- .../buying/doctype/quality_inspection/quality_inspection.js | 4 ++-- erpnext/projects/doctype/task/task.js | 2 +- erpnext/projects/doctype/time_log_batch/time_log_batch.js | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/erpnext/accounts/doctype/account/account.js b/erpnext/accounts/doctype/account/account.js index 4b865ed363..55dd15e4f3 100644 --- a/erpnext/accounts/doctype/account/account.js +++ b/erpnext/accounts/doctype/account/account.js @@ -109,7 +109,7 @@ cur_frm.fields_dict['master_name'].get_query = function(doc) { var dt = doc.master_type || "Warehouse"; return { doctype: dt, - query: "accounts.doctype.account.account.get_master_name", + query: "erpnext.accounts.doctype.account.account.get_master_name", filters: { "master_type": dt, "company": doc.company diff --git a/erpnext/accounts/doctype/journal_voucher/journal_voucher.js b/erpnext/accounts/doctype/journal_voucher/journal_voucher.js index e3bf28b348..ff42169e66 100644 --- a/erpnext/accounts/doctype/journal_voucher/journal_voucher.js +++ b/erpnext/accounts/doctype/journal_voucher/journal_voucher.js @@ -56,7 +56,7 @@ erpnext.accounts.JournalVoucher = frappe.ui.form.Controller.extend({ frappe.model.validate_missing(jvd, "account"); return { - query: "accounts.doctype.journal_voucher.journal_voucher.get_against_jv", + query: "erpnext.accounts.doctype.journal_voucher.journal_voucher.get_against_jv", filters: { account: jvd.account } }; }); diff --git a/erpnext/accounts/report/accounts_payable/accounts_payable.js b/erpnext/accounts/report/accounts_payable/accounts_payable.js index 18765f5fff..09fbd3ef28 100644 --- a/erpnext/accounts/report/accounts_payable/accounts_payable.js +++ b/erpnext/accounts/report/accounts_payable/accounts_payable.js @@ -18,7 +18,7 @@ frappe.query_reports["Accounts Payable"] = { "get_query": function() { var company = frappe.query_report.filters_by_name.company.get_value(); return { - "query": "accounts.utils.get_account_list", + "query": "erpnext.accounts.utils.get_account_list", "filters": { "report_type": "Balance Sheet", "company": company, @@ -41,4 +41,4 @@ frappe.query_reports["Accounts Payable"] = { "default": "Posting Date" } ] -} \ No newline at end of file +} diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js index 2c0f735f6c..1cf0941e0f 100644 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js @@ -18,7 +18,7 @@ frappe.query_reports["Accounts Receivable"] = { "get_query": function() { var company = frappe.query_report.filters_by_name.company.get_value(); return { - "query": "accounts.utils.get_account_list", + "query": "erpnext.accounts.utils.get_account_list", "filters": { "report_type": "Balance Sheet", "company": company, diff --git a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.js b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.js index 61fe9bbf1f..abeaba85e5 100644 --- a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.js +++ b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.js @@ -23,7 +23,7 @@ frappe.query_reports["Bank Clearance Summary"] = { "options": "Account", "get_query": function() { return { - "query": "accounts.utils.get_account_list", + "query": "erpnext.accounts.utils.get_account_list", "filters": [ ['Account', 'account_type', 'in', 'Bank, Cash'], ['Account', 'group_or_ledger', '=', 'Ledger'], diff --git a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js index 3d3b2f5599..5316b587e1 100644 --- a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js +++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js @@ -11,7 +11,7 @@ frappe.query_reports["Bank Reconciliation Statement"] = { "reqd": 1, "get_query": function() { return { - "query": "accounts.utils.get_account_list", + "query": "erpnext.accounts.utils.get_account_list", "filters": [ ['Account', 'account_type', 'in', 'Bank, Cash'], ['Account', 'group_or_ledger', '=', 'Ledger'], diff --git a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js index e2e0287be8..402f894d3f 100644 --- a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js +++ b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js @@ -30,7 +30,7 @@ frappe.query_reports["Item-wise Purchase Register"] = { "get_query": function() { var company = frappe.query_report.filters_by_name.company.get_value(); return { - "query": "accounts.utils.get_account_list", + "query": "erpnext.accounts.utils.get_account_list", "filters": { "report_type": "Balance Sheet", "company": company, diff --git a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js index 09ce2fbb0d..3264da7155 100644 --- a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js +++ b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js @@ -24,7 +24,7 @@ frappe.query_reports["Item-wise Sales Register"] = frappe.query_reports["Sales R "get_query": function() { var company = frappe.query_report.filters_by_name.company.get_value(); return { - "query": "accounts.utils.get_account_list", + "query": "erpnext.accounts.utils.get_account_list", "filters": { "report_type": "Balance Sheet", "company": company, 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 d9a05c9574..b0833b54a7 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 @@ -29,7 +29,7 @@ frappe.query_reports["Payment Period Based On Invoice Date"] = { options: "Account", get_query: function() { return { - query: "accounts.utils.get_account_list", + query: "erpnext.accounts.utils.get_account_list", filters: { "report_type": "Balance Sheet", company: frappe.query_report.filters_by_name.company.get_value() diff --git a/erpnext/accounts/report/purchase_register/purchase_register.js b/erpnext/accounts/report/purchase_register/purchase_register.js index b55358430f..7e999dee70 100644 --- a/erpnext/accounts/report/purchase_register/purchase_register.js +++ b/erpnext/accounts/report/purchase_register/purchase_register.js @@ -24,7 +24,7 @@ frappe.query_reports["Purchase Register"] = { "get_query": function() { var company = frappe.query_report.filters_by_name.company.get_value(); return { - "query": "accounts.utils.get_account_list", + "query": "erpnext.accounts.utils.get_account_list", "filters": { "report_type": "Balance Sheet", "company": company, diff --git a/erpnext/accounts/report/sales_register/sales_register.js b/erpnext/accounts/report/sales_register/sales_register.js index 976e7533ac..0cc48a6489 100644 --- a/erpnext/accounts/report/sales_register/sales_register.js +++ b/erpnext/accounts/report/sales_register/sales_register.js @@ -24,7 +24,7 @@ frappe.query_reports["Sales Register"] = { "get_query": function() { var company = frappe.query_report.filters_by_name.company.get_value(); return { - "query": "accounts.utils.get_account_list", + "query": "erpnext.accounts.utils.get_account_list", "filters": { "report_type": "Balance Sheet", "company": company, diff --git a/erpnext/buying/doctype/quality_inspection/quality_inspection.js b/erpnext/buying/doctype/quality_inspection/quality_inspection.js index 84dd3ccb7b..5755387a21 100644 --- a/erpnext/buying/doctype/quality_inspection/quality_inspection.js +++ b/erpnext/buying/doctype/quality_inspection/quality_inspection.js @@ -27,7 +27,7 @@ cur_frm.cscript.refresh = cur_frm.cscript.inspection_type; cur_frm.fields_dict['item_code'].get_query = function(doc, cdt, cdn) { if (doc.purchase_receipt_no) { return { - query: "buying.doctype.quality_inspection.quality_inspection.item_query", + query: "erpnext.buying.doctype.quality_inspection.quality_inspection.item_query", filters: { "from": "Purchase Receipt Item", "parent": doc.purchase_receipt_no @@ -35,7 +35,7 @@ cur_frm.fields_dict['item_code'].get_query = function(doc, cdt, cdn) { } } else if (doc.delivery_note_no) { return { - query: "buying.doctype.quality_inspection.quality_inspection.item_query", + query: "erpnext.buying.doctype.quality_inspection.quality_inspection.item_query", filters: { "from": "Delivery Note Item", "parent": doc.delivery_note_no diff --git a/erpnext/projects/doctype/task/task.js b/erpnext/projects/doctype/task/task.js index 81eeacda30..900159573d 100644 --- a/erpnext/projects/doctype/task/task.js +++ b/erpnext/projects/doctype/task/task.js @@ -9,7 +9,7 @@ erpnext.projects.Task = frappe.ui.form.Controller.extend({ setup: function() { this.frm.fields_dict.project.get_query = function() { return { - query: "projects.doctype.task.task.get_project" + query: "erpnext.projects.doctype.task.task.get_project" } }; }, diff --git a/erpnext/projects/doctype/time_log_batch/time_log_batch.js b/erpnext/projects/doctype/time_log_batch/time_log_batch.js index 05e62df29a..3065f334c1 100644 --- a/erpnext/projects/doctype/time_log_batch/time_log_batch.js +++ b/erpnext/projects/doctype/time_log_batch/time_log_batch.js @@ -7,7 +7,7 @@ cur_frm.add_fetch("time_log", "hours", "hours"); cur_frm.set_query("time_log", "time_log_batch_details", function(doc) { return { - query: "projects.utils.get_time_log_list", + query: "erpnext.projects.utils.get_time_log_list", filters: { "billable": 1, "status": "Submitted"