From 82623d4399ac390deb957029ea87ae823ca07636 Mon Sep 17 00:00:00 2001 From: Nicolas Micoud Date: Tue, 28 Aug 2018 13:26:05 +0200 Subject: [PATCH] IDEMPIERE-3769 IBAN : Invalid message is not translated - force to uppercase --- migration/i5.1/oracle/201808010900_IDEMPIERE-3769.sql | 10 ++++++++++ .../i5.1/postgresql/201808010900_IDEMPIERE-3769.sql | 7 +++++++ .../src/org/compiere/model/MBPBankAccount.java | 3 ++- .../src/org/compiere/model/MBankAccount.java | 3 ++- .../src/org/compiere/model/MPayment.java | 2 +- .../src/org/compiere/model/MPaymentTransaction.java | 2 +- org.adempiere.base/src/org/compiere/util/IBAN.java | 2 +- 7 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 migration/i5.1/oracle/201808010900_IDEMPIERE-3769.sql create mode 100644 migration/i5.1/postgresql/201808010900_IDEMPIERE-3769.sql diff --git a/migration/i5.1/oracle/201808010900_IDEMPIERE-3769.sql b/migration/i5.1/oracle/201808010900_IDEMPIERE-3769.sql new file mode 100644 index 0000000000..87f4f8063d --- /dev/null +++ b/migration/i5.1/oracle/201808010900_IDEMPIERE-3769.sql @@ -0,0 +1,10 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- IDEMPIERE-3769 : IBAN : Invalid message is not translated - force to uppercase +-- Aug 1, 2018 8:56:43 AM 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 ('I','IBAN is invalid',0,0,'Y',TO_DATE('2018-08-01 08:56:42','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2018-08-01 08:56:42','YYYY-MM-DD HH24:MI:SS'),0,200480,'InvalidIBAN','D','4cc792d9-9af0-4e37-b90a-7dcc9f5e82ec') +; + +SELECT register_migration_script('201808010900_IDEMPIERE-3769.sql') FROM dual +; \ No newline at end of file diff --git a/migration/i5.1/postgresql/201808010900_IDEMPIERE-3769.sql b/migration/i5.1/postgresql/201808010900_IDEMPIERE-3769.sql new file mode 100644 index 0000000000..80650157a4 --- /dev/null +++ b/migration/i5.1/postgresql/201808010900_IDEMPIERE-3769.sql @@ -0,0 +1,7 @@ +-- IDEMPIERE-3769 : IBAN : Invalid message is not translated - force to uppercase +-- Aug 1, 2018 8:56:43 AM 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 ('I','IBAN is invalid',0,0,'Y',TO_TIMESTAMP('2018-08-01 08:56:42','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2018-08-01 08:56:42','YYYY-MM-DD HH24:MI:SS'),0,200480,'InvalidIBAN','D','4cc792d9-9af0-4e37-b90a-7dcc9f5e82ec') +; + +SELECT register_migration_script('201808010900_IDEMPIERE-3769.sql') FROM dual +; \ No newline at end of file diff --git a/org.adempiere.base/src/org/compiere/model/MBPBankAccount.java b/org.adempiere.base/src/org/compiere/model/MBPBankAccount.java index 5d7cbcb9e8..4a5ea08b21 100644 --- a/org.adempiere.base/src/org/compiere/model/MBPBankAccount.java +++ b/org.adempiere.base/src/org/compiere/model/MBPBankAccount.java @@ -24,6 +24,7 @@ import org.adempiere.util.PaymentUtil; import org.compiere.util.CLogger; import org.compiere.util.Env; import org.compiere.util.IBAN; +import org.compiere.util.Msg; import org.compiere.util.Util; /** @@ -214,7 +215,7 @@ public class MBPBankAccount extends X_C_BP_BankAccount if (!Util.isEmpty(getIBAN())) { setIBAN(IBAN.normalizeIBAN(getIBAN())); if (!IBAN.isValid(getIBAN())) { - log.saveError("Error", "IBAN is invalid"); + log.saveError("Error", Msg.getMsg(getCtx(), "InvalidIBAN")); return false; } } diff --git a/org.adempiere.base/src/org/compiere/model/MBankAccount.java b/org.adempiere.base/src/org/compiere/model/MBankAccount.java index eac26ff408..9bb98fca78 100644 --- a/org.adempiere.base/src/org/compiere/model/MBankAccount.java +++ b/org.adempiere.base/src/org/compiere/model/MBankAccount.java @@ -22,6 +22,7 @@ import java.util.Properties; import org.compiere.util.CCache; import org.compiere.util.Env; import org.compiere.util.IBAN; +import org.compiere.util.Msg; import org.compiere.util.Util; @@ -136,7 +137,7 @@ public class MBankAccount extends X_C_BankAccount if (!Util.isEmpty(getIBAN())) { setIBAN(IBAN.normalizeIBAN(getIBAN())); if (!IBAN.isValid(getIBAN())) { - log.saveError("Error", "IBAN is invalid"); + log.saveError("Error", Msg.getMsg(getCtx(), "InvalidIBAN")); return false; } } diff --git a/org.adempiere.base/src/org/compiere/model/MPayment.java b/org.adempiere.base/src/org/compiere/model/MPayment.java index cd547695e9..33f16025b5 100644 --- a/org.adempiere.base/src/org/compiere/model/MPayment.java +++ b/org.adempiere.base/src/org/compiere/model/MPayment.java @@ -804,7 +804,7 @@ public class MPayment extends X_C_Payment if (!Util.isEmpty(getIBAN())) { setIBAN(IBAN.normalizeIBAN(getIBAN())); if (!IBAN.isValid(getIBAN())) { - log.saveError("Error", "IBAN is invalid"); + log.saveError("Error", Msg.getMsg(getCtx(), "InvalidIBAN")); return false; } } diff --git a/org.adempiere.base/src/org/compiere/model/MPaymentTransaction.java b/org.adempiere.base/src/org/compiere/model/MPaymentTransaction.java index c367709afa..1cd3bb7a6e 100644 --- a/org.adempiere.base/src/org/compiere/model/MPaymentTransaction.java +++ b/org.adempiere.base/src/org/compiere/model/MPaymentTransaction.java @@ -87,7 +87,7 @@ public class MPaymentTransaction extends X_C_PaymentTransaction implements Proce if (!Util.isEmpty(getIBAN())) { setIBAN(IBAN.normalizeIBAN(getIBAN())); if (!IBAN.isValid(getIBAN())) { - log.saveError("Error", "IBAN is invalid"); + log.saveError("Error", Msg.getMsg(getCtx(), "InvalidIBAN")); return false; } } diff --git a/org.adempiere.base/src/org/compiere/util/IBAN.java b/org.adempiere.base/src/org/compiere/util/IBAN.java index 3cbb374fc4..212f80b742 100644 --- a/org.adempiere.base/src/org/compiere/util/IBAN.java +++ b/org.adempiere.base/src/org/compiere/util/IBAN.java @@ -26,7 +26,7 @@ public class IBAN { { if (iban!=null) { - return iban.trim().replace(" ", "") ; + return iban.trim().replace(" ", "").toUpperCase() ; } return null ; }