From 89ae85363f0d092d2301d1a3066ee317dab933d4 Mon Sep 17 00:00:00 2001
From: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Date: Tue, 31 Aug 2021 19:07:20 +0530
Subject: [PATCH] Revert "fix: add child item groups into the filters (#26997)"
 (#27266)

This reverts commit c60d5523bca0a0631555a6234a485cd7a1e3c245.

(cherry picked from commit 763450dcf867c31ad954ac5b45ed76e5379f28bf)

# Conflicts:
#	erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py
---
 .../item_group_wise_sales_target_variance.py                 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py b/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py
index f34f3e34e2c..52630f06c40 100644
--- a/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py
+++ b/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py
@@ -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)