mirror of
https://github.com/frappe/erpnext.git
synced 2026-11-15 21:20:55 +00:00
fix(selling): include descendants in group target achievements
(cherry picked from commit a5f27756a9)
This commit is contained in:
committed by
Mergify
parent
6ed19302f7
commit
a1ddafa411
+19
-2
@@ -57,7 +57,9 @@ def get_data(filters, period_list, partner_doctype):
|
||||
|
||||
date_field = "transaction_date" if filters.get("doctype") == "Sales Order" else "posting_date"
|
||||
|
||||
actual_data = get_actual_data(filters, sales_users, date_field, sales_field)
|
||||
sales_user_map = get_sales_user_map(partner_doctype, sales_users)
|
||||
actual_users = {name for names in sales_user_map.values() for name in names}
|
||||
actual_data = get_actual_data(filters, list(actual_users), date_field, sales_field)
|
||||
|
||||
return prepare_data(
|
||||
filters,
|
||||
@@ -67,9 +69,23 @@ def get_data(filters, period_list, partner_doctype):
|
||||
date_field,
|
||||
period_list,
|
||||
sales_field,
|
||||
sales_user_map,
|
||||
)
|
||||
|
||||
|
||||
def get_sales_user_map(partner_doctype, sales_users):
|
||||
if partner_doctype not in ("Territory", "Sales Person"):
|
||||
return {name: {name} for name in sales_users}
|
||||
|
||||
nodes = frappe.get_all(partner_doctype, fields=["name", "lft", "rgt"])
|
||||
by_name = {node.name: node for node in nodes}
|
||||
return {
|
||||
name: {node.name for node in nodes if by_name[name].lft <= node.lft <= by_name[name].rgt}
|
||||
for name in sales_users
|
||||
if name in by_name
|
||||
}
|
||||
|
||||
|
||||
def get_columns(filters, period_list, partner_doctype):
|
||||
fieldtype, options = "Currency", "currency"
|
||||
|
||||
@@ -160,6 +176,7 @@ def prepare_data(
|
||||
date_field,
|
||||
period_list,
|
||||
sales_field,
|
||||
sales_user_map=None,
|
||||
):
|
||||
rows = {}
|
||||
|
||||
@@ -184,7 +201,7 @@ def prepare_data(
|
||||
details[p_key] = sum(
|
||||
r.get(qty_or_amount_field, 0)
|
||||
for r in actual_data
|
||||
if r.get(sales_field) == parent
|
||||
if r.get(sales_field) in (sales_user_map or {}).get(parent, {parent})
|
||||
and period.from_date <= r.get(date_field) <= period.to_date
|
||||
and (
|
||||
not item_group
|
||||
|
||||
+7
@@ -127,6 +127,13 @@ class TestSalesPersonTargetVarianceBasedOnItemGroup(FrappeTestCase):
|
||||
|
||||
check_duplicate_targets(self, "Sales Person", "sales_person_name", execute)
|
||||
|
||||
def test_group_target_includes_descendant_sales(self):
|
||||
from erpnext.selling.report.territory_target_variance_based_on_item_group.test_territory_target_variance_based_on_item_group import (
|
||||
check_group_target,
|
||||
)
|
||||
|
||||
check_group_target(self, "Sales Person", "sales_person_name", execute)
|
||||
|
||||
|
||||
def create_target_distribution(fiscal_year):
|
||||
if frappe.db.exists("Monthly Distribution", "Target Report Distribution"):
|
||||
|
||||
+43
@@ -164,6 +164,9 @@ class TestTerritoryTargetVarianceBasedOnItemGroup(FrappeTestCase):
|
||||
|
||||
check_duplicate_targets(self, "Territory", "territory_name", execute)
|
||||
|
||||
def test_group_target_includes_descendant_sales(self):
|
||||
check_group_target(self, "Territory", "territory_name", execute)
|
||||
|
||||
|
||||
def create_territory_with_target(name, fiscal_year, distribution_id, target_qty=50):
|
||||
doc = frappe.new_doc("Territory")
|
||||
@@ -296,3 +299,43 @@ def check_duplicate_targets(test, doctype, name_field, execute_report):
|
||||
test.assertEqual(
|
||||
sorted(flt(v, 2) for k, v in row.items() if k.startswith("target_")), [0] * 10 + [1000, 1000]
|
||||
)
|
||||
|
||||
|
||||
def check_group_target(test, doctype, name_field, execute_report):
|
||||
from erpnext.selling.report.sales_person_target_variance_based_on_item_group.test_sales_person_target_variance_based_on_item_group import (
|
||||
create_sales_target_doc,
|
||||
)
|
||||
|
||||
distribution = create_target_distribution(test.fiscal_year)
|
||||
group = create_sales_target_doc(
|
||||
doctype, name_field, frappe.generate_hash(length=10), test.fiscal_year, distribution.name
|
||||
)
|
||||
group.is_group = 1
|
||||
group.save()
|
||||
parent_field = "parent_" + frappe.scrub(doctype)
|
||||
middle = frappe.get_doc(
|
||||
dict(
|
||||
doctype=doctype,
|
||||
is_group=1,
|
||||
**{name_field: frappe.generate_hash(length=10), parent_field: group.name},
|
||||
)
|
||||
).insert()
|
||||
leaf = frappe.get_doc(
|
||||
dict(doctype=doctype, **{name_field: frappe.generate_hash(length=10), parent_field: middle.name})
|
||||
).insert()
|
||||
order = make_sales_order(rate=700, qty=1, do_not_submit=True)
|
||||
field = frappe.scrub(doctype)
|
||||
if doctype == "Sales Person":
|
||||
order.set("sales_team", [{"sales_person": leaf.name, "allocated_percentage": 100}])
|
||||
else:
|
||||
order.set(field, leaf.name)
|
||||
order.submit()
|
||||
filters = frappe._dict(
|
||||
company=order.company,
|
||||
fiscal_year=test.fiscal_year,
|
||||
doctype="Sales Order",
|
||||
period="Yearly",
|
||||
target_on="Amount",
|
||||
)
|
||||
row = next(row for row in execute_report(filters)[1] if row[field] == group.name)
|
||||
test.assertEqual(flt(row["total_achieved"], 2), 700)
|
||||
|
||||
Reference in New Issue
Block a user