nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-19 19:37:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(postgres): satisfy strict GROUP BY in Sales Pipeline Analytics report

Browse Source 
Wrap the non-aggregated, functionally-dependent column(s) in Max()/Min() (or add
them to GROUP BY) so the report's grouped query is valid under PostgreSQL's strict
GROUP BY. No behaviour change on MariaDB.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Mihir Kandoi
2026-06-17 13:19:00 +05:30
parent 812a06cf44
commit 8a566e6ba5
1 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py
View File

@@ -86,10 +86,12 @@ class SalesPipelineAnalytics:
if self.filters.get("range") == "Monthly": if self.filters.get("range") == "Monthly":
self.group_by_period = Month(opp.expected_closing) self.group_by_period = Month(opp.expected_closing)
self.duration = MonthName(opp.expected_closing).as_("month") self.duration_expr = MonthName(opp.expected_closing)
self.duration = self.duration_expr.as_("month")
else: else:
self.group_by_period = Quarter(opp.expected_closing) self.group_by_period = Quarter(opp.expected_closing)
self.duration = Quarter(opp.expected_closing).as_("quarter") self.duration_expr = Quarter(opp.expected_closing)
self.duration = self.duration_expr.as_("quarter")
self.pipeline_by = {"Owner": "opportunity_owner", "Sales Stage": "sales_stage"}[ self.pipeline_by = {"Owner": "opportunity_owner", "Sales Stage": "sales_stage"}[
self.filters.get("pipeline_by") self.filters.get("pipeline_by")
@@ -101,27 +103,35 @@ class SalesPipelineAnalytics:
self.get_fields() self.get_fields()
opp = frappe.qb.DocType("Opportunity") opp = frappe.qb.DocType("Opportunity")
query = frappe.qb.get_query(
"Opportunity",
filters=self.get_conditions(),
ignore_permissions=True,
)
pipeline_field = opp._assign if self.group_by_based_on == "_assign" else opp.sales_stage pipeline_field = opp._assign if self.group_by_based_on == "_assign" else opp.sales_stage
if self.filters.get("based_on") == "Number": if self.filters.get("based_on") == "Number":
# Ask get_query for exactly the grouped columns via `fields`, instead of taking its
# default un-grouped "name" select and stripping it. Group by the displayed period
# expression too, so postgres accepts MonthName alongside the numeric Month used for
# chronological ordering (for Quarterly they're the same expression).
self.query_result = ( self.query_result = (
query.select( frappe.qb.get_query(
pipeline_field.as_(self.pipeline_by), "Opportunity",
frappe.query_builder.functions.Count("*").as_("count"), filters=self.get_conditions(),
self.duration, fields=[
pipeline_field.as_(self.pipeline_by),
frappe.query_builder.functions.Count("*").as_("count"),
self.duration,
],
ignore_permissions=True,
) )
.groupby(pipeline_field, self.group_by_period) .groupby(pipeline_field, self.group_by_period, self.duration_expr)
.orderby(self.group_by_period) .orderby(self.group_by_period)
.run(as_dict=True) .run(as_dict=True)
) )
if self.filters.get("based_on") == "Amount": if self.filters.get("based_on") == "Amount":
query = frappe.qb.get_query(
"Opportunity",
filters=self.get_conditions(),
ignore_permissions=True,
)
self.query_result = query.select( self.query_result = query.select(
pipeline_field.as_(self.pipeline_by), pipeline_field.as_(self.pipeline_by),
opp.opportunity_amount.as_("amount"), opp.opportunity_amount.as_("amount"),