From 8512eb449309181daea3ae701560010e08571393 Mon Sep 17 00:00:00 2001 From: Nishka Gosalia Date: Mon, 18 May 2026 11:44:57 +0530 Subject: [PATCH] fix: merge conflicts --- erpnext/stock/get_item_details.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index 66479d5b676..8c205a10874 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -1044,13 +1044,8 @@ def insert_item_price(args): ) item_price.insert() frappe.msgprint( -<<<<<<< HEAD - _("Item Price Added for {0} in Price List {1}").format( - get_link_to_form("Item", args.item_code), args.price_list -======= _("Item Price added for {0} in Price List - {1}").format( - get_link_to_form("Item", ctx.item_code), ctx.price_list ->>>>>>> ae9c632e39 (fix: toast message for item price insert (#55009)) + get_link_to_form("Item", args.item_code), args.price_list ), alert=True, ) @@ -1075,13 +1070,9 @@ def insert_item_price(args): ) item_price.insert() frappe.msgprint( -<<<<<<< HEAD - _("Item Price added for {0} in Price List {1}").format(args.item_code, args.price_list), -======= _("Item Price added for {0} in Price List - {1}").format( - get_link_to_form("Item", ctx.item_code), ctx.price_list + get_link_to_form("Item", args.item_code), args.price_list ), ->>>>>>> ae9c632e39 (fix: toast message for item price insert (#55009)) alert=True, )