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

Search query for account cleanup

Browse Source
This commit is contained in:
Nabin Hait 2014-05-28 12:56:28 +05:30
parent a3dd72a759
commit ea4aa04cc4
11 changed files with 21 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/report/accounts_payable/accounts_payable.js
View File

@ -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": "erpnext.accounts.utils.get_account_list",
"query": "erpnext.controllers.queries.get_account_list",
"filters": {
"report_type": "Balance Sheet",
"company": company,

2
erpnext/accounts/report/accounts_receivable/accounts_receivable.js
View File

@ -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": "erpnext.accounts.utils.get_account_list",
"query": "erpnext.controllers.queries.get_account_list",
"filters": {
"report_type": "Balance Sheet",
"company": company,

2
erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.js
View File

@ -23,7 +23,7 @@ frappe.query_reports["Bank Clearance Summary"] = {
"options": "Account",
"get_query": function() {
return {
"query": "erpnext.accounts.utils.get_account_list",
"query": "erpnext.controllers.queries.get_account_list",
"filters": [
['Account', 'account_type', 'in', 'Bank, Cash'],
['Account', 'group_or_ledger', '=', 'Ledger'],

2
erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js
View File

@ -11,7 +11,7 @@ frappe.query_reports["Bank Reconciliation Statement"] = {
"reqd": 1,
"get_query": function() {
return {
"query": "erpnext.accounts.utils.get_account_list",
"query": "erpnext.controllers.queries.get_account_list",
"filters": [
['Account', 'account_type', 'in', 'Bank, Cash'],
['Account', 'group_or_ledger', '=', 'Ledger'],

2
erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js
View File

@ -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": "erpnext.accounts.utils.get_account_list",
"query": "erpnext.controllers.queries.get_account_list",
"filters": {
"report_type": "Balance Sheet",
"company": company,

2
erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js
View File

@ -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": "erpnext.accounts.utils.get_account_list",
"query": "erpnext.controllers.queries.get_account_list",
"filters": {
"report_type": "Balance Sheet",
"company": company,

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

@ -29,7 +29,7 @@ frappe.query_reports["Payment Period Based On Invoice Date"] = {
options: "Account",
get_query: function() {
return {
query: "erpnext.accounts.utils.get_account_list",
query: "erpnext.controllers.queries.get_account_list",
filters: {
"report_type": "Balance Sheet",
company: frappe.query_report.filters_by_name.company.get_value()

2
erpnext/accounts/report/purchase_register/purchase_register.js
View File

@ -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": "erpnext.accounts.utils.get_account_list",
"query": "erpnext.controllers.queries.get_account_list",
"filters": {
"report_type": "Balance Sheet",
"company": company,

2
erpnext/accounts/report/sales_register/sales_register.js
View File

@ -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": "erpnext.accounts.utils.get_account_list",
"query": "erpnext.controllers.queries.get_account_list",
"filters": {
"report_type": "Balance Sheet",
"company": company,

24
erpnext/accounts/utils.py
View File

@ -195,30 +195,6 @@ def update_against_doc(d, jv_obj):
jv_obj.ignore_validate_update_after_submit = True
jv_obj.save()
def get_account_list(doctype, txt, searchfield, start, page_len, filters):
filters = add_group_or_ledger_filter("Account", filters)
return frappe.widgets.reportview.execute("Account", filters = filters,
fields = ["name", "parent_account"],
limit_start=start, limit_page_length=page_len, as_list=True)
def get_cost_center_list(doctype, txt, searchfield, start, page_len, filters):
filters = add_group_or_ledger_filter("Cost Center", filters)
return frappe.widgets.reportview.execute("Cost Center", filters = filters,
fields = ["name", "parent_cost_center"],
limit_start=start, limit_page_length=page_len, as_list=True)
def add_group_or_ledger_filter(doctype, filters):
if isinstance(filters, dict):
if not filters.get("group_or_ledger"):
filters["group_or_ledger"] = "Ledger"
elif isinstance(filters, list):
if "group_or_ledger" not in [d[0] for d in filters]:
filters.append([doctype, "group_or_ledger", "=", "Ledger"])
return filters
def remove_against_link_from_jv(ref_type, ref_no, against_field):
linked_jv = frappe.db.sql_list("""select parent from `tabJournal Voucher Detail`
where `%s`=%s and docstatus < 2""" % (against_field, "%s"), (ref_no))

12
erpnext/controllers/queries.py
View File

@ -234,3 +234,15 @@ def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
'posting_date': filters['posting_date'], 'txt': "%%%s%%" % txt,
'mcond':get_match_cond(doctype),'start': start,
'page_len': page_len})
def get_account_list(doctype, txt, searchfield, start, page_len, filters):
if isinstance(filters, dict):
if not filters.get("group_or_ledger"):
filters["group_or_ledger"] = "Ledger"
elif isinstance(filters, list):
if "group_or_ledger" not in [d[0] for d in filters]:
filters.append(["Account", "group_or_ledger", "=", "Ledger"])
return frappe.widgets.reportview.execute("Account", filters = filters,
fields = ["name", "parent_account"],
limit_start=start, limit_page_length=page_len, as_list=True)