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

chore: resolve conflict

Browse Source
This commit is contained in:
Mihir Kandoi
2026-08-11 21:19:00 +05:30
parent 218397e78d
commit bc6cb75bf4
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/utilities/transaction_base.py
View File

@@ -350,11 +350,7 @@ class TransactionBase(StatusUpdater):
) )
@frappe.whitelist() @frappe.whitelist()
<<<<<<< HEAD
def process_item_selection(self, item_idx):
=======
def process_item_selection(self, item_idx: int, reset_item_details: bool = False): 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 # Server side 'item' doc. Update this to reflect in UI
item_obj = self.get("items", {"idx": item_idx})[0] item_obj = self.get("items", {"idx": item_idx})[0]