From 0dd6c2b4a9117776a3bb06d1559a843debfe9f21 Mon Sep 17 00:00:00 2001
From: PeterTakacs300 <93127072+PeterTakacs300@users.noreply.github.com>
Date: Tue, 31 May 2022 09:25:50 +0200
Subject: [PATCH] IDEMPIERE-5304 - Missing Message from Payment (#1346)

* IDEMPIERE-5304 - Missing Message from Payment

* IDEMPIERE-5304 - replaced message type and Msg.translate method
---
 .../iD10/oracle/202205261621_IDEMPIERE-5304.sql    | 14 ++++++++++++++
 .../postgresql/202205261621_IDEMPIERE-5304.sql     | 11 +++++++++++
 .../src/org/compiere/model/MPayment.java           |  4 ++--
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 migration/iD10/oracle/202205261621_IDEMPIERE-5304.sql
 create mode 100644 migration/iD10/postgresql/202205261621_IDEMPIERE-5304.sql

diff --git a/migration/iD10/oracle/202205261621_IDEMPIERE-5304.sql b/migration/iD10/oracle/202205261621_IDEMPIERE-5304.sql
new file mode 100644
index 0000000000..5c0c61f3e6
--- /dev/null
+++ b/migration/iD10/oracle/202205261621_IDEMPIERE-5304.sql
@@ -0,0 +1,14 @@
+-- IDEMPIERE-5304
+SELECT register_migration_script('202205261621_IDEMPIERE-5304.sql') FROM dual;
+
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- May 26, 2022, 4:21:54 PM CEST
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('E','Business Partner is different from Invoice - Business Partner',0,0,'Y',TO_TIMESTAMP('2022-05-26 16:21:53','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2022-05-26 16:21:53','YYYY-MM-DD HH24:MI:SS'),100,200757,'BPDifferentFromBPInvoice','D','a67cc8e4-94e3-449e-aacb-55a45ae7f4fd')
+;
+
+-- May 26, 2022, 4:22:12 PM CEST
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('E','Business Partner is different from Order - Business Partner',0,0,'Y',TO_TIMESTAMP('2022-05-26 16:22:12','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2022-05-26 16:22:12','YYYY-MM-DD HH24:MI:SS'),100,200758,'BPDifferentFromBPOrder','D','d7547154-6d4f-490f-ba2f-c90ef83604c0')
+;
+
diff --git a/migration/iD10/postgresql/202205261621_IDEMPIERE-5304.sql b/migration/iD10/postgresql/202205261621_IDEMPIERE-5304.sql
new file mode 100644
index 0000000000..45a3ac185b
--- /dev/null
+++ b/migration/iD10/postgresql/202205261621_IDEMPIERE-5304.sql
@@ -0,0 +1,11 @@
+-- IDEMPIERE-5304
+SELECT register_migration_script('202205261621_IDEMPIERE-5304.sql') FROM dual;
+
+-- May 26, 2022, 4:21:54 PM CEST
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('E','Business Partner is different from Invoice - Business Partner',0,0,'Y',TO_TIMESTAMP('2022-05-26 16:21:53','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2022-05-26 16:21:53','YYYY-MM-DD HH24:MI:SS'),100,200757,'BPDifferentFromBPInvoice','D','a67cc8e4-94e3-449e-aacb-55a45ae7f4fd')
+;
+
+-- May 26, 2022, 4:22:12 PM CEST
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('E','Business Partner is different from Order - Business Partner',0,0,'Y',TO_TIMESTAMP('2022-05-26 16:22:12','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2022-05-26 16:22:12','YYYY-MM-DD HH24:MI:SS'),100,200758,'BPDifferentFromBPOrder','D','d7547154-6d4f-490f-ba2f-c90ef83604c0')
+;
+
diff --git a/org.adempiere.base/src/org/compiere/model/MPayment.java b/org.adempiere.base/src/org/compiere/model/MPayment.java
index d01ff87674..649abe5176 100644
--- a/org.adempiere.base/src/org/compiere/model/MPayment.java
+++ b/org.adempiere.base/src/org/compiere/model/MPayment.java
@@ -792,14 +792,14 @@ public class MPayment extends X_C_Payment
 			if (getC_Invoice_ID() != 0) {
 				MInvoice inv = new MInvoice(getCtx(), getC_Invoice_ID(), get_TrxName());
 				if (inv.getC_BPartner_ID() != getC_BPartner_ID()) {
-					log.saveError("Error", Msg.parseTranslation(getCtx(), "BP different from BP Invoice"));
+					log.saveError("Error", Msg.getMsg(getCtx(), "BPDifferentFromBPInvoice"));
 					return false;
 				}
 			}
 			if (getC_Order_ID() != 0) {
 				MOrder ord = new MOrder(getCtx(), getC_Order_ID(), get_TrxName());
 				if (ord.getC_BPartner_ID() != getC_BPartner_ID()) {
-					log.saveError("Error", Msg.parseTranslation(getCtx(), "BP different from BP Order"));
+					log.saveError("Error", Msg.getMsg(getCtx(), "BPDifferentFromBPOrder"));
 					return false;
 				}
 			}