nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-07 07:20:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Get Bundle Items

Browse Source
This commit is contained in:
GangaManoj
2021-08-25 15:33:53 +05:30
parent 94162e0139
commit 5bc7d63646
1 changed files with 0 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -472,35 +472,6 @@ class GrossProfitGenerator(object):
fields = ['item_code', 'qty']
)
<<<<<<< HEAD
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({
'parent_invoice': product_bundle.item_code,
'indent': product_bundle.indent + 1,
'parent': item.item_code,
'posting_date': product_bundle.posting_date,
'posting_time': product_bundle.posting_time,
'project': product_bundle.project,
'customer': product_bundle.customer,
'customer_group': product_bundle.customer_group,
'item_code': item.item_code,
'item_name': item_name,
'description': description,
'warehouse': product_bundle.warehouse,
'item_group': item_group,
'brand': brand,
'dn_detail': product_bundle.dn_detail,
'delivery_note': product_bundle.delivery_note,
'qty': (flt(product_bundle.qty) * flt(item.qty)),
'item_row': None,
'is_return': product_bundle.is_return,
'cost_center': product_bundle.cost_center
})
self.si_list.insert((index+i+1), bundle_item)
=======
def get_bundle_item_row(self, product_bundle, item):
item_name, description, item_group, brand = self.get_bundle_item_details(item.item_code)
@@ -526,7 +497,6 @@ class GrossProfitGenerator(object):
'is_return': product_bundle.is_return,
'cost_center': product_bundle.cost_center
})
>>>>>>> 3135d6dc6a (fix: Get Bundle Items)
def get_bundle_item_details(self, item_code):
return frappe.db.get_value(