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

chore: resolve merge conflict (2)

Browse Source
This commit is contained in:
Raffael Meyer
2022-12-15 00:13:13 +01:00
committed by GitHub
parent 10ac8d6e67
commit 0992ca40b0
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/controllers/status_updater.py
View File

@@ -333,16 +333,6 @@ class StatusUpdater(Document):
) )
def warn_about_bypassing_with_role(self, item, qty_or_amount, role): def warn_about_bypassing_with_role(self, item, qty_or_amount, role):
<<<<<<< HEAD
action = _("Over Receipt/Delivery") if qty_or_amount == "qty" else _("Overbilling")
msg = _("{} of {} {} ignored for item {} because you have {} role.").format(
action,
_(item["target_ref_field"].title()),
frappe.bold(item["reduce_by"]),
frappe.bold(item.get("item_code")),
role,
=======
if qty_or_amount == "qty": if qty_or_amount == "qty":
msg = _("Over Receipt/Delivery of {0} {1} ignored for item {2} because you have {3} role.") msg = _("Over Receipt/Delivery of {0} {1} ignored for item {2} because you have {3} role.")
else: else:
@@ -357,7 +347,6 @@ class StatusUpdater(Document):
), ),
indicator="orange", indicator="orange",
alert=True, alert=True,
>>>>>>> 36997d9788 (fix: translation for warning on Overbilling/-receipt/-delivery)
) )
def update_qty(self, update_modified=True): def update_qty(self, update_modified=True):