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

fix(SalesAnalytics): Ignore opening entries

Browse Source
This commit is contained in:
l0gesh29
2025-05-09 17:27:48 +05:30
parent b6b4ac5b4a
commit 6d269b4409
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

@@ -241,14 +241,17 @@ class Analytics:
entity_name = "party_name as entity_name"
value_field = "base_paid_amount as value_field"
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.filters.doc_type,
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.filters.doc_type, fields=[entity, entity_name, value_field, self.date_field], filters=filters
)
self.entity_names = {}
@@ -300,14 +303,19 @@ class Analytics:
else:
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.filters.doc_type,
fields=[entity_field, 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]),
},
filters=filters,
)
self.get_groups()
@@ -349,15 +357,18 @@ class Analytics:
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.filters.doc_type,
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]),
},
self.filters.doc_type, fields=[entity, value_field, self.date_field], filters=filters
)
def get_rows(self):