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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2024-04-09 16:57:02 +05:30
committed by GitHub
parent 722abf1b6b
commit 7a0e313895
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -568,9 +568,6 @@ class PickList(Document):
return picked_items return picked_items
<<<<<<< HEAD
def _get_product_bundles(self) -> Dict[str, str]:
=======
def _get_pick_list_items(self, items): def _get_pick_list_items(self, items):
pi = frappe.qb.DocType("Pick List") pi = frappe.qb.DocType("Pick List")
pi_item = frappe.qb.DocType("Pick List Item") pi_item = frappe.qb.DocType("Pick List Item")
@@ -603,7 +600,6 @@ class PickList(Document):
return query.run(as_dict=True) return query.run(as_dict=True)
def _get_product_bundles(self) -> dict[str, str]: def _get_product_bundles(self) -> dict[str, str]:
>>>>>>> 3bce4d92f6 (fix: pick list validation didn't consider existing draft pick list)
# Dict[so_item_row: item_code] # Dict[so_item_row: item_code]
product_bundles = {} product_bundles = {}
for item in self.locations: for item in self.locations: