From b13ee4fc8cdb9e38612213b303da500337562217 Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Tue, 13 Dec 2022 18:59:20 +0100
Subject: [PATCH] fix: translation for warning on
 Overbilling/-receipt/-delivery

(cherry picked from commit 36997d9788d7e677a1b5bb3a2c772689a9146c24)

# Conflicts:
#	erpnext/controllers/status_updater.py
#	erpnext/translations/de.csv
---
 erpnext/controllers/status_updater.py | 18 +++++++++++++++++-
 erpnext/translations/de.csv           | 16 ++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py
index 517e080c972..5991bff4bea 100644
--- a/erpnext/controllers/status_updater.py
+++ b/erpnext/controllers/status_updater.py
@@ -333,6 +333,7 @@ class StatusUpdater(Document):
 		)
 
 	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(
@@ -341,8 +342,23 @@ class StatusUpdater(Document):
 			frappe.bold(item["reduce_by"]),
 			frappe.bold(item.get("item_code")),
 			role,
+=======
+		if qty_or_amount == "qty":
+			msg = _("Over Receipt/Delivery of {0} {1} ignored for item {2} because you have {3} role.")
+		else:
+			msg = _("Overbilling of {0} {1} ignored for item {2} because you have {3} role.")
+
+		frappe.msgprint(
+			msg.format(
+				_(item["target_ref_field"].title()),
+				frappe.bold(item["reduce_by"]),
+				frappe.bold(item.get("item_code")),
+				role,
+			),
+			indicator="orange",
+			alert=True,
+>>>>>>> 36997d9788 (fix: translation for warning on Overbilling/-receipt/-delivery)
 		)
-		frappe.msgprint(msg, indicator="orange", alert=True)
 
 	def update_qty(self, update_modified=True):
 		"""Updates qty or amount at row level
diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index 69780276ce2..83c346c693f 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -1844,6 +1844,8 @@ Outstanding Amt,Offener Betrag,
 Outstanding Cheques and Deposits to clear,Ausstehende Schecks und Anzahlungen zum verbuchen,
 Outstanding for {0} cannot be less than zero ({1}),Ausstände für {0} können nicht kleiner als Null sein ({1}),
 Outward taxable supplies(zero rated),Steuerpflichtige Lieferungen aus dem Ausland (null bewertet),
+Over Receipt/Delivery of {0} {1} ignored for item {2} because you have {3} role.,"Überhöhte Annahme bzw. Lieferung von Artikel {2} mit {0} {1} wurde ignoriert, weil Sie die Rolle {3} haben."
+Overbilling of {0} {1} ignored for item {2} because you have {3} role.,"Überhöhte Abrechnung von Artikel {2} mit {0} {1} wurde ignoriert, weil Sie die Rolle {3} haben."
 Overdue,Überfällig,
 Overlap in scoring between {0} and {1},Überlappung beim Scoring zwischen {0} und {1},
 Overlapping conditions found between:,Überlagernde Bedingungen gefunden zwischen:,
@@ -9897,3 +9899,17 @@ Total Asset,Aktiva,
 Total Liability,Verbindlichkeiten,
 Total Equity,Eigenkapital,
 Warehouse wise Stock Value,Warenwert nach Lager,
+<<<<<<< HEAD
+=======
+Ex Works,Ab Werk,
+Free Carrier,Frei Frachtführer,
+Free Alongside Ship,Frei Längsseite Schiff,
+Free on Board,Frei an Bord,
+Carriage Paid To,Frachtfrei,
+Carriage and Insurance Paid to,Frachtfrei versichert,
+Cost and Freight,Kosten und Fracht,
+"Cost, Insurance and Freight","Kosten, Versicherung und Fracht",
+Delivered at Place,Geliefert benannter Ort,
+Delivered at Place Unloaded,Geliefert benannter Ort entladen,
+Delivered Duty Paid,Geliefert verzollt,
+>>>>>>> 36997d9788 (fix: translation for warning on Overbilling/-receipt/-delivery)