Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #35112 from ruthra-kumar/gp_report_simplify_groupby_invoice

Browse Source 
refactor(Gross Profit): simplify group by invoice logic
This commit is contained in:
ruthra kumar 2023-06-01 14:34:01 +05:30 committed by GitHub
commit 0319650187
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt # License: GNU General Public License v3. See license.txt
from collections import OrderedDict
import frappe import frappe
from frappe import _, qb, scrub from frappe import _, qb, scrub
@ -856,30 +857,30 @@ class GrossProfitGenerator(object):
Turns list of Sales Invoice Items to a tree of Sales Invoices with their Items as children. Turns list of Sales Invoice Items to a tree of Sales Invoices with their Items as children.
""" """
parents = [] grouped = OrderedDict()
for row in self.si_list: for row in self.si_list:
if row.parent not in parents: # initialize list with a header row for each new parent
parents.append(row.parent) grouped.setdefault(row.parent, [self.get_invoice_row(row)]).append(
row.update(
parents_index = 0 {"indent": 1.0, "parent_invoice": row.parent, "invoice_or_item": row.item_code}
for index, row in enumerate(self.si_list): ) # descendant rows will have indent: 1.0 or greater
if parents_index < len(parents) and row.parent == parents[parents_index]: )
invoice = self.get_invoice_row(row)
self.si_list.insert(index, invoice)
parents_index += 1
else:
# skipping the bundle items rows
if not row.indent:
row.indent = 1.0
row.parent_invoice = row.parent
row.invoice_or_item = row.item_code
# if item is a bundle, add it's components as seperate rows
if frappe.db.exists("Product Bundle", row.item_code): if frappe.db.exists("Product Bundle", row.item_code):
self.add_bundle_items(row, index) bundled_items = self.get_bundle_items(row)
for x in bundled_items:
bundle_item = self.get_bundle_item_row(row, x)
grouped.get(row.parent).append(bundle_item)
self.si_list.clear()
for items in grouped.values():
self.si_list.extend(items)
def get_invoice_row(self, row): def get_invoice_row(self, row):
# header row format
return frappe._dict( return frappe._dict(
{ {
"parent_invoice": "", "parent_invoice": "",
@ -908,13 +909,6 @@ class GrossProfitGenerator(object):
} }
) )
def add_bundle_items(self, product_bundle, index):
bundle_items = self.get_bundle_items(product_bundle)
for i, item in enumerate(bundle_items):
bundle_item = self.get_bundle_item_row(product_bundle, item)
self.si_list.insert((index + i + 1), bundle_item)
def get_bundle_items(self, product_bundle): def get_bundle_items(self, product_bundle):
return frappe.get_all( return frappe.get_all(
"Product Bundle Item", filters={"parent": product_bundle.item_code}, fields=["item_code", "qty"] "Product Bundle Item", filters={"parent": product_bundle.item_code}, fields=["item_code", "qty"]