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

Merge branch 'develop' into variance-report-fix

Browse Source
This commit is contained in:
Anupam Kumar
2020-09-01 09:31:22 +05:30
committed by GitHub
parent b3bd780d46 37cb44e109
commit 232cb37ebf
680 changed files with 26959 additions and 20594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -191,7 +191,7 @@ def get_conditions(filters):
conditions += "AND so_item.item_code = '%s'" %frappe.db.escape(filters.item_code)
if filters.get("customer"):
conditions += "AND so.customer = '%s'" %frappe.db.escape(filters.customer)
conditions += "AND so.customer = %s" %frappe.db.escape(filters.customer)
return conditions

2
erpnext/selling/report/sales_order_analysis/sales_order_analysis.py
View File

@@ -96,7 +96,7 @@ def prepare_data(data, filters):
# prepare data for report view
row["qty_to_bill"] = flt(row["qty"]) - flt(row["billed_qty"])
row["delay"] = 0 if row["delay"] < 0 else row["delay"]
row["delay"] = 0 if row["delay"] and row["delay"] < 0 else row["delay"]
if filters.get("group_by_so"):
so_name = row["sales_order"]