midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-5304 - Missing Message from Payment (#1346) 

* IDEMPIERE-5304 - Missing Message from Payment

* IDEMPIERE-5304 - replaced message type and Msg.translate method
This commit is contained in:
PeterTakacs300 2022-05-31 09:25:50 +02:00 committed by GitHub
parent 935987bd9d
commit 0dd6c2b4a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
migration/iD10/oracle/202205261621_IDEMPIERE-5304.sql Normal file
View File

@ -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')
;

11
migration/iD10/postgresql/202205261621_IDEMPIERE-5304.sql Normal file
View File

@ -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')
;

4
org.adempiere.base/src/org/compiere/model/MPayment.java
View File

@ -792,14 +792,14 @@ public class MPayment extends X_C_Payment
if (getC_Invoice_ID() != 0) { if (getC_Invoice_ID() != 0) {
MInvoice inv = new MInvoice(getCtx(), getC_Invoice_ID(), get_TrxName()); MInvoice inv = new MInvoice(getCtx(), getC_Invoice_ID(), get_TrxName());
if (inv.getC_BPartner_ID() != getC_BPartner_ID()) { 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; return false;
} }
} }
if (getC_Order_ID() != 0) { if (getC_Order_ID() != 0) {
MOrder ord = new MOrder(getCtx(), getC_Order_ID(), get_TrxName()); MOrder ord = new MOrder(getCtx(), getC_Order_ID(), get_TrxName());
if (ord.getC_BPartner_ID() != getC_BPartner_ID()) { 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; return false;
} }
} }