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

fix: incorrect warehouse and selling amount on bundled products (#33549)

Browse Source
This commit is contained in:
ruthra kumar 2023-01-09 22:45:43 +05:30 committed by GitHub
parent dd3b79b511
commit bbe5e5d9d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -439,6 +439,18 @@ class GrossProfitGenerator(object):
row.delivery_note, frappe._dict() row.delivery_note, frappe._dict()
) )
row.item_row = row.dn_detail row.item_row = row.dn_detail
# Update warehouse and base_amount from 'Packed Item' List
if product_bundles and not row.parent:
# For Packed Items, row.parent_invoice will be the Bundle name
product_bundle = product_bundles.get(row.parent_invoice)
if product_bundle:
for packed_item in product_bundle:
if (
packed_item.get("item_code") == row.item_code
and packed_item.get("parent_detail_docname") == row.item_row
):
row.warehouse = packed_item.warehouse
row.base_amount = packed_item.base_amount
# get buying amount # get buying amount
if row.item_code in product_bundles: if row.item_code in product_bundles:
@ -589,7 +601,9 @@ class GrossProfitGenerator(object):
buying_amount = 0.0 buying_amount = 0.0
for packed_item in product_bundle: for packed_item in product_bundle:
if packed_item.get("parent_detail_docname") == row.item_row: if packed_item.get("parent_detail_docname") == row.item_row:
buying_amount += self.get_buying_amount(row, packed_item.item_code) packed_item_row = row.copy()
packed_item_row.warehouse = packed_item.warehouse
buying_amount += self.get_buying_amount(packed_item_row, packed_item.item_code)
return flt(buying_amount, self.currency_precision) return flt(buying_amount, self.currency_precision)
@ -922,12 +936,25 @@ class GrossProfitGenerator(object):
def load_product_bundle(self): def load_product_bundle(self):
self.product_bundles = {} self.product_bundles = {}
for d in frappe.db.sql( pki = qb.DocType("Packed Item")
"""select parenttype, parent, parent_item,
item_code, warehouse, -1*qty as total_qty, parent_detail_docname pki_query = (
from `tabPacked Item` where docstatus=1""", frappe.qb.from_(pki)
as_dict=True, .select(
): pki.parenttype,
pki.parent,
pki.parent_item,
pki.item_code,
pki.warehouse,
(-1 * pki.qty).as_("total_qty"),
pki.rate,
(pki.rate * pki.qty).as_("base_amount"),
pki.parent_detail_docname,
)
.where(pki.docstatus == 1)
)
for d in pki_query.run(as_dict=True):
self.product_bundles.setdefault(d.parenttype, frappe._dict()).setdefault( self.product_bundles.setdefault(d.parenttype, frappe._dict()).setdefault(
d.parent, frappe._dict() d.parent, frappe._dict()
).setdefault(d.parent_item, []).append(d) ).setdefault(d.parent_item, []).append(d)