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

fix: Fetch bundle item details

Browse Source
This commit is contained in:
GangaManoj 2021-08-24 23:38:24 +05:30
parent 257215f479
commit 3edb1938a9
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -460,6 +460,8 @@ class GrossProfitGenerator(object):
) )
for i, item in enumerate(bundle_items): for i, item in enumerate(bundle_items):
item_name, description, item_group, brand = self.get_bundle_item_details(item.item_code)
bundle_item = frappe._dict({ bundle_item = frappe._dict({
'parent_invoice': product_bundle.item_code, 'parent_invoice': product_bundle.item_code,
'indent': product_bundle.indent + 1, 'indent': product_bundle.indent + 1,
@ -470,11 +472,11 @@ class GrossProfitGenerator(object):
'customer': product_bundle.customer, 'customer': product_bundle.customer,
'customer_group': product_bundle.customer_group, 'customer_group': product_bundle.customer_group,
'item_code': item.item_code, 'item_code': item.item_code,
'item_name': frappe.db.get_value('Item', item.item_code, 'item_name'), 'item_name': item_name,
'description': frappe.db.get_value('Item', item.item_code, 'description'), 'description': description,
'warehouse': product_bundle.warehouse, 'warehouse': product_bundle.warehouse,
'item_group': frappe.db.get_value('Item', item.item_code, 'item_group'), 'item_group': item_group,
'brand': frappe.db.get_value('Item', item.item_code, 'brand'), 'brand': brand,
'dn_detail': product_bundle.dn_detail, 'dn_detail': product_bundle.dn_detail,
'delivery_note': product_bundle.delivery_note, 'delivery_note': product_bundle.delivery_note,
'qty': (flt(product_bundle.qty) * flt(item.qty)), 'qty': (flt(product_bundle.qty) * flt(item.qty)),
@ -485,6 +487,13 @@ class GrossProfitGenerator(object):
self.si_list.insert((index+i+1), bundle_item) self.si_list.insert((index+i+1), bundle_item)
def get_bundle_item_details(self, item_code):
return frappe.db.get_value(
'Item',
item_code,
['item_name', 'description', 'item_group', 'brand']
)
def load_stock_ledger_entries(self): def load_stock_ledger_entries(self):
res = frappe.db.sql("""select item_code, voucher_type, voucher_no, res = frappe.db.sql("""select item_code, voucher_type, voucher_no,
voucher_detail_no, stock_value, warehouse, actual_qty as qty voucher_detail_no, stock_value, warehouse, actual_qty as qty