From bc6cb75bf4be6cfe44f1e27a3d9b64a00a7f4ca4 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Tue, 11 Aug 2026 21:19:00 +0530 Subject: [PATCH] chore: resolve conflict --- erpnext/utilities/transaction_base.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/utilities/transaction_base.py b/erpnext/utilities/transaction_base.py index 7efc43936e7..97dbcfaa4d6 100644 --- a/erpnext/utilities/transaction_base.py +++ b/erpnext/utilities/transaction_base.py @@ -350,11 +350,7 @@ class TransactionBase(StatusUpdater): ) @frappe.whitelist() -<<<<<<< HEAD - def process_item_selection(self, item_idx): -======= def process_item_selection(self, item_idx: int, reset_item_details: bool = False): ->>>>>>> e8c890a844 (fix(selling): preserve explicit UOM during item selection) # Server side 'item' doc. Update this to reflect in UI item_obj = self.get("items", {"idx": item_idx})[0]