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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-06-06 15:38:10 +05:30
committed by GitHub
parent ef77791bd6
commit ea393ef008
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
View File

@@ -163,16 +163,11 @@ class StockReconciliation(StockController):
def set_current_serial_and_batch_bundle(self, voucher_detail_no=None, save=False) -> None: def set_current_serial_and_batch_bundle(self, voucher_detail_no=None, save=False) -> None:
"""Set Serial and Batch Bundle for each item""" """Set Serial and Batch Bundle for each item"""
for item in self.items: for item in self.items:
<<<<<<< HEAD
if not frappe.db.exists("Item", item.item_code):
frappe.throw(_("Item {0} does not exist").format(item.item_code))
=======
if voucher_detail_no and voucher_detail_no != item.name: if voucher_detail_no and voucher_detail_no != item.name:
continue continue
if not item.item_code: if not item.item_code:
continue continue
>>>>>>> 86e4a658a5 (fix: do not remove item which has zero qty and zero valuation)
item_details = frappe.get_cached_value( item_details = frappe.get_cached_value(
"Item", item.item_code, ["has_serial_no", "has_batch_no"], as_dict=1 "Item", item.item_code, ["has_serial_no", "has_batch_no"], as_dict=1