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

IDEMPIERE-4023 Missing translation in Client setup

This commit is contained in:
sjeffen 2019-08-11 14:58:20 +02:00
parent 9e6b18bcc6
commit 8790af0262
3 changed files with 121 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
migration/i6.2z/oracle/201908141917_IDEMPIERE-4023.sql Normal file
View File

@ -0,0 +1,54 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- IDEMPIERE-4023 Missing translation in Client setup
-- Aug 11, 2019, 3:53:29 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 ('I','Missing required parameters',0,0,'Y',TO_DATE('2019-08-11 15:53:29','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2019-08-11 15:53:29','YYYY-MM-DD HH24:MI:SS'),0,200521,'Missing required parameters','D','5e92b7be-d6a7-4dfc-a6f0-83ea53f8c967')
;
-- Aug 11, 2019, 3:54:43 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 ('I','AdminUserEmail is required',0,0,'Y',TO_DATE('2019-08-11 15:54:43','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2019-08-11 15:54:43','YYYY-MM-DD HH24:MI:SS'),0,200522,'AdminUserEmail is required','D','72ea12c4-af13-4889-a87f-fe2345546940')
;
-- Aug 11, 2019, 3:55:01 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 ('I','AdminUserEmail',0,0,'Y',TO_DATE('2019-08-11 15:55:01','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2019-08-11 15:55:01','YYYY-MM-DD HH24:MI:SS'),0,200523,'AdminUserEmail','D','5cfba6dc-f6cd-4d9d-afc1-9038de2a8b26')
;
-- Aug 11, 2019, 3:55:23 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 ('I','is incorrect',0,0,'Y',TO_DATE('2019-08-11 15:55:22','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2019-08-11 15:55:22','YYYY-MM-DD HH24:MI:SS'),0,200524,'is incorrect','D','9c70e7da-779c-49d5-89d6-c0040bd5b074')
;
-- Aug 11, 2019, 3:55:41 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 ('I','NormalUserEmail is required',0,0,'Y',TO_DATE('2019-08-11 15:55:41','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2019-08-11 15:55:41','YYYY-MM-DD HH24:MI:SS'),0,200525,'NormalUserEmail is required','D','f99ad03a-815c-4cbf-9b5a-c8416d135110')
;
-- Aug 11, 2019, 3:55: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 ('I','NormalUserEmail',0,0,'Y',TO_DATE('2019-08-11 15:55:54','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2019-08-11 15:55:54','YYYY-MM-DD HH24:MI:SS'),0,200526,'NormalUserEmail','D','258b36b7-90c1-4ead-82d3-ed28267d8567')
;
-- Aug 11, 2019, 3:56:10 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 ('I','CoaFile',0,0,'Y',TO_DATE('2019-08-11 15:56:09','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2019-08-11 15:56:09','YYYY-MM-DD HH24:MI:SS'),0,200527,'CoaFile','D','9849c078-7390-471c-9ad2-6273e5e35bdf')
;
-- Aug 11, 2019, 3:56:25 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 ('I','does not exist',0,0,'Y',TO_DATE('2019-08-11 15:56:25','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2019-08-11 15:56:25','YYYY-MM-DD HH24:MI:SS'),0,200528,'does not exist','D','b5729638-4d0a-4155-a0f0-6990f669d969')
;
-- Aug 11, 2019, 3:56:40 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 ('I','Cannot read CoaFile',0,0,'Y',TO_DATE('2019-08-11 15:56:40','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2019-08-11 15:56:40','YYYY-MM-DD HH24:MI:SS'),0,200529,'Cannot read CoaFile','D','ded6c203-a327-4eea-b514-b0d902eea3d2')
;
-- Aug 11, 2019, 3:57:01 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 ('I','is not a file',0,0,'Y',TO_DATE('2019-08-11 15:57:00','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2019-08-11 15:57:00','YYYY-MM-DD HH24:MI:SS'),0,200530,'is not a file','D','68910be6-a6af-480f-acb4-ae261f61528d')
;
-- Aug 11, 2019, 3:57:19 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 ('I','is empty',0,0,'Y',TO_DATE('2019-08-11 15:57:18','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2019-08-11 15:57:18','YYYY-MM-DD HH24:MI:SS'),0,200531,'is empty','D','1c800dd6-0944-4ada-ae48-9b5532731333')
;
-- Aug 11, 2019, 3:57:38 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 ('I','Create client failed',0,0,'Y',TO_DATE('2019-08-11 15:57:38','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2019-08-11 15:57:38','YYYY-MM-DD HH24:MI:SS'),0,200532,'Create client failed','D','9ad3c432-c4a0-4bde-9dd1-b8928263be3f')
;
SELECT register_migration_script('201908141917_IDEMPIERE-4023.sql') FROM dual
;

