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

fix(SalesAnalytics): Ignore opening entries

Browse Source 
(cherry picked from commit 6d269b4409)
This commit is contained in:
l0gesh29
2025-05-09 17:27:48 +05:30
committed by Mergify
parent 9584c80857
commit be280a408e
1 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
erpnext/selling/report/sales_analytics/sales_analytics.py
View File

@@ -177,14 +177,17 @@ class Analytics:
entity = "supplier as entity" entity = "supplier as entity"
entity_name = "supplier_name as entity_name" entity_name = "supplier_name as entity_name"
filters = {
"docstatus": 1,
"company": ["in", self.filters.company],
self.date_field: ("between", [self.filters.from_date, self.filters.to_date]),
}
if self.filters.doc_type in ["Sales Invoice", "Purchase Invoice", "Payment Entry"]:
filters.update({"is_opening": "No"})
self.entries = frappe.get_all( self.entries = frappe.get_all(
self.filters.doc_type, self.filters.doc_type, fields=[entity, entity_name, value_field, self.date_field], filters=filters
fields=[entity, entity_name, value_field, self.date_field],
filters={
"docstatus": 1,
"company": ["in", self.filters.company],
self.date_field: ("between", [self.filters.from_date, self.filters.to_date]),
},
) )
self.entity_names = {} self.entity_names = {}
@@ -236,14 +239,19 @@ class Analytics:
else: else:
entity_field = "territory as entity" entity_field = "territory as entity"
filters = {
"docstatus": 1,
"company": ["in", self.filters.company],
self.date_field: ("between", [self.filters.from_date, self.filters.to_date]),
}
if self.filters.doc_type in ["Sales Invoice", "Purchase Invoice", "Payment Entry"]:
filters.update({"is_opening": "No"})
self.entries = frappe.get_all( self.entries = frappe.get_all(
self.filters.doc_type, self.filters.doc_type,
fields=[entity_field, value_field, self.date_field], fields=[entity_field, value_field, self.date_field],
filters={ filters=filters,
"docstatus": 1,
"company": ["in", self.filters.company],
self.date_field: ("between", [self.filters.from_date, self.filters.to_date]),
},
) )
self.get_groups() self.get_groups()
@@ -282,15 +290,18 @@ class Analytics:
entity = "project as entity" entity = "project as entity"
filters = {
"docstatus": 1,
"company": ["in", self.filters.company],
"project": ["!=", ""],
self.date_field: ("between", [self.filters.from_date, self.filters.to_date]),
}
if self.filters.doc_type in ["Sales Invoice", "Purchase Invoice", "Payment Entry"]:
filters.update({"is_opening": "No"})
self.entries = frappe.get_all( self.entries = frappe.get_all(
self.filters.doc_type, self.filters.doc_type, fields=[entity, value_field, self.date_field], filters=filters
fields=[entity, value_field, self.date_field],
filters={
"docstatus": 1,
"company": ["in", self.filters.company],
"project": ["!=", ""],
self.date_field: ("between", [self.filters.from_date, self.filters.to_date]),
},
) )
def get_rows(self): def get_rows(self):