nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-06 21:59:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove incorrect report conditions and unset sales partner on consolidated sales invoice (#48669)

Browse Source 
* fix: undo query changes for sales partner related reports

* fix: patch to remove sales partner from consolidated sales invoice
This commit is contained in:
Diptanil Saha
2025-07-18 00:30:04 +05:30
committed by GitHub
parent 971024ab99
commit 9dc583ffcb
6 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py
View File

@@ -106,7 +106,4 @@ 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

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

@@ -248,9 +248,6 @@ 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],

3
erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py
View File

@@ -137,9 +137,6 @@ 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"])