51
migration/i6.2z/postgresql/201908141917_IDEMPIERE-4023.sql Normal file
View File

@ -0,0 +1,51 @@
-- IDEMPIERE-4023 Missing translation in Client setup
-- Aug 11, 2019, 3:53:29 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 ('I','Missing required parameters',0,0,'Y',TO_TIMESTAMP('2019-08-11 15:53:29','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2019-08-11 15:53:29','YYYY-MM-DD HH24:MI:SS'),0,200521,'Missing required parameters','D','5e92b7be-d6a7-4dfc-a6f0-83ea53f8c967')
;
-- Aug 11, 2019, 3:54:43 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 ('I','AdminUserEmail is required',0,0,'Y',TO_TIMESTAMP('2019-08-11 15:54:43','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2019-08-11 15:54:43','YYYY-MM-DD HH24:MI:SS'),0,200522,'AdminUserEmail is required','D','72ea12c4-af13-4889-a87f-fe2345546940')
;
-- Aug 11, 2019, 3:55:01 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 ('I','AdminUserEmail',0,0,'Y',TO_TIMESTAMP('2019-08-11 15:55:01','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2019-08-11 15:55:01','YYYY-MM-DD HH24:MI:SS'),0,200523,'AdminUserEmail','D','5cfba6dc-f6cd-4d9d-afc1-9038de2a8b26')
;
-- Aug 11, 2019, 3:55:23 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 ('I','is incorrect',0,0,'Y',TO_TIMESTAMP('2019-08-11 15:55:22','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2019-08-11 15:55:22','YYYY-MM-DD HH24:MI:SS'),0,200524,'is incorrect','D','9c70e7da-779c-49d5-89d6-c0040bd5b074')
;
-- Aug 11, 2019, 3:55:41 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 ('I','NormalUserEmail is required',0,0,'Y',TO_TIMESTAMP('2019-08-11 15:55:41','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2019-08-11 15:55:41','YYYY-MM-DD HH24:MI:SS'),0,200525,'NormalUserEmail is required','D','f99ad03a-815c-4cbf-9b5a-c8416d135110')
;
-- Aug 11, 2019, 3:55: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 ('I','NormalUserEmail',0,0,'Y',TO_TIMESTAMP('2019-08-11 15:55:54','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2019-08-11 15:55:54','YYYY-MM-DD HH24:MI:SS'),0,200526,'NormalUserEmail','D','258b36b7-90c1-4ead-82d3-ed28267d8567')
;
-- Aug 11, 2019, 3:56:10 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 ('I','CoaFile',0,0,'Y',TO_TIMESTAMP('2019-08-11 15:56:09','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2019-08-11 15:56:09','YYYY-MM-DD HH24:MI:SS'),0,200527,'CoaFile','D','9849c078-7390-471c-9ad2-6273e5e35bdf')
;
-- Aug 11, 2019, 3:56:25 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 ('I','does not exist',0,0,'Y',TO_TIMESTAMP('2019-08-11 15:56:25','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2019-08-11 15:56:25','YYYY-MM-DD HH24:MI:SS'),0,200528,'does not exist','D','b5729638-4d0a-4155-a0f0-6990f669d969')
;
-- Aug 11, 2019, 3:56:40 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 ('I','Cannot read CoaFile',0,0,'Y',TO_TIMESTAMP('2019-08-11 15:56:40','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2019-08-11 15:56:40','YYYY-MM-DD HH24:MI:SS'),0,200529,'Cannot read CoaFile','D','ded6c203-a327-4eea-b514-b0d902eea3d2')
;
-- Aug 11, 2019, 3:57:01 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 ('I','is not a file',0,0,'Y',TO_TIMESTAMP('2019-08-11 15:57:00','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2019-08-11 15:57:00','YYYY-MM-DD HH24:MI:SS'),0,200530,'is not a file','D','68910be6-a6af-480f-acb4-ae261f61528d')
;
-- Aug 11, 2019, 3:57:19 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 ('I','is empty',0,0,'Y',TO_TIMESTAMP('2019-08-11 15:57:18','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2019-08-11 15:57:18','YYYY-MM-DD HH24:MI:SS'),0,200531,'is empty','D','1c800dd6-0944-4ada-ae48-9b5532731333')
;
-- Aug 11, 2019, 3:57:38 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 ('I','Create client failed',0,0,'Y',TO_TIMESTAMP('2019-08-11 15:57:38','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2019-08-11 15:57:38','YYYY-MM-DD HH24:MI:SS'),0,200532,'Create client failed','D','9ad3c432-c4a0-4bde-9dd1-b8928263be3f')
;
SELECT register_migration_script('201908141917_IDEMPIERE-4023.sql') FROM dual
;

