#5231 Add OrgValue to importing replenishment

#5231 Import Replenishments

de.metas.adempiere.adempiere/base/src/main/java-gen/org/compiere/model/I_I_Replenish.java

@@ -495,6 +495,31 @@ public interface I_I_Replenish
     /** Column name M_WarehouseSource_ID */
     public static final String COLUMNNAME_M_WarehouseSource_ID = "M_WarehouseSource_ID";
 
+	/**
+	 * Set Organisations-Schlüssel.
+	 * Suchschlüssel der Organisation
+	 *
+	 * <br>Type: String
+	 * <br>Mandatory: false
+	 * <br>Virtual Column: false
+	 */
+	public void setOrgValue (java.lang.String OrgValue);
+
+	/**
+	 * Get Organisations-Schlüssel.
+	 * Suchschlüssel der Organisation
+	 *
+	 * <br>Type: String
+	 * <br>Mandatory: false
+	 * <br>Virtual Column: false
+	 */
+	public java.lang.String getOrgValue();
+
+    /** Column definition for OrgValue */
+    public static final org.adempiere.model.ModelColumn<I_I_Replenish, Object> COLUMN_OrgValue = new org.adempiere.model.ModelColumn<I_I_Replenish, Object>(I_I_Replenish.class, "OrgValue", null);
+    /** Column name OrgValue */
+    public static final String COLUMNNAME_OrgValue = "OrgValue";
+
 	/**
 	 * Set Verarbeitet.
 	 * Checkbox sagt aus, ob der Beleg verarbeitet wurde.

de.metas.adempiere.adempiere/base/src/main/java-gen/org/compiere/model/X_I_Replenish.java

@@ -15,7 +15,7 @@ public class X_I_Replenish extends org.compiere.model.PO implements I_I_Replenis
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = -1678926779L;
+	private static final long serialVersionUID = 1956155821L;
 
     /** Standard Constructor */
     public X_I_Replenish (Properties ctx, int I_Replenish_ID, String trxName)
@@ -446,6 +446,25 @@ public int getM_WarehouseSource_ID ()
 		return ii.intValue();
 	}
 
