Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Item Wise report query fix #20765

Merged
merged 1 commit into from Feb 28, 2020
Merged

fix: Item Wise report query fix #20765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 2 additions & 6 deletions erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
View file
Open in desktop
Expand Up @@ -306,10 +306,6 @@ def get_conditions(filters):

def get_items(filters, additional_query_columns):
conditions = get_conditions(filters)
match_conditions = frappe.build_match_conditions("Purchase Invoice")

if match_conditions:
match_conditions = " and {0} ".format(match_conditions)

if additional_query_columns:
additional_query_columns = ', ' + ', '.join(additional_query_columns)
Expand All @@ -327,8 +323,8 @@ def get_items(filters, additional_query_columns):
`tabPurchase Invoice`.supplier_name, `tabPurchase Invoice`.mode_of_payment {0}
from `tabPurchase Invoice`, `tabPurchase Invoice Item`
where `tabPurchase Invoice`.name = `tabPurchase Invoice Item`.`parent` and
`tabPurchase Invoice`.docstatus = 1 %s %s
""".format(additional_query_columns) % (conditions, match_conditions), filters, as_dict=1)
`tabPurchase Invoice`.docstatus = 1 %s
""".format(additional_query_columns) % (conditions), filters, as_dict=1)

def get_aii_accounts():
return dict(frappe.db.sql("select name, stock_received_but_not_billed from tabCompany"))
Expand Down
10 changes: 3 additions & 7 deletions erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
View file
Open in desktop
Expand Up @@ -119,7 +119,7 @@ def _execute(filters=None, additional_table_columns=None, additional_query_colum
add_sub_total_row(total_row, total_row_map, 'total_row', tax_columns)
data.append(total_row_map.get('total_row'))
skip_total_row = 1

return columns, data, None, None, None, skip_total_row

def get_columns(additional_table_columns, filters):
Expand Down Expand Up @@ -370,10 +370,6 @@ def get_group_by_conditions(filters, doctype):

def get_items(filters, additional_query_columns):
conditions = get_conditions(filters)
match_conditions = frappe.build_match_conditions("Sales Invoice")

if match_conditions:
match_conditions = " and {0} ".format(match_conditions)

if additional_query_columns:
additional_query_columns = ', ' + ', '.join(additional_query_columns)
Expand All @@ -394,8 +390,8 @@ def get_items(filters, additional_query_columns):
`tabSales Invoice`.update_stock, `tabSales Invoice Item`.uom, `tabSales Invoice Item`.qty {0}
from `tabSales Invoice`, `tabSales Invoice Item`
where `tabSales Invoice`.name = `tabSales Invoice Item`.parent
and `tabSales Invoice`.docstatus = 1 {1} {2}
""".format(additional_query_columns or '', conditions, match_conditions), filters, as_dict=1) #nosec
and `tabSales Invoice`.docstatus = 1 {1}
""".format(additional_query_columns or '', conditions), filters, as_dict=1) #nosec

def get_delivery_notes_against_sales_order(item_list):
so_dn_map = frappe._dict()
Expand Down