fix: resolve target report backport conflicts

erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py

@@ -239,15 +239,6 @@ def get_actual_data(filters, sales_users_or_territory_data, date_field, sales_fi
 	fiscal_year = get_fiscal_year(fiscal_year=filters.get("fiscal_year"), as_dict=1)
 	doctype = filters.get("doctype")
 
-<<<<<<< HEAD
-	permitted_names = frappe.get_list(
-		doctype,
-		filters={
-			"docstatus": 1,
-			date_field: ["between", [fiscal_year.year_start_date, fiscal_year.year_end_date]],
-		},
-		pluck="name",
-=======
 	doc_filters = {
 		"docstatus": 1,
 		date_field: ["between", [fiscal_year.year_start_date, fiscal_year.year_end_date]],
@@ -255,12 +246,10 @@ def get_actual_data(filters, sales_users_or_territory_data, date_field, sales_fi
 	if filters.get("company"):
 		doc_filters["company"] = filters.company
 
-	permitted_docs = frappe.qb.get_query(
-		table=doctype,
-		fields=["name"],
+	permitted_names = frappe.get_list(
+		doctype,
 		filters=doc_filters,
-		ignore_permissions=False,
->>>>>>> 7d493a6 (fix(selling): respect company in target variance actuals)
+		pluck="name",
 	)
 
 	if not permitted_names:

erpnext/setup/doctype/target_detail/test_target_detail.py

@@ -2,6 +2,7 @@
 # See license.txt
 
 import frappe
+from frappe.tests.utils import FrappeTestCase
 from frappe.utils import nowdate
 
 from erpnext.accounts.utils import get_fiscal_year
@@ -9,10 +10,9 @@ from erpnext.selling.report.sales_person_target_variance_based_on_item_group.tes
 	create_sales_target_doc,
 	create_target_distribution,
 )
-from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestTargetDetail(ERPNextTestSuite):
+class TestTargetDetail(FrappeTestCase):
 	def test_duplicate_target_rows_are_rejected(self):
 		fiscal_year = get_fiscal_year(nowdate())[0]
 		distribution = create_target_distribution(fiscal_year)