+	/** Set Organisations-Schlüssel.
+		@param OrgValue 
+		Suchschlüssel der Organisation
+	  */
+	@Override
+	public void setOrgValue (java.lang.String OrgValue)
+	{
+		set_Value (COLUMNNAME_OrgValue, OrgValue);
+	}
+
+	/** Get Organisations-Schlüssel.
+		@return Suchschlüssel der Organisation
+	  */
+	@Override
+	public java.lang.String getOrgValue () 
+	{
+		return (java.lang.String)get_Value(COLUMNNAME_OrgValue);
+	}
+
 	/** Set Verarbeitet.
 		@param Processed 
 		Checkbox sagt aus, ob der Beleg verarbeitet wurde. 

de.metas.adempiere.adempiere/migration/src/main/sql/postgresql/system/10-de.metas.adempiere/5522540_sys_gh5231_AddOrgValueToIMportReplenishment.sql

@@ -0,0 +1,155 @@
+-- 2019-05-24T17:08:19.153
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,DDL_NoForeignKey,Description,EntityType,FieldLength,IsActive,IsAdvancedText,IsAllowLogging,IsAlwaysUpdateable,IsAutoApplyValidationRule,IsAutocomplete,IsCalculated,IsDimension,IsDLMPartitionBoundary,IsEncrypted,IsForceIncludeInGeneratedModel,IsGenericZoomKeyColumn,IsGenericZoomOrigin,IsIdentifier,IsKey,IsLazyLoading,IsMandatory,IsParent,IsRangeFilter,IsSelectionColumn,IsShowFilterIncrementButtons,IsStaleable,IsSyncDatabase,IsTranslated,IsUpdateable,IsUseDocSequence,Name,SelectionColumnSeqNo,SeqNo,Updated,UpdatedBy,Version) VALUES (0,568105,2115,0,10,541362,'OrgValue',TO_TIMESTAMP('2019-05-24 17:08:18','YYYY-MM-DD HH24:MI:SS'),100,'N','Suchschlüssel der Organisation','D',60,'Y','N','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','Y','N','Organisations-Schlüssel',0,0,TO_TIMESTAMP('2019-05-24 17:08:18','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- 2019-05-24T17:08:19.176
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language, t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y'AND (l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N') AND t.AD_Column_ID=568105 AND NOT EXISTS (SELECT 1 FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+-- 2019-05-24T17:08:19.240
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+/* DDL */  select update_Column_Translation_From_AD_Element(2115) 
+;
+
+-- 2019-05-24T17:08:21.156
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+/* DDL */ SELECT public.db_alter_table('I_Replenish','ALTER TABLE public.I_Replenish ADD COLUMN OrgValue VARCHAR(60)')
+;
+
+-- 2019-05-24T17:08:29.145
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Table SET AD_Window_ID=540645,Updated=TO_TIMESTAMP('2019-05-24 17:08:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=541362
+;
+
+-- 2019-05-24T17:08:40.280
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Org_ID,AD_Tab_ID,Created,CreatedBy,Description,DisplayLength,EntityType,IsActive,IsDisplayed,IsDisplayedGrid,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,Updated,UpdatedBy) VALUES (0,568105,580707,0,541780,TO_TIMESTAMP('2019-05-24 17:08:40','YYYY-MM-DD HH24:MI:SS'),100,'Suchschlüssel der Organisation',60,'D','Y','N','N','N','N','N','N','N','Organisations-Schlüssel',TO_TIMESTAMP('2019-05-24 17:08:40','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- 2019-05-24T17:08:40.284
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language, t.AD_Field_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y'AND (l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N') AND t.AD_Field_ID=580707 AND NOT EXISTS (SELECT 1 FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+-- 2019-05-24T17:08:40.308
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+/* DDL */  select update_FieldTranslation_From_AD_Name_Element(2115) 
+;
+
+-- 2019-05-24T17:08:40.319
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+DELETE FROM AD_Element_Link WHERE AD_Field_ID=580707
+;
+
+-- 2019-05-24T17:08:40.371
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+/* DDL */ select AD_Element_Link_Create_Missing_Field(580707)
+;
+
+-- 2019-05-24T17:08:55.256
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=20,Updated=TO_TIMESTAMP('2019-05-24 17:08:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=580707
+;
+
+-- 2019-05-24T17:08:55.260
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=30,Updated=TO_TIMESTAMP('2019-05-24 17:08:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=580535
+;
+
+-- 2019-05-24T17:08:55.263
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=40,Updated=TO_TIMESTAMP('2019-05-24 17:08:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=580556
+;
+
+-- 2019-05-24T17:08:55.266
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=50,Updated=TO_TIMESTAMP('2019-05-24 17:08:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=580537
+;
+
+-- 2019-05-24T17:08:55.269
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=60,Updated=TO_TIMESTAMP('2019-05-24 17:08:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=580540
+;
+
+-- 2019-05-24T17:08:55.271
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=70,Updated=TO_TIMESTAMP('2019-05-24 17:08:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=580538
+;
+
+-- 2019-05-24T17:08:55.273
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=80,Updated=TO_TIMESTAMP('2019-05-24 17:08:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=580555
+;
+
+-- 2019-05-24T17:08:55.276
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=90,Updated=TO_TIMESTAMP('2019-05-24 17:08:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=580550
+;
+
+-- 2019-05-24T17:08:55.279
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=100,Updated=TO_TIMESTAMP('2019-05-24 17:08:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=580557
+;
+
+-- 2019-05-24T17:08:55.282
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=110,Updated=TO_TIMESTAMP('2019-05-24 17:08:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=580543
+;
+
+-- 2019-05-24T17:08:55.285
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=120,Updated=TO_TIMESTAMP('2019-05-24 17:08:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=580544
+;
+
+-- 2019-05-24T17:08:55.288
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=130,Updated=TO_TIMESTAMP('2019-05-24 17:08:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=580545
+;
+
+-- 2019-05-24T17:08:55.290
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=140,Updated=TO_TIMESTAMP('2019-05-24 17:08:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=580546
+;
+
+-- 2019-05-24T17:08:55.293
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=150,Updated=TO_TIMESTAMP('2019-05-24 17:08:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=580553
+;
+
+-- 2019-05-24T17:08:55.296
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=160,Updated=TO_TIMESTAMP('2019-05-24 17:08:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=580547
+;
+
+-- 2019-05-24T17:08:55.299
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=170,Updated=TO_TIMESTAMP('2019-05-24 17:08:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=580554
+;
+
+-- 2019-05-24T17:08:55.302
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=180,Updated=TO_TIMESTAMP('2019-05-24 17:08:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=580548
+;
+
+-- 2019-05-24T17:08:55.305
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=190,Updated=TO_TIMESTAMP('2019-05-24 17:08:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=580558
+;
+
+-- 2019-05-24T17:08:55.308
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=200,Updated=TO_TIMESTAMP('2019-05-24 17:08:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=580549
+;
+
+-- 2019-05-24T17:08:55.311
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=210,Updated=TO_TIMESTAMP('2019-05-24 17:08:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=580551
+;
+
+-- 2019-05-24T17:08:55.315
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=220,Updated=TO_TIMESTAMP('2019-05-24 17:08:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=580552
+;
+

de.metas.business/src/main/java/de/metas/replenishment/impexp/RepelnishmentImportTableSqlUpdater.java

@@ -50,6 +50,7 @@ public class RepelnishmentImportTableSqlUpdater
 
 	public void updateReplenishmentImortTable(@NonNull final String whereClause)
 	{
+		dbUpdateOrg(whereClause);
 		dbUpdateProducIds(whereClause);
 		dbUpdateWarehouse(whereClause);
 		dbUpdateSourceWarehouse(whereClause);
@@ -78,6 +79,17 @@ private void dbUpdateProducIds(final String whereClause)
 		logger.info("Found Products={}", no);
 	}
 
+	private void dbUpdateOrg(@NonNull final String whereClause)
+	{
+		final StringBuilder sql = new StringBuilder("UPDATE " + I_I_Replenish.Table_Name + " i ")
+				.append("SET AD_Org_ID=(SELECT AD_Org_ID FROM AD_org o WHERE o.value = ") 
+				.append(I_I_Replenish.COLUMNNAME_OrgValue)
+				.append(" ) WHERE AD_Org_ID IS NULL AND OrgValue IS NOT NULL ")
+				.append("AND I_IsImported<>'Y' ")
+				.append(whereClause);
+		DB.executeUpdateEx(sql.toString(), ITrx.TRXNAME_ThreadInherited);
+	}
+
 	private void dbUpdateWarehouse(@NonNull final String whereClause)
 	{
 		final StringBuilder sql = new StringBuilder("UPDATE " + I_I_Replenish.Table_Name + " i ")