schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #42694 from frappe/mergify/bp/version-14-hotfix/pr-42428

Browse Source 
fix: Sort lists before calling itertools.groupby (backport #42428)
This commit is contained in:
ruthra kumar
2024-08-09 12:44:24 +05:30
committed by GitHub
parent d0fbb4d532 29cfb7cf25
commit a43136da5d
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py
View File

@@ -108,7 +108,9 @@ class OpportunitySummaryBySalesStage:
self.grouped_data = [] self.grouped_data = []
grouping_key = lambda o: (o["sales_stage"], o[based_on]) # noqa grouping_key = lambda o: (o["sales_stage"], o[based_on]) # noqa
for (sales_stage, _based_on), rows in groupby(self.query_result, grouping_key): for (sales_stage, _based_on), rows in groupby(
sorted(self.query_result, key=grouping_key), key=grouping_key
):
self.grouped_data.append( self.grouped_data.append(
{ {
"sales_stage": sales_stage, "sales_stage": sales_stage,

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

@@ -122,7 +122,9 @@ class SalesPipelineAnalytics:
self.grouped_data = [] self.grouped_data = []
grouping_key = lambda o: (o.get(self.pipeline_by) or "Not Assigned", o[self.period_by]) # noqa grouping_key = lambda o: (o.get(self.pipeline_by) or "Not Assigned", o[self.period_by]) # noqa
for (pipeline_by, period_by), rows in groupby(self.query_result, grouping_key): for (pipeline_by, period_by), rows in groupby(
sorted(self.query_result, key=grouping_key), grouping_key
):
self.grouped_data.append( self.grouped_data.append(
{ {
self.pipeline_by: pipeline_by, self.pipeline_by: pipeline_by,

2
erpnext/selling/page/sales_funnel/sales_funnel.py
View File

@@ -93,7 +93,7 @@ def get_opp_by_lead_source(from_date, to_date, company):
summary = {} summary = {}
sales_stages = set() sales_stages = set()
group_key = lambda o: (o["source"], o["sales_stage"]) # noqa group_key = lambda o: (o["source"], o["sales_stage"]) # noqa
for (source, sales_stage), rows in groupby(cp_opportunities, group_key): for (source, sales_stage), rows in groupby(sorted(cp_opportunities, key=group_key), group_key):
summary.setdefault(source, {})[sales_stage] = sum(r["compound_amount"] for r in rows) summary.setdefault(source, {})[sales_stage] = sum(r["compound_amount"] for r in rows)
sales_stages.add(sales_stage) sales_stages.add(sales_stage)

3
erpnext/stock/doctype/pick_list/pick_list.py
View File

@@ -837,7 +837,8 @@ def create_delivery_note(source_name, target_doc=None):
) )
) )
for customer, rows in groupby(sales_orders, key=lambda so: so["customer"]): group_key = lambda so: so["customer"] # noqa
for customer, rows in groupby(sorted(sales_orders, key=group_key), key=group_key):
sales_dict[customer] = {row.sales_order for row in rows} sales_dict[customer] = {row.sales_order for row in rows}
if sales_dict: if sales_dict: