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

Revert "fix: add child item groups into the filters (#26997)" (#27266)

Browse Source 
This reverts commit c60d5523bc.

(cherry picked from commit 763450dcf8)

# Conflicts:
#	erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py
This commit is contained in:
Afshan
2021-08-31 19:07:20 +05:30
committed by Mergify
parent f5160dc83d
commit 89ae85363f
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py
View File

@@ -53,7 +53,12 @@ def get_data(filters, period_list, partner_doctype):
if d.item_group not in item_groups:
item_groups.append(d.item_group)
<<<<<<< HEAD
date_field = "transaction_date" if filters.get("doctype") == "Sales Order" else "posting_date"
=======
date_field = ("transaction_date"
if filters.get('doctype') == "Sales Order" else "posting_date")
>>>>>>> 763450dcf8 (Revert "fix: add child item groups into the filters (#26997)" (#27266))
actual_data = get_actual_data(filters, item_groups, sales_users, date_field, sales_field)