31
org.adempiere.base.process/src/org/adempiere/process/InitialClientSetup.java
View File

@ -45,6 +45,7 @@ import org.compiere.util.DB;
import org.compiere.util.EMail;
import org.compiere.util.Env;
import org.compiere.util.KeyNamePair;
import org.compiere.util.Msg;
import org.compiere.util.Util;
/**
@ -209,18 +210,18 @@ public class InitialClientSetup extends SvrProcess
|| p_C_Country_ID <= 0
|| (!p_UseDefaultCoA && (p_CoAFile == null || p_CoAFile.length() == 0))
)
throw new IllegalArgumentException("Missing required parameters");
throw new IllegalArgumentException(Msg.getMsg(Env.getCtx(), "Missing required parameters"));
// Validate Uniqueness of client and users name
// Unique Client Name
if (DB.executeUpdate("UPDATE AD_Client SET CreatedBy=0 WHERE Name=?", new Object[] {p_ClientName}, false, null) != 0)
throw new AdempiereException("@NotUnique@ " + p_ClientName);
throw new AdempiereException("@" + Msg.getMsg(Env.getCtx(), "NotUnique") + "@ " + p_ClientName);
// Unique User Names
if (DB.executeUpdate("UPDATE AD_User SET CreatedBy=0 WHERE Name=?", new Object[] {p_AdminUserName}, false, null) != 0)
throw new AdempiereException("@NotUnique@ " + p_AdminUserName);
throw new AdempiereException("@" + Msg.getMsg(Env.getCtx(), "NotUnique") + "@ " + p_AdminUserName);
if (DB.executeUpdate("UPDATE AD_User SET CreatedBy=0 WHERE Name=?", new Object[] {p_NormalUserName}, false, null) != 0)
throw new AdempiereException("@NotUnique@ " + p_NormalUserName);
throw new AdempiereException("@" + Msg.getMsg(Env.getCtx(), "NotUnique") + "@ " + p_NormalUserName);
// City_ID overrides CityName if both used
if (p_C_City_ID > 0) {
@ -236,13 +237,13 @@ public class InitialClientSetup extends SvrProcess
boolean email_login = MSysConfig.getBooleanValue(MSysConfig.USE_EMAIL_FOR_LOGIN, false);
if (email_login) {
if (Util.isEmpty(p_AdminUserEmail))
throw new AdempiereException("AdminUserEmail is required");
throw new AdempiereException(Msg.getMsg(Env.getCtx(), "AdminUserEmail is required"));
if (! EMail.validate(p_AdminUserEmail))
throw new AdempiereException("AdminUserEmail " + p_AdminUserEmail + " is incorrect");
throw new AdempiereException(Msg.getMsg(Env.getCtx(), "AdminUserEmail") + " " + p_AdminUserEmail + " " + Msg.getMsg(Env.getCtx(), "is incorrect") );
if (Util.isEmpty(p_NormalUserEmail))
throw new AdempiereException("NormalUserEmail is required");
throw new AdempiereException(Msg.getMsg(Env.getCtx(), "NormalUserEmail is required") );
if (! EMail.validate(p_NormalUserEmail))
throw new AdempiereException("NormalUserEmail " + p_NormalUserEmail + " is incorrect");
throw new AdempiereException(Msg.getMsg(Env.getCtx(), "NormalUserEmail") + " " + p_NormalUserEmail + " " + Msg.getMsg(Env.getCtx(), "is incorrect"));
}
if (Util.isEmpty(p_CoAFile, true))
p_CoAFile = MSysConfig.getValue(MSysConfig.DEFAULT_COA_PATH,
@ -251,13 +252,13 @@ public class InitialClientSetup extends SvrProcess
+ File.separator + "AccountingDefaultsOnly.csv");
File coaFile = new File(p_CoAFile);
if (!coaFile.exists())
throw new AdempiereException("CoaFile " + p_CoAFile + " does not exist");
throw new AdempiereException(Msg.getMsg(Env.getCtx(), "CoaFile") + " " + p_CoAFile + " " + Msg.getMsg(Env.getCtx(), "does not exist") );
if (!coaFile.canRead())
throw new AdempiereException("Cannot read CoaFile " + p_CoAFile);
throw new AdempiereException(Msg.getMsg(Env.getCtx(), "Cannot read CoaFile") + " " + p_CoAFile);
if (!coaFile.isFile())
throw new AdempiereException("CoaFile " + p_CoAFile + " is not a file");
throw new AdempiereException(Msg.getMsg(Env.getCtx(), "CoaFile") + " " + p_CoAFile + " " + Msg.getMsg(Env.getCtx(), "is not a file"));
if (coaFile.length() <= 0L)
throw new AdempiereException("CoaFile " + p_CoAFile + " is empty");
throw new AdempiereException(Msg.getMsg(Env.getCtx(), "CoaFile") + " " + p_CoAFile + " " + Msg.getMsg(Env.getCtx(), "is empty"));
// Process
MSetup ms = new MSetup(Env.getCtx(), WINDOW_THIS_PROCESS);
@ -265,7 +266,7 @@ public class InitialClientSetup extends SvrProcess
if (! ms.createClient(p_ClientName, p_OrgValue, p_OrgName, p_AdminUserName, p_NormalUserName
, p_Phone, p_Phone2, p_Fax, p_EMail, p_TaxID, p_AdminUserEmail, p_NormalUserEmail, p_IsSetInitialPassword)) {
ms.rollback();
throw new AdempiereException("Create client failed");
throw new AdempiereException(Msg.getMsg(Env.getCtx(), "Create client failed"));
}
addLog(ms.getInfo());
@ -277,13 +278,13 @@ public class InitialClientSetup extends SvrProcess
p_IsUseProductDimension, p_IsUseBPDimension, p_IsUseProjectDimension, p_IsUseCampaignDimension, p_IsUseSalesRegionDimension, p_IsUseActivityDimension,
coaFile, p_UseDefaultCoA, p_InactivateDefaults)) {
ms.rollback();
throw new AdempiereException("@AccountSetupError@");
throw new AdempiereException("@" + Msg.getMsg(Env.getCtx(), "AccountSetupError")+ "@");
}
// Generate Entities
if (!ms.createEntities(p_C_Country_ID, p_CityName, p_C_Region_ID, p_C_Currency_ID, p_Postal, p_Address1)) {
ms.rollback();
throw new AdempiereException("@AccountSetupError@");
throw new AdempiereException("@" + Msg.getMsg(Env.getCtx(), "AccountSetupError") + "@");
}
addLog(ms.getInfo());