Merge branch 'develop' into Gokulnath_dev

erpnext/accounts/doctype/payment_entry/payment_entry.py

@@ -684,26 +684,25 @@ class PaymentEntry(AccountsController):
 		)
 
 	def validate_payment_against_negative_invoice(self):
-		if (self.payment_type == "Pay" and self.party_type == "Customer") or (
+		if (self.payment_type != "Pay" or self.party_type != "Customer") and (
-			self.payment_type == "Receive" and self.party_type == "Supplier"
+			self.payment_type != "Receive" or self.party_type != "Supplier"
 		):
+			return
 
 		total_negative_outstanding = sum(
 			abs(flt(d.outstanding_amount)) for d in self.get("references") if flt(d.outstanding_amount) < 0
 		)
 
 		paid_amount = self.paid_amount if self.payment_type == "Receive" else self.received_amount
-			additional_charges = sum([flt(d.amount) for d in self.deductions])
+		additional_charges = sum(flt(d.amount) for d in self.deductions)
 
 		if not total_negative_outstanding:
-				frappe.throw(
+			if self.party_type == "Customer":
-					_("Cannot {0} {1} {2} without any negative outstanding invoice").format(
+				msg = _("Cannot pay to Customer without any negative outstanding invoice")
-						_(self.payment_type),
+			else:
-						(_("to") if self.party_type == "Customer" else _("from")),
+				msg = _("Cannot receive from Supplier without any negative outstanding invoice")
-						self.party_type,
+
-					),
+			frappe.throw(msg, InvalidPaymentEntry)
-					InvalidPaymentEntry,
-				)
 
 		elif paid_amount - additional_charges > total_negative_outstanding:
 			frappe.throw(

erpnext/controllers/status_updater.py

@@ -347,16 +347,21 @@ class StatusUpdater(Document):
 		)
 
 	def warn_about_bypassing_with_role(self, item, qty_or_amount, role):
-		action = _("Over Receipt/Delivery") if qty_or_amount == "qty" else _("Overbilling")
+		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.")
 
-		msg = _("{0} of {1} {2} ignored for item {3} because you have {4} role.").format(
+		frappe.msgprint(
-			action,
+			msg.format(
 				_(item["target_ref_field"].title()),
 				frappe.bold(item["reduce_by"]),
 				frappe.bold(item.get("item_code")),
 				role,
+			),
+			indicator="orange",
+			alert=True,
 		)
-		frappe.msgprint(msg, indicator="orange", alert=True)
 
 	def update_qty(self, update_modified=True):
 		"""Updates qty or amount at row level

erpnext/translations/de.csv

@@ -1849,6 +1849,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:,
@@ -9914,4 +9916,3 @@ Cost and Freight,Kosten und Fracht,
 Delivered at Place,Geliefert benannter Ort,
 Delivered at Place Unloaded,Geliefert benannter Ort entladen,
 Delivered Duty Paid,Geliefert verzollt,
-{0} of {1} {2} ignored for item {3} because you have {4} role,"{0} von Artikel {3} mit {1} {2} wurde ignoriert, weil Sie die Rolle {4} haben."