CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-13 17:53:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(gross-profit): handle item group filters

Browse Source 
(cherry picked from commit 047b278791)
This commit is contained in:
Navin-S-R
2026-02-10 11:47:35 +05:30
committed by Mergify
parent d01ea27f2f
commit 0d02bbb01a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/accounts/report/gross_profit/gross_profit.py
View File

@@ -890,7 +890,9 @@ class GrossProfitGenerator:
(SalesInvoice.is_return == 1) & SalesInvoice.return_against.isnotnull() (SalesInvoice.is_return == 1) & SalesInvoice.return_against.isnotnull()
) )
if self.vouchers_to_ignore: if self.vouchers_to_ignore:
ret_invoice_query = base_query.where(SalesInvoice.return_against.notin(self.vouchers_to_ignore)) ret_invoice_query = ret_invoice_query.where(
SalesInvoice.return_against.notin(self.vouchers_to_ignore)
)
self.si_list += ret_invoice_query.run(as_dict=True) self.si_list += ret_invoice_query.run(as_dict=True)
@@ -910,7 +912,7 @@ class GrossProfitGenerator:
.where((SalesInvoice.docstatus == 1) & (SalesInvoice.is_opening != "Yes")) .where((SalesInvoice.docstatus == 1) & (SalesInvoice.is_opening != "Yes"))
) )
query = self.apply_common_filters(query, SalesInvoice, SalesInvoiceItem, SalesTeam) query = self.apply_common_filters(query, SalesInvoice, SalesInvoiceItem, SalesTeam, Item)
query = query.select( query = query.select(
SalesInvoiceItem.parenttype, SalesInvoiceItem.parenttype,
@@ -974,7 +976,7 @@ class GrossProfitGenerator:
return query return query
def apply_common_filters(self, query, SalesInvoice, SalesInvoiceItem, SalesTeam): def apply_common_filters(self, query, SalesInvoice, SalesInvoiceItem, SalesTeam, Item):
if self.filters.company: if self.filters.company:
query = query.where(SalesInvoice.company == self.filters.company) query = query.where(SalesInvoice.company == self.filters.company)
@@ -985,7 +987,7 @@ class GrossProfitGenerator:
query = query.where(SalesInvoice.posting_date <= self.filters.to_date) query = query.where(SalesInvoice.posting_date <= self.filters.to_date)
if self.filters.item_group: if self.filters.item_group:
query = query.where(get_item_group_condition(self.filters.item_group)) query = query.where(get_item_group_condition(self.filters.item_group, Item))
if self.filters.sales_person: if self.filters.sales_person:
query = query.where( query = query.where(