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

fix: merge conflicts

Browse Source
This commit is contained in:
Nishka Gosalia
2026-05-18 11:44:57 +05:30
parent 9309aec209
commit 8512eb4493
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/stock/get_item_details.py
View File

@@ -1044,13 +1044,8 @@ def insert_item_price(args):
) )
item_price.insert() item_price.insert()
frappe.msgprint( 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( _("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, alert=True,
) )
@@ -1075,13 +1070,9 @@ def insert_item_price(args):
) )
item_price.insert() item_price.insert()
frappe.msgprint( 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( _("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, alert=True,
) )