nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 07:29:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Item-wise Sales History report not working (#19890)

Browse Source
This commit is contained in:
rohitwaghchaure
2019-12-10 21:34:20 +05:30
committed by Nabin Hait
parent d1e8e8652f
commit ac967d09ec
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.js
View File

@@ -20,11 +20,15 @@ frappe.query_reports["Item-wise Sales History"] = {
}, },
{ {
fieldname:"from_date", fieldname:"from_date",
reqd: 1,
label: __("From Date"), label: __("From Date"),
fieldtype: "Date", fieldtype: "Date",
default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
}, },
{ {
fieldname:"to_date", fieldname:"to_date",
reqd: 1,
default: frappe.datetime.get_today(),
label: __("To Date"), label: __("To Date"),
fieldtype: "Date", fieldtype: "Date",
}, },

8
erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py
View File

@@ -196,6 +196,7 @@ def get_customer_details():
def get_sales_order_details(company_list, filters): def get_sales_order_details(company_list, filters):
conditions = get_conditions(filters) conditions = get_conditions(filters)
return frappe.db.sql(""" return frappe.db.sql("""
SELECT SELECT
so_item.item_code, so_item.item_name, so_item.item_group, so_item.item_code, so_item.item_name, so_item.item_group,
@@ -208,7 +209,6 @@ def get_sales_order_details(company_list, filters):
`tabSales Order` so, `tabSales Order Item` so_item `tabSales Order` so, `tabSales Order Item` so_item
WHERE WHERE
so.name = so_item.parent so.name = so_item.parent
AND so.company in (%s) AND so.company in ({0})
AND so.docstatus = 1 AND so.docstatus = 1 {1}
{0} """.format(','.join(["%s"] * len(company_list)), conditions), tuple(company_list), as_dict=1)
""".format(conditions), company_list, as_dict=1) #nosec