diff --git a/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py b/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py index 844aa86b52e..a314c9054de 100644 --- a/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py +++ b/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py @@ -106,4 +106,7 @@ def get_conditions(filters, date_field): if filters.get("to_date"): conditions += f" and {date_field} <= %(to_date)s" + if filters.get("doctype") == "Sales Invoice": + conditions += " and not (is_consolidated = 1 and is_created_using_pos = 0)" + return conditions 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 b837d67e1c0..53c297aaea9 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 @@ -248,6 +248,9 @@ def get_actual_data(filters, sales_users_or_territory_data, date_field, sales_fi net_amount = child_doc.base_net_amount sales_field_col = parent_doc[sales_field] + if filters.get("doctype") == "Sales Invoice": + query = query.where(~((parent_doc.is_consolidated == 0) & (parent_doc.is_created_using_pos == 1))) + query = query.select( child_doc.item_group, parent_doc[date_field], diff --git a/erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py b/erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py index 216adde18fd..5e62a72db36 100644 --- a/erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py +++ b/erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py @@ -137,6 +137,9 @@ def get_conditions(filters, date_field): if filters.get("brand"): conditions += " and dt_item.brand = %(brand)s" + if filters.get("doctype") == "Sales Invoice": + conditions += " and not (is_consolidated = 1 and is_created_using_pos = 0)" + if filters.get("item_group"): lft, rgt = frappe.get_cached_value("Item Group", filters.get("item_group"), ["lft", "rgt"])