diff --git a/.hgignore b/.hgignore
index 35a5a1c4e0..bce765a476 100644
--- a/.hgignore
+++ b/.hgignore
@@ -8,6 +8,7 @@ alpn-boot.jar
 org.adempiere.webstore/bin
 org.idempiere.hazelcast.service.config/bin
 */target
+runtime-server.product
 syntax: regexp
 ^adempiere$
 ^org\.adempiere\.install/lib$
diff --git a/migration/i5.1/oracle/201809081552_IDEMPIERE-2621.sql b/migration/i5.1/oracle/201809081552_IDEMPIERE-2621.sql
new file mode 100644
index 0000000000..84e388b740
--- /dev/null
+++ b/migration/i5.1/oracle/201809081552_IDEMPIERE-2621.sql
@@ -0,0 +1,19 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-2621 Assign default warehouse from Org on inventory docs
+-- Sep 8, 2018 3:47:28 PM CEST
+UPDATE AD_Column SET Callout='org.compiere.model.CalloutOrder.organization',Updated=TO_DATE('2018-09-08 15:47:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=3523
+;
+
+-- Sep 8, 2018 3:48:02 PM CEST
+UPDATE AD_Column SET Callout='org.compiere.model.CalloutOrder.organization',Updated=TO_DATE('2018-09-08 15:48:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=3544
+;
+
+-- Sep 8, 2018 3:48:30 PM CEST
+UPDATE AD_Column SET AD_Val_Rule_ID=130, Callout='org.compiere.model.CalloutOrder.organization',Updated=TO_DATE('2018-09-08 15:48:30','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=11469
+;
+
+SELECT register_migration_script('201809081552_IDEMPIERE-2621.sql') FROM dual
+;
+
diff --git a/migration/i5.1/oracle/201809081618_IDEMPIERE-2652.sql b/migration/i5.1/oracle/201809081618_IDEMPIERE-2652.sql
new file mode 100644
index 0000000000..f8cfb694d0
--- /dev/null
+++ b/migration/i5.1/oracle/201809081618_IDEMPIERE-2652.sql
@@ -0,0 +1,15 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-2652 default value of ad_ctxhelpmsg_trl.create and ad_ctxhelpmsg_trl.update should now()
+-- Sep 8, 2018 4:14:56 PM CEST
+ALTER TABLE AD_CtxHelpMsg_Trl MODIFY Created DATE DEFAULT SYSDATE
+;
+
+-- Sep 8, 2018 4:15:28 PM CEST
+ALTER TABLE AD_CtxHelpMsg_Trl MODIFY Updated DATE DEFAULT SYSDATE
+;
+
+SELECT register_migration_script('201809081618_IDEMPIERE-2652.sql') FROM dual
+;
+
diff --git a/migration/i5.1/oracle/201810062307_IDEMPIERE-2395.sql b/migration/i5.1/oracle/201810062307_IDEMPIERE-2395.sql
new file mode 100644
index 0000000000..46e609b1e5
--- /dev/null
+++ b/migration/i5.1/oracle/201810062307_IDEMPIERE-2395.sql
@@ -0,0 +1,159 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-2395 NoteDelete leaving orphan attachments
+-- Oct 6, 2018 11:05:15 PM CEST
+INSERT INTO AD_Process (AD_Process_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,Name,Help,IsReport,Value,IsDirectPrint,Classname,AccessLevel,EntityType,Statistic_Count,Statistic_Seconds,IsBetaFunctionality,IsServerProcess,ShowHelp,CopyFromProcess,AD_Process_UU) VALUES (200102,0,0,'Y',TO_DATE('2018-10-06 23:05:15','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-10-06 23:05:15','YYYY-MM-DD HH24:MI:SS'),100,'Clean Orphan Cascade Records','Some processes accessing directly the database can leave orphan records, this process clean those orphan records deleting them','N','CleanOrphanCascade','N','org.idempiere.process.CleanOrphanCascade','4','D',0,0,'N','N','Y','N','d3826a84-1467-4d6e-931b-e395f349f60c')
+;
+
+-- Oct 6, 2018 11:05:55 PM CEST
+INSERT INTO AD_Menu (AD_Menu_ID,Name,Action,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsSummary,AD_Process_ID,IsSOTrx,IsReadOnly,EntityType,IsCentrallyMaintained,AD_Menu_UU) VALUES (200161,'Clean Orphan Cascade Records','P',0,0,'Y',TO_DATE('2018-10-06 23:05:55','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-10-06 23:05:55','YYYY-MM-DD HH24:MI:SS'),100,'N',200102,'Y','N','D','Y','67e5ec6c-93d0-47f9-bd45-f0d60d552b16')
+;
+
+-- Oct 6, 2018 11:05:55 PM CEST
+INSERT INTO AD_TreeNodeMM (AD_Client_ID,AD_Org_ID, IsActive,Created,CreatedBy,Updated,UpdatedBy, AD_Tree_ID, Node_ID, Parent_ID, SeqNo, AD_TreeNodeMM_UU) SELECT t.AD_Client_ID, 0, 'Y', SysDate, 100, SysDate, 100,t.AD_Tree_ID, 200161, 0, 999, Generate_UUID() FROM AD_Tree t WHERE t.AD_Client_ID=0 AND t.IsActive='Y' AND t.IsAllNodes='Y' AND t.TreeType='MM' AND NOT EXISTS (SELECT * FROM AD_TreeNodeMM e WHERE e.AD_Tree_ID=t.AD_Tree_ID AND Node_ID=200161)
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=0, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=218
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=1, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=153
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=2, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=263
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=3, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=166
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=4, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=203
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=5, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53242
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=6, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=236
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=7, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=183
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=8, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=160
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=9, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=278
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=10, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=345
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=11, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53296
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=12, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53014
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=13, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53108
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=0, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=161
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=1, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=367
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=2, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=456
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=3, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=501
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=4, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=326
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=5, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=566
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=6, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=392
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=7, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=113
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=8, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=220
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=9, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=351
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=10, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=289
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=11, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=302
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=12, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=303
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=13, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=200047
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=14, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=200048
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=15, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=321
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=16, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=461
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=17, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53193
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=18, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53322
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=19, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=383
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=20, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=200161
+;
+
+SELECT register_migration_script('201810062307_IDEMPIERE-2395.sql') FROM dual
+;
+
diff --git a/migration/i5.1/postgresql/201809081552_IDEMPIERE-2621.sql b/migration/i5.1/postgresql/201809081552_IDEMPIERE-2621.sql
new file mode 100644
index 0000000000..3ac8826da0
--- /dev/null
+++ b/migration/i5.1/postgresql/201809081552_IDEMPIERE-2621.sql
@@ -0,0 +1,16 @@
+-- IDEMPIERE-2621 Assign default warehouse from Org on inventory docs
+-- Sep 8, 2018 3:47:28 PM CEST
+UPDATE AD_Column SET Callout='org.compiere.model.CalloutOrder.organization',Updated=TO_TIMESTAMP('2018-09-08 15:47:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=3523
+;
+
+-- Sep 8, 2018 3:48:02 PM CEST
+UPDATE AD_Column SET Callout='org.compiere.model.CalloutOrder.organization',Updated=TO_TIMESTAMP('2018-09-08 15:48:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=3544
+;
+
+-- Sep 8, 2018 3:48:30 PM CEST
+UPDATE AD_Column SET AD_Val_Rule_ID=130, Callout='org.compiere.model.CalloutOrder.organization',Updated=TO_TIMESTAMP('2018-09-08 15:48:30','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=11469
+;
+
+SELECT register_migration_script('201809081552_IDEMPIERE-2621.sql') FROM dual
+;
+
diff --git a/migration/i5.1/postgresql/201809081618_IDEMPIERE-2652.sql b/migration/i5.1/postgresql/201809081618_IDEMPIERE-2652.sql
new file mode 100644
index 0000000000..8d0a8cceea
--- /dev/null
+++ b/migration/i5.1/postgresql/201809081618_IDEMPIERE-2652.sql
@@ -0,0 +1,12 @@
+-- IDEMPIERE-2652 default value of ad_ctxhelpmsg_trl.create and ad_ctxhelpmsg_trl.update should now()
+-- Sep 8, 2018 4:14:56 PM CEST
+INSERT INTO t_alter_column values('ad_ctxhelpmsg_trl','Created','TIMESTAMP',null,'statement_timestamp()')
+;
+
+-- Sep 8, 2018 4:15:28 PM CEST
+INSERT INTO t_alter_column values('ad_ctxhelpmsg_trl','Updated','TIMESTAMP',null,'statement_timestamp()')
+;
+
+SELECT register_migration_script('201809081618_IDEMPIERE-2652.sql') FROM dual
+;
+
diff --git a/migration/i5.1/postgresql/201810062307_IDEMPIERE-2395.sql b/migration/i5.1/postgresql/201810062307_IDEMPIERE-2395.sql
new file mode 100644
index 0000000000..2c40843c5f
--- /dev/null
+++ b/migration/i5.1/postgresql/201810062307_IDEMPIERE-2395.sql
@@ -0,0 +1,156 @@
+-- IDEMPIERE-2395 NoteDelete leaving orphan attachments
+-- Oct 6, 2018 11:05:15 PM CEST
+INSERT INTO AD_Process (AD_Process_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,Name,Help,IsReport,Value,IsDirectPrint,Classname,AccessLevel,EntityType,Statistic_Count,Statistic_Seconds,IsBetaFunctionality,IsServerProcess,ShowHelp,CopyFromProcess,AD_Process_UU) VALUES (200102,0,0,'Y',TO_TIMESTAMP('2018-10-06 23:05:15','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-10-06 23:05:15','YYYY-MM-DD HH24:MI:SS'),100,'Clean Orphan Cascade Records','Some processes accessing directly the database can leave orphan records, this process clean those orphan records deleting them','N','CleanOrphanCascade','N','org.idempiere.process.CleanOrphanCascade','4','D',0,0,'N','N','Y','N','d3826a84-1467-4d6e-931b-e395f349f60c')
+;
+
+-- Oct 6, 2018 11:05:55 PM CEST
+INSERT INTO AD_Menu (AD_Menu_ID,Name,"action",AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsSummary,AD_Process_ID,IsSOTrx,IsReadOnly,EntityType,IsCentrallyMaintained,AD_Menu_UU) VALUES (200161,'Clean Orphan Cascade Records','P',0,0,'Y',TO_TIMESTAMP('2018-10-06 23:05:55','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-10-06 23:05:55','YYYY-MM-DD HH24:MI:SS'),100,'N',200102,'Y','N','D','Y','67e5ec6c-93d0-47f9-bd45-f0d60d552b16')
+;
+
+-- Oct 6, 2018 11:05:55 PM CEST
+INSERT INTO AD_TreeNodeMM (AD_Client_ID,AD_Org_ID, IsActive,Created,CreatedBy,Updated,UpdatedBy, AD_Tree_ID, Node_ID, Parent_ID, SeqNo, AD_TreeNodeMM_UU) SELECT t.AD_Client_ID, 0, 'Y', statement_timestamp(), 100, statement_timestamp(), 100,t.AD_Tree_ID, 200161, 0, 999, Generate_UUID() FROM AD_Tree t WHERE t.AD_Client_ID=0 AND t.IsActive='Y' AND t.IsAllNodes='Y' AND t.TreeType='MM' AND NOT EXISTS (SELECT * FROM AD_TreeNodeMM e WHERE e.AD_Tree_ID=t.AD_Tree_ID AND Node_ID=200161)
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=0, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=218
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=1, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=153
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=2, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=263
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=3, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=166
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=4, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=203
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=5, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=53242
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=6, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=236
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=7, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=183
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=8, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=160
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=9, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=278
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=10, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=345
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=11, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=53296
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=12, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=53014
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=13, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=53108
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=0, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=161
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=1, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=367
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=2, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=456
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=3, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=501
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=4, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=326
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=5, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=566
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=6, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=392
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=7, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=113
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=8, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=220
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=9, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=351
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=10, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=289
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=11, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=302
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=12, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=303
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=13, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=200047
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=14, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=200048
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=15, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=321
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=16, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=461
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=17, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=53193
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=18, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=53322
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=19, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=383
+;
+
+-- Oct 6, 2018 11:07:01 PM CEST
+UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=20, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=200161
+;
+
+SELECT register_migration_script('201810062307_IDEMPIERE-2395.sql') FROM dual
+;
+
diff --git a/migration/i5.1z/oracle/201807251833_IDEMPIERE-3760.sql b/migration/i5.1z/oracle/201807251833_IDEMPIERE-3760.sql
index 8ec5204bdc..34a8a12727 100644
--- a/migration/i5.1z/oracle/201807251833_IDEMPIERE-3760.sql
+++ b/migration/i5.1z/oracle/201807251833_IDEMPIERE-3760.sql
@@ -7,8 +7,10 @@ UPDATE AD_Column SET FieldLength=4000,Updated=TO_DATE('2018-07-25 18:02:03','YYY
 ;
 
 -- Jul 25, 2018 6:02:05 PM CEST
-ALTER TABLE AD_Column MODIFY ColumnSQL VARCHAR2(4000) DEFAULT NULL 
-;
+ALTER TABLE AD_Column ADD Tmp_ColumnSQL VARCHAR2(4000) DEFAULT NULL;
+UPDATE AD_Column SET Tmp_ColumnSQL = ColumnSQL;
+ALTER TABLE AD_Column DROP COLUMN ColumnSQL;
+ALTER TABLE AD_Column RENAME COLUMN Tmp_ColumnSQL TO ColumnSQL;
 
 -- Jul 25, 2018 6:02:36 PM CEST
 UPDATE AD_Field SET AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, NumLines=2, IsToolbarButton=NULL,Updated=TO_DATE('2018-07-25 18:02:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11264
diff --git a/migration/i5.1z/oracle/201809271702_IDEMPIERE-3794.sql b/migration/i5.1z/oracle/201809271702_IDEMPIERE-3794.sql
new file mode 100644
index 0000000000..8fa5a534d9
--- /dev/null
+++ b/migration/i5.1z/oracle/201809271702_IDEMPIERE-3794.sql
@@ -0,0 +1,95 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-3794 Improvement to Housekeeping
+-- Sep 27, 2018 4:49:40 PM CEST
+UPDATE AD_Column SET IsMandatory='N',Updated=TO_DATE('2018-09-27 16:49:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=56346
+;
+
+-- Sep 27, 2018 4:49:43 PM CEST
+ALTER TABLE AD_HouseKeeping MODIFY AD_Table_ID NUMBER(10) DEFAULT NULL 
+;
+
+-- Sep 27, 2018 4:49:43 PM CEST
+ALTER TABLE AD_HouseKeeping MODIFY AD_Table_ID NULL
+;
+
+-- Sep 27, 2018 4:51:05 PM CEST
+INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,AD_Table_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Element_ID,IsUpdateable,IsSelectionColumn,EntityType,IsSyncDatabase,IsAlwaysUpdateable,MandatoryLogic,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,SeqNoSelection,IsToolbarButton,IsSecure) VALUES (213696,0,'DB Table Name','Name of the table in the database','The DB Table Name indicates the name of the table in database.',53147,'TableName',40,'N','N','N','N','N',0,'N',10,0,0,'Y',TO_DATE('2018-09-27 16:51:04','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-09-27 16:51:04','YYYY-MM-DD HH24:MI:SS'),100,587,'Y','N','D','N','N','@AD_Table_ID@=0','N','Y','60eaa9cd-381b-4385-b4a4-245510ad0718','Y',0,'N','N')
+;
+
+-- Sep 27, 2018 4:51:16 PM CEST
+UPDATE AD_Column SET MandatoryLogic='@TableName@=''''',Updated=TO_DATE('2018-09-27 16:51:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=56346
+;
+
+-- Sep 27, 2018 4:51:23 PM CEST
+ALTER TABLE AD_HouseKeeping ADD TableName VARCHAR2(40) DEFAULT NULL 
+;
+
+-- Sep 27, 2018 4:51:59 PM CEST
+INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,AD_Tab_ID,AD_Column_ID,IsDisplayed,DisplayLength,SeqNo,IsSameLine,IsHeading,IsFieldOnly,IsEncrypted,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsReadOnly,IsCentrallyMaintained,EntityType,AD_Field_UU,IsDisplayedGrid,SeqNoGrid,ColumnSpan) VALUES (205834,'DB Table Name','Name of the table in the database','The DB Table Name indicates the name of the table in database.',53178,213696,'Y',40,160,'N','N','N','N',0,0,'Y',TO_DATE('2018-09-27 16:51:59','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-09-27 16:51:59','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','D','bbc73a31-615b-4045-92f9-e37a64fc5b6c','Y',160,2)
+;
+
+-- Sep 27, 2018 4:52:20 PM CEST
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=80, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=4, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205834
+;
+
+-- Sep 27, 2018 4:52:20 PM CEST
+UPDATE AD_Field SET SeqNo=90, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56367
+;
+
+-- Sep 27, 2018 4:52:20 PM CEST
+UPDATE AD_Field SET SeqNo=100, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56365
+;
+
+-- Sep 27, 2018 4:52:20 PM CEST
+UPDATE AD_Field SET SeqNo=110, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56358
+;
+
+-- Sep 27, 2018 4:52:20 PM CEST
+UPDATE AD_Field SET SeqNo=120, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56354
+;
+
+-- Sep 27, 2018 4:52:20 PM CEST
+UPDATE AD_Field SET SeqNo=130, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56364
+;
+
+-- Sep 27, 2018 4:52:20 PM CEST
+UPDATE AD_Field SET SeqNo=140, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56361
+;
+
+-- Sep 27, 2018 4:52:20 PM CEST
+UPDATE AD_Field SET SeqNo=150, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56360
+;
+
+-- Sep 27, 2018 4:52:20 PM CEST
+UPDATE AD_Field SET SeqNo=160, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56353
+;
+
+-- Sep 27, 2018 4:52:20 PM CEST
+UPDATE AD_Field SET SeqNo=0, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=204515
+;
+
+-- Sep 27, 2018 4:52:20 PM CEST
+UPDATE AD_Field SET SeqNo=0, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56359
+;
+
+-- Sep 27, 2018 4:53:13 PM CEST
+UPDATE AD_Field SET DisplayLogic='@AD_Table_ID@>0', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:53:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56358
+;
+
+-- Sep 27, 2018 4:53:21 PM CEST
+UPDATE AD_Field SET DisplayLogic='@IsExportXMLBackup@=Y & @AD_Table_ID@>0', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:53:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56354
+;
+
+-- Sep 27, 2018 4:56:14 PM CEST
+UPDATE AD_Field SET DisplayLogic='@TableName@=''''', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:56:14','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56368
+;
+
+-- Sep 27, 2018 4:56:32 PM CEST
+UPDATE AD_Field SET DisplayLogic='@AD_Table_ID@=0', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:56:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205834
+;
+
+SELECT register_migration_script('201809271702_IDEMPIERE-3794.sql') FROM dual
+;
+
diff --git a/migration/i5.1z/oracle/201810021745_IDEMPIERE-2816.sql b/migration/i5.1z/oracle/201810021745_IDEMPIERE-2816.sql
new file mode 100644
index 0000000000..72fe989ad3
--- /dev/null
+++ b/migration/i5.1z/oracle/201810021745_IDEMPIERE-2816.sql
@@ -0,0 +1,104 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- Oct 2, 2018 5:20:14 PM CEST
+-- IDEMPIERE-2816/IDEMPIERE-2351 Force background/foreground based on parameters
+INSERT INTO AD_Element (AD_Element_ID,ColumnName,Help,Updated,Name,Description,PrintName,AD_Element_UU,IsActive,Created,CreatedBy,UpdatedBy,AD_Client_ID,EntityType,AD_Org_ID) VALUES (203268,'ExecutionType','Execution Type defines whether the report/process will always run in background or foreground. The System Configurator "BACKGROUND_JOB_ALLOWED" has greater precedence.',TO_DATE('2018-10-02 17:20:14','YYYY-MM-DD HH24:MI:SS'),'Execution Type','Execution Type defines whether the report/process will always run in background or foreground. ','Execution Type','0132dcc1-96b3-427f-a057-de8a7616b2c4','Y',TO_DATE('2018-10-02 17:20:14','YYYY-MM-DD HH24:MI:SS'),100,100,0,'D',0)
+;
+
+-- Oct 2, 2018 5:22:04 PM CEST
+INSERT INTO AD_Reference (AD_Reference_ID,Name,AD_Reference_UU,IsOrderByValue,Description,ValidationType,VFormat,Updated,IsActive,CreatedBy,UpdatedBy,AD_Client_ID,Created,EntityType,AD_Org_ID) VALUES (200157,'AD_Process Execution Type','1acef8a3-44b6-49c1-9309-d848829e3898','N','Report/Process Execution Type','L',NULL,TO_DATE('2018-10-02 17:22:04','YYYY-MM-DD HH24:MI:SS'),'Y',100,100,0,TO_DATE('2018-10-02 17:22:04','YYYY-MM-DD HH24:MI:SS'),'D',0)
+;
+
+-- Oct 2, 2018 5:22:47 PM CEST
+INSERT INTO AD_Ref_List (AD_Ref_List_ID,Description,AD_Ref_List_UU,Name,IsActive,CreatedBy,UpdatedBy,AD_Client_ID,Created,Updated,EntityType,AD_Reference_ID,Value,AD_Org_ID) VALUES (200438,'It forces the report/process to always run on background. This can be useful for slow reports.','24e2cb33-193c-45ca-9281-fea9752bf59f','Force Background','Y',100,100,0,TO_DATE('2018-10-02 17:22:46','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2018-10-02 17:22:46','YYYY-MM-DD HH24:MI:SS'),'D',200157,'B',0)
+;
+
+-- Oct 2, 2018 5:23:25 PM CEST
+INSERT INTO AD_Ref_List (AD_Ref_List_ID,Description,AD_Ref_List_UU,Name,IsActive,CreatedBy,UpdatedBy,AD_Client_ID,Created,Updated,EntityType,AD_Reference_ID,Value,AD_Org_ID) VALUES (200439,'It forces the report/process to always run on foreground.','9a4c7179-17f7-4fc0-9ccb-bdcdf36488a4','Force Foreground','Y',100,100,0,TO_DATE('2018-10-02 17:23:24','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2018-10-02 17:23:24','YYYY-MM-DD HH24:MI:SS'),'D',200157,'F',0)
+;
+
+-- Oct 2, 2018 5:24:15 PM CEST
+INSERT INTO AD_Column (AD_Column_ID,IsSyncDatabase,Version,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,Updated,IsUpdateable,ColumnName,Description,Help,Name,IsAllowCopy,IsActive,CreatedBy,UpdatedBy,IsAlwaysUpdateable,AD_Client_ID,Created,IsSecure,EntityType,IsEncrypted,AD_Element_ID,AD_Reference_Value_ID,AD_Table_ID,AD_Reference_ID,IsToolbarButton,AD_Org_ID) VALUES (213698,'N',0,'N','N','N',0,'N',1,'N','N','N','Y','11fe0ed8-bdfb-47b6-9683-2acdc05f64f7',TO_DATE('2018-10-02 17:24:14','YYYY-MM-DD HH24:MI:SS'),'Y','ExecutionType','Execution Type defines whether the report/process will always run in background or foreground. ','Execution Type defines whether the report/process will always run in background or foreground. The System Configurator "BACKGROUND_JOB_ALLOWED" has greater precedence.','Execution Type','Y','Y',100,100,'Y',0,TO_DATE('2018-10-02 17:24:14','YYYY-MM-DD HH24:MI:SS'),'N','D','N',203268,200157,284,17,'N',0)
+;
+
+-- Oct 2, 2018 5:28:15 PM CEST
+ALTER TABLE AD_Process ADD ExecutionType CHAR(1) DEFAULT NULL 
+;
+
+-- Oct 2, 2018 5:28:56 PM CEST
+INSERT INTO AD_Field (SortNo,AD_Field_ID,IsEncrypted,DisplayLength,IsSameLine,IsHeading,SeqNo,IsCentrallyMaintained,IsReadOnly,Help,Updated,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,CreatedBy,UpdatedBy,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,Created,ColumnSpan,NumLines,IsAdvancedField,IsDefaultFocus,AD_Column_ID,EntityType,AD_Tab_ID,AD_Org_ID) VALUES (0,205836,'N',22,'N','N',270,'Y','N','Execution Type defines whether the report/process will always run in background or foreground. The System Configurator "BACKGROUND_JOB_ALLOWED" has greater precedence.',TO_DATE('2018-10-02 17:28:55','YYYY-MM-DD HH24:MI:SS'),'Execution Type defines whether the report/process will always run in background or foreground. ','Execution Type','6283412f-702d-4a39-ae95-67a25ada2228','Y','N',100,100,'Y','Y',230,2,'N',0,TO_DATE('2018-10-02 17:28:55','YYYY-MM-DD HH24:MI:SS'),2,1,'N','N',213698,'D',245,0)
+;
+
+-- Oct 2, 2018 5:29:18 PM CEST
+UPDATE AD_Field SET SeqNo=100, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 17:29:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4540
+;
+
+-- Oct 2, 2018 5:29:18 PM CEST
+UPDATE AD_Field SET SeqNo=110, AD_Val_Rule_ID=NULL, IsDisplayed='Y', XPosition=4, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 17:29:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205836
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=120, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2571
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=130, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12100
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=140, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3703
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=150, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2534
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=160, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10235
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=170, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56497
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=180, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3278
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=190, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3219
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=200, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5849
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=210, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=50155
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=220, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5850
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=230, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5851
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=240, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=50156
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=250, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201809
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=260, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=57342
+;
+
+SELECT register_migration_script('201810021745_IDEMPIERE-2816.sql') FROM dual
+;
+
+
diff --git a/migration/i5.1z/oracle/201810041316_IDEMPIERE-3799.sql b/migration/i5.1z/oracle/201810041316_IDEMPIERE-3799.sql
new file mode 100644
index 0000000000..01b75013de
--- /dev/null
+++ b/migration/i5.1z/oracle/201810041316_IDEMPIERE-3799.sql
@@ -0,0 +1,124 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- Oct 2, 2018 6:52:02 PM CEST
+-- IDEMPIERE-3799 Avoid users re-running a report that is already being processed
+INSERT INTO AD_Element (AD_Element_ID,ColumnName,Help,Updated,Name,Description,PrintName,AD_Element_UU,IsActive,Created,CreatedBy,UpdatedBy,AD_Client_ID,EntityType,AD_Org_ID) VALUES (203269,'AllowMultipleExecution','1. Disallow multiple executions: Never allow to execute a process that is already running.
+2. Disallow multiple executions with the same parameters: Allow to execute a process multiple times with different parameters.
+3. When blank: Always allow to execute a process multiple times.',TO_DATE('2018-10-02 18:52:01','YYYY-MM-DD HH24:MI:SS'),'Multiple Execution','Allow or disallow executing a process/report multiple times.','Multiple Execution','f8a79725-bf46-4682-aba8-4c1191ba9ddc','Y',TO_DATE('2018-10-02 18:52:01','YYYY-MM-DD HH24:MI:SS'),100,100,0,'D',0)
+;
+
+-- Oct 2, 2018 6:53:12 PM CEST
+INSERT INTO AD_Reference (AD_Reference_ID,Name,AD_Reference_UU,IsOrderByValue,Description,ValidationType,VFormat,Updated,IsActive,CreatedBy,UpdatedBy,AD_Client_ID,Created,EntityType,AD_Org_ID) VALUES (200158,'AD_Process Multiple Execution','e08cde11-cfd5-45e8-9813-0e3005269c97','N','Multiple execution rule list','L',NULL,TO_DATE('2018-10-02 18:53:11','YYYY-MM-DD HH24:MI:SS'),'Y',100,100,0,TO_DATE('2018-10-02 18:53:11','YYYY-MM-DD HH24:MI:SS'),'D',0)
+;
+
+-- Oct 2, 2018 6:53:40 PM CEST
+INSERT INTO AD_Ref_List (AD_Ref_List_ID,Description,AD_Ref_List_UU,Name,IsActive,CreatedBy,UpdatedBy,AD_Client_ID,Created,Updated,EntityType,AD_Reference_ID,Value,AD_Org_ID) VALUES (200440,'Never allow to execute a process that is already running','cd374cc2-e928-4e76-a376-9021ec5f31e7','Disallow multiple executions','Y',100,100,0,TO_DATE('2018-10-02 18:53:39','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2018-10-02 18:53:39','YYYY-MM-DD HH24:MI:SS'),'D',200158,'N',0)
+;
+
+-- Oct 2, 2018 6:53:58 PM CEST
+INSERT INTO AD_Ref_List (AD_Ref_List_ID,Description,AD_Ref_List_UU,Name,IsActive,CreatedBy,UpdatedBy,AD_Client_ID,Created,Updated,EntityType,AD_Reference_ID,Value,AD_Org_ID) VALUES (200441,'Allow to execute a process multiple times with different parameters.','1dcb3178-d9f5-449e-9592-5e6e29453cf1','Disallow multiple executions with the same parameters','Y',100,100,0,TO_DATE('2018-10-02 18:53:57','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2018-10-02 18:53:57','YYYY-MM-DD HH24:MI:SS'),'D',200158,'P',0)
+;
+
+-- Oct 2, 2018 6:58:23 PM CEST
+INSERT INTO AD_Column (AD_Column_ID,IsSyncDatabase,Version,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,Updated,IsUpdateable,ColumnName,Description,DefaultValue,Help,Name,IsAllowCopy,IsActive,CreatedBy,UpdatedBy,IsAlwaysUpdateable,AD_Client_ID,Created,IsSecure,EntityType,IsEncrypted,AD_Element_ID,AD_Reference_Value_ID,AD_Table_ID,AD_Reference_ID,IsToolbarButton,AD_Org_ID) VALUES (213699,'N',0,'N','N','N',0,'N',1,'N','N','N','Y','2996d521-d5f3-4b8f-b93d-fab92a71b406',TO_DATE('2018-10-02 18:58:23','YYYY-MM-DD HH24:MI:SS'),'Y','AllowMultipleExecution','Allow or disallow executing a process/report multiple times.','P','1. Disallow multiple executions: Never allow to execute a process that is already running.
+2. Disallow multiple executions with the same parameters: Allow to execute a process multiple times with different parameters.
+3. When blank: Always allow to execute a process multiple times.','Multiple Execution','Y','Y',100,100,'Y',0,TO_DATE('2018-10-02 18:58:23','YYYY-MM-DD HH24:MI:SS'),'N','D','N',203269,200158,284,17,'N',0)
+;
+
+-- Oct 2, 2018 6:58:37 PM CEST
+ALTER TABLE AD_Process ADD AllowMultipleExecution CHAR(1) DEFAULT 'P'
+;
+
+-- Oct 2, 2018 7:00:24 PM CEST
+INSERT INTO AD_Field (SortNo,AD_Field_ID,IsEncrypted,DisplayLength,IsSameLine,IsHeading,SeqNo,IsCentrallyMaintained,IsReadOnly,Help,Updated,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,CreatedBy,UpdatedBy,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,Created,ColumnSpan,NumLines,IsAdvancedField,IsDefaultFocus,AD_Column_ID,EntityType,AD_Tab_ID,AD_Org_ID) VALUES (0,205837,'N',0,'N','N',270,'Y','N','1. Disallow multiple executions: Never allow to execute a process that is already running.
+2. Disallow multiple executions with the same parameters: Allow to execute a process multiple times with different parameters.
+3. When blank: Always allow to execute a process multiple times.',TO_DATE('2018-10-02 19:00:23','YYYY-MM-DD HH24:MI:SS'),'Allow or disallow executing a process/report multiple times.','Multiple Execution','f4a81a10-57ca-459f-bb21-a17812a75381','Y','N',100,100,'Y','Y',240,1,'N',0,TO_DATE('2018-10-02 19:00:23','YYYY-MM-DD HH24:MI:SS'),1,1,'N','N',213699,'D',245,0)
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=100, AD_Val_Rule_ID=NULL, IsDisplayed='Y', XPosition=4, ColumnSpan=2, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205837
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=110, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4540
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=120, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205836
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=130, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2571
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=140, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12100
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=150, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3703
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=160, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2534
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=170, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10235
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=180, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56497
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=190, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3278
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=200, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3219
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=210, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5849
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=220, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=50155
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=230, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5850
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=240, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5851
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=250, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=50156
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=260, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201809
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=270, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=57342
+;
+
+-- Oct 2, 2018 7:05:07 PM CEST
+INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,AD_Message_UU,Updated,IsActive,CreatedBy,AD_Client_ID,Created,UpdatedBy,EntityType,Value,AD_Org_ID) VALUES ('I','Another instance of this process is already running, please wait until it finishes to run it again.',200483,'db33903f-5eb2-4585-be6f-9a6bcae3940e',TO_DATE('2018-10-02 19:05:06','YYYY-MM-DD HH24:MI:SS'),'Y',100,0,TO_DATE('2018-10-02 19:05:06','YYYY-MM-DD HH24:MI:SS'),100,'D','ProcessAlreadyRunning',0)
+;
+
+-- Oct 4, 2018 4:52:16 PM CEST
+UPDATE AD_Process SET allowMultipleExecution = NULL WHERE isReport ='N'
+;
+
+-- Oct 4, 2018 4:52:16 PM CEST
+UPDATE AD_Process SET allowMultipleExecution = 'P' WHERE isReport ='Y'
+;
+
+SELECT register_migration_script('201810041316_IDEMPIERE-3799.sql') FROM dual
+;
diff --git a/migration/i5.1z/oracle/201810121201_IDEMPIERE-2754.sql b/migration/i5.1z/oracle/201810121201_IDEMPIERE-2754.sql
new file mode 100644
index 0000000000..5fdc840b29
--- /dev/null
+++ b/migration/i5.1z/oracle/201810121201_IDEMPIERE-2754.sql
@@ -0,0 +1,11 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-2754 remove wrong test data.
+-- Oct 12, 2018 12:00:11 PM CEST
+DELETE FROM AD_Image WHERE AD_Image_ID=108
+;
+
+SELECT register_migration_script('201810121201_IDEMPIERE-2754.sql') FROM dual
+;
+
diff --git a/migration/i5.1z/oracle/201811031833_GardenYear2019.sql b/migration/i5.1z/oracle/201811031833_GardenYear2019.sql
new file mode 100644
index 0000000000..4d79300a17
--- /dev/null
+++ b/migration/i5.1z/oracle/201811031833_GardenYear2019.sql
@@ -0,0 +1,1595 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- GardenWorld periods 2019
+-- Nov 3, 2018, 6:28:09 PM CET
+INSERT INTO C_Year (C_Year_ID,AD_Client_ID,AD_Org_ID,IsActive,CreatedBy,Created,UpdatedBy,FiscalYear,Updated,C_Calendar_ID,Processing,C_Year_UU) VALUES (200007,11,0,'Y',100,TO_DATE('2018-11-03 18:28:07','YYYY-MM-DD HH24:MI:SS'),100,'2019',TO_DATE('2018-11-03 18:28:07','YYYY-MM-DD HH24:MI:SS'),102,'N','e8a2b0cc-050c-42ee-8fb0-1f25b1c6ac47')
+;
+
+-- Nov 3, 2018, 6:28:20 PM CET
+INSERT INTO C_Period (Name,StartDate,C_Period_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,PeriodNo,C_Year_ID,PeriodType,EndDate,Processing,C_Period_UU) VALUES ('Jan-19',TO_DATE('2019-01-01','YYYY-MM-DD'),200084,11,0,'Y',TO_DATE('2018-11-03 18:28:20','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:20','YYYY-MM-DD HH24:MI:SS'),100,1,200007,'S',TO_DATE('2019-01-31','YYYY-MM-DD'),'N','4ccdd6b3-3738-4d11-bd5e-1b0c6ec7d7e2')
+;
+
+-- Nov 3, 2018, 6:28:21 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202616,11,0,'Y',TO_DATE('2018-11-03 18:28:20','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:20','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','MMS','8733030a-50bc-4297-9cf2-2a8d6a35a275')
+;
+
+-- Nov 3, 2018, 6:28:21 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202617,11,0,'Y',TO_DATE('2018-11-03 18:28:21','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:21','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','PJI','f0104cdd-51ed-4fe0-8987-45bf6f42e114')
+;
+
+-- Nov 3, 2018, 6:28:22 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202618,11,0,'Y',TO_DATE('2018-11-03 18:28:21','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:21','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','MXI','6d9f7321-fa40-495a-bcde-4ebaf883d093')
+;
+
+-- Nov 3, 2018, 6:28:22 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202619,11,0,'Y',TO_DATE('2018-11-03 18:28:22','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:22','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','MMP','fa700cb2-5d4a-495a-9c93-2ac1dd47f7bf')
+;
+
+-- Nov 3, 2018, 6:28:22 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202620,11,0,'Y',TO_DATE('2018-11-03 18:28:22','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:22','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','GLD','d1a2195a-06cf-4336-80f3-a14a8fcc510c')
+;
+
+-- Nov 3, 2018, 6:28:23 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202621,11,0,'Y',TO_DATE('2018-11-03 18:28:22','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:22','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','CMC','39c9a33c-07c0-4944-9600-299c873ba288')
+;
+
+-- Nov 3, 2018, 6:28:23 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202622,11,0,'Y',TO_DATE('2018-11-03 18:28:23','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:23','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','MXP','7318e07c-8775-4fea-89e1-7786bc47630e')
+;
+
+-- Nov 3, 2018, 6:28:24 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202623,11,0,'Y',TO_DATE('2018-11-03 18:28:23','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:23','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','ARF','193df41a-de79-4e5c-a301-a30652d7c410')
+;
+
+-- Nov 3, 2018, 6:28:24 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202624,11,0,'Y',TO_DATE('2018-11-03 18:28:24','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:24','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','CMB','f0082345-b22a-4ee3-95e6-319526b9637d')
+;
+
+-- Nov 3, 2018, 6:28:25 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202625,11,0,'Y',TO_DATE('2018-11-03 18:28:24','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:24','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','API','a1cf555c-1fc7-4c6a-a1fd-e6c905c2bf07')
+;
+
+-- Nov 3, 2018, 6:28:25 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202626,11,0,'Y',TO_DATE('2018-11-03 18:28:25','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:25','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','APC','a7f63814-53be-4840-a561-e6966d1c66b4')
+;
+
+-- Nov 3, 2018, 6:28:25 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202627,11,0,'Y',TO_DATE('2018-11-03 18:28:25','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:25','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','GLJ','39ca58aa-bd18-4f27-a572-871be1bc156e')
+;
+
+-- Nov 3, 2018, 6:28:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202628,11,0,'Y',TO_DATE('2018-11-03 18:28:25','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:25','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','ARI','892976f7-98ee-497c-a093-d717cd43c9c7')
+;
+
+-- Nov 3, 2018, 6:28:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202629,11,0,'Y',TO_DATE('2018-11-03 18:28:26','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:26','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','ARC','4c03b2f4-9945-46d3-bb4b-765070f808e1')
+;
+
+-- Nov 3, 2018, 6:28:27 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202630,11,0,'Y',TO_DATE('2018-11-03 18:28:26','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:26','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','ARR','b7463510-f424-4555-a975-960f4e415eb9')
+;
+
+-- Nov 3, 2018, 6:28:27 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202631,11,0,'Y',TO_DATE('2018-11-03 18:28:27','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:27','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','APP','c305f8e0-3b68-43bf-959e-c6264d2d58d6')
+;
+
+-- Nov 3, 2018, 6:28:27 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202632,11,0,'Y',TO_DATE('2018-11-03 18:28:27','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:27','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','SOO','07a07e42-cda2-4bbc-8b4d-b1555e68f5e6')
+;
+
+-- Nov 3, 2018, 6:28:28 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202633,11,0,'Y',TO_DATE('2018-11-03 18:28:27','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:27','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','POO','d704425e-0eb7-48d9-9265-89278f76eb73')
+;
+
+-- Nov 3, 2018, 6:28:35 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202634,11,0,'Y',TO_DATE('2018-11-03 18:28:28','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:28','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','HRP','dcaabe23-8577-4698-ace4-4d3e0e682d70')
+;
+
+-- Nov 3, 2018, 6:28:36 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202635,11,0,'Y',TO_DATE('2018-11-03 18:28:35','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:35','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','MOP','f2a11d93-f3e9-4b21-b80d-9af2a49b2a68')
+;
+
+-- Nov 3, 2018, 6:28:36 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202636,11,0,'Y',TO_DATE('2018-11-03 18:28:36','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:36','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','MMR','fe9f4682-fbe7-45f3-ae76-2a9999a5fcee')
+;
+
+-- Nov 3, 2018, 6:28:36 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202637,11,0,'Y',TO_DATE('2018-11-03 18:28:36','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:36','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','MQO','90b3d546-654b-4089-a97f-41b129e4832d')
+;
+
+-- Nov 3, 2018, 6:28:37 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202638,11,0,'Y',TO_DATE('2018-11-03 18:28:37','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:37','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','DOO','9ffe5b56-dba0-4188-9129-5176710c5472')
+;
+
+-- Nov 3, 2018, 6:28:37 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202639,11,0,'Y',TO_DATE('2018-11-03 18:28:37','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:37','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','CMA','8ac19f3b-df84-45ca-9eff-c93ec5698b9c')
+;
+
+-- Nov 3, 2018, 6:28:38 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202640,11,0,'Y',TO_DATE('2018-11-03 18:28:37','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:37','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','MMM','228fd960-232d-47b6-81d6-610b85b1295b')
+;
+
+-- Nov 3, 2018, 6:28:38 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202641,11,0,'Y',TO_DATE('2018-11-03 18:28:38','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:38','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','POR','66ceaf86-adac-42db-92d0-f7b5a2f246ff')
+;
+
+-- Nov 3, 2018, 6:28:39 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202642,11,0,'Y',TO_DATE('2018-11-03 18:28:38','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:38','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','MOF','45c9bd30-03a5-45ed-920f-d1f4e1d58a17')
+;
+
+-- Nov 3, 2018, 6:28:39 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202643,11,0,'Y',TO_DATE('2018-11-03 18:28:39','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:39','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','MCC','500e8324-9370-44d4-8ff5-0216cba333ef')
+;
+
+-- Nov 3, 2018, 6:28:39 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202644,11,0,'Y',TO_DATE('2018-11-03 18:28:39','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:39','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','MMI','0c56d63d-bcee-4c1b-a395-35bc661b3b12')
+;
+
+-- Nov 3, 2018, 6:28:40 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202645,11,0,'Y',TO_DATE('2018-11-03 18:28:39','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:39','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','FAA','5593285b-73ee-4425-b227-b7cdbf125e3c')
+;
+
+-- Nov 3, 2018, 6:28:40 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202646,11,0,'Y',TO_DATE('2018-11-03 18:28:40','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:40','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','FDP','781d3b31-4017-4f24-bb78-8376a7c3fc6f')
+;
+
+-- Nov 3, 2018, 6:28:41 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202647,11,0,'Y',TO_DATE('2018-11-03 18:28:40','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:40','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','FAD','6358c599-fb92-4a5e-a7ba-4cc7f1b71a37')
+;
+
+-- Nov 3, 2018, 6:28:41 PM CET
+INSERT INTO C_Period (Name,StartDate,C_Period_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,PeriodNo,C_Year_ID,PeriodType,EndDate,Processing,C_Period_UU) VALUES ('Feb-19',TO_DATE('2019-02-01','YYYY-MM-DD'),200085,11,0,'Y',TO_DATE('2018-11-03 18:28:41','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:41','YYYY-MM-DD HH24:MI:SS'),100,2,200007,'S',TO_DATE('2019-02-28','YYYY-MM-DD'),'N','d650b293-9954-4e80-a351-9ff0cfa1eac5')
+;
+
+-- Nov 3, 2018, 6:28:41 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202648,11,0,'Y',TO_DATE('2018-11-03 18:28:41','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:41','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','MMS','8436d4fe-60d1-4b55-a5bb-31589680e553')
+;
+
+-- Nov 3, 2018, 6:28:42 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202649,11,0,'Y',TO_DATE('2018-11-03 18:28:41','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:41','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','PJI','9e25bfff-5caa-4c34-9248-87eed11ac9b8')
+;
+
+-- Nov 3, 2018, 6:28:42 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202650,11,0,'Y',TO_DATE('2018-11-03 18:28:42','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:42','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','MXI','657a7324-3022-4fed-9abb-dae176e74994')
+;
+
+-- Nov 3, 2018, 6:28:43 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202651,11,0,'Y',TO_DATE('2018-11-03 18:28:42','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:42','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','MMP','f084094b-0faf-474f-b656-0bc30cd037f7')
+;
+
+-- Nov 3, 2018, 6:28:50 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202652,11,0,'Y',TO_DATE('2018-11-03 18:28:43','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:43','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','GLD','ac74f364-3489-40e3-8b90-34bee28418e1')
+;
+
+-- Nov 3, 2018, 6:28:51 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202653,11,0,'Y',TO_DATE('2018-11-03 18:28:50','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:50','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','CMC','79031dcb-67f2-4193-b64a-0b6c93687013')
+;
+
+-- Nov 3, 2018, 6:28:51 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202654,11,0,'Y',TO_DATE('2018-11-03 18:28:51','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:51','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','MXP','30c63ca0-e339-4539-9db4-e12c5807af05')
+;
+
+-- Nov 3, 2018, 6:28:51 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202655,11,0,'Y',TO_DATE('2018-11-03 18:28:51','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:51','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','ARF','b6dc358f-5de2-4331-99f3-114efa8b7c27')
+;
+
+-- Nov 3, 2018, 6:28:52 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202656,11,0,'Y',TO_DATE('2018-11-03 18:28:51','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:51','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','CMB','c3f72610-cdac-4d00-a0f3-043791be11ec')
+;
+
+-- Nov 3, 2018, 6:28:52 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202657,11,0,'Y',TO_DATE('2018-11-03 18:28:52','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:52','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','API','4b89719d-7bb6-465c-a197-fea2b5c45690')
+;
+
+-- Nov 3, 2018, 6:28:53 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202658,11,0,'Y',TO_DATE('2018-11-03 18:28:52','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:52','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','APC','a55696a0-6ace-44cb-916f-0c70956c74bb')
+;
+
+-- Nov 3, 2018, 6:28:53 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202659,11,0,'Y',TO_DATE('2018-11-03 18:28:53','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:53','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','GLJ','304065a8-3fed-4590-a1c7-3c43abb2b4d4')
+;
+
+-- Nov 3, 2018, 6:28:53 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202660,11,0,'Y',TO_DATE('2018-11-03 18:28:53','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:53','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','ARI','d4222235-9d56-4d6b-a8ac-62c0238e7c9f')
+;
+
+-- Nov 3, 2018, 6:28:54 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202661,11,0,'Y',TO_DATE('2018-11-03 18:28:53','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:53','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','ARC','b61235e3-6ac8-4047-ac5c-542a8fa19d20')
+;
+
+-- Nov 3, 2018, 6:28:54 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202662,11,0,'Y',TO_DATE('2018-11-03 18:28:54','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:54','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','ARR','0c3ef0b6-5071-41f5-ab04-53d31e483383')
+;
+
+-- Nov 3, 2018, 6:28:55 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202663,11,0,'Y',TO_DATE('2018-11-03 18:28:54','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:54','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','APP','ad814ae3-de1d-46f2-838f-e3a620d740cf')
+;
+
+-- Nov 3, 2018, 6:28:55 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202664,11,0,'Y',TO_DATE('2018-11-03 18:28:55','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:55','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','SOO','238b675e-2d00-4506-9b00-05ba21e3d46d')
+;
+
+-- Nov 3, 2018, 6:28:55 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202665,11,0,'Y',TO_DATE('2018-11-03 18:28:55','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:55','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','POO','22422a03-7059-459a-b998-f674a75c9db1')
+;
+
+-- Nov 3, 2018, 6:28:56 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202666,11,0,'Y',TO_DATE('2018-11-03 18:28:55','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:55','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','HRP','e7c3724f-5093-468e-8850-cee7b3f50746')
+;
+
+-- Nov 3, 2018, 6:28:56 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202667,11,0,'Y',TO_DATE('2018-11-03 18:28:56','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:56','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','MOP','c089d789-4b3c-4979-863c-927f9ae97c76')
+;
+
+-- Nov 3, 2018, 6:28:57 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202668,11,0,'Y',TO_DATE('2018-11-03 18:28:56','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:56','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','MMR','d4cf7a59-2529-41a9-82b5-6dbd9f302a51')
+;
+
+-- Nov 3, 2018, 6:28:57 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202669,11,0,'Y',TO_DATE('2018-11-03 18:28:57','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:57','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','MQO','273d026b-4bce-4e0a-843b-9c1f1e014281')
+;
+
+-- Nov 3, 2018, 6:28:57 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202670,11,0,'Y',TO_DATE('2018-11-03 18:28:57','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:57','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','DOO','6fa5930f-b2ce-4e77-9077-24de68539289')
+;
+
+-- Nov 3, 2018, 6:29:05 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202671,11,0,'Y',TO_DATE('2018-11-03 18:28:57','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:28:57','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','CMA','eb168790-d22e-4847-ac49-546eee9ade1a')
+;
+
+-- Nov 3, 2018, 6:29:05 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202672,11,0,'Y',TO_DATE('2018-11-03 18:29:05','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:05','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','MMM','9cd95641-c3c7-47c5-81eb-f32c54fdf2f3')
+;
+
+-- Nov 3, 2018, 6:29:06 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202673,11,0,'Y',TO_DATE('2018-11-03 18:29:05','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:05','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','POR','88df3199-a71e-4750-8fe3-220b81bf8fb1')
+;
+
+-- Nov 3, 2018, 6:29:06 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202674,11,0,'Y',TO_DATE('2018-11-03 18:29:06','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:06','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','MOF','c7cc3006-f38c-4c65-ad63-1458ec322ed5')
+;
+
+-- Nov 3, 2018, 6:29:07 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202675,11,0,'Y',TO_DATE('2018-11-03 18:29:06','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:06','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','MCC','55187f0e-fb29-4646-a778-147d3bc6953c')
+;
+
+-- Nov 3, 2018, 6:29:07 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202676,11,0,'Y',TO_DATE('2018-11-03 18:29:07','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:07','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','MMI','5943120f-5902-4961-b1f1-ff09b5f28c19')
+;
+
+-- Nov 3, 2018, 6:29:07 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202677,11,0,'Y',TO_DATE('2018-11-03 18:29:07','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:07','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','FAA','477b335a-740e-4abe-9f7a-f453bb51657c')
+;
+
+-- Nov 3, 2018, 6:29:08 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202678,11,0,'Y',TO_DATE('2018-11-03 18:29:07','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:07','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','FDP','ecfe99d1-d6f7-4963-9d0f-e703e1f5acc2')
+;
+
+-- Nov 3, 2018, 6:29:08 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202679,11,0,'Y',TO_DATE('2018-11-03 18:29:08','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:08','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','FAD','79325d4c-18aa-4604-9ce2-cd2f95477369')
+;
+
+-- Nov 3, 2018, 6:29:09 PM CET
+INSERT INTO C_Period (Name,StartDate,C_Period_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,PeriodNo,C_Year_ID,PeriodType,EndDate,Processing,C_Period_UU) VALUES ('Mar-19',TO_DATE('2019-03-01','YYYY-MM-DD'),200086,11,0,'Y',TO_DATE('2018-11-03 18:29:08','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:08','YYYY-MM-DD HH24:MI:SS'),100,3,200007,'S',TO_DATE('2019-03-31','YYYY-MM-DD'),'N','acc351d6-75b6-4b4b-b6a1-9606031acac4')
+;
+
+-- Nov 3, 2018, 6:29:09 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202680,11,0,'Y',TO_DATE('2018-11-03 18:29:09','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:09','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','MMS','14554102-1e3a-4f57-ac0d-afb0e7a66d82')
+;
+
+-- Nov 3, 2018, 6:29:09 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202681,11,0,'Y',TO_DATE('2018-11-03 18:29:09','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:09','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','PJI','38e0de75-f71c-48b3-b4b9-809721c5e1f7')
+;
+
+-- Nov 3, 2018, 6:29:10 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202682,11,0,'Y',TO_DATE('2018-11-03 18:29:09','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:09','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','MXI','115a5599-2619-417e-9055-a3d533dec643')
+;
+
+-- Nov 3, 2018, 6:29:10 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202683,11,0,'Y',TO_DATE('2018-11-03 18:29:10','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:10','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','MMP','49fce423-3147-468b-b491-9cf04b011bb4')
+;
+
+-- Nov 3, 2018, 6:29:11 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202684,11,0,'Y',TO_DATE('2018-11-03 18:29:10','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:10','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','GLD','44e13445-8e3b-4dfe-bb4e-25c0a0dcb2b7')
+;
+
+-- Nov 3, 2018, 6:29:11 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202685,11,0,'Y',TO_DATE('2018-11-03 18:29:11','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:11','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','CMC','fafadcca-a602-4483-8fd6-1a0da7c3be0a')
+;
+
+-- Nov 3, 2018, 6:29:12 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202686,11,0,'Y',TO_DATE('2018-11-03 18:29:11','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:11','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','MXP','011b8cba-8b4e-4ce5-a945-b98c3402a396')
+;
+
+-- Nov 3, 2018, 6:29:12 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202687,11,0,'Y',TO_DATE('2018-11-03 18:29:12','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:12','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','ARF','4034ca85-14c6-48e0-9f55-bed494d148af')
+;
+
+-- Nov 3, 2018, 6:29:12 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202688,11,0,'Y',TO_DATE('2018-11-03 18:29:12','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:12','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','CMB','3a5eced7-4ed2-486b-8bc5-7017a9a37405')
+;
+
+-- Nov 3, 2018, 6:29:20 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202689,11,0,'Y',TO_DATE('2018-11-03 18:29:12','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:12','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','API','b6b15529-2797-459a-ad31-e0f94c5297a7')
+;
+
+-- Nov 3, 2018, 6:29:20 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202690,11,0,'Y',TO_DATE('2018-11-03 18:29:20','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:20','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','APC','2e294570-c4d4-4588-8bc3-92f1eb452893')
+;
+
+-- Nov 3, 2018, 6:29:21 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202691,11,0,'Y',TO_DATE('2018-11-03 18:29:20','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:20','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','GLJ','f3a7f555-74f5-4673-a561-84917d8b700b')
+;
+
+-- Nov 3, 2018, 6:29:21 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202692,11,0,'Y',TO_DATE('2018-11-03 18:29:21','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:21','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','ARI','85280dbd-0570-4e80-8fea-ec47459b55d9')
+;
+
+-- Nov 3, 2018, 6:29:21 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202693,11,0,'Y',TO_DATE('2018-11-03 18:29:21','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:21','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','ARC','fc859eea-616e-4f75-ad5b-3e602035fa8f')
+;
+
+-- Nov 3, 2018, 6:29:22 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202694,11,0,'Y',TO_DATE('2018-11-03 18:29:21','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:21','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','ARR','6b0cc38d-338f-4ed3-ad8b-c506286870b8')
+;
+
+-- Nov 3, 2018, 6:29:22 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202695,11,0,'Y',TO_DATE('2018-11-03 18:29:22','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:22','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','APP','21e5ee99-3125-4b68-b268-12a2d59ffa6c')
+;
+
+-- Nov 3, 2018, 6:29:23 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202696,11,0,'Y',TO_DATE('2018-11-03 18:29:22','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:22','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','SOO','bdbefa50-a417-4053-9076-65b5048d7833')
+;
+
+-- Nov 3, 2018, 6:29:23 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202697,11,0,'Y',TO_DATE('2018-11-03 18:29:23','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:23','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','POO','82fb1357-982d-432f-85e0-d1a669584897')
+;
+
+-- Nov 3, 2018, 6:29:24 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202698,11,0,'Y',TO_DATE('2018-11-03 18:29:23','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:23','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','HRP','9a5cabb5-7244-4ec5-8e68-09bb1b7a0a0d')
+;
+
+-- Nov 3, 2018, 6:29:24 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202699,11,0,'Y',TO_DATE('2018-11-03 18:29:24','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:24','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','MOP','787aab04-96b0-4cc8-9f61-b30011adee1f')
+;
+
+-- Nov 3, 2018, 6:29:24 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202700,11,0,'Y',TO_DATE('2018-11-03 18:29:24','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:24','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','MMR','0b02e522-010e-4d59-a25d-6297bb2b6e68')
+;
+
+-- Nov 3, 2018, 6:29:25 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202701,11,0,'Y',TO_DATE('2018-11-03 18:29:24','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:24','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','MQO','fe78b942-1512-459d-bc2b-c0d35d2d571e')
+;
+
+-- Nov 3, 2018, 6:29:25 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202702,11,0,'Y',TO_DATE('2018-11-03 18:29:25','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:25','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','DOO','9a64f8ac-5138-4d2a-abf1-f45df053a7e7')
+;
+
+-- Nov 3, 2018, 6:29:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202703,11,0,'Y',TO_DATE('2018-11-03 18:29:25','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:25','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','CMA','9d3bebc8-6561-49e8-a319-5ab964b60f02')
+;
+
+-- Nov 3, 2018, 6:29:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202704,11,0,'Y',TO_DATE('2018-11-03 18:29:26','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:26','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','MMM','0db76c69-d488-486a-8e9e-fd584e0eb670')
+;
+
+-- Nov 3, 2018, 6:29:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202705,11,0,'Y',TO_DATE('2018-11-03 18:29:26','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:26','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','POR','39202614-bd3a-446d-8dbc-7d85f659c6b0')
+;
+
+-- Nov 3, 2018, 6:29:27 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202706,11,0,'Y',TO_DATE('2018-11-03 18:29:26','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:26','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','MOF','9cf0c0b0-e4b7-404c-8c7b-358779f6e7b4')
+;
+
+-- Nov 3, 2018, 6:29:27 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202707,11,0,'Y',TO_DATE('2018-11-03 18:29:27','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:27','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','MCC','e4d1f2d7-9928-4762-b253-56c6beac1f8a')
+;
+
+-- Nov 3, 2018, 6:29:35 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202708,11,0,'Y',TO_DATE('2018-11-03 18:29:27','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:27','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','MMI','de36e96a-5501-4b46-980e-e34edceb3407')
+;
+
+-- Nov 3, 2018, 6:29:35 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202709,11,0,'Y',TO_DATE('2018-11-03 18:29:35','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:35','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','FAA','288feb16-4789-4d0a-b8b1-566de0627648')
+;
+
+-- Nov 3, 2018, 6:29:36 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202710,11,0,'Y',TO_DATE('2018-11-03 18:29:35','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:35','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','FDP','7fa26da5-156d-4c87-bd8d-3a102c17ce58')
+;
+
+-- Nov 3, 2018, 6:29:36 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202711,11,0,'Y',TO_DATE('2018-11-03 18:29:36','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:36','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','FAD','b740fb7c-3415-42c0-9353-2a2bfce710e1')
+;
+
+-- Nov 3, 2018, 6:29:37 PM CET
+INSERT INTO C_Period (Name,StartDate,C_Period_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,PeriodNo,C_Year_ID,PeriodType,EndDate,Processing,C_Period_UU) VALUES ('Apr-19',TO_DATE('2019-04-01','YYYY-MM-DD'),200087,11,0,'Y',TO_DATE('2018-11-03 18:29:36','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:36','YYYY-MM-DD HH24:MI:SS'),100,4,200007,'S',TO_DATE('2019-04-30','YYYY-MM-DD'),'N','41026d14-6567-4292-9f99-3d353bf2d970')
+;
+
+-- Nov 3, 2018, 6:29:37 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202712,11,0,'Y',TO_DATE('2018-11-03 18:29:37','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:37','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','MMS','dfacee0c-5348-4ef8-b389-fb866d337c49')
+;
+
+-- Nov 3, 2018, 6:29:37 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202713,11,0,'Y',TO_DATE('2018-11-03 18:29:37','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:37','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','PJI','84b117c5-cf91-4049-8752-a555b2a8cf3b')
+;
+
+-- Nov 3, 2018, 6:29:38 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202714,11,0,'Y',TO_DATE('2018-11-03 18:29:37','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:37','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','MXI','d56d4910-be18-40ef-83a5-7ff517774319')
+;
+
+-- Nov 3, 2018, 6:29:38 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202715,11,0,'Y',TO_DATE('2018-11-03 18:29:38','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:38','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','MMP','c960bf9b-ca53-417f-b148-6ee7268e4f68')
+;
+
+-- Nov 3, 2018, 6:29:39 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202716,11,0,'Y',TO_DATE('2018-11-03 18:29:38','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:38','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','GLD','68c23356-5954-4f34-9ad4-c1cec45f9e84')
+;
+
+-- Nov 3, 2018, 6:29:39 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202717,11,0,'Y',TO_DATE('2018-11-03 18:29:39','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:39','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','CMC','5977ce2e-ca74-4328-91c6-5617bd584d3b')
+;
+
+-- Nov 3, 2018, 6:29:39 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202718,11,0,'Y',TO_DATE('2018-11-03 18:29:39','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:39','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','MXP','56b550cd-93e5-4af4-8cdc-19a6973ce352')
+;
+
+-- Nov 3, 2018, 6:29:40 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202719,11,0,'Y',TO_DATE('2018-11-03 18:29:39','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:39','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','ARF','a05c1d80-d3ee-453f-ba25-98ad2155710f')
+;
+
+-- Nov 3, 2018, 6:29:40 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202720,11,0,'Y',TO_DATE('2018-11-03 18:29:40','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:40','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','CMB','57b10fb3-dc33-4a12-8eb6-abf34812e6ab')
+;
+
+-- Nov 3, 2018, 6:29:41 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202721,11,0,'Y',TO_DATE('2018-11-03 18:29:40','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:40','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','API','91361531-b889-4d4f-aed5-8b00eeb91789')
+;
+
+-- Nov 3, 2018, 6:29:41 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202722,11,0,'Y',TO_DATE('2018-11-03 18:29:41','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:41','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','APC','2cb221ad-696d-4c9c-ac2c-920c0a6c2fbc')
+;
+
+-- Nov 3, 2018, 6:29:42 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202723,11,0,'Y',TO_DATE('2018-11-03 18:29:41','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:41','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','GLJ','bab3d12f-58d2-4da8-9f1b-3cc9c01f03ea')
+;
+
+-- Nov 3, 2018, 6:29:42 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202724,11,0,'Y',TO_DATE('2018-11-03 18:29:42','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:42','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','ARI','1633e18f-b585-4247-8bf4-ffe9659e5adc')
+;
+
+-- Nov 3, 2018, 6:29:42 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202725,11,0,'Y',TO_DATE('2018-11-03 18:29:42','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:42','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','ARC','25dc977b-b62b-4175-b8bd-7f827ae43f21')
+;
+
+-- Nov 3, 2018, 6:29:50 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202726,11,0,'Y',TO_DATE('2018-11-03 18:29:42','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:42','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','ARR','fd687075-81be-4605-9003-ec790d06044e')
+;
+
+-- Nov 3, 2018, 6:29:50 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202727,11,0,'Y',TO_DATE('2018-11-03 18:29:50','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:50','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','APP','7ae7eb45-f492-402d-87c1-69ebb5c99e54')
+;
+
+-- Nov 3, 2018, 6:29:51 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202728,11,0,'Y',TO_DATE('2018-11-03 18:29:50','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:50','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','SOO','cf1bc4f0-b318-4cbf-8b62-08630c752453')
+;
+
+-- Nov 3, 2018, 6:29:51 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202729,11,0,'Y',TO_DATE('2018-11-03 18:29:51','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:51','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','POO','52365c1d-e98c-4404-9231-ad382ba021a0')
+;
+
+-- Nov 3, 2018, 6:29:52 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202730,11,0,'Y',TO_DATE('2018-11-03 18:29:51','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:51','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','HRP','e0e7133f-ea38-4773-834c-86dd22b9058f')
+;
+
+-- Nov 3, 2018, 6:29:52 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202731,11,0,'Y',TO_DATE('2018-11-03 18:29:52','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:52','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','MOP','cf0acf04-0f69-4f62-96ed-b1b5f7b0e116')
+;
+
+-- Nov 3, 2018, 6:29:52 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202732,11,0,'Y',TO_DATE('2018-11-03 18:29:52','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:52','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','MMR','b49f1f6d-b0a6-463c-aa56-edeea853678d')
+;
+
+-- Nov 3, 2018, 6:29:53 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202733,11,0,'Y',TO_DATE('2018-11-03 18:29:52','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:52','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','MQO','053b6658-bc61-4767-a0d5-f1adfd32b054')
+;
+
+-- Nov 3, 2018, 6:29:53 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202734,11,0,'Y',TO_DATE('2018-11-03 18:29:53','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:53','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','DOO','5719be01-2174-4e5c-ad89-5fd91f2b8b23')
+;
+
+-- Nov 3, 2018, 6:29:54 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202735,11,0,'Y',TO_DATE('2018-11-03 18:29:53','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:53','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','CMA','e92eec25-ff61-4fa4-9297-c5c1f18cc553')
+;
+
+-- Nov 3, 2018, 6:29:54 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202736,11,0,'Y',TO_DATE('2018-11-03 18:29:54','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:54','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','MMM','655977bb-4092-4bf8-8e95-46bd47745731')
+;
+
+-- Nov 3, 2018, 6:29:55 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202737,11,0,'Y',TO_DATE('2018-11-03 18:29:54','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:54','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','POR','2c18b1a7-2839-47b0-b115-8f6dc5249d66')
+;
+
+-- Nov 3, 2018, 6:29:55 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202738,11,0,'Y',TO_DATE('2018-11-03 18:29:55','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:55','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','MOF','244e659b-05ae-416f-b682-18801b376f1d')
+;
+
+-- Nov 3, 2018, 6:29:55 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202739,11,0,'Y',TO_DATE('2018-11-03 18:29:55','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:55','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','MCC','3798f40c-093f-4709-a261-70dae5749278')
+;
+
+-- Nov 3, 2018, 6:29:56 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202740,11,0,'Y',TO_DATE('2018-11-03 18:29:55','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:55','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','MMI','ee056d2d-740b-4031-ae93-98b7cc24f86b')
+;
+
+-- Nov 3, 2018, 6:29:56 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202741,11,0,'Y',TO_DATE('2018-11-03 18:29:56','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:56','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','FAA','2b8c3723-9abf-468b-b137-a4588de3fea5')
+;
+
+-- Nov 3, 2018, 6:29:57 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202742,11,0,'Y',TO_DATE('2018-11-03 18:29:56','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:56','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','FDP','3fe427b8-c617-47a0-b8d4-35c677d62cd1')
+;
+
+-- Nov 3, 2018, 6:29:57 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202743,11,0,'Y',TO_DATE('2018-11-03 18:29:57','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:57','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','FAD','0d7f6baf-49b3-4c0a-b641-3767ed776ae8')
+;
+
+-- Nov 3, 2018, 6:29:57 PM CET
+INSERT INTO C_Period (Name,StartDate,C_Period_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,PeriodNo,C_Year_ID,PeriodType,EndDate,Processing,C_Period_UU) VALUES ('May-19',TO_DATE('2019-05-01','YYYY-MM-DD'),200088,11,0,'Y',TO_DATE('2018-11-03 18:29:57','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:57','YYYY-MM-DD HH24:MI:SS'),100,5,200007,'S',TO_DATE('2019-05-31','YYYY-MM-DD'),'N','04f794d1-e9be-4327-86af-e078f6b51207')
+;
+
+-- Nov 3, 2018, 6:30:05 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202744,11,0,'Y',TO_DATE('2018-11-03 18:29:57','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:29:57','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','MMS','1614a7e0-293f-4596-a9fd-3c0a80b6ea0a')
+;
+
+-- Nov 3, 2018, 6:30:05 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202745,11,0,'Y',TO_DATE('2018-11-03 18:30:05','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:05','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','PJI','4bd7db0a-3374-4cc9-9e87-bc603c6f5caf')
+;
+
+-- Nov 3, 2018, 6:30:06 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202746,11,0,'Y',TO_DATE('2018-11-03 18:30:05','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:05','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','MXI','3a49d7d9-9dc5-4e6a-bdde-bcf54ded07a5')
+;
+
+-- Nov 3, 2018, 6:30:06 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202747,11,0,'Y',TO_DATE('2018-11-03 18:30:06','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:06','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','MMP','90feb04e-a710-4217-b603-a74b863496fe')
+;
+
+-- Nov 3, 2018, 6:30:06 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202748,11,0,'Y',TO_DATE('2018-11-03 18:30:06','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:06','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','GLD','46444f41-3bb7-4370-9ccb-6828637b68bc')
+;
+
+-- Nov 3, 2018, 6:30:07 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202749,11,0,'Y',TO_DATE('2018-11-03 18:30:06','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:06','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','CMC','a35bd4d9-0a39-401e-a0fd-bdff1d15464d')
+;
+
+-- Nov 3, 2018, 6:30:07 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202750,11,0,'Y',TO_DATE('2018-11-03 18:30:07','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:07','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','MXP','b1e7529e-7fba-4aff-9e80-dcbb4651d378')
+;
+
+-- Nov 3, 2018, 6:30:08 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202751,11,0,'Y',TO_DATE('2018-11-03 18:30:07','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:07','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','ARF','a8d927ab-85b9-4494-9cf0-4dc81c87185e')
+;
+
+-- Nov 3, 2018, 6:30:08 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202752,11,0,'Y',TO_DATE('2018-11-03 18:30:08','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:08','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','CMB','3697fea2-26b7-4934-b3e2-de078b3f3b49')
+;
+
+-- Nov 3, 2018, 6:30:09 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202753,11,0,'Y',TO_DATE('2018-11-03 18:30:08','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:08','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','API','8d450e43-e0a6-4953-982f-0ab55e6a2b00')
+;
+
+-- Nov 3, 2018, 6:30:09 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202754,11,0,'Y',TO_DATE('2018-11-03 18:30:09','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:09','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','APC','a7bbc028-e19a-4918-b796-4446f27aee59')
+;
+
+-- Nov 3, 2018, 6:30:10 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202755,11,0,'Y',TO_DATE('2018-11-03 18:30:09','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:09','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','GLJ','86727644-bd34-4c49-a74a-a95f0bf89eac')
+;
+
+-- Nov 3, 2018, 6:30:10 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202756,11,0,'Y',TO_DATE('2018-11-03 18:30:10','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:10','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','ARI','e6d25572-d19a-44d6-9719-2099edcf1be1')
+;
+
+-- Nov 3, 2018, 6:30:11 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202757,11,0,'Y',TO_DATE('2018-11-03 18:30:10','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:10','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','ARC','69af5358-66a7-49e5-9a59-1c8658c9eee0')
+;
+
+-- Nov 3, 2018, 6:30:11 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202758,11,0,'Y',TO_DATE('2018-11-03 18:30:11','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:11','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','ARR','e6c92c38-69a5-48e9-853e-c4688a886b6a')
+;
+
+-- Nov 3, 2018, 6:30:12 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202759,11,0,'Y',TO_DATE('2018-11-03 18:30:11','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:11','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','APP','66b9c024-9ae9-40c2-8dbf-a4899dc2bdd7')
+;
+
+-- Nov 3, 2018, 6:30:12 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202760,11,0,'Y',TO_DATE('2018-11-03 18:30:12','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:12','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','SOO','ad5b5ae1-6766-4125-bf5d-de8cabe20f44')
+;
+
+-- Nov 3, 2018, 6:30:12 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202761,11,0,'Y',TO_DATE('2018-11-03 18:30:12','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:12','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','POO','69faa967-3eaf-45fe-98d2-1a0b62450c70')
+;
+
+-- Nov 3, 2018, 6:30:13 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202762,11,0,'Y',TO_DATE('2018-11-03 18:30:12','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:12','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','HRP','a50aa994-dcca-467f-98db-2fb61756a773')
+;
+
+-- Nov 3, 2018, 6:30:21 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202763,11,0,'Y',TO_DATE('2018-11-03 18:30:13','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:13','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','MOP','0ef4634f-b71c-4a93-9ab1-a2c8ff26637c')
+;
+
+-- Nov 3, 2018, 6:30:21 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202764,11,0,'Y',TO_DATE('2018-11-03 18:30:21','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:21','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','MMR','49f46238-000f-47d3-a330-8a2d7c1fe5cb')
+;
+
+-- Nov 3, 2018, 6:30:21 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202765,11,0,'Y',TO_DATE('2018-11-03 18:30:21','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:21','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','MQO','768dcd1d-f255-472f-ba55-500ea72d5890')
+;
+
+-- Nov 3, 2018, 6:30:22 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202766,11,0,'Y',TO_DATE('2018-11-03 18:30:21','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:21','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','DOO','305ab3f9-656c-45ad-ae3d-061ff0b9e7d7')
+;
+
+-- Nov 3, 2018, 6:30:22 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202767,11,0,'Y',TO_DATE('2018-11-03 18:30:22','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:22','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','CMA','28d8b96e-c81e-40c9-b5b1-8b688acc2946')
+;
+
+-- Nov 3, 2018, 6:30:23 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202768,11,0,'Y',TO_DATE('2018-11-03 18:30:22','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:22','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','MMM','4bace6b5-f8f1-4df2-987b-52c052a91987')
+;
+
+-- Nov 3, 2018, 6:30:23 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202769,11,0,'Y',TO_DATE('2018-11-03 18:30:23','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:23','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','POR','ec9eb93f-8002-475a-8347-8422c283e1fd')
+;
+
+-- Nov 3, 2018, 6:30:23 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202770,11,0,'Y',TO_DATE('2018-11-03 18:30:23','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:23','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','MOF','3800d046-d846-4d57-9092-e1b8c00fffff')
+;
+
+-- Nov 3, 2018, 6:30:24 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202771,11,0,'Y',TO_DATE('2018-11-03 18:30:23','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:23','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','MCC','0230ce6b-d8e1-4b89-a46a-4424dd84bc0c')
+;
+
+-- Nov 3, 2018, 6:30:24 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202772,11,0,'Y',TO_DATE('2018-11-03 18:30:24','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:24','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','MMI','0cb374b7-d0a4-4934-a718-2c5ad3ccbe45')
+;
+
+-- Nov 3, 2018, 6:30:25 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202773,11,0,'Y',TO_DATE('2018-11-03 18:30:24','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:24','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','FAA','754eba14-4bcf-4e7d-aab8-d7df3d62de17')
+;
+
+-- Nov 3, 2018, 6:30:25 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202774,11,0,'Y',TO_DATE('2018-11-03 18:30:25','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:25','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','FDP','4dc0ebfd-5466-46ed-974a-37cd2ac7fa9b')
+;
+
+-- Nov 3, 2018, 6:30:25 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202775,11,0,'Y',TO_DATE('2018-11-03 18:30:25','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:25','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','FAD','f1dec394-5f1d-4279-b7f8-2e2cb89ca768')
+;
+
+-- Nov 3, 2018, 6:30:26 PM CET
+INSERT INTO C_Period (Name,StartDate,C_Period_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,PeriodNo,C_Year_ID,PeriodType,EndDate,Processing,C_Period_UU) VALUES ('Jun-19',TO_DATE('2019-06-01','YYYY-MM-DD'),200089,11,0,'Y',TO_DATE('2018-11-03 18:30:25','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:25','YYYY-MM-DD HH24:MI:SS'),100,6,200007,'S',TO_DATE('2019-06-30','YYYY-MM-DD'),'N','9edc4354-9c4b-455e-9df0-d8834a0da8fd')
+;
+
+-- Nov 3, 2018, 6:30:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202776,11,0,'Y',TO_DATE('2018-11-03 18:30:26','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:26','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','MMS','7cab4865-7f56-4662-8887-f9900ef0a483')
+;
+
+-- Nov 3, 2018, 6:30:27 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202777,11,0,'Y',TO_DATE('2018-11-03 18:30:26','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:26','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','PJI','17a723ae-7e87-4b70-b958-4cda5b40022b')
+;
+
+-- Nov 3, 2018, 6:30:27 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202778,11,0,'Y',TO_DATE('2018-11-03 18:30:27','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:27','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','MXI','649cf1fa-eb80-46f3-af4e-7701cf4a5611')
+;
+
+-- Nov 3, 2018, 6:30:27 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202779,11,0,'Y',TO_DATE('2018-11-03 18:30:27','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:27','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','MMP','f08a7f37-be3b-4d24-a572-a6d9a548deab')
+;
+
+-- Nov 3, 2018, 6:30:28 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202780,11,0,'Y',TO_DATE('2018-11-03 18:30:28','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:28','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','GLD','9ba707dd-a4af-4e73-b873-13cc9f9fe388')
+;
+
+-- Nov 3, 2018, 6:30:36 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202781,11,0,'Y',TO_DATE('2018-11-03 18:30:28','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:28','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','CMC','b659003d-ae49-49a2-822c-fdaebda933d3')
+;
+
+-- Nov 3, 2018, 6:30:36 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202782,11,0,'Y',TO_DATE('2018-11-03 18:30:36','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:36','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','MXP','0b8f8dd8-63c6-4921-9044-1a3bf4d49b10')
+;
+
+-- Nov 3, 2018, 6:30:36 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202783,11,0,'Y',TO_DATE('2018-11-03 18:30:36','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:36','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','ARF','efe314b6-8ab6-472f-b85d-84f42eaa90f7')
+;
+
+-- Nov 3, 2018, 6:30:37 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202784,11,0,'Y',TO_DATE('2018-11-03 18:30:36','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:36','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','CMB','72407fd7-1c3d-4e73-a33d-4ebe6ffd8720')
+;
+
+-- Nov 3, 2018, 6:30:37 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202785,11,0,'Y',TO_DATE('2018-11-03 18:30:37','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:37','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','API','8906097e-232d-4e83-b2d7-8ebd92147108')
+;
+
+-- Nov 3, 2018, 6:30:38 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202786,11,0,'Y',TO_DATE('2018-11-03 18:30:37','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:37','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','APC','359271f6-95fe-4aaa-84a2-3feff0c3f251')
+;
+
+-- Nov 3, 2018, 6:30:38 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202787,11,0,'Y',TO_DATE('2018-11-03 18:30:38','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:38','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','GLJ','7e6919d5-448c-440a-ae2c-bd444d0f9ed5')
+;
+
+-- Nov 3, 2018, 6:30:38 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202788,11,0,'Y',TO_DATE('2018-11-03 18:30:38','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:38','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','ARI','b2953601-6d19-4a1a-a39a-1b216806dd86')
+;
+
+-- Nov 3, 2018, 6:30:39 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202789,11,0,'Y',TO_DATE('2018-11-03 18:30:38','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:38','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','ARC','b23dc0e8-dd7a-4476-bc5c-1d3ed5296e80')
+;
+
+-- Nov 3, 2018, 6:30:39 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202790,11,0,'Y',TO_DATE('2018-11-03 18:30:39','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:39','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','ARR','f2981a11-8ea5-4a51-aecd-89902ec1026d')
+;
+
+-- Nov 3, 2018, 6:30:40 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202791,11,0,'Y',TO_DATE('2018-11-03 18:30:39','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:39','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','APP','20eebedf-4407-4924-a4cd-9854ee8d66a0')
+;
+
+-- Nov 3, 2018, 6:30:40 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202792,11,0,'Y',TO_DATE('2018-11-03 18:30:40','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:40','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','SOO','011cd26a-29f3-4c70-a2fc-d691cdfa4795')
+;
+
+-- Nov 3, 2018, 6:30:42 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202793,11,0,'Y',TO_DATE('2018-11-03 18:30:40','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:40','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','POO','44b2cbcc-e8ca-41cd-916a-15be7d71c057')
+;
+
+-- Nov 3, 2018, 6:30:42 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202794,11,0,'Y',TO_DATE('2018-11-03 18:30:42','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:42','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','HRP','e45c39ad-208d-4941-bb45-d8a047a36448')
+;
+
+-- Nov 3, 2018, 6:30:42 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202795,11,0,'Y',TO_DATE('2018-11-03 18:30:42','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:42','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','MOP','1d017c69-957c-456a-b7ab-a9368c54e8a6')
+;
+
+-- Nov 3, 2018, 6:30:43 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202796,11,0,'Y',TO_DATE('2018-11-03 18:30:42','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:42','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','MMR','b14bf7d5-2c6e-4800-a523-89bdf16c3612')
+;
+
+-- Nov 3, 2018, 6:30:43 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202797,11,0,'Y',TO_DATE('2018-11-03 18:30:43','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:43','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','MQO','57c0f424-3b1e-4ef1-bff3-d35ebaeb9dc4')
+;
+
+-- Nov 3, 2018, 6:30:44 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202798,11,0,'Y',TO_DATE('2018-11-03 18:30:43','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:43','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','DOO','e033dc5b-1d62-4de1-932f-3ab3db6e5f00')
+;
+
+-- Nov 3, 2018, 6:30:44 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202799,11,0,'Y',TO_DATE('2018-11-03 18:30:44','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:44','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','CMA','fd08ee09-496f-4f71-9c5a-952ac12dd540')
+;
+
+-- Nov 3, 2018, 6:30:47 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202800,11,0,'Y',TO_DATE('2018-11-03 18:30:44','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:44','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','MMM','9786523b-e1d8-423e-a7b0-cef68bc32b60')
+;
+
+-- Nov 3, 2018, 6:30:48 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202801,11,0,'Y',TO_DATE('2018-11-03 18:30:47','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:47','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','POR','e4527b61-0c3b-4584-8f8e-6dc962709450')
+;
+
+-- Nov 3, 2018, 6:30:48 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202802,11,0,'Y',TO_DATE('2018-11-03 18:30:48','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:48','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','MOF','136ae13d-88fd-4ec3-9f73-8e29c042f8cd')
+;
+
+-- Nov 3, 2018, 6:30:49 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202803,11,0,'Y',TO_DATE('2018-11-03 18:30:48','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:48','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','MCC','ab5807b5-706d-43ba-b269-ae630aed8dc4')
+;
+
+-- Nov 3, 2018, 6:30:49 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202804,11,0,'Y',TO_DATE('2018-11-03 18:30:49','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:49','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','MMI','ef653a9b-dcff-4a97-9d50-ae81ba118c85')
+;
+
+-- Nov 3, 2018, 6:30:50 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202805,11,0,'Y',TO_DATE('2018-11-03 18:30:49','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:49','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','FAA','5b629c7c-d351-4592-92bf-5439be27ebd5')
+;
+
+-- Nov 3, 2018, 6:30:50 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202806,11,0,'Y',TO_DATE('2018-11-03 18:30:50','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:50','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','FDP','27668620-4bea-4d3d-86b0-ee30077dcb0f')
+;
+
+-- Nov 3, 2018, 6:30:50 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202807,11,0,'Y',TO_DATE('2018-11-03 18:30:50','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:50','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','FAD','2d60f230-4967-40ca-aa31-0161a199888d')
+;
+
+-- Nov 3, 2018, 6:30:54 PM CET
+INSERT INTO C_Period (Name,StartDate,C_Period_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,PeriodNo,C_Year_ID,PeriodType,EndDate,Processing,C_Period_UU) VALUES ('Jul-19',TO_DATE('2019-07-01','YYYY-MM-DD'),200090,11,0,'Y',TO_DATE('2018-11-03 18:30:50','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:50','YYYY-MM-DD HH24:MI:SS'),100,7,200007,'S',TO_DATE('2019-07-31','YYYY-MM-DD'),'N','08961d2a-6cd4-4dbe-aab3-b517b2a7f3bd')
+;
+
+-- Nov 3, 2018, 6:30:54 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202808,11,0,'Y',TO_DATE('2018-11-03 18:30:54','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:54','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','MMS','30d83752-5a0b-4659-b9aa-30e6857a9a07')
+;
+
+-- Nov 3, 2018, 6:30:55 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202809,11,0,'Y',TO_DATE('2018-11-03 18:30:54','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:54','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','PJI','e502f2ac-3752-40db-84a1-bf120df5a846')
+;
+
+-- Nov 3, 2018, 6:30:55 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202810,11,0,'Y',TO_DATE('2018-11-03 18:30:55','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:55','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','MXI','6b5aee88-388b-44e0-b464-099e559ce413')
+;
+
+-- Nov 3, 2018, 6:30:55 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202811,11,0,'Y',TO_DATE('2018-11-03 18:30:55','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:55','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','MMP','e32affe3-1253-4fd7-bd3d-53fa657c3c7f')
+;
+
+-- Nov 3, 2018, 6:30:56 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202812,11,0,'Y',TO_DATE('2018-11-03 18:30:55','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:55','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','GLD','09acdb27-2542-42b9-91ad-a5f2a751fa8f')
+;
+
+-- Nov 3, 2018, 6:30:56 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202813,11,0,'Y',TO_DATE('2018-11-03 18:30:56','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:56','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','CMC','3cf9b315-b5e7-4db7-ba55-637a0433206e')
+;
+
+-- Nov 3, 2018, 6:31:00 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202814,11,0,'Y',TO_DATE('2018-11-03 18:30:56','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:30:56','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','MXP','e0f35533-97b3-4bfb-8f9f-466c9aabc1a1')
+;
+
+-- Nov 3, 2018, 6:31:00 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202815,11,0,'Y',TO_DATE('2018-11-03 18:31:00','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:00','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','ARF','0eecad33-5f71-4620-b506-c048399bb9b6')
+;
+
+-- Nov 3, 2018, 6:31:01 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202816,11,0,'Y',TO_DATE('2018-11-03 18:31:00','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:00','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','CMB','3c19cc70-e367-4e6f-8b89-6ffd39b4ff26')
+;
+
+-- Nov 3, 2018, 6:31:01 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202817,11,0,'Y',TO_DATE('2018-11-03 18:31:01','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:01','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','API','07f7ed8f-964d-43c6-bc06-6eaa8bf5adc9')
+;
+
+-- Nov 3, 2018, 6:31:01 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202818,11,0,'Y',TO_DATE('2018-11-03 18:31:01','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:01','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','APC','9b709279-ee53-4521-b028-cda911031c66')
+;
+
+-- Nov 3, 2018, 6:31:02 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202819,11,0,'Y',TO_DATE('2018-11-03 18:31:01','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:01','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','GLJ','c610493b-9b29-42b1-b4cd-491644de1161')
+;
+
+-- Nov 3, 2018, 6:31:02 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202820,11,0,'Y',TO_DATE('2018-11-03 18:31:02','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:02','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','ARI','592f028b-102f-4deb-85b2-543931043b96')
+;
+
+-- Nov 3, 2018, 6:31:03 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202821,11,0,'Y',TO_DATE('2018-11-03 18:31:02','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:02','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','ARC','5f4b9e59-f5ac-4275-acc9-2f6729b1a71e')
+;
+
+-- Nov 3, 2018, 6:31:06 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202822,11,0,'Y',TO_DATE('2018-11-03 18:31:03','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:03','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','ARR','c446d5c6-42bc-4b3b-b468-fa3242ce74b0')
+;
+
+-- Nov 3, 2018, 6:31:07 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202823,11,0,'Y',TO_DATE('2018-11-03 18:31:06','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:06','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','APP','fa3cc108-93f3-4355-97f5-993dd5a10d87')
+;
+
+-- Nov 3, 2018, 6:31:07 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202824,11,0,'Y',TO_DATE('2018-11-03 18:31:07','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:07','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','SOO','23a610fe-e257-443a-970f-4b71dc0a21e4')
+;
+
+-- Nov 3, 2018, 6:31:07 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202825,11,0,'Y',TO_DATE('2018-11-03 18:31:07','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:07','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','POO','88ff1867-8885-43d6-87b5-0106f77b4806')
+;
+
+-- Nov 3, 2018, 6:31:08 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202826,11,0,'Y',TO_DATE('2018-11-03 18:31:07','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:07','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','HRP','21d58356-1273-496b-948a-d9801e7ab142')
+;
+
+-- Nov 3, 2018, 6:31:08 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202827,11,0,'Y',TO_DATE('2018-11-03 18:31:08','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:08','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','MOP','f60d0903-990c-484b-b0a7-7dd588c66aac')
+;
+
+-- Nov 3, 2018, 6:31:09 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202828,11,0,'Y',TO_DATE('2018-11-03 18:31:08','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:08','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','MMR','4e9254a4-c402-4f63-b8b2-5a288407f9b4')
+;
+
+-- Nov 3, 2018, 6:31:12 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202829,11,0,'Y',TO_DATE('2018-11-03 18:31:09','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:09','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','MQO','ff6d11a5-052a-4ce2-b3d2-29787e02daa4')
+;
+
+-- Nov 3, 2018, 6:31:13 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202830,11,0,'Y',TO_DATE('2018-11-03 18:31:12','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:12','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','DOO','2c4e04c7-6bdf-465a-b54f-1c7ee32ecde6')
+;
+
+-- Nov 3, 2018, 6:31:13 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202831,11,0,'Y',TO_DATE('2018-11-03 18:31:13','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:13','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','CMA','2f6713cb-1248-4205-8082-80ed0c062f07')
+;
+
+-- Nov 3, 2018, 6:31:13 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202832,11,0,'Y',TO_DATE('2018-11-03 18:31:13','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:13','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','MMM','ffd61d59-00a5-4cf3-b362-c4eada44cae7')
+;
+
+-- Nov 3, 2018, 6:31:14 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202833,11,0,'Y',TO_DATE('2018-11-03 18:31:13','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:13','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','POR','343605e9-8f47-48b2-a01f-eca79cf70844')
+;
+
+-- Nov 3, 2018, 6:31:14 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202834,11,0,'Y',TO_DATE('2018-11-03 18:31:14','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:14','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','MOF','638ab1a1-4066-40bc-adf3-12847b2b2ddf')
+;
+
+-- Nov 3, 2018, 6:31:15 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202835,11,0,'Y',TO_DATE('2018-11-03 18:31:14','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:14','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','MCC','fabd61f3-4e0a-424b-8b25-2a05b6104b38')
+;
+
+-- Nov 3, 2018, 6:31:15 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202836,11,0,'Y',TO_DATE('2018-11-03 18:31:15','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:15','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','MMI','563d602e-79a7-4908-a9f1-8ce1d79aac49')
+;
+
+-- Nov 3, 2018, 6:31:18 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202837,11,0,'Y',TO_DATE('2018-11-03 18:31:15','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:15','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','FAA','386e9c40-aa72-412b-95a3-1b5af357b131')
+;
+
+-- Nov 3, 2018, 6:31:19 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202838,11,0,'Y',TO_DATE('2018-11-03 18:31:18','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:18','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','FDP','388b64f5-1e64-437a-9fbc-3f20c9419d4e')
+;
+
+-- Nov 3, 2018, 6:31:19 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202839,11,0,'Y',TO_DATE('2018-11-03 18:31:19','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:19','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','FAD','b6299394-e89a-4aec-b763-355cf4d3854b')
+;
+
+-- Nov 3, 2018, 6:31:20 PM CET
+INSERT INTO C_Period (Name,StartDate,C_Period_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,PeriodNo,C_Year_ID,PeriodType,EndDate,Processing,C_Period_UU) VALUES ('Aug-19',TO_DATE('2019-08-01','YYYY-MM-DD'),200091,11,0,'Y',TO_DATE('2018-11-03 18:31:19','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:19','YYYY-MM-DD HH24:MI:SS'),100,8,200007,'S',TO_DATE('2019-08-31','YYYY-MM-DD'),'N','23e07161-6a7a-48f8-9e3c-ed0b83db5b88')
+;
+
+-- Nov 3, 2018, 6:31:20 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202840,11,0,'Y',TO_DATE('2018-11-03 18:31:20','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:20','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','MMS','595f932d-ef01-4273-88f9-089bede966e8')
+;
+
+-- Nov 3, 2018, 6:31:21 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202841,11,0,'Y',TO_DATE('2018-11-03 18:31:20','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:20','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','PJI','f1e9160a-d2c7-4986-a639-7fb02570d782')
+;
+
+-- Nov 3, 2018, 6:31:21 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202842,11,0,'Y',TO_DATE('2018-11-03 18:31:21','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:21','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','MXI','824dd2fa-4340-49bc-b22a-1df01ae53aec')
+;
+
+-- Nov 3, 2018, 6:31:24 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202843,11,0,'Y',TO_DATE('2018-11-03 18:31:21','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:21','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','MMP','d348cd55-50af-426a-96f9-7f2193457e77')
+;
+
+-- Nov 3, 2018, 6:31:25 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202844,11,0,'Y',TO_DATE('2018-11-03 18:31:24','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:24','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','GLD','13a07b0e-da11-4dd0-b1c6-83a1ede2f8be')
+;
+
+-- Nov 3, 2018, 6:31:25 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202845,11,0,'Y',TO_DATE('2018-11-03 18:31:25','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:25','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','CMC','7622a6e1-84f5-49ef-81b5-1190baa0f2fd')
+;
+
+-- Nov 3, 2018, 6:31:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202846,11,0,'Y',TO_DATE('2018-11-03 18:31:25','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:25','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','MXP','639fea88-3215-4d5c-990c-251b83f4dcb7')
+;
+
+-- Nov 3, 2018, 6:31:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202847,11,0,'Y',TO_DATE('2018-11-03 18:31:26','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:26','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','ARF','da61d34b-a43b-4fa8-9486-525b156717a3')
+;
+
+-- Nov 3, 2018, 6:31:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202848,11,0,'Y',TO_DATE('2018-11-03 18:31:26','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:26','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','CMB','be4a7e6c-538d-4477-84f9-25ff7c32b4de')
+;
+
+-- Nov 3, 2018, 6:31:27 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202849,11,0,'Y',TO_DATE('2018-11-03 18:31:26','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:26','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','API','241f2d10-d7c1-4479-ab16-509fe679a4e2')
+;
+
+-- Nov 3, 2018, 6:31:27 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202850,11,0,'Y',TO_DATE('2018-11-03 18:31:27','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:27','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','APC','69439d0f-26d4-4222-9fc8-03e9b19a114d')
+;
+
+-- Nov 3, 2018, 6:31:31 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202851,11,0,'Y',TO_DATE('2018-11-03 18:31:27','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:27','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','GLJ','d8624da6-9100-480a-8f43-ff07e86e3955')
+;
+
+-- Nov 3, 2018, 6:31:31 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202852,11,0,'Y',TO_DATE('2018-11-03 18:31:31','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:31','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','ARI','f036fb49-636d-42c1-9503-dd84ba7c6d1e')
+;
+
+-- Nov 3, 2018, 6:31:31 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202853,11,0,'Y',TO_DATE('2018-11-03 18:31:31','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:31','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','ARC','9bac0bb9-438a-49e1-bb47-e4b0541f9e90')
+;
+
+-- Nov 3, 2018, 6:31:32 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202854,11,0,'Y',TO_DATE('2018-11-03 18:31:31','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:31','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','ARR','287356ce-4b3f-49e7-aedd-347d2ab8479e')
+;
+
+-- Nov 3, 2018, 6:31:32 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202855,11,0,'Y',TO_DATE('2018-11-03 18:31:32','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:32','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','APP','166bf2f8-0aee-4a4c-b1ae-a76b402af10f')
+;
+
+-- Nov 3, 2018, 6:31:33 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202856,11,0,'Y',TO_DATE('2018-11-03 18:31:32','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:32','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','SOO','adade061-a341-4ad8-81b0-1deca2a4ebf1')
+;
+
+-- Nov 3, 2018, 6:31:33 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202857,11,0,'Y',TO_DATE('2018-11-03 18:31:33','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:33','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','POO','4f8d54e9-cfa3-4ac6-9c45-49c0339d94af')
+;
+
+-- Nov 3, 2018, 6:31:37 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202858,11,0,'Y',TO_DATE('2018-11-03 18:31:33','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:33','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','HRP','c0f9c0e1-f1ca-4615-aa00-d911e1389bd8')
+;
+
+-- Nov 3, 2018, 6:31:37 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202859,11,0,'Y',TO_DATE('2018-11-03 18:31:37','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:37','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','MOP','57800308-8508-4fc1-bb00-b959a9a9739b')
+;
+
+-- Nov 3, 2018, 6:31:37 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202860,11,0,'Y',TO_DATE('2018-11-03 18:31:37','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:37','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','MMR','af5bef72-8e3c-47aa-8106-590876f42095')
+;
+
+-- Nov 3, 2018, 6:31:38 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202861,11,0,'Y',TO_DATE('2018-11-03 18:31:37','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:37','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','MQO','a856d1e6-20b1-46b3-8463-119cb025eca8')
+;
+
+-- Nov 3, 2018, 6:31:38 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202862,11,0,'Y',TO_DATE('2018-11-03 18:31:38','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:38','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','DOO','a3e8b4e6-36b7-4fea-ac6f-9dda1e06a64f')
+;
+
+-- Nov 3, 2018, 6:31:39 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202863,11,0,'Y',TO_DATE('2018-11-03 18:31:38','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:38','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','CMA','9ac55b57-698b-4924-9458-170709e375ec')
+;
+
+-- Nov 3, 2018, 6:31:39 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202864,11,0,'Y',TO_DATE('2018-11-03 18:31:39','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:39','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','MMM','74fe7665-9ffb-4462-852e-267916930381')
+;
+
+-- Nov 3, 2018, 6:31:39 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202865,11,0,'Y',TO_DATE('2018-11-03 18:31:39','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:39','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','POR','cd3d3ac4-4871-4824-824b-50a5819eed2e')
+;
+
+-- Nov 3, 2018, 6:31:43 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202866,11,0,'Y',TO_DATE('2018-11-03 18:31:39','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:39','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','MOF','8f2e86bb-ad52-4d9a-b4d1-dc9ba743109a')
+;
+
+-- Nov 3, 2018, 6:31:43 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202867,11,0,'Y',TO_DATE('2018-11-03 18:31:43','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:43','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','MCC','dfff7f86-6cab-4445-987b-32b44072c519')
+;
+
+-- Nov 3, 2018, 6:31:44 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202868,11,0,'Y',TO_DATE('2018-11-03 18:31:43','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:43','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','MMI','37c8726f-5b4c-4d2b-8662-cc1114847d88')
+;
+
+-- Nov 3, 2018, 6:31:44 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202869,11,0,'Y',TO_DATE('2018-11-03 18:31:44','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:44','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','FAA','8056af07-a24b-4982-9b11-3c8a7b9eee4d')
+;
+
+-- Nov 3, 2018, 6:31:45 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202870,11,0,'Y',TO_DATE('2018-11-03 18:31:44','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:44','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','FDP','373cdc67-b58f-4356-a6d8-834d2fadbd9c')
+;
+
+-- Nov 3, 2018, 6:31:45 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202871,11,0,'Y',TO_DATE('2018-11-03 18:31:45','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:45','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','FAD','6866714a-637d-44b8-868f-d35057bb2649')
+;
+
+-- Nov 3, 2018, 6:31:45 PM CET
+INSERT INTO C_Period (Name,StartDate,C_Period_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,PeriodNo,C_Year_ID,PeriodType,EndDate,Processing,C_Period_UU) VALUES ('Sep-19',TO_DATE('2019-09-01','YYYY-MM-DD'),200092,11,0,'Y',TO_DATE('2018-11-03 18:31:45','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:45','YYYY-MM-DD HH24:MI:SS'),100,9,200007,'S',TO_DATE('2019-09-30','YYYY-MM-DD'),'N','3f198ffe-3294-457e-8da2-d645c5771d16')
+;
+
+-- Nov 3, 2018, 6:31:49 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202872,11,0,'Y',TO_DATE('2018-11-03 18:31:45','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:45','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','MMS','f8f3344b-4b14-47d6-b1e7-a67c63769f3a')
+;
+
+-- Nov 3, 2018, 6:31:49 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202873,11,0,'Y',TO_DATE('2018-11-03 18:31:49','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:49','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','PJI','a057f9bf-b870-4728-83c4-6c0a0fa70ef9')
+;
+
+-- Nov 3, 2018, 6:31:50 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202874,11,0,'Y',TO_DATE('2018-11-03 18:31:49','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:49','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','MXI','5bbcf581-90fb-427c-8925-5ebc90583f9d')
+;
+
+-- Nov 3, 2018, 6:31:50 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202875,11,0,'Y',TO_DATE('2018-11-03 18:31:50','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:50','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','MMP','17105351-84ca-42bf-b1e6-8a1f3ac51f82')
+;
+
+-- Nov 3, 2018, 6:31:51 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202876,11,0,'Y',TO_DATE('2018-11-03 18:31:50','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:50','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','GLD','65a438c5-3bdc-4e5e-b409-7fa457b91177')
+;
+
+-- Nov 3, 2018, 6:31:51 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202877,11,0,'Y',TO_DATE('2018-11-03 18:31:51','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:51','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','CMC','e30b1228-143f-4955-a02b-4a77c62bacb3')
+;
+
+-- Nov 3, 2018, 6:31:51 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202878,11,0,'Y',TO_DATE('2018-11-03 18:31:51','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:51','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','MXP','edc91647-da0e-42ff-b760-e4fce6c8628d')
+;
+
+-- Nov 3, 2018, 6:31:52 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202879,11,0,'Y',TO_DATE('2018-11-03 18:31:51','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:51','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','ARF','5b2790b2-5aba-4537-9b76-f8079984c1ea')
+;
+
+-- Nov 3, 2018, 6:31:55 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202880,11,0,'Y',TO_DATE('2018-11-03 18:31:52','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:52','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','CMB','681c2660-4427-4452-aa1e-d1b917cdedbb')
+;
+
+-- Nov 3, 2018, 6:31:56 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202881,11,0,'Y',TO_DATE('2018-11-03 18:31:55','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:55','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','API','a976dabe-f520-4812-b097-c70b225311e4')
+;
+
+-- Nov 3, 2018, 6:31:56 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202882,11,0,'Y',TO_DATE('2018-11-03 18:31:56','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:56','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','APC','b8d1fb0c-9d42-4c10-b634-0ce863d0d40d')
+;
+
+-- Nov 3, 2018, 6:31:56 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202883,11,0,'Y',TO_DATE('2018-11-03 18:31:56','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:56','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','GLJ','7372f322-2f6f-4b7a-a5d3-1550b42c5251')
+;
+
+-- Nov 3, 2018, 6:31:57 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202884,11,0,'Y',TO_DATE('2018-11-03 18:31:56','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:56','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','ARI','e94dff45-d3bc-489a-82e5-f624793678c9')
+;
+
+-- Nov 3, 2018, 6:31:57 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202885,11,0,'Y',TO_DATE('2018-11-03 18:31:57','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:57','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','ARC','e967420d-94a9-4631-9ac7-d23d4d2188d3')
+;
+
+-- Nov 3, 2018, 6:31:58 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202886,11,0,'Y',TO_DATE('2018-11-03 18:31:57','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:57','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','ARR','b552ba89-ac13-4b6a-9fe8-dd20b3be02b5')
+;
+
+-- Nov 3, 2018, 6:32:01 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202887,11,0,'Y',TO_DATE('2018-11-03 18:31:58','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:31:58','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','APP','1c28663b-d352-48a8-a165-4c692b835ed0')
+;
+
+-- Nov 3, 2018, 6:32:02 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202888,11,0,'Y',TO_DATE('2018-11-03 18:32:01','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:01','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','SOO','23958ff8-6a8c-4cc0-89b7-aebbdbed6c87')
+;
+
+-- Nov 3, 2018, 6:32:02 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202889,11,0,'Y',TO_DATE('2018-11-03 18:32:02','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:02','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','POO','82138d0f-50e3-4ac6-bb44-614d55c3d6c3')
+;
+
+-- Nov 3, 2018, 6:32:02 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202890,11,0,'Y',TO_DATE('2018-11-03 18:32:02','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:02','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','HRP','245c4b41-c774-4a88-b548-fde68922cb5f')
+;
+
+-- Nov 3, 2018, 6:32:03 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202891,11,0,'Y',TO_DATE('2018-11-03 18:32:02','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:02','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','MOP','64c3db1e-4a6c-4df5-a196-cd8e52a02d74')
+;
+
+-- Nov 3, 2018, 6:32:03 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202892,11,0,'Y',TO_DATE('2018-11-03 18:32:03','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:03','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','MMR','4485bf3c-2e33-48cb-bdec-0325bf63b506')
+;
+
+-- Nov 3, 2018, 6:32:04 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202893,11,0,'Y',TO_DATE('2018-11-03 18:32:03','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:03','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','MQO','7ee80659-be67-411a-9c45-c53fa38d7056')
+;
+
+-- Nov 3, 2018, 6:32:04 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202894,11,0,'Y',TO_DATE('2018-11-03 18:32:04','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:04','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','DOO','0ee49434-ab21-414c-bb9e-729137d247c9')
+;
+
+-- Nov 3, 2018, 6:32:08 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202895,11,0,'Y',TO_DATE('2018-11-03 18:32:04','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:04','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','CMA','9290ee77-ce2d-42fc-95ef-005ae123c12f')
+;
+
+-- Nov 3, 2018, 6:32:08 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202896,11,0,'Y',TO_DATE('2018-11-03 18:32:08','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:08','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','MMM','c128cb4a-6200-4055-bfd1-35af9e61a24a')
+;
+
+-- Nov 3, 2018, 6:32:08 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202897,11,0,'Y',TO_DATE('2018-11-03 18:32:08','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:08','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','POR','2232b6f4-0088-403b-bfd5-a0bc0415423c')
+;
+
+-- Nov 3, 2018, 6:32:09 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202898,11,0,'Y',TO_DATE('2018-11-03 18:32:08','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:08','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','MOF','0d1d4590-41c4-4ab7-939c-88ab65c71978')
+;
+
+-- Nov 3, 2018, 6:32:09 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202899,11,0,'Y',TO_DATE('2018-11-03 18:32:09','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:09','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','MCC','536db762-2c52-4200-8598-ecbe8f77a3a2')
+;
+
+-- Nov 3, 2018, 6:32:10 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202900,11,0,'Y',TO_DATE('2018-11-03 18:32:09','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:09','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','MMI','c1ac44fd-9a3a-46e5-993a-15d02fe6a30a')
+;
+
+-- Nov 3, 2018, 6:32:10 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202901,11,0,'Y',TO_DATE('2018-11-03 18:32:10','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:10','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','FAA','3359ab35-f3e5-4d80-9cb1-2f8757391f70')
+;
+
+-- Nov 3, 2018, 6:32:13 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202902,11,0,'Y',TO_DATE('2018-11-03 18:32:10','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:10','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','FDP','b889ee45-e1b3-4efd-a539-6661ee88a6d2')
+;
+
+-- Nov 3, 2018, 6:32:14 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202903,11,0,'Y',TO_DATE('2018-11-03 18:32:13','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:13','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','FAD','8ce58183-4d5a-4bb9-8d68-a56a826b2fa6')
+;
+
+-- Nov 3, 2018, 6:32:14 PM CET
+INSERT INTO C_Period (Name,StartDate,C_Period_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,PeriodNo,C_Year_ID,PeriodType,EndDate,Processing,C_Period_UU) VALUES ('Oct-19',TO_DATE('2019-10-01','YYYY-MM-DD'),200093,11,0,'Y',TO_DATE('2018-11-03 18:32:14','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:14','YYYY-MM-DD HH24:MI:SS'),100,10,200007,'S',TO_DATE('2019-10-31','YYYY-MM-DD'),'N','8f745925-1edb-46b1-a351-6ea1dcbdb387')
+;
+
+-- Nov 3, 2018, 6:32:15 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202904,11,0,'Y',TO_DATE('2018-11-03 18:32:14','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:14','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','MMS','5e391f97-b879-47b7-baef-567424b7226e')
+;
+
+-- Nov 3, 2018, 6:32:15 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202905,11,0,'Y',TO_DATE('2018-11-03 18:32:15','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:15','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','PJI','2d266c24-b591-4426-8c62-2f734f911b6b')
+;
+
+-- Nov 3, 2018, 6:32:16 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202906,11,0,'Y',TO_DATE('2018-11-03 18:32:15','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:15','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','MXI','63ba3abc-158c-4159-abab-6333aea59dce')
+;
+
+-- Nov 3, 2018, 6:32:16 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202907,11,0,'Y',TO_DATE('2018-11-03 18:32:16','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:16','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','MMP','98de7fa7-08a2-492a-88c7-820762806905')
+;
+
+-- Nov 3, 2018, 6:32:16 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202908,11,0,'Y',TO_DATE('2018-11-03 18:32:16','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:16','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','GLD','ca9acd2e-6dd9-40f0-9392-e7f1986e65bc')
+;
+
+-- Nov 3, 2018, 6:32:20 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202909,11,0,'Y',TO_DATE('2018-11-03 18:32:16','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:16','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','CMC','7767d14b-8b93-4ab2-ba24-ae8f73f34f05')
+;
+
+-- Nov 3, 2018, 6:32:20 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202910,11,0,'Y',TO_DATE('2018-11-03 18:32:20','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:20','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','MXP','1d4c2633-a08a-424a-9add-00d7ec32dfe8')
+;
+
+-- Nov 3, 2018, 6:32:21 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202911,11,0,'Y',TO_DATE('2018-11-03 18:32:20','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:20','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','ARF','0bb552cf-b321-4c74-a7c9-b7ffa9deffde')
+;
+
+-- Nov 3, 2018, 6:32:21 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202912,11,0,'Y',TO_DATE('2018-11-03 18:32:21','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:21','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','CMB','7a4454f6-b61d-4b33-b130-15943eb8e321')
+;
+
+-- Nov 3, 2018, 6:32:21 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202913,11,0,'Y',TO_DATE('2018-11-03 18:32:21','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:21','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','API','7adc28fa-0edb-44b0-be05-9fcade6b736f')
+;
+
+-- Nov 3, 2018, 6:32:22 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202914,11,0,'Y',TO_DATE('2018-11-03 18:32:21','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:21','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','APC','10967451-86e1-4f03-902a-3552289db1d9')
+;
+
+-- Nov 3, 2018, 6:32:22 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202915,11,0,'Y',TO_DATE('2018-11-03 18:32:22','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:22','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','GLJ','0a07fb50-41ff-4955-87d8-881d89e7d96d')
+;
+
+-- Nov 3, 2018, 6:32:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202916,11,0,'Y',TO_DATE('2018-11-03 18:32:22','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:22','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','ARI','f4b362d7-11c2-4d4d-a531-447797e783fd')
+;
+
+-- Nov 3, 2018, 6:32:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202917,11,0,'Y',TO_DATE('2018-11-03 18:32:26','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:26','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','ARC','a4631932-dbc4-4558-9095-f546ded1f8d0')
+;
+
+-- Nov 3, 2018, 6:32:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202918,11,0,'Y',TO_DATE('2018-11-03 18:32:26','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:26','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','ARR','36753164-8a0c-4f68-bca6-a9c16b8befb8')
+;
+
+-- Nov 3, 2018, 6:32:27 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202919,11,0,'Y',TO_DATE('2018-11-03 18:32:26','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:26','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','APP','557460c6-659f-4712-a0b3-120d2fe544f6')
+;
+
+-- Nov 3, 2018, 6:32:27 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202920,11,0,'Y',TO_DATE('2018-11-03 18:32:27','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:27','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','SOO','0c5801fe-b7dc-44b1-b3ea-5bfd8551ad66')
+;
+
+-- Nov 3, 2018, 6:32:28 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202921,11,0,'Y',TO_DATE('2018-11-03 18:32:27','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:27','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','POO','37485d0e-d695-4a64-a2d1-5facf6d72c64')
+;
+
+-- Nov 3, 2018, 6:32:28 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202922,11,0,'Y',TO_DATE('2018-11-03 18:32:28','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:28','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','HRP','4f66f942-14ff-4808-9735-c16e17f4c0d6')
+;
+
+-- Nov 3, 2018, 6:32:29 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202923,11,0,'Y',TO_DATE('2018-11-03 18:32:28','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:28','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','MOP','85bb9117-1009-4b53-9053-0f8af0cc7892')
+;
+
+-- Nov 3, 2018, 6:32:32 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202924,11,0,'Y',TO_DATE('2018-11-03 18:32:29','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:29','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','MMR','573e5db2-6bd9-4198-9b27-0ffcf6969c09')
+;
+
+-- Nov 3, 2018, 6:32:33 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202925,11,0,'Y',TO_DATE('2018-11-03 18:32:32','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:32','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','MQO','6a316aae-ffb6-48a2-bfaa-1bf1dab218ef')
+;
+
+-- Nov 3, 2018, 6:32:33 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202926,11,0,'Y',TO_DATE('2018-11-03 18:32:33','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:33','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','DOO','62f50ad3-7f45-4388-a387-bafc34b0b030')
+;
+
+-- Nov 3, 2018, 6:32:34 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202927,11,0,'Y',TO_DATE('2018-11-03 18:32:33','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:33','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','CMA','dfbcf41e-39ea-4abe-880b-724d7a2b9ebe')
+;
+
+-- Nov 3, 2018, 6:32:34 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202928,11,0,'Y',TO_DATE('2018-11-03 18:32:34','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:34','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','MMM','e8eeffc7-8365-4b3b-b9be-38ce7b545c9a')
+;
+
+-- Nov 3, 2018, 6:32:35 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202929,11,0,'Y',TO_DATE('2018-11-03 18:32:34','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:34','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','POR','c7b04c4e-76c5-4a9d-8f17-56d5fcb3bf66')
+;
+
+-- Nov 3, 2018, 6:32:36 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202930,11,0,'Y',TO_DATE('2018-11-03 18:32:35','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:35','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','MOF','ec7664ac-621a-4853-8152-e9612540ff63')
+;
+
+-- Nov 3, 2018, 6:32:36 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202931,11,0,'Y',TO_DATE('2018-11-03 18:32:36','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:36','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','MCC','102cf2c2-08ec-4458-8fc1-1645e47ac92c')
+;
+
+-- Nov 3, 2018, 6:32:37 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202932,11,0,'Y',TO_DATE('2018-11-03 18:32:36','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:36','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','MMI','ec28540b-86ec-44ef-9022-5dedd928683e')
+;
+
+-- Nov 3, 2018, 6:32:38 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202933,11,0,'Y',TO_DATE('2018-11-03 18:32:37','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:37','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','FAA','e11452e2-3bc0-4221-bb50-146fba085541')
+;
+
+-- Nov 3, 2018, 6:32:38 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202934,11,0,'Y',TO_DATE('2018-11-03 18:32:38','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:38','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','FDP','b57f170d-91de-4a98-88c4-0fe1ee89961e')
+;
+
+-- Nov 3, 2018, 6:32:39 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202935,11,0,'Y',TO_DATE('2018-11-03 18:32:38','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:38','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','FAD','1b770d01-b25f-4ab8-abae-c8f33889b869')
+;
+
+-- Nov 3, 2018, 6:32:39 PM CET
+INSERT INTO C_Period (Name,StartDate,C_Period_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,PeriodNo,C_Year_ID,PeriodType,EndDate,Processing,C_Period_UU) VALUES ('Nov-19',TO_DATE('2019-11-01','YYYY-MM-DD'),200094,11,0,'Y',TO_DATE('2018-11-03 18:32:39','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:39','YYYY-MM-DD HH24:MI:SS'),100,11,200007,'S',TO_DATE('2019-11-30','YYYY-MM-DD'),'N','cb61d333-1016-4dfb-b35f-251dedb37c49')
+;
+
+-- Nov 3, 2018, 6:32:40 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202936,11,0,'Y',TO_DATE('2018-11-03 18:32:39','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:39','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','MMS','39f3c970-4817-4d05-bcb2-df649473faab')
+;
+
+-- Nov 3, 2018, 6:32:40 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202937,11,0,'Y',TO_DATE('2018-11-03 18:32:40','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:40','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','PJI','b3452193-5d50-4355-8269-b452609246b7')
+;
+
+-- Nov 3, 2018, 6:32:41 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202938,11,0,'Y',TO_DATE('2018-11-03 18:32:40','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:40','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','MXI','690a16ed-5f4f-4bea-a0ba-2eedcf439387')
+;
+
+-- Nov 3, 2018, 6:32:41 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202939,11,0,'Y',TO_DATE('2018-11-03 18:32:41','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:41','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','MMP','53b53f52-afc4-4342-be95-40a7ea318086')
+;
+
+-- Nov 3, 2018, 6:32:41 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202940,11,0,'Y',TO_DATE('2018-11-03 18:32:41','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:41','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','GLD','db2207b7-baa4-4759-b132-811fc267bfe3')
+;
+
+-- Nov 3, 2018, 6:32:42 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202941,11,0,'Y',TO_DATE('2018-11-03 18:32:41','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:41','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','CMC','233665ae-7656-47f8-a7fb-90a92de3ac79')
+;
+
+-- Nov 3, 2018, 6:32:42 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202942,11,0,'Y',TO_DATE('2018-11-03 18:32:42','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:42','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','MXP','16d55999-0802-434f-9a48-a88bcec2a025')
+;
+
+-- Nov 3, 2018, 6:32:43 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202943,11,0,'Y',TO_DATE('2018-11-03 18:32:42','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:42','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','ARF','4b446816-d026-4b0d-8411-673ac06e2dd7')
+;
+
+-- Nov 3, 2018, 6:32:43 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202944,11,0,'Y',TO_DATE('2018-11-03 18:32:43','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:43','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','CMB','55271d7d-7506-4077-a7ff-558b7d69dabc')
+;
+
+-- Nov 3, 2018, 6:32:47 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202945,11,0,'Y',TO_DATE('2018-11-03 18:32:43','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:43','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','API','77d9e50d-a301-4a4e-9b18-74be80f6a348')
+;
+
+-- Nov 3, 2018, 6:32:47 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202946,11,0,'Y',TO_DATE('2018-11-03 18:32:47','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:47','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','APC','24276f30-71dc-47b6-8dbb-f934d05053ed')
+;
+
+-- Nov 3, 2018, 6:32:48 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202947,11,0,'Y',TO_DATE('2018-11-03 18:32:47','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:47','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','GLJ','f331dd15-800c-4976-b382-2415cd5b9390')
+;
+
+-- Nov 3, 2018, 6:32:48 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202948,11,0,'Y',TO_DATE('2018-11-03 18:32:48','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:48','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','ARI','9ae9393f-2289-42e4-88aa-783d42bbeb54')
+;
+
+-- Nov 3, 2018, 6:32:49 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202949,11,0,'Y',TO_DATE('2018-11-03 18:32:48','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:48','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','ARC','265ebaf0-3d14-479c-b0d2-6ab012e7d0e0')
+;
+
+-- Nov 3, 2018, 6:32:49 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202950,11,0,'Y',TO_DATE('2018-11-03 18:32:49','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:49','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','ARR','3444bbcc-5ab6-40d9-8d31-0587f768de32')
+;
+
+-- Nov 3, 2018, 6:32:50 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202951,11,0,'Y',TO_DATE('2018-11-03 18:32:49','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:49','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','APP','b73237e1-b5cc-42f8-b72f-4f8a1c8567f4')
+;
+
+-- Nov 3, 2018, 6:32:50 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202952,11,0,'Y',TO_DATE('2018-11-03 18:32:50','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:50','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','SOO','0888f44e-35ba-4602-beac-9f8b496c13c0')
+;
+
+-- Nov 3, 2018, 6:32:51 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202953,11,0,'Y',TO_DATE('2018-11-03 18:32:50','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:50','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','POO','409ceccb-62a2-4b4f-925d-50e234ea5a08')
+;
+
+-- Nov 3, 2018, 6:32:51 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202954,11,0,'Y',TO_DATE('2018-11-03 18:32:51','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:51','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','HRP','661dc7f2-cace-49c4-bb5a-bc6adbc17ffe')
+;
+
+-- Nov 3, 2018, 6:32:52 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202955,11,0,'Y',TO_DATE('2018-11-03 18:32:51','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:51','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','MOP','2abf8f34-cb23-4161-ba1e-a6de107a0808')
+;
+
+-- Nov 3, 2018, 6:32:52 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202956,11,0,'Y',TO_DATE('2018-11-03 18:32:52','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:52','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','MMR','acebaf72-5120-4dfa-aca0-1f2f5f9d0a4c')
+;
+
+-- Nov 3, 2018, 6:32:53 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202957,11,0,'Y',TO_DATE('2018-11-03 18:32:52','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:52','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','MQO','636cf966-d50e-4016-a3e0-78db0f178369')
+;
+
+-- Nov 3, 2018, 6:32:54 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202958,11,0,'Y',TO_DATE('2018-11-03 18:32:53','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:53','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','DOO','a1c0f095-35a8-430f-b4e6-2997ff50458e')
+;
+
+-- Nov 3, 2018, 6:32:54 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202959,11,0,'Y',TO_DATE('2018-11-03 18:32:54','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:54','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','CMA','5fc55538-d126-495b-9404-2dd3d7701066')
+;
+
+-- Nov 3, 2018, 6:32:55 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202960,11,0,'Y',TO_DATE('2018-11-03 18:32:54','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:54','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','MMM','102a58b2-b38a-4466-a238-fe0b84e4c631')
+;
+
+-- Nov 3, 2018, 6:32:55 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202961,11,0,'Y',TO_DATE('2018-11-03 18:32:55','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:55','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','POR','b966270a-1a21-4a21-b9ef-5b0c441c407b')
+;
+
+-- Nov 3, 2018, 6:32:55 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202962,11,0,'Y',TO_DATE('2018-11-03 18:32:55','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:55','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','MOF','de32e094-da89-4d46-a714-593cd9dce985')
+;
+
+-- Nov 3, 2018, 6:32:56 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202963,11,0,'Y',TO_DATE('2018-11-03 18:32:55','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:55','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','MCC','844a68b1-4171-4f72-92df-1cf087efcf6a')
+;
+
+-- Nov 3, 2018, 6:32:59 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202964,11,0,'Y',TO_DATE('2018-11-03 18:32:56','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:56','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','MMI','4cad329b-1c14-4a51-b2f6-00ad93174b46')
+;
+
+-- Nov 3, 2018, 6:33:00 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202965,11,0,'Y',TO_DATE('2018-11-03 18:32:59','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:32:59','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','FAA','044cd7b6-fdc4-4585-875c-14e4eef5b29e')
+;
+
+-- Nov 3, 2018, 6:33:00 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202966,11,0,'Y',TO_DATE('2018-11-03 18:33:00','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:00','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','FDP','41786f3f-9af9-4445-a9f0-8cdf7c089395')
+;
+
+-- Nov 3, 2018, 6:33:01 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202967,11,0,'Y',TO_DATE('2018-11-03 18:33:00','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:00','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','FAD','d04f0ce6-9b8a-4cf1-a7b9-8ff623f80825')
+;
+
+-- Nov 3, 2018, 6:33:01 PM CET
+INSERT INTO C_Period (Name,StartDate,C_Period_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,PeriodNo,C_Year_ID,PeriodType,EndDate,Processing,C_Period_UU) VALUES ('Dec-19',TO_DATE('2019-12-01','YYYY-MM-DD'),200095,11,0,'Y',TO_DATE('2018-11-03 18:33:01','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:01','YYYY-MM-DD HH24:MI:SS'),100,12,200007,'S',TO_DATE('2019-12-31','YYYY-MM-DD'),'N','9c3be9f0-2ffa-49b5-8fad-e26e01fd8c6e')
+;
+
+-- Nov 3, 2018, 6:33:02 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202968,11,0,'Y',TO_DATE('2018-11-03 18:33:01','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:01','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','MMS','0e6aad49-a360-4589-8ac4-2e8a51637097')
+;
+
+-- Nov 3, 2018, 6:33:02 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202969,11,0,'Y',TO_DATE('2018-11-03 18:33:02','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:02','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','PJI','3a4bda49-8603-43a4-9b26-c069a82b25f8')
+;
+
+-- Nov 3, 2018, 6:33:02 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202970,11,0,'Y',TO_DATE('2018-11-03 18:33:02','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:02','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','MXI','3b449f47-f85a-40ce-a97a-521f1f98dce3')
+;
+
+-- Nov 3, 2018, 6:33:03 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202971,11,0,'Y',TO_DATE('2018-11-03 18:33:02','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:02','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','MMP','43f1b437-5ce3-4cc6-8be1-971ac51b1d1d')
+;
+
+-- Nov 3, 2018, 6:33:06 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202972,11,0,'Y',TO_DATE('2018-11-03 18:33:03','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:03','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','GLD','7d655dbb-f8db-4a82-9762-9e10c3c9cb7e')
+;
+
+-- Nov 3, 2018, 6:33:07 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202973,11,0,'Y',TO_DATE('2018-11-03 18:33:06','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:06','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','CMC','2a732160-5da8-4e68-afa2-ae21bb0ca35d')
+;
+
+-- Nov 3, 2018, 6:33:07 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202974,11,0,'Y',TO_DATE('2018-11-03 18:33:07','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:07','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','MXP','0d3c43f9-204e-48a7-ba76-ddd2bee30519')
+;
+
+-- Nov 3, 2018, 6:33:08 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202975,11,0,'Y',TO_DATE('2018-11-03 18:33:07','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:07','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','ARF','9e1f56fa-47c6-40a9-9d01-15992230b64d')
+;
+
+-- Nov 3, 2018, 6:33:08 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202976,11,0,'Y',TO_DATE('2018-11-03 18:33:08','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:08','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','CMB','b30a3645-2957-49ca-8f0f-d660473438c9')
+;
+
+-- Nov 3, 2018, 6:33:08 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202977,11,0,'Y',TO_DATE('2018-11-03 18:33:08','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:08','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','API','19348673-ca44-44d0-b155-bf90339b5dc6')
+;
+
+-- Nov 3, 2018, 6:33:12 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202978,11,0,'Y',TO_DATE('2018-11-03 18:33:08','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:08','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','APC','58e0d164-2eab-442a-aa44-7a527c62de65')
+;
+
+-- Nov 3, 2018, 6:33:12 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202979,11,0,'Y',TO_DATE('2018-11-03 18:33:12','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:12','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','GLJ','a3354de9-efd2-4e70-8379-34ad26e7c447')
+;
+
+-- Nov 3, 2018, 6:33:13 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202980,11,0,'Y',TO_DATE('2018-11-03 18:33:12','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:12','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','ARI','c78bf4e5-9c4a-4558-b8ea-db3a30964478')
+;
+
+-- Nov 3, 2018, 6:33:13 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202981,11,0,'Y',TO_DATE('2018-11-03 18:33:13','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:13','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','ARC','24bf15be-8ce6-419f-89e1-1674e0798189')
+;
+
+-- Nov 3, 2018, 6:33:13 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202982,11,0,'Y',TO_DATE('2018-11-03 18:33:13','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:13','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','ARR','859371fa-7b84-44ff-9b57-6f29eba3059c')
+;
+
+-- Nov 3, 2018, 6:33:14 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202983,11,0,'Y',TO_DATE('2018-11-03 18:33:13','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:13','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','APP','f845231e-07c5-4577-bb69-5be934fb70aa')
+;
+
+-- Nov 3, 2018, 6:33:14 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202984,11,0,'Y',TO_DATE('2018-11-03 18:33:14','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:14','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','SOO','48fce4e5-767d-4ac9-9d9c-a8aa796640b4')
+;
+
+-- Nov 3, 2018, 6:33:15 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202985,11,0,'Y',TO_DATE('2018-11-03 18:33:14','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:14','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','POO','df7cb80c-4344-4c2a-abea-65440eb05057')
+;
+
+-- Nov 3, 2018, 6:33:15 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202986,11,0,'Y',TO_DATE('2018-11-03 18:33:15','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:15','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','HRP','1a8f18e2-231d-4243-978e-f714db20661b')
+;
+
+-- Nov 3, 2018, 6:33:19 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202987,11,0,'Y',TO_DATE('2018-11-03 18:33:15','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:15','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','MOP','7aeb5d23-fcde-4351-ab04-cc4839d8c097')
+;
+
+-- Nov 3, 2018, 6:33:19 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202988,11,0,'Y',TO_DATE('2018-11-03 18:33:19','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:19','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','MMR','c8df24ab-7923-4792-bec3-39515924835f')
+;
+
+-- Nov 3, 2018, 6:33:19 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202989,11,0,'Y',TO_DATE('2018-11-03 18:33:19','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:19','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','MQO','0d9d724f-d0bc-44e9-975c-3ad18390ebcb')
+;
+
+-- Nov 3, 2018, 6:33:20 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202990,11,0,'Y',TO_DATE('2018-11-03 18:33:19','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:19','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','DOO','4f2bdd09-180a-4336-aba4-df4ea76429c2')
+;
+
+-- Nov 3, 2018, 6:33:20 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202991,11,0,'Y',TO_DATE('2018-11-03 18:33:20','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:20','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','CMA','77e25c2b-fb45-4e47-8bd4-9894f1babc46')
+;
+
+-- Nov 3, 2018, 6:33:21 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202992,11,0,'Y',TO_DATE('2018-11-03 18:33:20','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:20','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','MMM','a3813988-7081-44e2-9107-34ee81209086')
+;
+
+-- Nov 3, 2018, 6:33:24 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202993,11,0,'Y',TO_DATE('2018-11-03 18:33:21','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:21','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','POR','dfaae066-1dc2-4e1a-ba73-91ec5b6fe298')
+;
+
+-- Nov 3, 2018, 6:33:24 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202994,11,0,'Y',TO_DATE('2018-11-03 18:33:24','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:24','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','MOF','ff15297b-8f9a-4b83-b8de-ec1a12332b86')
+;
+
+-- Nov 3, 2018, 6:33:25 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202995,11,0,'Y',TO_DATE('2018-11-03 18:33:24','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:24','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','MCC','4e0a324c-a1ab-4019-a51c-0513d6b22e67')
+;
+
+-- Nov 3, 2018, 6:33:25 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202996,11,0,'Y',TO_DATE('2018-11-03 18:33:25','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:25','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','MMI','3f569005-6c1b-46dd-9f36-993105cd83ce')
+;
+
+-- Nov 3, 2018, 6:33:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202997,11,0,'Y',TO_DATE('2018-11-03 18:33:25','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:25','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','FAA','b4091f55-f911-4d16-b091-0e9ffaf5cc02')
+;
+
+-- Nov 3, 2018, 6:33:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202998,11,0,'Y',TO_DATE('2018-11-03 18:33:26','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:26','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','FDP','79fce4c6-9bda-4059-a65e-56fecdecba67')
+;
+
+-- Nov 3, 2018, 6:33:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202999,11,0,'Y',TO_DATE('2018-11-03 18:33:26','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-11-03 18:33:26','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','FAD','01ff1b75-a917-4afb-9ec3-05d9af7942ac')
+;
+
+SELECT register_migration_script('201811031833_GardenYear2019.sql') FROM dual
+;
+
diff --git a/migration/i5.1z/oracle/201811041439_Version.sql b/migration/i5.1z/oracle/201811041439_Version.sql
new file mode 100644
index 0000000000..bba7168696
--- /dev/null
+++ b/migration/i5.1z/oracle/201811041439_Version.sql
@@ -0,0 +1,12 @@
+UPDATE AD_SYSTEM
+   SET releaseno = '6.1',
+       VERSION = '2018-11-04'
+ WHERE ad_system_id = 0 AND ad_client_id = 0
+;
+
+COMMIT
+;
+
+SELECT register_migration_script('201811041439_Version.sql') FROM dual
+;
+
diff --git a/migration/i5.1z/postgresql/201809271702_IDEMPIERE-3794.sql b/migration/i5.1z/postgresql/201809271702_IDEMPIERE-3794.sql
new file mode 100644
index 0000000000..40fd2ddeee
--- /dev/null
+++ b/migration/i5.1z/postgresql/201809271702_IDEMPIERE-3794.sql
@@ -0,0 +1,92 @@
+-- IDEMPIERE-3794 Improvement to Housekeeping
+-- Sep 27, 2018 4:49:40 PM CEST
+UPDATE AD_Column SET IsMandatory='N',Updated=TO_TIMESTAMP('2018-09-27 16:49:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=56346
+;
+
+-- Sep 27, 2018 4:49:43 PM CEST
+INSERT INTO t_alter_column values('ad_housekeeping','AD_Table_ID','NUMERIC(10)',null,'NULL')
+;
+
+-- Sep 27, 2018 4:49:43 PM CEST
+INSERT INTO t_alter_column values('ad_housekeeping','AD_Table_ID',null,'NULL',null)
+;
+
+-- Sep 27, 2018 4:51:05 PM CEST
+INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,AD_Table_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Element_ID,IsUpdateable,IsSelectionColumn,EntityType,IsSyncDatabase,IsAlwaysUpdateable,MandatoryLogic,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,SeqNoSelection,IsToolbarButton,IsSecure) VALUES (213696,0,'DB Table Name','Name of the table in the database','The DB Table Name indicates the name of the table in database.',53147,'TableName',40,'N','N','N','N','N',0,'N',10,0,0,'Y',TO_TIMESTAMP('2018-09-27 16:51:04','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-09-27 16:51:04','YYYY-MM-DD HH24:MI:SS'),100,587,'Y','N','D','N','N','@AD_Table_ID@=0','N','Y','60eaa9cd-381b-4385-b4a4-245510ad0718','Y',0,'N','N')
+;
+
+-- Sep 27, 2018 4:51:16 PM CEST
+UPDATE AD_Column SET MandatoryLogic='@TableName@=''''',Updated=TO_TIMESTAMP('2018-09-27 16:51:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=56346
+;
+
+-- Sep 27, 2018 4:51:23 PM CEST
+ALTER TABLE AD_HouseKeeping ADD COLUMN TableName VARCHAR(40) DEFAULT NULL 
+;
+
+-- Sep 27, 2018 4:51:59 PM CEST
+INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,AD_Tab_ID,AD_Column_ID,IsDisplayed,DisplayLength,SeqNo,IsSameLine,IsHeading,IsFieldOnly,IsEncrypted,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsReadOnly,IsCentrallyMaintained,EntityType,AD_Field_UU,IsDisplayedGrid,SeqNoGrid,ColumnSpan) VALUES (205834,'DB Table Name','Name of the table in the database','The DB Table Name indicates the name of the table in database.',53178,213696,'Y',40,160,'N','N','N','N',0,0,'Y',TO_TIMESTAMP('2018-09-27 16:51:59','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-09-27 16:51:59','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','D','bbc73a31-615b-4045-92f9-e37a64fc5b6c','Y',160,2)
+;
+
+-- Sep 27, 2018 4:52:20 PM CEST
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=80, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=4, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205834
+;
+
+-- Sep 27, 2018 4:52:20 PM CEST
+UPDATE AD_Field SET SeqNo=90, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56367
+;
+
+-- Sep 27, 2018 4:52:20 PM CEST
+UPDATE AD_Field SET SeqNo=100, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56365
+;
+
+-- Sep 27, 2018 4:52:20 PM CEST
+UPDATE AD_Field SET SeqNo=110, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56358
+;
+
+-- Sep 27, 2018 4:52:20 PM CEST
+UPDATE AD_Field SET SeqNo=120, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56354
+;
+
+-- Sep 27, 2018 4:52:20 PM CEST
+UPDATE AD_Field SET SeqNo=130, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56364
+;
+
+-- Sep 27, 2018 4:52:20 PM CEST
+UPDATE AD_Field SET SeqNo=140, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56361
+;
+
+-- Sep 27, 2018 4:52:20 PM CEST
+UPDATE AD_Field SET SeqNo=150, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56360
+;
+
+-- Sep 27, 2018 4:52:20 PM CEST
+UPDATE AD_Field SET SeqNo=160, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56353
+;
+
+-- Sep 27, 2018 4:52:20 PM CEST
+UPDATE AD_Field SET SeqNo=0, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=204515
+;
+
+-- Sep 27, 2018 4:52:20 PM CEST
+UPDATE AD_Field SET SeqNo=0, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56359
+;
+
+-- Sep 27, 2018 4:53:13 PM CEST
+UPDATE AD_Field SET DisplayLogic='@AD_Table_ID@>0', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:53:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56358
+;
+
+-- Sep 27, 2018 4:53:21 PM CEST
+UPDATE AD_Field SET DisplayLogic='@IsExportXMLBackup@=Y & @AD_Table_ID@>0', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:53:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56354
+;
+
+-- Sep 27, 2018 4:56:14 PM CEST
+UPDATE AD_Field SET DisplayLogic='@TableName@=''''', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:56:14','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56368
+;
+
+-- Sep 27, 2018 4:56:32 PM CEST
+UPDATE AD_Field SET DisplayLogic='@AD_Table_ID@=0', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:56:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205834
+;
+
+SELECT register_migration_script('201809271702_IDEMPIERE-3794.sql') FROM dual
+;
+
diff --git a/migration/i5.1z/postgresql/201810021745_IDEMPIERE-2816.sql b/migration/i5.1z/postgresql/201810021745_IDEMPIERE-2816.sql
new file mode 100644
index 0000000000..24d212ee0f
--- /dev/null
+++ b/migration/i5.1z/postgresql/201810021745_IDEMPIERE-2816.sql
@@ -0,0 +1,101 @@
+-- Oct 2, 2018 5:20:14 PM CEST
+-- IDEMPIERE-2816/IDEMPIERE-2351 Force background/foreground based on parameters
+INSERT INTO AD_Element (AD_Element_ID,ColumnName,Help,Updated,Name,Description,PrintName,AD_Element_UU,IsActive,Created,CreatedBy,UpdatedBy,AD_Client_ID,EntityType,AD_Org_ID) VALUES (203268,'ExecutionType','Execution Type defines whether the report/process will always run in background or foreground. The System Configurator "BACKGROUND_JOB_ALLOWED" has greater precedence.',TO_TIMESTAMP('2018-10-02 17:20:14','YYYY-MM-DD HH24:MI:SS'),'Execution Type','Execution Type defines whether the report/process will always run in background or foreground. ','Execution Type','0132dcc1-96b3-427f-a057-de8a7616b2c4','Y',TO_TIMESTAMP('2018-10-02 17:20:14','YYYY-MM-DD HH24:MI:SS'),100,100,0,'D',0)
+;
+
+-- Oct 2, 2018 5:22:04 PM CEST
+INSERT INTO AD_Reference (AD_Reference_ID,Name,AD_Reference_UU,IsOrderByValue,Description,ValidationType,VFormat,Updated,IsActive,CreatedBy,UpdatedBy,AD_Client_ID,Created,EntityType,AD_Org_ID) VALUES (200157,'AD_Process Execution Type','1acef8a3-44b6-49c1-9309-d848829e3898','N','Report/Process Execution Type','L',NULL,TO_TIMESTAMP('2018-10-02 17:22:04','YYYY-MM-DD HH24:MI:SS'),'Y',100,100,0,TO_TIMESTAMP('2018-10-02 17:22:04','YYYY-MM-DD HH24:MI:SS'),'D',0)
+;
+
+-- Oct 2, 2018 5:22:47 PM CEST
+INSERT INTO AD_Ref_List (AD_Ref_List_ID,Description,AD_Ref_List_UU,Name,IsActive,CreatedBy,UpdatedBy,AD_Client_ID,Created,Updated,EntityType,AD_Reference_ID,Value,AD_Org_ID) VALUES (200438,'It forces the report/process to always run on background. This can be useful for slow reports.','24e2cb33-193c-45ca-9281-fea9752bf59f','Force Background','Y',100,100,0,TO_TIMESTAMP('2018-10-02 17:22:46','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2018-10-02 17:22:46','YYYY-MM-DD HH24:MI:SS'),'D',200157,'B',0)
+;
+
+-- Oct 2, 2018 5:23:25 PM CEST
+INSERT INTO AD_Ref_List (AD_Ref_List_ID,Description,AD_Ref_List_UU,Name,IsActive,CreatedBy,UpdatedBy,AD_Client_ID,Created,Updated,EntityType,AD_Reference_ID,Value,AD_Org_ID) VALUES (200439,'It forces the report/process to always run on foreground.','9a4c7179-17f7-4fc0-9ccb-bdcdf36488a4','Force Foreground','Y',100,100,0,TO_TIMESTAMP('2018-10-02 17:23:24','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2018-10-02 17:23:24','YYYY-MM-DD HH24:MI:SS'),'D',200157,'F',0)
+;
+
+-- Oct 2, 2018 5:24:15 PM CEST
+INSERT INTO AD_Column (AD_Column_ID,IsSyncDatabase,Version,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,Updated,IsUpdateable,ColumnName,Description,Help,Name,IsAllowCopy,IsActive,CreatedBy,UpdatedBy,IsAlwaysUpdateable,AD_Client_ID,Created,IsSecure,EntityType,IsEncrypted,AD_Element_ID,AD_Reference_Value_ID,AD_Table_ID,AD_Reference_ID,IsToolbarButton,AD_Org_ID) VALUES (213698,'N',0,'N','N','N',0,'N',1,'N','N','N','Y','11fe0ed8-bdfb-47b6-9683-2acdc05f64f7',TO_TIMESTAMP('2018-10-02 17:24:14','YYYY-MM-DD HH24:MI:SS'),'Y','ExecutionType','Execution Type defines whether the report/process will always run in background or foreground. ','Execution Type defines whether the report/process will always run in background or foreground. The System Configurator "BACKGROUND_JOB_ALLOWED" has greater precedence.','Execution Type','Y','Y',100,100,'Y',0,TO_TIMESTAMP('2018-10-02 17:24:14','YYYY-MM-DD HH24:MI:SS'),'N','D','N',203268,200157,284,17,'N',0)
+;
+
+-- Oct 2, 2018 5:28:15 PM CEST
+ALTER TABLE AD_Process ADD COLUMN ExecutionType CHAR(1) DEFAULT NULL 
+;
+
+-- Oct 2, 2018 5:28:56 PM CEST
+INSERT INTO AD_Field (SortNo,AD_Field_ID,IsEncrypted,DisplayLength,IsSameLine,IsHeading,SeqNo,IsCentrallyMaintained,IsReadOnly,Help,Updated,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,CreatedBy,UpdatedBy,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,Created,ColumnSpan,NumLines,IsAdvancedField,IsDefaultFocus,AD_Column_ID,EntityType,AD_Tab_ID,AD_Org_ID) VALUES (0,205836,'N',22,'N','N',270,'Y','N','Execution Type defines whether the report/process will always run in background or foreground. The System Configurator "BACKGROUND_JOB_ALLOWED" has greater precedence.',TO_TIMESTAMP('2018-10-02 17:28:55','YYYY-MM-DD HH24:MI:SS'),'Execution Type defines whether the report/process will always run in background or foreground. ','Execution Type','6283412f-702d-4a39-ae95-67a25ada2228','Y','N',100,100,'Y','Y',230,2,'N',0,TO_TIMESTAMP('2018-10-02 17:28:55','YYYY-MM-DD HH24:MI:SS'),2,1,'N','N',213698,'D',245,0)
+;
+
+-- Oct 2, 2018 5:29:18 PM CEST
+UPDATE AD_Field SET SeqNo=100, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 17:29:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4540
+;
+
+-- Oct 2, 2018 5:29:18 PM CEST
+UPDATE AD_Field SET SeqNo=110, AD_Val_Rule_ID=NULL, IsDisplayed='Y', XPosition=4, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 17:29:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205836
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=120, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2571
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=130, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12100
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=140, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3703
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=150, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2534
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=160, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10235
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=170, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56497
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=180, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3278
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=190, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3219
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=200, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5849
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=210, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=50155
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=220, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5850
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=230, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5851
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=240, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=50156
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=250, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201809
+;
+
+-- Oct 2, 2018 2:31:45 PM CEST
+UPDATE AD_Field SET SeqNo=260, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=57342
+;
+
+SELECT register_migration_script('201810021745_IDEMPIERE-2816.sql') FROM dual
+;
+
+
diff --git a/migration/i5.1z/postgresql/201810041316_IDEMPIERE-3799.sql b/migration/i5.1z/postgresql/201810041316_IDEMPIERE-3799.sql
new file mode 100644
index 0000000000..e81c010d23
--- /dev/null
+++ b/migration/i5.1z/postgresql/201810041316_IDEMPIERE-3799.sql
@@ -0,0 +1,121 @@
+-- Oct 2, 2018 6:52:02 PM CEST
+-- IDEMPIERE-3799 Avoid users re-running a report that is already being processed
+INSERT INTO AD_Element (AD_Element_ID,ColumnName,Help,Updated,Name,Description,PrintName,AD_Element_UU,IsActive,Created,CreatedBy,UpdatedBy,AD_Client_ID,EntityType,AD_Org_ID) VALUES (203269,'AllowMultipleExecution','1. Disallow multiple executions: Never allow to execute a process that is already running.
+2. Disallow multiple executions with the same parameters: Allow to execute a process multiple times with different parameters.
+3. When blank: Always allow to execute a process multiple times.',TO_TIMESTAMP('2018-10-02 18:52:01','YYYY-MM-DD HH24:MI:SS'),'Multiple Execution','Allow or disallow executing a process/report multiple times.','Multiple Execution','f8a79725-bf46-4682-aba8-4c1191ba9ddc','Y',TO_TIMESTAMP('2018-10-02 18:52:01','YYYY-MM-DD HH24:MI:SS'),100,100,0,'D',0)
+;
+
+-- Oct 2, 2018 6:53:12 PM CEST
+INSERT INTO AD_Reference (AD_Reference_ID,Name,AD_Reference_UU,IsOrderByValue,Description,ValidationType,VFormat,Updated,IsActive,CreatedBy,UpdatedBy,AD_Client_ID,Created,EntityType,AD_Org_ID) VALUES (200158,'AD_Process Multiple Execution','e08cde11-cfd5-45e8-9813-0e3005269c97','N','Multiple execution rule list','L',NULL,TO_TIMESTAMP('2018-10-02 18:53:11','YYYY-MM-DD HH24:MI:SS'),'Y',100,100,0,TO_TIMESTAMP('2018-10-02 18:53:11','YYYY-MM-DD HH24:MI:SS'),'D',0)
+;
+
+-- Oct 2, 2018 6:53:40 PM CEST
+INSERT INTO AD_Ref_List (AD_Ref_List_ID,Description,AD_Ref_List_UU,Name,IsActive,CreatedBy,UpdatedBy,AD_Client_ID,Created,Updated,EntityType,AD_Reference_ID,Value,AD_Org_ID) VALUES (200440,'Never allow to execute a process that is already running','cd374cc2-e928-4e76-a376-9021ec5f31e7','Disallow multiple executions','Y',100,100,0,TO_TIMESTAMP('2018-10-02 18:53:39','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2018-10-02 18:53:39','YYYY-MM-DD HH24:MI:SS'),'D',200158,'N',0)
+;
+
+-- Oct 2, 2018 6:53:58 PM CEST
+INSERT INTO AD_Ref_List (AD_Ref_List_ID,Description,AD_Ref_List_UU,Name,IsActive,CreatedBy,UpdatedBy,AD_Client_ID,Created,Updated,EntityType,AD_Reference_ID,Value,AD_Org_ID) VALUES (200441,'Allow to execute a process multiple times with different parameters.','1dcb3178-d9f5-449e-9592-5e6e29453cf1','Disallow multiple executions with the same parameters','Y',100,100,0,TO_TIMESTAMP('2018-10-02 18:53:57','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2018-10-02 18:53:57','YYYY-MM-DD HH24:MI:SS'),'D',200158,'P',0)
+;
+
+-- Oct 2, 2018 6:58:23 PM CEST
+INSERT INTO AD_Column (AD_Column_ID,IsSyncDatabase,Version,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,Updated,IsUpdateable,ColumnName,Description,DefaultValue,Help,Name,IsAllowCopy,IsActive,CreatedBy,UpdatedBy,IsAlwaysUpdateable,AD_Client_ID,Created,IsSecure,EntityType,IsEncrypted,AD_Element_ID,AD_Reference_Value_ID,AD_Table_ID,AD_Reference_ID,IsToolbarButton,AD_Org_ID) VALUES (213699,'N',0,'N','N','N',0,'N',1,'N','N','N','Y','2996d521-d5f3-4b8f-b93d-fab92a71b406',TO_TIMESTAMP('2018-10-02 18:58:23','YYYY-MM-DD HH24:MI:SS'),'Y','AllowMultipleExecution','Allow or disallow executing a process/report multiple times.','P','1. Disallow multiple executions: Never allow to execute a process that is already running.
+2. Disallow multiple executions with the same parameters: Allow to execute a process multiple times with different parameters.
+3. When blank: Always allow to execute a process multiple times.','Multiple Execution','Y','Y',100,100,'Y',0,TO_TIMESTAMP('2018-10-02 18:58:23','YYYY-MM-DD HH24:MI:SS'),'N','D','N',203269,200158,284,17,'N',0)
+;
+
+-- Oct 2, 2018 6:58:37 PM CEST
+ALTER TABLE AD_Process ADD COLUMN AllowMultipleExecution CHAR(1) DEFAULT 'P' 
+;
+
+-- Oct 2, 2018 7:00:24 PM CEST
+INSERT INTO AD_Field (SortNo,AD_Field_ID,IsEncrypted,DisplayLength,IsSameLine,IsHeading,SeqNo,IsCentrallyMaintained,IsReadOnly,Help,Updated,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,CreatedBy,UpdatedBy,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,Created,ColumnSpan,NumLines,IsAdvancedField,IsDefaultFocus,AD_Column_ID,EntityType,AD_Tab_ID,AD_Org_ID) VALUES (0,205837,'N',0,'N','N',270,'Y','N','1. Disallow multiple executions: Never allow to execute a process that is already running.
+2. Disallow multiple executions with the same parameters: Allow to execute a process multiple times with different parameters.
+3. When blank: Always allow to execute a process multiple times.',TO_TIMESTAMP('2018-10-02 19:00:23','YYYY-MM-DD HH24:MI:SS'),'Allow or disallow executing a process/report multiple times.','Multiple Execution','f4a81a10-57ca-459f-bb21-a17812a75381','Y','N',100,100,'Y','Y',240,1,'N',0,TO_TIMESTAMP('2018-10-02 19:00:23','YYYY-MM-DD HH24:MI:SS'),1,1,'N','N',213699,'D',245,0)
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=100, AD_Val_Rule_ID=NULL, IsDisplayed='Y', XPosition=4, ColumnSpan=2, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205837
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=110, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4540
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=120, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205836
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=130, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2571
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=140, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12100
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=150, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3703
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=160, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2534
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=170, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10235
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=180, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56497
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=190, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3278
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=200, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3219
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=210, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5849
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=220, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=50155
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=230, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5850
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=240, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5851
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=250, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=50156
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=260, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201809
+;
+
+-- Oct 2, 2018 7:03:16 PM CEST
+UPDATE AD_Field SET SeqNo=270, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=57342
+;
+
+-- Oct 2, 2018 7:05:07 PM CEST
+INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,AD_Message_UU,Updated,IsActive,CreatedBy,AD_Client_ID,Created,UpdatedBy,EntityType,Value,AD_Org_ID) VALUES ('I','Another instance of this process is already running, please wait until it finishes to run it again.',200483,'db33903f-5eb2-4585-be6f-9a6bcae3940e',TO_TIMESTAMP('2018-10-02 19:05:06','YYYY-MM-DD HH24:MI:SS'),'Y',100,0,TO_TIMESTAMP('2018-10-02 19:05:06','YYYY-MM-DD HH24:MI:SS'),100,'D','ProcessAlreadyRunning',0)
+;
+
+-- Oct 4, 2018 4:52:16 PM CEST
+UPDATE AD_Process SET allowMultipleExecution = NULL WHERE isReport ='N'
+;
+
+-- Oct 4, 2018 4:52:16 PM CEST
+UPDATE AD_Process SET allowMultipleExecution = 'P' WHERE isReport ='Y'
+;
+
+SELECT register_migration_script('201810041316_IDEMPIERE-3799.sql') FROM dual
+;
diff --git a/migration/i5.1z/postgresql/201810121201_IDEMPIERE-2754.sql b/migration/i5.1z/postgresql/201810121201_IDEMPIERE-2754.sql
new file mode 100644
index 0000000000..82145ae981
--- /dev/null
+++ b/migration/i5.1z/postgresql/201810121201_IDEMPIERE-2754.sql
@@ -0,0 +1,8 @@
+-- IDEMPIERE-2754 remove wrong test data.
+-- Oct 12, 2018 12:00:11 PM CEST
+DELETE FROM AD_Image WHERE AD_Image_ID=108
+;
+
+SELECT register_migration_script('201810121201_IDEMPIERE-2754.sql') FROM dual
+;
+
diff --git a/migration/i5.1z/postgresql/201811031833_GardenYear2019.sql b/migration/i5.1z/postgresql/201811031833_GardenYear2019.sql
new file mode 100644
index 0000000000..e4ea56894e
--- /dev/null
+++ b/migration/i5.1z/postgresql/201811031833_GardenYear2019.sql
@@ -0,0 +1,1592 @@
+-- GardenWorld periods 2019
+-- Nov 3, 2018, 6:28:09 PM CET
+INSERT INTO C_Year (C_Year_ID,AD_Client_ID,AD_Org_ID,IsActive,CreatedBy,Created,UpdatedBy,FiscalYear,Updated,C_Calendar_ID,Processing,C_Year_UU) VALUES (200007,11,0,'Y',100,TO_TIMESTAMP('2018-11-03 18:28:07','YYYY-MM-DD HH24:MI:SS'),100,'2019',TO_TIMESTAMP('2018-11-03 18:28:07','YYYY-MM-DD HH24:MI:SS'),102,'N','e8a2b0cc-050c-42ee-8fb0-1f25b1c6ac47')
+;
+
+-- Nov 3, 2018, 6:28:20 PM CET
+INSERT INTO C_Period (Name,StartDate,C_Period_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,PeriodNo,C_Year_ID,PeriodType,EndDate,Processing,C_Period_UU) VALUES ('Jan-19',TO_TIMESTAMP('2019-01-01','YYYY-MM-DD'),200084,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:20','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:20','YYYY-MM-DD HH24:MI:SS'),100,1,200007,'S',TO_TIMESTAMP('2019-01-31','YYYY-MM-DD'),'N','4ccdd6b3-3738-4d11-bd5e-1b0c6ec7d7e2')
+;
+
+-- Nov 3, 2018, 6:28:21 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202616,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:20','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:20','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','MMS','8733030a-50bc-4297-9cf2-2a8d6a35a275')
+;
+
+-- Nov 3, 2018, 6:28:21 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202617,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:21','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:21','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','PJI','f0104cdd-51ed-4fe0-8987-45bf6f42e114')
+;
+
+-- Nov 3, 2018, 6:28:22 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202618,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:21','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:21','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','MXI','6d9f7321-fa40-495a-bcde-4ebaf883d093')
+;
+
+-- Nov 3, 2018, 6:28:22 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202619,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:22','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:22','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','MMP','fa700cb2-5d4a-495a-9c93-2ac1dd47f7bf')
+;
+
+-- Nov 3, 2018, 6:28:22 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202620,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:22','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:22','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','GLD','d1a2195a-06cf-4336-80f3-a14a8fcc510c')
+;
+
+-- Nov 3, 2018, 6:28:23 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202621,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:22','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:22','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','CMC','39c9a33c-07c0-4944-9600-299c873ba288')
+;
+
+-- Nov 3, 2018, 6:28:23 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202622,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:23','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:23','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','MXP','7318e07c-8775-4fea-89e1-7786bc47630e')
+;
+
+-- Nov 3, 2018, 6:28:24 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202623,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:23','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:23','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','ARF','193df41a-de79-4e5c-a301-a30652d7c410')
+;
+
+-- Nov 3, 2018, 6:28:24 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202624,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:24','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:24','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','CMB','f0082345-b22a-4ee3-95e6-319526b9637d')
+;
+
+-- Nov 3, 2018, 6:28:25 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202625,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:24','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:24','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','API','a1cf555c-1fc7-4c6a-a1fd-e6c905c2bf07')
+;
+
+-- Nov 3, 2018, 6:28:25 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202626,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:25','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:25','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','APC','a7f63814-53be-4840-a561-e6966d1c66b4')
+;
+
+-- Nov 3, 2018, 6:28:25 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202627,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:25','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:25','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','GLJ','39ca58aa-bd18-4f27-a572-871be1bc156e')
+;
+
+-- Nov 3, 2018, 6:28:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202628,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:25','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:25','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','ARI','892976f7-98ee-497c-a093-d717cd43c9c7')
+;
+
+-- Nov 3, 2018, 6:28:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202629,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:26','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:26','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','ARC','4c03b2f4-9945-46d3-bb4b-765070f808e1')
+;
+
+-- Nov 3, 2018, 6:28:27 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202630,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:26','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:26','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','ARR','b7463510-f424-4555-a975-960f4e415eb9')
+;
+
+-- Nov 3, 2018, 6:28:27 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202631,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:27','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:27','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','APP','c305f8e0-3b68-43bf-959e-c6264d2d58d6')
+;
+
+-- Nov 3, 2018, 6:28:27 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202632,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:27','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:27','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','SOO','07a07e42-cda2-4bbc-8b4d-b1555e68f5e6')
+;
+
+-- Nov 3, 2018, 6:28:28 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202633,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:27','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:27','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','POO','d704425e-0eb7-48d9-9265-89278f76eb73')
+;
+
+-- Nov 3, 2018, 6:28:35 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202634,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:28','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:28','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','HRP','dcaabe23-8577-4698-ace4-4d3e0e682d70')
+;
+
+-- Nov 3, 2018, 6:28:36 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202635,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:35','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:35','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','MOP','f2a11d93-f3e9-4b21-b80d-9af2a49b2a68')
+;
+
+-- Nov 3, 2018, 6:28:36 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202636,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:36','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:36','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','MMR','fe9f4682-fbe7-45f3-ae76-2a9999a5fcee')
+;
+
+-- Nov 3, 2018, 6:28:36 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202637,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:36','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:36','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','MQO','90b3d546-654b-4089-a97f-41b129e4832d')
+;
+
+-- Nov 3, 2018, 6:28:37 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202638,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:37','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:37','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','DOO','9ffe5b56-dba0-4188-9129-5176710c5472')
+;
+
+-- Nov 3, 2018, 6:28:37 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202639,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:37','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:37','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','CMA','8ac19f3b-df84-45ca-9eff-c93ec5698b9c')
+;
+
+-- Nov 3, 2018, 6:28:38 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202640,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:37','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:37','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','MMM','228fd960-232d-47b6-81d6-610b85b1295b')
+;
+
+-- Nov 3, 2018, 6:28:38 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202641,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:38','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:38','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','POR','66ceaf86-adac-42db-92d0-f7b5a2f246ff')
+;
+
+-- Nov 3, 2018, 6:28:39 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202642,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:38','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:38','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','MOF','45c9bd30-03a5-45ed-920f-d1f4e1d58a17')
+;
+
+-- Nov 3, 2018, 6:28:39 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202643,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:39','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:39','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','MCC','500e8324-9370-44d4-8ff5-0216cba333ef')
+;
+
+-- Nov 3, 2018, 6:28:39 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202644,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:39','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:39','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','MMI','0c56d63d-bcee-4c1b-a395-35bc661b3b12')
+;
+
+-- Nov 3, 2018, 6:28:40 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202645,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:39','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:39','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','FAA','5593285b-73ee-4425-b227-b7cdbf125e3c')
+;
+
+-- Nov 3, 2018, 6:28:40 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202646,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:40','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:40','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','FDP','781d3b31-4017-4f24-bb78-8376a7c3fc6f')
+;
+
+-- Nov 3, 2018, 6:28:41 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202647,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:40','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:40','YYYY-MM-DD HH24:MI:SS'),100,200084,'N','N','N','FAD','6358c599-fb92-4a5e-a7ba-4cc7f1b71a37')
+;
+
+-- Nov 3, 2018, 6:28:41 PM CET
+INSERT INTO C_Period (Name,StartDate,C_Period_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,PeriodNo,C_Year_ID,PeriodType,EndDate,Processing,C_Period_UU) VALUES ('Feb-19',TO_TIMESTAMP('2019-02-01','YYYY-MM-DD'),200085,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:41','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:41','YYYY-MM-DD HH24:MI:SS'),100,2,200007,'S',TO_TIMESTAMP('2019-02-28','YYYY-MM-DD'),'N','d650b293-9954-4e80-a351-9ff0cfa1eac5')
+;
+
+-- Nov 3, 2018, 6:28:41 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202648,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:41','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:41','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','MMS','8436d4fe-60d1-4b55-a5bb-31589680e553')
+;
+
+-- Nov 3, 2018, 6:28:42 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202649,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:41','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:41','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','PJI','9e25bfff-5caa-4c34-9248-87eed11ac9b8')
+;
+
+-- Nov 3, 2018, 6:28:42 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202650,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:42','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:42','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','MXI','657a7324-3022-4fed-9abb-dae176e74994')
+;
+
+-- Nov 3, 2018, 6:28:43 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202651,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:42','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:42','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','MMP','f084094b-0faf-474f-b656-0bc30cd037f7')
+;
+
+-- Nov 3, 2018, 6:28:50 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202652,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:43','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:43','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','GLD','ac74f364-3489-40e3-8b90-34bee28418e1')
+;
+
+-- Nov 3, 2018, 6:28:51 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202653,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:50','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:50','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','CMC','79031dcb-67f2-4193-b64a-0b6c93687013')
+;
+
+-- Nov 3, 2018, 6:28:51 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202654,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:51','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:51','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','MXP','30c63ca0-e339-4539-9db4-e12c5807af05')
+;
+
+-- Nov 3, 2018, 6:28:51 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202655,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:51','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:51','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','ARF','b6dc358f-5de2-4331-99f3-114efa8b7c27')
+;
+
+-- Nov 3, 2018, 6:28:52 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202656,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:51','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:51','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','CMB','c3f72610-cdac-4d00-a0f3-043791be11ec')
+;
+
+-- Nov 3, 2018, 6:28:52 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202657,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:52','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:52','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','API','4b89719d-7bb6-465c-a197-fea2b5c45690')
+;
+
+-- Nov 3, 2018, 6:28:53 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202658,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:52','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:52','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','APC','a55696a0-6ace-44cb-916f-0c70956c74bb')
+;
+
+-- Nov 3, 2018, 6:28:53 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202659,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:53','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:53','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','GLJ','304065a8-3fed-4590-a1c7-3c43abb2b4d4')
+;
+
+-- Nov 3, 2018, 6:28:53 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202660,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:53','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:53','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','ARI','d4222235-9d56-4d6b-a8ac-62c0238e7c9f')
+;
+
+-- Nov 3, 2018, 6:28:54 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202661,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:53','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:53','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','ARC','b61235e3-6ac8-4047-ac5c-542a8fa19d20')
+;
+
+-- Nov 3, 2018, 6:28:54 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202662,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:54','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:54','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','ARR','0c3ef0b6-5071-41f5-ab04-53d31e483383')
+;
+
+-- Nov 3, 2018, 6:28:55 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202663,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:54','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:54','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','APP','ad814ae3-de1d-46f2-838f-e3a620d740cf')
+;
+
+-- Nov 3, 2018, 6:28:55 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202664,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:55','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:55','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','SOO','238b675e-2d00-4506-9b00-05ba21e3d46d')
+;
+
+-- Nov 3, 2018, 6:28:55 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202665,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:55','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:55','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','POO','22422a03-7059-459a-b998-f674a75c9db1')
+;
+
+-- Nov 3, 2018, 6:28:56 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202666,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:55','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:55','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','HRP','e7c3724f-5093-468e-8850-cee7b3f50746')
+;
+
+-- Nov 3, 2018, 6:28:56 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202667,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:56','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:56','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','MOP','c089d789-4b3c-4979-863c-927f9ae97c76')
+;
+
+-- Nov 3, 2018, 6:28:57 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202668,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:56','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:56','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','MMR','d4cf7a59-2529-41a9-82b5-6dbd9f302a51')
+;
+
+-- Nov 3, 2018, 6:28:57 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202669,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:57','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:57','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','MQO','273d026b-4bce-4e0a-843b-9c1f1e014281')
+;
+
+-- Nov 3, 2018, 6:28:57 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202670,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:57','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:57','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','DOO','6fa5930f-b2ce-4e77-9077-24de68539289')
+;
+
+-- Nov 3, 2018, 6:29:05 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202671,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:28:57','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:28:57','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','CMA','eb168790-d22e-4847-ac49-546eee9ade1a')
+;
+
+-- Nov 3, 2018, 6:29:05 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202672,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:05','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:05','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','MMM','9cd95641-c3c7-47c5-81eb-f32c54fdf2f3')
+;
+
+-- Nov 3, 2018, 6:29:06 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202673,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:05','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:05','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','POR','88df3199-a71e-4750-8fe3-220b81bf8fb1')
+;
+
+-- Nov 3, 2018, 6:29:06 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202674,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:06','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:06','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','MOF','c7cc3006-f38c-4c65-ad63-1458ec322ed5')
+;
+
+-- Nov 3, 2018, 6:29:07 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202675,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:06','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:06','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','MCC','55187f0e-fb29-4646-a778-147d3bc6953c')
+;
+
+-- Nov 3, 2018, 6:29:07 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202676,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:07','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:07','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','MMI','5943120f-5902-4961-b1f1-ff09b5f28c19')
+;
+
+-- Nov 3, 2018, 6:29:07 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202677,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:07','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:07','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','FAA','477b335a-740e-4abe-9f7a-f453bb51657c')
+;
+
+-- Nov 3, 2018, 6:29:08 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202678,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:07','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:07','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','FDP','ecfe99d1-d6f7-4963-9d0f-e703e1f5acc2')
+;
+
+-- Nov 3, 2018, 6:29:08 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202679,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:08','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:08','YYYY-MM-DD HH24:MI:SS'),100,200085,'N','N','N','FAD','79325d4c-18aa-4604-9ce2-cd2f95477369')
+;
+
+-- Nov 3, 2018, 6:29:09 PM CET
+INSERT INTO C_Period (Name,StartDate,C_Period_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,PeriodNo,C_Year_ID,PeriodType,EndDate,Processing,C_Period_UU) VALUES ('Mar-19',TO_TIMESTAMP('2019-03-01','YYYY-MM-DD'),200086,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:08','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:08','YYYY-MM-DD HH24:MI:SS'),100,3,200007,'S',TO_TIMESTAMP('2019-03-31','YYYY-MM-DD'),'N','acc351d6-75b6-4b4b-b6a1-9606031acac4')
+;
+
+-- Nov 3, 2018, 6:29:09 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202680,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:09','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:09','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','MMS','14554102-1e3a-4f57-ac0d-afb0e7a66d82')
+;
+
+-- Nov 3, 2018, 6:29:09 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202681,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:09','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:09','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','PJI','38e0de75-f71c-48b3-b4b9-809721c5e1f7')
+;
+
+-- Nov 3, 2018, 6:29:10 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202682,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:09','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:09','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','MXI','115a5599-2619-417e-9055-a3d533dec643')
+;
+
+-- Nov 3, 2018, 6:29:10 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202683,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:10','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:10','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','MMP','49fce423-3147-468b-b491-9cf04b011bb4')
+;
+
+-- Nov 3, 2018, 6:29:11 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202684,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:10','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:10','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','GLD','44e13445-8e3b-4dfe-bb4e-25c0a0dcb2b7')
+;
+
+-- Nov 3, 2018, 6:29:11 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202685,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:11','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:11','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','CMC','fafadcca-a602-4483-8fd6-1a0da7c3be0a')
+;
+
+-- Nov 3, 2018, 6:29:12 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202686,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:11','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:11','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','MXP','011b8cba-8b4e-4ce5-a945-b98c3402a396')
+;
+
+-- Nov 3, 2018, 6:29:12 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202687,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:12','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:12','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','ARF','4034ca85-14c6-48e0-9f55-bed494d148af')
+;
+
+-- Nov 3, 2018, 6:29:12 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202688,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:12','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:12','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','CMB','3a5eced7-4ed2-486b-8bc5-7017a9a37405')
+;
+
+-- Nov 3, 2018, 6:29:20 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202689,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:12','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:12','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','API','b6b15529-2797-459a-ad31-e0f94c5297a7')
+;
+
+-- Nov 3, 2018, 6:29:20 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202690,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:20','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:20','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','APC','2e294570-c4d4-4588-8bc3-92f1eb452893')
+;
+
+-- Nov 3, 2018, 6:29:21 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202691,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:20','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:20','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','GLJ','f3a7f555-74f5-4673-a561-84917d8b700b')
+;
+
+-- Nov 3, 2018, 6:29:21 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202692,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:21','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:21','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','ARI','85280dbd-0570-4e80-8fea-ec47459b55d9')
+;
+
+-- Nov 3, 2018, 6:29:21 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202693,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:21','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:21','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','ARC','fc859eea-616e-4f75-ad5b-3e602035fa8f')
+;
+
+-- Nov 3, 2018, 6:29:22 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202694,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:21','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:21','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','ARR','6b0cc38d-338f-4ed3-ad8b-c506286870b8')
+;
+
+-- Nov 3, 2018, 6:29:22 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202695,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:22','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:22','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','APP','21e5ee99-3125-4b68-b268-12a2d59ffa6c')
+;
+
+-- Nov 3, 2018, 6:29:23 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202696,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:22','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:22','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','SOO','bdbefa50-a417-4053-9076-65b5048d7833')
+;
+
+-- Nov 3, 2018, 6:29:23 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202697,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:23','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:23','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','POO','82fb1357-982d-432f-85e0-d1a669584897')
+;
+
+-- Nov 3, 2018, 6:29:24 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202698,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:23','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:23','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','HRP','9a5cabb5-7244-4ec5-8e68-09bb1b7a0a0d')
+;
+
+-- Nov 3, 2018, 6:29:24 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202699,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:24','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:24','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','MOP','787aab04-96b0-4cc8-9f61-b30011adee1f')
+;
+
+-- Nov 3, 2018, 6:29:24 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202700,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:24','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:24','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','MMR','0b02e522-010e-4d59-a25d-6297bb2b6e68')
+;
+
+-- Nov 3, 2018, 6:29:25 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202701,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:24','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:24','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','MQO','fe78b942-1512-459d-bc2b-c0d35d2d571e')
+;
+
+-- Nov 3, 2018, 6:29:25 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202702,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:25','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:25','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','DOO','9a64f8ac-5138-4d2a-abf1-f45df053a7e7')
+;
+
+-- Nov 3, 2018, 6:29:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202703,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:25','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:25','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','CMA','9d3bebc8-6561-49e8-a319-5ab964b60f02')
+;
+
+-- Nov 3, 2018, 6:29:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202704,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:26','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:26','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','MMM','0db76c69-d488-486a-8e9e-fd584e0eb670')
+;
+
+-- Nov 3, 2018, 6:29:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202705,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:26','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:26','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','POR','39202614-bd3a-446d-8dbc-7d85f659c6b0')
+;
+
+-- Nov 3, 2018, 6:29:27 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202706,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:26','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:26','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','MOF','9cf0c0b0-e4b7-404c-8c7b-358779f6e7b4')
+;
+
+-- Nov 3, 2018, 6:29:27 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202707,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:27','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:27','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','MCC','e4d1f2d7-9928-4762-b253-56c6beac1f8a')
+;
+
+-- Nov 3, 2018, 6:29:35 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202708,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:27','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:27','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','MMI','de36e96a-5501-4b46-980e-e34edceb3407')
+;
+
+-- Nov 3, 2018, 6:29:35 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202709,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:35','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:35','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','FAA','288feb16-4789-4d0a-b8b1-566de0627648')
+;
+
+-- Nov 3, 2018, 6:29:36 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202710,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:35','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:35','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','FDP','7fa26da5-156d-4c87-bd8d-3a102c17ce58')
+;
+
+-- Nov 3, 2018, 6:29:36 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202711,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:36','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:36','YYYY-MM-DD HH24:MI:SS'),100,200086,'N','N','N','FAD','b740fb7c-3415-42c0-9353-2a2bfce710e1')
+;
+
+-- Nov 3, 2018, 6:29:37 PM CET
+INSERT INTO C_Period (Name,StartDate,C_Period_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,PeriodNo,C_Year_ID,PeriodType,EndDate,Processing,C_Period_UU) VALUES ('Apr-19',TO_TIMESTAMP('2019-04-01','YYYY-MM-DD'),200087,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:36','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:36','YYYY-MM-DD HH24:MI:SS'),100,4,200007,'S',TO_TIMESTAMP('2019-04-30','YYYY-MM-DD'),'N','41026d14-6567-4292-9f99-3d353bf2d970')
+;
+
+-- Nov 3, 2018, 6:29:37 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202712,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:37','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:37','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','MMS','dfacee0c-5348-4ef8-b389-fb866d337c49')
+;
+
+-- Nov 3, 2018, 6:29:37 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202713,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:37','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:37','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','PJI','84b117c5-cf91-4049-8752-a555b2a8cf3b')
+;
+
+-- Nov 3, 2018, 6:29:38 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202714,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:37','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:37','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','MXI','d56d4910-be18-40ef-83a5-7ff517774319')
+;
+
+-- Nov 3, 2018, 6:29:38 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202715,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:38','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:38','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','MMP','c960bf9b-ca53-417f-b148-6ee7268e4f68')
+;
+
+-- Nov 3, 2018, 6:29:39 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202716,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:38','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:38','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','GLD','68c23356-5954-4f34-9ad4-c1cec45f9e84')
+;
+
+-- Nov 3, 2018, 6:29:39 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202717,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:39','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:39','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','CMC','5977ce2e-ca74-4328-91c6-5617bd584d3b')
+;
+
+-- Nov 3, 2018, 6:29:39 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202718,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:39','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:39','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','MXP','56b550cd-93e5-4af4-8cdc-19a6973ce352')
+;
+
+-- Nov 3, 2018, 6:29:40 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202719,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:39','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:39','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','ARF','a05c1d80-d3ee-453f-ba25-98ad2155710f')
+;
+
+-- Nov 3, 2018, 6:29:40 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202720,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:40','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:40','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','CMB','57b10fb3-dc33-4a12-8eb6-abf34812e6ab')
+;
+
+-- Nov 3, 2018, 6:29:41 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202721,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:40','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:40','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','API','91361531-b889-4d4f-aed5-8b00eeb91789')
+;
+
+-- Nov 3, 2018, 6:29:41 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202722,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:41','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:41','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','APC','2cb221ad-696d-4c9c-ac2c-920c0a6c2fbc')
+;
+
+-- Nov 3, 2018, 6:29:42 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202723,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:41','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:41','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','GLJ','bab3d12f-58d2-4da8-9f1b-3cc9c01f03ea')
+;
+
+-- Nov 3, 2018, 6:29:42 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202724,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:42','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:42','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','ARI','1633e18f-b585-4247-8bf4-ffe9659e5adc')
+;
+
+-- Nov 3, 2018, 6:29:42 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202725,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:42','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:42','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','ARC','25dc977b-b62b-4175-b8bd-7f827ae43f21')
+;
+
+-- Nov 3, 2018, 6:29:50 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202726,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:42','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:42','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','ARR','fd687075-81be-4605-9003-ec790d06044e')
+;
+
+-- Nov 3, 2018, 6:29:50 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202727,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:50','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:50','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','APP','7ae7eb45-f492-402d-87c1-69ebb5c99e54')
+;
+
+-- Nov 3, 2018, 6:29:51 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202728,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:50','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:50','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','SOO','cf1bc4f0-b318-4cbf-8b62-08630c752453')
+;
+
+-- Nov 3, 2018, 6:29:51 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202729,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:51','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:51','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','POO','52365c1d-e98c-4404-9231-ad382ba021a0')
+;
+
+-- Nov 3, 2018, 6:29:52 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202730,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:51','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:51','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','HRP','e0e7133f-ea38-4773-834c-86dd22b9058f')
+;
+
+-- Nov 3, 2018, 6:29:52 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202731,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:52','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:52','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','MOP','cf0acf04-0f69-4f62-96ed-b1b5f7b0e116')
+;
+
+-- Nov 3, 2018, 6:29:52 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202732,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:52','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:52','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','MMR','b49f1f6d-b0a6-463c-aa56-edeea853678d')
+;
+
+-- Nov 3, 2018, 6:29:53 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202733,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:52','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:52','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','MQO','053b6658-bc61-4767-a0d5-f1adfd32b054')
+;
+
+-- Nov 3, 2018, 6:29:53 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202734,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:53','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:53','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','DOO','5719be01-2174-4e5c-ad89-5fd91f2b8b23')
+;
+
+-- Nov 3, 2018, 6:29:54 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202735,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:53','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:53','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','CMA','e92eec25-ff61-4fa4-9297-c5c1f18cc553')
+;
+
+-- Nov 3, 2018, 6:29:54 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202736,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:54','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:54','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','MMM','655977bb-4092-4bf8-8e95-46bd47745731')
+;
+
+-- Nov 3, 2018, 6:29:55 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202737,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:54','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:54','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','POR','2c18b1a7-2839-47b0-b115-8f6dc5249d66')
+;
+
+-- Nov 3, 2018, 6:29:55 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202738,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:55','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:55','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','MOF','244e659b-05ae-416f-b682-18801b376f1d')
+;
+
+-- Nov 3, 2018, 6:29:55 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202739,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:55','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:55','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','MCC','3798f40c-093f-4709-a261-70dae5749278')
+;
+
+-- Nov 3, 2018, 6:29:56 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202740,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:55','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:55','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','MMI','ee056d2d-740b-4031-ae93-98b7cc24f86b')
+;
+
+-- Nov 3, 2018, 6:29:56 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202741,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:56','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:56','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','FAA','2b8c3723-9abf-468b-b137-a4588de3fea5')
+;
+
+-- Nov 3, 2018, 6:29:57 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202742,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:56','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:56','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','FDP','3fe427b8-c617-47a0-b8d4-35c677d62cd1')
+;
+
+-- Nov 3, 2018, 6:29:57 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202743,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:57','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:57','YYYY-MM-DD HH24:MI:SS'),100,200087,'N','N','N','FAD','0d7f6baf-49b3-4c0a-b641-3767ed776ae8')
+;
+
+-- Nov 3, 2018, 6:29:57 PM CET
+INSERT INTO C_Period (Name,StartDate,C_Period_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,PeriodNo,C_Year_ID,PeriodType,EndDate,Processing,C_Period_UU) VALUES ('May-19',TO_TIMESTAMP('2019-05-01','YYYY-MM-DD'),200088,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:57','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:57','YYYY-MM-DD HH24:MI:SS'),100,5,200007,'S',TO_TIMESTAMP('2019-05-31','YYYY-MM-DD'),'N','04f794d1-e9be-4327-86af-e078f6b51207')
+;
+
+-- Nov 3, 2018, 6:30:05 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202744,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:29:57','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:29:57','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','MMS','1614a7e0-293f-4596-a9fd-3c0a80b6ea0a')
+;
+
+-- Nov 3, 2018, 6:30:05 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202745,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:05','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:05','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','PJI','4bd7db0a-3374-4cc9-9e87-bc603c6f5caf')
+;
+
+-- Nov 3, 2018, 6:30:06 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202746,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:05','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:05','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','MXI','3a49d7d9-9dc5-4e6a-bdde-bcf54ded07a5')
+;
+
+-- Nov 3, 2018, 6:30:06 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202747,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:06','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:06','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','MMP','90feb04e-a710-4217-b603-a74b863496fe')
+;
+
+-- Nov 3, 2018, 6:30:06 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202748,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:06','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:06','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','GLD','46444f41-3bb7-4370-9ccb-6828637b68bc')
+;
+
+-- Nov 3, 2018, 6:30:07 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202749,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:06','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:06','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','CMC','a35bd4d9-0a39-401e-a0fd-bdff1d15464d')
+;
+
+-- Nov 3, 2018, 6:30:07 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202750,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:07','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:07','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','MXP','b1e7529e-7fba-4aff-9e80-dcbb4651d378')
+;
+
+-- Nov 3, 2018, 6:30:08 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202751,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:07','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:07','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','ARF','a8d927ab-85b9-4494-9cf0-4dc81c87185e')
+;
+
+-- Nov 3, 2018, 6:30:08 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202752,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:08','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:08','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','CMB','3697fea2-26b7-4934-b3e2-de078b3f3b49')
+;
+
+-- Nov 3, 2018, 6:30:09 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202753,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:08','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:08','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','API','8d450e43-e0a6-4953-982f-0ab55e6a2b00')
+;
+
+-- Nov 3, 2018, 6:30:09 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202754,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:09','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:09','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','APC','a7bbc028-e19a-4918-b796-4446f27aee59')
+;
+
+-- Nov 3, 2018, 6:30:10 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202755,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:09','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:09','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','GLJ','86727644-bd34-4c49-a74a-a95f0bf89eac')
+;
+
+-- Nov 3, 2018, 6:30:10 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202756,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:10','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:10','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','ARI','e6d25572-d19a-44d6-9719-2099edcf1be1')
+;
+
+-- Nov 3, 2018, 6:30:11 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202757,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:10','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:10','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','ARC','69af5358-66a7-49e5-9a59-1c8658c9eee0')
+;
+
+-- Nov 3, 2018, 6:30:11 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202758,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:11','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:11','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','ARR','e6c92c38-69a5-48e9-853e-c4688a886b6a')
+;
+
+-- Nov 3, 2018, 6:30:12 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202759,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:11','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:11','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','APP','66b9c024-9ae9-40c2-8dbf-a4899dc2bdd7')
+;
+
+-- Nov 3, 2018, 6:30:12 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202760,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:12','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:12','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','SOO','ad5b5ae1-6766-4125-bf5d-de8cabe20f44')
+;
+
+-- Nov 3, 2018, 6:30:12 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202761,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:12','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:12','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','POO','69faa967-3eaf-45fe-98d2-1a0b62450c70')
+;
+
+-- Nov 3, 2018, 6:30:13 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202762,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:12','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:12','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','HRP','a50aa994-dcca-467f-98db-2fb61756a773')
+;
+
+-- Nov 3, 2018, 6:30:21 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202763,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:13','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:13','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','MOP','0ef4634f-b71c-4a93-9ab1-a2c8ff26637c')
+;
+
+-- Nov 3, 2018, 6:30:21 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202764,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:21','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:21','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','MMR','49f46238-000f-47d3-a330-8a2d7c1fe5cb')
+;
+
+-- Nov 3, 2018, 6:30:21 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202765,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:21','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:21','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','MQO','768dcd1d-f255-472f-ba55-500ea72d5890')
+;
+
+-- Nov 3, 2018, 6:30:22 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202766,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:21','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:21','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','DOO','305ab3f9-656c-45ad-ae3d-061ff0b9e7d7')
+;
+
+-- Nov 3, 2018, 6:30:22 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202767,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:22','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:22','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','CMA','28d8b96e-c81e-40c9-b5b1-8b688acc2946')
+;
+
+-- Nov 3, 2018, 6:30:23 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202768,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:22','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:22','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','MMM','4bace6b5-f8f1-4df2-987b-52c052a91987')
+;
+
+-- Nov 3, 2018, 6:30:23 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202769,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:23','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:23','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','POR','ec9eb93f-8002-475a-8347-8422c283e1fd')
+;
+
+-- Nov 3, 2018, 6:30:23 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202770,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:23','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:23','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','MOF','3800d046-d846-4d57-9092-e1b8c00fffff')
+;
+
+-- Nov 3, 2018, 6:30:24 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202771,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:23','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:23','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','MCC','0230ce6b-d8e1-4b89-a46a-4424dd84bc0c')
+;
+
+-- Nov 3, 2018, 6:30:24 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202772,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:24','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:24','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','MMI','0cb374b7-d0a4-4934-a718-2c5ad3ccbe45')
+;
+
+-- Nov 3, 2018, 6:30:25 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202773,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:24','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:24','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','FAA','754eba14-4bcf-4e7d-aab8-d7df3d62de17')
+;
+
+-- Nov 3, 2018, 6:30:25 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202774,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:25','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:25','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','FDP','4dc0ebfd-5466-46ed-974a-37cd2ac7fa9b')
+;
+
+-- Nov 3, 2018, 6:30:25 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202775,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:25','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:25','YYYY-MM-DD HH24:MI:SS'),100,200088,'N','N','N','FAD','f1dec394-5f1d-4279-b7f8-2e2cb89ca768')
+;
+
+-- Nov 3, 2018, 6:30:26 PM CET
+INSERT INTO C_Period (Name,StartDate,C_Period_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,PeriodNo,C_Year_ID,PeriodType,EndDate,Processing,C_Period_UU) VALUES ('Jun-19',TO_TIMESTAMP('2019-06-01','YYYY-MM-DD'),200089,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:25','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:25','YYYY-MM-DD HH24:MI:SS'),100,6,200007,'S',TO_TIMESTAMP('2019-06-30','YYYY-MM-DD'),'N','9edc4354-9c4b-455e-9df0-d8834a0da8fd')
+;
+
+-- Nov 3, 2018, 6:30:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202776,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:26','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:26','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','MMS','7cab4865-7f56-4662-8887-f9900ef0a483')
+;
+
+-- Nov 3, 2018, 6:30:27 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202777,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:26','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:26','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','PJI','17a723ae-7e87-4b70-b958-4cda5b40022b')
+;
+
+-- Nov 3, 2018, 6:30:27 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202778,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:27','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:27','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','MXI','649cf1fa-eb80-46f3-af4e-7701cf4a5611')
+;
+
+-- Nov 3, 2018, 6:30:28 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202779,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:27','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:27','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','MMP','f08a7f37-be3b-4d24-a572-a6d9a548deab')
+;
+
+-- Nov 3, 2018, 6:30:28 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202780,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:28','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:28','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','GLD','9ba707dd-a4af-4e73-b873-13cc9f9fe388')
+;
+
+-- Nov 3, 2018, 6:30:36 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202781,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:28','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:28','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','CMC','b659003d-ae49-49a2-822c-fdaebda933d3')
+;
+
+-- Nov 3, 2018, 6:30:36 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202782,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:36','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:36','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','MXP','0b8f8dd8-63c6-4921-9044-1a3bf4d49b10')
+;
+
+-- Nov 3, 2018, 6:30:36 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202783,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:36','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:36','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','ARF','efe314b6-8ab6-472f-b85d-84f42eaa90f7')
+;
+
+-- Nov 3, 2018, 6:30:37 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202784,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:36','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:36','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','CMB','72407fd7-1c3d-4e73-a33d-4ebe6ffd8720')
+;
+
+-- Nov 3, 2018, 6:30:37 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202785,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:37','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:37','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','API','8906097e-232d-4e83-b2d7-8ebd92147108')
+;
+
+-- Nov 3, 2018, 6:30:38 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202786,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:37','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:37','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','APC','359271f6-95fe-4aaa-84a2-3feff0c3f251')
+;
+
+-- Nov 3, 2018, 6:30:38 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202787,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:38','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:38','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','GLJ','7e6919d5-448c-440a-ae2c-bd444d0f9ed5')
+;
+
+-- Nov 3, 2018, 6:30:38 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202788,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:38','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:38','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','ARI','b2953601-6d19-4a1a-a39a-1b216806dd86')
+;
+
+-- Nov 3, 2018, 6:30:39 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202789,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:38','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:38','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','ARC','b23dc0e8-dd7a-4476-bc5c-1d3ed5296e80')
+;
+
+-- Nov 3, 2018, 6:30:39 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202790,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:39','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:39','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','ARR','f2981a11-8ea5-4a51-aecd-89902ec1026d')
+;
+
+-- Nov 3, 2018, 6:30:40 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202791,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:39','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:39','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','APP','20eebedf-4407-4924-a4cd-9854ee8d66a0')
+;
+
+-- Nov 3, 2018, 6:30:40 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202792,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:40','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:40','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','SOO','011cd26a-29f3-4c70-a2fc-d691cdfa4795')
+;
+
+-- Nov 3, 2018, 6:30:42 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202793,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:40','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:40','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','POO','44b2cbcc-e8ca-41cd-916a-15be7d71c057')
+;
+
+-- Nov 3, 2018, 6:30:42 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202794,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:42','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:42','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','HRP','e45c39ad-208d-4941-bb45-d8a047a36448')
+;
+
+-- Nov 3, 2018, 6:30:42 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202795,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:42','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:42','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','MOP','1d017c69-957c-456a-b7ab-a9368c54e8a6')
+;
+
+-- Nov 3, 2018, 6:30:43 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202796,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:42','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:42','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','MMR','b14bf7d5-2c6e-4800-a523-89bdf16c3612')
+;
+
+-- Nov 3, 2018, 6:30:43 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202797,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:43','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:43','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','MQO','57c0f424-3b1e-4ef1-bff3-d35ebaeb9dc4')
+;
+
+-- Nov 3, 2018, 6:30:44 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202798,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:43','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:43','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','DOO','e033dc5b-1d62-4de1-932f-3ab3db6e5f00')
+;
+
+-- Nov 3, 2018, 6:30:44 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202799,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:44','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:44','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','CMA','fd08ee09-496f-4f71-9c5a-952ac12dd540')
+;
+
+-- Nov 3, 2018, 6:30:47 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202800,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:44','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:44','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','MMM','9786523b-e1d8-423e-a7b0-cef68bc32b60')
+;
+
+-- Nov 3, 2018, 6:30:48 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202801,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:47','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:47','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','POR','e4527b61-0c3b-4584-8f8e-6dc962709450')
+;
+
+-- Nov 3, 2018, 6:30:48 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202802,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:48','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:48','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','MOF','136ae13d-88fd-4ec3-9f73-8e29c042f8cd')
+;
+
+-- Nov 3, 2018, 6:30:49 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202803,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:48','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:48','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','MCC','ab5807b5-706d-43ba-b269-ae630aed8dc4')
+;
+
+-- Nov 3, 2018, 6:30:49 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202804,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:49','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:49','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','MMI','ef653a9b-dcff-4a97-9d50-ae81ba118c85')
+;
+
+-- Nov 3, 2018, 6:30:50 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202805,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:49','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:49','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','FAA','5b629c7c-d351-4592-92bf-5439be27ebd5')
+;
+
+-- Nov 3, 2018, 6:30:50 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202806,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:50','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:50','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','FDP','27668620-4bea-4d3d-86b0-ee30077dcb0f')
+;
+
+-- Nov 3, 2018, 6:30:50 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202807,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:50','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:50','YYYY-MM-DD HH24:MI:SS'),100,200089,'N','N','N','FAD','2d60f230-4967-40ca-aa31-0161a199888d')
+;
+
+-- Nov 3, 2018, 6:30:54 PM CET
+INSERT INTO C_Period (Name,StartDate,C_Period_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,PeriodNo,C_Year_ID,PeriodType,EndDate,Processing,C_Period_UU) VALUES ('Jul-19',TO_TIMESTAMP('2019-07-01','YYYY-MM-DD'),200090,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:50','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:50','YYYY-MM-DD HH24:MI:SS'),100,7,200007,'S',TO_TIMESTAMP('2019-07-31','YYYY-MM-DD'),'N','08961d2a-6cd4-4dbe-aab3-b517b2a7f3bd')
+;
+
+-- Nov 3, 2018, 6:30:54 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202808,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:54','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:54','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','MMS','30d83752-5a0b-4659-b9aa-30e6857a9a07')
+;
+
+-- Nov 3, 2018, 6:30:55 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202809,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:54','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:54','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','PJI','e502f2ac-3752-40db-84a1-bf120df5a846')
+;
+
+-- Nov 3, 2018, 6:30:55 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202810,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:55','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:55','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','MXI','6b5aee88-388b-44e0-b464-099e559ce413')
+;
+
+-- Nov 3, 2018, 6:30:55 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202811,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:55','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:55','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','MMP','e32affe3-1253-4fd7-bd3d-53fa657c3c7f')
+;
+
+-- Nov 3, 2018, 6:30:56 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202812,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:55','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:55','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','GLD','09acdb27-2542-42b9-91ad-a5f2a751fa8f')
+;
+
+-- Nov 3, 2018, 6:30:56 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202813,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:56','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:56','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','CMC','3cf9b315-b5e7-4db7-ba55-637a0433206e')
+;
+
+-- Nov 3, 2018, 6:31:00 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202814,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:30:56','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:30:56','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','MXP','e0f35533-97b3-4bfb-8f9f-466c9aabc1a1')
+;
+
+-- Nov 3, 2018, 6:31:00 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202815,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:00','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:00','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','ARF','0eecad33-5f71-4620-b506-c048399bb9b6')
+;
+
+-- Nov 3, 2018, 6:31:01 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202816,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:00','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:00','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','CMB','3c19cc70-e367-4e6f-8b89-6ffd39b4ff26')
+;
+
+-- Nov 3, 2018, 6:31:01 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202817,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:01','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:01','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','API','07f7ed8f-964d-43c6-bc06-6eaa8bf5adc9')
+;
+
+-- Nov 3, 2018, 6:31:01 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202818,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:01','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:01','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','APC','9b709279-ee53-4521-b028-cda911031c66')
+;
+
+-- Nov 3, 2018, 6:31:02 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202819,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:01','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:01','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','GLJ','c610493b-9b29-42b1-b4cd-491644de1161')
+;
+
+-- Nov 3, 2018, 6:31:02 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202820,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:02','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:02','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','ARI','592f028b-102f-4deb-85b2-543931043b96')
+;
+
+-- Nov 3, 2018, 6:31:03 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202821,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:02','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:02','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','ARC','5f4b9e59-f5ac-4275-acc9-2f6729b1a71e')
+;
+
+-- Nov 3, 2018, 6:31:06 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202822,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:03','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:03','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','ARR','c446d5c6-42bc-4b3b-b468-fa3242ce74b0')
+;
+
+-- Nov 3, 2018, 6:31:07 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202823,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:06','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:06','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','APP','fa3cc108-93f3-4355-97f5-993dd5a10d87')
+;
+
+-- Nov 3, 2018, 6:31:07 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202824,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:07','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:07','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','SOO','23a610fe-e257-443a-970f-4b71dc0a21e4')
+;
+
+-- Nov 3, 2018, 6:31:07 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202825,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:07','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:07','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','POO','88ff1867-8885-43d6-87b5-0106f77b4806')
+;
+
+-- Nov 3, 2018, 6:31:08 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202826,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:07','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:07','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','HRP','21d58356-1273-496b-948a-d9801e7ab142')
+;
+
+-- Nov 3, 2018, 6:31:08 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202827,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:08','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:08','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','MOP','f60d0903-990c-484b-b0a7-7dd588c66aac')
+;
+
+-- Nov 3, 2018, 6:31:09 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202828,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:08','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:08','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','MMR','4e9254a4-c402-4f63-b8b2-5a288407f9b4')
+;
+
+-- Nov 3, 2018, 6:31:12 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202829,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:09','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:09','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','MQO','ff6d11a5-052a-4ce2-b3d2-29787e02daa4')
+;
+
+-- Nov 3, 2018, 6:31:13 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202830,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:12','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:12','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','DOO','2c4e04c7-6bdf-465a-b54f-1c7ee32ecde6')
+;
+
+-- Nov 3, 2018, 6:31:13 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202831,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:13','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:13','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','CMA','2f6713cb-1248-4205-8082-80ed0c062f07')
+;
+
+-- Nov 3, 2018, 6:31:13 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202832,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:13','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:13','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','MMM','ffd61d59-00a5-4cf3-b362-c4eada44cae7')
+;
+
+-- Nov 3, 2018, 6:31:14 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202833,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:13','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:13','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','POR','343605e9-8f47-48b2-a01f-eca79cf70844')
+;
+
+-- Nov 3, 2018, 6:31:14 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202834,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:14','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:14','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','MOF','638ab1a1-4066-40bc-adf3-12847b2b2ddf')
+;
+
+-- Nov 3, 2018, 6:31:15 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202835,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:14','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:14','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','MCC','fabd61f3-4e0a-424b-8b25-2a05b6104b38')
+;
+
+-- Nov 3, 2018, 6:31:15 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202836,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:15','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:15','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','MMI','563d602e-79a7-4908-a9f1-8ce1d79aac49')
+;
+
+-- Nov 3, 2018, 6:31:18 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202837,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:15','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:15','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','FAA','386e9c40-aa72-412b-95a3-1b5af357b131')
+;
+
+-- Nov 3, 2018, 6:31:19 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202838,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:18','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:18','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','FDP','388b64f5-1e64-437a-9fbc-3f20c9419d4e')
+;
+
+-- Nov 3, 2018, 6:31:19 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202839,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:19','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:19','YYYY-MM-DD HH24:MI:SS'),100,200090,'N','N','N','FAD','b6299394-e89a-4aec-b763-355cf4d3854b')
+;
+
+-- Nov 3, 2018, 6:31:20 PM CET
+INSERT INTO C_Period (Name,StartDate,C_Period_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,PeriodNo,C_Year_ID,PeriodType,EndDate,Processing,C_Period_UU) VALUES ('Aug-19',TO_TIMESTAMP('2019-08-01','YYYY-MM-DD'),200091,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:19','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:19','YYYY-MM-DD HH24:MI:SS'),100,8,200007,'S',TO_TIMESTAMP('2019-08-31','YYYY-MM-DD'),'N','23e07161-6a7a-48f8-9e3c-ed0b83db5b88')
+;
+
+-- Nov 3, 2018, 6:31:20 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202840,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:20','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:20','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','MMS','595f932d-ef01-4273-88f9-089bede966e8')
+;
+
+-- Nov 3, 2018, 6:31:21 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202841,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:20','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:20','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','PJI','f1e9160a-d2c7-4986-a639-7fb02570d782')
+;
+
+-- Nov 3, 2018, 6:31:21 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202842,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:21','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:21','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','MXI','824dd2fa-4340-49bc-b22a-1df01ae53aec')
+;
+
+-- Nov 3, 2018, 6:31:24 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202843,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:21','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:21','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','MMP','d348cd55-50af-426a-96f9-7f2193457e77')
+;
+
+-- Nov 3, 2018, 6:31:25 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202844,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:24','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:24','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','GLD','13a07b0e-da11-4dd0-b1c6-83a1ede2f8be')
+;
+
+-- Nov 3, 2018, 6:31:25 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202845,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:25','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:25','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','CMC','7622a6e1-84f5-49ef-81b5-1190baa0f2fd')
+;
+
+-- Nov 3, 2018, 6:31:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202846,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:25','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:25','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','MXP','639fea88-3215-4d5c-990c-251b83f4dcb7')
+;
+
+-- Nov 3, 2018, 6:31:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202847,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:26','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:26','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','ARF','da61d34b-a43b-4fa8-9486-525b156717a3')
+;
+
+-- Nov 3, 2018, 6:31:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202848,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:26','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:26','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','CMB','be4a7e6c-538d-4477-84f9-25ff7c32b4de')
+;
+
+-- Nov 3, 2018, 6:31:27 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202849,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:26','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:26','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','API','241f2d10-d7c1-4479-ab16-509fe679a4e2')
+;
+
+-- Nov 3, 2018, 6:31:27 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202850,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:27','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:27','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','APC','69439d0f-26d4-4222-9fc8-03e9b19a114d')
+;
+
+-- Nov 3, 2018, 6:31:31 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202851,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:27','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:27','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','GLJ','d8624da6-9100-480a-8f43-ff07e86e3955')
+;
+
+-- Nov 3, 2018, 6:31:31 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202852,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:31','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:31','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','ARI','f036fb49-636d-42c1-9503-dd84ba7c6d1e')
+;
+
+-- Nov 3, 2018, 6:31:31 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202853,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:31','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:31','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','ARC','9bac0bb9-438a-49e1-bb47-e4b0541f9e90')
+;
+
+-- Nov 3, 2018, 6:31:32 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202854,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:31','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:31','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','ARR','287356ce-4b3f-49e7-aedd-347d2ab8479e')
+;
+
+-- Nov 3, 2018, 6:31:32 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202855,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:32','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:32','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','APP','166bf2f8-0aee-4a4c-b1ae-a76b402af10f')
+;
+
+-- Nov 3, 2018, 6:31:33 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202856,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:32','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:32','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','SOO','adade061-a341-4ad8-81b0-1deca2a4ebf1')
+;
+
+-- Nov 3, 2018, 6:31:33 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202857,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:33','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:33','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','POO','4f8d54e9-cfa3-4ac6-9c45-49c0339d94af')
+;
+
+-- Nov 3, 2018, 6:31:37 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202858,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:33','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:33','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','HRP','c0f9c0e1-f1ca-4615-aa00-d911e1389bd8')
+;
+
+-- Nov 3, 2018, 6:31:37 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202859,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:37','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:37','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','MOP','57800308-8508-4fc1-bb00-b959a9a9739b')
+;
+
+-- Nov 3, 2018, 6:31:37 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202860,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:37','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:37','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','MMR','af5bef72-8e3c-47aa-8106-590876f42095')
+;
+
+-- Nov 3, 2018, 6:31:38 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202861,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:37','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:37','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','MQO','a856d1e6-20b1-46b3-8463-119cb025eca8')
+;
+
+-- Nov 3, 2018, 6:31:38 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202862,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:38','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:38','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','DOO','a3e8b4e6-36b7-4fea-ac6f-9dda1e06a64f')
+;
+
+-- Nov 3, 2018, 6:31:39 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202863,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:38','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:38','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','CMA','9ac55b57-698b-4924-9458-170709e375ec')
+;
+
+-- Nov 3, 2018, 6:31:39 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202864,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:39','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:39','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','MMM','74fe7665-9ffb-4462-852e-267916930381')
+;
+
+-- Nov 3, 2018, 6:31:39 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202865,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:39','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:39','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','POR','cd3d3ac4-4871-4824-824b-50a5819eed2e')
+;
+
+-- Nov 3, 2018, 6:31:43 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202866,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:39','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:39','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','MOF','8f2e86bb-ad52-4d9a-b4d1-dc9ba743109a')
+;
+
+-- Nov 3, 2018, 6:31:43 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202867,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:43','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:43','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','MCC','dfff7f86-6cab-4445-987b-32b44072c519')
+;
+
+-- Nov 3, 2018, 6:31:44 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202868,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:43','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:43','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','MMI','37c8726f-5b4c-4d2b-8662-cc1114847d88')
+;
+
+-- Nov 3, 2018, 6:31:44 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202869,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:44','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:44','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','FAA','8056af07-a24b-4982-9b11-3c8a7b9eee4d')
+;
+
+-- Nov 3, 2018, 6:31:45 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202870,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:44','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:44','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','FDP','373cdc67-b58f-4356-a6d8-834d2fadbd9c')
+;
+
+-- Nov 3, 2018, 6:31:45 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202871,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:45','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:45','YYYY-MM-DD HH24:MI:SS'),100,200091,'N','N','N','FAD','6866714a-637d-44b8-868f-d35057bb2649')
+;
+
+-- Nov 3, 2018, 6:31:45 PM CET
+INSERT INTO C_Period (Name,StartDate,C_Period_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,PeriodNo,C_Year_ID,PeriodType,EndDate,Processing,C_Period_UU) VALUES ('Sep-19',TO_TIMESTAMP('2019-09-01','YYYY-MM-DD'),200092,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:45','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:45','YYYY-MM-DD HH24:MI:SS'),100,9,200007,'S',TO_TIMESTAMP('2019-09-30','YYYY-MM-DD'),'N','3f198ffe-3294-457e-8da2-d645c5771d16')
+;
+
+-- Nov 3, 2018, 6:31:49 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202872,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:45','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:45','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','MMS','f8f3344b-4b14-47d6-b1e7-a67c63769f3a')
+;
+
+-- Nov 3, 2018, 6:31:49 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202873,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:49','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:49','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','PJI','a057f9bf-b870-4728-83c4-6c0a0fa70ef9')
+;
+
+-- Nov 3, 2018, 6:31:50 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202874,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:49','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:49','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','MXI','5bbcf581-90fb-427c-8925-5ebc90583f9d')
+;
+
+-- Nov 3, 2018, 6:31:50 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202875,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:50','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:50','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','MMP','17105351-84ca-42bf-b1e6-8a1f3ac51f82')
+;
+
+-- Nov 3, 2018, 6:31:51 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202876,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:50','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:50','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','GLD','65a438c5-3bdc-4e5e-b409-7fa457b91177')
+;
+
+-- Nov 3, 2018, 6:31:51 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202877,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:51','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:51','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','CMC','e30b1228-143f-4955-a02b-4a77c62bacb3')
+;
+
+-- Nov 3, 2018, 6:31:51 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202878,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:51','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:51','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','MXP','edc91647-da0e-42ff-b760-e4fce6c8628d')
+;
+
+-- Nov 3, 2018, 6:31:52 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202879,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:51','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:51','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','ARF','5b2790b2-5aba-4537-9b76-f8079984c1ea')
+;
+
+-- Nov 3, 2018, 6:31:55 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202880,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:52','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:52','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','CMB','681c2660-4427-4452-aa1e-d1b917cdedbb')
+;
+
+-- Nov 3, 2018, 6:31:56 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202881,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:55','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:55','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','API','a976dabe-f520-4812-b097-c70b225311e4')
+;
+
+-- Nov 3, 2018, 6:31:56 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202882,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:56','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:56','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','APC','b8d1fb0c-9d42-4c10-b634-0ce863d0d40d')
+;
+
+-- Nov 3, 2018, 6:31:56 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202883,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:56','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:56','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','GLJ','7372f322-2f6f-4b7a-a5d3-1550b42c5251')
+;
+
+-- Nov 3, 2018, 6:31:57 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202884,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:56','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:56','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','ARI','e94dff45-d3bc-489a-82e5-f624793678c9')
+;
+
+-- Nov 3, 2018, 6:31:57 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202885,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:57','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:57','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','ARC','e967420d-94a9-4631-9ac7-d23d4d2188d3')
+;
+
+-- Nov 3, 2018, 6:31:58 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202886,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:57','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:57','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','ARR','b552ba89-ac13-4b6a-9fe8-dd20b3be02b5')
+;
+
+-- Nov 3, 2018, 6:32:01 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202887,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:31:58','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:31:58','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','APP','1c28663b-d352-48a8-a165-4c692b835ed0')
+;
+
+-- Nov 3, 2018, 6:32:02 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202888,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:01','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:01','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','SOO','23958ff8-6a8c-4cc0-89b7-aebbdbed6c87')
+;
+
+-- Nov 3, 2018, 6:32:02 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202889,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:02','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:02','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','POO','82138d0f-50e3-4ac6-bb44-614d55c3d6c3')
+;
+
+-- Nov 3, 2018, 6:32:02 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202890,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:02','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:02','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','HRP','245c4b41-c774-4a88-b548-fde68922cb5f')
+;
+
+-- Nov 3, 2018, 6:32:03 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202891,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:02','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:02','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','MOP','64c3db1e-4a6c-4df5-a196-cd8e52a02d74')
+;
+
+-- Nov 3, 2018, 6:32:03 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202892,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:03','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:03','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','MMR','4485bf3c-2e33-48cb-bdec-0325bf63b506')
+;
+
+-- Nov 3, 2018, 6:32:04 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202893,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:03','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:03','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','MQO','7ee80659-be67-411a-9c45-c53fa38d7056')
+;
+
+-- Nov 3, 2018, 6:32:04 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202894,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:04','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:04','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','DOO','0ee49434-ab21-414c-bb9e-729137d247c9')
+;
+
+-- Nov 3, 2018, 6:32:08 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202895,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:04','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:04','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','CMA','9290ee77-ce2d-42fc-95ef-005ae123c12f')
+;
+
+-- Nov 3, 2018, 6:32:08 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202896,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:08','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:08','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','MMM','c128cb4a-6200-4055-bfd1-35af9e61a24a')
+;
+
+-- Nov 3, 2018, 6:32:08 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202897,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:08','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:08','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','POR','2232b6f4-0088-403b-bfd5-a0bc0415423c')
+;
+
+-- Nov 3, 2018, 6:32:09 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202898,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:08','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:08','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','MOF','0d1d4590-41c4-4ab7-939c-88ab65c71978')
+;
+
+-- Nov 3, 2018, 6:32:09 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202899,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:09','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:09','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','MCC','536db762-2c52-4200-8598-ecbe8f77a3a2')
+;
+
+-- Nov 3, 2018, 6:32:10 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202900,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:09','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:09','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','MMI','c1ac44fd-9a3a-46e5-993a-15d02fe6a30a')
+;
+
+-- Nov 3, 2018, 6:32:10 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202901,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:10','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:10','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','FAA','3359ab35-f3e5-4d80-9cb1-2f8757391f70')
+;
+
+-- Nov 3, 2018, 6:32:13 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202902,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:10','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:10','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','FDP','b889ee45-e1b3-4efd-a539-6661ee88a6d2')
+;
+
+-- Nov 3, 2018, 6:32:14 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202903,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:13','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:13','YYYY-MM-DD HH24:MI:SS'),100,200092,'N','N','N','FAD','8ce58183-4d5a-4bb9-8d68-a56a826b2fa6')
+;
+
+-- Nov 3, 2018, 6:32:14 PM CET
+INSERT INTO C_Period (Name,StartDate,C_Period_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,PeriodNo,C_Year_ID,PeriodType,EndDate,Processing,C_Period_UU) VALUES ('Oct-19',TO_TIMESTAMP('2019-10-01','YYYY-MM-DD'),200093,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:14','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:14','YYYY-MM-DD HH24:MI:SS'),100,10,200007,'S',TO_TIMESTAMP('2019-10-31','YYYY-MM-DD'),'N','8f745925-1edb-46b1-a351-6ea1dcbdb387')
+;
+
+-- Nov 3, 2018, 6:32:15 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202904,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:14','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:14','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','MMS','5e391f97-b879-47b7-baef-567424b7226e')
+;
+
+-- Nov 3, 2018, 6:32:15 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202905,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:15','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:15','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','PJI','2d266c24-b591-4426-8c62-2f734f911b6b')
+;
+
+-- Nov 3, 2018, 6:32:16 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202906,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:15','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:15','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','MXI','63ba3abc-158c-4159-abab-6333aea59dce')
+;
+
+-- Nov 3, 2018, 6:32:16 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202907,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:16','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:16','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','MMP','98de7fa7-08a2-492a-88c7-820762806905')
+;
+
+-- Nov 3, 2018, 6:32:16 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202908,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:16','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:16','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','GLD','ca9acd2e-6dd9-40f0-9392-e7f1986e65bc')
+;
+
+-- Nov 3, 2018, 6:32:20 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202909,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:16','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:16','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','CMC','7767d14b-8b93-4ab2-ba24-ae8f73f34f05')
+;
+
+-- Nov 3, 2018, 6:32:20 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202910,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:20','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:20','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','MXP','1d4c2633-a08a-424a-9add-00d7ec32dfe8')
+;
+
+-- Nov 3, 2018, 6:32:21 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202911,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:20','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:20','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','ARF','0bb552cf-b321-4c74-a7c9-b7ffa9deffde')
+;
+
+-- Nov 3, 2018, 6:32:21 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202912,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:21','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:21','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','CMB','7a4454f6-b61d-4b33-b130-15943eb8e321')
+;
+
+-- Nov 3, 2018, 6:32:21 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202913,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:21','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:21','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','API','7adc28fa-0edb-44b0-be05-9fcade6b736f')
+;
+
+-- Nov 3, 2018, 6:32:22 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202914,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:21','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:21','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','APC','10967451-86e1-4f03-902a-3552289db1d9')
+;
+
+-- Nov 3, 2018, 6:32:22 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202915,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:22','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:22','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','GLJ','0a07fb50-41ff-4955-87d8-881d89e7d96d')
+;
+
+-- Nov 3, 2018, 6:32:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202916,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:22','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:22','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','ARI','f4b362d7-11c2-4d4d-a531-447797e783fd')
+;
+
+-- Nov 3, 2018, 6:32:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202917,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:26','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:26','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','ARC','a4631932-dbc4-4558-9095-f546ded1f8d0')
+;
+
+-- Nov 3, 2018, 6:32:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202918,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:26','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:26','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','ARR','36753164-8a0c-4f68-bca6-a9c16b8befb8')
+;
+
+-- Nov 3, 2018, 6:32:27 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202919,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:26','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:26','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','APP','557460c6-659f-4712-a0b3-120d2fe544f6')
+;
+
+-- Nov 3, 2018, 6:32:27 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202920,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:27','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:27','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','SOO','0c5801fe-b7dc-44b1-b3ea-5bfd8551ad66')
+;
+
+-- Nov 3, 2018, 6:32:28 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202921,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:27','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:27','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','POO','37485d0e-d695-4a64-a2d1-5facf6d72c64')
+;
+
+-- Nov 3, 2018, 6:32:28 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202922,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:28','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:28','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','HRP','4f66f942-14ff-4808-9735-c16e17f4c0d6')
+;
+
+-- Nov 3, 2018, 6:32:29 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202923,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:28','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:28','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','MOP','85bb9117-1009-4b53-9053-0f8af0cc7892')
+;
+
+-- Nov 3, 2018, 6:32:32 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202924,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:29','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:29','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','MMR','573e5db2-6bd9-4198-9b27-0ffcf6969c09')
+;
+
+-- Nov 3, 2018, 6:32:33 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202925,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:32','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:32','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','MQO','6a316aae-ffb6-48a2-bfaa-1bf1dab218ef')
+;
+
+-- Nov 3, 2018, 6:32:33 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202926,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:33','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:33','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','DOO','62f50ad3-7f45-4388-a387-bafc34b0b030')
+;
+
+-- Nov 3, 2018, 6:32:34 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202927,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:33','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:33','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','CMA','dfbcf41e-39ea-4abe-880b-724d7a2b9ebe')
+;
+
+-- Nov 3, 2018, 6:32:34 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202928,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:34','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:34','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','MMM','e8eeffc7-8365-4b3b-b9be-38ce7b545c9a')
+;
+
+-- Nov 3, 2018, 6:32:35 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202929,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:34','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:34','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','POR','c7b04c4e-76c5-4a9d-8f17-56d5fcb3bf66')
+;
+
+-- Nov 3, 2018, 6:32:36 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202930,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:35','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:35','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','MOF','ec7664ac-621a-4853-8152-e9612540ff63')
+;
+
+-- Nov 3, 2018, 6:32:36 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202931,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:36','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:36','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','MCC','102cf2c2-08ec-4458-8fc1-1645e47ac92c')
+;
+
+-- Nov 3, 2018, 6:32:37 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202932,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:36','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:36','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','MMI','ec28540b-86ec-44ef-9022-5dedd928683e')
+;
+
+-- Nov 3, 2018, 6:32:38 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202933,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:37','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:37','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','FAA','e11452e2-3bc0-4221-bb50-146fba085541')
+;
+
+-- Nov 3, 2018, 6:32:38 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202934,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:38','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:38','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','FDP','b57f170d-91de-4a98-88c4-0fe1ee89961e')
+;
+
+-- Nov 3, 2018, 6:32:39 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202935,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:38','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:38','YYYY-MM-DD HH24:MI:SS'),100,200093,'N','N','N','FAD','1b770d01-b25f-4ab8-abae-c8f33889b869')
+;
+
+-- Nov 3, 2018, 6:32:39 PM CET
+INSERT INTO C_Period (Name,StartDate,C_Period_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,PeriodNo,C_Year_ID,PeriodType,EndDate,Processing,C_Period_UU) VALUES ('Nov-19',TO_TIMESTAMP('2019-11-01','YYYY-MM-DD'),200094,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:39','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:39','YYYY-MM-DD HH24:MI:SS'),100,11,200007,'S',TO_TIMESTAMP('2019-11-30','YYYY-MM-DD'),'N','cb61d333-1016-4dfb-b35f-251dedb37c49')
+;
+
+-- Nov 3, 2018, 6:32:40 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202936,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:39','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:39','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','MMS','39f3c970-4817-4d05-bcb2-df649473faab')
+;
+
+-- Nov 3, 2018, 6:32:40 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202937,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:40','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:40','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','PJI','b3452193-5d50-4355-8269-b452609246b7')
+;
+
+-- Nov 3, 2018, 6:32:41 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202938,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:40','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:40','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','MXI','690a16ed-5f4f-4bea-a0ba-2eedcf439387')
+;
+
+-- Nov 3, 2018, 6:32:41 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202939,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:41','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:41','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','MMP','53b53f52-afc4-4342-be95-40a7ea318086')
+;
+
+-- Nov 3, 2018, 6:32:41 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202940,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:41','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:41','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','GLD','db2207b7-baa4-4759-b132-811fc267bfe3')
+;
+
+-- Nov 3, 2018, 6:32:42 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202941,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:41','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:41','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','CMC','233665ae-7656-47f8-a7fb-90a92de3ac79')
+;
+
+-- Nov 3, 2018, 6:32:42 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202942,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:42','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:42','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','MXP','16d55999-0802-434f-9a48-a88bcec2a025')
+;
+
+-- Nov 3, 2018, 6:32:43 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202943,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:42','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:42','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','ARF','4b446816-d026-4b0d-8411-673ac06e2dd7')
+;
+
+-- Nov 3, 2018, 6:32:43 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202944,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:43','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:43','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','CMB','55271d7d-7506-4077-a7ff-558b7d69dabc')
+;
+
+-- Nov 3, 2018, 6:32:47 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202945,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:43','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:43','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','API','77d9e50d-a301-4a4e-9b18-74be80f6a348')
+;
+
+-- Nov 3, 2018, 6:32:47 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202946,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:47','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:47','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','APC','24276f30-71dc-47b6-8dbb-f934d05053ed')
+;
+
+-- Nov 3, 2018, 6:32:48 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202947,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:47','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:47','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','GLJ','f331dd15-800c-4976-b382-2415cd5b9390')
+;
+
+-- Nov 3, 2018, 6:32:48 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202948,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:48','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:48','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','ARI','9ae9393f-2289-42e4-88aa-783d42bbeb54')
+;
+
+-- Nov 3, 2018, 6:32:49 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202949,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:48','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:48','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','ARC','265ebaf0-3d14-479c-b0d2-6ab012e7d0e0')
+;
+
+-- Nov 3, 2018, 6:32:49 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202950,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:49','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:49','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','ARR','3444bbcc-5ab6-40d9-8d31-0587f768de32')
+;
+
+-- Nov 3, 2018, 6:32:50 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202951,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:49','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:49','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','APP','b73237e1-b5cc-42f8-b72f-4f8a1c8567f4')
+;
+
+-- Nov 3, 2018, 6:32:50 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202952,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:50','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:50','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','SOO','0888f44e-35ba-4602-beac-9f8b496c13c0')
+;
+
+-- Nov 3, 2018, 6:32:51 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202953,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:50','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:50','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','POO','409ceccb-62a2-4b4f-925d-50e234ea5a08')
+;
+
+-- Nov 3, 2018, 6:32:51 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202954,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:51','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:51','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','HRP','661dc7f2-cace-49c4-bb5a-bc6adbc17ffe')
+;
+
+-- Nov 3, 2018, 6:32:52 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202955,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:51','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:51','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','MOP','2abf8f34-cb23-4161-ba1e-a6de107a0808')
+;
+
+-- Nov 3, 2018, 6:32:52 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202956,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:52','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:52','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','MMR','acebaf72-5120-4dfa-aca0-1f2f5f9d0a4c')
+;
+
+-- Nov 3, 2018, 6:32:53 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202957,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:52','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:52','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','MQO','636cf966-d50e-4016-a3e0-78db0f178369')
+;
+
+-- Nov 3, 2018, 6:32:54 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202958,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:53','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:53','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','DOO','a1c0f095-35a8-430f-b4e6-2997ff50458e')
+;
+
+-- Nov 3, 2018, 6:32:54 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202959,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:54','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:54','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','CMA','5fc55538-d126-495b-9404-2dd3d7701066')
+;
+
+-- Nov 3, 2018, 6:32:55 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202960,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:54','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:54','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','MMM','102a58b2-b38a-4466-a238-fe0b84e4c631')
+;
+
+-- Nov 3, 2018, 6:32:55 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202961,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:55','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:55','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','POR','b966270a-1a21-4a21-b9ef-5b0c441c407b')
+;
+
+-- Nov 3, 2018, 6:32:55 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202962,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:55','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:55','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','MOF','de32e094-da89-4d46-a714-593cd9dce985')
+;
+
+-- Nov 3, 2018, 6:32:56 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202963,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:55','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:55','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','MCC','844a68b1-4171-4f72-92df-1cf087efcf6a')
+;
+
+-- Nov 3, 2018, 6:32:59 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202964,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:56','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:56','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','MMI','4cad329b-1c14-4a51-b2f6-00ad93174b46')
+;
+
+-- Nov 3, 2018, 6:33:00 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202965,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:32:59','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:32:59','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','FAA','044cd7b6-fdc4-4585-875c-14e4eef5b29e')
+;
+
+-- Nov 3, 2018, 6:33:00 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202966,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:00','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:00','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','FDP','41786f3f-9af9-4445-a9f0-8cdf7c089395')
+;
+
+-- Nov 3, 2018, 6:33:01 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202967,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:00','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:00','YYYY-MM-DD HH24:MI:SS'),100,200094,'N','N','N','FAD','d04f0ce6-9b8a-4cf1-a7b9-8ff623f80825')
+;
+
+-- Nov 3, 2018, 6:33:01 PM CET
+INSERT INTO C_Period (Name,StartDate,C_Period_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,PeriodNo,C_Year_ID,PeriodType,EndDate,Processing,C_Period_UU) VALUES ('Dec-19',TO_TIMESTAMP('2019-12-01','YYYY-MM-DD'),200095,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:01','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:01','YYYY-MM-DD HH24:MI:SS'),100,12,200007,'S',TO_TIMESTAMP('2019-12-31','YYYY-MM-DD'),'N','9c3be9f0-2ffa-49b5-8fad-e26e01fd8c6e')
+;
+
+-- Nov 3, 2018, 6:33:02 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202968,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:01','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:01','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','MMS','0e6aad49-a360-4589-8ac4-2e8a51637097')
+;
+
+-- Nov 3, 2018, 6:33:02 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202969,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:02','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:02','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','PJI','3a4bda49-8603-43a4-9b26-c069a82b25f8')
+;
+
+-- Nov 3, 2018, 6:33:02 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202970,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:02','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:02','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','MXI','3b449f47-f85a-40ce-a97a-521f1f98dce3')
+;
+
+-- Nov 3, 2018, 6:33:03 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202971,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:02','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:02','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','MMP','43f1b437-5ce3-4cc6-8be1-971ac51b1d1d')
+;
+
+-- Nov 3, 2018, 6:33:06 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202972,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:03','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:03','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','GLD','7d655dbb-f8db-4a82-9762-9e10c3c9cb7e')
+;
+
+-- Nov 3, 2018, 6:33:07 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202973,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:06','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:06','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','CMC','2a732160-5da8-4e68-afa2-ae21bb0ca35d')
+;
+
+-- Nov 3, 2018, 6:33:07 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202974,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:07','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:07','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','MXP','0d3c43f9-204e-48a7-ba76-ddd2bee30519')
+;
+
+-- Nov 3, 2018, 6:33:08 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202975,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:07','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:07','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','ARF','9e1f56fa-47c6-40a9-9d01-15992230b64d')
+;
+
+-- Nov 3, 2018, 6:33:08 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202976,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:08','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:08','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','CMB','b30a3645-2957-49ca-8f0f-d660473438c9')
+;
+
+-- Nov 3, 2018, 6:33:08 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202977,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:08','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:08','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','API','19348673-ca44-44d0-b155-bf90339b5dc6')
+;
+
+-- Nov 3, 2018, 6:33:12 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202978,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:08','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:08','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','APC','58e0d164-2eab-442a-aa44-7a527c62de65')
+;
+
+-- Nov 3, 2018, 6:33:12 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202979,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:12','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:12','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','GLJ','a3354de9-efd2-4e70-8379-34ad26e7c447')
+;
+
+-- Nov 3, 2018, 6:33:13 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202980,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:12','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:12','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','ARI','c78bf4e5-9c4a-4558-b8ea-db3a30964478')
+;
+
+-- Nov 3, 2018, 6:33:13 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202981,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:13','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:13','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','ARC','24bf15be-8ce6-419f-89e1-1674e0798189')
+;
+
+-- Nov 3, 2018, 6:33:13 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202982,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:13','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:13','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','ARR','859371fa-7b84-44ff-9b57-6f29eba3059c')
+;
+
+-- Nov 3, 2018, 6:33:14 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202983,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:13','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:13','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','APP','f845231e-07c5-4577-bb69-5be934fb70aa')
+;
+
+-- Nov 3, 2018, 6:33:14 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202984,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:14','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:14','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','SOO','48fce4e5-767d-4ac9-9d9c-a8aa796640b4')
+;
+
+-- Nov 3, 2018, 6:33:15 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202985,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:14','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:14','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','POO','df7cb80c-4344-4c2a-abea-65440eb05057')
+;
+
+-- Nov 3, 2018, 6:33:15 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202986,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:15','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:15','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','HRP','1a8f18e2-231d-4243-978e-f714db20661b')
+;
+
+-- Nov 3, 2018, 6:33:19 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202987,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:15','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:15','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','MOP','7aeb5d23-fcde-4351-ab04-cc4839d8c097')
+;
+
+-- Nov 3, 2018, 6:33:19 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202988,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:19','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:19','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','MMR','c8df24ab-7923-4792-bec3-39515924835f')
+;
+
+-- Nov 3, 2018, 6:33:19 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202989,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:19','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:19','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','MQO','0d9d724f-d0bc-44e9-975c-3ad18390ebcb')
+;
+
+-- Nov 3, 2018, 6:33:20 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202990,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:19','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:19','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','DOO','4f2bdd09-180a-4336-aba4-df4ea76429c2')
+;
+
+-- Nov 3, 2018, 6:33:20 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202991,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:20','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:20','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','CMA','77e25c2b-fb45-4e47-8bd4-9894f1babc46')
+;
+
+-- Nov 3, 2018, 6:33:21 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202992,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:20','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:20','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','MMM','a3813988-7081-44e2-9107-34ee81209086')
+;
+
+-- Nov 3, 2018, 6:33:24 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202993,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:21','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:21','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','POR','dfaae066-1dc2-4e1a-ba73-91ec5b6fe298')
+;
+
+-- Nov 3, 2018, 6:33:24 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202994,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:24','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:24','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','MOF','ff15297b-8f9a-4b83-b8de-ec1a12332b86')
+;
+
+-- Nov 3, 2018, 6:33:25 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202995,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:24','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:24','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','MCC','4e0a324c-a1ab-4019-a51c-0513d6b22e67')
+;
+
+-- Nov 3, 2018, 6:33:25 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202996,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:25','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:25','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','MMI','3f569005-6c1b-46dd-9f36-993105cd83ce')
+;
+
+-- Nov 3, 2018, 6:33:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202997,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:25','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:25','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','FAA','b4091f55-f911-4d16-b091-0e9ffaf5cc02')
+;
+
+-- Nov 3, 2018, 6:33:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202998,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:26','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:26','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','FDP','79fce4c6-9bda-4059-a65e-56fecdecba67')
+;
+
+-- Nov 3, 2018, 6:33:26 PM CET
+INSERT INTO C_PeriodControl (C_PeriodControl_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,C_Period_ID,PeriodStatus,PeriodAction,Processing,DocBaseType,C_PeriodControl_UU) VALUES (202999,11,0,'Y',TO_TIMESTAMP('2018-11-03 18:33:26','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-11-03 18:33:26','YYYY-MM-DD HH24:MI:SS'),100,200095,'N','N','N','FAD','01ff1b75-a917-4afb-9ec3-05d9af7942ac')
+;
+
+SELECT register_migration_script('201811031833_GardenYear2019.sql') FROM dual
+;
+
diff --git a/migration/i5.1z/postgresql/201811041439_Version.sql b/migration/i5.1z/postgresql/201811041439_Version.sql
new file mode 100644
index 0000000000..f03e91f45b
--- /dev/null
+++ b/migration/i5.1z/postgresql/201811041439_Version.sql
@@ -0,0 +1,9 @@
+UPDATE AD_SYSTEM
+   SET releaseno = '6.1',
+       VERSION = '2018-11-04'
+ WHERE ad_system_id = 0 AND ad_client_id = 0
+;
+
+SELECT register_migration_script('201811041439_Version.sql') FROM dual
+;
+
diff --git a/migration/i5.1/oracle/build.xml b/migration/i6.1/oracle/build.xml
similarity index 100%
rename from migration/i5.1/oracle/build.xml
rename to migration/i6.1/oracle/build.xml
diff --git a/migration/i5.1/postgresql/build.xml b/migration/i6.1/postgresql/build.xml
similarity index 100%
rename from migration/i5.1/postgresql/build.xml
rename to migration/i6.1/postgresql/build.xml
diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml
index 2e1ae03e5f..18b199739e 100644
--- a/org.adempiere.base-feature/feature.xml
+++ b/org.adempiere.base-feature/feature.xml
@@ -2,7 +2,8 @@
 <feature
       id="org.adempiere.base.feature"
       label="Adempiere Base"
-      version="5.1.0.qualifier">
+      version="6.1.0.qualifier"
+      provider-name="iDempiere Community">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -99,13 +100,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="javax.activation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="javax.jms"
          download-size="0"
@@ -162,20 +156,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.apache.poi"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.management.j2ee-api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.apache.commons.logging"
          download-size="0"
@@ -183,34 +163,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="javax.ejb"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.xml.rpc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.xml.soap"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.xml.bind"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="javax.xml.stream"
          download-size="0"
@@ -336,13 +288,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="groovy-all"
-         download-size="0"
-         install-size="0"
-         version="2.4.13"
-         unpack="false"/>
-
    <plugin
          id="com.ibm.icu"
          download-size="0"
@@ -378,14 +323,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="javax.transaction"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
    <plugin
          id="org.apache.commons.commons-collections4"
          download-size="0"
@@ -393,13 +330,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.apache.commons.configuration"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.apache.commons.net"
          download-size="0"
@@ -421,4 +351,152 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.apache.poi.poi"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="jaxb-api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javax.transaction-api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javax.interceptor-api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javax.enterprise.cdi-api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javax.inject"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javax.annotation-api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="groovy"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.commons.commons-configuration2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javax.transaction"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="groovy-console"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="groovy-datetime"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="groovy-json"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="groovy-jsr223"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="groovy-nio"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="groovy-swing"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="groovy-xml"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="javax.jws"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javax.activation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/org.adempiere.base-feature/model.generator.launch b/org.adempiere.base-feature/model.generator.launch
index 8b5bcca936..9fd9f58794 100644
--- a/org.adempiere.base-feature/model.generator.launch
+++ b/org.adempiere.base-feature/model.generator.launch
@@ -1,32 +1,38 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.adempiere.base.ModelGeneratorApplication"/>
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/model.generator"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-model.generator"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.adempiere.server.server_product"/>
-<stringAttribute key="selected_target_plugins" value="bcpkix@default:default,bcprov@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,com.sun.mail.javax.mail@default:default,groovy-all@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.ejb@default:default,javax.inject@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant*1.10.1.v20170504-0840@default:default,org.apache.ant*1.9.6.v201510161327@default:default,org.apache.commons.codec*1.6.0.v201305230611@default:default,org.apache.commons.codec*1.9.0.v20170208-1614@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.scr@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.jfree.chart-osgi@default:default,org.jfree.jcommon-osgi@default:default,org.junit@default:default,org.krysalis.barcode4j@default:default,org.passay@default:default,org.restlet*2.0.5.v201605172130@default:default,org.restlet*2.3.2.v20150501-1520@default:default,org.slf4j.api*1.7.10.v20170428-1633@default:default,org.slf4j.api*1.7.2.v20121108-1250@default:default,org.slf4j.jcl@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.fitrecorder@default:default,org.slf4j.jdk14@default:false"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="false"/>
+    <booleanAttribute key="append.args" value="true"/>
+    <stringAttribute key="application" value="org.adempiere.base.ModelGeneratorApplication"/>
+    <booleanAttribute key="askclear" value="true"/>
+    <booleanAttribute key="automaticAdd" value="false"/>
+    <booleanAttribute key="automaticValidate" value="true"/>
+    <stringAttribute key="bootstrap" value=""/>
+    <stringAttribute key="checked" value="[NONE]"/>
+    <booleanAttribute key="clearConfig" value="true"/>
+    <booleanAttribute key="clearws" value="false"/>
+    <booleanAttribute key="clearwslog" value="false"/>
+    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/model.generator.1"/>
+    <booleanAttribute key="default" value="false"/>
+    <booleanAttribute key="includeOptional" value="false"/>
+    <stringAttribute key="location" value="${workspace_loc}/../runtime-model.generator"/>
+    <mapAttribute key="org.eclipse.debug.core.environmentVariables">
+        <mapEntry key="J2D_UISCALE" value="1"/>
+    </mapAttribute>
+    <stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.pde.ui.launcher.PDESourceLookupDirector"/>
+    <stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;sourceLookupDirector&gt;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;classpathContainer path=&amp;quot;org.eclipse.jdt.launching.JRE_CONTAINER&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.classpathContainer&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;default/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#10;&lt;/sourceContainers&gt;&#10;&lt;/sourceLookupDirector&gt;&#10;"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
+    <stringAttribute key="pde.version" value="3.3"/>
+    <stringAttribute key="product" value="org.adempiere.server.server_product"/>
+    <stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
+    <stringAttribute key="selected_target_plugins" value="bcmail@default:default,bcpkix@default:default,bcprov@default:default,bctsp@default:default,com.fasterxml.jackson.core.jackson-annotations*2.9.5@default:default,com.fasterxml.jackson.core.jackson-core*2.9.5@default:default,com.fasterxml.jackson.core.jackson-databind*2.9.5@default:default,com.fasterxml.jackson.dataformat.jackson-dataformat-xml@default:default,com.fasterxml.jackson.datatype.jackson-datatype-guava*2.9.5@default:default,com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default,com.fasterxml.jackson.datatype.jackson-datatype-json-org@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-base*2.9.5@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider*2.9.5@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-xml-provider@default:default,com.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default,com.fasterxml.jackson.module.jackson-module-jsonSchema@default:default,com.fasterxml.woodstox.woodstox-core@default:default,com.google.guava*21.0.0.v20170206-1425@default:default,com.google.zxing.core@default:default,com.ibm.icu*63.1.0@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,com.jaspersoft.studio.bundles.itext@default:default,com.sun.mail.javax.mail@default:default,groovy-console@default:false,groovy-datetime@default:false,groovy-json@default:false,groovy-jsr223@default:false,groovy-nio@default:false,groovy-swing@default:false,groovy-xml@default:false,groovy@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.enterprise.cdi-api@default:default,javax.inject@default:default,javax.interceptor-api@default:default,javax.jms@default:default,javax.jws-api@default:default,javax.jws@default:default,javax.persistence@default:default,javax.transaction-api@default:default,javax.transaction@default:false,javax.validation.api@default:default,javax.websocket-api@default:default,javax.ws.rs-api@default:default,javax.ws.rs@default:default,javax.wsdl@default:default,javax.xml.rpc@default:default,javax.xml.soap-api@default:default,javax.xml.soap@default:default,javax.xml.stream@default:default,javax.xml@default:default,jaxb-api@default:default,jaxws-api@default:default,joda-time@default:default,json@default:default,net.sf.jasperreports.engine@default:default,net.sf.supercsv.super-csv@default:default,org.antlr.runtime*4.5.1.v20160210-1233@default:default,org.aopalliance@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant*1.10.5.v20180808-0324@default:default,org.apache.aries.spifly.dynamic.bundle@default:true,org.apache.aries.util@default:default,org.apache.axis@default:default,org.apache.batik.anim@default:default,org.apache.batik.bridge@default:default,org.apache.batik.codec@default:default,org.apache.batik.constants*1.10.0.v20180703-1553@default:default,org.apache.batik.css*1.10.0.v20180703-1553@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.extension@default:default,org.apache.batik.gvt@default:default,org.apache.batik.i18n*1.10.0.v20180703-1553@default:default,org.apache.batik.parser@default:default,org.apache.batik.pdf@default:default,org.apache.batik.script@default:default,org.apache.batik.svggen@default:default,org.apache.batik.swing@default:default,org.apache.batik.transcoder@default:default,org.apache.batik.util*1.10.0.v20180703-1553@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.xml@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec*1.10.0.v20180409-1845@default:default,org.apache.commons.collections@default:default,org.apache.commons.commons-collections4@default:default,org.apache.commons.commons-configuration2@default:default,org.apache.commons.digester@default:default,org.apache.commons.discovery*0.5.0@default:default,org.apache.commons.fileupload*1.3.2.v20170320-2229@default:default,org.apache.commons.io@default:default,org.apache.commons.lang3@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,org.apache.commons.net@default:default,org.apache.cxf.cxf-core@default:default,org.apache.cxf.cxf-rt-bindings-soap@default:default,org.apache.cxf.cxf-rt-bindings-xml@default:default,org.apache.cxf.cxf-rt-databinding-jaxb@default:default,org.apache.cxf.cxf-rt-databinding-xmlbeans@default:default,org.apache.cxf.cxf-rt-frontend-jaxrs@default:default,org.apache.cxf.cxf-rt-frontend-jaxws@default:default,org.apache.cxf.cxf-rt-frontend-simple@default:default,org.apache.cxf.cxf-rt-rs-extension-providers@default:default,org.apache.cxf.cxf-rt-rs-service-description@default:default,org.apache.cxf.cxf-rt-transports-http-jetty@default:default,org.apache.cxf.cxf-rt-transports-http@default:default,org.apache.cxf.cxf-rt-ws-addr@default:default,org.apache.cxf.cxf-rt-ws-policy@default:default,org.apache.cxf.cxf-rt-wsdl@default:default,org.apache.felix.gogo.command*1.0.2.v20170914-1324@default:default,org.apache.felix.gogo.runtime*1.1.0.v20180713-1646@default:default,org.apache.felix.gogo.shell*1.1.0.v20180713-1646@default:default,org.apache.felix.scr@1:true,org.apache.felix.webconsole@default:true,org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default,org.apache.httpcomponents.httpclient*4.5.5.v20180409-1525@default:default,org.apache.httpcomponents.httpcore*4.4.9.v20180409-1525@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core*3.5.0.v20120725-1805@default:default,org.apache.neethi*3.1.1@default:default,org.apache.poi.poi-ooxml-schemas@default:default,org.apache.poi.poi-ooxml@default:default,org.apache.poi.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.servicemix.bundles.jaxen@default:default,org.apache.servicemix.bundles.rhino@default:default,org.apache.servicemix.bundles.spring-aop@default:default,org.apache.servicemix.bundles.spring-beans@default:default,org.apache.servicemix.bundles.spring-context-support@default:default,org.apache.servicemix.bundles.spring-context@default:default,org.apache.servicemix.bundles.spring-core@default:default,org.apache.servicemix.bundles.spring-expression@default:default,org.apache.servicemix.bundles.spring-web@default:default,org.apache.taglibs.standard-impl@default:default,org.apache.taglibs.standard-jstlel@default:default,org.apache.taglibs.taglibs-standard-spec@default:default,org.apache.ws.xmlschema.core@default:default,org.apache.xalan@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.apache.xmlbeans*3.0.1@default:default,org.apache.xmlgraphics*2.2.0.v20180809-1640@default:default,org.atmosphere.runtime@default:default,org.cryptacular@default:default,org.dom4j@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@default:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@2:true,org.eclipse.equinox.event@2:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:true,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.metatype@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jetty.alpn.api@default:true,org.eclipse.jetty.alpn.conscrypt.server@default:true,org.eclipse.jetty.alpn.server@default:true,org.eclipse.jetty.annotations@default:default,org.eclipse.jetty.apache-jsp@default:true,org.eclipse.jetty.client@default:default,org.eclipse.jetty.continuation*9.4.12.v20180830@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http*9.4.12.v20180830@default:true,org.eclipse.jetty.http2.common@default:true,org.eclipse.jetty.http2.hpack@default:true,org.eclipse.jetty.http2.server@default:true,org.eclipse.jetty.io*9.4.12.v20180830@default:default,org.eclipse.jetty.jaas@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.jndi@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.alpn.fragment@default:false,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.plus@default:default,org.eclipse.jetty.security*9.4.12.v20180830@default:default,org.eclipse.jetty.server*9.4.12.v20180830@default:default,org.eclipse.jetty.servlet*9.4.12.v20180830@default:default,org.eclipse.jetty.servlets@default:default,org.eclipse.jetty.util*9.4.12.v20180830@default:default,org.eclipse.jetty.util.ajax@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.javax.websocket.server@default:default,org.eclipse.jetty.websocket.javax.websocket@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi*3.13.100.v20180827-1536@-1:true,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services*3.7.100.v20180827-1536@default:default,org.eclipse.osgi.util*3.5.100.v20180827-1536@default:default,org.eclipse.text@default:default,org.glassfish.hk2.api@default:default,org.glassfish.hk2.locator@default:default,org.glassfish.hk2.osgi-resource-locator@default:default,org.glassfish.hk2.utils@default:default,org.glassfish.jersey.bundles.repackaged.jersey-guava@default:default,org.glassfish.jersey.core.jersey-common@default:default,org.hamcrest.core@default:default,org.idempiere.org.conscrypt.openjdk-uber@default:default,org.jfree.chart-osgi@default:default,org.jfree.jcommon-osgi@default:default,org.json@default:default,org.junit@default:default,org.krysalis.barcode4j@default:default,org.mortbay.jasper.apache-el@default:true,org.mortbay.jasper.apache-jsp@default:true,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.passay@default:default,org.restlet*2.3.2.v20150501-1520@default:true,org.restlet.ext.servlet*2.3.2.v20150501-1520@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.springframework.spring-jcl@default:default,org.tukaani.xz*1.8.0.v20180207-1613@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default,slf4j.api@default:default,slf4j.jcl@default:false,stax2-api*3.1.4@default:default,stax2-api*4.1.0@default:default,zcommon@default:default,zel@default:default,zhtml@default:default,zjavassist@default:default,zk@default:default,zkbind@default:default,zkplus@default:default,zul@default:default,zweb@default:default"/>
+    <stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.report.jasper.library@default:false,org.adempiere.server@default:true,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.zk.extra@default:default"/>
+    <booleanAttribute key="show_selected_only" value="false"/>
+    <booleanAttribute key="tracing" value="false"/>
+    <booleanAttribute key="useCustomFeatures" value="false"/>
+    <booleanAttribute key="useDefaultConfig" value="true"/>
+    <booleanAttribute key="useDefaultConfigArea" value="true"/>
+    <booleanAttribute key="useProduct" value="false"/>
+    <booleanAttribute key="usefeatures" value="false"/>
 </launchConfiguration>
diff --git a/org.adempiere.base-feature/pom.xml b/org.adempiere.base-feature/pom.xml
index 4df4e241bd..e0075902e3 100644
--- a/org.adempiere.base-feature/pom.xml
+++ b/org.adempiere.base-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.base.feature</artifactId>
diff --git a/org.adempiere.base-feature/sign.database.build.launch b/org.adempiere.base-feature/sign.database.build.launch
index 6394255b5c..36060fe89b 100644
--- a/org.adempiere.base-feature/sign.database.build.launch
+++ b/org.adempiere.base-feature/sign.database.build.launch
@@ -1,32 +1,35 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.adempiere.base.SignDatabaseBuildApplication"/>
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="true"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/sign.database.build"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-sign.database.build"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.adempiere.server.server_product"/>
-<stringAttribute key="selected_target_plugins" value="bcpkix@default:default,bcprov@default:default,com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.ibm.icu@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,com.jaspersoft.studio.bundles.poi@default:default,com.sun.mail.javax.mail@default:default,groovy-all@default:default,java_cup.runtime@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.ejb@default:default,javax.inject@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml.stream@default:default,javax.xml@default:default,joda-time@default:default,net.sf.jasperreports.engine@default:default,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.bcel@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.scr@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.servicemix.bundles.xmlbeans@default:default,org.apache.xalan@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.cryptacular@default:default,org.dom4j@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.alpn.fragment@default:false,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.jfree.chart-osgi@default:default,org.jfree.jcommon-osgi@default:default,org.junit@default:default,org.krysalis.barcode4j@default:default,org.mortbay.jasper.apache-el@default:default,org.passay@default:default,org.restlet@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.report.jasper.library@default:false,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.fitrecorder@default:default,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:false"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="false"/>
+    <booleanAttribute key="append.args" value="true"/>
+    <stringAttribute key="application" value="org.adempiere.base.SignDatabaseBuildApplication"/>
+    <booleanAttribute key="askclear" value="true"/>
+    <booleanAttribute key="automaticAdd" value="false"/>
+    <booleanAttribute key="automaticValidate" value="true"/>
+    <stringAttribute key="bootstrap" value=""/>
+    <stringAttribute key="checked" value="[NONE]"/>
+    <booleanAttribute key="clearConfig" value="true"/>
+    <booleanAttribute key="clearws" value="false"/>
+    <booleanAttribute key="clearwslog" value="false"/>
+    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/sign.database.build"/>
+    <booleanAttribute key="default" value="false"/>
+    <booleanAttribute key="includeOptional" value="false"/>
+    <stringAttribute key="location" value="${workspace_loc}/../runtime-sign.database.build"/>
+    <stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.pde.ui.launcher.PDESourceLookupDirector"/>
+    <stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;sourceLookupDirector&gt;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;classpathContainer path=&amp;quot;org.eclipse.jdt.launching.JRE_CONTAINER&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.classpathContainer&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;default/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#10;&lt;/sourceContainers&gt;&#10;&lt;/sourceLookupDirector&gt;&#10;"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
+    <stringAttribute key="pde.version" value="3.3"/>
+    <stringAttribute key="product" value="org.adempiere.server.server_product"/>
+    <stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
+    <stringAttribute key="selected_target_plugins" value="bcmail@default:default,bcpkix@default:default,bcprov@default:default,bctsp@default:default,com.fasterxml.jackson.core.jackson-annotations*2.9.5@default:default,com.fasterxml.jackson.core.jackson-core*2.9.5@default:default,com.fasterxml.jackson.core.jackson-databind*2.9.5@default:default,com.fasterxml.jackson.dataformat.jackson-dataformat-xml@default:default,com.fasterxml.jackson.datatype.jackson-datatype-guava*2.9.5@default:default,com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default,com.fasterxml.jackson.datatype.jackson-datatype-json-org@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-base*2.9.5@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider*2.9.5@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-xml-provider@default:default,com.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default,com.fasterxml.jackson.module.jackson-module-jsonSchema@default:default,com.fasterxml.woodstox.woodstox-core@default:default,com.google.guava*21.0.0.v20170206-1425@default:default,com.google.zxing.core@default:default,com.ibm.icu*63.1.0@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,com.jaspersoft.studio.bundles.itext@default:default,com.sun.mail.javax.mail@default:default,groovy-console@default:false,groovy-datetime@default:false,groovy-json@default:false,groovy-jsr223@default:false,groovy-nio@default:false,groovy-swing@default:false,groovy-xml@default:false,groovy@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.enterprise.cdi-api@default:default,javax.inject@default:default,javax.interceptor-api@default:default,javax.jms@default:default,javax.jws-api@default:default,javax.jws@default:default,javax.persistence@default:default,javax.transaction-api@default:default,javax.transaction@default:false,javax.validation.api@default:default,javax.websocket-api@default:default,javax.ws.rs-api@default:default,javax.ws.rs@default:default,javax.wsdl@default:default,javax.xml.rpc@default:default,javax.xml.soap-api@default:default,javax.xml.soap@default:default,javax.xml.stream@default:default,javax.xml@default:default,jaxb-api@default:default,jaxws-api@default:default,joda-time@default:default,json@default:default,net.sf.jasperreports.engine@default:default,net.sf.supercsv.super-csv@default:default,org.antlr.runtime*4.5.1.v20160210-1233@default:default,org.aopalliance@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant*1.10.5.v20180808-0324@default:default,org.apache.aries.spifly.dynamic.bundle@default:true,org.apache.aries.util@default:default,org.apache.axis@default:default,org.apache.batik.anim@default:default,org.apache.batik.bridge@default:default,org.apache.batik.codec@default:default,org.apache.batik.constants*1.10.0.v20180703-1553@default:default,org.apache.batik.css*1.10.0.v20180703-1553@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.extension@default:default,org.apache.batik.gvt@default:default,org.apache.batik.i18n*1.10.0.v20180703-1553@default:default,org.apache.batik.parser@default:default,org.apache.batik.pdf@default:default,org.apache.batik.script@default:default,org.apache.batik.svggen@default:default,org.apache.batik.swing@default:default,org.apache.batik.transcoder@default:default,org.apache.batik.util*1.10.0.v20180703-1553@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.xml@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec*1.10.0.v20180409-1845@default:default,org.apache.commons.collections@default:default,org.apache.commons.commons-collections4@default:default,org.apache.commons.commons-configuration2@default:default,org.apache.commons.digester@default:default,org.apache.commons.discovery*0.5.0@default:default,org.apache.commons.fileupload*1.3.2.v20170320-2229@default:default,org.apache.commons.io@default:default,org.apache.commons.lang3@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,org.apache.commons.net@default:default,org.apache.cxf.cxf-core@default:default,org.apache.cxf.cxf-rt-bindings-soap@default:default,org.apache.cxf.cxf-rt-bindings-xml@default:default,org.apache.cxf.cxf-rt-databinding-jaxb@default:default,org.apache.cxf.cxf-rt-databinding-xmlbeans@default:default,org.apache.cxf.cxf-rt-frontend-jaxrs@default:default,org.apache.cxf.cxf-rt-frontend-jaxws@default:default,org.apache.cxf.cxf-rt-frontend-simple@default:default,org.apache.cxf.cxf-rt-rs-extension-providers@default:default,org.apache.cxf.cxf-rt-rs-service-description@default:default,org.apache.cxf.cxf-rt-transports-http-jetty@default:default,org.apache.cxf.cxf-rt-transports-http@default:default,org.apache.cxf.cxf-rt-ws-addr@default:default,org.apache.cxf.cxf-rt-ws-policy@default:default,org.apache.cxf.cxf-rt-wsdl@default:default,org.apache.felix.gogo.command*1.0.2.v20170914-1324@default:default,org.apache.felix.gogo.runtime*1.1.0.v20180713-1646@default:default,org.apache.felix.gogo.shell*1.1.0.v20180713-1646@default:default,org.apache.felix.scr@1:true,org.apache.felix.webconsole@default:true,org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default,org.apache.httpcomponents.httpclient*4.5.5.v20180409-1525@default:default,org.apache.httpcomponents.httpcore*4.4.9.v20180409-1525@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core*3.5.0.v20120725-1805@default:default,org.apache.neethi*3.1.1@default:default,org.apache.poi.poi-ooxml-schemas@default:default,org.apache.poi.poi-ooxml@default:default,org.apache.poi.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.servicemix.bundles.jaxen@default:default,org.apache.servicemix.bundles.rhino@default:default,org.apache.servicemix.bundles.spring-aop@default:default,org.apache.servicemix.bundles.spring-beans@default:default,org.apache.servicemix.bundles.spring-context-support@default:default,org.apache.servicemix.bundles.spring-context@default:default,org.apache.servicemix.bundles.spring-core@default:default,org.apache.servicemix.bundles.spring-expression@default:default,org.apache.servicemix.bundles.spring-web@default:default,org.apache.taglibs.standard-impl@default:default,org.apache.taglibs.standard-jstlel@default:default,org.apache.taglibs.taglibs-standard-spec@default:default,org.apache.ws.xmlschema.core@default:default,org.apache.xalan@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.apache.xmlbeans*3.0.1@default:default,org.apache.xmlgraphics*2.2.0.v20180809-1640@default:default,org.atmosphere.runtime@default:default,org.cryptacular@default:default,org.dom4j@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@default:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@2:true,org.eclipse.equinox.event@2:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:true,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.metatype@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jetty.alpn.api@default:true,org.eclipse.jetty.alpn.conscrypt.server@default:true,org.eclipse.jetty.alpn.server@default:true,org.eclipse.jetty.annotations@default:default,org.eclipse.jetty.apache-jsp@default:true,org.eclipse.jetty.client@default:default,org.eclipse.jetty.continuation*9.4.12.v20180830@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http*9.4.12.v20180830@default:true,org.eclipse.jetty.http2.common@default:true,org.eclipse.jetty.http2.hpack@default:true,org.eclipse.jetty.http2.server@default:true,org.eclipse.jetty.io*9.4.12.v20180830@default:default,org.eclipse.jetty.jaas@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.jndi@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.alpn.fragment@default:false,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.plus@default:default,org.eclipse.jetty.security*9.4.12.v20180830@default:default,org.eclipse.jetty.server*9.4.12.v20180830@default:default,org.eclipse.jetty.servlet*9.4.12.v20180830@default:default,org.eclipse.jetty.servlets@default:default,org.eclipse.jetty.util*9.4.12.v20180830@default:default,org.eclipse.jetty.util.ajax@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.javax.websocket.server@default:default,org.eclipse.jetty.websocket.javax.websocket@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi*3.13.100.v20180827-1536@-1:true,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services*3.7.100.v20180827-1536@default:default,org.eclipse.osgi.util*3.5.100.v20180827-1536@default:default,org.eclipse.text@default:default,org.glassfish.hk2.api@default:default,org.glassfish.hk2.locator@default:default,org.glassfish.hk2.osgi-resource-locator@default:default,org.glassfish.hk2.utils@default:default,org.glassfish.jersey.bundles.repackaged.jersey-guava@default:default,org.glassfish.jersey.core.jersey-common@default:default,org.hamcrest.core@default:default,org.idempiere.org.conscrypt.openjdk-uber@default:default,org.jfree.chart-osgi@default:default,org.jfree.jcommon-osgi@default:default,org.json@default:default,org.junit@default:default,org.krysalis.barcode4j@default:default,org.mortbay.jasper.apache-el@default:true,org.mortbay.jasper.apache-jsp@default:true,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.passay@default:default,org.restlet*2.3.2.v20150501-1520@default:true,org.restlet.ext.servlet*2.3.2.v20150501-1520@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.springframework.spring-jcl@default:default,org.tukaani.xz*1.8.0.v20180207-1613@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default,slf4j.api@default:default,slf4j.jcl@default:false,stax2-api*3.1.4@default:default,stax2-api*4.1.0@default:default,zcommon@default:default,zel@default:default,zhtml@default:default,zjavassist@default:default,zk@default:default,zkbind@default:default,zkplus@default:default,zul@default:default,zweb@default:default"/>
+    <stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.report.jasper.library@default:false,org.adempiere.server@default:true,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.zk.extra@default:default"/>
+    <booleanAttribute key="show_selected_only" value="false"/>
+    <booleanAttribute key="tracing" value="false"/>
+    <booleanAttribute key="useCustomFeatures" value="false"/>
+    <booleanAttribute key="useDefaultConfig" value="true"/>
+    <booleanAttribute key="useDefaultConfigArea" value="true"/>
+    <booleanAttribute key="useProduct" value="false"/>
+    <booleanAttribute key="usefeatures" value="false"/>
 </launchConfiguration>
diff --git a/org.adempiere.base-feature/synchronize-terminology.app.launch b/org.adempiere.base-feature/synchronize-terminology.app.launch
index 4031586bcc..d6eefa3f11 100644
--- a/org.adempiere.base-feature/synchronize-terminology.app.launch
+++ b/org.adempiere.base-feature/synchronize-terminology.app.launch
@@ -1,32 +1,35 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.adempiere.install.translation"/>
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="true"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/synchronize-terminology.app"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="includeOptional" value="false"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-translation.app"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog&#10;sync"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.adempiere.server.server_product"/>
-<stringAttribute key="selected_target_plugins" value="bcprov*1.55.0@default:default,bcprov*1.56.0@default:default,com.itextpdf@default:default,com.sun.mail.javax.mail@default:default,groovy-all*2.4.7@default:default,groovy-all*2.4.8@default:default,javax.activation@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.alpn.fragment@default:false,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.passay@default:default,org.restlet@default:default,org.slf4j.api@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.process@default:default,org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.slf4j.jdk14@default:false"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="false"/>
+    <booleanAttribute key="append.args" value="true"/>
+    <stringAttribute key="application" value="org.adempiere.install.translation"/>
+    <booleanAttribute key="askclear" value="true"/>
+    <booleanAttribute key="automaticAdd" value="false"/>
+    <booleanAttribute key="automaticValidate" value="true"/>
+    <stringAttribute key="bootstrap" value=""/>
+    <stringAttribute key="checked" value="[NONE]"/>
+    <booleanAttribute key="clearConfig" value="true"/>
+    <booleanAttribute key="clearws" value="false"/>
+    <booleanAttribute key="clearwslog" value="false"/>
+    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/synchronize-terminology.app"/>
+    <booleanAttribute key="default" value="false"/>
+    <booleanAttribute key="includeOptional" value="false"/>
+    <stringAttribute key="location" value="${workspace_loc}/../runtime-translation.app"/>
+    <stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.pde.ui.launcher.PDESourceLookupDirector"/>
+    <stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;sourceLookupDirector&gt;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;classpathContainer path=&amp;quot;org.eclipse.jdt.launching.JRE_CONTAINER&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.classpathContainer&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;default/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#10;&lt;/sourceContainers&gt;&#10;&lt;/sourceLookupDirector&gt;&#10;"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog&#10;sync"/>
+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
+    <stringAttribute key="pde.version" value="3.3"/>
+    <stringAttribute key="product" value="org.adempiere.server.server_product"/>
+    <stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
+    <stringAttribute key="selected_target_plugins" value="bcprov@default:default,com.google.guava*21.0.0.v20170206-1425@default:default,com.google.zxing.core@default:default,com.ibm.icu*63.1.0@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,com.sun.mail.javax.mail@default:default,groovy-console@default:false,groovy-datetime@default:false,groovy-json@default:false,groovy-jsr223@default:false,groovy-nio@default:false,groovy-swing@default:false,groovy-xml@default:false,groovy@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.enterprise.cdi-api@default:default,javax.inject@default:default,javax.interceptor-api@default:default,javax.jms@default:default,javax.jws-api@default:default,javax.jws@default:default,javax.persistence@default:default,javax.transaction-api@default:default,javax.transaction@default:false,javax.validation.api@default:default,javax.websocket-api@default:default,javax.ws.rs-api@default:default,javax.ws.rs@default:default,javax.wsdl@default:default,javax.xml.rpc@default:default,javax.xml.soap-api@default:default,javax.xml.soap@default:default,javax.xml.stream@default:default,javax.xml@default:default,jaxb-api@default:default,jaxws-api@default:default,joda-time@default:default,json@default:default,net.sf.jasperreports.engine@default:default,net.sf.supercsv.super-csv@default:default,org.antlr.runtime*4.5.1.v20160210-1233@default:default,org.aopalliance@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant*1.10.5.v20180808-0324@default:default,org.apache.aries.spifly.dynamic.bundle@default:true,org.apache.aries.util@default:default,org.apache.axis@default:default,org.apache.batik.anim@default:default,org.apache.batik.bridge@default:default,org.apache.batik.codec@default:default,org.apache.batik.constants*1.10.0.v20180703-1553@default:default,org.apache.batik.css*1.10.0.v20180703-1553@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.extension@default:default,org.apache.batik.gvt@default:default,org.apache.batik.i18n*1.10.0.v20180703-1553@default:default,org.apache.batik.parser@default:default,org.apache.batik.pdf@default:default,org.apache.batik.script@default:default,org.apache.batik.svggen@default:default,org.apache.batik.swing@default:default,org.apache.batik.transcoder@default:default,org.apache.batik.util*1.10.0.v20180703-1553@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.xml@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec*1.10.0.v20180409-1845@default:default,org.apache.commons.collections@default:default,org.apache.commons.commons-collections4@default:default,org.apache.commons.commons-configuration2@default:default,org.apache.commons.digester@default:default,org.apache.commons.discovery*0.5.0@default:default,org.apache.commons.fileupload*1.3.2.v20170320-2229@default:default,org.apache.commons.io@default:default,org.apache.commons.lang3@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,org.apache.commons.net@default:default,org.apache.cxf.cxf-core@default:default,org.apache.cxf.cxf-rt-bindings-soap@default:default,org.apache.cxf.cxf-rt-bindings-xml@default:default,org.apache.cxf.cxf-rt-databinding-jaxb@default:default,org.apache.cxf.cxf-rt-databinding-xmlbeans@default:default,org.apache.cxf.cxf-rt-frontend-jaxrs@default:default,org.apache.cxf.cxf-rt-frontend-jaxws@default:default,org.apache.cxf.cxf-rt-frontend-simple@default:default,org.apache.cxf.cxf-rt-rs-extension-providers@default:default,org.apache.cxf.cxf-rt-rs-service-description@default:default,org.apache.cxf.cxf-rt-transports-http-jetty@default:default,org.apache.cxf.cxf-rt-transports-http@default:default,org.apache.cxf.cxf-rt-ws-addr@default:default,org.apache.cxf.cxf-rt-ws-policy@default:default,org.apache.cxf.cxf-rt-wsdl@default:default,org.apache.felix.gogo.command*1.0.2.v20170914-1324@default:default,org.apache.felix.gogo.runtime*1.1.0.v20180713-1646@default:default,org.apache.felix.gogo.shell*1.1.0.v20180713-1646@default:default,org.apache.felix.scr@1:true,org.apache.felix.webconsole@default:true,org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default,org.apache.httpcomponents.httpclient*4.5.5.v20180409-1525@default:default,org.apache.httpcomponents.httpcore*4.4.9.v20180409-1525@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core*3.5.0.v20120725-1805@default:default,org.apache.neethi*3.1.1@default:default,org.apache.poi.poi-ooxml-schemas@default:default,org.apache.poi.poi-ooxml@default:default,org.apache.poi.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.servicemix.bundles.jaxen@default:default,org.apache.servicemix.bundles.rhino@default:default,org.apache.servicemix.bundles.spring-aop@default:default,org.apache.servicemix.bundles.spring-beans@default:default,org.apache.servicemix.bundles.spring-context-support@default:default,org.apache.servicemix.bundles.spring-context@default:default,org.apache.servicemix.bundles.spring-core@default:default,org.apache.servicemix.bundles.spring-expression@default:default,org.apache.servicemix.bundles.spring-web@default:default,org.apache.taglibs.standard-impl@default:default,org.apache.taglibs.standard-jstlel@default:default,org.apache.taglibs.taglibs-standard-spec@default:default,org.apache.ws.xmlschema.core@default:default,org.apache.xalan@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.apache.xmlbeans*3.0.1@default:default,org.apache.xmlgraphics*2.2.0.v20180809-1640@default:default,org.atmosphere.runtime@default:default,org.cryptacular@default:default,org.dom4j@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@default:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@2:true,org.eclipse.equinox.event@2:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:true,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.metatype@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jetty.alpn.api@default:true,org.eclipse.jetty.alpn.conscrypt.server@default:true,org.eclipse.jetty.alpn.server@default:true,org.eclipse.jetty.annotations@default:default,org.eclipse.jetty.apache-jsp@default:true,org.eclipse.jetty.client@default:default,org.eclipse.jetty.continuation*9.4.12.v20180830@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http*9.4.12.v20180830@default:true,org.eclipse.jetty.http2.common@default:true,org.eclipse.jetty.http2.hpack@default:true,org.eclipse.jetty.http2.server@default:true,org.eclipse.jetty.io*9.4.12.v20180830@default:default,org.eclipse.jetty.jaas@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.jndi@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.alpn.fragment@default:false,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.plus@default:default,org.eclipse.jetty.security*9.4.12.v20180830@default:default,org.eclipse.jetty.server*9.4.12.v20180830@default:default,org.eclipse.jetty.servlet*9.4.12.v20180830@default:default,org.eclipse.jetty.servlets@default:default,org.eclipse.jetty.util*9.4.12.v20180830@default:default,org.eclipse.jetty.util.ajax@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.javax.websocket.server@default:default,org.eclipse.jetty.websocket.javax.websocket@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi*3.13.100.v20180827-1536@-1:true,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services*3.7.100.v20180827-1536@default:default,org.eclipse.osgi.util*3.5.100.v20180827-1536@default:default,org.eclipse.text@default:default,org.glassfish.hk2.api@default:default,org.glassfish.hk2.locator@default:default,org.glassfish.hk2.osgi-resource-locator@default:default,org.glassfish.hk2.utils@default:default,org.glassfish.jersey.bundles.repackaged.jersey-guava@default:default,org.glassfish.jersey.core.jersey-common@default:default,org.hamcrest.core@default:default,org.idempiere.org.conscrypt.openjdk-uber@default:default,org.jfree.chart-osgi@default:default,org.jfree.jcommon-osgi@default:default,org.json@default:default,org.junit@default:default,org.krysalis.barcode4j@default:default,org.mortbay.jasper.apache-el@default:true,org.mortbay.jasper.apache-jsp@default:true,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.passay@default:default,org.restlet*2.3.2.v20150501-1520@default:true,org.restlet.ext.servlet*2.3.2.v20150501-1520@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.springframework.spring-jcl@default:default,org.tukaani.xz*1.8.0.v20180207-1613@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default,slf4j.api@default:default,slf4j.jcl@default:false,stax2-api*3.1.4@default:default,stax2-api*4.1.0@default:default,zcommon@default:default,zel@default:default,zhtml@default:default,zjavassist@default:default,zk@default:default,zkbind@default:default,zkplus@default:default,zul@default:default,zweb@default:default"/>
+    <stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.process@default:default,org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default"/>
+    <booleanAttribute key="show_selected_only" value="false"/>
+    <booleanAttribute key="tracing" value="false"/>
+    <booleanAttribute key="useCustomFeatures" value="false"/>
+    <booleanAttribute key="useDefaultConfig" value="true"/>
+    <booleanAttribute key="useDefaultConfigArea" value="true"/>
+    <booleanAttribute key="useProduct" value="false"/>
+    <booleanAttribute key="usefeatures" value="false"/>
 </launchConfiguration>
diff --git a/org.adempiere.base-feature/translation.app.launch b/org.adempiere.base-feature/translation.app.launch
index f05271891b..aa2ed159cb 100644
--- a/org.adempiere.base-feature/translation.app.launch
+++ b/org.adempiere.base-feature/translation.app.launch
@@ -1,32 +1,35 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.adempiere.install.translation"/>
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="true"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/translation.app"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="includeOptional" value="false"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-translation.app"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog&#10;import ../globalqss-idempiere-lco/es_CO es_CO"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.adempiere.server.server_product"/>
-<stringAttribute key="selected_target_plugins" value="bcprov*1.55.0@default:default,bcprov*1.56.0@default:default,com.itextpdf@default:default,com.sun.mail.javax.mail@default:default,groovy-all*2.4.7@default:default,groovy-all*2.4.8@default:default,javax.activation@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.alpn.fragment@default:false,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.passay@default:default,org.restlet@default:default,org.slf4j.api@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.slf4j.jdk14@default:false"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="false"/>
+    <booleanAttribute key="append.args" value="true"/>
+    <stringAttribute key="application" value="org.adempiere.install.translation"/>
+    <booleanAttribute key="askclear" value="true"/>
+    <booleanAttribute key="automaticAdd" value="false"/>
+    <booleanAttribute key="automaticValidate" value="true"/>
+    <stringAttribute key="bootstrap" value=""/>
+    <stringAttribute key="checked" value="[NONE]"/>
+    <booleanAttribute key="clearConfig" value="true"/>
+    <booleanAttribute key="clearws" value="false"/>
+    <booleanAttribute key="clearwslog" value="false"/>
+    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/translation.app.1"/>
+    <booleanAttribute key="default" value="false"/>
+    <booleanAttribute key="includeOptional" value="false"/>
+    <stringAttribute key="location" value="${workspace_loc}/../runtime-translation.app"/>
+    <stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.pde.ui.launcher.PDESourceLookupDirector"/>
+    <stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;sourceLookupDirector&gt;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;classpathContainer path=&amp;quot;org.eclipse.jdt.launching.JRE_CONTAINER&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.classpathContainer&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;default/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#10;&lt;/sourceContainers&gt;&#10;&lt;/sourceLookupDirector&gt;&#10;"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog&#10;import ../globalqss-idempiere-lco/es_CO es_CO"/>
+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
+    <stringAttribute key="pde.version" value="3.3"/>
+    <stringAttribute key="product" value="org.adempiere.server.server_product"/>
+    <stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
+    <stringAttribute key="selected_target_plugins" value="bcprov@default:default,com.google.guava*21.0.0.v20170206-1425@default:default,com.google.zxing.core@default:default,com.ibm.icu*63.1.0@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,com.sun.mail.javax.mail@default:default,groovy-console@default:false,groovy-datetime@default:false,groovy-json@default:false,groovy-jsr223@default:false,groovy-nio@default:false,groovy-swing@default:false,groovy-xml@default:false,groovy@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.enterprise.cdi-api@default:default,javax.inject@default:default,javax.interceptor-api@default:default,javax.jms@default:default,javax.jws-api@default:default,javax.jws@default:default,javax.persistence@default:default,javax.transaction-api@default:default,javax.transaction@default:false,javax.validation.api@default:default,javax.websocket-api@default:default,javax.ws.rs-api@default:default,javax.ws.rs@default:default,javax.wsdl@default:default,javax.xml.rpc@default:default,javax.xml.soap-api@default:default,javax.xml.soap@default:default,javax.xml.stream@default:default,javax.xml@default:default,jaxb-api@default:default,jaxws-api@default:default,joda-time@default:default,json@default:default,net.sf.jasperreports.engine@default:default,net.sf.supercsv.super-csv@default:default,org.antlr.runtime*4.5.1.v20160210-1233@default:default,org.aopalliance@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant*1.10.5.v20180808-0324@default:default,org.apache.aries.spifly.dynamic.bundle@default:true,org.apache.aries.util@default:default,org.apache.axis@default:default,org.apache.batik.anim@default:default,org.apache.batik.bridge@default:default,org.apache.batik.codec@default:default,org.apache.batik.constants*1.10.0.v20180703-1553@default:default,org.apache.batik.css*1.10.0.v20180703-1553@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.extension@default:default,org.apache.batik.gvt@default:default,org.apache.batik.i18n*1.10.0.v20180703-1553@default:default,org.apache.batik.parser@default:default,org.apache.batik.pdf@default:default,org.apache.batik.script@default:default,org.apache.batik.svggen@default:default,org.apache.batik.swing@default:default,org.apache.batik.transcoder@default:default,org.apache.batik.util*1.10.0.v20180703-1553@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.xml@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec*1.10.0.v20180409-1845@default:default,org.apache.commons.collections@default:default,org.apache.commons.commons-collections4@default:default,org.apache.commons.commons-configuration2@default:default,org.apache.commons.digester@default:default,org.apache.commons.discovery*0.5.0@default:default,org.apache.commons.fileupload*1.3.2.v20170320-2229@default:default,org.apache.commons.io@default:default,org.apache.commons.lang3@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,org.apache.commons.net@default:default,org.apache.cxf.cxf-core@default:default,org.apache.cxf.cxf-rt-bindings-soap@default:default,org.apache.cxf.cxf-rt-bindings-xml@default:default,org.apache.cxf.cxf-rt-databinding-jaxb@default:default,org.apache.cxf.cxf-rt-databinding-xmlbeans@default:default,org.apache.cxf.cxf-rt-frontend-jaxrs@default:default,org.apache.cxf.cxf-rt-frontend-jaxws@default:default,org.apache.cxf.cxf-rt-frontend-simple@default:default,org.apache.cxf.cxf-rt-rs-extension-providers@default:default,org.apache.cxf.cxf-rt-rs-service-description@default:default,org.apache.cxf.cxf-rt-transports-http-jetty@default:default,org.apache.cxf.cxf-rt-transports-http@default:default,org.apache.cxf.cxf-rt-ws-addr@default:default,org.apache.cxf.cxf-rt-ws-policy@default:default,org.apache.cxf.cxf-rt-wsdl@default:default,org.apache.felix.gogo.command*1.0.2.v20170914-1324@default:default,org.apache.felix.gogo.runtime*1.1.0.v20180713-1646@default:default,org.apache.felix.gogo.shell*1.1.0.v20180713-1646@default:default,org.apache.felix.scr@1:true,org.apache.felix.webconsole@default:true,org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default,org.apache.httpcomponents.httpclient*4.5.5.v20180409-1525@default:default,org.apache.httpcomponents.httpcore*4.4.9.v20180409-1525@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core*3.5.0.v20120725-1805@default:default,org.apache.neethi*3.1.1@default:default,org.apache.poi.poi-ooxml-schemas@default:default,org.apache.poi.poi-ooxml@default:default,org.apache.poi.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.servicemix.bundles.jaxen@default:default,org.apache.servicemix.bundles.rhino@default:default,org.apache.servicemix.bundles.spring-aop@default:default,org.apache.servicemix.bundles.spring-beans@default:default,org.apache.servicemix.bundles.spring-context-support@default:default,org.apache.servicemix.bundles.spring-context@default:default,org.apache.servicemix.bundles.spring-core@default:default,org.apache.servicemix.bundles.spring-expression@default:default,org.apache.servicemix.bundles.spring-web@default:default,org.apache.taglibs.standard-impl@default:default,org.apache.taglibs.standard-jstlel@default:default,org.apache.taglibs.taglibs-standard-spec@default:default,org.apache.ws.xmlschema.core@default:default,org.apache.xalan@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.apache.xmlbeans*3.0.1@default:default,org.apache.xmlgraphics*2.2.0.v20180809-1640@default:default,org.atmosphere.runtime@default:default,org.cryptacular@default:default,org.dom4j@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@default:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@2:true,org.eclipse.equinox.event@2:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:true,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.metatype@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jetty.alpn.api@default:true,org.eclipse.jetty.alpn.conscrypt.server@default:true,org.eclipse.jetty.alpn.server@default:true,org.eclipse.jetty.annotations@default:default,org.eclipse.jetty.apache-jsp@default:true,org.eclipse.jetty.client@default:default,org.eclipse.jetty.continuation*9.4.12.v20180830@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http*9.4.12.v20180830@default:true,org.eclipse.jetty.http2.common@default:true,org.eclipse.jetty.http2.hpack@default:true,org.eclipse.jetty.http2.server@default:true,org.eclipse.jetty.io*9.4.12.v20180830@default:default,org.eclipse.jetty.jaas@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.jndi@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.alpn.fragment@default:false,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.plus@default:default,org.eclipse.jetty.security*9.4.12.v20180830@default:default,org.eclipse.jetty.server*9.4.12.v20180830@default:default,org.eclipse.jetty.servlet*9.4.12.v20180830@default:default,org.eclipse.jetty.servlets@default:default,org.eclipse.jetty.util*9.4.12.v20180830@default:default,org.eclipse.jetty.util.ajax@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.javax.websocket.server@default:default,org.eclipse.jetty.websocket.javax.websocket@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi*3.13.100.v20180827-1536@-1:true,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services*3.7.100.v20180827-1536@default:default,org.eclipse.osgi.util*3.5.100.v20180827-1536@default:default,org.eclipse.text@default:default,org.glassfish.hk2.api@default:default,org.glassfish.hk2.locator@default:default,org.glassfish.hk2.osgi-resource-locator@default:default,org.glassfish.hk2.utils@default:default,org.glassfish.jersey.bundles.repackaged.jersey-guava@default:default,org.glassfish.jersey.core.jersey-common@default:default,org.hamcrest.core@default:default,org.idempiere.org.conscrypt.openjdk-uber@default:default,org.jfree.chart-osgi@default:default,org.jfree.jcommon-osgi@default:default,org.json@default:default,org.junit@default:default,org.krysalis.barcode4j@default:default,org.mortbay.jasper.apache-el@default:true,org.mortbay.jasper.apache-jsp@default:true,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.passay@default:default,org.restlet*2.3.2.v20150501-1520@default:true,org.restlet.ext.servlet*2.3.2.v20150501-1520@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.springframework.spring-jcl@default:default,org.tukaani.xz*1.8.0.v20180207-1613@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default,slf4j.api@default:default,slf4j.jcl@default:false,stax2-api*3.1.4@default:default,stax2-api*4.1.0@default:default,zcommon@default:default,zel@default:default,zhtml@default:default,zjavassist@default:default,zk@default:default,zkbind@default:default,zkplus@default:default,zul@default:default,zweb@default:default"/>
+    <stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.process@default:default,org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default"/>
+    <booleanAttribute key="show_selected_only" value="false"/>
+    <booleanAttribute key="tracing" value="false"/>
+    <booleanAttribute key="useCustomFeatures" value="false"/>
+    <booleanAttribute key="useDefaultConfig" value="true"/>
+    <booleanAttribute key="useDefaultConfigArea" value="true"/>
+    <booleanAttribute key="useProduct" value="false"/>
+    <booleanAttribute key="usefeatures" value="false"/>
 </launchConfiguration>
diff --git a/org.adempiere.base.callout/.classpath b/org.adempiere.base.callout/.classpath
index cf36b56119..423c974870 100644
--- a/org.adempiere.base.callout/.classpath
+++ b/org.adempiere.base.callout/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.adempiere.base.callout/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.base.callout/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.adempiere.base.callout/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.base.callout/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.adempiere.base.callout/META-INF/MANIFEST.MF b/org.adempiere.base.callout/META-INF/MANIFEST.MF
index b58d4c0877..01f39c7845 100644
--- a/org.adempiere.base.callout/META-INF/MANIFEST.MF
+++ b/org.adempiere.base.callout/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Callout
 Bundle-SymbolicName: org.adempiere.base.callout
-Bundle-Version: 5.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Version: 6.1.0.qualifier
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
 Eclipse-RegisterBuddy: org.adempiere.base
 Service-Component: OSGI-INF/costadjustmentcalloutfactory.xml, OSGI-INF/bpartnerquickentrycalloutFactory.xml
@@ -11,4 +11,5 @@ Bundle-ActivationPolicy: lazy
 Export-Package: org.compiere.model
 Bundle-ClassPath: .
 Automatic-Module-Name: org.adempiere.base.callout
+Bundle-Vendor: iDempiere Community
 
diff --git a/org.adempiere.base.callout/pom.xml b/org.adempiere.base.callout/pom.xml
index aad7df09f5..bd2a55684b 100644
--- a/org.adempiere.base.callout/pom.xml
+++ b/org.adempiere.base.callout/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.base.callout</artifactId>
diff --git a/org.adempiere.base.callout/src/org/adempiere/model/CalloutRMA.java b/org.adempiere.base.callout/src/org/adempiere/model/CalloutRMA.java
index c14c3bb203..a0816e4e72 100644
--- a/org.adempiere.base.callout/src/org/adempiere/model/CalloutRMA.java
+++ b/org.adempiere.base.callout/src/org/adempiere/model/CalloutRMA.java
@@ -18,6 +18,7 @@
 package org.adempiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Properties;
 
 import org.adempiere.base.Core;
@@ -101,7 +102,7 @@ public class CalloutRMA extends CalloutEngine {
 			BigDecimal lineNetAmt = invoiceLine.getQtyEntered().multiply(invoiceLine.getPriceEntered());
 			int precision = invoiceLine.getPrecision();
 			if (lineNetAmt.scale() > precision)
-				lineNetAmt = lineNetAmt.setScale(precision, BigDecimal.ROUND_HALF_UP);
+				lineNetAmt = lineNetAmt.setScale(precision, RoundingMode.HALF_UP);
 			mTab.setValue(MRMALine.COLUMNNAME_LineNetAmt, lineNetAmt);
 		} 
 		else if (iol.getC_OrderLine_ID() != 0) 
@@ -122,7 +123,7 @@ public class CalloutRMA extends CalloutEngine {
 			BigDecimal lineNetAmt = orderLine.getQtyEntered().multiply(orderLine.getPriceEntered());
 			int precision = orderLine.getPrecision();
 			if (lineNetAmt.scale() > precision)
-				lineNetAmt = lineNetAmt.setScale(precision, BigDecimal.ROUND_HALF_UP);
+				lineNetAmt = lineNetAmt.setScale(precision, RoundingMode.HALF_UP);
 			mTab.setValue(MRMALine.COLUMNNAME_LineNetAmt, lineNetAmt);
 		}
 
@@ -193,7 +194,7 @@ public class CalloutRMA extends CalloutEngine {
 		
 		BigDecimal lineNetAmt = Env.ONE.multiply(pp.getPriceStd());
 		if (lineNetAmt.scale() > precision)
-			lineNetAmt = lineNetAmt.setScale(precision, BigDecimal.ROUND_HALF_UP);
+			lineNetAmt = lineNetAmt.setScale(precision, RoundingMode.HALF_UP);
 		mTab.setValue(MRMALine.COLUMNNAME_LineNetAmt, lineNetAmt);
 
 		return "";
@@ -246,7 +247,7 @@ public class CalloutRMA extends CalloutEngine {
 		
 		BigDecimal lineNetAmt = Env.ONE.multiply(charge.getChargeAmt());
 		if (lineNetAmt.scale() > precision)
-			lineNetAmt = lineNetAmt.setScale(precision, BigDecimal.ROUND_HALF_UP);
+			lineNetAmt = lineNetAmt.setScale(precision, RoundingMode.HALF_UP);
 		mTab.setValue(MRMALine.COLUMNNAME_LineNetAmt, lineNetAmt);		
 
 		return "";
diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutAssignment.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutAssignment.java
index 261275993e..28dd701ff4 100644
--- a/org.adempiere.base.callout/src/org/compiere/model/CalloutAssignment.java
+++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutAssignment.java
@@ -92,7 +92,7 @@ public class CalloutAssignment extends CalloutEngine
 		if (log.isLoggable(Level.FINE)) log.fine("S_ResourceAssignment_ID=" + S_ResourceAssignment_ID + " - M_Product_ID=" + M_Product_ID);
 		if (M_Product_ID != 0)
 		{
-			mTab.setValue ("M_Product_ID", new Integer (M_Product_ID));
+			mTab.setValue ("M_Product_ID", Integer.valueOf(M_Product_ID));
 			if (Description != null)
 				Name += " (" + Description + ")";
 			if (!".".equals(Name))
diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutCashJournal.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutCashJournal.java
index e7b9bf305e..81a50121c4 100644
--- a/org.adempiere.base.callout/src/org/compiere/model/CalloutCashJournal.java
+++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutCashJournal.java
@@ -84,7 +84,7 @@ public class CalloutCashJournal extends CalloutEngine
 			rs = pstmt.executeQuery();
 			if (rs.next())
 			{
-				mTab.setValue("C_Currency_ID", new Integer(rs.getInt(2)));
+				mTab.setValue("C_Currency_ID", Integer.valueOf(rs.getInt(2)));
 				BigDecimal PayAmt = rs.getBigDecimal(3);
 				BigDecimal DiscountAmt = rs.getBigDecimal(5);
 				boolean isSOTrx = "Y".equals(rs.getString(4));
diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutGLJournal.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutGLJournal.java
index 048d34e40a..171ba28e47 100644
--- a/org.adempiere.base.callout/src/org/compiere/model/CalloutGLJournal.java
+++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutGLJournal.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -103,7 +104,7 @@ public class CalloutGLJournal extends CalloutEngine
 				pstmt = null;
 			}
 			if (C_Period_ID != 0)
-				mTab.setValue("C_Period_ID", new Integer(C_Period_ID));
+				mTab.setValue("C_Period_ID", Integer.valueOf(C_Period_ID));
 		}
 
 		//  When C_Period_ID is changed, check if in DateAcct range and set to end date if not
@@ -222,10 +223,10 @@ public class CalloutGLJournal extends CalloutEngine
 			AmtSourceCr = Env.ZERO;
 
 		BigDecimal AmtAcctDr = AmtSourceDr.multiply(CurrencyRate);
-		AmtAcctDr = AmtAcctDr.setScale(Precision, BigDecimal.ROUND_HALF_UP);
+		AmtAcctDr = AmtAcctDr.setScale(Precision, RoundingMode.HALF_UP);
 		mTab.setValue("AmtAcctDr", AmtAcctDr);
 		BigDecimal AmtAcctCr = AmtSourceCr.multiply(CurrencyRate);
-		AmtAcctCr = AmtAcctCr.setScale(Precision, BigDecimal.ROUND_HALF_UP);
+		AmtAcctCr = AmtAcctCr.setScale(Precision, RoundingMode.HALF_UP);
 		mTab.setValue("AmtAcctCr", AmtAcctCr);
 
 		return "";
diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutInOut.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutInOut.java
index e2e847022a..bf9544d7b6 100644
--- a/org.adempiere.base.callout/src/org/compiere/model/CalloutInOut.java
+++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutInOut.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -61,28 +62,28 @@ public class CalloutInOut extends CalloutEngine
 		{
 			mTab.setValue("DateOrdered", order.getDateOrdered());
 			mTab.setValue("POReference", order.getPOReference());
-			mTab.setValue("AD_Org_ID", new Integer(order.getAD_Org_ID()));
-			mTab.setValue("AD_OrgTrx_ID", new Integer(order.getAD_OrgTrx_ID()));
-			mTab.setValue("C_Activity_ID", new Integer(order.getC_Activity_ID()));
-			mTab.setValue("C_Campaign_ID", new Integer(order.getC_Campaign_ID()));
-			mTab.setValue("C_Project_ID", new Integer(order.getC_Project_ID()));
-			mTab.setValue("User1_ID", new Integer(order.getUser1_ID()));
-			mTab.setValue("User2_ID", new Integer(order.getUser2_ID()));
-			mTab.setValue("M_Warehouse_ID", new Integer(order.getM_Warehouse_ID()));
+			mTab.setValue("AD_Org_ID", Integer.valueOf(order.getAD_Org_ID()));
+			mTab.setValue("AD_OrgTrx_ID", Integer.valueOf(order.getAD_OrgTrx_ID()));
+			mTab.setValue("C_Activity_ID", Integer.valueOf(order.getC_Activity_ID()));
+			mTab.setValue("C_Campaign_ID", Integer.valueOf(order.getC_Campaign_ID()));
+			mTab.setValue("C_Project_ID", Integer.valueOf(order.getC_Project_ID()));
+			mTab.setValue("User1_ID", Integer.valueOf(order.getUser1_ID()));
+			mTab.setValue("User2_ID", Integer.valueOf(order.getUser2_ID()));
+			mTab.setValue("M_Warehouse_ID", Integer.valueOf(order.getM_Warehouse_ID()));
 			//
 			mTab.setValue("DeliveryRule", order.getDeliveryRule());
 			mTab.setValue("DeliveryViaRule", order.getDeliveryViaRule());
-			mTab.setValue("M_Shipper_ID", new Integer(order.getM_Shipper_ID()));
+			mTab.setValue("M_Shipper_ID", Integer.valueOf(order.getM_Shipper_ID()));
 			mTab.setValue("FreightCostRule", order.getFreightCostRule());
 			mTab.setValue("FreightAmt", order.getFreightAmt());
 
-			mTab.setValue("C_BPartner_ID", new Integer(order.getC_BPartner_ID()));
+			mTab.setValue("C_BPartner_ID", Integer.valueOf(order.getC_BPartner_ID()));
 
 			//[ 1867464 ]
-			mTab.setValue("C_BPartner_Location_ID", new Integer(order.getC_BPartner_Location_ID()));
+			mTab.setValue("C_BPartner_Location_ID", Integer.valueOf(order.getC_BPartner_Location_ID()));
 			
 			if (order.getAD_User_ID() > 0)
-				mTab.setValue("AD_User_ID", new Integer(order.getAD_User_ID()));
+				mTab.setValue("AD_User_ID", Integer.valueOf(order.getAD_User_ID()));
 			else
 				mTab.setValue("AD_User_ID", null);
 		}
@@ -128,28 +129,28 @@ public class CalloutInOut extends CalloutEngine
 		{
 			mTab.setValue("DateOrdered", originalReceipt.getDateOrdered());
 			mTab.setValue("POReference", originalReceipt.getPOReference());
-			mTab.setValue("AD_Org_ID", new Integer(originalReceipt.getAD_Org_ID()));
-			mTab.setValue("AD_OrgTrx_ID", new Integer(originalReceipt.getAD_OrgTrx_ID()));
-			mTab.setValue("C_Activity_ID", new Integer(originalReceipt.getC_Activity_ID()));
-			mTab.setValue("C_Campaign_ID", new Integer(originalReceipt.getC_Campaign_ID()));
-			mTab.setValue("C_Project_ID", new Integer(originalReceipt.getC_Project_ID()));
-			mTab.setValue("User1_ID", new Integer(originalReceipt.getUser1_ID()));
-			mTab.setValue("User2_ID", new Integer(originalReceipt.getUser2_ID()));
-			mTab.setValue("M_Warehouse_ID", new Integer(originalReceipt.getM_Warehouse_ID()));
+			mTab.setValue("AD_Org_ID", Integer.valueOf(originalReceipt.getAD_Org_ID()));
+			mTab.setValue("AD_OrgTrx_ID", Integer.valueOf(originalReceipt.getAD_OrgTrx_ID()));
+			mTab.setValue("C_Activity_ID", Integer.valueOf(originalReceipt.getC_Activity_ID()));
+			mTab.setValue("C_Campaign_ID", Integer.valueOf(originalReceipt.getC_Campaign_ID()));
+			mTab.setValue("C_Project_ID", Integer.valueOf(originalReceipt.getC_Project_ID()));
+			mTab.setValue("User1_ID", Integer.valueOf(originalReceipt.getUser1_ID()));
+			mTab.setValue("User2_ID", Integer.valueOf(originalReceipt.getUser2_ID()));
+			mTab.setValue("M_Warehouse_ID", Integer.valueOf(originalReceipt.getM_Warehouse_ID()));
 			//
 			mTab.setValue("DeliveryRule", originalReceipt.getDeliveryRule());
 			mTab.setValue("DeliveryViaRule", originalReceipt.getDeliveryViaRule());
-			mTab.setValue("M_Shipper_ID", new Integer(originalReceipt.getM_Shipper_ID()));
+			mTab.setValue("M_Shipper_ID", Integer.valueOf(originalReceipt.getM_Shipper_ID()));
 			mTab.setValue("FreightCostRule", originalReceipt.getFreightCostRule());
 			mTab.setValue("FreightAmt", originalReceipt.getFreightAmt());
 
-			mTab.setValue("C_BPartner_ID", new Integer(originalReceipt.getC_BPartner_ID()));
+			mTab.setValue("C_BPartner_ID", Integer.valueOf(originalReceipt.getC_BPartner_ID()));
 
 			//[ 1867464 ]
-			mTab.setValue("C_BPartner_Location_ID", new Integer(originalReceipt.getC_BPartner_Location_ID()));
+			mTab.setValue("C_BPartner_Location_ID", Integer.valueOf(originalReceipt.getC_BPartner_Location_ID()));
 
 			if (originalReceipt.getAD_User_ID() > 0)
-				mTab.setValue("AD_User_ID", new Integer(originalReceipt.getAD_User_ID()));
+				mTab.setValue("AD_User_ID", Integer.valueOf(originalReceipt.getAD_User_ID()));
 			else
 				mTab.setValue("AD_User_ID", null);
 		}
@@ -290,13 +291,13 @@ public class CalloutInOut extends CalloutEngine
 				if (!IsSOTrx)
 				{
 					//	Location
-					Integer ii = new Integer(rs.getInt("C_BPartner_Location_ID"));
+					Integer ii = Integer.valueOf(rs.getInt("C_BPartner_Location_ID"));
 					if (rs.wasNull())
 						mTab.setValue("C_BPartner_Location_ID", null);
 					else
 						mTab.setValue("C_BPartner_Location_ID", ii);
 					//	Contact
-					ii = new Integer(rs.getInt("AD_User_ID"));
+					ii = Integer.valueOf(rs.getInt("AD_User_ID"));
 					if (rs.wasNull())
 						mTab.setValue("AD_User_ID", null);
 					else
@@ -361,12 +362,12 @@ public class CalloutInOut extends CalloutEngine
 			if (rs.next())
 			{
 				//	Org
-				Integer ii = new Integer(rs.getInt(1));
+				Integer ii = Integer.valueOf(rs.getInt(1));
 				int AD_Org_ID = Env.getContextAsInt(ctx, WindowNo, "AD_Org_ID");
 				if (AD_Org_ID != ii.intValue())
 					mTab.setValue("AD_Org_ID", ii);
 				//	Locator
-				ii = new Integer(rs.getInt(2));
+				ii = Integer.valueOf(rs.getInt(2));
 				if (rs.wasNull())
 					Env.setContext(ctx, WindowNo, 0, "M_Locator_ID", null);
 				else
@@ -416,17 +417,17 @@ public class CalloutInOut extends CalloutEngine
 		if (ol.get_ID() != 0)
 		{
 			if (ol.getC_Charge_ID() > 0 && ol.getM_Product_ID() <= 0) {
-				mTab.setValue("C_Charge_ID", new Integer(ol.getC_Charge_ID()));
+				mTab.setValue("C_Charge_ID", Integer.valueOf(ol.getC_Charge_ID()));
 				mTab.setValue("M_Product_ID", null);
 				mTab.setValue("M_AttributeSetInstance_ID", null);
 			}
 			else {
-				mTab.setValue("M_Product_ID", new Integer(ol.getM_Product_ID()));
-				mTab.setValue("M_AttributeSetInstance_ID", new Integer(ol.getM_AttributeSetInstance_ID()));
+				mTab.setValue("M_Product_ID", Integer.valueOf(ol.getM_Product_ID()));
+				mTab.setValue("M_AttributeSetInstance_ID", Integer.valueOf(ol.getM_AttributeSetInstance_ID()));
 				mTab.setValue("C_Charge_ID", null);
 			}
 			//
-			mTab.setValue("C_UOM_ID", new Integer(ol.getC_UOM_ID()));
+			mTab.setValue("C_UOM_ID", Integer.valueOf(ol.getC_UOM_ID()));
 			BigDecimal MovementQty = ol.getQtyOrdered().subtract(ol.getQtyDelivered());
 			BigDecimal runningqty = DB.getSQLValueBDEx(null, "SELECT SUM(MovementQty) FROM M_InOutLine WHERE M_InOut_ID=? AND M_InOutLine_ID!=? AND C_OrderLine_ID=?",
 					Env.getContextAsInt(ctx, WindowNo, "M_InOut_ID"),
@@ -439,17 +440,17 @@ public class CalloutInOut extends CalloutEngine
 			BigDecimal QtyEntered = MovementQty;
 			if (ol.getQtyEntered().compareTo(ol.getQtyOrdered()) != 0)
 				QtyEntered = QtyEntered.multiply(ol.getQtyEntered())
-					.divide(ol.getQtyOrdered(), 12, BigDecimal.ROUND_HALF_UP);
+					.divide(ol.getQtyOrdered(), 12, RoundingMode.HALF_UP);
 			mTab.setValue("QtyEntered", QtyEntered);
 			//
-			mTab.setValue("C_Activity_ID", new Integer(ol.getC_Activity_ID()));
-			mTab.setValue("C_Campaign_ID", new Integer(ol.getC_Campaign_ID()));
-			mTab.setValue("C_Project_ID", new Integer(ol.getC_Project_ID()));
-			mTab.setValue("C_ProjectPhase_ID", new Integer(ol.getC_ProjectPhase_ID()));
-			mTab.setValue("C_ProjectTask_ID", new Integer(ol.getC_ProjectTask_ID()));
-			mTab.setValue("AD_OrgTrx_ID", new Integer(ol.getAD_OrgTrx_ID()));
-			mTab.setValue("User1_ID", new Integer(ol.getUser1_ID()));
-			mTab.setValue("User2_ID", new Integer(ol.getUser2_ID()));
+			mTab.setValue("C_Activity_ID", Integer.valueOf(ol.getC_Activity_ID()));
+			mTab.setValue("C_Campaign_ID", Integer.valueOf(ol.getC_Campaign_ID()));
+			mTab.setValue("C_Project_ID", Integer.valueOf(ol.getC_Project_ID()));
+			mTab.setValue("C_ProjectPhase_ID", Integer.valueOf(ol.getC_ProjectPhase_ID()));
+			mTab.setValue("C_ProjectTask_ID", Integer.valueOf(ol.getC_ProjectTask_ID()));
+			mTab.setValue("AD_OrgTrx_ID", Integer.valueOf(ol.getAD_OrgTrx_ID()));
+			mTab.setValue("User1_ID", Integer.valueOf(ol.getUser1_ID()));
+			mTab.setValue("User2_ID", Integer.valueOf(ol.getUser2_ID()));
 		}
 		return "";
 	}	//	orderLine
@@ -474,30 +475,30 @@ public class CalloutInOut extends CalloutEngine
 		if (rl.get_ID() != 0)
 		{
 			if (rl.getC_Charge_ID() > 0 && rl.getM_Product_ID() <= 0) {
-				mTab.setValue("C_Charge_ID", new Integer(rl.getC_Charge_ID()));
+				mTab.setValue("C_Charge_ID", Integer.valueOf(rl.getC_Charge_ID()));
 				mTab.setValue("M_Product_ID", null);
 				mTab.setValue("M_AttributeSetInstance_ID", null);
 			}
 			else {
-				mTab.setValue("M_Product_ID", new Integer(rl.getM_Product_ID()));
-				mTab.setValue("M_AttributeSetInstance_ID", new Integer(rl.getM_AttributeSetInstance_ID()));
+				mTab.setValue("M_Product_ID", Integer.valueOf(rl.getM_Product_ID()));
+				mTab.setValue("M_AttributeSetInstance_ID", Integer.valueOf(rl.getM_AttributeSetInstance_ID()));
 				mTab.setValue("C_Charge_ID", null);
 			}
 			//
-			mTab.setValue("C_UOM_ID", new Integer(rl.getC_UOM_ID()));
+			mTab.setValue("C_UOM_ID", Integer.valueOf(rl.getC_UOM_ID()));
 			BigDecimal MovementQty = rl.getQty().subtract(rl.getQtyDelivered());
 			mTab.setValue("MovementQty", MovementQty);
 			BigDecimal QtyEntered = MovementQty;
 			mTab.setValue("QtyEntered", QtyEntered);
 			//
-			mTab.setValue("C_Activity_ID", new Integer(rl.getC_Activity_ID()));
-			mTab.setValue("C_Campaign_ID", new Integer(rl.getC_Campaign_ID()));
-			mTab.setValue("C_Project_ID", new Integer(rl.getC_Project_ID()));
-			mTab.setValue("C_ProjectPhase_ID", new Integer(rl.getC_ProjectPhase_ID()));
-			mTab.setValue("C_ProjectTask_ID", new Integer(rl.getC_ProjectTask_ID()));
-			mTab.setValue("AD_OrgTrx_ID", new Integer(rl.getAD_OrgTrx_ID()));
-			mTab.setValue("User1_ID", new Integer(rl.getUser1_ID()));
-			mTab.setValue("User2_ID", new Integer(rl.getUser2_ID()));
+			mTab.setValue("C_Activity_ID", Integer.valueOf(rl.getC_Activity_ID()));
+			mTab.setValue("C_Campaign_ID", Integer.valueOf(rl.getC_Campaign_ID()));
+			mTab.setValue("C_Project_ID", Integer.valueOf(rl.getC_Project_ID()));
+			mTab.setValue("C_ProjectPhase_ID", Integer.valueOf(rl.getC_ProjectPhase_ID()));
+			mTab.setValue("C_ProjectTask_ID", Integer.valueOf(rl.getC_ProjectTask_ID()));
+			mTab.setValue("AD_OrgTrx_ID", Integer.valueOf(rl.getAD_OrgTrx_ID()));
+			mTab.setValue("User1_ID", Integer.valueOf(rl.getUser1_ID()));
+			mTab.setValue("User2_ID", Integer.valueOf(rl.getUser2_ID()));
 		}
 		return "";
 	}	//	rmaLine
@@ -525,10 +526,10 @@ public class CalloutInOut extends CalloutEngine
 			&& Env.getContextAsInt(ctx, WindowNo, Env.TAB_INFO, "M_AttributeSetInstance_ID") != 0)
 		{
 			mTab.setValue("M_AttributeSetInstance_ID",
-				new Integer(Env.getContextAsInt(ctx, WindowNo, Env.TAB_INFO, "M_AttributeSetInstance_ID")));
+				Integer.valueOf(Env.getContextAsInt(ctx, WindowNo, Env.TAB_INFO, "M_AttributeSetInstance_ID")));
 			M_Locator_ID = Env.getContextAsInt(ctx, WindowNo, Env.TAB_INFO, "M_Locator_ID");
 			if (M_Locator_ID != 0)
-				mTab.setValue("M_Locator_ID", new Integer(M_Locator_ID));
+				mTab.setValue("M_Locator_ID", Integer.valueOf(M_Locator_ID));
 		}
 		else
 			mTab.setValue("M_AttributeSetInstance_ID", null);
@@ -542,7 +543,7 @@ public class CalloutInOut extends CalloutEngine
 
 		//	Set UOM/Locator/Qty
 		MProduct product = MProduct.get(ctx, M_Product_ID.intValue());
-		mTab.setValue("C_UOM_ID", new Integer (product.getC_UOM_ID()));
+		mTab.setValue("C_UOM_ID", Integer.valueOf(product.getC_UOM_ID()));
 		BigDecimal QtyEntered = (BigDecimal)mTab.getValue("QtyEntered");
 		mTab.setValue("MovementQty", QtyEntered);
 		if (M_Locator_ID != 0)
@@ -551,7 +552,7 @@ public class CalloutInOut extends CalloutEngine
 		{
 			MLocator loc = MLocator.get(ctx, product.getM_Locator_ID());
 			if (M_Warehouse_ID == loc.getM_Warehouse_ID())
-				mTab.setValue("M_Locator_ID", new Integer (product.getM_Locator_ID()));
+				mTab.setValue("M_Locator_ID", Integer.valueOf(product.getM_Locator_ID()));
 			else
 				if (log.isLoggable(Level.FINE)) log.fine("No Locator for M_Product_ID=" + M_Product_ID + " and M_Warehouse_ID=" + M_Warehouse_ID);
 		}
@@ -591,7 +592,7 @@ public class CalloutInOut extends CalloutEngine
 		{
 			int C_UOM_To_ID = ((Integer)value).intValue();
 			QtyEntered = (BigDecimal)mTab.getValue("QtyEntered");
-			BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), BigDecimal.ROUND_HALF_UP);
+			BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), RoundingMode.HALF_UP);
 			if (QtyEntered.compareTo(QtyEntered1) != 0)
 			{
 				if (log.isLoggable(Level.FINE)) log.fine("Corrected QtyEntered Scale UOM=" + C_UOM_To_ID
@@ -622,7 +623,7 @@ public class CalloutInOut extends CalloutEngine
 		{
 			int C_UOM_To_ID = Env.getContextAsInt(ctx, WindowNo, mTab.getTabNo(), "C_UOM_ID");
 			QtyEntered = (BigDecimal)value;
-			BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), BigDecimal.ROUND_HALF_UP);
+			BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), RoundingMode.HALF_UP);
 			if (QtyEntered.compareTo(QtyEntered1) != 0)
 			{
 				if (log.isLoggable(Level.FINE)) log.fine("Corrected QtyEntered Scale UOM=" + C_UOM_To_ID
@@ -648,7 +649,7 @@ public class CalloutInOut extends CalloutEngine
 			int C_UOM_To_ID = Env.getContextAsInt(ctx, WindowNo, mTab.getTabNo(), "C_UOM_ID");
 			MovementQty = (BigDecimal)value;
 			int precision = MProduct.get(ctx, M_Product_ID).getUOMPrecision();
-			BigDecimal MovementQty1 = MovementQty.setScale(precision, BigDecimal.ROUND_HALF_UP);
+			BigDecimal MovementQty1 = MovementQty.setScale(precision, RoundingMode.HALF_UP);
 			if (MovementQty.compareTo(MovementQty1) != 0)
 			{
 				if (log.isLoggable(Level.FINE)) log.fine("Corrected MovementQty "
@@ -704,7 +705,7 @@ public class CalloutInOut extends CalloutEngine
 			if (selectedM_Locator_ID != 0)
 			{
 				if (log.isLoggable(Level.FINE)) log.fine("Selected M_Locator_ID=" + selectedM_Locator_ID);
-				mTab.setValue("M_Locator_ID", new Integer (selectedM_Locator_ID));
+				mTab.setValue("M_Locator_ID", Integer.valueOf(selectedM_Locator_ID));
 			}
 		}
 		MAttributeSetInstance asi = MAttributeSetInstance.get(ctx, M_ASI_ID.intValue(), 0);
diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoice.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoice.java
index 28bb0d4b8c..99429d11a7 100644
--- a/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoice.java
+++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoice.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -161,7 +162,7 @@ public class CalloutInvoice extends CalloutEngine
 				}
 				
 				//	PriceList & IsTaxIncluded & Currency
-				Integer ii = new Integer(rs.getInt(IsSOTrx ? "M_PriceList_ID" : "PO_PriceList_ID"));
+				Integer ii = Integer.valueOf(rs.getInt(IsSOTrx ? "M_PriceList_ID" : "PO_PriceList_ID"));
 				if (!rs.wasNull())
 					mTab.setValue("M_PriceList_ID", ii);
 				else
@@ -171,13 +172,13 @@ public class CalloutInvoice extends CalloutEngine
 					{
 						MPriceList pl = new MPriceList(ctx, i, null);
 						if (IsSOTrx == pl.isSOPriceList())
-							mTab.setValue("M_PriceList_ID", new Integer(i));
+							mTab.setValue("M_PriceList_ID", Integer.valueOf(i));
 						else
 						{
 							String sql2 = "SELECT M_PriceList_ID FROM M_PriceList WHERE AD_Client_ID=? AND IsSOPriceList=? AND IsActive='Y' ORDER BY IsDefault DESC";
 							ii = DB.getSQLValue (null, sql2, Env.getAD_Client_ID(ctx), IsSOTrx);
 							if (ii != 0)
-								mTab.setValue("M_PriceList_ID", new Integer(ii));
+								mTab.setValue("M_PriceList_ID", Integer.valueOf(ii));
 						}
 					}
 				}
@@ -189,7 +190,7 @@ public class CalloutInvoice extends CalloutEngine
 				if (Env.getContext(ctx, WindowNo, "DocBaseType").endsWith("C"))	//	Credits are Payment Term
 					s = X_C_Invoice.PAYMENTRULE_OnCredit;
 				//  Payment Term
-				ii = new Integer(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID"));
+				ii = Integer.valueOf(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID"));
 				if (!rs.wasNull())
 					mTab.setValue("C_PaymentTerm_ID", ii);
 
@@ -206,7 +207,7 @@ public class CalloutInvoice extends CalloutEngine
 				if (locID == 0)
 					mTab.setValue("C_BPartner_Location_ID", null);
 				else
-					mTab.setValue("C_BPartner_Location_ID", new Integer(locID));
+					mTab.setValue("C_BPartner_Location_ID", Integer.valueOf(locID));
 
 				//	Contact - overwritten by InfoBP selection
 				int contID = rs.getInt("AD_User_ID");
@@ -219,7 +220,7 @@ public class CalloutInvoice extends CalloutEngine
 				if (contID == 0)
 					mTab.setValue("AD_User_ID", null);
 				else
-					mTab.setValue("AD_User_ID", new Integer(contID));
+					mTab.setValue("AD_User_ID", Integer.valueOf(contID));
 
 				//	CreditAvailable
 				if (IsSOTrx)
@@ -358,9 +359,9 @@ public class CalloutInvoice extends CalloutEngine
 		mTab.setValue("PriceLimit", pp.getPriceLimit());
 		mTab.setValue("PriceActual", pp.getPriceStd());
 		mTab.setValue("PriceEntered", pp.getPriceStd());
-		mTab.setValue("C_Currency_ID", new Integer(pp.getC_Currency_ID()));
+		mTab.setValue("C_Currency_ID", Integer.valueOf(pp.getC_Currency_ID()));
 	//	mTab.setValue("Discount", pp.getDiscount());
-		mTab.setValue("C_UOM_ID", new Integer(pp.getC_UOM_ID()));
+		mTab.setValue("C_UOM_ID", Integer.valueOf(pp.getC_UOM_ID()));
 		Env.setContext(ctx, WindowNo, "EnforcePriceLimit", pp.isEnforcePriceLimit() ? "Y" : "N");
 		Env.setContext(ctx, WindowNo, "DiscountSchema", pp.isDiscountSchema() ? "Y" : "N");
 		//
@@ -393,7 +394,7 @@ public class CalloutInvoice extends CalloutEngine
 		}
 		mTab.setValue("M_AttributeSetInstance_ID", null);
 		mTab.setValue("S_ResourceAssignment_ID", null);
-		mTab.setValue("C_UOM_ID", new Integer(100));	//	EA
+		mTab.setValue("C_UOM_ID", Integer.valueOf(100));	//	EA
 
 		Env.setContext(ctx, WindowNo, "DiscountSchema", "N");
 		String sql = "SELECT ChargeAmt FROM C_Charge WHERE C_Charge_ID=?";
@@ -490,7 +491,7 @@ public class CalloutInvoice extends CalloutEngine
 		if (C_Tax_ID == 0)
 			mTab.fireDataStatusEEvent(CLogger.retrieveError());
 		else
-			mTab.setValue("C_Tax_ID", new Integer(C_Tax_ID));
+			mTab.setValue("C_Tax_ID", Integer.valueOf(C_Tax_ID));
 		//
 		return amt (ctx, WindowNo, mTab, mField, value);
 	}	//	tax
@@ -618,7 +619,7 @@ public class CalloutInvoice extends CalloutEngine
 		{
 			PriceActual = new BigDecimal ((100.0 - Discount.doubleValue()) / 100.0 * PriceList.doubleValue());
 			if (PriceActual.scale() > StdPrecision)
-				PriceActual = PriceActual.setScale(StdPrecision, BigDecimal.ROUND_HALF_UP);
+				PriceActual = PriceActual.setScale(StdPrecision, RoundingMode.HALF_UP);
 			PriceEntered = MUOMConversion.convertProductFrom (ctx, M_Product_ID, 
 				C_UOM_To_ID, PriceActual);
 			if (PriceEntered == null)
@@ -634,7 +635,7 @@ public class CalloutInvoice extends CalloutEngine
 			else
 				Discount = new BigDecimal ((PriceList.doubleValue() - PriceActual.doubleValue()) / PriceList.doubleValue() * 100.0);
 			if (Discount.scale() > 2)
-				Discount = Discount.setScale(2, BigDecimal.ROUND_HALF_UP);
+				Discount = Discount.setScale(2, RoundingMode.HALF_UP);
 			mTab.setValue("Discount", Discount);
 		}
 		log.fine("amt = PriceEntered=" + PriceEntered + ", Actual" + PriceActual + ", Discount=" + Discount);
@@ -663,7 +664,7 @@ public class CalloutInvoice extends CalloutEngine
 			{
 				Discount = BigDecimal.valueOf((PriceList.doubleValue () - PriceActual.doubleValue ()) / PriceList.doubleValue () * 100.0);
 				if (Discount.scale () > 2)
-					Discount = Discount.setScale (2, BigDecimal.ROUND_HALF_UP);
+					Discount = Discount.setScale (2, RoundingMode.HALF_UP);
 			//	mTab.setValue ("Discount", Discount);
 			}
 		}
@@ -671,7 +672,7 @@ public class CalloutInvoice extends CalloutEngine
 		//	Line Net Amt
 		BigDecimal LineNetAmt = QtyInvoiced.multiply(PriceActual);
 		if (LineNetAmt.scale() > StdPrecision)
-			LineNetAmt = LineNetAmt.setScale(StdPrecision, BigDecimal.ROUND_HALF_UP);
+			LineNetAmt = LineNetAmt.setScale(StdPrecision, RoundingMode.HALF_UP);
 		if (log.isLoggable(Level.INFO)) log.info("amt = LineNetAmt=" + LineNetAmt);
 		mTab.setValue("LineNetAmt", LineNetAmt);
 
@@ -757,7 +758,7 @@ public class CalloutInvoice extends CalloutEngine
 		{
 			int C_UOM_To_ID = ((Integer)value).intValue();
 			QtyEntered = (BigDecimal)mTab.getValue("QtyEntered");
-			BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), BigDecimal.ROUND_HALF_UP);
+			BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), RoundingMode.HALF_UP);
 			if (QtyEntered.compareTo(QtyEntered1) != 0)
 			{
 				if (log.isLoggable(Level.FINE)) log.fine("Corrected QtyEntered Scale UOM=" + C_UOM_To_ID 
@@ -788,7 +789,7 @@ public class CalloutInvoice extends CalloutEngine
 		{
 			int C_UOM_To_ID = Env.getContextAsInt(ctx, WindowNo, mTab.getTabNo(), "C_UOM_ID");
 			QtyEntered = (BigDecimal)value;
-			BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), BigDecimal.ROUND_HALF_UP);
+			BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), RoundingMode.HALF_UP);
 			if (QtyEntered.compareTo(QtyEntered1) != 0)
 			{
 				if (log.isLoggable(Level.FINE)) log.fine("Corrected QtyEntered Scale UOM=" + C_UOM_To_ID 
@@ -814,7 +815,7 @@ public class CalloutInvoice extends CalloutEngine
 			int C_UOM_To_ID = Env.getContextAsInt(ctx, WindowNo, mTab.getTabNo(), "C_UOM_ID");
 			QtyInvoiced = (BigDecimal)value;
 			int precision = MProduct.get(ctx, M_Product_ID).getUOMPrecision(); 
-			BigDecimal QtyInvoiced1 = QtyInvoiced.setScale(precision, BigDecimal.ROUND_HALF_UP);
+			BigDecimal QtyInvoiced1 = QtyInvoiced.setScale(precision, RoundingMode.HALF_UP);
 			if (QtyInvoiced.compareTo(QtyInvoiced1) != 0)
 			{
 				if (log.isLoggable(Level.FINE)) log.fine("Corrected QtyInvoiced Scale "
diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoiceBatch.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoiceBatch.java
index 8927608662..b346c68442 100644
--- a/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoiceBatch.java
+++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoiceBatch.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -108,7 +109,7 @@ public class CalloutInvoiceBatch extends CalloutEngine
 				if (Env.getContext(ctx, WindowNo, "DocBaseType").endsWith("C"))	//	Credits are Payment Term
 					s = X_C_Invoice.PAYMENTRULE_OnCredit;
 				//  Payment Term
-				Integer ii = new Integer(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID"));
+				Integer ii = Integer.valueOf(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID"));
 				if (!rs.wasNull())
 					mTab.setValue("C_PaymentTerm_ID", ii);
 
@@ -125,7 +126,7 @@ public class CalloutInvoiceBatch extends CalloutEngine
 				if (locID == 0)
 					mTab.setValue("C_BPartner_Location_ID", null);
 				else
-					mTab.setValue("C_BPartner_Location_ID", new Integer(locID));
+					mTab.setValue("C_BPartner_Location_ID", Integer.valueOf(locID));
 
 				//	Contact - overwritten by InfoBP selection
 				int contID = rs.getInt("AD_User_ID");
@@ -138,7 +139,7 @@ public class CalloutInvoiceBatch extends CalloutEngine
 				if (contID == 0)
 					mTab.setValue("AD_User_ID", null);
 				else
-					mTab.setValue("AD_User_ID", new Integer(contID));
+					mTab.setValue("AD_User_ID", Integer.valueOf(contID));
 
 				//	CreditAvailable
 				if (IsSOTrx)
@@ -324,7 +325,7 @@ public class CalloutInvoiceBatch extends CalloutEngine
 		if (C_Tax_ID == 0)
 			mTab.fireDataStatusEEvent(CLogger.retrieveError());
 		else
-			mTab.setValue("C_Tax_ID", new Integer(C_Tax_ID));
+			mTab.setValue("C_Tax_ID", Integer.valueOf(C_Tax_ID));
 		//
 		return amt (ctx, WindowNo, mTab, mField, value);
 	}	//	tax
@@ -360,7 +361,7 @@ public class CalloutInvoiceBatch extends CalloutEngine
 		//	Line Net Amt
 		BigDecimal LineNetAmt = QtyEntered.multiply(PriceEntered);
 		if (LineNetAmt.scale() > StdPrecision)
-			LineNetAmt = LineNetAmt.setScale(StdPrecision, BigDecimal.ROUND_HALF_UP);
+			LineNetAmt = LineNetAmt.setScale(StdPrecision, RoundingMode.HALF_UP);
 
 		//	Calculate Tax Amount
 		boolean IsTaxIncluded = "Y".equals(Env.getContext(Env.getCtx(), WindowNo, "IsTaxIncluded"));
diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java
index 63a68e61fc..749c83e269 100644
--- a/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java
+++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -186,7 +187,7 @@ public class CalloutOrder extends CalloutEngine
 					if (s != null && s.length() != 0)
 						mTab.setValue("PaymentRule", s);
 					//	Payment Term
-					Integer ii =new Integer(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID"));
+					Integer ii =Integer.valueOf(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID"));
 					if (!rs.wasNull())
 						mTab.setValue("C_PaymentTerm_ID", ii);
 					//	InvoiceRule
@@ -278,7 +279,7 @@ public class CalloutOrder extends CalloutEngine
 				}
 
 				//	PriceList (indirect: IsTaxIncluded & Currency)
-				Integer ii = new Integer(rs.getInt(IsSOTrx ? "M_PriceList_ID" : "PO_PriceList_ID"));
+				Integer ii = Integer.valueOf(rs.getInt(IsSOTrx ? "M_PriceList_ID" : "PO_PriceList_ID"));
 				if (!rs.wasNull())
 					mTab.setValue("M_PriceList_ID", ii);
 				else
@@ -288,13 +289,13 @@ public class CalloutOrder extends CalloutEngine
 					{
 						MPriceList pl = new MPriceList(ctx, i, null);
 						if (IsSOTrx == pl.isSOPriceList())
-							mTab.setValue("M_PriceList_ID", new Integer(i));
+							mTab.setValue("M_PriceList_ID", Integer.valueOf(i));
 						else
 						{
 							String sql2 = "SELECT M_PriceList_ID FROM M_PriceList WHERE AD_Client_ID=? AND IsSOPriceList=? AND IsActive='Y' ORDER BY IsDefault DESC";
 							ii = DB.getSQLValue (null, sql2, Env.getAD_Client_ID(ctx), IsSOTrx);
 							if (ii != 0)
-								mTab.setValue("M_PriceList_ID", new Integer(ii));
+								mTab.setValue("M_PriceList_ID", Integer.valueOf(ii));
 						}
 					}
 				}
@@ -325,7 +326,7 @@ public class CalloutOrder extends CalloutEngine
 				if (bill_Location_ID == 0)
 					mTab.setValue("Bill_Location_ID", null);
 				else
-					mTab.setValue("Bill_Location_ID", new Integer(bill_Location_ID));
+					mTab.setValue("Bill_Location_ID", Integer.valueOf(bill_Location_ID));
 				// Ship-To Location
 				if (shipTo_ID == 0)
 					shipTo_ID = rs.getInt("C_BPartner_Location_ID");
@@ -333,7 +334,7 @@ public class CalloutOrder extends CalloutEngine
 				if (shipTo_ID == 0)
 					mTab.setValue("C_BPartner_Location_ID", null);
 				else
-					mTab.setValue("C_BPartner_Location_ID", new Integer(shipTo_ID));
+					mTab.setValue("C_BPartner_Location_ID", Integer.valueOf(shipTo_ID));
 
 				//	Contact - overwritten by InfoBP selection
 				int contID = rs.getInt("AD_User_ID");
@@ -347,8 +348,8 @@ public class CalloutOrder extends CalloutEngine
 					mTab.setValue("AD_User_ID", null);
 				else
 				{
-					mTab.setValue("AD_User_ID", new Integer(contID));
-					mTab.setValue("Bill_User_ID", new Integer(contID));
+					mTab.setValue("AD_User_ID", Integer.valueOf(contID));
+					mTab.setValue("Bill_User_ID", Integer.valueOf(contID));
 				}
 
 				//	CreditAvailable
@@ -399,7 +400,7 @@ public class CalloutOrder extends CalloutEngine
 					if (s != null && s.length() != 0)
 						mTab.setValue("PaymentRule", s);
 					//	Payment Term
-					ii = new Integer(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID"));
+					ii = Integer.valueOf(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID"));
 					if (!rs.wasNull())
 						mTab.setValue("C_PaymentTerm_ID", ii);
 					//	InvoiceRule
@@ -479,7 +480,7 @@ public class CalloutOrder extends CalloutEngine
 			if (rs.next())
 			{
 				//	PriceList (indirect: IsTaxIncluded & Currency)
-				Integer ii = new Integer(rs.getInt(IsSOTrx ? "M_PriceList_ID" : "PO_PriceList_ID"));
+				Integer ii = Integer.valueOf(rs.getInt(IsSOTrx ? "M_PriceList_ID" : "PO_PriceList_ID"));
 				if (!rs.wasNull())
 					mTab.setValue("M_PriceList_ID", ii);
 				else
@@ -489,13 +490,13 @@ public class CalloutOrder extends CalloutEngine
 					{
 						MPriceList pl = new MPriceList(ctx, i, null);
 						if (IsSOTrx == pl.isSOPriceList())
-							mTab.setValue("M_PriceList_ID", new Integer(i));
+							mTab.setValue("M_PriceList_ID", Integer.valueOf(i));
 						else
 						{
 							String sql2 = "SELECT M_PriceList_ID FROM M_PriceList WHERE AD_Client_ID=? AND IsSOPriceList=? AND IsActive='Y' ORDER BY IsDefault DESC";
 							ii = DB.getSQLValue (null, sql2, Env.getAD_Client_ID(ctx), IsSOTrx);
 							if (ii != 0)
-								mTab.setValue("M_PriceList_ID", new Integer(ii));
+								mTab.setValue("M_PriceList_ID", Integer.valueOf(ii));
 						}
 					}
 				}
@@ -518,7 +519,7 @@ public class CalloutOrder extends CalloutEngine
 				if (bill_Location_ID == 0)
 					mTab.setValue("Bill_Location_ID", null);
 				else
-					mTab.setValue("Bill_Location_ID", new Integer(bill_Location_ID));
+					mTab.setValue("Bill_Location_ID", Integer.valueOf(bill_Location_ID));
 
 				//	Contact - overwritten by InfoBP selection
 				int contID = rs.getInt("AD_User_ID");
@@ -531,7 +532,7 @@ public class CalloutOrder extends CalloutEngine
 				if (contID == 0)
 					mTab.setValue("Bill_User_ID", null);
 				else
-					mTab.setValue("Bill_User_ID", new Integer(contID));
+					mTab.setValue("Bill_User_ID", Integer.valueOf(contID));
 
 				//	CreditAvailable
 				if (IsSOTrx)
@@ -577,7 +578,7 @@ public class CalloutOrder extends CalloutEngine
 					if (s != null && s.length() != 0)
 						mTab.setValue("PaymentRule", s);
 					//	Payment Term
-					ii = new Integer(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID"));
+					ii = Integer.valueOf(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID"));
 					if (!rs.wasNull())
 						mTab.setValue("C_PaymentTerm_ID", ii);
 					//	InvoiceRule
@@ -783,9 +784,9 @@ public class CalloutOrder extends CalloutEngine
 		mTab.setValue("PriceLimit", pp.getPriceLimit());
 		mTab.setValue("PriceActual", pp.getPriceStd());
 		mTab.setValue("PriceEntered", pp.getPriceStd());
-		mTab.setValue("C_Currency_ID", new Integer(pp.getC_Currency_ID()));
+		mTab.setValue("C_Currency_ID", Integer.valueOf(pp.getC_Currency_ID()));
 		mTab.setValue("Discount", pp.getDiscount());
-		mTab.setValue("C_UOM_ID", new Integer(pp.getC_UOM_ID()));
+		mTab.setValue("C_UOM_ID", Integer.valueOf(pp.getC_UOM_ID()));
 		mTab.setValue("QtyOrdered", mTab.getValue("QtyEntered"));
 		Env.setContext(ctx, WindowNo, "EnforcePriceLimit", pp.isEnforcePriceLimit() ? "Y" : "N");
 		Env.setContext(ctx, WindowNo, "DiscountSchema", pp.isDiscountSchema() ? "Y" : "N");
@@ -795,7 +796,7 @@ public class CalloutOrder extends CalloutEngine
 		//	Integer wh = (Integer)mTab.getValue("M_Warehouse_ID");
 		//	if (wh.intValue() != M_Warehouse_ID)
 		//	{
-		//		mTab.setValue("M_Warehouse_ID", new Integer(M_Warehouse_ID));
+		//		mTab.setValue("M_Warehouse_ID", Integer.valueOf(M_Warehouse_ID));
 		//		ADialog.warn(,WindowNo, "WarehouseChanged");
 		//	}
 
@@ -822,7 +823,7 @@ public class CalloutOrder extends CalloutEngine
 				{
 					Integer C_OrderLine_ID = (Integer)mTab.getValue("C_OrderLine_ID");
 					if (C_OrderLine_ID == null)
-						C_OrderLine_ID = new Integer(0);
+						C_OrderLine_ID = Integer.valueOf(0);
 					BigDecimal notReserved = MOrderLine.getNotReserved(ctx,
 						M_Warehouse_ID, M_Product_ID, M_AttributeSetInstance_ID,
 						C_OrderLine_ID.intValue());
@@ -869,7 +870,7 @@ public class CalloutOrder extends CalloutEngine
 		}
 		mTab.setValue("M_AttributeSetInstance_ID", null);
 		mTab.setValue("S_ResourceAssignment_ID", null);
-		mTab.setValue("C_UOM_ID", new Integer(100));	//	EA
+		mTab.setValue("C_UOM_ID", Integer.valueOf(100));	//	EA
 
 		Env.setContext(ctx, WindowNo, "DiscountSchema", "N");
 		String sql = "SELECT ChargeAmt FROM C_Charge WHERE C_Charge_ID=?";
@@ -976,7 +977,7 @@ public class CalloutOrder extends CalloutEngine
 		if (C_Tax_ID == 0)
 			mTab.fireDataStatusEEvent(CLogger.retrieveError());
 		else
-			mTab.setValue("C_Tax_ID", new Integer(C_Tax_ID));
+			mTab.setValue("C_Tax_ID", Integer.valueOf(C_Tax_ID));
 		//
 		if (steps) log.warning("fini");
 		return amt(ctx, WindowNo, mTab, mField, value);
@@ -1119,7 +1120,7 @@ public class CalloutOrder extends CalloutEngine
 			if ( PriceList.doubleValue() != 0 )
 				PriceActual = BigDecimal.valueOf((100.0 - Discount.doubleValue()) / 100.0 * PriceList.doubleValue());
 			if (PriceActual.scale() > StdPrecision)
-				PriceActual = PriceActual.setScale(StdPrecision, BigDecimal.ROUND_HALF_UP);
+				PriceActual = PriceActual.setScale(StdPrecision, RoundingMode.HALF_UP);
 			PriceEntered = MUOMConversion.convertProductFrom (ctx, M_Product_ID,
 				C_UOM_To_ID, PriceActual);
 			if (PriceEntered == null)
@@ -1135,7 +1136,7 @@ public class CalloutOrder extends CalloutEngine
 			else
 				Discount = BigDecimal.valueOf((PriceList.doubleValue() - PriceActual.doubleValue()) / PriceList.doubleValue() * 100.0);
 			if (Discount.scale() > 2)
-				Discount = Discount.setScale(2, BigDecimal.ROUND_HALF_UP);
+				Discount = Discount.setScale(2, RoundingMode.HALF_UP);
 			mTab.setValue("Discount", Discount);
 		}
 		if (log.isLoggable(Level.FINE)) log.fine("PriceEntered=" + PriceEntered + ", Actual=" + PriceActual + ", Discount=" + Discount);
@@ -1163,7 +1164,7 @@ public class CalloutOrder extends CalloutEngine
 			{
 				Discount = BigDecimal.valueOf((PriceList.doubleValue () - PriceActual.doubleValue ()) / PriceList.doubleValue () * 100.0);
 				if (Discount.scale () > 2)
-					Discount = Discount.setScale (2, BigDecimal.ROUND_HALF_UP);
+					Discount = Discount.setScale (2, RoundingMode.HALF_UP);
 				mTab.setValue ("Discount", Discount);
 			}
 		}
@@ -1171,7 +1172,7 @@ public class CalloutOrder extends CalloutEngine
 		//	Line Net Amt
 		BigDecimal LineNetAmt = QtyOrdered.multiply(PriceActual);
 		if (LineNetAmt.scale() > StdPrecision)
-			LineNetAmt = LineNetAmt.setScale(StdPrecision, BigDecimal.ROUND_HALF_UP);
+			LineNetAmt = LineNetAmt.setScale(StdPrecision, RoundingMode.HALF_UP);
 		if (log.isLoggable(Level.INFO)) log.info("LineNetAmt=" + LineNetAmt);
 		mTab.setValue("LineNetAmt", LineNetAmt);
 		//
@@ -1210,7 +1211,7 @@ public class CalloutOrder extends CalloutEngine
 		{
 			int C_UOM_To_ID = ((Integer)value).intValue();
 			QtyEntered = (BigDecimal)mTab.getValue("QtyEntered");
-			BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), BigDecimal.ROUND_HALF_UP);
+			BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), RoundingMode.HALF_UP);
 			if (QtyEntered.compareTo(QtyEntered1) != 0)
 			{
 				if (log.isLoggable(Level.FINE)) log.fine("Corrected QtyEntered Scale UOM=" + C_UOM_To_ID
@@ -1241,7 +1242,7 @@ public class CalloutOrder extends CalloutEngine
 		{
 			int C_UOM_To_ID = Env.getContextAsInt(ctx, WindowNo, mTab.getTabNo(), "C_UOM_ID");
 			QtyEntered = (BigDecimal)value;
-			BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), BigDecimal.ROUND_HALF_UP);
+			BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), RoundingMode.HALF_UP);
 			if (QtyEntered.compareTo(QtyEntered1) != 0)
 			{
 				if (log.isLoggable(Level.FINE)) log.fine("Corrected QtyEntered Scale UOM=" + C_UOM_To_ID
@@ -1267,7 +1268,7 @@ public class CalloutOrder extends CalloutEngine
 			int C_UOM_To_ID = Env.getContextAsInt(ctx, WindowNo, mTab.getTabNo(), "C_UOM_ID");
 			QtyOrdered = (BigDecimal)value;
 			int precision = MProduct.get(ctx, M_Product_ID).getUOMPrecision();
-			BigDecimal QtyOrdered1 = QtyOrdered.setScale(precision, BigDecimal.ROUND_HALF_UP);
+			BigDecimal QtyOrdered1 = QtyOrdered.setScale(precision, RoundingMode.HALF_UP);
 			if (QtyOrdered.compareTo(QtyOrdered1) != 0)
 			{
 				if (log.isLoggable(Level.FINE)) log.fine("Corrected QtyOrdered Scale "
@@ -1315,7 +1316,7 @@ public class CalloutOrder extends CalloutEngine
 				{
 					Integer C_OrderLine_ID = (Integer)mTab.getValue("C_OrderLine_ID");
 					if (C_OrderLine_ID == null)
-						C_OrderLine_ID = new Integer(0);
+						C_OrderLine_ID = Integer.valueOf(0);
 					BigDecimal notReserved = MOrderLine.getNotReserved(ctx,
 						M_Warehouse_ID, M_Product_ID, M_AttributeSetInstance_ID,
 						C_OrderLine_ID.intValue());
@@ -1356,6 +1357,7 @@ public class CalloutOrder extends CalloutEngine
 		return "";
 	}	//	SalesOrderTenderType
 
+	/* Called from AD_Org_ID in tables C_Order, M_InOut, M_Inventory, M_Requisition */
 	public String organization(Properties ctx, int WindowNo, GridTab mTab, GridField mField, Object value){
 		
 		//Return if Organization field is empty
diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutPaySelection.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutPaySelection.java
index ce184c1aaf..c8fc2efef2 100644
--- a/org.adempiere.base.callout/src/org/compiere/model/CalloutPaySelection.java
+++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutPaySelection.java
@@ -127,7 +127,7 @@ public class CalloutPaySelection extends CalloutEngine
 			{
 				OpenAmt = rs.getBigDecimal(1);
 				DiscountAmt = rs.getBigDecimal(2);
-				IsSOTrx = new Boolean ("Y".equals(rs.getString(3)));
+				IsSOTrx = Boolean.valueOf ("Y".equals(rs.getString(3)));
 			}
 		}
 		catch (SQLException e)
diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutPayment.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutPayment.java
index 34a5a9d048..1ca3a98309 100644
--- a/org.adempiere.base.callout/src/org/compiere/model/CalloutPayment.java
+++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutPayment.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -94,9 +95,9 @@ public class CalloutPayment extends CalloutEngine
 			rs = pstmt.executeQuery ();
 			if (rs.next ())
 			{
-				mTab.setValue ("C_BPartner_ID", new Integer (rs.getInt (1)));
+				mTab.setValue ("C_BPartner_ID", Integer.valueOf(rs.getInt (1)));
 				int C_Currency_ID = rs.getInt (2); // Set Invoice Currency
-				mTab.setValue ("C_Currency_ID", new Integer (C_Currency_ID));
+				mTab.setValue ("C_Currency_ID", Integer.valueOf(C_Currency_ID));
 				//
 				BigDecimal InvoiceOpen = rs.getBigDecimal (3); // Set Invoice
 				// OPen Amount
@@ -170,9 +171,9 @@ public class CalloutPayment extends CalloutEngine
 			rs = pstmt.executeQuery ();
 			if (rs.next ())
 			{
-				mTab.setValue ("C_BPartner_ID", new Integer (rs.getInt (1)));
+				mTab.setValue ("C_BPartner_ID", Integer.valueOf(rs.getInt (1)));
 				int C_Currency_ID = rs.getInt (2); // Set Order Currency
-				mTab.setValue ("C_Currency_ID", new Integer (C_Currency_ID));
+				mTab.setValue ("C_Currency_ID", Integer.valueOf(C_Currency_ID));
 				//
 				BigDecimal GrandTotal = rs.getBigDecimal (3); // Set Pay
 				// Amount
@@ -411,7 +412,7 @@ public class CalloutPayment extends CalloutEngine
 			}
 			//
 			InvoiceOpenAmt = InvoiceOpenAmt.multiply (CurrencyRate).setScale (
-				currency.getStdPrecision (), BigDecimal.ROUND_HALF_UP);
+				currency.getStdPrecision (), RoundingMode.HALF_UP);
 			if (log.isLoggable(Level.FINE)) log.fine ("Rate=" + CurrencyRate + ", InvoiceOpenAmt="
 				+ InvoiceOpenAmt);
 		}
@@ -420,16 +421,16 @@ public class CalloutPayment extends CalloutEngine
 			|| colName.equals ("C_ConversionType_ID"))
 		{
 			PayAmt = PayAmt.multiply (CurrencyRate).setScale (
-				currency.getStdPrecision (), BigDecimal.ROUND_HALF_UP);
+				currency.getStdPrecision (), RoundingMode.HALF_UP);
 			mTab.setValue ("PayAmt", PayAmt);
 			DiscountAmt = DiscountAmt.multiply (CurrencyRate).setScale (
-				currency.getStdPrecision (), BigDecimal.ROUND_HALF_UP);
+				currency.getStdPrecision (), RoundingMode.HALF_UP);
 			mTab.setValue ("DiscountAmt", DiscountAmt);
 			WriteOffAmt = WriteOffAmt.multiply (CurrencyRate).setScale (
-				currency.getStdPrecision (), BigDecimal.ROUND_HALF_UP);
+				currency.getStdPrecision (), RoundingMode.HALF_UP);
 			mTab.setValue ("WriteOffAmt", WriteOffAmt);
 			OverUnderAmt = OverUnderAmt.multiply (CurrencyRate).setScale (
-				currency.getStdPrecision (), BigDecimal.ROUND_HALF_UP);
+				currency.getStdPrecision (), RoundingMode.HALF_UP);
 			mTab.setValue ("OverUnderAmt", OverUnderAmt);
 		}
 		// No Invoice - Set Discount, Witeoff, Under/Over to 0
diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutPaymentAllocate.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutPaymentAllocate.java
index f02ea7bdd1..dd875b23a1 100644
--- a/org.adempiere.base.callout/src/org/compiere/model/CalloutPaymentAllocate.java
+++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutPaymentAllocate.java
@@ -95,9 +95,9 @@ public class CalloutPaymentAllocate extends CalloutEngine
 			rs = pstmt.executeQuery();
 			if (rs.next())
 			{
-			//	mTab.setValue("C_BPartner_ID", new Integer(rs.getInt(1)));
+			//	mTab.setValue("C_BPartner_ID", Integer.valueOf(rs.getInt(1)));
 			//	int C_Currency_ID = rs.getInt(2);					//	Set Invoice Currency
-			//	mTab.setValue("C_Currency_ID", new Integer(C_Currency_ID));
+			//	mTab.setValue("C_Currency_ID", Integer.valueOf(C_Currency_ID));
 				//
 				BigDecimal InvoiceOpen = rs.getBigDecimal(3);		//	Set Invoice OPen Amount
 				if (InvoiceOpen == null)
diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutProductCategory.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutProductCategory.java
index 1a54bbebbd..7a9cbd9f94 100644
--- a/org.adempiere.base.callout/src/org/compiere/model/CalloutProductCategory.java
+++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutProductCategory.java
@@ -43,7 +43,7 @@ public class CalloutProductCategory extends CalloutEngine
 
 		Integer productCategoryId = (Integer) mTab.getValue(MProductCategory.COLUMNNAME_M_Product_Category_ID);
 		if (productCategoryId == null)
-			productCategoryId = new Integer(0);
+			productCategoryId = Integer.valueOf(0);
 		
 		if (productCategoryId.intValue() > 0) {
 			MProductCategory pc = new MProductCategory(ctx, productCategoryId.intValue(), null);
diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutProduction.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutProduction.java
index e1fef1647a..8d686f27e6 100644
--- a/org.adempiere.base.callout/src/org/compiere/model/CalloutProduction.java
+++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutProduction.java
@@ -51,7 +51,7 @@ public class CalloutProduction extends CalloutEngine
 		if (Env.getContextAsInt(ctx, WindowNo, Env.TAB_INFO, "M_Product_ID") == M_Product_ID.intValue()
 			&& Env.getContextAsInt(ctx, WindowNo, Env.TAB_INFO, "M_AttributeSetInstance_ID") != 0)
 		{
-			mTab.setValue("M_AttributeSetInstance_ID", new Integer(Env.getContextAsInt(ctx, WindowNo, Env.TAB_INFO, "M_AttributeSetInstance_ID")));
+			mTab.setValue("M_AttributeSetInstance_ID", Integer.valueOf(Env.getContextAsInt(ctx, WindowNo, Env.TAB_INFO, "M_AttributeSetInstance_ID")));
 		}
 		else
 		{
diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutProject.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutProject.java
index 0f23ed39ed..4288e69e80 100644
--- a/org.adempiere.base.callout/src/org/compiere/model/CalloutProject.java
+++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutProject.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Properties;
 import java.util.logging.Level;
 
@@ -61,7 +62,7 @@ public class CalloutProject extends CalloutEngine
 		//
 		BigDecimal PlannedAmt = PlannedQty.multiply(PlannedPrice);
 		if (PlannedAmt.scale() > StdPrecision)
-			PlannedAmt = PlannedAmt.setScale(StdPrecision, BigDecimal.ROUND_HALF_UP);
+			PlannedAmt = PlannedAmt.setScale(StdPrecision, RoundingMode.HALF_UP);
 		//
 		if (log.isLoggable(Level.FINE)) log.fine("PlannedQty=" + PlannedQty + " * PlannedPrice=" + PlannedPrice + " -> PlannedAmt=" + PlannedAmt + " (Precision=" + StdPrecision+ ")");
 		mTab.setValue("PlannedAmt", PlannedAmt);
diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutRequest.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutRequest.java
index 5ae3fd5c16..af0f100e31 100644
--- a/org.adempiere.base.callout/src/org/compiere/model/CalloutRequest.java
+++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutRequest.java
@@ -138,7 +138,7 @@ public class CalloutRequest extends CalloutEngine
 		MRequestType rt = MRequestType.get(ctx, R_RequestType_ID);
 		int R_Status_ID = rt.getDefaultR_Status_ID();
 		if (R_Status_ID != 0)
-			mTab.setValue("R_Status_ID", new Integer(R_Status_ID));
+			mTab.setValue("R_Status_ID", Integer.valueOf(R_Status_ID));
 		
 		return "";
 	}	//	type
diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutRequisition.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutRequisition.java
index c219a54c8d..fbbd264ba6 100644
--- a/org.adempiere.base.callout/src/org/compiere/model/CalloutRequisition.java
+++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutRequisition.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.Timestamp;
 import java.util.Properties;
 import java.util.logging.Level;
@@ -89,7 +90,7 @@ public class CalloutRequisition extends CalloutEngine
 		//	Multiply
 		BigDecimal LineNetAmt = Qty.multiply(PriceActual);
 		if (LineNetAmt.scale() > StdPrecision)
-			LineNetAmt = LineNetAmt.setScale(StdPrecision, BigDecimal.ROUND_HALF_UP);
+			LineNetAmt = LineNetAmt.setScale(StdPrecision, RoundingMode.HALF_UP);
 		line.setLineNetAmt(LineNetAmt);
 		if (log.isLoggable(Level.INFO)) log.info("amt - LineNetAmt=" + LineNetAmt);
 		//
diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutTimeExpense.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutTimeExpense.java
index b26c16a5a1..83f0341425 100644
--- a/org.adempiere.base.callout/src/org/compiere/model/CalloutTimeExpense.java
+++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutTimeExpense.java
@@ -98,7 +98,7 @@ public class CalloutTimeExpense extends CalloutEngine
 					if (priceActual == null)
 						priceActual = rs.getBigDecimal("PriceLimit");
 					//	Currency
-					Integer ii = new Integer(rs.getInt("C_Currency_ID"));
+					Integer ii = Integer.valueOf(rs.getInt("C_Currency_ID"));
 					if (!rs.wasNull())
 						mTab.setValue("C_Currency_ID", ii);
 				}
@@ -143,7 +143,7 @@ public class CalloutTimeExpense extends CalloutEngine
 						if (priceActual == null)
 							priceActual = rs.getBigDecimal("PriceLimit");
 						//	Currency
-						Integer ii = new Integer(rs.getInt("C_Currency_ID"));
+						Integer ii = Integer.valueOf(rs.getInt("C_Currency_ID"));
 						if (!rs.wasNull())
 							mTab.setValue("C_Currency_ID", ii);
 					}
diff --git a/org.adempiere.base.process/.classpath b/org.adempiere.base.process/.classpath
index cf36b56119..423c974870 100644
--- a/org.adempiere.base.process/.classpath
+++ b/org.adempiere.base.process/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.adempiere.base.process/META-INF/MANIFEST.MF b/org.adempiere.base.process/META-INF/MANIFEST.MF
index 963dfb9f28..6ffdd4daf1 100644
--- a/org.adempiere.base.process/META-INF/MANIFEST.MF
+++ b/org.adempiere.base.process/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Processes
 Bundle-SymbolicName: org.adempiere.base.process
-Bundle-Version: 5.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Version: 6.1.0.qualifier
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
 Export-Package: org.adempiere.process,
  org.compiere.process,
@@ -16,3 +16,4 @@ Import-Package: javax.mail;version="1.5",
 Eclipse-RegisterBuddy: org.adempiere.base
 Bundle-ClassPath: .
 Automatic-Module-Name: org.adempiere.base.process
+Bundle-Vendor: iDempiere Community
diff --git a/org.adempiere.base.process/pom.xml b/org.adempiere.base.process/pom.xml
index 390feedfe0..4bed4b20ca 100644
--- a/org.adempiere.base.process/pom.xml
+++ b/org.adempiere.base.process/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.base.process</artifactId>
diff --git a/org.adempiere.base.process/src/org/adempiere/process/Export.java b/org.adempiere.base.process/src/org/adempiere/process/Export.java
index 5f366a04c3..091f33c20c 100644
--- a/org.adempiere.base.process/src/org/adempiere/process/Export.java
+++ b/org.adempiere.base.process/src/org/adempiere/process/Export.java
@@ -173,7 +173,7 @@ public class Export extends SvrProcess
 			if (rs.next())
 			{
 				HashMap<String, Integer> variableMap = new HashMap<String, Integer>();
-				variableMap.put(TOTAL_SEGMENTS, new Integer(1));
+				variableMap.put(TOTAL_SEGMENTS, Integer.valueOf(1));
 				
 				Element rootElement = outDocument.createElement(exportFormat.getValue());
 				rootElement.appendChild(outDocument.createComment(exportFormat.getDescription()));
@@ -395,11 +395,11 @@ public class Export extends SvrProcess
 		if (variableName != null && !"".equals(variableName) ) {
 			Integer var = variableMap.get(variableName);
 			if (var == null) {
-				var = new Integer(0);
+				var = Integer.valueOf(0);
 			}
 			int intValue = var.intValue();
 			intValue++;
-			variableMap.put(variableName, new Integer(intValue));
+			variableMap.put(variableName, Integer.valueOf(intValue));
 		}
 	}
 	
diff --git a/org.adempiere.base.process/src/org/adempiere/process/HouseKeeping.java b/org.adempiere.base.process/src/org/adempiere/process/HouseKeeping.java
index bd4c028de0..d61d7a1ba9 100644
--- a/org.adempiere.base.process/src/org/adempiere/process/HouseKeeping.java
+++ b/org.adempiere.base.process/src/org/adempiere/process/HouseKeeping.java
@@ -39,8 +39,8 @@ import java.util.Date;
 import java.util.logging.Level;
 
 import org.adempiere.model.GenericPO;
+import org.compiere.model.MHouseKeeping;
 import org.compiere.model.MTable;
-import org.compiere.model.X_AD_HouseKeeping;
 import org.compiere.process.ProcessInfoParameter;
 import org.compiere.process.SvrProcess;
 import org.compiere.util.AdempiereSystemError;
@@ -73,10 +73,15 @@ public class HouseKeeping extends SvrProcess{
 
 	protected String doIt() throws Exception {
 		
-		X_AD_HouseKeeping houseKeeping = new X_AD_HouseKeeping(getCtx(), p_AD_HouseKeeping_ID,get_TrxName());
+		MHouseKeeping houseKeeping = new MHouseKeeping(getCtx(), p_AD_HouseKeeping_ID,get_TrxName());
+		String tableName = null;
 		int tableID = houseKeeping.getAD_Table_ID();
-		MTable table = new MTable(getCtx(), tableID, get_TrxName());
-		String tableName = table.getTableName();	
+		if (tableID > 0) {
+			MTable table = new MTable(getCtx(), tableID, get_TrxName());
+			tableName = table.getTableName();	
+		} else {
+			tableName = houseKeeping.getTableName();
+		}
 		String whereClause = houseKeeping.getWhereClause();	
 		int noins = 0;
 		int noexp = 0;
@@ -93,7 +98,7 @@ public class HouseKeeping extends SvrProcess{
 		} //saveInHistoric
 
 		Date date = new Date();
-		if (houseKeeping.isExportXMLBackup()){
+		if (houseKeeping.isExportXMLBackup() && houseKeeping.getAD_Table_ID() > 0){
 			String pathFile = houseKeeping.getBackupFolder();
 			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
 			String dateString = dateFormat.format(date);
diff --git a/org.adempiere.base.process/src/org/compiere/process/AcctSchemaCopyAcct.java b/org.adempiere.base.process/src/org/compiere/process/AcctSchemaCopyAcct.java
index 8d32c72762..b21313997a 100644
--- a/org.adempiere.base.process/src/org/compiere/process/AcctSchemaCopyAcct.java
+++ b/org.adempiere.base.process/src/org/compiere/process/AcctSchemaCopyAcct.java
@@ -122,7 +122,7 @@ public class AcctSchemaCopyAcct extends SvrProcess
 			String columnName = pp.getName();
 			MAccount sourceAccount = MAccount.get(getCtx(), sourceC_ValidCombination_ID);
 			MAccount targetAccount = createAccount(targetAS, sourceAccount);
-			target.setValue(columnName, new Integer(targetAccount.getC_ValidCombination_ID()));
+			target.setValue(columnName, Integer.valueOf(targetAccount.getC_ValidCombination_ID()));
 		}
 		if (!target.save())
 			throw new AdempiereSystemError("Could not Save GL");
@@ -147,7 +147,7 @@ public class AcctSchemaCopyAcct extends SvrProcess
 			String columnName = pp.getName();
 			MAccount sourceAccount = MAccount.get(getCtx(), sourceC_ValidCombination_ID);
 			MAccount targetAccount = createAccount(targetAS, sourceAccount);
-			target.setValue(columnName, new Integer(targetAccount.getC_ValidCombination_ID()));
+			target.setValue(columnName, Integer.valueOf(targetAccount.getC_ValidCombination_ID()));
 		}
 		if (!target.save())
 			throw new AdempiereSystemError("Could not Save Default");
diff --git a/org.adempiere.base.process/src/org/compiere/process/ChangeLogProcess.java b/org.adempiere.base.process/src/org/compiere/process/ChangeLogProcess.java
index f531ff3417..ed963c59a8 100644
--- a/org.adempiere.base.process/src/org/compiere/process/ChangeLogProcess.java
+++ b/org.adempiere.base.process/src/org/compiere/process/ChangeLogProcess.java
@@ -91,9 +91,9 @@ public class ChangeLogProcess extends SvrProcess
 			if (para[i].getParameter() == null)
 				;
 			else if (name.equals("CheckNewValue"))
-				p_CheckNewValue = new Boolean("Y".equals(para[i].getParameter()));
+				p_CheckNewValue = Boolean.valueOf("Y".equals(para[i].getParameter()));
 			else if (name.equals("CheckOldValue"))
-				p_CheckOldValue = new Boolean("Y".equals(para[i].getParameter()));
+				p_CheckOldValue = Boolean.valueOf("Y".equals(para[i].getParameter()));
 			else if (name.equals("SetCustomization"))
 				p_SetCustomization = "Y".equals(para[i].getParameter());
 			else
diff --git a/org.adempiere.base.process/src/org/compiere/process/DistributionCreate.java b/org.adempiere.base.process/src/org/compiere/process/DistributionCreate.java
index dbc8cd4b84..872306c15c 100644
--- a/org.adempiere.base.process/src/org/compiere/process/DistributionCreate.java
+++ b/org.adempiere.base.process/src/org/compiere/process/DistributionCreate.java
@@ -17,6 +17,7 @@
 package org.compiere.process;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.logging.Level;
 
 import org.compiere.model.MBPartner;
@@ -191,7 +192,7 @@ public class DistributionCreate extends SvrProcess
 		BigDecimal ratio = dll.getRatio();
 		BigDecimal qty = p_Qty.multiply(ratio);
 		if (qty.compareTo(Env.ZERO) != 0)
-			qty = qty.divide(m_dl.getRatioTotal(), m_product.getUOMPrecision(), BigDecimal.ROUND_HALF_UP);
+			qty = qty.divide(m_dl.getRatioTotal(), m_product.getUOMPrecision(), RoundingMode.HALF_UP);
 		BigDecimal minQty = dll.getMinQty();
 		if (qty.compareTo(minQty) < 0)
 			qty = minQty;
diff --git a/org.adempiere.base.process/src/org/compiere/process/DistributionRun.java b/org.adempiere.base.process/src/org/compiere/process/DistributionRun.java
index 5a60a72a1e..757863c662 100644
--- a/org.adempiere.base.process/src/org/compiere/process/DistributionRun.java
+++ b/org.adempiere.base.process/src/org/compiere/process/DistributionRun.java
@@ -17,6 +17,7 @@
 package org.compiere.process;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
@@ -413,7 +414,7 @@ public class DistributionRun extends SvrProcess
 					if (detail.isCanAdjust())
 					{
 						BigDecimal diffRatio = detail.getRatio().multiply(difference)
-							.divide(ratioTotal, BigDecimal.ROUND_HALF_UP);	// precision from total
+							.divide(ratioTotal, RoundingMode.HALF_UP);	// precision from total
 						if (log.isLoggable(Level.FINE)) log.fine("Detail=" + detail.toString()
 							+ ", Allocation=" + detail.getActualAllocation()
 							+ ", DiffRatio=" + diffRatio);
@@ -646,7 +647,7 @@ public class DistributionRun extends SvrProcess
 						log.info("Qty Total Available:" + drl.getTotalQty());
 						log.info("Qty Total Demand:" +  totalration);
 					}			
-					BigDecimal factor = ration.divide(totalration, 12 , BigDecimal.ROUND_HALF_UP);
+					BigDecimal factor = ration.divide(totalration, 12 , RoundingMode.HALF_UP);
 					record.setQty(drl.getTotalQty().multiply(factor));
 					record.saveEx();
 			}			
@@ -750,7 +751,7 @@ public class DistributionRun extends SvrProcess
 					, p_M_DistributionRun_ID, record.getM_Product_ID());
 					MDistributionRunLine drl = (MDistributionRunLine) MTable.get(getCtx(), MDistributionRunLine.Table_ID).getPO(record.getM_DistributionRunLine_ID(), get_TrxName());
 					BigDecimal ration = record.getRatio();
-					BigDecimal factor = ration.divide(total_ration,BigDecimal.ROUND_HALF_UP);
+					BigDecimal factor = ration.divide(total_ration,RoundingMode.HALF_UP);
 					record.setQty(factor.multiply(drl.getTotalQty()));
 					record.saveEx();
 			}			
diff --git a/org.adempiere.base.process/src/org/compiere/process/DunningPrint.java b/org.adempiere.base.process/src/org/compiere/process/DunningPrint.java
index 484a55f868..3ca5c296f2 100644
--- a/org.adempiere.base.process/src/org/compiere/process/DunningPrint.java
+++ b/org.adempiere.base.process/src/org/compiere/process/DunningPrint.java
@@ -159,7 +159,7 @@ public class DunningPrint extends SvrProcess
 			//	query
 			MQuery query = new MQuery("C_Dunning_Header_v");
 			query.addRestriction("C_DunningRunEntry_ID", MQuery.EQUAL, 
-				new Integer(entry.getC_DunningRunEntry_ID()));
+				Integer.valueOf(entry.getC_DunningRunEntry_ID()));
 
 			//	Engine
 			PrintInfo info = new PrintInfo(
diff --git a/org.adempiere.base.process/src/org/compiere/process/InOutCreateInvoice.java b/org.adempiere.base.process/src/org/compiere/process/InOutCreateInvoice.java
index 9076dea73e..a4e371c8d8 100644
--- a/org.adempiere.base.process/src/org/compiere/process/InOutCreateInvoice.java
+++ b/org.adempiere.base.process/src/org/compiere/process/InOutCreateInvoice.java
@@ -17,6 +17,7 @@
 package org.compiere.process;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.logging.Level;
 
 import org.compiere.model.MCurrency;
@@ -122,7 +123,7 @@ public class InOutCreateInvoice extends SvrProcess
 				BigDecimal igt = invoice.getGrandTotal();
 				BigDecimal percent = Env.ONE;
 				if (ogt.compareTo(igt) != 0)
-					percent = igt.divide(ogt, 10, BigDecimal.ROUND_HALF_UP);
+					percent = igt.divide(ogt, 10, RoundingMode.HALF_UP);
 				MCurrency cur = MCurrency.get(order.getCtx(), order.getC_Currency_ID());
 				int scale = cur.getStdPrecision();
 			
@@ -132,7 +133,7 @@ public class InOutCreateInvoice extends SvrProcess
 					if (percent != Env.ONE) {
 						BigDecimal propDueAmt = ops.getDueAmt().multiply(percent);
 						if (propDueAmt.scale() > scale)
-							propDueAmt = propDueAmt.setScale(scale, BigDecimal.ROUND_HALF_UP);
+							propDueAmt = propDueAmt.setScale(scale, RoundingMode.HALF_UP);
 						ips.setDueAmt(propDueAmt);
 					}
 					ips.setC_Invoice_ID(invoice.getC_Invoice_ID());
diff --git a/org.adempiere.base.process/src/org/compiere/process/InOutGenerate.java b/org.adempiere.base.process/src/org/compiere/process/InOutGenerate.java
index 62576172f1..2026d2bf27 100644
--- a/org.adempiere.base.process/src/org/compiere/process/InOutGenerate.java
+++ b/org.adempiere.base.process/src/org/compiere/process/InOutGenerate.java
@@ -17,6 +17,7 @@
 package org.compiere.process;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
@@ -448,7 +449,7 @@ public class InOutGenerate extends SvrProcess
 			if (orderLine.getQtyEntered().compareTo(orderLine.getQtyOrdered()) != 0)
 				line.setQtyEntered(qty
 					.multiply(orderLine.getQtyEntered())
-					.divide(orderLine.getQtyOrdered(), 12, BigDecimal.ROUND_HALF_UP));
+					.divide(orderLine.getQtyOrdered(), 12, RoundingMode.HALF_UP));
 			line.setLine(m_line + orderLine.getLine());
 			if (!line.save())
 				throw new IllegalStateException("Could not create Shipment Line");
@@ -504,7 +505,7 @@ public class InOutGenerate extends SvrProcess
 				line.setQty(line.getMovementQty().add(deliver));
 			if (orderLine.getQtyEntered().compareTo(orderLine.getQtyOrdered()) != 0)
 				line.setQtyEntered(line.getMovementQty().multiply(orderLine.getQtyEntered())
-					.divide(orderLine.getQtyOrdered(), 12, BigDecimal.ROUND_HALF_UP));
+					.divide(orderLine.getQtyOrdered(), 12, RoundingMode.HALF_UP));
 			line.setLine(m_line + orderLine.getLine());
 			if (!line.save())
 				throw new IllegalStateException("Could not create Shipment Line");
@@ -530,7 +531,7 @@ public class InOutGenerate extends SvrProcess
 				 line.setQty(toDeliver);
 				 if (orderLine.getQtyEntered().compareTo(orderLine.getQtyOrdered()) != 0)
 					 line.setQtyEntered(line.getMovementQty().multiply(orderLine.getQtyEntered())
-						 .divide(orderLine.getQtyOrdered(), 12, BigDecimal.ROUND_HALF_UP));
+						 .divide(orderLine.getQtyOrdered(), 12, RoundingMode.HALF_UP));
 				 line.setLine(m_line + orderLine.getLine());
 			     if (!line.save())
 					 throw new IllegalStateException("Could not create Shipment Line");
diff --git a/org.adempiere.base.process/src/org/compiere/process/InvoiceGenerate.java b/org.adempiere.base.process/src/org/compiere/process/InvoiceGenerate.java
index 30407ce96b..e0e86158ea 100644
--- a/org.adempiere.base.process/src/org/compiere/process/InvoiceGenerate.java
+++ b/org.adempiere.base.process/src/org/compiere/process/InvoiceGenerate.java
@@ -17,6 +17,7 @@
 package org.compiere.process;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -300,7 +301,7 @@ public class InvoiceGenerate extends SvrProcess
 							if (oLine.getQtyEntered().compareTo(oLine.getQtyOrdered()) != 0)
 								qtyEntered = toInvoice
 									.multiply(oLine.getQtyEntered())
-									.divide(oLine.getQtyOrdered(), 12, BigDecimal.ROUND_HALF_UP);
+									.divide(oLine.getQtyOrdered(), 12, RoundingMode.HALF_UP);
 							createLine (order, oLine, toInvoice, qtyEntered);
 						}
 						else if (!completeOrder)
@@ -492,7 +493,7 @@ public class InvoiceGenerate extends SvrProcess
 					BigDecimal igt = m_invoice.getGrandTotal();
 					BigDecimal percent = Env.ONE;
 					if (ogt.compareTo(igt) != 0)
-						percent = igt.divide(ogt, 10, BigDecimal.ROUND_HALF_UP);
+						percent = igt.divide(ogt, 10, RoundingMode.HALF_UP);
 					MCurrency cur = MCurrency.get(order.getCtx(), order.getC_Currency_ID());
 					int scale = cur.getStdPrecision();
 				
@@ -502,7 +503,7 @@ public class InvoiceGenerate extends SvrProcess
 						if (percent != Env.ONE) {
 							BigDecimal propDueAmt = ops.getDueAmt().multiply(percent);
 							if (propDueAmt.scale() > scale)
-								propDueAmt = propDueAmt.setScale(scale, BigDecimal.ROUND_HALF_UP);
+								propDueAmt = propDueAmt.setScale(scale, RoundingMode.HALF_UP);
 							ips.setDueAmt(propDueAmt);
 						}
 						ips.setC_Invoice_ID(m_invoice.getC_Invoice_ID());
diff --git a/org.adempiere.base.process/src/org/compiere/process/InvoicePrint.java b/org.adempiere.base.process/src/org/compiere/process/InvoicePrint.java
index 2d73778a12..b621f48f3c 100644
--- a/org.adempiere.base.process/src/org/compiere/process/InvoicePrint.java
+++ b/org.adempiere.base.process/src/org/compiere/process/InvoicePrint.java
@@ -275,7 +275,7 @@ public class InvoicePrint extends SvrProcess
 				format.setTranslationLanguage(language);
 				//	query
 				MQuery query = new MQuery("C_Invoice_Header_v");
-				query.addRestriction("C_Invoice_ID", MQuery.EQUAL, new Integer(C_Invoice_ID));
+				query.addRestriction("C_Invoice_ID", MQuery.EQUAL, Integer.valueOf(C_Invoice_ID));
 
 				//	Engine
 				PrintInfo info = new PrintInfo(
diff --git a/org.adempiere.base.process/src/org/compiere/process/M_PriceList_Create.java b/org.adempiere.base.process/src/org/compiere/process/M_PriceList_Create.java
index 0365b78175..84bd0d325a 100644
--- a/org.adempiere.base.process/src/org/compiere/process/M_PriceList_Create.java
+++ b/org.adempiere.base.process/src/org/compiere/process/M_PriceList_Create.java
@@ -20,6 +20,7 @@
 package org.compiere.process;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -544,7 +545,7 @@ public class M_PriceList_Create extends SvrProcess {
 							}
 							if (conversion != null)
 							{
-								price = price.divide(conversion.getDivideRate(), precision, BigDecimal.ROUND_HALF_DOWN);
+								price = price.divide(conversion.getDivideRate(), precision, RoundingMode.HALF_DOWN);
 								StringBuilder sqlupdate = new StringBuilder();
 								sqlupdate.append("UPDATE M_ProductPrice SET PriceList=").append(price).append(" WHERE M_PriceList_Version_ID=").append(p_PriceList_Version_ID)
 									.append(" AND M_Product_ID= ").append(product_id);
diff --git a/org.adempiere.base.process/src/org/compiere/process/ProductUOMConvert.java b/org.adempiere.base.process/src/org/compiere/process/ProductUOMConvert.java
index 014017760c..3a73aaf194 100644
--- a/org.adempiere.base.process/src/org/compiere/process/ProductUOMConvert.java
+++ b/org.adempiere.base.process/src/org/compiere/process/ProductUOMConvert.java
@@ -17,6 +17,7 @@
 package org.compiere.process;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.logging.Level;
 
 import org.compiere.model.MProduct;
@@ -95,8 +96,8 @@ public class ProductUOMConvert extends SvrProcess
 			throw new AdempiereUserError("@NotFound@: @C_UOM_Conversion_ID@");
 		
 		MUOM uomTo = MUOM.get(getCtx(), productTo.getC_UOM_ID());
-		BigDecimal qtyTo = p_Qty.divide(conversion.getDivideRate(), uomTo.getStdPrecision(), BigDecimal.ROUND_HALF_UP);
-		BigDecimal qtyTo6 = p_Qty.divide(conversion.getDivideRate(), 6, BigDecimal.ROUND_HALF_UP);
+		BigDecimal qtyTo = p_Qty.divide(conversion.getDivideRate(), uomTo.getStdPrecision(), RoundingMode.HALF_UP);
+		BigDecimal qtyTo6 = p_Qty.divide(conversion.getDivideRate(), 6, RoundingMode.HALF_UP);
 		if (qtyTo.compareTo(qtyTo6) != 0)
 			throw new AdempiereUserError("@StdPrecision@: " + qtyTo + " <> " + qtyTo6 
 				+ " (" + p_Qty + "/" + conversion.getDivideRate() + ")");
diff --git a/org.adempiere.base.process/src/org/compiere/process/ReplenishReport.java b/org.adempiere.base.process/src/org/compiere/process/ReplenishReport.java
index de6fa93c5e..b4ad4950f9 100644
--- a/org.adempiere.base.process/src/org/compiere/process/ReplenishReport.java
+++ b/org.adempiere.base.process/src/org/compiere/process/ReplenishReport.java
@@ -358,7 +358,7 @@ public class ReplenishReport extends SvrProcess
 				if(custom==null){
 					// if no OSGi plugin is found try the legacy way (in my own classpath)
 					Class<?> clazz = Class.forName(className);
-					custom = (ReplenishInterface) clazz.newInstance();
+					custom = (ReplenishInterface) clazz.getDeclaredConstructor().newInstance();
 				}
 			}
 			catch (Exception e)
diff --git a/org.adempiere.base.process/src/org/compiere/process/ReplenishReportProduction.java b/org.adempiere.base.process/src/org/compiere/process/ReplenishReportProduction.java
index 3f70401567..42a7e92d58 100644
--- a/org.adempiere.base.process/src/org/compiere/process/ReplenishReportProduction.java
+++ b/org.adempiere.base.process/src/org/compiere/process/ReplenishReportProduction.java
@@ -392,7 +392,7 @@ public class ReplenishReportProduction extends SvrProcess
 				if(custom==null){
 					// if no OSGi plugin is found try the legacy way (in my own classpath)
 					Class<?> clazz = Class.forName(className);
-					custom = (ReplenishInterface) clazz.newInstance();
+					custom = (ReplenishInterface) clazz.getDeclaredConstructor().newInstance();
 				}
 			}
 			catch (Exception e)
diff --git a/org.adempiere.base.process/src/org/compiere/process/ReplicationLocal.java b/org.adempiere.base.process/src/org/compiere/process/ReplicationLocal.java
index 0ae55bbb6b..0afed49056 100644
--- a/org.adempiere.base.process/src/org/compiere/process/ReplicationLocal.java
+++ b/org.adempiere.base.process/src/org/compiere/process/ReplicationLocal.java
@@ -170,7 +170,7 @@ public class ReplicationLocal extends SvrProcess
 			+ "WHERE rt.IsActive='Y' AND t.IsActive='Y'"
 			+ " AND AD_ReplicationStrategy_ID=? "	//	#1
 			+ "ORDER BY t.LoadSeq";
-		RowSet rowset = getRowSet(sql, new Object[]{new Integer(m_replication.getAD_ReplicationStrategy_ID())});
+		RowSet rowset = getRowSet(sql, new Object[]{Integer.valueOf(m_replication.getAD_ReplicationStrategy_ID())});
 		if (rowset == null)
 			throw new Exception("setupRemote - No RowSet Data");
 
@@ -222,7 +222,7 @@ public class ReplicationLocal extends SvrProcess
 			+ " AND AD_ReplicationStrategy_ID=?" 	//	#1
 			+ " AND rt.ReplicationType='M' "		//	Merge
 			+ "ORDER BY t.LoadSeq";
-		RowSet rowset = getRowSet(sql, new Object[]{new Integer(m_replication.getAD_ReplicationStrategy_ID())});
+		RowSet rowset = getRowSet(sql, new Object[]{Integer.valueOf(m_replication.getAD_ReplicationStrategy_ID())});
 		try
 		{
 			while (rowset.next())
@@ -400,7 +400,7 @@ public class ReplicationLocal extends SvrProcess
 			+ " AND AD_ReplicationStrategy_ID=?" 	//	#1
 			+ " AND rt.ReplicationType='R' "		//	Reference
 			+ "ORDER BY t.LoadSeq";
-		RowSet rowset = getRowSet(sql, new Object[]{new Integer(m_replication.getAD_ReplicationStrategy_ID())});
+		RowSet rowset = getRowSet(sql, new Object[]{Integer.valueOf(m_replication.getAD_ReplicationStrategy_ID())});
 		try
 		{
 			while (rowset.next())
diff --git a/org.adempiere.base.process/src/org/compiere/process/RfQCreateSO.java b/org.adempiere.base.process/src/org/compiere/process/RfQCreateSO.java
index f7c9ff976b..c6942503aa 100644
--- a/org.adempiere.base.process/src/org/compiere/process/RfQCreateSO.java
+++ b/org.adempiere.base.process/src/org/compiere/process/RfQCreateSO.java
@@ -17,6 +17,7 @@
 package org.compiere.process;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.logging.Level;
 
 import org.compiere.model.MBPartner;
@@ -129,7 +130,7 @@ public class RfQCreateSO extends SvrProcess
 							{
 								margin = margin.add(Env.ONEHUNDRED);
 								price = price.multiply(margin)
-									.divide(Env.ONEHUNDRED, 2, BigDecimal.ROUND_HALF_UP);
+									.divide(Env.ONEHUNDRED, 2, RoundingMode.HALF_UP);
 							}
 						}
 					}	//	price
diff --git a/org.adempiere.base.process/src/org/compiere/process/SendMailText.java b/org.adempiere.base.process/src/org/compiere/process/SendMailText.java
index babd887342..a5d8688831 100644
--- a/org.adempiere.base.process/src/org/compiere/process/SendMailText.java
+++ b/org.adempiere.base.process/src/org/compiere/process/SendMailText.java
@@ -252,7 +252,7 @@ public class SendMailText extends SvrProcess
 	private Boolean sendIndividualMail (String Name, int AD_User_ID, StringBuilder unsubscribe)
 	{
 		//	Prevent two email
-		Integer ii = new Integer (AD_User_ID);
+		Integer ii = Integer.valueOf(AD_User_ID);
 		if (m_list.contains(ii))
 			return null;
 		m_list.add(ii);
@@ -290,7 +290,7 @@ public class SendMailText extends SvrProcess
 		}
 		StringBuilder msglog = new StringBuilder((OK ? "@OK@" : "@ERROR@")).append(" - ").append(to.getEMail());
 		addLog(0, null, null, msglog.toString());
-		return new Boolean(OK);
+		return Boolean.valueOf(OK);
 	}	//	sendIndividualMail
 
 }	//	SendMailText
diff --git a/org.adempiere.base.process/src/org/idempiere/process/CleanOrphanCascade.java b/org.adempiere.base.process/src/org/idempiere/process/CleanOrphanCascade.java
new file mode 100644
index 0000000000..bec999a7c3
--- /dev/null
+++ b/org.adempiere.base.process/src/org/idempiere/process/CleanOrphanCascade.java
@@ -0,0 +1,147 @@
+/**********************************************************************
+* This file is part of iDempiere ERP Open Source                      *
+* http://www.idempiere.org                                            *
+*                                                                     *
+* Copyright (C) Contributors                                          *
+*                                                                     *
+* This program is free software; you can redistribute it and/or       *
+* modify it under the terms of the GNU General Public License         *
+* as published by the Free Software Foundation; either version 2      *
+* of the License, or (at your option) any later version.              *
+*                                                                     *
+* This program is distributed in the hope that it will be useful,     *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of      *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        *
+* GNU General Public License for more details.                        *
+*                                                                     *
+* You should have received a copy of the GNU General Public License   *
+* along with this program; if not, write to the Free Software         *
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,          *
+* MA 02110-1301, USA.                                                 *
+*                                                                     *
+* Contributors:                                                       *
+* - Carlos Ruiz                                                       *
+**********************************************************************/
+package org.idempiere.process;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.logging.Level;
+
+import org.compiere.model.MArchive;
+import org.compiere.model.MAttachment;
+import org.compiere.model.MTable;
+import org.compiere.model.Query;
+import org.compiere.process.ProcessInfoParameter;
+import org.compiere.process.SvrProcess;
+import org.compiere.util.DB;
+import org.compiere.util.Msg;
+
+/**
+ *	IDEMPIERE-2395
+ * 	@author 	Carlos Ruiz - globalqss
+ */
+public class CleanOrphanCascade extends SvrProcess
+{
+
+	/**
+	 *  Prepare - e.g., get Parameters.
+	 */
+	protected void prepare()
+	{
+		for (ProcessInfoParameter para : getParameter())
+		{
+			String name = para.getParameterName();
+			log.log(Level.SEVERE, "Unknown Parameter: " + name);
+		}
+	}	//	prepare
+
+	/**
+	 *  Perform process.
+	 *  @return Message
+	 *  @throws Exception
+	 */
+	protected String doIt() throws Exception
+	{
+		if (log.isLoggable(Level.INFO)) log.info("");
+
+		String whereTables = ""
+				+ "    IsView = 'N' "
+				+ "AND TableName != 'AD_ChangeLog' "
+				+ "AND EXISTS (SELECT 1 "
+				+ "            FROM   AD_Column ct "
+				+ "            WHERE  ct.IsActive='Y' AND ct.AD_Table_ID = AD_Table.AD_Table_ID "
+				+ "                   AND ct.ColumnName = 'AD_Table_ID') "
+				+ "AND EXISTS (SELECT 1 "
+				+ "            FROM   AD_Column cr "
+				+ "            WHERE  cr.IsActive='Y' AND cr.AD_Table_ID = AD_Table.AD_Table_ID "
+				+ "                   AND cr.ColumnName = 'Record_ID') "
+				+ "AND EXISTS (SELECT 1 "
+				+ "            FROM   AD_Column ck "
+				+ "            WHERE  ck.IsActive='Y' AND ck.AD_Table_ID = AD_Table.AD_Table_ID "
+				+ "                   AND ck.ColumnName = AD_Table.TableName || '_ID')";
+
+		List<MTable> tables = new Query(getCtx(), "AD_Table", whereTables, get_TrxName())
+				.setOnlyActiveRecords(true)
+				.setOrderBy("TableName")
+				.list();
+		for (MTable table : tables) {
+			String tableName = table.getTableName();
+
+			StringBuilder sqlRef = new StringBuilder();
+			sqlRef.append("SELECT DISTINCT t.AD_Table_ID, ");
+			sqlRef.append("                t.TableName ");
+			sqlRef.append("FROM   ").append(tableName).append(" r ");
+			sqlRef.append("       JOIN AD_Table t ON ( r.AD_Table_ID = t.AD_Table_ID ) ");
+			sqlRef.append("ORDER  BY t.Tablename");
+			List<List<Object>> rowTables = DB.getSQLArrayObjectsEx(get_TrxName(), sqlRef.toString());
+			if (rowTables != null) {
+				for (List<Object> row : rowTables) {
+					int refTableID = ((BigDecimal) row.get(0)).intValue();
+					String refTableName = row.get(1).toString();
+
+					MTable refTable = MTable.get(getCtx(), refTableID);
+					if (refTable.getKeyColumns().length != 1) {
+						log.warning("Wrong reference for table " + tableName + " -> " + refTableName);
+						continue;
+					}
+					String colRef = refTable.getKeyColumns()[0];
+					
+					StringBuilder whereClause = new StringBuilder();
+					whereClause.append("AD_Table_ID = ").append(refTableID);
+					whereClause.append(" AND NOT EXISTS (SELECT ").append(colRef);
+					whereClause.append("                FROM   ").append(refTableName).append(" ");
+					whereClause.append("                WHERE  ").append(refTableName).append(".").append(colRef).append(" = ").append(tableName).append(".Record_ID)");
+
+					int noDel = 0;
+					if (MAttachment.Table_Name.equals(tableName)) {
+						// special case for attachment because of store
+						List<MAttachment> attachments = new Query(getCtx(), tableName, whereClause.toString(), get_TrxName()).list();
+						for (MAttachment attachment : attachments) {
+							attachment.deleteEx(true, get_TrxName());
+							noDel++;
+						}
+					} else if (MArchive.Table_Name.equals(tableName)) {
+						// special case for archive because of store
+						List<MArchive> archives = new Query(getCtx(), tableName, whereClause.toString(), get_TrxName()).list();
+						for (MArchive archive : archives) {
+							archive.deleteEx(true, get_TrxName());
+							noDel++;
+						}
+					} else {
+						StringBuilder sqlDelete = new StringBuilder();
+						sqlDelete.append("DELETE FROM ").append(tableName).append(" WHERE ").append(whereClause);
+						noDel = DB.executeUpdateEx(sqlDelete.toString(), get_TrxName());
+					}
+					if (noDel > 0) {
+						addLog(Msg.parseTranslation(getCtx(), noDel + " " + tableName + " " + "@Deleted@ -> " + refTableName));
+					}
+				}
+
+			}
+		}
+
+		return "@OK@";
+	}	//	doIt
+
+}	//	CleanOrphanCascade
diff --git a/org.adempiere.base.process/src/org/idempiere/process/ImportCSVProcess.java b/org.adempiere.base.process/src/org/idempiere/process/ImportCSVProcess.java
index 45fca381c8..9ceac6bf8d 100644
--- a/org.adempiere.base.process/src/org/idempiere/process/ImportCSVProcess.java
+++ b/org.adempiere.base.process/src/org/idempiere/process/ImportCSVProcess.java
@@ -144,6 +144,7 @@ public class ImportCSVProcess extends SvrProcess implements DataStatusListener {
 	protected void importFile(String filePath, IGridTabImporter csvImporter, GridTab activeTab, List<GridTab> childTabs) throws Exception {
 		m_file_istream = new FileInputStream(filePath);
 
+		m_file_istream = m_importTemplate.validateFile(m_file_istream);
 		File outFile = csvImporter.fileImport(activeTab, childTabs, m_file_istream, Charset.forName(m_importTemplate.getCharacterSet()), p_ImportMode, processUI);
 		// TODO: Potential improvement - traverse the outFile and call addLog with the results
 
diff --git a/org.adempiere.base/.classpath b/org.adempiere.base/.classpath
index 17c76976d9..10ed57fe9f 100644
--- a/org.adempiere.base/.classpath
+++ b/org.adempiere.base/.classpath
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+			<attribute name="add-exports" value="java.sql.rowset/com.sun.rowset=ALL-UNNAMED"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry exported="true" kind="lib" path="lib/bsh.jar"/>
diff --git a/org.adempiere.base/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.base/.settings/org.eclipse.jdt.core.prefs
index f6fb89ba37..182138f43f 100644
--- a/org.adempiere.base/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.base/.settings/org.eclipse.jdt.core.prefs
@@ -10,15 +10,12 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.APILeak=warning
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
 org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
 org.eclipse.jdt.core.compiler.problem.deadCode=warning
@@ -27,7 +24,6 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
@@ -108,4 +104,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF
index c4aee5c15e..244a0ac7ed 100644
--- a/org.adempiere.base/META-INF/MANIFEST.MF
+++ b/org.adempiere.base/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Core
 Bundle-SymbolicName: org.adempiere.base;singleton:=true
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.1.0.qualifier
 Bundle-ClassPath: .,
  lib/bsh.jar,
  lib/commons-validator.jar,
@@ -56,14 +56,14 @@ Export-Package: bsh,
  org.idempiere.broadcast,
  org.idempiere.distributed,
  org.idempiere.model
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Import-Package: com.sun.mail.smtp;version="1.5",
- javax.activation,
  javax.jms;version="1.1.0",
  javax.mail;version="1.5",
  javax.mail.internet;version="1.5",
  javax.servlet;version="3.0.0",
  javax.servlet.http;version="3.0.0",
+ javax.xml.bind;version="2.3.0",
  junit.framework;version="3.8.2";resolution:=optional,
  junit.textui;version="3.8.2";resolution:=optional,
  net.sf.cglib.proxy,
@@ -77,8 +77,6 @@ Import-Package: com.sun.mail.smtp;version="1.5",
  org.apache.ecs,
  org.apache.ecs.xhtml,
  org.apache.felix.scr;version="1.6.0",
- org.apache.poi.hssf.usermodel,
- org.apache.poi.ss.usermodel,
  org.apache.tools.ant,
  org.apache.tools.ant.taskdefs,
  org.eclipse.core.runtime;version="3.4.0",
@@ -121,6 +119,11 @@ Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0",
  com.itextpdf;bundle-version="0.0.0",
  net.sf.supercsv.super-csv;bundle-version="0.0.0",
  bcprov;bundle-version="1.54.0",
- groovy-all;bundle-version="0.0.0",
- org.krysalis.barcode4j;bundle-version="0.0.0"
+ org.krysalis.barcode4j;bundle-version="0.0.0",
+ groovy,
+ javax.xml;bundle-version="1.3.4",
+ org.apache.poi.poi;bundle-version="3.15.0",
+ org.apache.poi.poi-ooxml;bundle-version="3.15.0",
+ javax.activation;bundle-version="1.1.0"
 Automatic-Module-Name: org.adempiere.base
+Bundle-Vendor: iDempiere Community
diff --git a/org.adempiere.base/pom.xml b/org.adempiere.base/pom.xml
index f5a42a07cc..493665974a 100644
--- a/org.adempiere.base/pom.xml
+++ b/org.adempiere.base/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.base</artifactId>
@@ -17,7 +17,11 @@
 				<artifactId>tycho-compiler-plugin</artifactId>
 				<configuration>
 					<!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=367431 -->
-					<compilerArgument>-warn:+forbidden</compilerArgument>
+					<compilerArgs>
+						<arg>-warn:+forbidden</arg>
+		      			<arg>--add-exports</arg>
+		      			<arg>java.sql.rowset/com.sun.rowset=ALL-UNNAMED</arg>
+					</compilerArgs>
 				</configuration>
 			</plugin>
 
@@ -45,7 +49,7 @@
 								<artifactItem>
 									<groupId>org.python</groupId>
 									<artifactId>jython</artifactId>
-									<version>2.2.1</version>
+									<version>2.7.0</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>it.sauronsoftware.cron4j</groupId>
@@ -73,4 +77,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/org.adempiere.base/src/com/akunagroup/uk/postcode/AddressLookup.java b/org.adempiere.base/src/com/akunagroup/uk/postcode/AddressLookup.java
index 16e9d4f042..39ba901d73 100644
--- a/org.adempiere.base/src/com/akunagroup/uk/postcode/AddressLookup.java
+++ b/org.adempiere.base/src/com/akunagroup/uk/postcode/AddressLookup.java
@@ -252,7 +252,7 @@ public class AddressLookup implements AddressLookupInterface {
 						NodeList firstValueList = firstElement.getElementsByTagName("Value");
 						Element ValueElement = (Element) firstValueList.item(0);
 						if (log.isLoggable(Level.FINE)){log.log(Level.FINE, "Value: "  + ValueElement.getChildNodes().item(0).getNodeValue().replaceAll("\n","").trim() + " Node: " + i);}
-						resultCode = (int) new Integer(ValueElement.getChildNodes().item(0).getNodeValue().replaceAll("\n","").trim());
+						resultCode = (int) Integer.valueOf(ValueElement.getChildNodes().item(0).getNodeValue().replaceAll("\n","").trim());
 					}
 						
 			}
diff --git a/org.adempiere.base/src/org/adempiere/base/DefaultAddressValidationFactory.java b/org.adempiere.base/src/org/adempiere/base/DefaultAddressValidationFactory.java
index 99f1917eb4..5555259e39 100644
--- a/org.adempiere.base/src/org/adempiere/base/DefaultAddressValidationFactory.java
+++ b/org.adempiere.base/src/org/adempiere/base/DefaultAddressValidationFactory.java
@@ -44,7 +44,7 @@ public class DefaultAddressValidationFactory implements IAddressValidationFactor
 			{
 				Class<?> ppClass = Class.forName(className);
 				if (ppClass != null)
-					myProcessor = (IAddressValidation) ppClass.newInstance();
+					myProcessor = (IAddressValidation) ppClass.getDeclaredConstructor().newInstance();
 			} 
 			catch (Error e1) 
 			{   //  NoClassDefFound
diff --git a/org.adempiere.base/src/org/adempiere/base/DefaultCalloutFactory.java b/org.adempiere.base/src/org/adempiere/base/DefaultCalloutFactory.java
index 9d74a6249f..e0853b04c0 100644
--- a/org.adempiere.base/src/org/adempiere/base/DefaultCalloutFactory.java
+++ b/org.adempiere.base/src/org/adempiere/base/DefaultCalloutFactory.java
@@ -80,7 +80,7 @@ public class DefaultCalloutFactory implements ICalloutFactory {
 			//Get callout
 			try
 			{
-				callout = (Callout)calloutClass.newInstance();
+				callout = (Callout)calloutClass.getDeclaredConstructor().newInstance();
 			}
 			catch (Exception ex)
 			{
diff --git a/org.adempiere.base/src/org/adempiere/base/DefaultModelFactory.java b/org.adempiere.base/src/org/adempiere/base/DefaultModelFactory.java
index 8a48f6c49e..309f58a47d 100644
--- a/org.adempiere.base/src/org/adempiere/base/DefaultModelFactory.java
+++ b/org.adempiere.base/src/org/adempiere/base/DefaultModelFactory.java
@@ -269,7 +269,7 @@ public class DefaultModelFactory implements IModelFactory {
 				s_log.warning("No transaction Constructor for " + clazz + " (" + msg + ")");
 			}
 
-			PO po = constructor!=null ? (PO)constructor.newInstance(new Object[] {Env.getCtx(), new Integer(Record_ID), trxName}) : null;
+			PO po = constructor!=null ? (PO)constructor.newInstance(new Object[] {Env.getCtx(), Integer.valueOf(Record_ID), trxName}) : null;
 			return po;
 		}
 		catch (Exception e)
diff --git a/org.adempiere.base/src/org/adempiere/base/DefaultModelValidatorFactory.java b/org.adempiere.base/src/org/adempiere/base/DefaultModelValidatorFactory.java
index d8af7d0f93..fe7ecec0aa 100644
--- a/org.adempiere.base/src/org/adempiere/base/DefaultModelValidatorFactory.java
+++ b/org.adempiere.base/src/org/adempiere/base/DefaultModelValidatorFactory.java
@@ -56,7 +56,7 @@ public class DefaultModelValidatorFactory implements IModelValidatorFactory {
 			}
 			if (clazz != null) {
 				try {
-					validator = (ModelValidator)clazz.newInstance();
+					validator = (ModelValidator)clazz.getDeclaredConstructor().newInstance();
 				} catch (Exception e) {
 					e.printStackTrace();
 				} 
diff --git a/org.adempiere.base/src/org/adempiere/base/DefaultPaymentExporterFactory.java b/org.adempiere.base/src/org/adempiere/base/DefaultPaymentExporterFactory.java
index 797a98a602..bdfc978423 100644
--- a/org.adempiere.base/src/org/adempiere/base/DefaultPaymentExporterFactory.java
+++ b/org.adempiere.base/src/org/adempiere/base/DefaultPaymentExporterFactory.java
@@ -42,7 +42,7 @@ public class DefaultPaymentExporterFactory implements IPaymentExporterFactory {
 			try {
 				Class<?> peClass = Class.forName(className);
 				if (peClass != null)
-					myExporter = (PaymentExport)peClass.newInstance();
+					myExporter = (PaymentExport)peClass.getDeclaredConstructor().newInstance();
 			} catch (Error e1) {   //  NoClassDefFound
 				s_log.log(Level.SEVERE, className + " - Error=" + e1.getMessage());
 				return null;
diff --git a/org.adempiere.base/src/org/adempiere/base/DefaultPaymentProcessorFactory.java b/org.adempiere.base/src/org/adempiere/base/DefaultPaymentProcessorFactory.java
index 21301c0f70..c948cbfd44 100644
--- a/org.adempiere.base/src/org/adempiere/base/DefaultPaymentProcessorFactory.java
+++ b/org.adempiere.base/src/org/adempiere/base/DefaultPaymentProcessorFactory.java
@@ -45,7 +45,7 @@ public class DefaultPaymentProcessorFactory implements IPaymentProcessorFactory
 			try {
 				Class<?> ppClass = Class.forName(className);
 				if (ppClass != null)
-					myProcessor = (PaymentProcessor)ppClass.newInstance();
+					myProcessor = (PaymentProcessor)ppClass.getDeclaredConstructor().newInstance();
 			} catch (Error e1) {   //  NoClassDefFound
 				s_log.log(Level.SEVERE, className + " - Error=" + e1.getMessage());
 				return null;
diff --git a/org.adempiere.base/src/org/adempiere/base/DefaultProcessFactory.java b/org.adempiere.base/src/org/adempiere/base/DefaultProcessFactory.java
index 681f2a1cb7..7d1f7b13a3 100644
--- a/org.adempiere.base/src/org/adempiere/base/DefaultProcessFactory.java
+++ b/org.adempiere.base/src/org/adempiere/base/DefaultProcessFactory.java
@@ -77,7 +77,7 @@ public class DefaultProcessFactory implements IProcessFactory {
 			//Get Process
 			try
 			{
-				process = (ProcessCall)processClass.newInstance();
+				process = (ProcessCall)processClass.getDeclaredConstructor().newInstance();
 			}
 			catch (Exception ex)
 			{
diff --git a/org.adempiere.base/src/org/adempiere/base/DefaultShipmentProcessorFactory.java b/org.adempiere.base/src/org/adempiere/base/DefaultShipmentProcessorFactory.java
index 63e3a13adb..77667ed00b 100644
--- a/org.adempiere.base/src/org/adempiere/base/DefaultShipmentProcessorFactory.java
+++ b/org.adempiere.base/src/org/adempiere/base/DefaultShipmentProcessorFactory.java
@@ -43,7 +43,7 @@ public class DefaultShipmentProcessorFactory implements IShipmentProcessorFactor
 			{
 				Class<?> ppClass = Class.forName(className);
 				if (ppClass != null)
-					myProcessor = (IShipmentProcessor) ppClass.newInstance();
+					myProcessor = (IShipmentProcessor) ppClass.getDeclaredConstructor().newInstance();
 			} 
 			catch (Error e1) 
 			{   //  NoClassDefFound
diff --git a/org.adempiere.base/src/org/adempiere/base/DefaultTaxProviderFactory.java b/org.adempiere.base/src/org/adempiere/base/DefaultTaxProviderFactory.java
index 45540988dc..3b5a1d14bf 100644
--- a/org.adempiere.base/src/org/adempiere/base/DefaultTaxProviderFactory.java
+++ b/org.adempiere.base/src/org/adempiere/base/DefaultTaxProviderFactory.java
@@ -38,7 +38,7 @@ public class DefaultTaxProviderFactory implements ITaxProviderFactory {
 			{
 				Class<?> ppClass = Class.forName(className);
 				if (ppClass != null)
-					myCalculator = (ITaxProvider) ppClass.newInstance();
+					myCalculator = (ITaxProvider) ppClass.getDeclaredConstructor().newInstance();
 			} 
 			catch (Error e1) 
 			{   //  NoClassDefFound
diff --git a/org.adempiere.base/src/org/adempiere/base/event/RequestEventHandler.java b/org.adempiere.base/src/org/adempiere/base/event/RequestEventHandler.java
index cd96218a8b..420f8857d4 100644
--- a/org.adempiere.base/src/org/adempiere/base/event/RequestEventHandler.java
+++ b/org.adempiere.base/src/org/adempiere/base/event/RequestEventHandler.java
@@ -368,7 +368,7 @@ public class RequestEventHandler extends AbstractEventHandler implements Managed
 				}
 
 				//	Check duplicate receivers
-				Integer ii = new Integer (AD_User_ID);
+				Integer ii = Integer.valueOf(AD_User_ID);
 				if (userList.contains(ii))
 					continue;
 				userList.add(ii);
diff --git a/org.adempiere.base/src/org/adempiere/impexp/AbstractExcelExporter.java b/org.adempiere.base/src/org/adempiere/impexp/AbstractExcelExporter.java
index db5d908eb9..02f823d34f 100644
--- a/org.adempiere.base/src/org/adempiere/impexp/AbstractExcelExporter.java
+++ b/org.adempiere.base/src/org/adempiere/impexp/AbstractExcelExporter.java
@@ -35,6 +35,7 @@ import org.apache.poi.hssf.usermodel.HSSFRichTextString;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.BorderStyle;
 import org.compiere.model.MSysConfig;
 import org.compiere.util.CLogger;
 import org.compiere.util.DisplayType;
@@ -166,13 +167,13 @@ public abstract class AbstractExcelExporter
 		if (isHeader) {
 			if (m_fontHeader == null) {
 				m_fontHeader = m_workbook.createFont();
-				m_fontHeader.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
+				m_fontHeader.setBold(true);
 			}
 			font = m_fontHeader;
 		}
 		else if (isFunctionRow()) {
 			font = m_workbook.createFont();
-			font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
+			font.setBold(true);
 			font.setItalic(true);
 		}
 		else {
@@ -228,28 +229,37 @@ public abstract class AbstractExcelExporter
 		String key = "cell-"+col+"-"+displayType;
 		HSSFCellStyle cs = m_styles.get(key);
 		if (cs == null) {
-			boolean isHighlightNegativeNumbers = true;
 			cs = m_workbook.createCellStyle();
 			HSSFFont font = getFont(false);
 			cs.setFont(font);
 			// Border
-			cs.setBorderLeft((short)1);
-			cs.setBorderTop((short)1);
-			cs.setBorderRight((short)1);
-			cs.setBorderBottom((short)1);
+			cs.setBorderLeft(BorderStyle.THIN);
+			cs.setBorderTop(BorderStyle.THIN);
+			cs.setBorderRight(BorderStyle.THIN);
+			cs.setBorderBottom(BorderStyle.THIN);
 			//
-			if (DisplayType.isDate(displayType)) {
-				cs.setDataFormat(m_dataFormat.getFormat(DisplayType.getDateFormat(getLanguage()).toPattern()));
-			}
-			else if (DisplayType.isNumeric(displayType)) {
-				DecimalFormat df = DisplayType.getNumberFormat(displayType, getLanguage());
-				String format = getFormatString(df, isHighlightNegativeNumbers);
-				cs.setDataFormat(m_dataFormat.getFormat(format));
-			}
+			String cellFormat = getCellFormat(row, col);
+			if (cellFormat != null)
+				cs.setDataFormat(m_dataFormat.getFormat(cellFormat));
 			m_styles.put(key, cs);
 		}
 		return cs;
 	}
+	
+	protected String getCellFormat(int row, int col) {
+		boolean isHighlightNegativeNumbers = true;
+		int displayType = getDisplayType(row, col);
+		String cellFormat = null;
+		
+		if (DisplayType.isDate(displayType)) {
+			cellFormat = DisplayType.getDateFormat(getLanguage()).toPattern();
+		} else if (DisplayType.isNumeric(displayType)) {
+			DecimalFormat df = DisplayType.getNumberFormat(displayType, getLanguage());
+			cellFormat = getFormatString(df, isHighlightNegativeNumbers);
+		}
+		
+		return cellFormat;
+	}
 
 	private HSSFCellStyle getHeaderStyle(int col)
 	{
@@ -259,10 +269,10 @@ public abstract class AbstractExcelExporter
 			HSSFFont font_header = getFont(true);
 			cs_header = m_workbook.createCellStyle();
 			cs_header.setFont(font_header);
-			cs_header.setBorderLeft((short)2);
-			cs_header.setBorderTop((short)2);
-			cs_header.setBorderRight((short)2);
-			cs_header.setBorderBottom((short)2);
+			cs_header.setBorderLeft(BorderStyle.MEDIUM);
+			cs_header.setBorderTop(BorderStyle.MEDIUM);
+			cs_header.setBorderRight(BorderStyle.MEDIUM);
+			cs_header.setBorderBottom(BorderStyle.MEDIUM);
 			cs_header.setDataFormat(HSSFDataFormat.getBuiltinFormat("text"));
 			cs_header.setWrapText(true);
 			m_styles.put(key, cs_header);
diff --git a/org.adempiere.base/src/org/adempiere/impexp/GridTabCSVExporter.java b/org.adempiere.base/src/org/adempiere/impexp/GridTabCSVExporter.java
index b074057fd1..b8f2416605 100644
--- a/org.adempiere.base/src/org/adempiere/impexp/GridTabCSVExporter.java
+++ b/org.adempiere.base/src/org/adempiere/impexp/GridTabCSVExporter.java
@@ -147,8 +147,8 @@ public class GridTabCSVExporter implements IGridTabExporter
 				 
 				 if(detail.getDisplayLogic()!=null){
 				    //if(!currentRowOnly)
-				       //numOfTabs--;	
-					 //TODO: it's need? DisplayLogic is evaluated when call detail.isDisplayed() 
+				       //numOfTabs--;
+					//TODO: it's need? DisplayLogic is evaluated when call detail.isDisplayed() 
 				    if(currentRowOnly && !Evaluator.evaluateLogic(detail,detail.getDisplayLogic()))
 					   continue;
 				 }
@@ -223,7 +223,7 @@ public class GridTabCSVExporter implements IGridTabExporter
 				int index =0;
 				int rowDetail=0;  
 				int record_Id = 0;
-				boolean isActiveRow = true;
+//				boolean isActiveRow = true;
 				gridTab.setCurrentRow(idxrow);
 				for(GridField field : getFields(gridTab)){   
 					MColumn column = MColumn.get(Env.getCtx(), field.getAD_Column_ID());
@@ -241,16 +241,16 @@ public class GridTabCSVExporter implements IGridTabExporter
 					   value = resolveValue(gridTab, table, column, idxrow, headName);
 					}
 					//Ignore row 
-					if("IsActive".equals(headName) && value!=null && Boolean.valueOf((Boolean)value)==false){
-						isActiveRow=false;	
-						break;
-					}
+//					if("IsActive".equals(headName) && value!=null && Boolean.valueOf((Boolean)value)==false){
+//						isActiveRow=false;	
+//						break;
+//					}
 					row.put(headName,value);
 					idxfld++;
 					index++;
 				} 
-			    if(!isActiveRow) 	
-			       continue;
+//			    if(!isActiveRow) 	
+//			       continue;
 			    	
 				if(specialHDispayType > 0 && record_Id > 0){
 				   switch(specialHDispayType) {
@@ -336,8 +336,8 @@ public class GridTabCSVExporter implements IGridTabExporter
 		if (tab.isReadOnly())
 		   result = Msg.getMsg(Env.getCtx(),"FieldIsReadOnly", new Object[] {gridTab.getName()});
 		
-		if (gridTab.getTableName().endsWith("_Acct"))
-		   result = "Accounting Tab are not exported by default: "+ gridTab.getName();
+//		if (gridTab.getTableName().endsWith("_Acct"))
+//		   result = "Accounting Tab are not exported by default: "+ gridTab.getName();
 		
 		return result;
 	}
@@ -354,10 +354,10 @@ public class GridTabCSVExporter implements IGridTabExporter
 		
 		for(Map.Entry<GridTab, GridField[]> childTabDetail : tabMapDetails.entrySet()) {		
 		    GridTab childTab = childTabDetail.getKey();
-		    //String  whereCla = getWhereClause (childTab, parentGrid, currentParentIndex);
+		    //String  whereCla = getWhereClause (childTab ,record_Id ,keyColumnParent);
 		    //childTab.getTableModel().dataRequery(whereCla, false, 0);
 			Map<String,Object> row = new HashMap<String,Object>();
-			boolean isActiveRow = true;
+//			boolean isActiveRow = true;
 		    if (childTab.getRowCount() > 0) {
 		    	int specialRecordId = 0;
 		    	for(GridField field : childTabDetail.getValue()){
@@ -374,19 +374,19 @@ public class GridTabCSVExporter implements IGridTabExporter
 				    String headName = headArray.get(headArray.indexOf(childTab.getTableName()+">"+resolveColumnName(tableDetail,column))); 
 				    value = resolveValue(childTab, MTable.get(Env.getCtx(),childTab.getTableName()), column, currentDetRow, headName.substring(headName.indexOf(">")+ 1,headName.length()));
 				    
-				    if(DisplayType.Payment == field.getDisplayType())
+				    if(DisplayType.Payment == field.getDisplayType() && value != null)
 					   value = MRefList.getListName(Env.getCtx(),REFERENCE_PAYMENTRULE, value.toString()); 
 					   
 				    row.put(headName,value);
 				    if(value!=null)
 				       hasDetails = true;
 					//Ignore row 
-					if(headName.contains("IsActive")&& value!=null && Boolean.valueOf((Boolean)value)==false){
-					   isActiveRow=false;	
-					   break;
-					}				    
+//					if(headName.contains("IsActive")&& value!=null && Boolean.valueOf((Boolean)value)==false){
+//					   isActiveRow=false;	
+//					   break;
+//					}				    
 			    }	
-				if(isActiveRow && specialDetDispayType > 0 && specialRecordId > 0){
+				if(/* isActiveRow && */ specialDetDispayType > 0 && specialRecordId > 0){
 					MLocation address = new MLocation (Env.getCtx(),specialRecordId,null);  
 					for(String specialHeader:resolveSpecialColumnName(specialDetDispayType)){
 						String columnName = specialHeader.substring(specialHeader.indexOf(">")+1,specialHeader.length());		
@@ -411,7 +411,7 @@ public class GridTabCSVExporter implements IGridTabExporter
 					}	
 				}
 		    }
-		    if(isActiveRow)
+//		    if(isActiveRow)
 		       activeRow.putAll(row);
 		}
 		if (hasDetails)
@@ -495,6 +495,8 @@ public class GridTabCSVExporter implements IGridTabExporter
 					name.append("[DocumentNo]");
 				}
 			}
+		} else if (DisplayType.Account == column.getAD_Reference_ID()) {
+			name.append("[Combination]");
 		}
 		return name.toString();
 	}
@@ -588,11 +590,11 @@ public class GridTabCSVExporter implements IGridTabExporter
 				if (DisplayType.Button == MColumn.get(Env.getCtx(),field.getAD_Column_ID()).getAD_Reference_ID())
 					continue;
 				if (   field.isVirtualColumn()
-					|| field.isEncrypted()
-					|| field.isEncryptedColumn()
-					|| !(field.isDisplayed() || field.isDisplayedGrid()))
-					continue;
-				if (field.isParentValue() || (!field.isReadOnly() && field.isDisplayedGrid()))
+						|| field.isEncrypted()
+						|| field.isEncryptedColumn()
+						|| !(field.isDisplayed() || field.isDisplayedGrid()))
+						continue;
+				if (field.isParentValue() || (!field.isReadOnly() && field.isDisplayedGrid()) || field.isParentColumn())
 					gridFieldList.add(field);
 			}
 			
diff --git a/org.adempiere.base/src/org/adempiere/impexp/GridTabCSVImporter.java b/org.adempiere.base/src/org/adempiere/impexp/GridTabCSVImporter.java
index 81193e7a82..e5be3fea25 100644
--- a/org.adempiere.base/src/org/adempiere/impexp/GridTabCSVImporter.java
+++ b/org.adempiere.base/src/org/adempiere/impexp/GridTabCSVImporter.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
+import java.math.BigDecimal;
 import java.nio.charset.Charset;
 import java.sql.SQLException;
 import java.sql.Timestamp;
@@ -905,16 +906,20 @@ public class GridTabCSVImporter implements IGridTabImporter
 			String columnName = header.get(i);	
 			Object value = tmpRow.get(i); 	
 			//Validate Address
-			if(header.get(i).contains(MTable.getTableName(Env.getCtx(),MLocation.Table_ID)) && !isAddressValidated){
-			   StringBuilder specialColumns = new StringBuilder();
-			   specialColumns = validateSpecialFields(gridTab,header,tmpRow,i,"C_Location_ID");
-			   isAddressValidated = true;
-			   if(specialColumns==null)
-				  continue;   
-			   else
-				  return specialColumns;     
-			}else if (header.get(i).contains(MTable.getTableName(Env.getCtx(),MLocation.Table_ID)) && isAddressValidated){
-				continue;
+			if (!"C_Location".equals(gridTab.getTableName()))
+			{
+				//Validate Address
+				if(header.get(i).contains(MTable.getTableName(Env.getCtx(),MLocation.Table_ID)) && !isAddressValidated){
+				   StringBuilder specialColumns = new StringBuilder();
+				   specialColumns = validateSpecialFields(gridTab,header,tmpRow,i,"C_Location_ID");
+				   isAddressValidated = true;
+				   if(specialColumns==null)
+					  continue;   
+				   else
+					  return specialColumns;     
+				}else if (header.get(i).contains(MTable.getTableName(Env.getCtx(),MLocation.Table_ID)) && isAddressValidated){
+					continue;
+				}
 			}
 			
 			if(value!=null)
@@ -1067,7 +1072,7 @@ public class GridTabCSVImporter implements IGridTabImporter
 			if(isForeing) 
 			   foreignColumn = header.get(i).substring(header.get(i).indexOf("[")+1,header.get(i).indexOf("]"));
 			
-			if(header.get(i).contains(MTable.getTableName(Env.getCtx(),MLocation.Table_ID))){
+			if(!"C_Location".equals(gridTab.getTableName()) && header.get(i).contains(MTable.getTableName(Env.getCtx(),MLocation.Table_ID))){
 		    
 				if(address == null){
 				    if(isInsertMode()){
@@ -1173,7 +1178,7 @@ public class GridTabCSVImporter implements IGridTabImporter
 						} else {
 							
 							int id = resolveForeign(foreignTable, foreignColumn, value,field,trx);
-							if (id < 0)
+							if(id < 0)	
 								return Msg.getMsg(Env.getCtx(),id==-2?"ForeignMultipleResolved":"ForeignNotResolved",new Object[]{header.get(i),value});
 
 							setValue = id;
@@ -1219,7 +1224,17 @@ public class GridTabCSVImporter implements IGridTabImporter
 							 }else{
 								 return Msg.getMsg(Env.getCtx(),"Invalid") + " Column ["+column.getColumnName()+"]";   
 							 } 
-						  }  
+						  }  else if (DisplayType.isNumeric(field.getDisplayType()) || DisplayType.isID(field.getDisplayType())) {
+							  if (columnName.endsWith("_ID")) {
+								  if (!(value instanceof Integer)) {
+									  Integer idValue = Integer.valueOf(value.toString());
+									  value = idValue;
+								  }
+							  } else if (!(value instanceof BigDecimal)) {
+								  BigDecimal decValue = new BigDecimal(value.toString());
+								  value = decValue;
+							  }
+						  }
 						  setValue = value;
 						  isThereRow =true;
 					   }
@@ -1349,7 +1364,7 @@ public class GridTabCSVImporter implements IGridTabImporter
 		//Process columnKeys + Foreign to add restrictions.
 		for (int i = startindx ; i < endindx + 1 ; i++){					  
 		    boolean isKeyColumn = header.get(i).indexOf("/") > 0 && ( header.get(i).endsWith("K") || header.get(i).endsWith("KT"));	
-			if(isKeyColumn && !header.get(i).contains(MTable.getTableName(Env.getCtx(),MLocation.Table_ID))){  
+		    if(isKeyColumn && ("C_Location".equals(gridTab.getTableName()) || !header.get(i).contains(MTable.getTableName(Env.getCtx(),MLocation.Table_ID)))){  
 			   boolean isForeing = header.get(i).indexOf("[") > 0 && header.get(i).indexOf("]")>0;
 			   boolean isDetail  = header.get(i).indexOf(">") > 0;
 			   columnwithKey = getColumnName(isKeyColumn,isForeing,isDetail,header.get(i));
diff --git a/org.adempiere.base/src/org/adempiere/model/GenericPO.java b/org.adempiere.base/src/org/adempiere/model/GenericPO.java
index e65deb5f10..6fd50521e6 100644
--- a/org.adempiere.base/src/org/adempiere/model/GenericPO.java
+++ b/org.adempiere.base/src/org/adempiere/model/GenericPO.java
@@ -114,7 +114,7 @@ public class GenericPO extends PO {
 		if (AD_OrgTrx_ID == 0)
 			set_Value("AD_OrgTrx_ID", null);
 		else
-			set_Value("AD_OrgTrx_ID", new Integer(AD_OrgTrx_ID));
+			set_Value("AD_OrgTrx_ID", Integer.valueOf(AD_OrgTrx_ID));
 	}
 
 	/**
diff --git a/org.adempiere.base/src/org/adempiere/model/MBroadcastMessage.java b/org.adempiere.base/src/org/adempiere/model/MBroadcastMessage.java
index 240c61e860..7dbe1287ac 100644
--- a/org.adempiere.base/src/org/adempiere/model/MBroadcastMessage.java
+++ b/org.adempiere.base/src/org/adempiere/model/MBroadcastMessage.java
@@ -50,7 +50,7 @@ public class MBroadcastMessage extends X_AD_BroadcastMessage
 
 	public static MBroadcastMessage get (Properties ctx, int AD_BroadcastMessage_ID)
 	{
-		Integer key = new Integer(AD_BroadcastMessage_ID);
+		Integer key = Integer.valueOf(AD_BroadcastMessage_ID);
 		MBroadcastMessage retValue = (MBroadcastMessage)s_cache.get(key);
 		if (retValue == null)
 		{
diff --git a/org.adempiere.base/src/org/adempiere/model/PromotionRule.java b/org.adempiere.base/src/org/adempiere/model/PromotionRule.java
index 498f9b8a53..6c059095f7 100644
--- a/org.adempiere.base/src/org/adempiere/model/PromotionRule.java
+++ b/org.adempiere.base/src/org/adempiere/model/PromotionRule.java
@@ -14,6 +14,7 @@
 package org.adempiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -295,7 +296,7 @@ public class PromotionRule {
 		nol.setC_Charge_ID(C_Charge_ID);
 		nol.setQty(qty);
 		if (discount.scale() > 2)
-			discount = discount.setScale(2, BigDecimal.ROUND_HALF_UP);
+			discount = discount.setScale(2, RoundingMode.HALF_UP);
 		nol.setPriceEntered(discount.negate());
 		nol.setPriceActual(discount.negate());
 		if (ol != null && Integer.toString(ol.getLine()).endsWith("0")) {
diff --git a/org.adempiere.base/src/org/adempiere/print/export/PrintDataExcelExporter.java b/org.adempiere.base/src/org/adempiere/print/export/PrintDataExcelExporter.java
index c77de78b27..0dc8e4affe 100644
--- a/org.adempiere.base/src/org/adempiere/print/export/PrintDataExcelExporter.java
+++ b/org.adempiere.base/src/org/adempiere/print/export/PrintDataExcelExporter.java
@@ -26,6 +26,8 @@ import org.compiere.print.MPrintFormatItem;
 import org.compiere.print.MPrintPaper;
 import org.compiere.print.PrintData;
 import org.compiere.print.PrintDataElement;
+import org.compiere.util.DisplayType;
+import org.compiere.util.Util;
 
 /**
  * Export PrintData to Excel (XLS) file
@@ -192,4 +194,24 @@ extends AbstractExcelExporter
 		sheet.setMargin(HSSFSheet.BottomMargin, ((double)paper.getMarginBottom()) / 72);
 		//
 	}
+	
+	@Override
+	protected String getCellFormat(int row, int col) {
+		String cellFormat = null;
+		PrintDataElement pde = getPDE(row, col);
+		
+		if (pde != null && !Util.isEmpty(pde.getM_formatPattern())) {
+			String formatPattern = pde.getM_formatPattern();
+			int displayType = pde.getDisplayType();
+			if (DisplayType.isDate(displayType)) {
+				cellFormat = DisplayType.getDateFormat(displayType, getLanguage(), formatPattern).toPattern();
+			} else if (DisplayType.isNumeric(displayType)) {
+				cellFormat = DisplayType.getNumberFormat(displayType, getLanguage(), formatPattern).toPattern();
+			}
+		} else {
+			return super.getCellFormat(row, col);
+		}
+		
+		return cellFormat;
+	}
 }
diff --git a/org.adempiere.base/src/org/adempiere/process/ResetLockedAccount.java b/org.adempiere.base/src/org/adempiere/process/ResetLockedAccount.java
index a50fd3aa0f..2880e88e75 100644
--- a/org.adempiere.base/src/org/adempiere/process/ResetLockedAccount.java
+++ b/org.adempiere.base/src/org/adempiere/process/ResetLockedAccount.java
@@ -69,16 +69,16 @@ public class ResetLockedAccount extends SvrProcess {
 			if (DB.isPostgreSQL())
 			{
 				if (MAX_ACCOUNT_LOCK_MINUTES > 0)
-					sql.append( " AND EXTRACT(MINUTE FROM (now()-DateAccountLocked)) * 24 * 60 > ").append(MAX_ACCOUNT_LOCK_MINUTES);
+					sql.append(" AND EXTRACT(EPOCH FROM (now()-DateAccountLocked)) / 60 > ").append(MAX_ACCOUNT_LOCK_MINUTES);
 				if (MAX_INACTIVE_PERIOD > 0)
-					sql.append(" AND EXTRACT(DAY FROM (now()-DateLastLogin)) * 24 <= ").append(MAX_INACTIVE_PERIOD);
+					sql.append(" AND EXTRACT(EPOCH FROM (now()-DateLastLogin)) / 86400 <= ").append(MAX_INACTIVE_PERIOD);
 			}
 			else
 			{
 				if (MAX_ACCOUNT_LOCK_MINUTES > 0)
-					sql.append(" AND (SysDate-DateAccountLocked) * 24 * 60 > ").append(MAX_ACCOUNT_LOCK_MINUTES);
+					sql.append(" AND (SysDate-DateAccountLocked) * 1440 > ").append(MAX_ACCOUNT_LOCK_MINUTES);
 				if (MAX_INACTIVE_PERIOD > 0)
-					sql.append(" AND (SysDate-DateLastLogin) * 24 <= ").append(MAX_INACTIVE_PERIOD);
+					sql.append(" AND (SysDate-DateLastLogin) <= ").append(MAX_INACTIVE_PERIOD);
 			}
 			
 			int no = DB.executeUpdate(sql.toString(), p_AD_Client_ID, get_TrxName());
diff --git a/org.adempiere.base/src/org/adempiere/util/AbstractDocumentSearch.java b/org.adempiere.base/src/org/adempiere/util/AbstractDocumentSearch.java
index 126a137bc0..539ffd1418 100644
--- a/org.adempiere.base/src/org/adempiere/util/AbstractDocumentSearch.java
+++ b/org.adempiere.base/src/org/adempiere/util/AbstractDocumentSearch.java
@@ -216,7 +216,7 @@ public abstract class AbstractDocumentSearch {
 					rsSO = pstmtSO.executeQuery();
 					Vector<Integer> idSO = new Vector<Integer>();
 					while (rsSO.next()) {
-						idSO.add(new Integer(rsSO.getInt(1)));
+						idSO.add(Integer.valueOf(rsSO.getInt(1)));
 					}
 					if (role.getWindowAccess(msd.getAD_Window_ID()) != null) {
 						msglog = new StringBuilder("Open Window: ").append(msd.getAD_Window_ID()).append(" / Table: ")
@@ -225,7 +225,7 @@ public abstract class AbstractDocumentSearch {
 
 						if (idSO.size() == 0 && (searchString == null || searchString.trim().length() == 0)) {
 							// No search string - open the window with new record
-							idSO.add(new Integer(0));
+							idSO.add(Integer.valueOf(0));
 						}
 
 						openWindow(idSO, table.getTableName(), msd.getAD_Window_ID());
@@ -239,7 +239,7 @@ public abstract class AbstractDocumentSearch {
 					rsPO = pstmtPO.executeQuery();
 					Vector<Integer> idPO = new Vector<Integer>();
 					while (rsPO.next()) {
-						idPO.add(new Integer(rsPO.getInt(1)));
+						idPO.add(Integer.valueOf(rsPO.getInt(1)));
 					}
 					if (role.getWindowAccess(msd.getPO_Window_ID()) != null) {
 						msglog = new StringBuilder("Open Window: ").append(msd.getPO_Window_ID()).append(" / Table: ")
diff --git a/org.adempiere.base/src/org/adempiere/util/GenerateModelJPA.java b/org.adempiere.base/src/org/adempiere/util/GenerateModelJPA.java
index 951508ba5c..19b1427911 100755
--- a/org.adempiere.base/src/org/adempiere/util/GenerateModelJPA.java
+++ b/org.adempiere.base/src/org/adempiere/util/GenerateModelJPA.java
@@ -406,10 +406,10 @@ public class GenerateModelJPA
 					sb.append("if (").append (columnName).append (" <= 0) ")
 						.append(setValue).append(" (\"").append(columnName).append("\", null); else \n");
 			}
-			sb.append(setValue).append(" (\"").append(columnName).append("\", new Integer(").append(columnName).append("));");
+			sb.append(setValue).append(" (\"").append(columnName).append("\", Integer.valueOf(").append(columnName).append("));");
 		}
 		else if (clazz.equals(Boolean.class))
-			sb.append(setValue).append(" (\"").append(columnName).append("\", new Boolean(").append(columnName).append("));");
+			sb.append(setValue).append(" (\"").append(columnName).append("\", Boolean.valueOf(").append(columnName).append("));");
 		else
 		{
 			if (isMandatory && AD_Reference_ID == 0)	//	does not apply to int/boolean
diff --git a/org.adempiere.base/src/org/compiere/Adempiere.java b/org.adempiere.base/src/org/compiere/Adempiere.java
index 88785c2e92..dedef3e527 100644
--- a/org.adempiere.base/src/org/compiere/Adempiere.java
+++ b/org.adempiere.base/src/org/compiere/Adempiere.java
@@ -67,11 +67,11 @@ public final class Adempiere
 	/** Timestamp                   */
 	static public final String	ID				= "$Id: Adempiere.java,v 1.8 2006/08/11 02:58:14 jjanke Exp $";
 	/** Main Version String         */
-	static public String	MAIN_VERSION	= "Release 5.1";
+	static public String	MAIN_VERSION	= "Release 6.1";
 	/** Detail Version as date      Used for Client/Server		*/
-	static public String	DATE_VERSION	= "2017-10-31";
+	static public String	DATE_VERSION	= "2018-11-04";
 	/** Database Version as date    Compared with AD_System		*/
-	static public String	DB_VERSION		= "2017-10-31";
+	static public String	DB_VERSION		= "2018-11-04";
 
 	/** Product Name            */
 	static public final String	NAME 			= "iDempiere\u00AE";
@@ -92,7 +92,7 @@ public final class Adempiere
 	/** Subtitle                */
 	static public final String	SUB_TITLE		= "Smart Suite ERP, CRM and SCM";
 	static public final String	ADEMPIERE_R		= "iDempiere\u00AE";
-	static public final String	COPYRIGHT		= "\u00A9 1999-2016 iDempiere\u00AE";
+	static public final String	COPYRIGHT		= "\u00A9 1999-2018 iDempiere\u00AE";
 
 	static private String		s_ImplementationVersion = null;
 	static private String		s_ImplementationVendor = null;
diff --git a/org.adempiere.base/src/org/compiere/acct/Doc.java b/org.adempiere.base/src/org/compiere/acct/Doc.java
index 1bc38d49ce..e4057ae418 100644
--- a/org.adempiere.base/src/org/compiere/acct/Doc.java
+++ b/org.adempiere.base/src/org/compiere/acct/Doc.java
@@ -1036,12 +1036,12 @@ public abstract class Doc
 		}
 		//  Get All Currencies
 		HashSet<Integer> set = new HashSet<Integer>();
-		set.add(new Integer(getC_Currency_ID()));
+		set.add(Integer.valueOf(getC_Currency_ID()));
 		for (int i = 0; p_lines != null && i < p_lines.length; i++)
 		{
 			int C_Currency_ID = p_lines[i].getC_Currency_ID();
 			if (C_Currency_ID != NO_CURRENCY)
-				set.add(new Integer(C_Currency_ID));
+				set.add(Integer.valueOf(C_Currency_ID));
 		}
 
 		//  just one and the same
diff --git a/org.adempiere.base/src/org/compiere/acct/Doc_AllocationHdr.java b/org.adempiere.base/src/org/compiere/acct/Doc_AllocationHdr.java
index 6780f17807..8eaad8c421 100644
--- a/org.adempiere.base/src/org/compiere/acct/Doc_AllocationHdr.java
+++ b/org.adempiere.base/src/org/compiere/acct/Doc_AllocationHdr.java
@@ -17,6 +17,7 @@
 package org.compiere.acct;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.ArrayList;
@@ -780,7 +781,7 @@ public class Doc_AllocationHdr extends Doc
 			//	Round
 			int precision = as.getStdPrecision();
 			if (invoiceDifference.scale() > precision)
-				invoiceDifference = invoiceDifference.setScale(precision, BigDecimal.ROUND_HALF_UP);
+				invoiceDifference = invoiceDifference.setScale(precision, RoundingMode.HALF_UP);
 			StringBuilder d2 = new StringBuilder("(partial) = ").append(invoiceDifference).append(" - Multiplier=").append(multiplier);
 			if (log.isLoggable(Level.FINE)) log.fine(d2.toString());
 			descriptionInv.append(" - ").append(d2);
@@ -847,7 +848,7 @@ public class Doc_AllocationHdr extends Doc
 				//	Round
 				int precision = as.getStdPrecision();
 				if (paymentDifference.scale() > precision)
-					paymentDifference = paymentDifference.setScale(precision, BigDecimal.ROUND_HALF_UP);
+					paymentDifference = paymentDifference.setScale(precision, RoundingMode.HALF_UP);
 				StringBuilder d2 = new StringBuilder("(partial) = ").append(paymentDifference).append(" - Multiplier=").append(multiplier);
 				if (log.isLoggable(Level.FINE)) log.fine(d2.toString());
 				descriptionPay.append(" - ").append(d2);
@@ -1193,10 +1194,10 @@ class Doc_AllocationTax
 			|| amt.signum() == 0)
 			return Env.ZERO;
 		//
-		BigDecimal multiplier = tax.divide(total, 10, BigDecimal.ROUND_HALF_UP);
+		BigDecimal multiplier = tax.divide(total, 10, RoundingMode.HALF_UP);
 		BigDecimal retValue = multiplier.multiply(amt);
 		if (retValue.scale() > precision)
-			retValue = retValue.setScale(precision, BigDecimal.ROUND_HALF_UP);
+			retValue = retValue.setScale(precision, RoundingMode.HALF_UP);
 		if (log.isLoggable(Level.FINE)) log.fine(retValue + " (Mult=" + multiplier + "(Prec=" + precision + ")");
 		return retValue;
 	}	//	calcAmount
diff --git a/org.adempiere.base/src/org/compiere/acct/Doc_Invoice.java b/org.adempiere.base/src/org/compiere/acct/Doc_Invoice.java
index d3a6498ba4..3bd709173a 100644
--- a/org.adempiere.base/src/org/compiere/acct/Doc_Invoice.java
+++ b/org.adempiere.base/src/org/compiere/acct/Doc_Invoice.java
@@ -17,6 +17,7 @@
 package org.compiere.acct;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -922,7 +923,7 @@ public class Doc_Invoice extends Doc
 							BigDecimal qty = allocation.getQty();
 							if (qty.compareTo(iol.getMovementQty()) != 0)
 							{
-								amt = amt.multiply(iol.getMovementQty()).divide(qty, 12, BigDecimal.ROUND_HALF_UP);
+								amt = amt.multiply(iol.getMovementQty()).divide(qty, 12, RoundingMode.HALF_UP);
 							}
 							estimatedAmt = estimatedAmt.add(amt); 
 						}
@@ -931,7 +932,7 @@ public class Doc_Invoice extends Doc
 				
 				if (estimatedAmt.scale() > as.getCostingPrecision())
 				{
-					estimatedAmt = estimatedAmt.setScale(as.getCostingPrecision(), BigDecimal.ROUND_HALF_UP);
+					estimatedAmt = estimatedAmt.setScale(as.getCostingPrecision(), RoundingMode.HALF_UP);
 				}
 				BigDecimal costAdjustmentAmt = allocationAmt;
 				if (estimatedAmt.signum() > 0)
@@ -996,7 +997,7 @@ public class Doc_Invoice extends Doc
 								getDateAcct(), getC_ConversionType_ID(),
 								getAD_Client_ID(), getAD_Org_ID());
 						if (costDetailAmt.scale() > as.getCostingPrecision())
-							costDetailAmt = costDetailAmt.setScale(as.getCostingPrecision(), BigDecimal.ROUND_HALF_UP);
+							costDetailAmt = costDetailAmt.setScale(as.getCostingPrecision(), RoundingMode.HALF_UP);
 						
 						String key = lca.getM_Product_ID()+"_"+lca.getM_AttributeSetInstance_ID();
 						BigDecimal prevAmt = costDetailAmtMap.remove(key);
@@ -1041,11 +1042,11 @@ public class Doc_Invoice extends Doc
 				{
 					if (allocationAmt.scale() > as.getStdPrecision())
 					{
-						allocationAmt = allocationAmt.setScale(as.getStdPrecision(), BigDecimal.ROUND_HALF_UP);
+						allocationAmt = allocationAmt.setScale(as.getStdPrecision(), RoundingMode.HALF_UP);
 					}
 					if (estimatedAmt.scale() > as.getStdPrecision())
 					{
-						estimatedAmt = estimatedAmt.setScale(as.getStdPrecision(), BigDecimal.ROUND_HALF_UP);
+						estimatedAmt = estimatedAmt.setScale(as.getStdPrecision(), RoundingMode.HALF_UP);
 					}
 					int compare = allocationAmt.compareTo(estimatedAmt);
 					if (compare > 0)
diff --git a/org.adempiere.base/src/org/compiere/acct/Doc_MatchInv.java b/org.adempiere.base/src/org/compiere/acct/Doc_MatchInv.java
index c4545b976f..d65d8ae04f 100644
--- a/org.adempiere.base/src/org/compiere/acct/Doc_MatchInv.java
+++ b/org.adempiere.base/src/org/compiere/acct/Doc_MatchInv.java
@@ -17,6 +17,7 @@
 package org.compiere.acct;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Savepoint;
@@ -167,7 +168,7 @@ public class Doc_MatchInv extends Doc
 		//  NotInvoicedReceipt      DR
 		//  From Receipt
 		BigDecimal multiplier = getQty()
-			.divide(m_receiptLine.getMovementQty(), 12, BigDecimal.ROUND_HALF_UP)
+			.divide(m_receiptLine.getMovementQty(), 12, RoundingMode.HALF_UP)
 			.abs();
 		FactLine dr = fact.createLine (null,
 			getAccount(Doc.ACCTTYPE_NotInvoicedReceipts, as),
@@ -212,7 +213,7 @@ public class Doc_MatchInv extends Doc
 			expense = m_pc.getAccount(ProductCost.ACCTTYPE_P_Expense, as);
 		BigDecimal LineNetAmt = m_invoiceLine.getLineNetAmt();
 		multiplier = getQty()
-			.divide(m_invoiceLine.getQtyInvoiced(), 12, BigDecimal.ROUND_HALF_UP)
+			.divide(m_invoiceLine.getQtyInvoiced(), 12, RoundingMode.HALF_UP)
 			.abs();
 		if (multiplier.compareTo(Env.ONE) != 0)
 			LineNetAmt = LineNetAmt.multiply(multiplier);
@@ -453,7 +454,7 @@ public class Doc_MatchInv extends Doc
 			
 			BigDecimal LineNetAmt = m_invoiceLine.getLineNetAmt();
 			BigDecimal multiplier = getQty()
-				.divide(m_invoiceLine.getQtyInvoiced(), 12, BigDecimal.ROUND_HALF_UP)
+				.divide(m_invoiceLine.getQtyInvoiced(), 12, RoundingMode.HALF_UP)
 				.abs();
 			if (multiplier.compareTo(Env.ONE) != 0)
 				LineNetAmt = LineNetAmt.multiply(multiplier);
@@ -469,7 +470,7 @@ public class Doc_MatchInv extends Doc
 				{
 					tQty = tQty.add(mInv[i].getQty());
 					multiplier = mInv[i].getQty()
-						.divide(m_invoiceLine.getQtyInvoiced(), 12, BigDecimal.ROUND_HALF_UP).abs();
+						.divide(m_invoiceLine.getQtyInvoiced(), 12, RoundingMode.HALF_UP).abs();
 					tAmt = tAmt.add(m_invoiceLine.getLineNetAmt().multiply(multiplier));
 				}
 			}
@@ -516,7 +517,7 @@ public class Doc_MatchInv extends Doc
 			{
 				BigDecimal totalAmt = allocation.getAmt();
 				BigDecimal totalQty = allocation.getQty();
-				BigDecimal amt = totalAmt.multiply(tQty).divide(totalQty, 12, BigDecimal.ROUND_HALF_UP);			
+				BigDecimal amt = totalAmt.multiply(tQty).divide(totalQty, 12, RoundingMode.HALF_UP);			
 				if (orderLine.getC_Currency_ID() != as.getC_Currency_ID())
 				{
 					I_C_Order order = orderLine.getC_Order();
@@ -532,7 +533,7 @@ public class Doc_MatchInv extends Doc
 					}
 					amt = amt.multiply(rate);
 					if (amt.scale() > as.getCostingPrecision())
-						amt = amt.setScale(as.getCostingPrecision(), BigDecimal.ROUND_HALF_UP);
+						amt = amt.setScale(as.getCostingPrecision(), RoundingMode.HALF_UP);
 				}
 				int elementId = allocation.getC_OrderLandedCost().getM_CostElement_ID();
 				BigDecimal elementAmt = landedCostMap.get(elementId);
diff --git a/org.adempiere.base/src/org/compiere/acct/Doc_MatchPO.java b/org.adempiere.base/src/org/compiere/acct/Doc_MatchPO.java
index 7580ec3e1c..72758107ca 100644
--- a/org.adempiere.base/src/org/compiere/acct/Doc_MatchPO.java
+++ b/org.adempiere.base/src/org/compiere/acct/Doc_MatchPO.java
@@ -233,7 +233,7 @@ public class Doc_MatchPO extends Doc
 			amt = amt.divide(getQty(), 12, RoundingMode.HALF_UP);
 			landedCost = landedCost.add(amt);
 			if (landedCost.scale() > as.getCostingPrecision())
-				landedCost = landedCost.setScale(as.getCostingPrecision(), BigDecimal.ROUND_HALF_UP);
+				landedCost = landedCost.setScale(as.getCostingPrecision(), RoundingMode.HALF_UP);
 			int elementId = allocation.getC_OrderLandedCost().getM_CostElement_ID();
 			BigDecimal elementAmt = landedCostMap.get(elementId);
 			if (elementAmt == null) 
@@ -263,7 +263,7 @@ public class Doc_MatchPO extends Doc
 			}
 			poCost = poCost.multiply(rate);
 			if (poCost.scale() > as.getCostingPrecision())
-				poCost = poCost.setScale(as.getCostingPrecision(), BigDecimal.ROUND_HALF_UP);
+				poCost = poCost.setScale(as.getCostingPrecision(), RoundingMode.HALF_UP);
 		}
 
 		String costingError = createMatchPOCostDetail(as, poCost, landedCostMap);
@@ -492,7 +492,7 @@ public class Doc_MatchPO extends Doc
 			}
 			
 			if (tAmt.scale() > as.getCostingPrecision())
-				tAmt = tAmt.setScale(as.getCostingPrecision(), BigDecimal.ROUND_HALF_UP);
+				tAmt = tAmt.setScale(as.getCostingPrecision(), RoundingMode.HALF_UP);
 			// Set Total Amount and Total Quantity from Matched PO 
 			if (!MCostDetail.createOrder(as, m_oLine.getAD_Org_ID(), 
 					getM_Product_ID(), mMatchPO.getM_AttributeSetInstance_ID(),
@@ -523,7 +523,7 @@ public class Doc_MatchPO extends Doc
 			BigDecimal amt = landedCostMap.get(elementId);
 			amt = amt.multiply(tQty);
 			if (amt.scale() > as.getCostingPrecision())
-				amt = amt.setScale(as.getCostingPrecision(), BigDecimal.ROUND_HALF_UP);
+				amt = amt.setScale(as.getCostingPrecision(), RoundingMode.HALF_UP);
 			if (!MCostDetail.createOrder(as, m_oLine.getAD_Org_ID(), 
 					getM_Product_ID(), mMatchPO.getM_AttributeSetInstance_ID(),
 					m_oLine.getC_OrderLine_ID(), elementId,
diff --git a/org.adempiere.base/src/org/compiere/acct/Doc_Order.java b/org.adempiere.base/src/org/compiere/acct/Doc_Order.java
index e62ecb3521..451a5fc74e 100644
--- a/org.adempiere.base/src/org/compiere/acct/Doc_Order.java
+++ b/org.adempiere.base/src/org/compiere/acct/Doc_Order.java
@@ -159,7 +159,7 @@ public class Doc_Order extends Doc
 		for (int i = 0; i < oLines.length; i++)
 		{
 			MOrderLine line = oLines[i];
-			qtys.put(new Integer(line.getC_OrderLine_ID()), line.getQtyOrdered());
+			qtys.put(Integer.valueOf(line.getC_OrderLine_ID()), line.getQtyOrdered());
 		}
 		//
 		ArrayList<DocLine> list = new ArrayList<DocLine>();
@@ -182,7 +182,7 @@ public class Doc_Order extends Doc
 				DocLine docLine = new DocLine (line, this);
 				//	Quantity - not more then OrderLine
 				//	Issue: Split of Requisition to multiple POs & different price
-				Integer key = new Integer(line.getC_OrderLine_ID());
+				Integer key = Integer.valueOf(line.getC_OrderLine_ID());
 				BigDecimal maxQty = qtys.get(key);
 				BigDecimal Qty = line.getQty().max(maxQty);
 				if (Qty.signum() == 0)
diff --git a/org.adempiere.base/src/org/compiere/acct/Doc_Production.java b/org.adempiere.base/src/org/compiere/acct/Doc_Production.java
index 23eb0c210a..a5fa72ab84 100644
--- a/org.adempiere.base/src/org/compiere/acct/Doc_Production.java
+++ b/org.adempiere.base/src/org/compiere/acct/Doc_Production.java
@@ -17,6 +17,7 @@
 package org.compiere.acct;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.ArrayList;
@@ -318,7 +319,7 @@ public class Doc_Production extends Doc
 										costMap.put(line0.get_ID()+ "_"+ ma.getM_AttributeSetInstance_ID(),maCost);
 										costs0 = costs0.add(maCost);
 									}						
-									bomCost = bomCost.add(costs0.setScale(2,BigDecimal.ROUND_HALF_UP));
+									bomCost = bomCost.add(costs0.setScale(2,RoundingMode.HALF_UP));
 								} 
 								else
 									p_Error = "Failed to post - No Attribute Set for line";
@@ -339,7 +340,7 @@ public class Doc_Production extends Doc
 									costs0 = line0.getProductCosts(as, line0.getAD_Org_ID(), false);
 								}
 								costMap.put(line0.get_ID()+ "_"+ line0.getM_AttributeSetInstance_ID(),costs0);
-								bomCost = bomCost.add(costs0.setScale(2,BigDecimal.ROUND_HALF_UP));	
+								bomCost = bomCost.add(costs0.setScale(2,RoundingMode.HALF_UP));	
 							}
 							
 						}  
@@ -358,7 +359,7 @@ public class Doc_Production extends Doc
 								costs0 = line0.getProductCosts(as, line0.getAD_Org_ID(), false);
 							}
 							costMap.put(line0.get_ID()+ "_"+ line0.getM_AttributeSetInstance_ID(),costs0);
-							bomCost = bomCost.add(costs0.setScale(2,BigDecimal.ROUND_HALF_UP));
+							bomCost = bomCost.add(costs0.setScale(2,RoundingMode.HALF_UP));
 						}
 					}
 				}
@@ -366,8 +367,8 @@ public class Doc_Production extends Doc
 				qtyProduced = manipulateQtyProduced (mQtyProduced, endProLine, prod.isUseProductionPlan(), null);
 				if (line.getQty().compareTo(qtyProduced) != 0) 
 				{
-					BigDecimal factor = line.getQty().divide(qtyProduced, 12, BigDecimal.ROUND_HALF_UP);
-					bomCost = bomCost.multiply(factor).setScale(2,BigDecimal.ROUND_HALF_UP);
+					BigDecimal factor = line.getQty().divide(qtyProduced, 12, RoundingMode.HALF_UP);
+					bomCost = bomCost.multiply(factor).setScale(2,RoundingMode.HALF_UP);
 				}
 				
 				if (MAcctSchema.COSTINGLEVEL_BatchLot.equals(CostingLevel))
@@ -386,7 +387,7 @@ public class Doc_Production extends Doc
 				else
 				{
 					int precision = as.getStdPrecision();
-					BigDecimal variance = (costs.setScale(precision, BigDecimal.ROUND_HALF_UP)).subtract(bomCost.negate());
+					BigDecimal variance = (costs.setScale(precision, RoundingMode.HALF_UP)).subtract(bomCost.negate());
 					// only post variance if it's not zero 
 					if (variance.signum() != 0) 
 					{
diff --git a/org.adempiere.base/src/org/compiere/acct/Fact.java b/org.adempiere.base/src/org/compiere/acct/Fact.java
index ff5803466f..943f9a5abb 100644
--- a/org.adempiere.base/src/org/compiere/acct/Fact.java
+++ b/org.adempiere.base/src/org/compiere/acct/Fact.java
@@ -378,7 +378,7 @@ public final class Fact
 			for (int i = 0; i < m_lines.size(); i++)
 			{
 				FactLine line = (FactLine)m_lines.get(i);
-				Integer key = new Integer(line.getAD_Org_ID());
+				Integer key = Integer.valueOf(line.getAD_Org_ID());
 				BigDecimal bal = line.getSourceBalance();
 				BigDecimal oldBal = (BigDecimal)map.get(key);
 				if (oldBal != null)
@@ -445,7 +445,7 @@ public final class Fact
 			for (int i = 0; i < m_lines.size(); i++)
 			{
 				FactLine line = (FactLine)m_lines.get(i);
-				Integer key = new Integer(line.getAD_Org_ID());
+				Integer key = Integer.valueOf(line.getAD_Org_ID());
 			//	BigDecimal balance = line.getSourceBalance();
 				Balance oldBalance = (Balance)map.get(key);
 				if (oldBalance == null)
diff --git a/org.adempiere.base/src/org/compiere/acct/FactLine.java b/org.adempiere.base/src/org/compiere/acct/FactLine.java
index 45b92d7a51..bfe93b328c 100644
--- a/org.adempiere.base/src/org/compiere/acct/FactLine.java
+++ b/org.adempiere.base/src/org/compiere/acct/FactLine.java
@@ -17,6 +17,7 @@
 package org.compiere.acct;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -252,14 +253,14 @@ public final class FactLine extends X_Fact_Acct
 		int precision = MCurrency.getStdPrecision(getCtx(), C_Currency_ID);
 		if (AmtSourceDr != null && AmtSourceDr.scale() > precision)
 		{
-			BigDecimal AmtSourceDr1 = AmtSourceDr.setScale(precision, BigDecimal.ROUND_HALF_UP);
+			BigDecimal AmtSourceDr1 = AmtSourceDr.setScale(precision, RoundingMode.HALF_UP);
 			if (AmtSourceDr1.compareTo(AmtSourceDr) != 0)
 				log.warning("Source DR Precision " + AmtSourceDr + " -> " + AmtSourceDr1);
 			setAmtSourceDr(AmtSourceDr1);
 		}
 		if (AmtSourceCr != null && AmtSourceCr.scale() > precision)
 		{
-			BigDecimal AmtSourceCr1 = AmtSourceCr.setScale(precision, BigDecimal.ROUND_HALF_UP);
+			BigDecimal AmtSourceCr1 = AmtSourceCr.setScale(precision, RoundingMode.HALF_UP);
 			if (AmtSourceCr1.compareTo(AmtSourceCr) != 0)
 				log.warning("Source CR Precision " + AmtSourceCr + " -> " + AmtSourceCr1);
 			setAmtSourceCr(AmtSourceCr1);
@@ -326,14 +327,14 @@ public final class FactLine extends X_Fact_Acct
 		int precision = MCurrency.getStdPrecision(getCtx(), C_Currency_ID);
 		if (AmtAcctDr != null && AmtAcctDr.scale() > precision)
 		{
-			BigDecimal AmtAcctDr1 = AmtAcctDr.setScale(precision, BigDecimal.ROUND_HALF_UP);
+			BigDecimal AmtAcctDr1 = AmtAcctDr.setScale(precision, RoundingMode.HALF_UP);
 			if (AmtAcctDr1.compareTo(AmtAcctDr) != 0)
 				log.warning("Accounted DR Precision " + AmtAcctDr + " -> " + AmtAcctDr1);
 			setAmtAcctDr(AmtAcctDr1);
 		}
 		if (AmtAcctCr != null && AmtAcctCr.scale() > precision)
 		{
-			BigDecimal AmtAcctCr1 = AmtAcctCr.setScale(precision, BigDecimal.ROUND_HALF_UP);
+			BigDecimal AmtAcctCr1 = AmtAcctCr.setScale(precision, RoundingMode.HALF_UP);
 			if (AmtAcctCr1.compareTo(AmtAcctCr) != 0)
 				log.warning("Accounted CR Precision " + AmtAcctCr + " -> " + AmtAcctCr1);
 			setAmtAcctCr(AmtAcctCr1);
diff --git a/org.adempiere.base/src/org/compiere/cm/WebProjectDeploy.java b/org.adempiere.base/src/org/compiere/cm/WebProjectDeploy.java
index 5ab1d0cba3..4016683e86 100644
--- a/org.adempiere.base/src/org/compiere/cm/WebProjectDeploy.java
+++ b/org.adempiere.base/src/org/compiere/cm/WebProjectDeploy.java
@@ -94,7 +94,7 @@ public class WebProjectDeploy extends SvrProcess
 		//	Stage
 		MCStage[] stages = MCStage.getStages(m_project);
 		for (int i = 0; i < stages.length; i++)
-			m_map.put(new Integer(stages[i].getCM_CStage_ID()), stages[i]);
+			m_map.put(Integer.valueOf(stages[i].getCM_CStage_ID()), stages[i]);
 		
 		//	Copy Stage Tree
 		MTree treeS = new MTree (getCtx(), m_project.getAD_TreeCMS_ID(), false, false, get_TrxName());
@@ -106,7 +106,7 @@ public class WebProjectDeploy extends SvrProcess
 		for (int i = 0; i < containers.length; i++)
 		{
 			MContainer container = containers[i];
-			if (!m_idList.contains(new Integer(container.getCM_Container_ID())))
+			if (!m_idList.contains(Integer.valueOf(container.getCM_Container_ID())))
 			{
 				String name = container.getName();
 				if (container.delete(true)) {
@@ -155,14 +155,14 @@ public class WebProjectDeploy extends SvrProcess
 	private void copyStage (MTreeNode node, String path)
 	{
 		org.compiere.cm.CacheHandler thisHandler = new org.compiere.cm.CacheHandler(org.compiere.cm.CacheHandler.convertJNPURLToCacheURL(getCtx().getProperty("java.naming.provider.url")), log, getCtx(), get_TrxName());
-		Integer ID = new Integer(node.getNode_ID());
+		Integer ID = Integer.valueOf(node.getNode_ID());
 		MCStage stage = m_map.get(ID);
 		//	
 		int size = node.getChildCount();
 		for (int i = 0; i < size; i++)
 		{
 			MTreeNode child = (MTreeNode)node.getChildAt(i);
-			ID = new Integer(child.getNode_ID());
+			ID = Integer.valueOf(child.getNode_ID());
 			stage = m_map.get(ID);
 			if (stage == null)
 			{
diff --git a/org.adempiere.base/src/org/compiere/impexp/ImpFormatRow.java b/org.adempiere.base/src/org/compiere/impexp/ImpFormatRow.java
index 4c007df795..9ee90cd1f4 100644
--- a/org.adempiere.base/src/org/compiere/impexp/ImpFormatRow.java
+++ b/org.adempiere.base/src/org/compiere/impexp/ImpFormatRow.java
@@ -18,6 +18,7 @@
 package org.compiere.impexp;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.Timestamp;
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -309,7 +310,7 @@ public final class ImpFormatRow
 				if (methodStart != -1)      //  no class
 				{
 					Class<?> cClass = Class.forName(callout.substring(0,methodStart));
-					m_callout = (Callout)cClass.newInstance();
+					m_callout = (Callout)cClass.getDeclaredConstructor().newInstance();
 					m_method = callout.substring(methodStart+1);
 				}
 			}
@@ -525,7 +526,7 @@ public final class ImpFormatRow
 			bd = BigDecimal.ZERO;
 		
 		if (m_divideBy100)					//	assumed two decimal scale
-			bd = bd.divide(Env.ONEHUNDRED, 2, BigDecimal.ROUND_HALF_UP);
+			bd = bd.divide(Env.ONEHUNDRED, 2, RoundingMode.HALF_UP);
 		return bd.toString();
 	}	//	parseNumber
 
diff --git a/org.adempiere.base/src/org/compiere/model/CalloutEngine.java b/org.adempiere.base/src/org/compiere/model/CalloutEngine.java
index c734b8e437..d0eaecce99 100644
--- a/org.adempiere.base/src/org/compiere/model/CalloutEngine.java
+++ b/org.adempiere.base/src/org/compiere/model/CalloutEngine.java
@@ -18,6 +18,7 @@ package org.compiere.model;
 
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.Timestamp;
 import java.util.Properties;
 import java.util.logging.Level;
@@ -103,9 +104,9 @@ public class CalloutEngine implements Callout
 		{
 			Object[] args = null;
 			if (argLength == 6)
-				args = new Object[] {ctx, new Integer(WindowNo), mTab, mField, value, oldValue};
+				args = new Object[] {ctx, Integer.valueOf(WindowNo), mTab, mField, value, oldValue};
 			else
-				args = new Object[] {ctx, new Integer(WindowNo), mTab, mField, value}; 
+				args = new Object[] {ctx, Integer.valueOf(WindowNo), mTab, mField, value}; 
 			retValue = (String)method.invoke(this, args);
 		}
 		catch (Exception e)
@@ -303,7 +304,7 @@ public class CalloutEngine implements Callout
 		BigDecimal rate2 = Env.ZERO;
 
 		if (rate1.signum() != 0.0)	//	no divide by zero
-			rate2 = Env.ONE.divide(rate1, 12, BigDecimal.ROUND_HALF_UP);
+			rate2 = Env.ONE.divide(rate1, 12, RoundingMode.HALF_UP);
 		//
 		if (mField.getColumnName().equals("MultiplyRate"))
 			mTab.setValue("DivideRate", rate2);
diff --git a/org.adempiere.base/src/org/compiere/model/GridField.java b/org.adempiere.base/src/org/compiere/model/GridField.java
index 12618898a2..1f26b575df 100644
--- a/org.adempiere.base/src/org/compiere/model/GridField.java
+++ b/org.adempiere.base/src/org/compiere/model/GridField.java
@@ -791,14 +791,14 @@ public class GridField
 			&& (m_vo.ColumnName.equals("AD_Client_ID") || m_vo.ColumnName.equals("AD_Org_ID")))
 		{
 			if (log.isLoggable(Level.FINE)) log.fine("[SystemAccess] " + m_vo.ColumnName + "=0");
-			return new Integer(0);
+			return Integer.valueOf(0);
 		}
 		//	Set Org to System, if Client access
 		else if (X_AD_Table.ACCESSLEVEL_SystemPlusClient.equals(Env.getContext(m_vo.ctx, m_vo.WindowNo, m_vo.TabNo, GridTab.CTX_AccessLevel))
 			&& m_vo.ColumnName.equals("AD_Org_ID"))
 		{
 			if (log.isLoggable(Level.FINE)) log.fine("[ClientAccess] " + m_vo.ColumnName + "=0");
-			return new Integer(0);
+			return Integer.valueOf(0);
 		}
 		
 		return null;
@@ -1057,17 +1057,17 @@ public class GridField
 					int ii = Integer.parseInt(value);
 					if (ii < 0)
 						return null;
-					return new Integer(ii);
+					return Integer.valueOf(ii);
 				}
 				catch (Exception e)
 				{
 					log.warning("Cannot parse: " + value + " - " + e.getMessage());
 				}
-				return new Integer(0);
+				return Integer.valueOf(0);
 			}
 			//	Integer
 			if (m_vo.displayType == DisplayType.Integer)
-				return new Integer(value);
+				return Integer.valueOf(value);
 			
 			//	Number
 			if (DisplayType.isNumeric(m_vo.displayType))
@@ -2057,7 +2057,7 @@ public class GridField
 				|| (DisplayType.isID(dt) && getColumnName().endsWith("_ID")))
 			{
 				int i = Integer.parseInt(newValue);
-				setValue (new Integer(i), inserting);
+				setValue (Integer.valueOf(i), inserting);
 			}
 			//	Return BigDecimal
 			else if (DisplayType.isNumeric(dt))
diff --git a/org.adempiere.base/src/org/compiere/model/GridFieldVO.java b/org.adempiere.base/src/org/compiere/model/GridFieldVO.java
index f2c08f4e79..479b719e52 100644
--- a/org.adempiere.base/src/org/compiere/model/GridFieldVO.java
+++ b/org.adempiere.base/src/org/compiere/model/GridFieldVO.java
@@ -870,7 +870,7 @@ public class GridFieldVO implements Serializable
 	public static class SeqNoComparator implements Comparator<GridFieldVO> {
 		@Override
 		public int compare(GridFieldVO gf1, GridFieldVO gf2) {
-			return (new Integer(gf1.SeqNo)).compareTo(new Integer(gf2.SeqNo));
+			return (Integer.valueOf(gf1.SeqNo)).compareTo(Integer.valueOf(gf2.SeqNo));
 		}
 	}
 
diff --git a/org.adempiere.base/src/org/compiere/model/GridTab.java b/org.adempiere.base/src/org/compiere/model/GridTab.java
index 86891042f4..af44023cb2 100644
--- a/org.adempiere.base/src/org/compiere/model/GridTab.java
+++ b/org.adempiere.base/src/org/compiere/model/GridTab.java
@@ -1818,13 +1818,13 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
 				if (rs.next())
 				{
 					//	{0} - Number of lines
-					Integer lines = new Integer(rs.getInt(1));
+					Integer lines = Integer.valueOf(rs.getInt(1));
 					arguments[0] = lines;
 					//	{1} - Line net
-					Double net = new Double(rs.getDouble(2));
+					Double net = Double.valueOf(rs.getDouble(2));
 					arguments[1] = net;
 					//	{2} - Line net
-					Double total = new Double(rs.getDouble(3));
+					Double total = Double.valueOf(rs.getDouble(3));
 					arguments[2] = total;
 					filled = true;
 				}
@@ -1905,19 +1905,19 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
 				if (rs.next())
 				{
 					//	{0} - Number of lines
-					Integer lines = new Integer(rs.getInt(1));
+					Integer lines = Integer.valueOf(rs.getInt(1));
 					arguments[0] = lines;
 					//	{1} - Line toral
-					Double lineTotal = new Double(rs.getDouble(3));
+					Double lineTotal = Double.valueOf(rs.getDouble(3));
 					arguments[1] = lineTotal;
 					//	{2} - Grand total (including tax, etc.)
-					Double grandTotal = new Double(rs.getDouble(4));
+					Double grandTotal = Double.valueOf(rs.getDouble(4));
 					arguments[2] = grandTotal;
 					//	{3} - Currency
 					String currency = rs.getString(2);
 					arguments[3] = currency;
 					//	(4) - Grand total converted to Euro
-					Double grandEuro = new Double(rs.getDouble(5));
+					Double grandEuro = Double.valueOf(rs.getDouble(5));
 					arguments[4] = grandEuro;
 					filled = true;
 				}
@@ -1979,10 +1979,10 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
 				if (rs.next())
 				{
 					//	{0} - Number of lines
-					Integer lines = new Integer(rs.getInt(1));
+					Integer lines = Integer.valueOf(rs.getInt(1));
 					arguments[0] = lines;
 					//	{1} - Line total
-					Double total = new Double(rs.getDouble(2));
+					Double total = Double.valueOf(rs.getDouble(2));
 					arguments[1] = total;
 					//	{3} - Currency
 					arguments[2] = " ";
@@ -2234,7 +2234,7 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
 			rs = pstmt.executeQuery();
 			while (rs.next())
 			{
-				Integer key = new Integer(rs.getInt(1));
+				Integer key = Integer.valueOf(rs.getInt(1));
 				m_Lock.add(key);
 			}
 		}
@@ -2264,7 +2264,7 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
 		if (m_Lock == null || m_Lock.isEmpty())
 			return false;
 		//
-		Integer key = new Integer(m_mTable.getKeyID (m_currentRow));
+		Integer key = Integer.valueOf(m_mTable.getKeyID (m_currentRow));
 		return m_Lock.contains(key);
 	}	//	isLocked
 
@@ -2927,7 +2927,7 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
 							if (call == null) {
 								//no match from factory, check java classpath
 								Class<?> cClass = Class.forName(className);
-								call = (Callout)cClass.newInstance();
+								call = (Callout)cClass.getDeclaredConstructor().newInstance();
 							}
 						}
 					}
@@ -3190,9 +3190,9 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
 			lineNoCurrentRow = (Integer) m_mTable.getValueAt(from, lineCol);
 			lineNoNextRow = (Integer) m_mTable.getValueAt(to, lineCol);
 		} else if (m_mTable.getValueAt(from, lineCol) instanceof BigDecimal) {
-			lineNoCurrentRow = new Integer(((BigDecimal) m_mTable.getValueAt(from, lineCol))
+			lineNoCurrentRow = Integer.valueOf(((BigDecimal) m_mTable.getValueAt(from, lineCol))
 					.intValue());
-			lineNoNextRow = new Integer(((BigDecimal) m_mTable.getValueAt(to, lineCol))
+			lineNoNextRow = Integer.valueOf(((BigDecimal) m_mTable.getValueAt(to, lineCol))
 					.intValue());
 		} else {
 			log.fine("unknown value format - return");
diff --git a/org.adempiere.base/src/org/compiere/model/GridTable.java b/org.adempiere.base/src/org/compiere/model/GridTable.java
index 144304b5ac..cc11e1a1e8 100644
--- a/org.adempiere.base/src/org/compiere/model/GridTable.java
+++ b/org.adempiere.base/src/org/compiere/model/GridTable.java
@@ -1303,8 +1303,8 @@ public class GridTable extends AbstractTableModel
 
 		//  Save old value
 		m_oldValue = new Object[3];
-		m_oldValue[0] = new Integer(row);
-		m_oldValue[1] = new Integer(col);
+		m_oldValue[0] = Integer.valueOf(row);
+		m_oldValue[1] = Integer.valueOf(col);
 		m_oldValue[2] = oldValue;
 
 		//	Set Data item
@@ -1894,7 +1894,7 @@ public class GridTable extends AbstractTableModel
 								if (dd instanceof Integer)
 									iii = (Integer)dd;
 								else
-									iii = new Integer(dd.toString());
+									iii = Integer.valueOf(dd.toString());
 								if (encrypted)
 									iii = (Integer)encrypt(iii, getAD_Client_ID());
 								if (manualUpdate)
@@ -3242,7 +3242,7 @@ public class GridTable extends AbstractTableModel
 				//	Integer, ID, Lookup
 				if (displayType == DisplayType.Integer || (DisplayType.isID(displayType) && !(columnName.equals("EntityType") || columnName.equals("AD_Language"))))
 				{
-					rowData[j] = new Integer(rs.getInt(j+1));	//	Integer
+					rowData[j] = Integer.valueOf(rs.getInt(j+1));	//	Integer
 					if (rs.wasNull())
 						rowData[j] = null;
 				}
@@ -3261,7 +3261,7 @@ public class GridTable extends AbstractTableModel
 					String str = rs.getString(j+1);
 					if (field.isEncryptedColumn())
 						str = (String)decrypt(str, getAD_Client_ID(rs));
-					rowData[j] = new Boolean ("Y".equals(str));	//	Boolean
+					rowData[j] = Boolean.valueOf("Y".equals(str));	//	Boolean
 				}
 				//	LOB
 				else if (DisplayType.isLOB(displayType))
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_AccessLog.java b/org.adempiere.base/src/org/compiere/model/I_AD_AccessLog.java
index 60740811e7..85044abc6a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_AccessLog.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_AccessLog.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_AccessLog
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_AccessLog 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Alert.java b/org.adempiere.base/src/org/compiere/model/I_AD_Alert.java
index f0b4773e15..0fca4e9827 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Alert.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Alert.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Alert
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Alert 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_AlertProcessor.java b/org.adempiere.base/src/org/compiere/model/I_AD_AlertProcessor.java
index ace2434183..d7f179b15c 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_AlertProcessor.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_AlertProcessor.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_AlertProcessor
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_AlertProcessor 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_AlertProcessorLog.java b/org.adempiere.base/src/org/compiere/model/I_AD_AlertProcessorLog.java
index a482b51db9..df01d8e0bf 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_AlertProcessorLog.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_AlertProcessorLog.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_AlertProcessorLog
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_AlertProcessorLog 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_AlertRecipient.java b/org.adempiere.base/src/org/compiere/model/I_AD_AlertRecipient.java
index e2cfcfbc57..3264e4681c 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_AlertRecipient.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_AlertRecipient.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_AlertRecipient
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_AlertRecipient 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_AlertRule.java b/org.adempiere.base/src/org/compiere/model/I_AD_AlertRule.java
index a80785605f..6e29d31c17 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_AlertRule.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_AlertRule.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_AlertRule
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_AlertRule 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_AllClients_V.java b/org.adempiere.base/src/org/compiere/model/I_AD_AllClients_V.java
index d00945abcb..f58963ab6d 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_AllClients_V.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_AllClients_V.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_AllClients_V
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_AllClients_V 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_AllUsers_V.java b/org.adempiere.base/src/org/compiere/model/I_AD_AllUsers_V.java
index 4fb38c2358..19958d6fae 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_AllUsers_V.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_AllUsers_V.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_AllUsers_V
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_AllUsers_V 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Archive.java b/org.adempiere.base/src/org/compiere/model/I_AD_Archive.java
index cf643240ee..4c49fcea4c 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Archive.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Archive.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Archive
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Archive 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Attachment.java b/org.adempiere.base/src/org/compiere/model/I_AD_Attachment.java
index 396fcea5f2..dc33f9834c 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Attachment.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Attachment.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Attachment
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Attachment 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_AttachmentNote.java b/org.adempiere.base/src/org/compiere/model/I_AD_AttachmentNote.java
index b0a22509f4..a23e20182c 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_AttachmentNote.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_AttachmentNote.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_AttachmentNote
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_AttachmentNote 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Attribute.java b/org.adempiere.base/src/org/compiere/model/I_AD_Attribute.java
index 1ef60e51e4..b1be3f3d35 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Attribute.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Attribute.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Attribute
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Attribute 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Attribute_Value.java b/org.adempiere.base/src/org/compiere/model/I_AD_Attribute_Value.java
index 35feaf9541..7d1d5b4554 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Attribute_Value.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Attribute_Value.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Attribute_Value
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Attribute_Value 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_BroadcastMessage.java b/org.adempiere.base/src/org/compiere/model/I_AD_BroadcastMessage.java
index 55f3341381..3918332cb1 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_BroadcastMessage.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_BroadcastMessage.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_BroadcastMessage
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_BroadcastMessage 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_ChangeLog.java b/org.adempiere.base/src/org/compiere/model/I_AD_ChangeLog.java
index d9c388c24c..041ac7e425 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_ChangeLog.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_ChangeLog.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ChangeLog
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_ChangeLog 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Chart.java b/org.adempiere.base/src/org/compiere/model/I_AD_Chart.java
index a3f21e020d..d76869e3ae 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Chart.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Chart.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Chart
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Chart 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_ChartDatasource.java b/org.adempiere.base/src/org/compiere/model/I_AD_ChartDatasource.java
index 74e402945b..8befe3ce2d 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_ChartDatasource.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_ChartDatasource.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ChartDatasource
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_ChartDatasource 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Client.java b/org.adempiere.base/src/org/compiere/model/I_AD_Client.java
index a7e5a20803..bb0f2bf220 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Client.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Client.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Client
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Client 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_ClientInfo.java b/org.adempiere.base/src/org/compiere/model/I_AD_ClientInfo.java
index 6b47bca130..bb11c1e2fe 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_ClientInfo.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_ClientInfo.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ClientInfo
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_ClientInfo 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_ClientShare.java b/org.adempiere.base/src/org/compiere/model/I_AD_ClientShare.java
index ee0dec91b9..43a6bd0720 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_ClientShare.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_ClientShare.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ClientShare
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_ClientShare 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Color.java b/org.adempiere.base/src/org/compiere/model/I_AD_Color.java
index 87098d91a5..8077f3fc78 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Color.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Color.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Color
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Color 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Column.java b/org.adempiere.base/src/org/compiere/model/I_AD_Column.java
index 259e323822..8e8530145f 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Column.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Column.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Column
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Column 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Column_Access.java b/org.adempiere.base/src/org/compiere/model/I_AD_Column_Access.java
index 24ed927ebf..1a0ba0dc1b 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Column_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Column_Access.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Column_Access
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Column_Access 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_CtxHelp.java b/org.adempiere.base/src/org/compiere/model/I_AD_CtxHelp.java
index edfecbca9c..2e214f0e5b 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_CtxHelp.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_CtxHelp.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_CtxHelp
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_CtxHelp 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_CtxHelpMsg.java b/org.adempiere.base/src/org/compiere/model/I_AD_CtxHelpMsg.java
index 404d81dc0b..1b98bc2006 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_CtxHelpMsg.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_CtxHelpMsg.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_CtxHelpMsg
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_CtxHelpMsg 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_CtxHelpSuggestion.java b/org.adempiere.base/src/org/compiere/model/I_AD_CtxHelpSuggestion.java
index 7e5d204beb..ad219de1b8 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_CtxHelpSuggestion.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_CtxHelpSuggestion.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_CtxHelpSuggestion
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_CtxHelpSuggestion 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Desktop.java b/org.adempiere.base/src/org/compiere/model/I_AD_Desktop.java
index 3406df2d1f..c1936950ee 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Desktop.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Desktop.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Desktop
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Desktop 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_DesktopWorkbench.java b/org.adempiere.base/src/org/compiere/model/I_AD_DesktopWorkbench.java
index 64ec280f9e..85fa27bdf4 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_DesktopWorkbench.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_DesktopWorkbench.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_DesktopWorkbench
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_DesktopWorkbench 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Document_Action_Access.java b/org.adempiere.base/src/org/compiere/model/I_AD_Document_Action_Access.java
index 8e478cb572..998f249358 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Document_Action_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Document_Action_Access.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Document_Action_Access
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Document_Action_Access 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Element.java b/org.adempiere.base/src/org/compiere/model/I_AD_Element.java
index 0455eac0a1..3d0be0909f 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Element.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Element.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Element
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Element 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_EntityType.java b/org.adempiere.base/src/org/compiere/model/I_AD_EntityType.java
index 303713c03c..dec477108d 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_EntityType.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_EntityType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_EntityType
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_EntityType 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Error.java b/org.adempiere.base/src/org/compiere/model/I_AD_Error.java
index 1e70c28b9b..94d072d61b 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Error.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Error.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Error
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Error 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Field.java b/org.adempiere.base/src/org/compiere/model/I_AD_Field.java
index e82bc5a6bc..702a280548 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Field.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Field.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Field
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Field 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_FieldGroup.java b/org.adempiere.base/src/org/compiere/model/I_AD_FieldGroup.java
index ca308461fe..3728dc6d9e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_FieldGroup.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_FieldGroup.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_FieldGroup
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_FieldGroup 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_FieldSuggestion.java b/org.adempiere.base/src/org/compiere/model/I_AD_FieldSuggestion.java
index a2bee9aaa3..ec88e0a592 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_FieldSuggestion.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_FieldSuggestion.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_FieldSuggestion
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_FieldSuggestion 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Find.java b/org.adempiere.base/src/org/compiere/model/I_AD_Find.java
index d264b90fe7..85e060715c 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Find.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Find.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Find
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Find 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Form.java b/org.adempiere.base/src/org/compiere/model/I_AD_Form.java
index 1b0c83e82a..e8531f60fa 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Form.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Form.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Form
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Form 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Form_Access.java b/org.adempiere.base/src/org/compiere/model/I_AD_Form_Access.java
index 90395058f7..c161dd23bc 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Form_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Form_Access.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Form_Access
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Form_Access 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_HouseKeeping.java b/org.adempiere.base/src/org/compiere/model/I_AD_HouseKeeping.java
index 3d76ce5345..99c265e9c1 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_HouseKeeping.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_HouseKeeping.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_HouseKeeping
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_HouseKeeping 
 {
@@ -221,6 +221,19 @@ public interface I_AD_HouseKeeping
 	/** Get Process Now	  */
 	public boolean isProcessing();
 
+    /** Column name TableName */
+    public static final String COLUMNNAME_TableName = "TableName";
+
+	/** Set DB Table Name.
+	  * Name of the table in the database
+	  */
+	public void setTableName (String TableName);
+
+	/** Get DB Table Name.
+	  * Name of the table in the database
+	  */
+	public String getTableName();
+
     /** Column name Updated */
     public static final String COLUMNNAME_Updated = "Updated";
 
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Image.java b/org.adempiere.base/src/org/compiere/model/I_AD_Image.java
index f0a616657e..d4039127c9 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Image.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Image.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Image
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Image 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_ImpFormat.java b/org.adempiere.base/src/org/compiere/model/I_AD_ImpFormat.java
index d48798cb82..f199c79607 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_ImpFormat.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_ImpFormat.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ImpFormat
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_ImpFormat 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_ImpFormat_Row.java b/org.adempiere.base/src/org/compiere/model/I_AD_ImpFormat_Row.java
index 6bd62b28b5..58c2ce9bbe 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_ImpFormat_Row.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_ImpFormat_Row.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ImpFormat_Row
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_ImpFormat_Row 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_ImportTemplate.java b/org.adempiere.base/src/org/compiere/model/I_AD_ImportTemplate.java
index 0f27a49215..0f616408b0 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_ImportTemplate.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_ImportTemplate.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ImportTemplate
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_ImportTemplate 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_ImportTemplateAccess.java b/org.adempiere.base/src/org/compiere/model/I_AD_ImportTemplateAccess.java
index 788a0279c0..f5277e7da3 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_ImportTemplateAccess.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_ImportTemplateAccess.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ImportTemplateAccess
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_ImportTemplateAccess 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_IndexColumn.java b/org.adempiere.base/src/org/compiere/model/I_AD_IndexColumn.java
index 55f6c66de5..a541af84f5 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_IndexColumn.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_IndexColumn.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_IndexColumn
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_IndexColumn 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_InfoColumn.java b/org.adempiere.base/src/org/compiere/model/I_AD_InfoColumn.java
index f43d114dca..8c5caf4f54 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_InfoColumn.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_InfoColumn.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_InfoColumn
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_InfoColumn 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_InfoProcess.java b/org.adempiere.base/src/org/compiere/model/I_AD_InfoProcess.java
index a2cabccb15..5f03a1afdc 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_InfoProcess.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_InfoProcess.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_InfoProcess
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_InfoProcess 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_InfoRelated.java b/org.adempiere.base/src/org/compiere/model/I_AD_InfoRelated.java
index bc1f81a4e3..df78a28dff 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_InfoRelated.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_InfoRelated.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_InfoRelated
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_InfoRelated 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_InfoWindow.java b/org.adempiere.base/src/org/compiere/model/I_AD_InfoWindow.java
index dc3e680fd8..a92da88844 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_InfoWindow.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_InfoWindow.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_InfoWindow
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_InfoWindow 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_InfoWindow_Access.java b/org.adempiere.base/src/org/compiere/model/I_AD_InfoWindow_Access.java
index 9a297291c3..25b3a15b02 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_InfoWindow_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_InfoWindow_Access.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_InfoWindow_Access
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_InfoWindow_Access 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Issue.java b/org.adempiere.base/src/org/compiere/model/I_AD_Issue.java
index 2db4bf92e1..c249704eb9 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Issue.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Issue.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Issue
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Issue 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_LabelPrinter.java b/org.adempiere.base/src/org/compiere/model/I_AD_LabelPrinter.java
index d0a6dfb2fe..31b27932e9 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_LabelPrinter.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_LabelPrinter.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_LabelPrinter
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_LabelPrinter 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_LabelPrinterFunction.java b/org.adempiere.base/src/org/compiere/model/I_AD_LabelPrinterFunction.java
index f02fc7a999..9edb28685b 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_LabelPrinterFunction.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_LabelPrinterFunction.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_LabelPrinterFunction
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_LabelPrinterFunction 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Language.java b/org.adempiere.base/src/org/compiere/model/I_AD_Language.java
index 8cd84f85f0..5b6a48c7a2 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Language.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Language.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Language
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Language 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_LdapAccess.java b/org.adempiere.base/src/org/compiere/model/I_AD_LdapAccess.java
index 9521a9d495..8578c8a827 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_LdapAccess.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_LdapAccess.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_LdapAccess
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_LdapAccess 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_LdapProcessor.java b/org.adempiere.base/src/org/compiere/model/I_AD_LdapProcessor.java
index 98968bcbcc..54e18e7fc5 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_LdapProcessor.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_LdapProcessor.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_LdapProcessor
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_LdapProcessor 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_LdapProcessorLog.java b/org.adempiere.base/src/org/compiere/model/I_AD_LdapProcessorLog.java
index b4c32fa301..ed6648feef 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_LdapProcessorLog.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_LdapProcessorLog.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_LdapProcessorLog
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_LdapProcessorLog 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Menu.java b/org.adempiere.base/src/org/compiere/model/I_AD_Menu.java
index ae04f333dc..232ffde16b 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Menu.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Menu.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Menu
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Menu 
 {
@@ -35,9 +35,9 @@ public interface I_AD_Menu
 
     KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name);
 
-    /** AccessLevel = 6 - System - Client 
+    /** AccessLevel = 4 - System 
      */
-    BigDecimal accessLevel = BigDecimal.valueOf(6);
+    BigDecimal accessLevel = BigDecimal.valueOf(4);
 
     /** Load Meta Data */
 
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Message.java b/org.adempiere.base/src/org/compiere/model/I_AD_Message.java
index eb272df193..85f4442638 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Message.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Message.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Message
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Message 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_MigrationScript.java b/org.adempiere.base/src/org/compiere/model/I_AD_MigrationScript.java
index 06141c680c..89d4af5c01 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_MigrationScript.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_MigrationScript.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_MigrationScript
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_MigrationScript 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_ModelValidator.java b/org.adempiere.base/src/org/compiere/model/I_AD_ModelValidator.java
index cd75adbedc..7beae88041 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_ModelValidator.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_ModelValidator.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ModelValidator
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_ModelValidator 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Modification.java b/org.adempiere.base/src/org/compiere/model/I_AD_Modification.java
index 6fa5af627a..b669087f1a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Modification.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Modification.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Modification
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Modification 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Note.java b/org.adempiere.base/src/org/compiere/model/I_AD_Note.java
index eb1ea807a8..9bd2b146a1 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Note.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Note.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Note
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Note 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Org.java b/org.adempiere.base/src/org/compiere/model/I_AD_Org.java
index ad2d241ae4..98f5fd6eae 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Org.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Org.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Org
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Org 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_OrgInfo.java b/org.adempiere.base/src/org/compiere/model/I_AD_OrgInfo.java
index 432e901ac5..228d7f21bc 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_OrgInfo.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_OrgInfo.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_OrgInfo
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_OrgInfo 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_OrgType.java b/org.adempiere.base/src/org/compiere/model/I_AD_OrgType.java
index 8c45aa827d..4816e3b10d 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_OrgType.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_OrgType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_OrgType
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_OrgType 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_PInstance.java b/org.adempiere.base/src/org/compiere/model/I_AD_PInstance.java
index 85665847c9..37e618c61f 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_PInstance.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_PInstance.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_PInstance
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_PInstance 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_PInstance_Log.java b/org.adempiere.base/src/org/compiere/model/I_AD_PInstance_Log.java
index ea416db2b9..8da1fc26ac 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_PInstance_Log.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_PInstance_Log.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_PInstance_Log
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_PInstance_Log 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_PInstance_Para.java b/org.adempiere.base/src/org/compiere/model/I_AD_PInstance_Para.java
index a67e6a219e..401951401f 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_PInstance_Para.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_PInstance_Para.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_PInstance_Para
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_PInstance_Para 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Package_Exp.java b/org.adempiere.base/src/org/compiere/model/I_AD_Package_Exp.java
index 0092304bb4..b785d4bf56 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Package_Exp.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Package_Exp.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Package_Exp
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Package_Exp 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Package_Exp_Detail.java b/org.adempiere.base/src/org/compiere/model/I_AD_Package_Exp_Detail.java
index 7a9d49ae36..70ccdb04bf 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Package_Exp_Detail.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Package_Exp_Detail.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Package_Exp_Detail
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Package_Exp_Detail 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp.java b/org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp.java
index 1b21bd8474..3ffa14890f 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Package_Imp
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Package_Imp 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp_Backup.java b/org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp_Backup.java
index 7f7b247226..c4731b7540 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp_Backup.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp_Backup.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Package_Imp_Backup
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Package_Imp_Backup 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp_Detail.java b/org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp_Detail.java
index 2e7e151061..433a397eab 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp_Detail.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp_Detail.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Package_Imp_Detail
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Package_Imp_Detail 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp_Inst.java b/org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp_Inst.java
index 8defb9425c..59df526945 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp_Inst.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp_Inst.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Package_Imp_Inst
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Package_Imp_Inst 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp_Proc.java b/org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp_Proc.java
index d7953abb56..c3cac4a592 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp_Proc.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp_Proc.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Package_Imp_Proc
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Package_Imp_Proc 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Package_UUID_Map.java b/org.adempiere.base/src/org/compiere/model/I_AD_Package_UUID_Map.java
index cef564fb6c..6e97469155 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Package_UUID_Map.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Package_UUID_Map.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Package_UUID_Map
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Package_UUID_Map 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_PasswordRule.java b/org.adempiere.base/src/org/compiere/model/I_AD_PasswordRule.java
index 619a1119ff..a9fbe4fa36 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_PasswordRule.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_PasswordRule.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_PasswordRule
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_PasswordRule 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Password_History.java b/org.adempiere.base/src/org/compiere/model/I_AD_Password_History.java
index af7ddb8823..878b55026b 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Password_History.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Password_History.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Password_History
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Password_History 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_PostIt.java b/org.adempiere.base/src/org/compiere/model/I_AD_PostIt.java
index 4bb2047e25..2d79d5e43a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_PostIt.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_PostIt.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_PostIt
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_PostIt 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Preference.java b/org.adempiere.base/src/org/compiere/model/I_AD_Preference.java
index 2c91f52d6d..3ab44a4544 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Preference.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Preference.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Preference
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Preference 
 {
@@ -127,7 +127,7 @@ public interface I_AD_Preference
 	  */
 	public int getAD_User_ID();
 
-	public org.compiere.model.I_AD_User getAD_User() throws RuntimeException;
+	public org.compiere.model.I_AD_AllUsers_V getAD_User() throws RuntimeException;
 
     /** Column name AD_Window_ID */
     public static final String COLUMNNAME_AD_Window_ID = "AD_Window_ID";
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_PrintColor.java b/org.adempiere.base/src/org/compiere/model/I_AD_PrintColor.java
index 079fbc3625..46105cbb2d 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_PrintColor.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_PrintColor.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_PrintColor
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_PrintColor 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_PrintFont.java b/org.adempiere.base/src/org/compiere/model/I_AD_PrintFont.java
index 3bb66b0d69..aa9b878bfd 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_PrintFont.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_PrintFont.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_PrintFont
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_PrintFont 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_PrintForm.java b/org.adempiere.base/src/org/compiere/model/I_AD_PrintForm.java
index ffe8d9be54..7e66a1611b 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_PrintForm.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_PrintForm.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_PrintForm
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_PrintForm 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_PrintFormat.java b/org.adempiere.base/src/org/compiere/model/I_AD_PrintFormat.java
index e9346827b5..9059d6df34 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_PrintFormat.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_PrintFormat.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_PrintFormat
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_PrintFormat 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_PrintFormatItem.java b/org.adempiere.base/src/org/compiere/model/I_AD_PrintFormatItem.java
index 923b150785..e3b59ad1e3 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_PrintFormatItem.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_PrintFormatItem.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_PrintFormatItem
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_PrintFormatItem 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_PrintGraph.java b/org.adempiere.base/src/org/compiere/model/I_AD_PrintGraph.java
index 4a36821b93..dce1e5315a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_PrintGraph.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_PrintGraph.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_PrintGraph
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_PrintGraph 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_PrintLabel.java b/org.adempiere.base/src/org/compiere/model/I_AD_PrintLabel.java
index a07b65c0de..efc2725fb8 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_PrintLabel.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_PrintLabel.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_PrintLabel
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_PrintLabel 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_PrintLabelLine.java b/org.adempiere.base/src/org/compiere/model/I_AD_PrintLabelLine.java
index 2234761518..5c90b811e3 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_PrintLabelLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_PrintLabelLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_PrintLabelLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_PrintLabelLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_PrintPaper.java b/org.adempiere.base/src/org/compiere/model/I_AD_PrintPaper.java
index 7c16b9d639..cf8a56cac6 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_PrintPaper.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_PrintPaper.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_PrintPaper
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_PrintPaper 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_PrintTableFormat.java b/org.adempiere.base/src/org/compiere/model/I_AD_PrintTableFormat.java
index c749ddef4e..1324afff68 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_PrintTableFormat.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_PrintTableFormat.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_PrintTableFormat
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_PrintTableFormat 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Private_Access.java b/org.adempiere.base/src/org/compiere/model/I_AD_Private_Access.java
index f685f0bf29..5a2de0a063 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Private_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Private_Access.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Private_Access
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Private_Access 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Process.java b/org.adempiere.base/src/org/compiere/model/I_AD_Process.java
index 013ebc178d..827e810641 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Process.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Process.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Process
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Process 
 {
@@ -168,6 +168,19 @@ public interface I_AD_Process
 
 	public org.compiere.model.I_AD_Workflow getAD_Workflow() throws RuntimeException;
 
+    /** Column name AllowMultipleExecution */
+    public static final String COLUMNNAME_AllowMultipleExecution = "AllowMultipleExecution";
+
+	/** Set Multiple Execution.
+	  * Allow or disallow executing a process/report multiple times.
+	  */
+	public void setAllowMultipleExecution (String AllowMultipleExecution);
+
+	/** Get Multiple Execution.
+	  * Allow or disallow executing a process/report multiple times.
+	  */
+	public String getAllowMultipleExecution();
+
     /** Column name Classname */
     public static final String COLUMNNAME_Classname = "Classname";
 
@@ -238,6 +251,19 @@ public interface I_AD_Process
 	  */
 	public String getEntityType();
 
+    /** Column name ExecutionType */
+    public static final String COLUMNNAME_ExecutionType = "ExecutionType";
+
+	/** Set Execution Type.
+	  * Execution Type defines whether the report/process will always run in background or foreground. 
+	  */
+	public void setExecutionType (String ExecutionType);
+
+	/** Get Execution Type.
+	  * Execution Type defines whether the report/process will always run in background or foreground. 
+	  */
+	public String getExecutionType();
+
     /** Column name Help */
     public static final String COLUMNNAME_Help = "Help";
 
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Process_Access.java b/org.adempiere.base/src/org/compiere/model/I_AD_Process_Access.java
index 422dd14542..c5f041adb1 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Process_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Process_Access.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Process_Access
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Process_Access 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Process_Para.java b/org.adempiere.base/src/org/compiere/model/I_AD_Process_Para.java
index 838d0602a1..da05d31665 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Process_Para.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Process_Para.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Process_Para
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Process_Para 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_RecentItem.java b/org.adempiere.base/src/org/compiere/model/I_AD_RecentItem.java
index ac41d6fbf4..3ac79cded3 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_RecentItem.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_RecentItem.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_RecentItem
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_RecentItem 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Record_Access.java b/org.adempiere.base/src/org/compiere/model/I_AD_Record_Access.java
index 94fabd8a75..61263842a4 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Record_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Record_Access.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Record_Access
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Record_Access 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Ref_List.java b/org.adempiere.base/src/org/compiere/model/I_AD_Ref_List.java
index b30b811b2d..b3df1475d3 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Ref_List.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Ref_List.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Ref_List
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Ref_List 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Ref_Table.java b/org.adempiere.base/src/org/compiere/model/I_AD_Ref_Table.java
index 6be20938aa..cb189db2d8 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Ref_Table.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Ref_Table.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Ref_Table
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Ref_Table 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Reference.java b/org.adempiere.base/src/org/compiere/model/I_AD_Reference.java
index 1115ee6a57..953f5b0ce7 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Reference.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Reference.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Reference
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Reference 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Registration.java b/org.adempiere.base/src/org/compiere/model/I_AD_Registration.java
index 9e822fd0d1..7ad9c8fe30 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Registration.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Registration.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Registration
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Registration 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_RelationType.java b/org.adempiere.base/src/org/compiere/model/I_AD_RelationType.java
index 5d6b4fbcab..8806f07b3f 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_RelationType.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_RelationType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_RelationType
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_RelationType 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Replication.java b/org.adempiere.base/src/org/compiere/model/I_AD_Replication.java
index 1fca97bf77..3299ad6a19 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Replication.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Replication.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Replication
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Replication 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_ReplicationDocument.java b/org.adempiere.base/src/org/compiere/model/I_AD_ReplicationDocument.java
index 85ecaf1278..84cfd613f3 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_ReplicationDocument.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_ReplicationDocument.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ReplicationDocument
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_ReplicationDocument 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_ReplicationStrategy.java b/org.adempiere.base/src/org/compiere/model/I_AD_ReplicationStrategy.java
index 0db39bdbeb..e8a2034055 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_ReplicationStrategy.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_ReplicationStrategy.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ReplicationStrategy
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_ReplicationStrategy 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_ReplicationTable.java b/org.adempiere.base/src/org/compiere/model/I_AD_ReplicationTable.java
index 390adabfcc..86b423a7f2 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_ReplicationTable.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_ReplicationTable.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ReplicationTable
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_ReplicationTable 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Replication_Log.java b/org.adempiere.base/src/org/compiere/model/I_AD_Replication_Log.java
index 56c86b8d4f..86612bbf07 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Replication_Log.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Replication_Log.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Replication_Log
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Replication_Log 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Replication_Run.java b/org.adempiere.base/src/org/compiere/model/I_AD_Replication_Run.java
index 09fcb7c54e..3f8429f023 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Replication_Run.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Replication_Run.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Replication_Run
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Replication_Run 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_ReportView.java b/org.adempiere.base/src/org/compiere/model/I_AD_ReportView.java
index 1be4b5b4cb..9bbea225d2 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_ReportView.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_ReportView.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ReportView
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_ReportView 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_ReportView_Col.java b/org.adempiere.base/src/org/compiere/model/I_AD_ReportView_Col.java
index 9de5497e74..b3704b3191 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_ReportView_Col.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_ReportView_Col.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ReportView_Col
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_ReportView_Col 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_ReportView_Column.java b/org.adempiere.base/src/org/compiere/model/I_AD_ReportView_Column.java
index 7bac2e33ce..8a4b942206 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_ReportView_Column.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_ReportView_Column.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ReportView_Column
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_ReportView_Column 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Role.java b/org.adempiere.base/src/org/compiere/model/I_AD_Role.java
index 256f1751b2..b658750d61 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Role.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Role.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Role
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Role 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Role_Included.java b/org.adempiere.base/src/org/compiere/model/I_AD_Role_Included.java
index 53ecb93984..698ce510ab 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Role_Included.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Role_Included.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Role_Included
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Role_Included 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Role_OrgAccess.java b/org.adempiere.base/src/org/compiere/model/I_AD_Role_OrgAccess.java
index 34cb676780..a4e3a90351 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Role_OrgAccess.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Role_OrgAccess.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Role_OrgAccess
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Role_OrgAccess 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Rule.java b/org.adempiere.base/src/org/compiere/model/I_AD_Rule.java
index b104458ff7..49d20449aa 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Rule.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Rule.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Rule
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Rule 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Schedule.java b/org.adempiere.base/src/org/compiere/model/I_AD_Schedule.java
index 471f4bfb4d..ecae951205 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Schedule.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Schedule.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Schedule
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Schedule 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Scheduler.java b/org.adempiere.base/src/org/compiere/model/I_AD_Scheduler.java
index 51cf517920..0ba904ac52 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Scheduler.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Scheduler.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Scheduler
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Scheduler 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_SchedulerLog.java b/org.adempiere.base/src/org/compiere/model/I_AD_SchedulerLog.java
index 59ac49545e..a738d6b0bc 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_SchedulerLog.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_SchedulerLog.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_SchedulerLog
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_SchedulerLog 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_SchedulerRecipient.java b/org.adempiere.base/src/org/compiere/model/I_AD_SchedulerRecipient.java
index 5a8093d4eb..8a70d1ae4a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_SchedulerRecipient.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_SchedulerRecipient.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_SchedulerRecipient
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_SchedulerRecipient 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Scheduler_Para.java b/org.adempiere.base/src/org/compiere/model/I_AD_Scheduler_Para.java
index dc7b9ae9d0..59d3686e0d 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Scheduler_Para.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Scheduler_Para.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Scheduler_Para
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Scheduler_Para 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_SearchDefinition.java b/org.adempiere.base/src/org/compiere/model/I_AD_SearchDefinition.java
index c86819a8cc..97ecbb56e5 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_SearchDefinition.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_SearchDefinition.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_SearchDefinition
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_SearchDefinition 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Sequence.java b/org.adempiere.base/src/org/compiere/model/I_AD_Sequence.java
index 480bd5abe7..32507148b3 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Sequence.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Sequence.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Sequence
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Sequence 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Sequence_Audit.java b/org.adempiere.base/src/org/compiere/model/I_AD_Sequence_Audit.java
index 4d8ba83e0a..003abb85b7 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Sequence_Audit.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Sequence_Audit.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Sequence_Audit
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Sequence_Audit 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Sequence_No.java b/org.adempiere.base/src/org/compiere/model/I_AD_Sequence_No.java
index b88dcdc0f0..5219c61376 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Sequence_No.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Sequence_No.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Sequence_No
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Sequence_No 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Session.java b/org.adempiere.base/src/org/compiere/model/I_AD_Session.java
index 57561ab175..bb9afa350f 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Session.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Session.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Session
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Session 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_StatusLine.java b/org.adempiere.base/src/org/compiere/model/I_AD_StatusLine.java
index 018c507578..6c32b9df25 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_StatusLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_StatusLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_StatusLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_StatusLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_StatusLineUsedIn.java b/org.adempiere.base/src/org/compiere/model/I_AD_StatusLineUsedIn.java
index 721826ce71..7696631f71 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_StatusLineUsedIn.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_StatusLineUsedIn.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_StatusLineUsedIn
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_StatusLineUsedIn 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_StorageProvider.java b/org.adempiere.base/src/org/compiere/model/I_AD_StorageProvider.java
index d1c9547a4a..0db32c7a55 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_StorageProvider.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_StorageProvider.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_StorageProvider
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_StorageProvider 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Style.java b/org.adempiere.base/src/org/compiere/model/I_AD_Style.java
index b1cd086244..da00d13192 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Style.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Style.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Style
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Style 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_StyleLine.java b/org.adempiere.base/src/org/compiere/model/I_AD_StyleLine.java
index cfd3d1ea36..2f930738e8 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_StyleLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_StyleLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_StyleLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_StyleLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_SysConfig.java b/org.adempiere.base/src/org/compiere/model/I_AD_SysConfig.java
index 17b06cc5c8..0fcc4f9d6e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_SysConfig.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_SysConfig.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_SysConfig
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_SysConfig 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_System.java b/org.adempiere.base/src/org/compiere/model/I_AD_System.java
index a4d53ae8bb..84bec0faa5 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_System.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_System.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_System
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_System 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Tab.java b/org.adempiere.base/src/org/compiere/model/I_AD_Tab.java
index 9fc0b938a2..501ee81ff0 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Tab.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Tab.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Tab
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Tab 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Tab_Customization.java b/org.adempiere.base/src/org/compiere/model/I_AD_Tab_Customization.java
index d8c474c9b4..ba182d7a00 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Tab_Customization.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Tab_Customization.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Tab_Customization
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Tab_Customization 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Table.java b/org.adempiere.base/src/org/compiere/model/I_AD_Table.java
index 12df219fc5..2e5ce9aa9e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Table.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Table.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Table
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Table 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_TableIndex.java b/org.adempiere.base/src/org/compiere/model/I_AD_TableIndex.java
index 5127eeb332..f5e91add64 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_TableIndex.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_TableIndex.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_TableIndex
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_TableIndex 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Table_Access.java b/org.adempiere.base/src/org/compiere/model/I_AD_Table_Access.java
index 0d4f469779..78c2f1be2c 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Table_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Table_Access.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Table_Access
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Table_Access 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Table_ScriptValidator.java b/org.adempiere.base/src/org/compiere/model/I_AD_Table_ScriptValidator.java
index d92b20dd99..8c93a3ba97 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Table_ScriptValidator.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Table_ScriptValidator.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Table_ScriptValidator
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Table_ScriptValidator 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Task.java b/org.adempiere.base/src/org/compiere/model/I_AD_Task.java
index 239bf3e540..6210a63c24 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Task.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Task.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Task
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Task 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_TaskInstance.java b/org.adempiere.base/src/org/compiere/model/I_AD_TaskInstance.java
index c1bfe25b24..fdf3bc60db 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_TaskInstance.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_TaskInstance.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_TaskInstance
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_TaskInstance 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Task_Access.java b/org.adempiere.base/src/org/compiere/model/I_AD_Task_Access.java
index b27e9d5551..70158ddaa9 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Task_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Task_Access.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Task_Access
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Task_Access 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_ToolBarButton.java b/org.adempiere.base/src/org/compiere/model/I_AD_ToolBarButton.java
index 3e408c7c13..2972e1a941 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_ToolBarButton.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_ToolBarButton.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ToolBarButton
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_ToolBarButton 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_ToolBarButtonRestrict.java b/org.adempiere.base/src/org/compiere/model/I_AD_ToolBarButtonRestrict.java
index ddb294f2b4..76278819da 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_ToolBarButtonRestrict.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_ToolBarButtonRestrict.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ToolBarButtonRestrict
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_ToolBarButtonRestrict 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Tree.java b/org.adempiere.base/src/org/compiere/model/I_AD_Tree.java
index d8cb112449..6be88c527a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Tree.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Tree.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Tree
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Tree 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_TreeBar.java b/org.adempiere.base/src/org/compiere/model/I_AD_TreeBar.java
index cb5c8c3b4e..0878d0e56a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_TreeBar.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_TreeBar.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_TreeBar
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_TreeBar 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_TreeNode.java b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNode.java
index fd7f82d113..ba76c74a64 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_TreeNode.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNode.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_TreeNode
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_TreeNode 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeBP.java b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeBP.java
index 53bcd67bc6..60188ec917 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeBP.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeBP.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_TreeNodeBP
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_TreeNodeBP 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeCMC.java b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeCMC.java
index 66b1b95ca9..0aff0a9cc7 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeCMC.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeCMC.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_TreeNodeCMC
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_TreeNodeCMC 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeCMM.java b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeCMM.java
index 63269e48fe..d291c91866 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeCMM.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeCMM.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_TreeNodeCMM
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_TreeNodeCMM 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeCMS.java b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeCMS.java
index c31480f08d..eb428fb514 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeCMS.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeCMS.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_TreeNodeCMS
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_TreeNodeCMS 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeCMT.java b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeCMT.java
index db2a91441e..ad3903fc7a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeCMT.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeCMT.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_TreeNodeCMT
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_TreeNodeCMT 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeMM.java b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeMM.java
index 3f2b0d0a0a..febcee5698 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeMM.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeMM.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_TreeNodeMM
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_TreeNodeMM 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodePR.java b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodePR.java
index 1077671b68..1893be2fb4 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodePR.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodePR.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_TreeNodePR
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_TreeNodePR 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeU1.java b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeU1.java
index d55048feb7..91dfa620a7 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeU1.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeU1.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_TreeNodeU1
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_TreeNodeU1 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeU2.java b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeU2.java
index 1640b7e1de..ff8b6d374e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeU2.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeU2.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_TreeNodeU2
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_TreeNodeU2 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeU3.java b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeU3.java
index a2fb520c40..8ae10c4695 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeU3.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeU3.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_TreeNodeU3
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_TreeNodeU3 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeU4.java b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeU4.java
index f6810ff79f..2473a93d7c 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeU4.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeU4.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_TreeNodeU4
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_TreeNodeU4 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_User.java b/org.adempiere.base/src/org/compiere/model/I_AD_User.java
index f54af0b02c..ec433a0230 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_User.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_User.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_User
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_User 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_UserBPAccess.java b/org.adempiere.base/src/org/compiere/model/I_AD_UserBPAccess.java
index cf8eb2bcd6..28661f9208 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_UserBPAccess.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_UserBPAccess.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_UserBPAccess
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_UserBPAccess 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Field.java b/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Field.java
index 5cafbc1333..4f7417b811 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Field.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Field.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_UserDef_Field
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_UserDef_Field 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Tab.java b/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Tab.java
index 47e71719c6..5101bcea47 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Tab.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Tab.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_UserDef_Tab
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_UserDef_Tab 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Win.java b/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Win.java
index ac5e9e8449..c01da2eab8 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Win.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Win.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_UserDef_Win
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_UserDef_Win 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_UserMail.java b/org.adempiere.base/src/org/compiere/model/I_AD_UserMail.java
index ea435cb7e8..7b2f2ff1c8 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_UserMail.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_UserMail.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_UserMail
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_UserMail 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_UserPreference.java b/org.adempiere.base/src/org/compiere/model/I_AD_UserPreference.java
index f1d278eae9..b790adc3ad 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_UserPreference.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_UserPreference.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_UserPreference
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_UserPreference 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_UserQuery.java b/org.adempiere.base/src/org/compiere/model/I_AD_UserQuery.java
index c6a2470974..53e6e60e26 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_UserQuery.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_UserQuery.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_UserQuery
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_UserQuery 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_User_OrgAccess.java b/org.adempiere.base/src/org/compiere/model/I_AD_User_OrgAccess.java
index 48ea12e786..4338f82e10 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_User_OrgAccess.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_User_OrgAccess.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_User_OrgAccess
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_User_OrgAccess 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_User_Roles.java b/org.adempiere.base/src/org/compiere/model/I_AD_User_Roles.java
index efa9b59c84..9d558032b8 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_User_Roles.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_User_Roles.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_User_Roles
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_User_Roles 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_User_Substitute.java b/org.adempiere.base/src/org/compiere/model/I_AD_User_Substitute.java
index b3e4e21907..fdc3ade1aa 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_User_Substitute.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_User_Substitute.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_User_Substitute
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_User_Substitute 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Val_Rule.java b/org.adempiere.base/src/org/compiere/model/I_AD_Val_Rule.java
index ada5481b88..1b3d5dc390 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Val_Rule.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Val_Rule.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Val_Rule
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Val_Rule 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_ViewColumn.java b/org.adempiere.base/src/org/compiere/model/I_AD_ViewColumn.java
index 0d39e3b93f..36a1a4257a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_ViewColumn.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_ViewColumn.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ViewColumn
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_ViewColumn 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_ViewComponent.java b/org.adempiere.base/src/org/compiere/model/I_AD_ViewComponent.java
index 0d9d1d32f8..193f19ef81 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_ViewComponent.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_ViewComponent.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ViewComponent
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_ViewComponent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_WF_Activity.java b/org.adempiere.base/src/org/compiere/model/I_AD_WF_Activity.java
index 81a6f01028..1dc9071271 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_WF_Activity.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_WF_Activity.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WF_Activity
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_WF_Activity 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_WF_ActivityApprover.java b/org.adempiere.base/src/org/compiere/model/I_AD_WF_ActivityApprover.java
index 49f302690d..0a54fbf3ca 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_WF_ActivityApprover.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_WF_ActivityApprover.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WF_ActivityApprover
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_WF_ActivityApprover 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_WF_ActivityResult.java b/org.adempiere.base/src/org/compiere/model/I_AD_WF_ActivityResult.java
index d1669b4204..cc4b5237fc 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_WF_ActivityResult.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_WF_ActivityResult.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WF_ActivityResult
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_WF_ActivityResult 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_WF_Block.java b/org.adempiere.base/src/org/compiere/model/I_AD_WF_Block.java
index 3ce175f5ac..bbc073c4e8 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_WF_Block.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_WF_Block.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WF_Block
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_WF_Block 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_WF_EventAudit.java b/org.adempiere.base/src/org/compiere/model/I_AD_WF_EventAudit.java
index 312ee8d3be..0a1789f60a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_WF_EventAudit.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_WF_EventAudit.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WF_EventAudit
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_WF_EventAudit 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_WF_NextCondition.java b/org.adempiere.base/src/org/compiere/model/I_AD_WF_NextCondition.java
index 7ee180599b..96574a349e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_WF_NextCondition.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_WF_NextCondition.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WF_NextCondition
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_WF_NextCondition 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_WF_Node.java b/org.adempiere.base/src/org/compiere/model/I_AD_WF_Node.java
index 31f16b0a1f..8110ca067b 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_WF_Node.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_WF_Node.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WF_Node
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_WF_Node 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_WF_NodeNext.java b/org.adempiere.base/src/org/compiere/model/I_AD_WF_NodeNext.java
index fd35b6007e..f1f85ba599 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_WF_NodeNext.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_WF_NodeNext.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WF_NodeNext
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_WF_NodeNext 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_WF_Node_Para.java b/org.adempiere.base/src/org/compiere/model/I_AD_WF_Node_Para.java
index b76bdf30d4..3363e1be02 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_WF_Node_Para.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_WF_Node_Para.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WF_Node_Para
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_WF_Node_Para 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_WF_Process.java b/org.adempiere.base/src/org/compiere/model/I_AD_WF_Process.java
index 68286beec6..de376f6633 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_WF_Process.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_WF_Process.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WF_Process
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_WF_Process 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_WF_ProcessData.java b/org.adempiere.base/src/org/compiere/model/I_AD_WF_ProcessData.java
index 055e856c29..31965f41be 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_WF_ProcessData.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_WF_ProcessData.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WF_ProcessData
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_WF_ProcessData 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_WF_Responsible.java b/org.adempiere.base/src/org/compiere/model/I_AD_WF_Responsible.java
index 6e82e3d5de..6a8a83c255 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_WF_Responsible.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_WF_Responsible.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WF_Responsible
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_WF_Responsible 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Window.java b/org.adempiere.base/src/org/compiere/model/I_AD_Window.java
index d0743593cb..55ab943c41 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Window.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Window.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Window
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Window 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Window_Access.java b/org.adempiere.base/src/org/compiere/model/I_AD_Window_Access.java
index 1e13d4acc6..090c4ad595 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Window_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Window_Access.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Window_Access
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Window_Access 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_WizardProcess.java b/org.adempiere.base/src/org/compiere/model/I_AD_WizardProcess.java
index 2d369dd1ec..68cd6dcfb4 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_WizardProcess.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_WizardProcess.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WizardProcess
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_WizardProcess 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Workbench.java b/org.adempiere.base/src/org/compiere/model/I_AD_Workbench.java
index 7d334575ac..adb148b96b 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Workbench.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Workbench.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Workbench
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Workbench 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_WorkbenchWindow.java b/org.adempiere.base/src/org/compiere/model/I_AD_WorkbenchWindow.java
index ecdf2779e9..302d3b3d0e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_WorkbenchWindow.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_WorkbenchWindow.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WorkbenchWindow
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_WorkbenchWindow 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Workflow.java b/org.adempiere.base/src/org/compiere/model/I_AD_Workflow.java
index 69eb1fc71b..09fdd40c03 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Workflow.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Workflow.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Workflow
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Workflow 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_WorkflowProcessor.java b/org.adempiere.base/src/org/compiere/model/I_AD_WorkflowProcessor.java
index f60bb3dcb1..67c1b3e9b0 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_WorkflowProcessor.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_WorkflowProcessor.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WorkflowProcessor
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_WorkflowProcessor 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_WorkflowProcessorLog.java b/org.adempiere.base/src/org/compiere/model/I_AD_WorkflowProcessorLog.java
index 5f093a8dd8..81d9edbac0 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_WorkflowProcessorLog.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_WorkflowProcessorLog.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WorkflowProcessorLog
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_WorkflowProcessorLog 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Workflow_Access.java b/org.adempiere.base/src/org/compiere/model/I_AD_Workflow_Access.java
index 6ffe7dd4f5..fdaf1256ca 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_Workflow_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_Workflow_Access.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Workflow_Access
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_Workflow_Access 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_ZoomCondition.java b/org.adempiere.base/src/org/compiere/model/I_AD_ZoomCondition.java
index 87c7b15d53..7b618b90c3 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_ZoomCondition.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_ZoomCondition.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ZoomCondition
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_AD_ZoomCondition 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_ASP_ClientException.java b/org.adempiere.base/src/org/compiere/model/I_ASP_ClientException.java
index ecb1536998..9ddd849f40 100644
--- a/org.adempiere.base/src/org/compiere/model/I_ASP_ClientException.java
+++ b/org.adempiere.base/src/org/compiere/model/I_ASP_ClientException.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for ASP_ClientException
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_ASP_ClientException 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_ASP_ClientLevel.java b/org.adempiere.base/src/org/compiere/model/I_ASP_ClientLevel.java
index 43d8c67557..ced24f49c9 100644
--- a/org.adempiere.base/src/org/compiere/model/I_ASP_ClientLevel.java
+++ b/org.adempiere.base/src/org/compiere/model/I_ASP_ClientLevel.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for ASP_ClientLevel
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_ASP_ClientLevel 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_ASP_Field.java b/org.adempiere.base/src/org/compiere/model/I_ASP_Field.java
index 25f268788c..3b7310ccdb 100644
--- a/org.adempiere.base/src/org/compiere/model/I_ASP_Field.java
+++ b/org.adempiere.base/src/org/compiere/model/I_ASP_Field.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for ASP_Field
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_ASP_Field 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_ASP_Form.java b/org.adempiere.base/src/org/compiere/model/I_ASP_Form.java
index 4c4cf916a8..ad3d125ec2 100644
--- a/org.adempiere.base/src/org/compiere/model/I_ASP_Form.java
+++ b/org.adempiere.base/src/org/compiere/model/I_ASP_Form.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for ASP_Form
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_ASP_Form 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_ASP_Level.java b/org.adempiere.base/src/org/compiere/model/I_ASP_Level.java
index bb54551cdd..4855aa4dd1 100644
--- a/org.adempiere.base/src/org/compiere/model/I_ASP_Level.java
+++ b/org.adempiere.base/src/org/compiere/model/I_ASP_Level.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for ASP_Level
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_ASP_Level 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_ASP_Module.java b/org.adempiere.base/src/org/compiere/model/I_ASP_Module.java
index 8bc92bd629..6977ef3f5e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_ASP_Module.java
+++ b/org.adempiere.base/src/org/compiere/model/I_ASP_Module.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for ASP_Module
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_ASP_Module 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_ASP_Process.java b/org.adempiere.base/src/org/compiere/model/I_ASP_Process.java
index 9b5fc73760..51643566b6 100644
--- a/org.adempiere.base/src/org/compiere/model/I_ASP_Process.java
+++ b/org.adempiere.base/src/org/compiere/model/I_ASP_Process.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for ASP_Process
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_ASP_Process 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_ASP_Process_Para.java b/org.adempiere.base/src/org/compiere/model/I_ASP_Process_Para.java
index 7ba4c6f66b..9b6ea9ef1a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_ASP_Process_Para.java
+++ b/org.adempiere.base/src/org/compiere/model/I_ASP_Process_Para.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for ASP_Process_Para
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_ASP_Process_Para 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_ASP_Ref_List.java b/org.adempiere.base/src/org/compiere/model/I_ASP_Ref_List.java
index 8a9a42639f..e9f14433ee 100644
--- a/org.adempiere.base/src/org/compiere/model/I_ASP_Ref_List.java
+++ b/org.adempiere.base/src/org/compiere/model/I_ASP_Ref_List.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for ASP_Ref_List
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_ASP_Ref_List 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_ASP_Tab.java b/org.adempiere.base/src/org/compiere/model/I_ASP_Tab.java
index 6f9a6eabd1..61ffdab89e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_ASP_Tab.java
+++ b/org.adempiere.base/src/org/compiere/model/I_ASP_Tab.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for ASP_Tab
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_ASP_Tab 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_ASP_Task.java b/org.adempiere.base/src/org/compiere/model/I_ASP_Task.java
index 8c357f82da..a008ebff77 100644
--- a/org.adempiere.base/src/org/compiere/model/I_ASP_Task.java
+++ b/org.adempiere.base/src/org/compiere/model/I_ASP_Task.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for ASP_Task
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_ASP_Task 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_ASP_Window.java b/org.adempiere.base/src/org/compiere/model/I_ASP_Window.java
index a932ef63d9..1fc3584fc1 100644
--- a/org.adempiere.base/src/org/compiere/model/I_ASP_Window.java
+++ b/org.adempiere.base/src/org/compiere/model/I_ASP_Window.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for ASP_Window
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_ASP_Window 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_ASP_Workflow.java b/org.adempiere.base/src/org/compiere/model/I_ASP_Workflow.java
index 8bc888a034..8011199fac 100644
--- a/org.adempiere.base/src/org/compiere/model/I_ASP_Workflow.java
+++ b/org.adempiere.base/src/org/compiere/model/I_ASP_Workflow.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for ASP_Workflow
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_ASP_Workflow 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Asset.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset.java
index 1d12c3f95e..ad7f9afd6b 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Asset.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Asset.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Asset 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Acct.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Acct.java
index 99e1e1c8f9..2cd1d7e854 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Asset_Acct 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Addition.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Addition.java
index be979bdf6a..9bf283b296 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Addition.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Addition.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Addition
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Asset_Addition 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Change.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Change.java
index 99477250fb..7c422f842b 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Change.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Change.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Change
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Asset_Change 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Class.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Class.java
index f76fa5bcd0..183f78820c 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Class.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Class.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Class
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Asset_Class 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Delivery.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Delivery.java
index d1965b6b9d..70b2320200 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Delivery.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Delivery.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Delivery
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Asset_Delivery 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Disposed.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Disposed.java
index 5111eb7b26..468657401d 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Disposed.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Disposed.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Disposed
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Asset_Disposed 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Group.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Group.java
index 217e93f8da..6ece03d8f6 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Group.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Group.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Group
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Asset_Group 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Group_Acct.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Group_Acct.java
index f5d4d492ee..57bd637f42 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Group_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Group_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Group_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Asset_Group_Acct 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Fin.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Fin.java
index 41d315ae3e..cb1cac3958 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Fin.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Fin.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Info_Fin
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Asset_Info_Fin 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Ins.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Ins.java
index 543752fe32..3edf233aaa 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Ins.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Ins.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Info_Ins
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Asset_Info_Ins 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Lic.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Lic.java
index 7447f1a351..f1916244f6 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Lic.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Lic.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Info_Lic
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Asset_Info_Lic 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Oth.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Oth.java
index afb85bc785..d9d4cbcc1f 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Oth.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Oth.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Info_Oth
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Asset_Info_Oth 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Tax.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Tax.java
index 649c909437..7d4320cc78 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Tax.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Tax.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Info_Tax
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Asset_Info_Tax 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Product.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Product.java
index 9580913abf..5abdb0f379 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Product.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Product.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Product
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Asset_Product 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Retirement.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Retirement.java
index fbc261fa25..d7919e2478 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Retirement.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Retirement.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Retirement
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Asset_Retirement 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Reval.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Reval.java
index 2a6e5f4f5c..7f97739c9d 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Reval.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Reval.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Reval
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Asset_Reval 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Reval_Entry.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Reval_Entry.java
index 32583e3645..e945dc7c76 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Reval_Entry.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Reval_Entry.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Reval_Entry
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Asset_Reval_Entry 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Reval_Index.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Reval_Index.java
index 2b143ac693..41ae28b961 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Reval_Index.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Reval_Index.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Reval_Index
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Asset_Reval_Index 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Split.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Split.java
index 104c379eec..068ff13e1c 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Split.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Split.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Split
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Asset_Split 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Spread.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Spread.java
index 1014acc6fd..b5b66f6d9f 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Spread.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Spread.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Spread
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Asset_Spread 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Transfer.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Transfer.java
index cc110e9a9b..1307cd389c 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Transfer.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Transfer.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Transfer
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Asset_Transfer 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Type.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Type.java
index a5ed6e8134..424e2e5709 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Type.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Type.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Type
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Asset_Type 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Use.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Use.java
index bda74bf7f3..0ce0aead95 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Asset_Use.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Use.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Use
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Asset_Use 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Depreciation.java b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation.java
index 82fa947d59..0901dc5d3c 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Depreciation.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Depreciation
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Depreciation 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Build.java b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Build.java
index e13a746c9b..94dc99df90 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Build.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Build.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Depreciation_Build
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Depreciation_Build 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Convention.java b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Convention.java
index d4b8baf49a..e3a776276b 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Convention.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Convention.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Depreciation_Convention
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Depreciation_Convention 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Entry.java b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Entry.java
index 69da696363..8db3c1b43e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Entry.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Entry.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Depreciation_Entry
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Depreciation_Entry 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Exp.java b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Exp.java
index bd272112f2..2635e9e574 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Exp.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Exp.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Depreciation_Exp
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Depreciation_Exp 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Forecast.java b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Forecast.java
index a75742bcfc..c48f12ea0f 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Forecast.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Forecast.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Depreciation_Forecast
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Depreciation_Forecast 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Method.java b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Method.java
index 98dbc24417..4ed4122dd8 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Method.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Method.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Depreciation_Method
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Depreciation_Method 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Table_Detail.java b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Table_Detail.java
index 472cb51bbc..f4a04b45f2 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Table_Detail.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Table_Detail.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Depreciation_Table_Detail
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Depreciation_Table_Detail 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Table_Header.java b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Table_Header.java
index f1c7f2cac9..71e9b34a37 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Table_Header.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Table_Header.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Depreciation_Table_Header
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Depreciation_Table_Header 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Workfile.java b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Workfile.java
index bc3882d833..c745cac453 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Workfile.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Workfile.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Depreciation_Workfile
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Depreciation_Workfile 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_FundingMode.java b/org.adempiere.base/src/org/compiere/model/I_A_FundingMode.java
index 61cfd89e46..7b7c426b49 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_FundingMode.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_FundingMode.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_FundingMode
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_FundingMode 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_FundingMode_Acct.java b/org.adempiere.base/src/org/compiere/model/I_A_FundingMode_Acct.java
index 44e0193f73..867a24fc4a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_FundingMode_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_FundingMode_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_FundingMode_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_FundingMode_Acct 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_Registration.java b/org.adempiere.base/src/org/compiere/model/I_A_Registration.java
index e8b150ee03..c45ae58371 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_Registration.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_Registration.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Registration
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_Registration 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_RegistrationAttribute.java b/org.adempiere.base/src/org/compiere/model/I_A_RegistrationAttribute.java
index f99f907061..16b1f1b75c 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_RegistrationAttribute.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_RegistrationAttribute.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_RegistrationAttribute
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_RegistrationAttribute 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_RegistrationProduct.java b/org.adempiere.base/src/org/compiere/model/I_A_RegistrationProduct.java
index bcff48fb78..111f3bf153 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_RegistrationProduct.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_RegistrationProduct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_RegistrationProduct
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_RegistrationProduct 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_A_RegistrationValue.java b/org.adempiere.base/src/org/compiere/model/I_A_RegistrationValue.java
index 96964fffbb..e0166ffcd4 100644
--- a/org.adempiere.base/src/org/compiere/model/I_A_RegistrationValue.java
+++ b/org.adempiere.base/src/org/compiere/model/I_A_RegistrationValue.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_RegistrationValue
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_A_RegistrationValue 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_B_Bid.java b/org.adempiere.base/src/org/compiere/model/I_B_Bid.java
index 0e4adb0708..648acbd0c9 100644
--- a/org.adempiere.base/src/org/compiere/model/I_B_Bid.java
+++ b/org.adempiere.base/src/org/compiere/model/I_B_Bid.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for B_Bid
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_B_Bid 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_B_BidComment.java b/org.adempiere.base/src/org/compiere/model/I_B_BidComment.java
index 203167a094..c1348b2f45 100644
--- a/org.adempiere.base/src/org/compiere/model/I_B_BidComment.java
+++ b/org.adempiere.base/src/org/compiere/model/I_B_BidComment.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for B_BidComment
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_B_BidComment 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_B_Buyer.java b/org.adempiere.base/src/org/compiere/model/I_B_Buyer.java
index e11afb548a..b763a9fb8b 100644
--- a/org.adempiere.base/src/org/compiere/model/I_B_Buyer.java
+++ b/org.adempiere.base/src/org/compiere/model/I_B_Buyer.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for B_Buyer
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_B_Buyer 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_B_BuyerFunds.java b/org.adempiere.base/src/org/compiere/model/I_B_BuyerFunds.java
index 3f383c5e38..47e0745a0e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_B_BuyerFunds.java
+++ b/org.adempiere.base/src/org/compiere/model/I_B_BuyerFunds.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for B_BuyerFunds
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_B_BuyerFunds 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_B_Offer.java b/org.adempiere.base/src/org/compiere/model/I_B_Offer.java
index 15bd3a8bd0..da96b61fe7 100644
--- a/org.adempiere.base/src/org/compiere/model/I_B_Offer.java
+++ b/org.adempiere.base/src/org/compiere/model/I_B_Offer.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for B_Offer
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_B_Offer 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_B_Seller.java b/org.adempiere.base/src/org/compiere/model/I_B_Seller.java
index 2fd88e47cb..cea44664d4 100644
--- a/org.adempiere.base/src/org/compiere/model/I_B_Seller.java
+++ b/org.adempiere.base/src/org/compiere/model/I_B_Seller.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for B_Seller
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_B_Seller 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_B_SellerFunds.java b/org.adempiere.base/src/org/compiere/model/I_B_SellerFunds.java
index f944281ca2..255f2660ea 100644
--- a/org.adempiere.base/src/org/compiere/model/I_B_SellerFunds.java
+++ b/org.adempiere.base/src/org/compiere/model/I_B_SellerFunds.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for B_SellerFunds
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_B_SellerFunds 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_B_Topic.java b/org.adempiere.base/src/org/compiere/model/I_B_Topic.java
index 877aa2cd86..c472283988 100644
--- a/org.adempiere.base/src/org/compiere/model/I_B_Topic.java
+++ b/org.adempiere.base/src/org/compiere/model/I_B_Topic.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for B_Topic
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_B_Topic 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_B_TopicCategory.java b/org.adempiere.base/src/org/compiere/model/I_B_TopicCategory.java
index 5af038e0ca..76a1b64003 100644
--- a/org.adempiere.base/src/org/compiere/model/I_B_TopicCategory.java
+++ b/org.adempiere.base/src/org/compiere/model/I_B_TopicCategory.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for B_TopicCategory
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_B_TopicCategory 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_B_TopicType.java b/org.adempiere.base/src/org/compiere/model/I_B_TopicType.java
index ef27e9aedc..118a99f9a1 100644
--- a/org.adempiere.base/src/org/compiere/model/I_B_TopicType.java
+++ b/org.adempiere.base/src/org/compiere/model/I_B_TopicType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for B_TopicType
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_B_TopicType 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_AccessContainer.java b/org.adempiere.base/src/org/compiere/model/I_CM_AccessContainer.java
index cf95821e44..4d34abc984 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_AccessContainer.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_AccessContainer.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_AccessContainer
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_AccessContainer 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_AccessListBPGroup.java b/org.adempiere.base/src/org/compiere/model/I_CM_AccessListBPGroup.java
index acddb473c1..d51a284b8d 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_AccessListBPGroup.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_AccessListBPGroup.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_AccessListBPGroup
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_AccessListBPGroup 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_AccessListRole.java b/org.adempiere.base/src/org/compiere/model/I_CM_AccessListRole.java
index 1cf62a2a8d..db0adc6572 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_AccessListRole.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_AccessListRole.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_AccessListRole
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_AccessListRole 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_AccessMedia.java b/org.adempiere.base/src/org/compiere/model/I_CM_AccessMedia.java
index cc5195573a..5cff0b51ef 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_AccessMedia.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_AccessMedia.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_AccessMedia
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_AccessMedia 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_AccessNewsChannel.java b/org.adempiere.base/src/org/compiere/model/I_CM_AccessNewsChannel.java
index 434043fcb3..b1f239f301 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_AccessNewsChannel.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_AccessNewsChannel.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_AccessNewsChannel
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_AccessNewsChannel 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_AccessProfile.java b/org.adempiere.base/src/org/compiere/model/I_CM_AccessProfile.java
index d6aecdbe42..47a0b4d426 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_AccessProfile.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_AccessProfile.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_AccessProfile
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_AccessProfile 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_AccessStage.java b/org.adempiere.base/src/org/compiere/model/I_CM_AccessStage.java
index 2229a57bc0..ecd9a844b5 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_AccessStage.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_AccessStage.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_AccessStage
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_AccessStage 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_Ad.java b/org.adempiere.base/src/org/compiere/model/I_CM_Ad.java
index a18907973b..338734a29e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_Ad.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_Ad.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_Ad
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_Ad 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_Ad_Cat.java b/org.adempiere.base/src/org/compiere/model/I_CM_Ad_Cat.java
index 6df856129b..6c50208d9c 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_Ad_Cat.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_Ad_Cat.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_Ad_Cat
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_Ad_Cat 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_BroadcastServer.java b/org.adempiere.base/src/org/compiere/model/I_CM_BroadcastServer.java
index b9ca6f2531..57e9c5bac0 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_BroadcastServer.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_BroadcastServer.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_BroadcastServer
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_BroadcastServer 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_CStage.java b/org.adempiere.base/src/org/compiere/model/I_CM_CStage.java
index 9dc9831565..abda0adb7e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_CStage.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_CStage.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_CStage
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_CStage 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_CStageTTable.java b/org.adempiere.base/src/org/compiere/model/I_CM_CStageTTable.java
index a84c1a6c67..15f13300e0 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_CStageTTable.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_CStageTTable.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_CStageTTable
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_CStageTTable 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_CStage_Element.java b/org.adempiere.base/src/org/compiere/model/I_CM_CStage_Element.java
index 4ba0796884..36a17fdc1e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_CStage_Element.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_CStage_Element.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_CStage_Element
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_CStage_Element 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_Chat.java b/org.adempiere.base/src/org/compiere/model/I_CM_Chat.java
index 8c2f2941e4..26ca5d6056 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_Chat.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_Chat.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_Chat
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_Chat 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_ChatEntry.java b/org.adempiere.base/src/org/compiere/model/I_CM_ChatEntry.java
index bfee326ff3..edab324217 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_ChatEntry.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_ChatEntry.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_ChatEntry
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_ChatEntry 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_ChatType.java b/org.adempiere.base/src/org/compiere/model/I_CM_ChatType.java
index f7d9c0bf72..1640cb477f 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_ChatType.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_ChatType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_ChatType
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_ChatType 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_ChatTypeUpdate.java b/org.adempiere.base/src/org/compiere/model/I_CM_ChatTypeUpdate.java
index 952ecfe4c1..4be3ac09af 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_ChatTypeUpdate.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_ChatTypeUpdate.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_ChatTypeUpdate
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_ChatTypeUpdate 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_ChatUpdate.java b/org.adempiere.base/src/org/compiere/model/I_CM_ChatUpdate.java
index 047c4f0a0c..de0cb8c864 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_ChatUpdate.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_ChatUpdate.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_ChatUpdate
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_ChatUpdate 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_Container.java b/org.adempiere.base/src/org/compiere/model/I_CM_Container.java
index c53af6e007..6eb2525fcf 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_Container.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_Container.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_Container
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_Container 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_ContainerTTable.java b/org.adempiere.base/src/org/compiere/model/I_CM_ContainerTTable.java
index e84c21b158..71db50a3d9 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_ContainerTTable.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_ContainerTTable.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_ContainerTTable
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_ContainerTTable 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_Container_Element.java b/org.adempiere.base/src/org/compiere/model/I_CM_Container_Element.java
index dd791dcce6..4783119671 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_Container_Element.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_Container_Element.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_Container_Element
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_Container_Element 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_Container_URL.java b/org.adempiere.base/src/org/compiere/model/I_CM_Container_URL.java
index 2d536994be..70f4d4b5e8 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_Container_URL.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_Container_URL.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_Container_URL
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_Container_URL 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_Media.java b/org.adempiere.base/src/org/compiere/model/I_CM_Media.java
index d16dfca174..7332b8f809 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_Media.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_Media.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_Media
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_Media 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_MediaDeploy.java b/org.adempiere.base/src/org/compiere/model/I_CM_MediaDeploy.java
index 8ea393ff79..d5838c68c7 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_MediaDeploy.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_MediaDeploy.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_MediaDeploy
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_MediaDeploy 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_Media_Server.java b/org.adempiere.base/src/org/compiere/model/I_CM_Media_Server.java
index 44c521a53f..62bfd039a7 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_Media_Server.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_Media_Server.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_Media_Server
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_Media_Server 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_NewsChannel.java b/org.adempiere.base/src/org/compiere/model/I_CM_NewsChannel.java
index 2fa095940c..3822db107e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_NewsChannel.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_NewsChannel.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_NewsChannel
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_NewsChannel 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_NewsItem.java b/org.adempiere.base/src/org/compiere/model/I_CM_NewsItem.java
index 77c7121173..0e1ed57d1b 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_NewsItem.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_NewsItem.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_NewsItem
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_NewsItem 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_Template.java b/org.adempiere.base/src/org/compiere/model/I_CM_Template.java
index 53ab8895d8..cb7dadff93 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_Template.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_Template.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_Template
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_Template 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_TemplateTable.java b/org.adempiere.base/src/org/compiere/model/I_CM_TemplateTable.java
index ee45e73f25..c39ce868d1 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_TemplateTable.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_TemplateTable.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_TemplateTable
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_TemplateTable 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_Template_Ad_Cat.java b/org.adempiere.base/src/org/compiere/model/I_CM_Template_Ad_Cat.java
index c651366e67..4720e035e5 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_Template_Ad_Cat.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_Template_Ad_Cat.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_Template_Ad_Cat
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_Template_Ad_Cat 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_WebAccessLog.java b/org.adempiere.base/src/org/compiere/model/I_CM_WebAccessLog.java
index 7d6cf4f5ec..7d1311516c 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_WebAccessLog.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_WebAccessLog.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_WebAccessLog
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_WebAccessLog 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_WebProject.java b/org.adempiere.base/src/org/compiere/model/I_CM_WebProject.java
index 63ab9afd5f..f6bdef0214 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_WebProject.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_WebProject.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_WebProject
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_WebProject 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_WebProject_Domain.java b/org.adempiere.base/src/org/compiere/model/I_CM_WebProject_Domain.java
index 76cb5ac109..b356aeb95b 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_WebProject_Domain.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_WebProject_Domain.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_WebProject_Domain
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_WebProject_Domain 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_CM_WikiToken.java b/org.adempiere.base/src/org/compiere/model/I_CM_WikiToken.java
index ed36efea5f..76aca67976 100644
--- a/org.adempiere.base/src/org/compiere/model/I_CM_WikiToken.java
+++ b/org.adempiere.base/src/org/compiere/model/I_CM_WikiToken.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_WikiToken
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_CM_WikiToken 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_1099Box.java b/org.adempiere.base/src/org/compiere/model/I_C_1099Box.java
index 529924970f..bf2b0e3e5e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_1099Box.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_1099Box.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_1099Box
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_1099Box 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_AcctProcessor.java b/org.adempiere.base/src/org/compiere/model/I_C_AcctProcessor.java
index be4a1c5429..5282e53c16 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_AcctProcessor.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_AcctProcessor.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_AcctProcessor
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_AcctProcessor 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_AcctProcessorLog.java b/org.adempiere.base/src/org/compiere/model/I_C_AcctProcessorLog.java
index da7bcc9cd4..24b1f16d01 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_AcctProcessorLog.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_AcctProcessorLog.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_AcctProcessorLog
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_AcctProcessorLog 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_AcctSchema.java b/org.adempiere.base/src/org/compiere/model/I_C_AcctSchema.java
index b7a5bee275..b75a52510f 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_AcctSchema.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_AcctSchema.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_AcctSchema
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_AcctSchema 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_AcctSchema_Default.java b/org.adempiere.base/src/org/compiere/model/I_C_AcctSchema_Default.java
index ff95c74669..49c3b4f6d9 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_AcctSchema_Default.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_AcctSchema_Default.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_AcctSchema_Default
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_AcctSchema_Default 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_AcctSchema_Element.java b/org.adempiere.base/src/org/compiere/model/I_C_AcctSchema_Element.java
index 503483ac0e..f3e3a860fd 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_AcctSchema_Element.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_AcctSchema_Element.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_AcctSchema_Element
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_AcctSchema_Element 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_AcctSchema_GL.java b/org.adempiere.base/src/org/compiere/model/I_C_AcctSchema_GL.java
index e40e219032..bd3753d7a5 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_AcctSchema_GL.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_AcctSchema_GL.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_AcctSchema_GL
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_AcctSchema_GL 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Activity.java b/org.adempiere.base/src/org/compiere/model/I_C_Activity.java
index 320f783576..8e8f6ac249 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Activity.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Activity.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Activity
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Activity 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_AddressTransaction.java b/org.adempiere.base/src/org/compiere/model/I_C_AddressTransaction.java
index e19abb2efd..c8fbd4196c 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_AddressTransaction.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_AddressTransaction.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_AddressTransaction
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_AddressTransaction 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_AddressValidation.java b/org.adempiere.base/src/org/compiere/model/I_C_AddressValidation.java
index 73c4cb2ae2..2ffb7547e3 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_AddressValidation.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_AddressValidation.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_AddressValidation
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_AddressValidation 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_AddressValidationCfg.java b/org.adempiere.base/src/org/compiere/model/I_C_AddressValidationCfg.java
index c05feef319..999d97bc6c 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_AddressValidationCfg.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_AddressValidationCfg.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_AddressValidationCfg
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_AddressValidationCfg 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_AllocationHdr.java b/org.adempiere.base/src/org/compiere/model/I_C_AllocationHdr.java
index 44b5a5bfe3..d476157969 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_AllocationHdr.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_AllocationHdr.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_AllocationHdr
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_AllocationHdr 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_AllocationLine.java b/org.adempiere.base/src/org/compiere/model/I_C_AllocationLine.java
index 1ede5e0dcd..d9e8c089ef 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_AllocationLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_AllocationLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_AllocationLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_AllocationLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_BP_BankAccount.java b/org.adempiere.base/src/org/compiere/model/I_C_BP_BankAccount.java
index ba198d4586..8a3d015d84 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_BP_BankAccount.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_BP_BankAccount.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BP_BankAccount
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_BP_BankAccount 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_BP_Customer_Acct.java b/org.adempiere.base/src/org/compiere/model/I_C_BP_Customer_Acct.java
index bc75eea6dd..afa97d8066 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_BP_Customer_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_BP_Customer_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BP_Customer_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_BP_Customer_Acct 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_BP_EDI.java b/org.adempiere.base/src/org/compiere/model/I_C_BP_EDI.java
index 10c796950e..b020ac8270 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_BP_EDI.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_BP_EDI.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BP_EDI
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_BP_EDI 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_BP_Employee_Acct.java b/org.adempiere.base/src/org/compiere/model/I_C_BP_Employee_Acct.java
index 2374a35cd7..af196295ef 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_BP_Employee_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_BP_Employee_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BP_Employee_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_BP_Employee_Acct 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_BP_Group.java b/org.adempiere.base/src/org/compiere/model/I_C_BP_Group.java
index 72e3fd5a7b..514f82d5ec 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_BP_Group.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_BP_Group.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BP_Group
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_BP_Group 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_BP_Group_Acct.java b/org.adempiere.base/src/org/compiere/model/I_C_BP_Group_Acct.java
index afb86006a1..4e11c4dcb6 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_BP_Group_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_BP_Group_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BP_Group_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_BP_Group_Acct 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_BP_Relation.java b/org.adempiere.base/src/org/compiere/model/I_C_BP_Relation.java
index 01ce4ece05..d9140c1be6 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_BP_Relation.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_BP_Relation.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BP_Relation
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_BP_Relation 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_BP_ShippingAcct.java b/org.adempiere.base/src/org/compiere/model/I_C_BP_ShippingAcct.java
index 979d6ae580..39366429ca 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_BP_ShippingAcct.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_BP_ShippingAcct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BP_ShippingAcct
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_BP_ShippingAcct 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_BP_Vendor_Acct.java b/org.adempiere.base/src/org/compiere/model/I_C_BP_Vendor_Acct.java
index a36cb7caf7..e0bc1f3bfd 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_BP_Vendor_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_BP_Vendor_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BP_Vendor_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_BP_Vendor_Acct 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_BP_Withholding.java b/org.adempiere.base/src/org/compiere/model/I_C_BP_Withholding.java
index 3f5a5a3ab8..f70ca42580 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_BP_Withholding.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_BP_Withholding.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BP_Withholding
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_BP_Withholding 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_BPartner.java b/org.adempiere.base/src/org/compiere/model/I_C_BPartner.java
index 3fdb866b83..d912402b7e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_BPartner.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_BPartner.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BPartner
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_BPartner 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_BPartner_Location.java b/org.adempiere.base/src/org/compiere/model/I_C_BPartner_Location.java
index 04175bcecd..7c1801854b 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_BPartner_Location.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_BPartner_Location.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BPartner_Location
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_BPartner_Location 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_BPartner_Product.java b/org.adempiere.base/src/org/compiere/model/I_C_BPartner_Product.java
index fafc5642d9..4cc796eb2a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_BPartner_Product.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_BPartner_Product.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BPartner_Product
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_BPartner_Product 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Bank.java b/org.adempiere.base/src/org/compiere/model/I_C_Bank.java
index 5e6d44223f..e59016d061 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Bank.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Bank.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Bank
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Bank 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_BankAccount.java b/org.adempiere.base/src/org/compiere/model/I_C_BankAccount.java
index b9a51ca505..e741014da7 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_BankAccount.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_BankAccount.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BankAccount
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_BankAccount 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_BankAccountDoc.java b/org.adempiere.base/src/org/compiere/model/I_C_BankAccountDoc.java
index 168ba3f0fc..7489b72d6a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_BankAccountDoc.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_BankAccountDoc.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BankAccountDoc
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_BankAccountDoc 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_BankAccount_Acct.java b/org.adempiere.base/src/org/compiere/model/I_C_BankAccount_Acct.java
index 6cf0294253..512a8b3a75 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_BankAccount_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_BankAccount_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BankAccount_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_BankAccount_Acct 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_BankAccount_Processor.java b/org.adempiere.base/src/org/compiere/model/I_C_BankAccount_Processor.java
index 4b32a817ea..5d4889f3f8 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_BankAccount_Processor.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_BankAccount_Processor.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BankAccount_Processor
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_BankAccount_Processor 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_BankStatement.java b/org.adempiere.base/src/org/compiere/model/I_C_BankStatement.java
index 31d8a169bb..db2bbe6c3b 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_BankStatement.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_BankStatement.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BankStatement
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_BankStatement 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_BankStatementLine.java b/org.adempiere.base/src/org/compiere/model/I_C_BankStatementLine.java
index 1a2c770783..7234212812 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_BankStatementLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_BankStatementLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BankStatementLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_BankStatementLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_BankStatementLoader.java b/org.adempiere.base/src/org/compiere/model/I_C_BankStatementLoader.java
index 86c2095a51..f896d1a363 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_BankStatementLoader.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_BankStatementLoader.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BankStatementLoader
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_BankStatementLoader 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_BankStatementMatcher.java b/org.adempiere.base/src/org/compiere/model/I_C_BankStatementMatcher.java
index 915858206b..36d29a6bf9 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_BankStatementMatcher.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_BankStatementMatcher.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BankStatementMatcher
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_BankStatementMatcher 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Calendar.java b/org.adempiere.base/src/org/compiere/model/I_C_Calendar.java
index 01d20d96ac..e84046e288 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Calendar.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Calendar.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Calendar
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Calendar 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Campaign.java b/org.adempiere.base/src/org/compiere/model/I_C_Campaign.java
index ac049a2a6e..d67aad1afc 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Campaign.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Campaign.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Campaign
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Campaign 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Cash.java b/org.adempiere.base/src/org/compiere/model/I_C_Cash.java
index f4008bbaf1..92eb0f722a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Cash.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Cash.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Cash
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Cash 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_CashBook.java b/org.adempiere.base/src/org/compiere/model/I_C_CashBook.java
index 182aabbb5a..e850dde328 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_CashBook.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_CashBook.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_CashBook
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_CashBook 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_CashBook_Acct.java b/org.adempiere.base/src/org/compiere/model/I_C_CashBook_Acct.java
index 074d05bdeb..af43740913 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_CashBook_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_CashBook_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_CashBook_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_CashBook_Acct 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_CashLine.java b/org.adempiere.base/src/org/compiere/model/I_C_CashLine.java
index 4e0b92d40a..a381e2600d 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_CashLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_CashLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_CashLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_CashLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_CashPlan.java b/org.adempiere.base/src/org/compiere/model/I_C_CashPlan.java
index 907b65c177..c08b63dd46 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_CashPlan.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_CashPlan.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_CashPlan
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_CashPlan 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_CashPlanLine.java b/org.adempiere.base/src/org/compiere/model/I_C_CashPlanLine.java
index d377d7e122..d87f182b93 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_CashPlanLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_CashPlanLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_CashPlanLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_CashPlanLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Channel.java b/org.adempiere.base/src/org/compiere/model/I_C_Channel.java
index 96a6819186..b22bf1e0f9 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Channel.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Channel.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Channel
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Channel 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Charge.java b/org.adempiere.base/src/org/compiere/model/I_C_Charge.java
index 3a27711982..4178aee4af 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Charge.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Charge.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Charge
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Charge 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_ChargeType.java b/org.adempiere.base/src/org/compiere/model/I_C_ChargeType.java
index 1cde22a934..0da8b58bb6 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_ChargeType.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_ChargeType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_ChargeType
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_ChargeType 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_ChargeType_DocType.java b/org.adempiere.base/src/org/compiere/model/I_C_ChargeType_DocType.java
index 898cca4304..4ac31fbdb7 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_ChargeType_DocType.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_ChargeType_DocType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_ChargeType_DocType
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_ChargeType_DocType 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Charge_Acct.java b/org.adempiere.base/src/org/compiere/model/I_C_Charge_Acct.java
index e718fafd2b..32a74036d1 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Charge_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Charge_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Charge_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Charge_Acct 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_City.java b/org.adempiere.base/src/org/compiere/model/I_C_City.java
index ab789730f9..0cbc6d432a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_City.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_City.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_City
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_City 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Commission.java b/org.adempiere.base/src/org/compiere/model/I_C_Commission.java
index 81e5e2b225..09f1cf5caf 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Commission.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Commission.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Commission
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Commission 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_CommissionAmt.java b/org.adempiere.base/src/org/compiere/model/I_C_CommissionAmt.java
index 8345848ae9..af8d313df8 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_CommissionAmt.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_CommissionAmt.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_CommissionAmt
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_CommissionAmt 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_CommissionDetail.java b/org.adempiere.base/src/org/compiere/model/I_C_CommissionDetail.java
index 7fe24d441e..9665758c4c 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_CommissionDetail.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_CommissionDetail.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_CommissionDetail
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_CommissionDetail 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_CommissionLine.java b/org.adempiere.base/src/org/compiere/model/I_C_CommissionLine.java
index 94fd7b32f7..ec6b370881 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_CommissionLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_CommissionLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_CommissionLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_CommissionLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_CommissionRun.java b/org.adempiere.base/src/org/compiere/model/I_C_CommissionRun.java
index 80ffe8a4f4..37212f455a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_CommissionRun.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_CommissionRun.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_CommissionRun
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_CommissionRun 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_ContactActivity.java b/org.adempiere.base/src/org/compiere/model/I_C_ContactActivity.java
index c92df0f133..84e9cc4007 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_ContactActivity.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_ContactActivity.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_ContactActivity
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_ContactActivity 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_ConversionType.java b/org.adempiere.base/src/org/compiere/model/I_C_ConversionType.java
index ab6c9a54a7..059e6d81f0 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_ConversionType.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_ConversionType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_ConversionType
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_ConversionType 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Conversion_Rate.java b/org.adempiere.base/src/org/compiere/model/I_C_Conversion_Rate.java
index 10dafe2a70..7c4fc85c54 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Conversion_Rate.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Conversion_Rate.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Conversion_Rate
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Conversion_Rate 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Country.java b/org.adempiere.base/src/org/compiere/model/I_C_Country.java
index 5c803ae859..f5f8a56bbf 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Country.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Country.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Country
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Country 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_CountryGroup.java b/org.adempiere.base/src/org/compiere/model/I_C_CountryGroup.java
index 8bef7ee216..0397e94fba 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_CountryGroup.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_CountryGroup.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_CountryGroup
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_CountryGroup 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_CountryGroupCountry.java b/org.adempiere.base/src/org/compiere/model/I_C_CountryGroupCountry.java
index 37a144905c..9163cebece 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_CountryGroupCountry.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_CountryGroupCountry.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_CountryGroupCountry
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_CountryGroupCountry 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Currency.java b/org.adempiere.base/src/org/compiere/model/I_C_Currency.java
index 86ed836c3a..b1e2c2ce59 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Currency.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Currency.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Currency
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Currency 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Currency_Acct.java b/org.adempiere.base/src/org/compiere/model/I_C_Currency_Acct.java
index 60d5704245..d9697862ea 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Currency_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Currency_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Currency_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Currency_Acct 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Cycle.java b/org.adempiere.base/src/org/compiere/model/I_C_Cycle.java
index a100af220c..131a8789f5 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Cycle.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Cycle.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Cycle
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Cycle 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_CyclePhase.java b/org.adempiere.base/src/org/compiere/model/I_C_CyclePhase.java
index 0f3a4722f6..306b5bcb65 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_CyclePhase.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_CyclePhase.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_CyclePhase
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_CyclePhase 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_CycleStep.java b/org.adempiere.base/src/org/compiere/model/I_C_CycleStep.java
index f839a85988..5713d86a7a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_CycleStep.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_CycleStep.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_CycleStep
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_CycleStep 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_DepositBatch.java b/org.adempiere.base/src/org/compiere/model/I_C_DepositBatch.java
index 45c851e3cd..47c9e68e3a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_DepositBatch.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_DepositBatch.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_DepositBatch
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_DepositBatch 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_DepositBatchLine.java b/org.adempiere.base/src/org/compiere/model/I_C_DepositBatchLine.java
index 6d93386d14..1dfb910727 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_DepositBatchLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_DepositBatchLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_DepositBatchLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_DepositBatchLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_DocType.java b/org.adempiere.base/src/org/compiere/model/I_C_DocType.java
index a0188e43e8..59c35c844b 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_DocType.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_DocType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_DocType
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_DocType 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_DocTypeCounter.java b/org.adempiere.base/src/org/compiere/model/I_C_DocTypeCounter.java
index 92bd47b38f..f5d8a23b09 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_DocTypeCounter.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_DocTypeCounter.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_DocTypeCounter
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_DocTypeCounter 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Dunning.java b/org.adempiere.base/src/org/compiere/model/I_C_Dunning.java
index 236e8214ef..46226fd993 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Dunning.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Dunning.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Dunning
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Dunning 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_DunningLevel.java b/org.adempiere.base/src/org/compiere/model/I_C_DunningLevel.java
index 0fa9aa8764..2bb2a6e592 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_DunningLevel.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_DunningLevel.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_DunningLevel
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_DunningLevel 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_DunningRun.java b/org.adempiere.base/src/org/compiere/model/I_C_DunningRun.java
index 3756460ea6..ce41d780fb 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_DunningRun.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_DunningRun.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_DunningRun
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_DunningRun 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_DunningRunEntry.java b/org.adempiere.base/src/org/compiere/model/I_C_DunningRunEntry.java
index 864e37ab6c..9a51e50e19 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_DunningRunEntry.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_DunningRunEntry.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_DunningRunEntry
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_DunningRunEntry 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_DunningRunLine.java b/org.adempiere.base/src/org/compiere/model/I_C_DunningRunLine.java
index 9eead87ad7..ed563b4476 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_DunningRunLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_DunningRunLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_DunningRunLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_DunningRunLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Element.java b/org.adempiere.base/src/org/compiere/model/I_C_Element.java
index 8eac6cb7b3..b2100f37bc 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Element.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Element.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Element
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Element 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_ElementValue.java b/org.adempiere.base/src/org/compiere/model/I_C_ElementValue.java
index d422e41f4a..2d0b3370cb 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_ElementValue.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_ElementValue.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_ElementValue
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_ElementValue 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Greeting.java b/org.adempiere.base/src/org/compiere/model/I_C_Greeting.java
index 6b0ef2b152..16a32c3639 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Greeting.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Greeting.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Greeting
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Greeting 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_InterOrg_Acct.java b/org.adempiere.base/src/org/compiere/model/I_C_InterOrg_Acct.java
index 7cdd4a2145..922381c6b9 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_InterOrg_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_InterOrg_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_InterOrg_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_InterOrg_Acct 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Invoice.java b/org.adempiere.base/src/org/compiere/model/I_C_Invoice.java
index 2c3c2aef02..c79dca0707 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Invoice.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Invoice.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Invoice
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Invoice 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_InvoiceBatch.java b/org.adempiere.base/src/org/compiere/model/I_C_InvoiceBatch.java
index eb2acc7310..6113c8c95f 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_InvoiceBatch.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_InvoiceBatch.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_InvoiceBatch
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_InvoiceBatch 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_InvoiceBatchLine.java b/org.adempiere.base/src/org/compiere/model/I_C_InvoiceBatchLine.java
index 56de1282bf..20c4385f98 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_InvoiceBatchLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_InvoiceBatchLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_InvoiceBatchLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_InvoiceBatchLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_InvoiceLine.java b/org.adempiere.base/src/org/compiere/model/I_C_InvoiceLine.java
index a095032b98..d1d248e8f9 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_InvoiceLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_InvoiceLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_InvoiceLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_InvoiceLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_InvoicePaySchedule.java b/org.adempiere.base/src/org/compiere/model/I_C_InvoicePaySchedule.java
index cddf3c616a..8a8a646dce 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_InvoicePaySchedule.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_InvoicePaySchedule.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_InvoicePaySchedule
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_InvoicePaySchedule 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_InvoiceSchedule.java b/org.adempiere.base/src/org/compiere/model/I_C_InvoiceSchedule.java
index fa5cf31887..9184d9970f 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_InvoiceSchedule.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_InvoiceSchedule.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_InvoiceSchedule
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_InvoiceSchedule 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_InvoiceTax.java b/org.adempiere.base/src/org/compiere/model/I_C_InvoiceTax.java
index c5be4ea74a..b130485a77 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_InvoiceTax.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_InvoiceTax.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_InvoiceTax
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_InvoiceTax 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Job.java b/org.adempiere.base/src/org/compiere/model/I_C_Job.java
index 2fca0089f6..4d6fba609c 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Job.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Job.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Job
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Job 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_JobAssignment.java b/org.adempiere.base/src/org/compiere/model/I_C_JobAssignment.java
index 4f95e494df..318f523a38 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_JobAssignment.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_JobAssignment.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_JobAssignment
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_JobAssignment 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_JobCategory.java b/org.adempiere.base/src/org/compiere/model/I_C_JobCategory.java
index c625b0c35f..7179282b6a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_JobCategory.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_JobCategory.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_JobCategory
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_JobCategory 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_JobRemuneration.java b/org.adempiere.base/src/org/compiere/model/I_C_JobRemuneration.java
index 79fa8c8ce4..135b94baca 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_JobRemuneration.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_JobRemuneration.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_JobRemuneration
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_JobRemuneration 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_LandedCost.java b/org.adempiere.base/src/org/compiere/model/I_C_LandedCost.java
index 0bafa1783e..102a38261d 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_LandedCost.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_LandedCost.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_LandedCost
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_LandedCost 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_LandedCostAllocation.java b/org.adempiere.base/src/org/compiere/model/I_C_LandedCostAllocation.java
index 3d5ecc1157..d2fd693264 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_LandedCostAllocation.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_LandedCostAllocation.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_LandedCostAllocation
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_LandedCostAllocation 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Location.java b/org.adempiere.base/src/org/compiere/model/I_C_Location.java
index 9798afd46d..755b986512 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Location.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Location.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Location
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Location 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_NonBusinessDay.java b/org.adempiere.base/src/org/compiere/model/I_C_NonBusinessDay.java
index d1eb4d8d28..8e38ac74fb 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_NonBusinessDay.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_NonBusinessDay.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_NonBusinessDay
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_NonBusinessDay 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_OnlineTrxHistory.java b/org.adempiere.base/src/org/compiere/model/I_C_OnlineTrxHistory.java
index 9556d84df3..b5921a3bbd 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_OnlineTrxHistory.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_OnlineTrxHistory.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_OnlineTrxHistory
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_OnlineTrxHistory 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Opportunity.java b/org.adempiere.base/src/org/compiere/model/I_C_Opportunity.java
index b3c7b92d39..176361bb36 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Opportunity.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Opportunity.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Opportunity
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Opportunity 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Order.java b/org.adempiere.base/src/org/compiere/model/I_C_Order.java
index add03c93f8..c8df91a9d7 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Order.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Order.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Order
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Order 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_OrderLandedCost.java b/org.adempiere.base/src/org/compiere/model/I_C_OrderLandedCost.java
index 1be2db95d1..1481ed830b 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_OrderLandedCost.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_OrderLandedCost.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_OrderLandedCost
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_OrderLandedCost 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_OrderLandedCostAllocation.java b/org.adempiere.base/src/org/compiere/model/I_C_OrderLandedCostAllocation.java
index 6098cc0690..2f21e95b5b 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_OrderLandedCostAllocation.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_OrderLandedCostAllocation.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_OrderLandedCostAllocation
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_OrderLandedCostAllocation 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_OrderLine.java b/org.adempiere.base/src/org/compiere/model/I_C_OrderLine.java
index 685f26e5b8..a80b4566cc 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_OrderLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_OrderLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_OrderLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_OrderLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_OrderPaySchedule.java b/org.adempiere.base/src/org/compiere/model/I_C_OrderPaySchedule.java
index 11e98503cd..fb42eeb41b 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_OrderPaySchedule.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_OrderPaySchedule.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_OrderPaySchedule
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_OrderPaySchedule 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_OrderSource.java b/org.adempiere.base/src/org/compiere/model/I_C_OrderSource.java
index c71eeb52b7..2a1a05bd88 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_OrderSource.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_OrderSource.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_OrderSource
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_OrderSource 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_OrderTax.java b/org.adempiere.base/src/org/compiere/model/I_C_OrderTax.java
index 0f7152548a..e6049e400d 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_OrderTax.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_OrderTax.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_OrderTax
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_OrderTax 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_OrgAssignment.java b/org.adempiere.base/src/org/compiere/model/I_C_OrgAssignment.java
index ba00a613e3..120ef0fa83 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_OrgAssignment.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_OrgAssignment.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_OrgAssignment
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_OrgAssignment 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_POS.java b/org.adempiere.base/src/org/compiere/model/I_C_POS.java
index 0f10bdbc7f..c5e1f2d115 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_POS.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_POS.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_POS
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_POS 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_POSKey.java b/org.adempiere.base/src/org/compiere/model/I_C_POSKey.java
index fc7dd3218f..2049ea4ba7 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_POSKey.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_POSKey.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_POSKey
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_POSKey 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_POSKeyLayout.java b/org.adempiere.base/src/org/compiere/model/I_C_POSKeyLayout.java
index f44604930a..279cba2067 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_POSKeyLayout.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_POSKeyLayout.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_POSKeyLayout
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_POSKeyLayout 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_POSPayment.java b/org.adempiere.base/src/org/compiere/model/I_C_POSPayment.java
index 860339b1ce..2be7b64efd 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_POSPayment.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_POSPayment.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_POSPayment
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_POSPayment 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_POSTenderType.java b/org.adempiere.base/src/org/compiere/model/I_C_POSTenderType.java
index 5cc37a355b..11cd2a8cb7 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_POSTenderType.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_POSTenderType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_POSTenderType
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_POSTenderType 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_PaySchedule.java b/org.adempiere.base/src/org/compiere/model/I_C_PaySchedule.java
index b1feb9683e..4b436ae07f 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_PaySchedule.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_PaySchedule.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_PaySchedule
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_PaySchedule 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_PaySelection.java b/org.adempiere.base/src/org/compiere/model/I_C_PaySelection.java
index 6971424f3f..29804473a3 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_PaySelection.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_PaySelection.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_PaySelection
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_PaySelection 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_PaySelectionCheck.java b/org.adempiere.base/src/org/compiere/model/I_C_PaySelectionCheck.java
index 3650e86d5e..5cfc0ec6e4 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_PaySelectionCheck.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_PaySelectionCheck.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_PaySelectionCheck
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_PaySelectionCheck 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_PaySelectionLine.java b/org.adempiere.base/src/org/compiere/model/I_C_PaySelectionLine.java
index dca19a65f6..1a3cd48bdf 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_PaySelectionLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_PaySelectionLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_PaySelectionLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_PaySelectionLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Payment.java b/org.adempiere.base/src/org/compiere/model/I_C_Payment.java
index c17c0cc06b..87298fd5e1 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Payment.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Payment.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Payment
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Payment 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_PaymentAllocate.java b/org.adempiere.base/src/org/compiere/model/I_C_PaymentAllocate.java
index 6bb1a52e83..1979186d47 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_PaymentAllocate.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_PaymentAllocate.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_PaymentAllocate
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_PaymentAllocate 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_PaymentBatch.java b/org.adempiere.base/src/org/compiere/model/I_C_PaymentBatch.java
index 37cca1cace..9694c8ed63 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_PaymentBatch.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_PaymentBatch.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_PaymentBatch
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_PaymentBatch 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_PaymentProcessor.java b/org.adempiere.base/src/org/compiere/model/I_C_PaymentProcessor.java
index 5a26861380..c14cbfbe0a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_PaymentProcessor.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_PaymentProcessor.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_PaymentProcessor
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_PaymentProcessor 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_PaymentTerm.java b/org.adempiere.base/src/org/compiere/model/I_C_PaymentTerm.java
index 97aa80a711..81c24ce817 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_PaymentTerm.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_PaymentTerm.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_PaymentTerm
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_PaymentTerm 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_PaymentTransaction.java b/org.adempiere.base/src/org/compiere/model/I_C_PaymentTransaction.java
index 4ddbf5e7d2..8495fcf96e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_PaymentTransaction.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_PaymentTransaction.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_PaymentTransaction
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_PaymentTransaction 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Period.java b/org.adempiere.base/src/org/compiere/model/I_C_Period.java
index 4a72e501ac..0710f1923e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Period.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Period.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Period
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Period 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_PeriodControl.java b/org.adempiere.base/src/org/compiere/model/I_C_PeriodControl.java
index 3dc1a2df06..e208b4c9bc 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_PeriodControl.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_PeriodControl.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_PeriodControl
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_PeriodControl 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Phase.java b/org.adempiere.base/src/org/compiere/model/I_C_Phase.java
index 34f5b80fda..179f34631f 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Phase.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Phase.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Phase
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Phase 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Project.java b/org.adempiere.base/src/org/compiere/model/I_C_Project.java
index c0e04c9ed8..06912c5fed 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Project.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Project.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Project
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Project 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_ProjectIssue.java b/org.adempiere.base/src/org/compiere/model/I_C_ProjectIssue.java
index e123762b81..559fde8bf4 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_ProjectIssue.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_ProjectIssue.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_ProjectIssue
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_ProjectIssue 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_ProjectIssueMA.java b/org.adempiere.base/src/org/compiere/model/I_C_ProjectIssueMA.java
index 7cc29abe49..bda0d5f5d4 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_ProjectIssueMA.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_ProjectIssueMA.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_ProjectIssueMA
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_ProjectIssueMA 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_ProjectLine.java b/org.adempiere.base/src/org/compiere/model/I_C_ProjectLine.java
index 8339713862..fca8b08dd7 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_ProjectLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_ProjectLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_ProjectLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_ProjectLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_ProjectPhase.java b/org.adempiere.base/src/org/compiere/model/I_C_ProjectPhase.java
index 29968d524e..3c43c493fc 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_ProjectPhase.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_ProjectPhase.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_ProjectPhase
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_ProjectPhase 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_ProjectTask.java b/org.adempiere.base/src/org/compiere/model/I_C_ProjectTask.java
index 7837cf0eed..ab0801b3ae 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_ProjectTask.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_ProjectTask.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_ProjectTask
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_ProjectTask 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_ProjectType.java b/org.adempiere.base/src/org/compiere/model/I_C_ProjectType.java
index 74f193153a..80c9b6c46c 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_ProjectType.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_ProjectType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_ProjectType
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_ProjectType 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Project_Acct.java b/org.adempiere.base/src/org/compiere/model/I_C_Project_Acct.java
index cb4ab85032..699e7f00b7 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Project_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Project_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Project_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Project_Acct 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Recurring.java b/org.adempiere.base/src/org/compiere/model/I_C_Recurring.java
index ee9a64324a..ae2c1d1fc0 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Recurring.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Recurring.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Recurring
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Recurring 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_RecurringGroup.java b/org.adempiere.base/src/org/compiere/model/I_C_RecurringGroup.java
index ad95eb2c4c..a35fc5c269 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_RecurringGroup.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_RecurringGroup.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_RecurringGroup
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_RecurringGroup 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Recurring_Run.java b/org.adempiere.base/src/org/compiere/model/I_C_Recurring_Run.java
index 3b1dc7e864..b6d3855dac 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Recurring_Run.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Recurring_Run.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Recurring_Run
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Recurring_Run 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Region.java b/org.adempiere.base/src/org/compiere/model/I_C_Region.java
index babb28d8cf..90f14e2460 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Region.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Region.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Region
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Region 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Remuneration.java b/org.adempiere.base/src/org/compiere/model/I_C_Remuneration.java
index 9597daa324..cb652fc7ce 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Remuneration.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Remuneration.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Remuneration
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Remuneration 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_RevenueRecognition.java b/org.adempiere.base/src/org/compiere/model/I_C_RevenueRecognition.java
index 864c7b28eb..cb3e3665d2 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_RevenueRecognition.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_RevenueRecognition.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_RevenueRecognition
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_RevenueRecognition 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_RevenueRecognition_Plan.java b/org.adempiere.base/src/org/compiere/model/I_C_RevenueRecognition_Plan.java
index d6ed68f5a6..66eddce30f 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_RevenueRecognition_Plan.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_RevenueRecognition_Plan.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_RevenueRecognition_Plan
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_RevenueRecognition_Plan 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_RevenueRecognition_Run.java b/org.adempiere.base/src/org/compiere/model/I_C_RevenueRecognition_Run.java
index 31567fa1b7..623d937ad2 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_RevenueRecognition_Run.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_RevenueRecognition_Run.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_RevenueRecognition_Run
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_RevenueRecognition_Run 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_RfQ.java b/org.adempiere.base/src/org/compiere/model/I_C_RfQ.java
index e774e5cab8..50a6ef2f58 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_RfQ.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_RfQ.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_RfQ
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_RfQ 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_RfQLine.java b/org.adempiere.base/src/org/compiere/model/I_C_RfQLine.java
index 082f7fd494..7f2baf1721 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_RfQLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_RfQLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_RfQLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_RfQLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_RfQLineQty.java b/org.adempiere.base/src/org/compiere/model/I_C_RfQLineQty.java
index 515ce38746..70e7848f1e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_RfQLineQty.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_RfQLineQty.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_RfQLineQty
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_RfQLineQty 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_RfQResponse.java b/org.adempiere.base/src/org/compiere/model/I_C_RfQResponse.java
index 2b59b883d8..5bd4ef248e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_RfQResponse.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_RfQResponse.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_RfQResponse
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_RfQResponse 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_RfQResponseLine.java b/org.adempiere.base/src/org/compiere/model/I_C_RfQResponseLine.java
index f80b7a3212..2545f746da 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_RfQResponseLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_RfQResponseLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_RfQResponseLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_RfQResponseLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_RfQResponseLineQty.java b/org.adempiere.base/src/org/compiere/model/I_C_RfQResponseLineQty.java
index 2af422a0fc..5c4df1dff1 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_RfQResponseLineQty.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_RfQResponseLineQty.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_RfQResponseLineQty
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_RfQResponseLineQty 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_RfQ_Topic.java b/org.adempiere.base/src/org/compiere/model/I_C_RfQ_Topic.java
index d9540fe235..7351da5c83 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_RfQ_Topic.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_RfQ_Topic.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_RfQ_Topic
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_RfQ_Topic 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_RfQ_TopicSubscriber.java b/org.adempiere.base/src/org/compiere/model/I_C_RfQ_TopicSubscriber.java
index a160c63325..9f424b3913 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_RfQ_TopicSubscriber.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_RfQ_TopicSubscriber.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_RfQ_TopicSubscriber
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_RfQ_TopicSubscriber 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_RfQ_TopicSubscriberOnly.java b/org.adempiere.base/src/org/compiere/model/I_C_RfQ_TopicSubscriberOnly.java
index 9fd36567c6..db2df20c76 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_RfQ_TopicSubscriberOnly.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_RfQ_TopicSubscriberOnly.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_RfQ_TopicSubscriberOnly
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_RfQ_TopicSubscriberOnly 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_SalesRegion.java b/org.adempiere.base/src/org/compiere/model/I_C_SalesRegion.java
index 16af2c8b59..28113a5078 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_SalesRegion.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_SalesRegion.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_SalesRegion
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_SalesRegion 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_SalesStage.java b/org.adempiere.base/src/org/compiere/model/I_C_SalesStage.java
index 671190e753..498a82226c 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_SalesStage.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_SalesStage.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_SalesStage
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_SalesStage 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_ServiceLevel.java b/org.adempiere.base/src/org/compiere/model/I_C_ServiceLevel.java
index af2ecbfbfc..285b99ece1 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_ServiceLevel.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_ServiceLevel.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_ServiceLevel
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_ServiceLevel 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_ServiceLevelLine.java b/org.adempiere.base/src/org/compiere/model/I_C_ServiceLevelLine.java
index e09968a473..da3ea09b3c 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_ServiceLevelLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_ServiceLevelLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_ServiceLevelLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_ServiceLevelLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_SubAcct.java b/org.adempiere.base/src/org/compiere/model/I_C_SubAcct.java
index 8dec3486cd..d3aeb2fb1a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_SubAcct.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_SubAcct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_SubAcct
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_SubAcct 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Subscription.java b/org.adempiere.base/src/org/compiere/model/I_C_Subscription.java
index c8016e5e18..61a4c29fce 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Subscription.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Subscription.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Subscription
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Subscription 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_SubscriptionType.java b/org.adempiere.base/src/org/compiere/model/I_C_SubscriptionType.java
index fb525ce375..25f26e3c3f 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_SubscriptionType.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_SubscriptionType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_SubscriptionType
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_SubscriptionType 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Subscription_Delivery.java b/org.adempiere.base/src/org/compiere/model/I_C_Subscription_Delivery.java
index 9306c45d04..40cd0aa97c 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Subscription_Delivery.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Subscription_Delivery.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Subscription_Delivery
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Subscription_Delivery 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Task.java b/org.adempiere.base/src/org/compiere/model/I_C_Task.java
index 92375db8ee..6435ec8299 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Task.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Task.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Task
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Task 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Tax.java b/org.adempiere.base/src/org/compiere/model/I_C_Tax.java
index 0b5468410c..57850beb5a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Tax.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Tax.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Tax
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Tax 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_TaxCategory.java b/org.adempiere.base/src/org/compiere/model/I_C_TaxCategory.java
index 69f356507e..a2373563bc 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_TaxCategory.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_TaxCategory.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_TaxCategory
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_TaxCategory 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_TaxDeclaration.java b/org.adempiere.base/src/org/compiere/model/I_C_TaxDeclaration.java
index 356bf28ac9..7678a9face 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_TaxDeclaration.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_TaxDeclaration.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_TaxDeclaration
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_TaxDeclaration 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_TaxDeclarationAcct.java b/org.adempiere.base/src/org/compiere/model/I_C_TaxDeclarationAcct.java
index 7b3e52026f..a3db478e26 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_TaxDeclarationAcct.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_TaxDeclarationAcct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_TaxDeclarationAcct
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_TaxDeclarationAcct 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_TaxDeclarationLine.java b/org.adempiere.base/src/org/compiere/model/I_C_TaxDeclarationLine.java
index 389ef830fa..784e5aab70 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_TaxDeclarationLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_TaxDeclarationLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_TaxDeclarationLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_TaxDeclarationLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_TaxPostal.java b/org.adempiere.base/src/org/compiere/model/I_C_TaxPostal.java
index a1ca6ca87a..5247439c33 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_TaxPostal.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_TaxPostal.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_TaxPostal
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_TaxPostal 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_TaxProvider.java b/org.adempiere.base/src/org/compiere/model/I_C_TaxProvider.java
index 11ff89b6a5..b4bef38f4a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_TaxProvider.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_TaxProvider.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_TaxProvider
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_TaxProvider 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_TaxProviderCfg.java b/org.adempiere.base/src/org/compiere/model/I_C_TaxProviderCfg.java
index 57f2ec6c09..e897acbb7b 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_TaxProviderCfg.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_TaxProviderCfg.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_TaxProviderCfg
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_TaxProviderCfg 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Tax_Acct.java b/org.adempiere.base/src/org/compiere/model/I_C_Tax_Acct.java
index 806677a708..c9f2948bb8 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Tax_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Tax_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Tax_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Tax_Acct 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_UOM.java b/org.adempiere.base/src/org/compiere/model/I_C_UOM.java
index 530a219728..cda4e25109 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_UOM.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_UOM.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_UOM
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_UOM 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_UOM_Conversion.java b/org.adempiere.base/src/org/compiere/model/I_C_UOM_Conversion.java
index bb251edfc0..8f0b3be582 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_UOM_Conversion.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_UOM_Conversion.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_UOM_Conversion
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_UOM_Conversion 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_UserRemuneration.java b/org.adempiere.base/src/org/compiere/model/I_C_UserRemuneration.java
index 9977032beb..9e66ad5955 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_UserRemuneration.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_UserRemuneration.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_UserRemuneration
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_UserRemuneration 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_ValidCombination.java b/org.adempiere.base/src/org/compiere/model/I_C_ValidCombination.java
index e00f4e0b1b..38ae0259f1 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_ValidCombination.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_ValidCombination.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_ValidCombination
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_ValidCombination 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Withholding.java b/org.adempiere.base/src/org/compiere/model/I_C_Withholding.java
index 26151b5a3a..48cddaf22f 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Withholding.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Withholding.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Withholding
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Withholding 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Withholding_Acct.java b/org.adempiere.base/src/org/compiere/model/I_C_Withholding_Acct.java
index f02db17a6b..2cb28ba334 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Withholding_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Withholding_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Withholding_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Withholding_Acct 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Year.java b/org.adempiere.base/src/org/compiere/model/I_C_Year.java
index 7362e664a9..99b0d4d843 100644
--- a/org.adempiere.base/src/org/compiere/model/I_C_Year.java
+++ b/org.adempiere.base/src/org/compiere/model/I_C_Year.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Year
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_C_Year 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_EXP_Format.java b/org.adempiere.base/src/org/compiere/model/I_EXP_Format.java
index 604422fe26..480d1b7c48 100644
--- a/org.adempiere.base/src/org/compiere/model/I_EXP_Format.java
+++ b/org.adempiere.base/src/org/compiere/model/I_EXP_Format.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for EXP_Format
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_EXP_Format 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_EXP_FormatLine.java b/org.adempiere.base/src/org/compiere/model/I_EXP_FormatLine.java
index 31d59813ca..c8c5593581 100644
--- a/org.adempiere.base/src/org/compiere/model/I_EXP_FormatLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_EXP_FormatLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for EXP_FormatLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_EXP_FormatLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_EXP_Processor.java b/org.adempiere.base/src/org/compiere/model/I_EXP_Processor.java
index d8abe3003f..9cfd6dbb26 100644
--- a/org.adempiere.base/src/org/compiere/model/I_EXP_Processor.java
+++ b/org.adempiere.base/src/org/compiere/model/I_EXP_Processor.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for EXP_Processor
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_EXP_Processor 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_EXP_ProcessorParameter.java b/org.adempiere.base/src/org/compiere/model/I_EXP_ProcessorParameter.java
index b2afa30596..9571ea6ee3 100644
--- a/org.adempiere.base/src/org/compiere/model/I_EXP_ProcessorParameter.java
+++ b/org.adempiere.base/src/org/compiere/model/I_EXP_ProcessorParameter.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for EXP_ProcessorParameter
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_EXP_ProcessorParameter 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_EXP_Processor_Type.java b/org.adempiere.base/src/org/compiere/model/I_EXP_Processor_Type.java
index 4f032042c1..6d13659c3f 100644
--- a/org.adempiere.base/src/org/compiere/model/I_EXP_Processor_Type.java
+++ b/org.adempiere.base/src/org/compiere/model/I_EXP_Processor_Type.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for EXP_Processor_Type
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_EXP_Processor_Type 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_Fact_Acct.java b/org.adempiere.base/src/org/compiere/model/I_Fact_Acct.java
index 243161653e..6e134d1758 100644
--- a/org.adempiere.base/src/org/compiere/model/I_Fact_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/I_Fact_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for Fact_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_Fact_Acct 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_Fact_Acct_Summary.java b/org.adempiere.base/src/org/compiere/model/I_Fact_Acct_Summary.java
index 3afee28144..1fddbf6bc2 100644
--- a/org.adempiere.base/src/org/compiere/model/I_Fact_Acct_Summary.java
+++ b/org.adempiere.base/src/org/compiere/model/I_Fact_Acct_Summary.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for Fact_Acct_Summary
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_Fact_Acct_Summary 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_Fact_Reconciliation.java b/org.adempiere.base/src/org/compiere/model/I_Fact_Reconciliation.java
index 7df1926ffb..38f74a5afa 100644
--- a/org.adempiere.base/src/org/compiere/model/I_Fact_Reconciliation.java
+++ b/org.adempiere.base/src/org/compiere/model/I_Fact_Reconciliation.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for Fact_Reconciliation
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_Fact_Reconciliation 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_GL_Budget.java b/org.adempiere.base/src/org/compiere/model/I_GL_Budget.java
index 0e81708156..6b53a2a66f 100644
--- a/org.adempiere.base/src/org/compiere/model/I_GL_Budget.java
+++ b/org.adempiere.base/src/org/compiere/model/I_GL_Budget.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for GL_Budget
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_GL_Budget 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_GL_BudgetControl.java b/org.adempiere.base/src/org/compiere/model/I_GL_BudgetControl.java
index 00f06af087..d7434b746d 100644
--- a/org.adempiere.base/src/org/compiere/model/I_GL_BudgetControl.java
+++ b/org.adempiere.base/src/org/compiere/model/I_GL_BudgetControl.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for GL_BudgetControl
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_GL_BudgetControl 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_GL_Category.java b/org.adempiere.base/src/org/compiere/model/I_GL_Category.java
index 199a5547e4..4b89d66506 100644
--- a/org.adempiere.base/src/org/compiere/model/I_GL_Category.java
+++ b/org.adempiere.base/src/org/compiere/model/I_GL_Category.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for GL_Category
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_GL_Category 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_GL_Distribution.java b/org.adempiere.base/src/org/compiere/model/I_GL_Distribution.java
index 4a38a9d52e..ed25c86353 100644
--- a/org.adempiere.base/src/org/compiere/model/I_GL_Distribution.java
+++ b/org.adempiere.base/src/org/compiere/model/I_GL_Distribution.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for GL_Distribution
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_GL_Distribution 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_GL_DistributionLine.java b/org.adempiere.base/src/org/compiere/model/I_GL_DistributionLine.java
index e20a0ec3ee..e41301582f 100644
--- a/org.adempiere.base/src/org/compiere/model/I_GL_DistributionLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_GL_DistributionLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for GL_DistributionLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_GL_DistributionLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_GL_Fund.java b/org.adempiere.base/src/org/compiere/model/I_GL_Fund.java
index f13850d90e..ca9e5f866d 100644
--- a/org.adempiere.base/src/org/compiere/model/I_GL_Fund.java
+++ b/org.adempiere.base/src/org/compiere/model/I_GL_Fund.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for GL_Fund
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_GL_Fund 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_GL_FundRestriction.java b/org.adempiere.base/src/org/compiere/model/I_GL_FundRestriction.java
index 7a79584cce..f6cb2e96c3 100644
--- a/org.adempiere.base/src/org/compiere/model/I_GL_FundRestriction.java
+++ b/org.adempiere.base/src/org/compiere/model/I_GL_FundRestriction.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for GL_FundRestriction
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_GL_FundRestriction 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_GL_Journal.java b/org.adempiere.base/src/org/compiere/model/I_GL_Journal.java
index 1225d82702..9965285cc1 100644
--- a/org.adempiere.base/src/org/compiere/model/I_GL_Journal.java
+++ b/org.adempiere.base/src/org/compiere/model/I_GL_Journal.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for GL_Journal
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_GL_Journal 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_GL_JournalBatch.java b/org.adempiere.base/src/org/compiere/model/I_GL_JournalBatch.java
index ac5a42d79b..fa1ae74ea7 100644
--- a/org.adempiere.base/src/org/compiere/model/I_GL_JournalBatch.java
+++ b/org.adempiere.base/src/org/compiere/model/I_GL_JournalBatch.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for GL_JournalBatch
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_GL_JournalBatch 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_GL_JournalGenerator.java b/org.adempiere.base/src/org/compiere/model/I_GL_JournalGenerator.java
index d627fc390f..2d3ce819d2 100644
--- a/org.adempiere.base/src/org/compiere/model/I_GL_JournalGenerator.java
+++ b/org.adempiere.base/src/org/compiere/model/I_GL_JournalGenerator.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for GL_JournalGenerator
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_GL_JournalGenerator 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_GL_JournalGeneratorLine.java b/org.adempiere.base/src/org/compiere/model/I_GL_JournalGeneratorLine.java
index 408699f15d..1f41698632 100644
--- a/org.adempiere.base/src/org/compiere/model/I_GL_JournalGeneratorLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_GL_JournalGeneratorLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for GL_JournalGeneratorLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_GL_JournalGeneratorLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_GL_JournalGeneratorSource.java b/org.adempiere.base/src/org/compiere/model/I_GL_JournalGeneratorSource.java
index 52ef54e97f..a29aeb9d25 100644
--- a/org.adempiere.base/src/org/compiere/model/I_GL_JournalGeneratorSource.java
+++ b/org.adempiere.base/src/org/compiere/model/I_GL_JournalGeneratorSource.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for GL_JournalGeneratorSource
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_GL_JournalGeneratorSource 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_GL_JournalLine.java b/org.adempiere.base/src/org/compiere/model/I_GL_JournalLine.java
index 17b1380789..bd500a156a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_GL_JournalLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_GL_JournalLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for GL_JournalLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_GL_JournalLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_IMP_Processor.java b/org.adempiere.base/src/org/compiere/model/I_IMP_Processor.java
index 74b00fe652..c22e6d7079 100644
--- a/org.adempiere.base/src/org/compiere/model/I_IMP_Processor.java
+++ b/org.adempiere.base/src/org/compiere/model/I_IMP_Processor.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for IMP_Processor
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_IMP_Processor 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_IMP_ProcessorLog.java b/org.adempiere.base/src/org/compiere/model/I_IMP_ProcessorLog.java
index 2604d7c5df..6bf59b0f9d 100644
--- a/org.adempiere.base/src/org/compiere/model/I_IMP_ProcessorLog.java
+++ b/org.adempiere.base/src/org/compiere/model/I_IMP_ProcessorLog.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for IMP_ProcessorLog
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_IMP_ProcessorLog 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_IMP_ProcessorParameter.java b/org.adempiere.base/src/org/compiere/model/I_IMP_ProcessorParameter.java
index d1d629f16f..52e1277f0a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_IMP_ProcessorParameter.java
+++ b/org.adempiere.base/src/org/compiere/model/I_IMP_ProcessorParameter.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for IMP_ProcessorParameter
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_IMP_ProcessorParameter 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_IMP_Processor_Type.java b/org.adempiere.base/src/org/compiere/model/I_IMP_Processor_Type.java
index b5437cdfbb..7364a19ee4 100644
--- a/org.adempiere.base/src/org/compiere/model/I_IMP_Processor_Type.java
+++ b/org.adempiere.base/src/org/compiere/model/I_IMP_Processor_Type.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for IMP_Processor_Type
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_IMP_Processor_Type 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_I_Asset.java b/org.adempiere.base/src/org/compiere/model/I_I_Asset.java
index 74d373bac7..c6ab0e5461 100644
--- a/org.adempiere.base/src/org/compiere/model/I_I_Asset.java
+++ b/org.adempiere.base/src/org/compiere/model/I_I_Asset.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_Asset
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_I_Asset 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_I_BPartner.java b/org.adempiere.base/src/org/compiere/model/I_I_BPartner.java
index ac222ab566..5418f06b81 100644
--- a/org.adempiere.base/src/org/compiere/model/I_I_BPartner.java
+++ b/org.adempiere.base/src/org/compiere/model/I_I_BPartner.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_BPartner
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_I_BPartner 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_I_BankStatement.java b/org.adempiere.base/src/org/compiere/model/I_I_BankStatement.java
index debf6e72bd..b583c1f0ab 100644
--- a/org.adempiere.base/src/org/compiere/model/I_I_BankStatement.java
+++ b/org.adempiere.base/src/org/compiere/model/I_I_BankStatement.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_BankStatement
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_I_BankStatement 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_I_Conversion_Rate.java b/org.adempiere.base/src/org/compiere/model/I_I_Conversion_Rate.java
index 176cb1513a..f4f4738efc 100644
--- a/org.adempiere.base/src/org/compiere/model/I_I_Conversion_Rate.java
+++ b/org.adempiere.base/src/org/compiere/model/I_I_Conversion_Rate.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_Conversion_Rate
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_I_Conversion_Rate 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_I_ElementValue.java b/org.adempiere.base/src/org/compiere/model/I_I_ElementValue.java
index 2acdede2e6..941b053fd1 100644
--- a/org.adempiere.base/src/org/compiere/model/I_I_ElementValue.java
+++ b/org.adempiere.base/src/org/compiere/model/I_I_ElementValue.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_ElementValue
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_I_ElementValue 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_I_FAJournal.java b/org.adempiere.base/src/org/compiere/model/I_I_FAJournal.java
index 61c1d90f36..677dfb1a22 100644
--- a/org.adempiere.base/src/org/compiere/model/I_I_FAJournal.java
+++ b/org.adempiere.base/src/org/compiere/model/I_I_FAJournal.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_FAJournal
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_I_FAJournal 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_I_FixedAsset.java b/org.adempiere.base/src/org/compiere/model/I_I_FixedAsset.java
index 16061b4032..ea64afe85d 100644
--- a/org.adempiere.base/src/org/compiere/model/I_I_FixedAsset.java
+++ b/org.adempiere.base/src/org/compiere/model/I_I_FixedAsset.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_FixedAsset
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_I_FixedAsset 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_I_GLJournal.java b/org.adempiere.base/src/org/compiere/model/I_I_GLJournal.java
index 2c2fb87540..8169291644 100644
--- a/org.adempiere.base/src/org/compiere/model/I_I_GLJournal.java
+++ b/org.adempiere.base/src/org/compiere/model/I_I_GLJournal.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_GLJournal
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_I_GLJournal 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_I_InOutLineConfirm.java b/org.adempiere.base/src/org/compiere/model/I_I_InOutLineConfirm.java
index 05f57cb952..eb9fb01e85 100644
--- a/org.adempiere.base/src/org/compiere/model/I_I_InOutLineConfirm.java
+++ b/org.adempiere.base/src/org/compiere/model/I_I_InOutLineConfirm.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_InOutLineConfirm
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_I_InOutLineConfirm 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_I_Inventory.java b/org.adempiere.base/src/org/compiere/model/I_I_Inventory.java
index 681fcf6fb7..0177517377 100644
--- a/org.adempiere.base/src/org/compiere/model/I_I_Inventory.java
+++ b/org.adempiere.base/src/org/compiere/model/I_I_Inventory.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_Inventory
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_I_Inventory 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_I_Invoice.java b/org.adempiere.base/src/org/compiere/model/I_I_Invoice.java
index 0a372e7c36..9c923aa4e7 100644
--- a/org.adempiere.base/src/org/compiere/model/I_I_Invoice.java
+++ b/org.adempiere.base/src/org/compiere/model/I_I_Invoice.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_Invoice
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_I_Invoice 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_I_Order.java b/org.adempiere.base/src/org/compiere/model/I_I_Order.java
index 010c1991a4..95a1a4cebe 100644
--- a/org.adempiere.base/src/org/compiere/model/I_I_Order.java
+++ b/org.adempiere.base/src/org/compiere/model/I_I_Order.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_Order
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_I_Order 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_I_Payment.java b/org.adempiere.base/src/org/compiere/model/I_I_Payment.java
index d02088a7ae..9969227eec 100644
--- a/org.adempiere.base/src/org/compiere/model/I_I_Payment.java
+++ b/org.adempiere.base/src/org/compiere/model/I_I_Payment.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_Payment
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_I_Payment 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_I_PriceList.java b/org.adempiere.base/src/org/compiere/model/I_I_PriceList.java
index 8e48697e05..f81cec0f6e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_I_PriceList.java
+++ b/org.adempiere.base/src/org/compiere/model/I_I_PriceList.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_PriceList
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_I_PriceList 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_I_Product.java b/org.adempiere.base/src/org/compiere/model/I_I_Product.java
index d589995814..505d829789 100644
--- a/org.adempiere.base/src/org/compiere/model/I_I_Product.java
+++ b/org.adempiere.base/src/org/compiere/model/I_I_Product.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_Product
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_I_Product 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_I_ReportLine.java b/org.adempiere.base/src/org/compiere/model/I_I_ReportLine.java
index 91dcf6cd85..7f0f218ea4 100644
--- a/org.adempiere.base/src/org/compiere/model/I_I_ReportLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_I_ReportLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_ReportLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_I_ReportLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_K_Category.java b/org.adempiere.base/src/org/compiere/model/I_K_Category.java
index a200ac7d8a..48c3c92567 100644
--- a/org.adempiere.base/src/org/compiere/model/I_K_Category.java
+++ b/org.adempiere.base/src/org/compiere/model/I_K_Category.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for K_Category
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_K_Category 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_K_CategoryValue.java b/org.adempiere.base/src/org/compiere/model/I_K_CategoryValue.java
index 0e05c60bea..bf028eb6d7 100644
--- a/org.adempiere.base/src/org/compiere/model/I_K_CategoryValue.java
+++ b/org.adempiere.base/src/org/compiere/model/I_K_CategoryValue.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for K_CategoryValue
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_K_CategoryValue 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_K_Comment.java b/org.adempiere.base/src/org/compiere/model/I_K_Comment.java
index 6aed130e71..4e7aec1d89 100644
--- a/org.adempiere.base/src/org/compiere/model/I_K_Comment.java
+++ b/org.adempiere.base/src/org/compiere/model/I_K_Comment.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for K_Comment
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_K_Comment 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_K_Entry.java b/org.adempiere.base/src/org/compiere/model/I_K_Entry.java
index b92362a640..169494ef95 100644
--- a/org.adempiere.base/src/org/compiere/model/I_K_Entry.java
+++ b/org.adempiere.base/src/org/compiere/model/I_K_Entry.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for K_Entry
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_K_Entry 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_K_EntryCategory.java b/org.adempiere.base/src/org/compiere/model/I_K_EntryCategory.java
index dbdbc75960..3f55357dd2 100644
--- a/org.adempiere.base/src/org/compiere/model/I_K_EntryCategory.java
+++ b/org.adempiere.base/src/org/compiere/model/I_K_EntryCategory.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for K_EntryCategory
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_K_EntryCategory 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_K_EntryRelated.java b/org.adempiere.base/src/org/compiere/model/I_K_EntryRelated.java
index 4abe111ccb..2366772201 100644
--- a/org.adempiere.base/src/org/compiere/model/I_K_EntryRelated.java
+++ b/org.adempiere.base/src/org/compiere/model/I_K_EntryRelated.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for K_EntryRelated
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_K_EntryRelated 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_K_Index.java b/org.adempiere.base/src/org/compiere/model/I_K_Index.java
index cd9379baf9..d474a83b6e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_K_Index.java
+++ b/org.adempiere.base/src/org/compiere/model/I_K_Index.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for K_Index
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_K_Index 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_K_IndexLog.java b/org.adempiere.base/src/org/compiere/model/I_K_IndexLog.java
index bdb4f5b719..35bfe900ef 100644
--- a/org.adempiere.base/src/org/compiere/model/I_K_IndexLog.java
+++ b/org.adempiere.base/src/org/compiere/model/I_K_IndexLog.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for K_IndexLog
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_K_IndexLog 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_K_IndexStop.java b/org.adempiere.base/src/org/compiere/model/I_K_IndexStop.java
index c53ad96849..dfb087ced5 100644
--- a/org.adempiere.base/src/org/compiere/model/I_K_IndexStop.java
+++ b/org.adempiere.base/src/org/compiere/model/I_K_IndexStop.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for K_IndexStop
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_K_IndexStop 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_K_Source.java b/org.adempiere.base/src/org/compiere/model/I_K_Source.java
index 57c02018f9..2fd2fa8c48 100644
--- a/org.adempiere.base/src/org/compiere/model/I_K_Source.java
+++ b/org.adempiere.base/src/org/compiere/model/I_K_Source.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for K_Source
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_K_Source 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_K_Synonym.java b/org.adempiere.base/src/org/compiere/model/I_K_Synonym.java
index fd8fe3a327..6798aa0439 100644
--- a/org.adempiere.base/src/org/compiere/model/I_K_Synonym.java
+++ b/org.adempiere.base/src/org/compiere/model/I_K_Synonym.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for K_Synonym
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_K_Synonym 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_K_Topic.java b/org.adempiere.base/src/org/compiere/model/I_K_Topic.java
index e69571342e..7601cd71bd 100644
--- a/org.adempiere.base/src/org/compiere/model/I_K_Topic.java
+++ b/org.adempiere.base/src/org/compiere/model/I_K_Topic.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for K_Topic
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_K_Topic 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_K_Type.java b/org.adempiere.base/src/org/compiere/model/I_K_Type.java
index 4d0b522dc8..fa56ff2f79 100644
--- a/org.adempiere.base/src/org/compiere/model/I_K_Type.java
+++ b/org.adempiere.base/src/org/compiere/model/I_K_Type.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for K_Type
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_K_Type 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Attribute.java b/org.adempiere.base/src/org/compiere/model/I_M_Attribute.java
index 46dceb22af..b1e4b97a30 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_Attribute.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_Attribute.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Attribute
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_Attribute 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_AttributeInstance.java b/org.adempiere.base/src/org/compiere/model/I_M_AttributeInstance.java
index b67a330a2b..5b0207c25e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_AttributeInstance.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_AttributeInstance.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_AttributeInstance
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_AttributeInstance 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_AttributeSearch.java b/org.adempiere.base/src/org/compiere/model/I_M_AttributeSearch.java
index 513b265e66..9bf8e3e142 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_AttributeSearch.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_AttributeSearch.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_AttributeSearch
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_AttributeSearch 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_AttributeSet.java b/org.adempiere.base/src/org/compiere/model/I_M_AttributeSet.java
index 73f8f04295..2cb315b77e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_AttributeSet.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_AttributeSet.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_AttributeSet
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_AttributeSet 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_AttributeSetExclude.java b/org.adempiere.base/src/org/compiere/model/I_M_AttributeSetExclude.java
index 668226131d..1b19d6bb38 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_AttributeSetExclude.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_AttributeSetExclude.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_AttributeSetExclude
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_AttributeSetExclude 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_AttributeSetInstance.java b/org.adempiere.base/src/org/compiere/model/I_M_AttributeSetInstance.java
index cb23001ace..5fe206e2e8 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_AttributeSetInstance.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_AttributeSetInstance.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_AttributeSetInstance
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_AttributeSetInstance 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_AttributeUse.java b/org.adempiere.base/src/org/compiere/model/I_M_AttributeUse.java
index 5c1601508a..a81201ff6b 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_AttributeUse.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_AttributeUse.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_AttributeUse
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_AttributeUse 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_AttributeValue.java b/org.adempiere.base/src/org/compiere/model/I_M_AttributeValue.java
index b6c0b8d6ba..0906024501 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_AttributeValue.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_AttributeValue.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_AttributeValue
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_AttributeValue 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_BOM.java b/org.adempiere.base/src/org/compiere/model/I_M_BOM.java
index 8c95bd2e31..52c6f0154c 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_BOM.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_BOM.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_BOM
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_BOM 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_BOMAlternative.java b/org.adempiere.base/src/org/compiere/model/I_M_BOMAlternative.java
index 355b2b9808..861759d0d3 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_BOMAlternative.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_BOMAlternative.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_BOMAlternative
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_BOMAlternative 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_BOMProduct.java b/org.adempiere.base/src/org/compiere/model/I_M_BOMProduct.java
index 6d29b53dc2..5464ce57af 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_BOMProduct.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_BOMProduct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_BOMProduct
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_BOMProduct 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_BP_Price.java b/org.adempiere.base/src/org/compiere/model/I_M_BP_Price.java
index c6cd7bcc6f..b214bd2e16 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_BP_Price.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_BP_Price.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_BP_Price
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_BP_Price 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ChangeNotice.java b/org.adempiere.base/src/org/compiere/model/I_M_ChangeNotice.java
index 4f871dbe43..34dff843ec 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_ChangeNotice.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_ChangeNotice.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ChangeNotice
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_ChangeNotice 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ChangeRequest.java b/org.adempiere.base/src/org/compiere/model/I_M_ChangeRequest.java
index 7b812a764c..e0b03daf73 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_ChangeRequest.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_ChangeRequest.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ChangeRequest
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_ChangeRequest 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_CommodityShipment.java b/org.adempiere.base/src/org/compiere/model/I_M_CommodityShipment.java
index 149a5ba242..398a973c30 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_CommodityShipment.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_CommodityShipment.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_CommodityShipment
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_CommodityShipment 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Cost.java b/org.adempiere.base/src/org/compiere/model/I_M_Cost.java
index 4c7f946da8..9b37302213 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_Cost.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_Cost.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Cost
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_Cost 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_CostDetail.java b/org.adempiere.base/src/org/compiere/model/I_M_CostDetail.java
index b4a41431ff..55cca956e1 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_CostDetail.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_CostDetail.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_CostDetail
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_CostDetail 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_CostElement.java b/org.adempiere.base/src/org/compiere/model/I_M_CostElement.java
index 9d438295c5..c62a9a13f4 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_CostElement.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_CostElement.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_CostElement
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_CostElement 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_CostHistory.java b/org.adempiere.base/src/org/compiere/model/I_M_CostHistory.java
index 5ae0fc399b..9cd3147aaa 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_CostHistory.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_CostHistory.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_CostHistory
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_CostHistory 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_CostQueue.java b/org.adempiere.base/src/org/compiere/model/I_M_CostQueue.java
index 17f9fdd6b0..f11b1abecd 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_CostQueue.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_CostQueue.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_CostQueue
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_CostQueue 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_CostType.java b/org.adempiere.base/src/org/compiere/model/I_M_CostType.java
index ea9ddead7a..d2c02369b8 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_CostType.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_CostType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_CostType
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_CostType 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Demand.java b/org.adempiere.base/src/org/compiere/model/I_M_Demand.java
index f67839ed4c..35bf8be63d 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_Demand.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_Demand.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Demand
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_Demand 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_DemandDetail.java b/org.adempiere.base/src/org/compiere/model/I_M_DemandDetail.java
index 650c64fad2..9f1e77d9ad 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_DemandDetail.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_DemandDetail.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_DemandDetail
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_DemandDetail 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_DemandLine.java b/org.adempiere.base/src/org/compiere/model/I_M_DemandLine.java
index 4e242c6f40..470420fe01 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_DemandLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_DemandLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_DemandLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_DemandLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_DiscountSchema.java b/org.adempiere.base/src/org/compiere/model/I_M_DiscountSchema.java
index 9d226eaf47..a588f6c6b5 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_DiscountSchema.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_DiscountSchema.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_DiscountSchema
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_DiscountSchema 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_DiscountSchemaBreak.java b/org.adempiere.base/src/org/compiere/model/I_M_DiscountSchemaBreak.java
index 16f4686aa9..f04852a99f 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_DiscountSchemaBreak.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_DiscountSchemaBreak.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_DiscountSchemaBreak
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_DiscountSchemaBreak 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_DiscountSchemaLine.java b/org.adempiere.base/src/org/compiere/model/I_M_DiscountSchemaLine.java
index d7955df043..53d38d277d 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_DiscountSchemaLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_DiscountSchemaLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_DiscountSchemaLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_DiscountSchemaLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_DistributionList.java b/org.adempiere.base/src/org/compiere/model/I_M_DistributionList.java
index e75b24e7ca..15c06a29bd 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_DistributionList.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_DistributionList.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_DistributionList
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_DistributionList 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_DistributionListLine.java b/org.adempiere.base/src/org/compiere/model/I_M_DistributionListLine.java
index 81a271b1a7..cd68ae9766 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_DistributionListLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_DistributionListLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_DistributionListLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_DistributionListLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_DistributionRun.java b/org.adempiere.base/src/org/compiere/model/I_M_DistributionRun.java
index 255b8ef372..f1f600c373 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_DistributionRun.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_DistributionRun.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_DistributionRun
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_DistributionRun 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_DistributionRunLine.java b/org.adempiere.base/src/org/compiere/model/I_M_DistributionRunLine.java
index bcc9e00b77..bfa0668d20 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_DistributionRunLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_DistributionRunLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_DistributionRunLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_DistributionRunLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Forecast.java b/org.adempiere.base/src/org/compiere/model/I_M_Forecast.java
index cd7f6fe298..87932c9e16 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_Forecast.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_Forecast.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Forecast
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_Forecast 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ForecastLine.java b/org.adempiere.base/src/org/compiere/model/I_M_ForecastLine.java
index 786ea2d01c..a10265d002 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_ForecastLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_ForecastLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ForecastLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_ForecastLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Freight.java b/org.adempiere.base/src/org/compiere/model/I_M_Freight.java
index 3272b6b64f..b3bf42659d 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_Freight.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_Freight.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Freight
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_Freight 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_FreightCategory.java b/org.adempiere.base/src/org/compiere/model/I_M_FreightCategory.java
index 4883519f1a..ce130f144e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_FreightCategory.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_FreightCategory.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_FreightCategory
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_FreightCategory 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_InOut.java b/org.adempiere.base/src/org/compiere/model/I_M_InOut.java
index 7a61822a78..b752365d52 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_InOut.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_InOut.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_InOut
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_InOut 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_InOutConfirm.java b/org.adempiere.base/src/org/compiere/model/I_M_InOutConfirm.java
index 9329a763ce..63d4dbc3ae 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_InOutConfirm.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_InOutConfirm.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_InOutConfirm
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_InOutConfirm 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_InOutLine.java b/org.adempiere.base/src/org/compiere/model/I_M_InOutLine.java
index c224fcbd50..ba273eaa1e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_InOutLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_InOutLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_InOutLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_InOutLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_InOutLineConfirm.java b/org.adempiere.base/src/org/compiere/model/I_M_InOutLineConfirm.java
index c70e2517fe..abcc21eebe 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_InOutLineConfirm.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_InOutLineConfirm.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_InOutLineConfirm
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_InOutLineConfirm 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_InOutLineMA.java b/org.adempiere.base/src/org/compiere/model/I_M_InOutLineMA.java
index 362ffb763d..0d3004fe19 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_InOutLineMA.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_InOutLineMA.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_InOutLineMA
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_InOutLineMA 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Inventory.java b/org.adempiere.base/src/org/compiere/model/I_M_Inventory.java
index de270e423e..9fa3cd6fb5 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_Inventory.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_Inventory.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Inventory
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_Inventory 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_InventoryLine.java b/org.adempiere.base/src/org/compiere/model/I_M_InventoryLine.java
index 8cba13b561..e864f91bc1 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_InventoryLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_InventoryLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_InventoryLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_InventoryLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_InventoryLineMA.java b/org.adempiere.base/src/org/compiere/model/I_M_InventoryLineMA.java
index 1d81f6d18b..0d911205ab 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_InventoryLineMA.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_InventoryLineMA.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_InventoryLineMA
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_InventoryLineMA 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Locator.java b/org.adempiere.base/src/org/compiere/model/I_M_Locator.java
index 2e0c5f2686..9bdb095f57 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_Locator.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_Locator.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Locator
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_Locator 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_LocatorType.java b/org.adempiere.base/src/org/compiere/model/I_M_LocatorType.java
index 7cbb1fe044..3dd4c12ce9 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_LocatorType.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_LocatorType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_LocatorType
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_LocatorType 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Lot.java b/org.adempiere.base/src/org/compiere/model/I_M_Lot.java
index 58949011cb..0661e079fa 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_Lot.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_Lot.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Lot
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_Lot 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_LotCtl.java b/org.adempiere.base/src/org/compiere/model/I_M_LotCtl.java
index ec639ce162..91692c9ba3 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_LotCtl.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_LotCtl.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_LotCtl
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_LotCtl 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_LotCtlExclude.java b/org.adempiere.base/src/org/compiere/model/I_M_LotCtlExclude.java
index a6c3acfea4..4d67708c5a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_LotCtlExclude.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_LotCtlExclude.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_LotCtlExclude
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_LotCtlExclude 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_MatchInv.java b/org.adempiere.base/src/org/compiere/model/I_M_MatchInv.java
index ca7d2f6bf7..6389f776cb 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_MatchInv.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_MatchInv.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_MatchInv
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_MatchInv 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_MatchPO.java b/org.adempiere.base/src/org/compiere/model/I_M_MatchPO.java
index cca657f160..f6d65c5973 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_MatchPO.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_MatchPO.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_MatchPO
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_MatchPO 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Movement.java b/org.adempiere.base/src/org/compiere/model/I_M_Movement.java
index 0947c3d60a..01a666adf3 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_Movement.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_Movement.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Movement
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_Movement 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_MovementConfirm.java b/org.adempiere.base/src/org/compiere/model/I_M_MovementConfirm.java
index 3845c5741e..19cc32d467 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_MovementConfirm.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_MovementConfirm.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_MovementConfirm
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_MovementConfirm 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_MovementLine.java b/org.adempiere.base/src/org/compiere/model/I_M_MovementLine.java
index 144dba6a9e..fdf286ef67 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_MovementLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_MovementLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_MovementLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_MovementLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_MovementLineConfirm.java b/org.adempiere.base/src/org/compiere/model/I_M_MovementLineConfirm.java
index 4d92920c0f..20ab3de8a9 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_MovementLineConfirm.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_MovementLineConfirm.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_MovementLineConfirm
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_MovementLineConfirm 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_MovementLineMA.java b/org.adempiere.base/src/org/compiere/model/I_M_MovementLineMA.java
index e770990bff..1322096597 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_MovementLineMA.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_MovementLineMA.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_MovementLineMA
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_MovementLineMA 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_OperationResource.java b/org.adempiere.base/src/org/compiere/model/I_M_OperationResource.java
index 8213fb7999..c3322d2582 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_OperationResource.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_OperationResource.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_OperationResource
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_OperationResource 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Package.java b/org.adempiere.base/src/org/compiere/model/I_M_Package.java
index 80cd4c556c..24e3fc4d5f 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_Package.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_Package.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Package
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_Package 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_PackageLine.java b/org.adempiere.base/src/org/compiere/model/I_M_PackageLine.java
index 5020c7923c..f4a21c82c6 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_PackageLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_PackageLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_PackageLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_PackageLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_PackageMPS.java b/org.adempiere.base/src/org/compiere/model/I_M_PackageMPS.java
index 131dc389f3..598d6434a9 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_PackageMPS.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_PackageMPS.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_PackageMPS
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_PackageMPS 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_PartType.java b/org.adempiere.base/src/org/compiere/model/I_M_PartType.java
index 398d463108..55e91cf85f 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_PartType.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_PartType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_PartType
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_PartType 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_PerpetualInv.java b/org.adempiere.base/src/org/compiere/model/I_M_PerpetualInv.java
index 9f3e3247df..ecfad7ec92 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_PerpetualInv.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_PerpetualInv.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_PerpetualInv
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_PerpetualInv 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_PriceList.java b/org.adempiere.base/src/org/compiere/model/I_M_PriceList.java
index 7e61a92f89..9406636eae 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_PriceList.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_PriceList.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_PriceList
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_PriceList 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_PriceList_Version.java b/org.adempiere.base/src/org/compiere/model/I_M_PriceList_Version.java
index a95f9f2adf..ef871c92a5 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_PriceList_Version.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_PriceList_Version.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_PriceList_Version
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_PriceList_Version 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Product.java b/org.adempiere.base/src/org/compiere/model/I_M_Product.java
index f93ca35d81..7015ec8f9b 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_Product.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_Product.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Product
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_Product 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ProductDownload.java b/org.adempiere.base/src/org/compiere/model/I_M_ProductDownload.java
index 18896df1ce..df0bd6fbd0 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_ProductDownload.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_ProductDownload.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ProductDownload
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_ProductDownload 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ProductOperation.java b/org.adempiere.base/src/org/compiere/model/I_M_ProductOperation.java
index 77b19a0720..e3efc2700c 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_ProductOperation.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_ProductOperation.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ProductOperation
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_ProductOperation 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ProductPrice.java b/org.adempiere.base/src/org/compiere/model/I_M_ProductPrice.java
index 818761ba3e..d8b85d7258 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_ProductPrice.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_ProductPrice.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ProductPrice
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_ProductPrice 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ProductPriceVendorBreak.java b/org.adempiere.base/src/org/compiere/model/I_M_ProductPriceVendorBreak.java
index 5a52afd556..015dd47c47 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_ProductPriceVendorBreak.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_ProductPriceVendorBreak.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ProductPriceVendorBreak
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_ProductPriceVendorBreak 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Product_Acct.java b/org.adempiere.base/src/org/compiere/model/I_M_Product_Acct.java
index 0f37586822..080c5e3d2a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_Product_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_Product_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Product_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_Product_Acct 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Product_BOM.java b/org.adempiere.base/src/org/compiere/model/I_M_Product_BOM.java
index d71b013efe..46dabdad17 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_Product_BOM.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_Product_BOM.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Product_BOM
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_Product_BOM 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Product_Category.java b/org.adempiere.base/src/org/compiere/model/I_M_Product_Category.java
index 0d3c50250d..42af50d9e3 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_Product_Category.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_Product_Category.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Product_Category
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_Product_Category 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Product_Category_Acct.java b/org.adempiere.base/src/org/compiere/model/I_M_Product_Category_Acct.java
index 3c78f83af7..8f26ecdf62 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_Product_Category_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_Product_Category_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Product_Category_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_Product_Category_Acct 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Product_PO.java b/org.adempiere.base/src/org/compiere/model/I_M_Product_PO.java
index 761f2db810..1ae9682fa4 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_Product_PO.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_Product_PO.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Product_PO
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_Product_PO 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Product_QualityTest.java b/org.adempiere.base/src/org/compiere/model/I_M_Product_QualityTest.java
index cc210e3b78..1183ade8b1 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_Product_QualityTest.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_Product_QualityTest.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Product_QualityTest
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_Product_QualityTest 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Production.java b/org.adempiere.base/src/org/compiere/model/I_M_Production.java
index d1b645d840..2ddb988a11 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_Production.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_Production.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Production
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_Production 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ProductionLine.java b/org.adempiere.base/src/org/compiere/model/I_M_ProductionLine.java
index efdc0028d8..f2d266854a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_ProductionLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_ProductionLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ProductionLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_ProductionLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ProductionLineMA.java b/org.adempiere.base/src/org/compiere/model/I_M_ProductionLineMA.java
index fd9580bd4f..e1f05b4b02 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_ProductionLineMA.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_ProductionLineMA.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ProductionLineMA
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_ProductionLineMA 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ProductionPlan.java b/org.adempiere.base/src/org/compiere/model/I_M_ProductionPlan.java
index 83de89c7c8..998cdfa423 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_ProductionPlan.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_ProductionPlan.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ProductionPlan
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_ProductionPlan 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Promotion.java b/org.adempiere.base/src/org/compiere/model/I_M_Promotion.java
index 59a1b74d75..da3dacfc44 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_Promotion.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_Promotion.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Promotion
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_Promotion 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_PromotionDistribution.java b/org.adempiere.base/src/org/compiere/model/I_M_PromotionDistribution.java
index a6d5f912db..88cedaafc2 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_PromotionDistribution.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_PromotionDistribution.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_PromotionDistribution
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_PromotionDistribution 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_PromotionGroup.java b/org.adempiere.base/src/org/compiere/model/I_M_PromotionGroup.java
index 944e306152..318c938860 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_PromotionGroup.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_PromotionGroup.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_PromotionGroup
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_PromotionGroup 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_PromotionGroupLine.java b/org.adempiere.base/src/org/compiere/model/I_M_PromotionGroupLine.java
index 9dc435eb3f..1aef90d041 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_PromotionGroupLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_PromotionGroupLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_PromotionGroupLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_PromotionGroupLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_PromotionLine.java b/org.adempiere.base/src/org/compiere/model/I_M_PromotionLine.java
index 1eafe7c6be..af3d4cf7f6 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_PromotionLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_PromotionLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_PromotionLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_PromotionLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_PromotionPreCondition.java b/org.adempiere.base/src/org/compiere/model/I_M_PromotionPreCondition.java
index c6eae70dbd..59eaf1556d 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_PromotionPreCondition.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_PromotionPreCondition.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_PromotionPreCondition
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_PromotionPreCondition 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_PromotionReward.java b/org.adempiere.base/src/org/compiere/model/I_M_PromotionReward.java
index 593c44477f..4ca9bd7b16 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_PromotionReward.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_PromotionReward.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_PromotionReward
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_PromotionReward 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_QualityTest.java b/org.adempiere.base/src/org/compiere/model/I_M_QualityTest.java
index 2960de9b0e..8901d7e81a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_QualityTest.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_QualityTest.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_QualityTest
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_QualityTest 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_QualityTestResult.java b/org.adempiere.base/src/org/compiere/model/I_M_QualityTestResult.java
index 667d2c330a..97492f2df7 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_QualityTestResult.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_QualityTestResult.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_QualityTestResult
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_QualityTestResult 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_RMA.java b/org.adempiere.base/src/org/compiere/model/I_M_RMA.java
index e30de01508..7c26bb5522 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_RMA.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_RMA.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_RMA
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_RMA 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_RMALine.java b/org.adempiere.base/src/org/compiere/model/I_M_RMALine.java
index 876d07d24e..6dce181ee9 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_RMALine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_RMALine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_RMALine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_RMALine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_RMATax.java b/org.adempiere.base/src/org/compiere/model/I_M_RMATax.java
index 465fb8557a..6ae7b3201f 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_RMATax.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_RMATax.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_RMATax
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_RMATax 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_RMAType.java b/org.adempiere.base/src/org/compiere/model/I_M_RMAType.java
index c3615f9266..b9476cddb8 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_RMAType.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_RMAType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_RMAType
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_RMAType 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_RelatedProduct.java b/org.adempiere.base/src/org/compiere/model/I_M_RelatedProduct.java
index 4f581c85d4..68677b2492 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_RelatedProduct.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_RelatedProduct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_RelatedProduct
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_RelatedProduct 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Replenish.java b/org.adempiere.base/src/org/compiere/model/I_M_Replenish.java
index ec4f41eda6..e9dbc46a2d 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_Replenish.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_Replenish.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Replenish
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_Replenish 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Requisition.java b/org.adempiere.base/src/org/compiere/model/I_M_Requisition.java
index f12a18ff6b..b35d7f9d66 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_Requisition.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_Requisition.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Requisition
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_Requisition 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_RequisitionLine.java b/org.adempiere.base/src/org/compiere/model/I_M_RequisitionLine.java
index 2e4beaf076..44f4f2a229 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_RequisitionLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_RequisitionLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_RequisitionLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_RequisitionLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_SerNoCtl.java b/org.adempiere.base/src/org/compiere/model/I_M_SerNoCtl.java
index 707ade49c0..bdff1454ca 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_SerNoCtl.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_SerNoCtl.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_SerNoCtl
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_SerNoCtl 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_SerNoCtlExclude.java b/org.adempiere.base/src/org/compiere/model/I_M_SerNoCtlExclude.java
index 54d489c5a9..554eaafa78 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_SerNoCtlExclude.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_SerNoCtlExclude.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_SerNoCtlExclude
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_SerNoCtlExclude 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Shipper.java b/org.adempiere.base/src/org/compiere/model/I_M_Shipper.java
index 96889c7b6e..4e99fee06a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_Shipper.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_Shipper.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Shipper
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_Shipper 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ShipperCfg.java b/org.adempiere.base/src/org/compiere/model/I_M_ShipperCfg.java
index deed725193..6f0b7e5b89 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_ShipperCfg.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_ShipperCfg.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ShipperCfg
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_ShipperCfg 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ShipperLabels.java b/org.adempiere.base/src/org/compiere/model/I_M_ShipperLabels.java
index 48d80d87a2..39eac0f5ea 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_ShipperLabels.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_ShipperLabels.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ShipperLabels
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_ShipperLabels 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ShipperLabelsCfg.java b/org.adempiere.base/src/org/compiere/model/I_M_ShipperLabelsCfg.java
index 756d47c3e2..2ab8ea66e5 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_ShipperLabelsCfg.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_ShipperLabelsCfg.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ShipperLabelsCfg
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_ShipperLabelsCfg 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ShipperPackaging.java b/org.adempiere.base/src/org/compiere/model/I_M_ShipperPackaging.java
index 0d37978110..4ee28870f0 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_ShipperPackaging.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_ShipperPackaging.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ShipperPackaging
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_ShipperPackaging 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ShipperPackagingCfg.java b/org.adempiere.base/src/org/compiere/model/I_M_ShipperPackagingCfg.java
index dde963157a..b9b6fc35c9 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_ShipperPackagingCfg.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_ShipperPackagingCfg.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ShipperPackagingCfg
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_ShipperPackagingCfg 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ShipperPickupTypes.java b/org.adempiere.base/src/org/compiere/model/I_M_ShipperPickupTypes.java
index 7e9ee1aa00..25050e52d4 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_ShipperPickupTypes.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_ShipperPickupTypes.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ShipperPickupTypes
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_ShipperPickupTypes 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ShipperPickupTypesCfg.java b/org.adempiere.base/src/org/compiere/model/I_M_ShipperPickupTypesCfg.java
index 07c6a9bf28..eaf966b5d4 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_ShipperPickupTypesCfg.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_ShipperPickupTypesCfg.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ShipperPickupTypesCfg
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_ShipperPickupTypesCfg 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ShippingProcessor.java b/org.adempiere.base/src/org/compiere/model/I_M_ShippingProcessor.java
index b43456bef2..89e28d5205 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_ShippingProcessor.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_ShippingProcessor.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ShippingProcessor
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_ShippingProcessor 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ShippingProcessorCfg.java b/org.adempiere.base/src/org/compiere/model/I_M_ShippingProcessorCfg.java
index 8d1075ab32..617b5cd0fe 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_ShippingProcessorCfg.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_ShippingProcessorCfg.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ShippingProcessorCfg
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_ShippingProcessorCfg 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ShippingTransaction.java b/org.adempiere.base/src/org/compiere/model/I_M_ShippingTransaction.java
index 45e04473f9..c362adbe2c 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_ShippingTransaction.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_ShippingTransaction.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ShippingTransaction
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_ShippingTransaction 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ShippingTransactionLine.java b/org.adempiere.base/src/org/compiere/model/I_M_ShippingTransactionLine.java
index 43e8ce5dc0..1c46226efb 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_ShippingTransactionLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_ShippingTransactionLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ShippingTransactionLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_ShippingTransactionLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_StorageOnHand.java b/org.adempiere.base/src/org/compiere/model/I_M_StorageOnHand.java
index 12dae2d9de..0c2aab7432 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_StorageOnHand.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_StorageOnHand.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_StorageOnHand
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_StorageOnHand 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_StorageReservation.java b/org.adempiere.base/src/org/compiere/model/I_M_StorageReservation.java
index 380638d1ea..3b14ebf1a8 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_StorageReservation.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_StorageReservation.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_StorageReservation
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_StorageReservation 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Substitute.java b/org.adempiere.base/src/org/compiere/model/I_M_Substitute.java
index 15cfa63be0..a16bf98965 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_Substitute.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_Substitute.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Substitute
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_Substitute 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Transaction.java b/org.adempiere.base/src/org/compiere/model/I_M_Transaction.java
index 54617f87da..b68869f704 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_Transaction.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_Transaction.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Transaction
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_Transaction 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_TransactionAllocation.java b/org.adempiere.base/src/org/compiere/model/I_M_TransactionAllocation.java
index 7fb4b35016..732acda0f9 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_TransactionAllocation.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_TransactionAllocation.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_TransactionAllocation
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_TransactionAllocation 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Warehouse.java b/org.adempiere.base/src/org/compiere/model/I_M_Warehouse.java
index 29e8288ccf..e26e13da80 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_Warehouse.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_Warehouse.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Warehouse
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_Warehouse 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Warehouse_Acct.java b/org.adempiere.base/src/org/compiere/model/I_M_Warehouse_Acct.java
index 5e260ecef4..7ab945f84f 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_Warehouse_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_Warehouse_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Warehouse_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_M_Warehouse_Acct 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_PA_Achievement.java b/org.adempiere.base/src/org/compiere/model/I_PA_Achievement.java
index 17decce116..96991fc8c7 100644
--- a/org.adempiere.base/src/org/compiere/model/I_PA_Achievement.java
+++ b/org.adempiere.base/src/org/compiere/model/I_PA_Achievement.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_Achievement
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_PA_Achievement 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_PA_Benchmark.java b/org.adempiere.base/src/org/compiere/model/I_PA_Benchmark.java
index def6d15b4a..f78d44b1fd 100644
--- a/org.adempiere.base/src/org/compiere/model/I_PA_Benchmark.java
+++ b/org.adempiere.base/src/org/compiere/model/I_PA_Benchmark.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_Benchmark
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_PA_Benchmark 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_PA_BenchmarkData.java b/org.adempiere.base/src/org/compiere/model/I_PA_BenchmarkData.java
index afd41ce475..514c9cab7c 100644
--- a/org.adempiere.base/src/org/compiere/model/I_PA_BenchmarkData.java
+++ b/org.adempiere.base/src/org/compiere/model/I_PA_BenchmarkData.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_BenchmarkData
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_PA_BenchmarkData 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_PA_ColorSchema.java b/org.adempiere.base/src/org/compiere/model/I_PA_ColorSchema.java
index fa39035a56..a699d84d93 100644
--- a/org.adempiere.base/src/org/compiere/model/I_PA_ColorSchema.java
+++ b/org.adempiere.base/src/org/compiere/model/I_PA_ColorSchema.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_ColorSchema
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_PA_ColorSchema 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_PA_DashboardContent.java b/org.adempiere.base/src/org/compiere/model/I_PA_DashboardContent.java
index 05e398e808..e5f4132236 100644
--- a/org.adempiere.base/src/org/compiere/model/I_PA_DashboardContent.java
+++ b/org.adempiere.base/src/org/compiere/model/I_PA_DashboardContent.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_DashboardContent
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_PA_DashboardContent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_PA_DashboardContent_Access.java b/org.adempiere.base/src/org/compiere/model/I_PA_DashboardContent_Access.java
index 237f57163a..e54151656d 100644
--- a/org.adempiere.base/src/org/compiere/model/I_PA_DashboardContent_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/I_PA_DashboardContent_Access.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_DashboardContent_Access
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_PA_DashboardContent_Access 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_PA_DashboardPreference.java b/org.adempiere.base/src/org/compiere/model/I_PA_DashboardPreference.java
index 3833b3c0e2..90854b47da 100644
--- a/org.adempiere.base/src/org/compiere/model/I_PA_DashboardPreference.java
+++ b/org.adempiere.base/src/org/compiere/model/I_PA_DashboardPreference.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_DashboardPreference
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_PA_DashboardPreference 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_PA_DocumentStatus.java b/org.adempiere.base/src/org/compiere/model/I_PA_DocumentStatus.java
index 63b778a187..6dac1952be 100644
--- a/org.adempiere.base/src/org/compiere/model/I_PA_DocumentStatus.java
+++ b/org.adempiere.base/src/org/compiere/model/I_PA_DocumentStatus.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_DocumentStatus
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_PA_DocumentStatus 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_PA_Goal.java b/org.adempiere.base/src/org/compiere/model/I_PA_Goal.java
index e59be071fe..7c5c6a980d 100644
--- a/org.adempiere.base/src/org/compiere/model/I_PA_Goal.java
+++ b/org.adempiere.base/src/org/compiere/model/I_PA_Goal.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_Goal
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_PA_Goal 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_PA_GoalRestriction.java b/org.adempiere.base/src/org/compiere/model/I_PA_GoalRestriction.java
index 851bd6f022..1390791b26 100644
--- a/org.adempiere.base/src/org/compiere/model/I_PA_GoalRestriction.java
+++ b/org.adempiere.base/src/org/compiere/model/I_PA_GoalRestriction.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_GoalRestriction
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_PA_GoalRestriction 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_PA_Hierarchy.java b/org.adempiere.base/src/org/compiere/model/I_PA_Hierarchy.java
index f2aace6f8a..a48f0f8cfa 100644
--- a/org.adempiere.base/src/org/compiere/model/I_PA_Hierarchy.java
+++ b/org.adempiere.base/src/org/compiere/model/I_PA_Hierarchy.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_Hierarchy
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_PA_Hierarchy 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_PA_Measure.java b/org.adempiere.base/src/org/compiere/model/I_PA_Measure.java
index 2f2632b957..7c7bee680c 100644
--- a/org.adempiere.base/src/org/compiere/model/I_PA_Measure.java
+++ b/org.adempiere.base/src/org/compiere/model/I_PA_Measure.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_Measure
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_PA_Measure 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_PA_MeasureCalc.java b/org.adempiere.base/src/org/compiere/model/I_PA_MeasureCalc.java
index a5cb92ed67..4586bce02e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_PA_MeasureCalc.java
+++ b/org.adempiere.base/src/org/compiere/model/I_PA_MeasureCalc.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_MeasureCalc
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_PA_MeasureCalc 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_PA_Ratio.java b/org.adempiere.base/src/org/compiere/model/I_PA_Ratio.java
index 2eab2b88f9..06a4567af7 100644
--- a/org.adempiere.base/src/org/compiere/model/I_PA_Ratio.java
+++ b/org.adempiere.base/src/org/compiere/model/I_PA_Ratio.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_Ratio
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_PA_Ratio 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_PA_RatioElement.java b/org.adempiere.base/src/org/compiere/model/I_PA_RatioElement.java
index cc7a5bcdf6..cef51e9545 100644
--- a/org.adempiere.base/src/org/compiere/model/I_PA_RatioElement.java
+++ b/org.adempiere.base/src/org/compiere/model/I_PA_RatioElement.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_RatioElement
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_PA_RatioElement 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_PA_Report.java b/org.adempiere.base/src/org/compiere/model/I_PA_Report.java
index 77d6089cd8..fc21c69727 100644
--- a/org.adempiere.base/src/org/compiere/model/I_PA_Report.java
+++ b/org.adempiere.base/src/org/compiere/model/I_PA_Report.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_Report
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_PA_Report 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_PA_ReportColumn.java b/org.adempiere.base/src/org/compiere/model/I_PA_ReportColumn.java
index 69988d1d93..c8d985ce88 100644
--- a/org.adempiere.base/src/org/compiere/model/I_PA_ReportColumn.java
+++ b/org.adempiere.base/src/org/compiere/model/I_PA_ReportColumn.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_ReportColumn
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_PA_ReportColumn 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_PA_ReportColumnSet.java b/org.adempiere.base/src/org/compiere/model/I_PA_ReportColumnSet.java
index 07f01cc19b..a932589a14 100644
--- a/org.adempiere.base/src/org/compiere/model/I_PA_ReportColumnSet.java
+++ b/org.adempiere.base/src/org/compiere/model/I_PA_ReportColumnSet.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_ReportColumnSet
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_PA_ReportColumnSet 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_PA_ReportCube.java b/org.adempiere.base/src/org/compiere/model/I_PA_ReportCube.java
index 4baf61d99d..dcb6f3c7c8 100644
--- a/org.adempiere.base/src/org/compiere/model/I_PA_ReportCube.java
+++ b/org.adempiere.base/src/org/compiere/model/I_PA_ReportCube.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_ReportCube
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_PA_ReportCube 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_PA_ReportLine.java b/org.adempiere.base/src/org/compiere/model/I_PA_ReportLine.java
index a12bcd07a5..a8e26cd208 100644
--- a/org.adempiere.base/src/org/compiere/model/I_PA_ReportLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_PA_ReportLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_ReportLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_PA_ReportLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_PA_ReportLineSet.java b/org.adempiere.base/src/org/compiere/model/I_PA_ReportLineSet.java
index 7dd72f0ff8..bf5339b5ec 100644
--- a/org.adempiere.base/src/org/compiere/model/I_PA_ReportLineSet.java
+++ b/org.adempiere.base/src/org/compiere/model/I_PA_ReportLineSet.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_ReportLineSet
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_PA_ReportLineSet 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_PA_ReportSource.java b/org.adempiere.base/src/org/compiere/model/I_PA_ReportSource.java
index e4b8b71bf2..eaa2f4bd48 100644
--- a/org.adempiere.base/src/org/compiere/model/I_PA_ReportSource.java
+++ b/org.adempiere.base/src/org/compiere/model/I_PA_ReportSource.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_ReportSource
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_PA_ReportSource 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_PA_SLA_Criteria.java b/org.adempiere.base/src/org/compiere/model/I_PA_SLA_Criteria.java
index aa3a6d5d05..1f360a8e8b 100644
--- a/org.adempiere.base/src/org/compiere/model/I_PA_SLA_Criteria.java
+++ b/org.adempiere.base/src/org/compiere/model/I_PA_SLA_Criteria.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_SLA_Criteria
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_PA_SLA_Criteria 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_PA_SLA_Goal.java b/org.adempiere.base/src/org/compiere/model/I_PA_SLA_Goal.java
index 3f495b5858..a81c86772a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_PA_SLA_Goal.java
+++ b/org.adempiere.base/src/org/compiere/model/I_PA_SLA_Goal.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_SLA_Goal
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_PA_SLA_Goal 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_PA_SLA_Measure.java b/org.adempiere.base/src/org/compiere/model/I_PA_SLA_Measure.java
index 1867726124..252ddd22bc 100644
--- a/org.adempiere.base/src/org/compiere/model/I_PA_SLA_Measure.java
+++ b/org.adempiere.base/src/org/compiere/model/I_PA_SLA_Measure.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_SLA_Measure
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_PA_SLA_Measure 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_RV_BPartner.java b/org.adempiere.base/src/org/compiere/model/I_RV_BPartner.java
index 1c0e9bb566..5d4b09a42a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_RV_BPartner.java
+++ b/org.adempiere.base/src/org/compiere/model/I_RV_BPartner.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for RV_BPartner
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_RV_BPartner 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_RV_WarehousePrice.java b/org.adempiere.base/src/org/compiere/model/I_RV_WarehousePrice.java
index b830302faf..7eb779f3de 100644
--- a/org.adempiere.base/src/org/compiere/model/I_RV_WarehousePrice.java
+++ b/org.adempiere.base/src/org/compiere/model/I_RV_WarehousePrice.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for RV_WarehousePrice
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_RV_WarehousePrice 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_R_Category.java b/org.adempiere.base/src/org/compiere/model/I_R_Category.java
index b5272b1178..c3199a309a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_R_Category.java
+++ b/org.adempiere.base/src/org/compiere/model/I_R_Category.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_Category
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_R_Category 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_R_CategoryUpdates.java b/org.adempiere.base/src/org/compiere/model/I_R_CategoryUpdates.java
index ae01c552d0..0804c54594 100644
--- a/org.adempiere.base/src/org/compiere/model/I_R_CategoryUpdates.java
+++ b/org.adempiere.base/src/org/compiere/model/I_R_CategoryUpdates.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_CategoryUpdates
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_R_CategoryUpdates 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_R_ContactInterest.java b/org.adempiere.base/src/org/compiere/model/I_R_ContactInterest.java
index cd38dc7e9e..910474397c 100644
--- a/org.adempiere.base/src/org/compiere/model/I_R_ContactInterest.java
+++ b/org.adempiere.base/src/org/compiere/model/I_R_ContactInterest.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_ContactInterest
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_R_ContactInterest 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_R_Group.java b/org.adempiere.base/src/org/compiere/model/I_R_Group.java
index c9d0c4ee31..31c63d8d0a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_R_Group.java
+++ b/org.adempiere.base/src/org/compiere/model/I_R_Group.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_Group
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_R_Group 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_R_GroupUpdates.java b/org.adempiere.base/src/org/compiere/model/I_R_GroupUpdates.java
index 7ee2b4251c..69d58b991a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_R_GroupUpdates.java
+++ b/org.adempiere.base/src/org/compiere/model/I_R_GroupUpdates.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_GroupUpdates
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_R_GroupUpdates 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_R_InterestArea.java b/org.adempiere.base/src/org/compiere/model/I_R_InterestArea.java
index fa886540e8..6965791ef9 100644
--- a/org.adempiere.base/src/org/compiere/model/I_R_InterestArea.java
+++ b/org.adempiere.base/src/org/compiere/model/I_R_InterestArea.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_InterestArea
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_R_InterestArea 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_R_IssueKnown.java b/org.adempiere.base/src/org/compiere/model/I_R_IssueKnown.java
index 3489f0c6a1..f5a97746dc 100644
--- a/org.adempiere.base/src/org/compiere/model/I_R_IssueKnown.java
+++ b/org.adempiere.base/src/org/compiere/model/I_R_IssueKnown.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_IssueKnown
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_R_IssueKnown 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_R_IssueProject.java b/org.adempiere.base/src/org/compiere/model/I_R_IssueProject.java
index ca54ecd15e..b040a48df1 100644
--- a/org.adempiere.base/src/org/compiere/model/I_R_IssueProject.java
+++ b/org.adempiere.base/src/org/compiere/model/I_R_IssueProject.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_IssueProject
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_R_IssueProject 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_R_IssueRecommendation.java b/org.adempiere.base/src/org/compiere/model/I_R_IssueRecommendation.java
index 9468f0bf33..c4b3a67731 100644
--- a/org.adempiere.base/src/org/compiere/model/I_R_IssueRecommendation.java
+++ b/org.adempiere.base/src/org/compiere/model/I_R_IssueRecommendation.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_IssueRecommendation
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_R_IssueRecommendation 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_R_IssueStatus.java b/org.adempiere.base/src/org/compiere/model/I_R_IssueStatus.java
index 268fe894a1..13878222bc 100644
--- a/org.adempiere.base/src/org/compiere/model/I_R_IssueStatus.java
+++ b/org.adempiere.base/src/org/compiere/model/I_R_IssueStatus.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_IssueStatus
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_R_IssueStatus 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_R_IssueSystem.java b/org.adempiere.base/src/org/compiere/model/I_R_IssueSystem.java
index de5958dd41..4c9a8ac447 100644
--- a/org.adempiere.base/src/org/compiere/model/I_R_IssueSystem.java
+++ b/org.adempiere.base/src/org/compiere/model/I_R_IssueSystem.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_IssueSystem
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_R_IssueSystem 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_R_IssueUser.java b/org.adempiere.base/src/org/compiere/model/I_R_IssueUser.java
index da4d7faae2..61e32cb3a9 100644
--- a/org.adempiere.base/src/org/compiere/model/I_R_IssueUser.java
+++ b/org.adempiere.base/src/org/compiere/model/I_R_IssueUser.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_IssueUser
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_R_IssueUser 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_R_MailText.java b/org.adempiere.base/src/org/compiere/model/I_R_MailText.java
index f211a1b07a..6f18f26a85 100644
--- a/org.adempiere.base/src/org/compiere/model/I_R_MailText.java
+++ b/org.adempiere.base/src/org/compiere/model/I_R_MailText.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_MailText
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_R_MailText 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_R_Request.java b/org.adempiere.base/src/org/compiere/model/I_R_Request.java
index c4c7491613..08b1af3b31 100644
--- a/org.adempiere.base/src/org/compiere/model/I_R_Request.java
+++ b/org.adempiere.base/src/org/compiere/model/I_R_Request.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_Request
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_R_Request 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_R_RequestAction.java b/org.adempiere.base/src/org/compiere/model/I_R_RequestAction.java
index 16e062334b..2926ecaa1e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_R_RequestAction.java
+++ b/org.adempiere.base/src/org/compiere/model/I_R_RequestAction.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_RequestAction
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_R_RequestAction 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_R_RequestProcessor.java b/org.adempiere.base/src/org/compiere/model/I_R_RequestProcessor.java
index 021c8804fe..cecf26c364 100644
--- a/org.adempiere.base/src/org/compiere/model/I_R_RequestProcessor.java
+++ b/org.adempiere.base/src/org/compiere/model/I_R_RequestProcessor.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_RequestProcessor
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_R_RequestProcessor 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_R_RequestProcessorLog.java b/org.adempiere.base/src/org/compiere/model/I_R_RequestProcessorLog.java
index 6d271ee1aa..2e83eb06e2 100644
--- a/org.adempiere.base/src/org/compiere/model/I_R_RequestProcessorLog.java
+++ b/org.adempiere.base/src/org/compiere/model/I_R_RequestProcessorLog.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_RequestProcessorLog
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_R_RequestProcessorLog 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_R_RequestProcessor_Route.java b/org.adempiere.base/src/org/compiere/model/I_R_RequestProcessor_Route.java
index 96acdcece1..fe87b2fdcb 100644
--- a/org.adempiere.base/src/org/compiere/model/I_R_RequestProcessor_Route.java
+++ b/org.adempiere.base/src/org/compiere/model/I_R_RequestProcessor_Route.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_RequestProcessor_Route
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_R_RequestProcessor_Route 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_R_RequestType.java b/org.adempiere.base/src/org/compiere/model/I_R_RequestType.java
index 6226e79089..099664d4e2 100644
--- a/org.adempiere.base/src/org/compiere/model/I_R_RequestType.java
+++ b/org.adempiere.base/src/org/compiere/model/I_R_RequestType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_RequestType
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_R_RequestType 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_R_RequestTypeUpdates.java b/org.adempiere.base/src/org/compiere/model/I_R_RequestTypeUpdates.java
index c84c14facf..b16aadf06d 100644
--- a/org.adempiere.base/src/org/compiere/model/I_R_RequestTypeUpdates.java
+++ b/org.adempiere.base/src/org/compiere/model/I_R_RequestTypeUpdates.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_RequestTypeUpdates
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_R_RequestTypeUpdates 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_R_RequestUpdate.java b/org.adempiere.base/src/org/compiere/model/I_R_RequestUpdate.java
index d3c95faa1d..556f926498 100644
--- a/org.adempiere.base/src/org/compiere/model/I_R_RequestUpdate.java
+++ b/org.adempiere.base/src/org/compiere/model/I_R_RequestUpdate.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_RequestUpdate
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_R_RequestUpdate 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_R_RequestUpdates.java b/org.adempiere.base/src/org/compiere/model/I_R_RequestUpdates.java
index 524cec7aa9..d340eedbe0 100644
--- a/org.adempiere.base/src/org/compiere/model/I_R_RequestUpdates.java
+++ b/org.adempiere.base/src/org/compiere/model/I_R_RequestUpdates.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_RequestUpdates
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_R_RequestUpdates 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_R_Resolution.java b/org.adempiere.base/src/org/compiere/model/I_R_Resolution.java
index d4c41711b4..bc7360af46 100644
--- a/org.adempiere.base/src/org/compiere/model/I_R_Resolution.java
+++ b/org.adempiere.base/src/org/compiere/model/I_R_Resolution.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_Resolution
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_R_Resolution 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_R_StandardResponse.java b/org.adempiere.base/src/org/compiere/model/I_R_StandardResponse.java
index 99e1e21ea2..f995ee6ade 100644
--- a/org.adempiere.base/src/org/compiere/model/I_R_StandardResponse.java
+++ b/org.adempiere.base/src/org/compiere/model/I_R_StandardResponse.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_StandardResponse
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_R_StandardResponse 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_R_Status.java b/org.adempiere.base/src/org/compiere/model/I_R_Status.java
index 3299f115e5..793a6e9634 100644
--- a/org.adempiere.base/src/org/compiere/model/I_R_Status.java
+++ b/org.adempiere.base/src/org/compiere/model/I_R_Status.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_Status
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_R_Status 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_R_StatusCategory.java b/org.adempiere.base/src/org/compiere/model/I_R_StatusCategory.java
index aa7a2e7b72..d38124c1bf 100644
--- a/org.adempiere.base/src/org/compiere/model/I_R_StatusCategory.java
+++ b/org.adempiere.base/src/org/compiere/model/I_R_StatusCategory.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_StatusCategory
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_R_StatusCategory 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_S_ExpenseType.java b/org.adempiere.base/src/org/compiere/model/I_S_ExpenseType.java
index c722fc3ff1..a5601cb3c2 100644
--- a/org.adempiere.base/src/org/compiere/model/I_S_ExpenseType.java
+++ b/org.adempiere.base/src/org/compiere/model/I_S_ExpenseType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for S_ExpenseType
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_S_ExpenseType 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_S_Resource.java b/org.adempiere.base/src/org/compiere/model/I_S_Resource.java
index 906aba9583..f02d796ba8 100644
--- a/org.adempiere.base/src/org/compiere/model/I_S_Resource.java
+++ b/org.adempiere.base/src/org/compiere/model/I_S_Resource.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for S_Resource
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_S_Resource 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_S_ResourceAssignment.java b/org.adempiere.base/src/org/compiere/model/I_S_ResourceAssignment.java
index 2bd86c5f58..d37162508e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_S_ResourceAssignment.java
+++ b/org.adempiere.base/src/org/compiere/model/I_S_ResourceAssignment.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for S_ResourceAssignment
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_S_ResourceAssignment 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_S_ResourceType.java b/org.adempiere.base/src/org/compiere/model/I_S_ResourceType.java
index 349f777a99..3f991ea6ed 100644
--- a/org.adempiere.base/src/org/compiere/model/I_S_ResourceType.java
+++ b/org.adempiere.base/src/org/compiere/model/I_S_ResourceType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for S_ResourceType
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_S_ResourceType 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_S_ResourceUnAvailable.java b/org.adempiere.base/src/org/compiere/model/I_S_ResourceUnAvailable.java
index a55f1c9905..a2ba29e1c0 100644
--- a/org.adempiere.base/src/org/compiere/model/I_S_ResourceUnAvailable.java
+++ b/org.adempiere.base/src/org/compiere/model/I_S_ResourceUnAvailable.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for S_ResourceUnAvailable
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_S_ResourceUnAvailable 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_S_TimeExpense.java b/org.adempiere.base/src/org/compiere/model/I_S_TimeExpense.java
index 410c10a591..e2852d0bab 100644
--- a/org.adempiere.base/src/org/compiere/model/I_S_TimeExpense.java
+++ b/org.adempiere.base/src/org/compiere/model/I_S_TimeExpense.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for S_TimeExpense
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_S_TimeExpense 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_S_TimeExpenseLine.java b/org.adempiere.base/src/org/compiere/model/I_S_TimeExpenseLine.java
index 5ddef5b13b..7138197fef 100644
--- a/org.adempiere.base/src/org/compiere/model/I_S_TimeExpenseLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_S_TimeExpenseLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for S_TimeExpenseLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_S_TimeExpenseLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_S_TimeType.java b/org.adempiere.base/src/org/compiere/model/I_S_TimeType.java
index daf7e126f8..32dd0461cc 100644
--- a/org.adempiere.base/src/org/compiere/model/I_S_TimeType.java
+++ b/org.adempiere.base/src/org/compiere/model/I_S_TimeType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for S_TimeType
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_S_TimeType 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_S_Training.java b/org.adempiere.base/src/org/compiere/model/I_S_Training.java
index 02ce535173..fb4492e596 100644
--- a/org.adempiere.base/src/org/compiere/model/I_S_Training.java
+++ b/org.adempiere.base/src/org/compiere/model/I_S_Training.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for S_Training
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_S_Training 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_S_Training_Class.java b/org.adempiere.base/src/org/compiere/model/I_S_Training_Class.java
index 0b53ce8115..f6334a231e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_S_Training_Class.java
+++ b/org.adempiere.base/src/org/compiere/model/I_S_Training_Class.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for S_Training_Class
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_S_Training_Class 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_T_1099Extract.java b/org.adempiere.base/src/org/compiere/model/I_T_1099Extract.java
index bc5303838c..3e14983916 100644
--- a/org.adempiere.base/src/org/compiere/model/I_T_1099Extract.java
+++ b/org.adempiere.base/src/org/compiere/model/I_T_1099Extract.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for T_1099Extract
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_T_1099Extract 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_T_Aging.java b/org.adempiere.base/src/org/compiere/model/I_T_Aging.java
index 95765c0ee0..b821c85753 100644
--- a/org.adempiere.base/src/org/compiere/model/I_T_Aging.java
+++ b/org.adempiere.base/src/org/compiere/model/I_T_Aging.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for T_Aging
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_T_Aging 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_T_BOM_Indented.java b/org.adempiere.base/src/org/compiere/model/I_T_BOM_Indented.java
index f8373af5f1..efeef7f4b9 100644
--- a/org.adempiere.base/src/org/compiere/model/I_T_BOM_Indented.java
+++ b/org.adempiere.base/src/org/compiere/model/I_T_BOM_Indented.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for T_BOM_Indented
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_T_BOM_Indented 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_T_BankRegister.java b/org.adempiere.base/src/org/compiere/model/I_T_BankRegister.java
index ae966e3f33..b20a1e6cc2 100644
--- a/org.adempiere.base/src/org/compiere/model/I_T_BankRegister.java
+++ b/org.adempiere.base/src/org/compiere/model/I_T_BankRegister.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for T_BankRegister
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_T_BankRegister 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_T_CashFlow.java b/org.adempiere.base/src/org/compiere/model/I_T_CashFlow.java
index 0c536dc41a..33428138c5 100644
--- a/org.adempiere.base/src/org/compiere/model/I_T_CashFlow.java
+++ b/org.adempiere.base/src/org/compiere/model/I_T_CashFlow.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for T_CashFlow
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_T_CashFlow 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_T_DistributionRunDetail.java b/org.adempiere.base/src/org/compiere/model/I_T_DistributionRunDetail.java
index 6a51b1124f..fd1724645e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_T_DistributionRunDetail.java
+++ b/org.adempiere.base/src/org/compiere/model/I_T_DistributionRunDetail.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for T_DistributionRunDetail
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_T_DistributionRunDetail 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_T_InventoryValue.java b/org.adempiere.base/src/org/compiere/model/I_T_InventoryValue.java
index 609732d4e2..6e467f8c99 100644
--- a/org.adempiere.base/src/org/compiere/model/I_T_InventoryValue.java
+++ b/org.adempiere.base/src/org/compiere/model/I_T_InventoryValue.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for T_InventoryValue
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_T_InventoryValue 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_T_InvoiceGL.java b/org.adempiere.base/src/org/compiere/model/I_T_InvoiceGL.java
index 0b444d45bd..ca4fc2db6a 100644
--- a/org.adempiere.base/src/org/compiere/model/I_T_InvoiceGL.java
+++ b/org.adempiere.base/src/org/compiere/model/I_T_InvoiceGL.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for T_InvoiceGL
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_T_InvoiceGL 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_T_Reconciliation.java b/org.adempiere.base/src/org/compiere/model/I_T_Reconciliation.java
index 87a37301ee..713fcd9bf0 100644
--- a/org.adempiere.base/src/org/compiere/model/I_T_Reconciliation.java
+++ b/org.adempiere.base/src/org/compiere/model/I_T_Reconciliation.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for T_Reconciliation
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_T_Reconciliation 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_T_Replenish.java b/org.adempiere.base/src/org/compiere/model/I_T_Replenish.java
index bd7eeef95a..c11f050458 100644
--- a/org.adempiere.base/src/org/compiere/model/I_T_Replenish.java
+++ b/org.adempiere.base/src/org/compiere/model/I_T_Replenish.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for T_Replenish
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_T_Replenish 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_T_Report.java b/org.adempiere.base/src/org/compiere/model/I_T_Report.java
index bc5dcd8fc9..42d1199185 100644
--- a/org.adempiere.base/src/org/compiere/model/I_T_Report.java
+++ b/org.adempiere.base/src/org/compiere/model/I_T_Report.java
@@ -21,7 +21,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for T_Report
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_T_Report 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_T_ReportStatement.java b/org.adempiere.base/src/org/compiere/model/I_T_ReportStatement.java
index 1155f44027..c8757b9099 100644
--- a/org.adempiere.base/src/org/compiere/model/I_T_ReportStatement.java
+++ b/org.adempiere.base/src/org/compiere/model/I_T_ReportStatement.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for T_ReportStatement
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_T_ReportStatement 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_T_Transaction.java b/org.adempiere.base/src/org/compiere/model/I_T_Transaction.java
index e5f52b2b7b..9a3c7fcdef 100644
--- a/org.adempiere.base/src/org/compiere/model/I_T_Transaction.java
+++ b/org.adempiere.base/src/org/compiere/model/I_T_Transaction.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for T_Transaction
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_T_Transaction 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_Test.java b/org.adempiere.base/src/org/compiere/model/I_Test.java
index f6bc5b25c7..4741f139e9 100644
--- a/org.adempiere.base/src/org/compiere/model/I_Test.java
+++ b/org.adempiere.base/src/org/compiere/model/I_Test.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for Test
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_Test 
 {
@@ -144,6 +144,15 @@ public interface I_Test
 
 	public I_C_Location getC_Location() throws RuntimeException;
 
+    /** Column name Color */
+    public static final String COLUMNNAME_Color = "Color";
+
+	/** Set Color	  */
+	public void setColor (String Color);
+
+	/** Get Color	  */
+	public String getColor();
+
     /** Column name C_Payment_ID */
     public static final String COLUMNNAME_C_Payment_ID = "C_Payment_ID";
 
diff --git a/org.adempiere.base/src/org/compiere/model/I_U_BlackListCheque.java b/org.adempiere.base/src/org/compiere/model/I_U_BlackListCheque.java
index d2d09d2cca..1196a84756 100644
--- a/org.adempiere.base/src/org/compiere/model/I_U_BlackListCheque.java
+++ b/org.adempiere.base/src/org/compiere/model/I_U_BlackListCheque.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for U_BlackListCheque
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_U_BlackListCheque 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_U_POSTerminal.java b/org.adempiere.base/src/org/compiere/model/I_U_POSTerminal.java
index 81cc113250..32184218d0 100644
--- a/org.adempiere.base/src/org/compiere/model/I_U_POSTerminal.java
+++ b/org.adempiere.base/src/org/compiere/model/I_U_POSTerminal.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for U_POSTerminal
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_U_POSTerminal 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_U_RoleMenu.java b/org.adempiere.base/src/org/compiere/model/I_U_RoleMenu.java
index 4563159c94..227ea39e84 100644
--- a/org.adempiere.base/src/org/compiere/model/I_U_RoleMenu.java
+++ b/org.adempiere.base/src/org/compiere/model/I_U_RoleMenu.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for U_RoleMenu
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_U_RoleMenu 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_U_WebMenu.java b/org.adempiere.base/src/org/compiere/model/I_U_WebMenu.java
index d75b8460e2..8c3a77d62f 100644
--- a/org.adempiere.base/src/org/compiere/model/I_U_WebMenu.java
+++ b/org.adempiere.base/src/org/compiere/model/I_U_WebMenu.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for U_WebMenu
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_U_WebMenu 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_U_Web_Properties.java b/org.adempiere.base/src/org/compiere/model/I_U_Web_Properties.java
index f99906607c..0daadaad5e 100644
--- a/org.adempiere.base/src/org/compiere/model/I_U_Web_Properties.java
+++ b/org.adempiere.base/src/org/compiere/model/I_U_Web_Properties.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for U_Web_Properties
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_U_Web_Properties 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_WS_WebService.java b/org.adempiere.base/src/org/compiere/model/I_WS_WebService.java
index eeea39579a..6b9636cc42 100644
--- a/org.adempiere.base/src/org/compiere/model/I_WS_WebService.java
+++ b/org.adempiere.base/src/org/compiere/model/I_WS_WebService.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for WS_WebService
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_WS_WebService 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_WS_WebServiceFieldInput.java b/org.adempiere.base/src/org/compiere/model/I_WS_WebServiceFieldInput.java
index 6c24eaa179..6122c8f854 100644
--- a/org.adempiere.base/src/org/compiere/model/I_WS_WebServiceFieldInput.java
+++ b/org.adempiere.base/src/org/compiere/model/I_WS_WebServiceFieldInput.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for WS_WebServiceFieldInput
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_WS_WebServiceFieldInput 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_WS_WebServiceFieldOutput.java b/org.adempiere.base/src/org/compiere/model/I_WS_WebServiceFieldOutput.java
index 56527b1ad9..ab9d200527 100644
--- a/org.adempiere.base/src/org/compiere/model/I_WS_WebServiceFieldOutput.java
+++ b/org.adempiere.base/src/org/compiere/model/I_WS_WebServiceFieldOutput.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for WS_WebServiceFieldOutput
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_WS_WebServiceFieldOutput 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_WS_WebServiceMethod.java b/org.adempiere.base/src/org/compiere/model/I_WS_WebServiceMethod.java
index 8bec27fa5e..8bbb0143e3 100644
--- a/org.adempiere.base/src/org/compiere/model/I_WS_WebServiceMethod.java
+++ b/org.adempiere.base/src/org/compiere/model/I_WS_WebServiceMethod.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for WS_WebServiceMethod
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_WS_WebServiceMethod 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_WS_WebServiceType.java b/org.adempiere.base/src/org/compiere/model/I_WS_WebServiceType.java
index 74f8399f46..57cf6c2b09 100644
--- a/org.adempiere.base/src/org/compiere/model/I_WS_WebServiceType.java
+++ b/org.adempiere.base/src/org/compiere/model/I_WS_WebServiceType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for WS_WebServiceType
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_WS_WebServiceType 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_WS_WebServiceTypeAccess.java b/org.adempiere.base/src/org/compiere/model/I_WS_WebServiceTypeAccess.java
index d56040c8ff..d5dbccf46b 100644
--- a/org.adempiere.base/src/org/compiere/model/I_WS_WebServiceTypeAccess.java
+++ b/org.adempiere.base/src/org/compiere/model/I_WS_WebServiceTypeAccess.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for WS_WebServiceTypeAccess
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_WS_WebServiceTypeAccess 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_WS_WebService_Para.java b/org.adempiere.base/src/org/compiere/model/I_WS_WebService_Para.java
index 0d6eb2980b..22a6022eb8 100644
--- a/org.adempiere.base/src/org/compiere/model/I_WS_WebService_Para.java
+++ b/org.adempiere.base/src/org/compiere/model/I_WS_WebService_Para.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for WS_WebService_Para
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_WS_WebService_Para 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_W_Advertisement.java b/org.adempiere.base/src/org/compiere/model/I_W_Advertisement.java
index f7b8cb4326..5ead36df67 100644
--- a/org.adempiere.base/src/org/compiere/model/I_W_Advertisement.java
+++ b/org.adempiere.base/src/org/compiere/model/I_W_Advertisement.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for W_Advertisement
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_W_Advertisement 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_W_Basket.java b/org.adempiere.base/src/org/compiere/model/I_W_Basket.java
index fa38543ed9..236b7c3a72 100644
--- a/org.adempiere.base/src/org/compiere/model/I_W_Basket.java
+++ b/org.adempiere.base/src/org/compiere/model/I_W_Basket.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for W_Basket
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_W_Basket 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_W_BasketLine.java b/org.adempiere.base/src/org/compiere/model/I_W_BasketLine.java
index 31dfd2d13d..111112a680 100644
--- a/org.adempiere.base/src/org/compiere/model/I_W_BasketLine.java
+++ b/org.adempiere.base/src/org/compiere/model/I_W_BasketLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for W_BasketLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_W_BasketLine 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_W_Click.java b/org.adempiere.base/src/org/compiere/model/I_W_Click.java
index 7e1a63c3d6..d9d64253e7 100644
--- a/org.adempiere.base/src/org/compiere/model/I_W_Click.java
+++ b/org.adempiere.base/src/org/compiere/model/I_W_Click.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for W_Click
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_W_Click 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_W_ClickCount.java b/org.adempiere.base/src/org/compiere/model/I_W_ClickCount.java
index 1ef13713e3..3d8d5955b3 100644
--- a/org.adempiere.base/src/org/compiere/model/I_W_ClickCount.java
+++ b/org.adempiere.base/src/org/compiere/model/I_W_ClickCount.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for W_ClickCount
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_W_ClickCount 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_W_Counter.java b/org.adempiere.base/src/org/compiere/model/I_W_Counter.java
index efa7d85a44..fc3c4a91f6 100644
--- a/org.adempiere.base/src/org/compiere/model/I_W_Counter.java
+++ b/org.adempiere.base/src/org/compiere/model/I_W_Counter.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for W_Counter
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_W_Counter 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_W_CounterCount.java b/org.adempiere.base/src/org/compiere/model/I_W_CounterCount.java
index 458adf0d6e..3029a2ebb2 100644
--- a/org.adempiere.base/src/org/compiere/model/I_W_CounterCount.java
+++ b/org.adempiere.base/src/org/compiere/model/I_W_CounterCount.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for W_CounterCount
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_W_CounterCount 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_W_MailMsg.java b/org.adempiere.base/src/org/compiere/model/I_W_MailMsg.java
index ddc07471ad..2d08303554 100644
--- a/org.adempiere.base/src/org/compiere/model/I_W_MailMsg.java
+++ b/org.adempiere.base/src/org/compiere/model/I_W_MailMsg.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for W_MailMsg
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_W_MailMsg 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/I_W_Store.java b/org.adempiere.base/src/org/compiere/model/I_W_Store.java
index 045982d17d..5a975c776f 100644
--- a/org.adempiere.base/src/org/compiere/model/I_W_Store.java
+++ b/org.adempiere.base/src/org/compiere/model/I_W_Store.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for W_Store
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 public interface I_W_Store 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/MAcctSchema.java b/org.adempiere.base/src/org/compiere/model/MAcctSchema.java
index 495bf66133..58bd6f7dde 100644
--- a/org.adempiere.base/src/org/compiere/model/MAcctSchema.java
+++ b/org.adempiere.base/src/org/compiere/model/MAcctSchema.java
@@ -62,7 +62,7 @@ public class MAcctSchema extends X_C_AcctSchema
 	public static MAcctSchema get (Properties ctx, int C_AcctSchema_ID, String trxName)
 	{
 		//  Check Cache
-		Integer key = new Integer(C_AcctSchema_ID);
+		Integer key = Integer.valueOf(C_AcctSchema_ID);
 		MAcctSchema retValue = (MAcctSchema)s_cache.get(key);
 		if (retValue != null)
 			return retValue;
@@ -93,7 +93,7 @@ public class MAcctSchema extends X_C_AcctSchema
 	public static synchronized MAcctSchema[] getClientAcctSchema (Properties ctx, int AD_Client_ID, String trxName)
 	{
 		//  Check Cache
-		Integer key = new Integer(AD_Client_ID);
+		Integer key = Integer.valueOf(AD_Client_ID);
 		if (s_schema.containsKey(key))
 			return (MAcctSchema[])s_schema.get(key);
 
diff --git a/org.adempiere.base/src/org/compiere/model/MAcctSchemaElement.java b/org.adempiere.base/src/org/compiere/model/MAcctSchemaElement.java
index 47c7bde908..7e48939ad3 100644
--- a/org.adempiere.base/src/org/compiere/model/MAcctSchemaElement.java
+++ b/org.adempiere.base/src/org/compiere/model/MAcctSchemaElement.java
@@ -57,7 +57,7 @@ public class MAcctSchemaElement extends X_C_AcctSchema_Element
 	 */
 	public static MAcctSchemaElement[] getAcctSchemaElements (MAcctSchema as)
 	{
-		Integer key = new Integer (as.getC_AcctSchema_ID());
+		Integer key = Integer.valueOf(as.getC_AcctSchema_ID());
 		MAcctSchemaElement[] retValue = (MAcctSchemaElement[]) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MAging.java b/org.adempiere.base/src/org/compiere/model/MAging.java
index 9396a52e91..05d5332fd0 100644
--- a/org.adempiere.base/src/org/compiere/model/MAging.java
+++ b/org.adempiere.base/src/org/compiere/model/MAging.java
@@ -116,9 +116,9 @@ public class MAging extends X_T_Aging
 
 		//	Optional
 	//	setC_Invoice_ID (C_Invoice_ID);		// may be zero
-		set_ValueNoCheck ("C_Invoice_ID", new Integer(C_Invoice_ID));
+		set_ValueNoCheck ("C_Invoice_ID", Integer.valueOf(C_Invoice_ID));
 	//	setC_InvoicePaySchedule_ID(C_InvoicePaySchedule_ID);	//	may be zero
-		set_Value ("C_InvoicePaySchedule_ID", new Integer(C_InvoicePaySchedule_ID));
+		set_Value ("C_InvoicePaySchedule_ID", Integer.valueOf(C_InvoicePaySchedule_ID));
 		setIsListInvoices(C_Invoice_ID != 0);
 		//
 		setDueDate(DueDate);		//	only sensible if List invoices
@@ -156,9 +156,9 @@ public class MAging extends X_T_Aging
 
 		//	Optional
 	//	setC_Invoice_ID (C_Invoice_ID);		// may be zero
-		set_ValueNoCheck ("C_Invoice_ID", new Integer(C_Invoice_ID));
+		set_ValueNoCheck ("C_Invoice_ID", Integer.valueOf(C_Invoice_ID));
 	//	setC_InvoicePaySchedule_ID(C_InvoicePaySchedule_ID);	//	may be zero
-		set_Value ("C_InvoicePaySchedule_ID", new Integer(C_InvoicePaySchedule_ID));
+		set_Value ("C_InvoicePaySchedule_ID", Integer.valueOf(C_InvoicePaySchedule_ID));
 		setIsListInvoices(C_Invoice_ID != 0);
 		//
 		setDueDate(DueDate);		//	only sensible if List invoices
diff --git a/org.adempiere.base/src/org/compiere/model/MAllocationHdr.java b/org.adempiere.base/src/org/compiere/model/MAllocationHdr.java
index 6041a67c53..e6146929e8 100644
--- a/org.adempiere.base/src/org/compiere/model/MAllocationHdr.java
+++ b/org.adempiere.base/src/org/compiere/model/MAllocationHdr.java
@@ -18,6 +18,7 @@ package org.compiere.model;
 
 import java.io.File;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
@@ -1066,7 +1067,7 @@ public class MAllocationHdr extends X_C_AllocationHdr implements DocAction
 					//	Round
 					int precision = MCurrency.getStdPrecision(getCtx(), client.getC_Currency_ID());
 					if (openBalanceDiff.scale() > precision)
-						openBalanceDiff = openBalanceDiff.setScale(precision, BigDecimal.ROUND_HALF_UP);
+						openBalanceDiff = openBalanceDiff.setScale(precision, RoundingMode.HALF_UP);
 				}
 			}			
 			
diff --git a/org.adempiere.base/src/org/compiere/model/MAttributeSet.java b/org.adempiere.base/src/org/compiere/model/MAttributeSet.java
index 292a0071b8..a03dd23c34 100644
--- a/org.adempiere.base/src/org/compiere/model/MAttributeSet.java
+++ b/org.adempiere.base/src/org/compiere/model/MAttributeSet.java
@@ -51,7 +51,7 @@ public class MAttributeSet extends X_M_AttributeSet
 	 */
 	public static MAttributeSet get (Properties ctx, int M_AttributeSet_ID)
 	{
-		Integer key = new Integer (M_AttributeSet_ID);
+		Integer key = Integer.valueOf(M_AttributeSet_ID);
 		MAttributeSet retValue = (MAttributeSet) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MBOM.java b/org.adempiere.base/src/org/compiere/model/MBOM.java
index a011ddc982..e2ccd91c9e 100644
--- a/org.adempiere.base/src/org/compiere/model/MBOM.java
+++ b/org.adempiere.base/src/org/compiere/model/MBOM.java
@@ -45,7 +45,7 @@ public class MBOM extends X_M_BOM
 	 */
 	public static MBOM get (Properties ctx, int M_BOM_ID)
 	{
-		Integer key = new Integer (M_BOM_ID);
+		Integer key = Integer.valueOf(M_BOM_ID);
 		MBOM retValue = (MBOM) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MBPGroup.java b/org.adempiere.base/src/org/compiere/model/MBPGroup.java
index 9d8ae48efc..74581087eb 100644
--- a/org.adempiere.base/src/org/compiere/model/MBPGroup.java
+++ b/org.adempiere.base/src/org/compiere/model/MBPGroup.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Properties;
@@ -49,7 +50,7 @@ public class MBPGroup extends X_C_BP_Group
 	 */
 	public static MBPGroup get (Properties ctx, int C_BP_Group_ID)
 	{
-		Integer key = new Integer (C_BP_Group_ID);
+		Integer key = Integer.valueOf(C_BP_Group_ID);
 		MBPGroup retValue = (MBPGroup) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
@@ -82,7 +83,7 @@ public class MBPGroup extends X_C_BP_Group
 	public static MBPGroup getDefault (Properties ctx)
 	{
 		int AD_Client_ID = Env.getAD_Client_ID(ctx);
-		Integer key = new Integer (AD_Client_ID);
+		Integer key = Integer.valueOf(AD_Client_ID);
 		MBPGroup retValue = (MBPGroup) s_cacheDefault.get (key);
 		if (retValue != null)
 			return retValue;
@@ -141,7 +142,7 @@ public class MBPGroup extends X_C_BP_Group
 			if (rs.next ())
 			{
 				retValue = new MBPGroup (ctx, rs, null);
-				Integer key = new Integer (retValue.getC_BP_Group_ID());
+				Integer key = Integer.valueOf(retValue.getC_BP_Group_ID());
 				if (retValue.get_ID () != 0)
 					s_cache.put (key, retValue);
 			}
@@ -220,7 +221,7 @@ public class MBPGroup extends X_C_BP_Group
 	{
 		BigDecimal bd = super.getCreditWatchPercent();
 		if (bd.compareTo(Env.ZERO) != 0)
-			return bd.divide(Env.ONEHUNDRED, 2, BigDecimal.ROUND_HALF_UP);
+			return bd.divide(Env.ONEHUNDRED, 2, RoundingMode.HALF_UP);
 		return BigDecimal.valueOf(0.90);
 	}	//	getCreditWatchRatio
 
diff --git a/org.adempiere.base/src/org/compiere/model/MBPartner.java b/org.adempiere.base/src/org/compiere/model/MBPartner.java
index 9a9f7b2ffd..d0df6787b8 100644
--- a/org.adempiere.base/src/org/compiere/model/MBPartner.java
+++ b/org.adempiere.base/src/org/compiere/model/MBPartner.java
@@ -47,7 +47,7 @@ public class MBPartner extends X_C_BPartner
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -803727877324075871L;
+	private static final long serialVersionUID = -3098526308112073395L;
 
 	/**
 	 * 	Get Empty Template Business Partner
@@ -63,7 +63,7 @@ public class MBPartner extends X_C_BPartner
 		//	Reset
 		if (template != null)
 		{
-			template.set_ValueNoCheck ("C_BPartner_ID", new Integer(0));
+			template.set_ValueNoCheck ("C_BPartner_ID", Integer.valueOf(0));
 			template.set_ValueNoCheck ("C_BPartner_UU", (String)null);
 			template.setAD_OrgBP_ID(0);
 			template.setLogo_ID(0);
@@ -308,24 +308,24 @@ public class MBPartner extends X_C_BPartner
 	
 	
 	/** Users							*/
-	private MUser[]					m_contacts = null;
+	protected MUser[]				m_contacts = null;
 	/** Addressed						*/
-	private MBPartnerLocation[]		m_locations = null;
+	protected MBPartnerLocation[]	m_locations = null;
 	/** BP Bank Accounts				*/
-	private MBPBankAccount[]		m_accounts = null;
+	protected MBPBankAccount[]		m_accounts = null;
 	/** Prim Address					*/
-	private Integer					m_primaryC_BPartner_Location_ID = null;
+	protected Integer				m_primaryC_BPartner_Location_ID = null;
 	/** Prim User						*/
-	private Integer					m_primaryAD_User_ID = null;
+	protected Integer				m_primaryAD_User_ID = null;
 	/** BP Group						*/
-	private MBPGroup				m_group = null;
+	protected MBPGroup				m_group = null;
 	
 	/**
 	 * 	Load Default BPartner
 	 * 	@param AD_Client_ID client
 	 * 	@return true if loaded
 	 */
-	private boolean initTemplate (int AD_Client_ID)
+	protected boolean initTemplate (int AD_Client_ID)
 	{
 		if (AD_Client_ID == 0)
 			throw new IllegalArgumentException ("Client_ID=0");
@@ -660,7 +660,7 @@ public class MBPartner extends X_C_BPartner
 	 */
 	public void setPrimaryC_BPartner_Location_ID(int C_BPartner_Location_ID)
 	{
-		m_primaryC_BPartner_Location_ID = new Integer (C_BPartner_Location_ID);
+		m_primaryC_BPartner_Location_ID = Integer.valueOf(C_BPartner_Location_ID);
 	}	//	setPrimaryC_BPartner_Location_ID
 	
 	/**
@@ -669,7 +669,7 @@ public class MBPartner extends X_C_BPartner
 	 */
 	public void setPrimaryAD_User_ID(int AD_User_ID)
 	{
-		m_primaryAD_User_ID = new Integer (AD_User_ID);
+		m_primaryAD_User_ID = Integer.valueOf(AD_User_ID);
 	}	//	setPrimaryAD_User_ID
 	
 	
diff --git a/org.adempiere.base/src/org/compiere/model/MBPartnerLocation.java b/org.adempiere.base/src/org/compiere/model/MBPartnerLocation.java
index 11b5aa17b1..dc3866976c 100644
--- a/org.adempiere.base/src/org/compiere/model/MBPartnerLocation.java
+++ b/org.adempiere.base/src/org/compiere/model/MBPartnerLocation.java
@@ -105,7 +105,7 @@ public class MBPartnerLocation extends X_C_BPartner_Location {
 		this(bp.getCtx(), 0, bp.get_TrxName());
 		setClientOrg(bp);
 		// may (still) be 0
-		set_ValueNoCheck("C_BPartner_ID", new Integer(bp.getC_BPartner_ID()));
+		set_ValueNoCheck("C_BPartner_ID", Integer.valueOf(bp.getC_BPartner_ID()));
 	} // MBPartner_Location
 
 	/**
diff --git a/org.adempiere.base/src/org/compiere/model/MBank.java b/org.adempiere.base/src/org/compiere/model/MBank.java
index e3b8c9afc7..93e3c4ec04 100644
--- a/org.adempiere.base/src/org/compiere/model/MBank.java
+++ b/org.adempiere.base/src/org/compiere/model/MBank.java
@@ -43,7 +43,7 @@ public class MBank extends X_C_Bank
 	 */
 	public static MBank get (Properties ctx, int C_Bank_ID)
 	{
-		Integer key = new Integer (C_Bank_ID);
+		Integer key = Integer.valueOf(C_Bank_ID);
 		MBank retValue = (MBank)s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MBankAccount.java b/org.adempiere.base/src/org/compiere/model/MBankAccount.java
index 9bb98fca78..086ef6f5b6 100644
--- a/org.adempiere.base/src/org/compiere/model/MBankAccount.java
+++ b/org.adempiere.base/src/org/compiere/model/MBankAccount.java
@@ -47,7 +47,7 @@ public class MBankAccount extends X_C_BankAccount
 	 */
 	public static MBankAccount get (Properties ctx, int C_BankAccount_ID)
 	{
-		Integer key = new Integer (C_BankAccount_ID);
+		Integer key = Integer.valueOf(C_BankAccount_ID);
 		MBankAccount retValue = (MBankAccount) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MBankStatement.java b/org.adempiere.base/src/org/compiere/model/MBankStatement.java
index 7f1bf5e5e9..cebdf7a44d 100644
--- a/org.adempiere.base/src/org/compiere/model/MBankStatement.java
+++ b/org.adempiere.base/src/org/compiere/model/MBankStatement.java
@@ -52,7 +52,7 @@ public class MBankStatement extends X_C_BankStatement implements DocAction
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -859925588789443186L;
+	private static final long serialVersionUID = 4286511528899179483L;
 
 	/**
 	 * 	Standard Constructor
@@ -117,7 +117,7 @@ public class MBankStatement extends X_C_BankStatement implements DocAction
 	}	//	MBankStatement
  
 	/**	Lines							*/
-	private MBankStatementLine[] 	m_lines = null;
+	protected MBankStatementLine[] m_lines = null;
 	
  	/**
  	 * 	Get Bank Statement Lines
@@ -265,9 +265,9 @@ public class MBankStatement extends X_C_BankStatement implements DocAction
 	}	//	processIt
 	
 	/**	Process Message 			*/
-	private String		m_processMsg = null;
+	protected String m_processMsg = null;
 	/**	Just Prepared Flag			*/
-	private boolean		m_justPrepared = false;
+	protected boolean m_justPrepared = false;
 
 	/**
 	 * 	Unlock Document.
diff --git a/org.adempiere.base/src/org/compiere/model/MBankStatementLine.java b/org.adempiere.base/src/org/compiere/model/MBankStatementLine.java
index 91447408f6..e66961856a 100644
--- a/org.adempiere.base/src/org/compiere/model/MBankStatementLine.java
+++ b/org.adempiere.base/src/org/compiere/model/MBankStatementLine.java
@@ -44,7 +44,7 @@ import org.compiere.util.Msg;
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 1914411222159254809L;
+	private static final long serialVersionUID = 3809130336412385420L;
 
 	/**
 	 * 	Standard Constructor
@@ -210,7 +210,7 @@ import org.compiere.util.Msg;
 	}	//	beforeSave
 	
 	/** Parent					*/
-	private MBankStatement			m_parent = null;
+	protected MBankStatement m_parent = null;
 	
 	/**
 	 * 	Get Parent
@@ -251,7 +251,7 @@ import org.compiere.util.Msg;
 	/**
 	 * 	Update Header
 	 */
-	private boolean updateHeader()
+	protected boolean updateHeader()
 	{
 		StringBuilder sql = new StringBuilder("UPDATE C_BankStatement bs")
 			.append(" SET StatementDifference=(SELECT COALESCE(SUM(StmtAmt),0) FROM C_BankStatementLine bsl ")
diff --git a/org.adempiere.base/src/org/compiere/model/MBankStatementLoader.java b/org.adempiere.base/src/org/compiere/model/MBankStatementLoader.java
index aa790d9f2f..7a61593ae0 100644
--- a/org.adempiere.base/src/org/compiere/model/MBankStatementLoader.java
+++ b/org.adempiere.base/src/org/compiere/model/MBankStatementLoader.java
@@ -132,7 +132,7 @@ import org.compiere.util.Util;
 			if(m_loader==null){
 				// if no OSGi plugin is found try the legacy way (in my own classpath)
 				Class<?> bsrClass = Class.forName(getStmtLoaderClass());
-				m_loader = (BankStatementLoaderInterface) bsrClass.newInstance();
+				m_loader = (BankStatementLoaderInterface) bsrClass.getDeclaredConstructor().newInstance();
 			}
 		}
 		catch(Exception e)
diff --git a/org.adempiere.base/src/org/compiere/model/MBankStatementMatcher.java b/org.adempiere.base/src/org/compiere/model/MBankStatementMatcher.java
index c255442ab8..9137ec4e6c 100644
--- a/org.adempiere.base/src/org/compiere/model/MBankStatementMatcher.java
+++ b/org.adempiere.base/src/org/compiere/model/MBankStatementMatcher.java
@@ -141,7 +141,7 @@ public class MBankStatementMatcher extends X_C_BankStatementMatcher
 			if(m_matcher==null){
 				// if no OSGi plugin is found try the legacy way (in my own classpath)
 				Class<?> bsrClass = Class.forName(className);
-				m_matcher = (BankStatementMatcherInterface) bsrClass.newInstance();
+				m_matcher = (BankStatementMatcherInterface) bsrClass.getDeclaredConstructor().newInstance();
 			}
 			m_matcherValid = Boolean.TRUE;
 		}
diff --git a/org.adempiere.base/src/org/compiere/model/MCalendar.java b/org.adempiere.base/src/org/compiere/model/MCalendar.java
index 2f20ef7649..34f149e340 100644
--- a/org.adempiere.base/src/org/compiere/model/MCalendar.java
+++ b/org.adempiere.base/src/org/compiere/model/MCalendar.java
@@ -46,7 +46,7 @@ public class MCalendar extends X_C_Calendar
 	 */
 	public static MCalendar get (Properties ctx, int C_Calendar_ID)
 	{
-		Integer key = new Integer (C_Calendar_ID);
+		Integer key = Integer.valueOf(C_Calendar_ID);
 		MCalendar retValue = (MCalendar) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MCash.java b/org.adempiere.base/src/org/compiere/model/MCash.java
index 289be65292..501fc0a77a 100644
--- a/org.adempiere.base/src/org/compiere/model/MCash.java
+++ b/org.adempiere.base/src/org/compiere/model/MCash.java
@@ -54,7 +54,7 @@ public class MCash extends X_C_Cash implements DocAction
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -1221144207418749593L;
+	private static final long serialVersionUID = -7632011237765946083L;
 
 
 	/**
@@ -203,9 +203,9 @@ public class MCash extends X_C_Cash implements DocAction
 	}	//	MCash
 	
 	/**	Lines					*/
-	private MCashLine[]		m_lines = null;
+	protected MCashLine[]		m_lines = null;
 	/** CashBook				*/
-	private MCashBook		m_book = null;
+	protected MCashBook		m_book = null;
 	
 	/**
 	 * 	Get Lines
@@ -324,9 +324,9 @@ public class MCash extends X_C_Cash implements DocAction
 	}	//	process
 	
 	/**	Process Message 			*/
-	private String		m_processMsg = null;
+	protected String		m_processMsg = null;
 	/**	Just Prepared Flag			*/
-	private boolean		m_justPrepared = false;
+	protected boolean		m_justPrepared = false;
 
 	/**
 	 * 	Unlock Document.
@@ -593,7 +593,7 @@ public class MCash extends X_C_Cash implements DocAction
 	 * 	Period needs to be open
 	 *	@return true if reversed
 	 */
-	private boolean reverseIt() 
+	protected boolean reverseIt() 
 	{
 		if (DOCSTATUS_Closed.equals(getDocStatus())
 			|| DOCSTATUS_Reversed.equals(getDocStatus())
diff --git a/org.adempiere.base/src/org/compiere/model/MCashBook.java b/org.adempiere.base/src/org/compiere/model/MCashBook.java
index d486d503e2..1a02dece78 100644
--- a/org.adempiere.base/src/org/compiere/model/MCashBook.java
+++ b/org.adempiere.base/src/org/compiere/model/MCashBook.java
@@ -57,7 +57,7 @@ public class MCashBook extends X_C_CashBook
 	 */
 	public static MCashBook get(Properties ctx, int C_CashBook_ID, String trxName)
 	{
-		Integer key = new Integer (C_CashBook_ID);
+		Integer key = Integer.valueOf(C_CashBook_ID);
 		MCashBook retValue = (MCashBook) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
@@ -93,7 +93,7 @@ public class MCashBook extends X_C_CashBook
 		.first();
 		if (retValue!=null)
 			{
-				Integer key = new Integer (retValue.getC_CashBook_ID());
+				Integer key = Integer.valueOf(retValue.getC_CashBook_ID());
 				s_cache.put (key, retValue);
 			}
 		return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MCashLine.java b/org.adempiere.base/src/org/compiere/model/MCashLine.java
index 089492f502..e98eaccff8 100644
--- a/org.adempiere.base/src/org/compiere/model/MCashLine.java
+++ b/org.adempiere.base/src/org/compiere/model/MCashLine.java
@@ -42,7 +42,7 @@ public class MCashLine extends X_C_CashLine
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 2962077554051498950L;
+	private static final long serialVersionUID = 5023249596033465923L;
 
 
 	/**
@@ -90,13 +90,13 @@ public class MCashLine extends X_C_CashLine
 	}	//	MCashLine
 
 	/** Parent					*/
-	private MCash			m_parent = null;
+	protected MCash		m_parent = null;
 	/** Cash Book				*/
-	private MCashBook 		m_cashBook = null;
+	protected MCashBook 	m_cashBook = null;
 	/** Bank Account			*/
-	private MBankAccount 	m_bankAccount = null;
+	protected MBankAccount 	m_bankAccount = null;
 	/** Invoice					*/
-	private MInvoice		m_invoice = null;
+	protected MInvoice		m_invoice = null;
 	
 
 	/**
@@ -395,7 +395,7 @@ public class MCashLine extends X_C_CashLine
 	 * 	Statement Difference, Ending Balance
 	 *	@return true if success
 	 */
-	private boolean updateHeader()
+	protected boolean updateHeader()
 	{
 		String sql = "UPDATE C_Cash c"
 			+ " SET StatementDifference="
diff --git a/org.adempiere.base/src/org/compiere/model/MCashPlanLine.java b/org.adempiere.base/src/org/compiere/model/MCashPlanLine.java
index 5a4eb39386..046e8a8f39 100644
--- a/org.adempiere.base/src/org/compiere/model/MCashPlanLine.java
+++ b/org.adempiere.base/src/org/compiere/model/MCashPlanLine.java
@@ -32,7 +32,7 @@ public class MCashPlanLine extends X_C_CashPlanLine
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 3897658515979106674L;
+	private static final long serialVersionUID = -5535407146793681944L;
 
 	/**	Logger			*/
 	@SuppressWarnings("unused")
@@ -110,7 +110,7 @@ public class MCashPlanLine extends X_C_CashPlanLine
 	 *	Update Header
 	 *	@return true if header updated
 	 */
-	private boolean updateHeader()
+	protected boolean updateHeader()
 	{
 		//	Update Cash Plan Header
 		StringBuilder sql = new StringBuilder("UPDATE C_CashPlan ")
diff --git a/org.adempiere.base/src/org/compiere/model/MChangeLog.java b/org.adempiere.base/src/org/compiere/model/MChangeLog.java
index a282041244..8ed28049c6 100644
--- a/org.adempiere.base/src/org/compiere/model/MChangeLog.java
+++ b/org.adempiere.base/src/org/compiere/model/MChangeLog.java
@@ -72,7 +72,7 @@ public class MChangeLog extends X_AD_ChangeLog
 			pstmt = DB.prepareStatement(sql, null);
 			rs = pstmt.executeQuery();
 			while (rs.next())
-				list.add(new Integer(rs.getInt(1)));
+				list.add(Integer.valueOf(rs.getInt(1)));
 		}
 		catch (Exception e)
 		{
diff --git a/org.adempiere.base/src/org/compiere/model/MCharge.java b/org.adempiere.base/src/org/compiere/model/MCharge.java
index 2432e6a13e..9b3133053e 100644
--- a/org.adempiere.base/src/org/compiere/model/MCharge.java
+++ b/org.adempiere.base/src/org/compiere/model/MCharge.java
@@ -87,7 +87,7 @@ public class MCharge extends X_C_Charge
 	 */
 	public static MCharge get (Properties ctx, int C_Charge_ID)
 	{
-		Integer key = new Integer (C_Charge_ID);
+		Integer key = Integer.valueOf(C_Charge_ID);
 		MCharge retValue = (MCharge)s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MChatType.java b/org.adempiere.base/src/org/compiere/model/MChatType.java
index 1dac912ea0..71a2daa810 100644
--- a/org.adempiere.base/src/org/compiere/model/MChatType.java
+++ b/org.adempiere.base/src/org/compiere/model/MChatType.java
@@ -42,7 +42,7 @@ public class MChatType extends X_CM_ChatType
 	 */
 	public static MChatType get (Properties ctx, int CM_ChatType_ID)
 	{
-		Integer key = new Integer (CM_ChatType_ID);
+		Integer key = Integer.valueOf(CM_ChatType_ID);
 		MChatType retValue = (MChatType)s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MCity.java b/org.adempiere.base/src/org/compiere/model/MCity.java
index ada89eebbc..0cb3c8701c 100644
--- a/org.adempiere.base/src/org/compiere/model/MCity.java
+++ b/org.adempiere.base/src/org/compiere/model/MCity.java
@@ -46,7 +46,7 @@ public class MCity extends X_C_City
 	 */
 	public static MCity get (Properties ctx, int C_City_ID)
 	{
-		Integer key = new Integer (C_City_ID);
+		Integer key = Integer.valueOf(C_City_ID);
 		MCity r = s_Cities.get(key);
 		if (r != null)
 			return r;
diff --git a/org.adempiere.base/src/org/compiere/model/MClient.java b/org.adempiere.base/src/org/compiere/model/MClient.java
index 21589b1d96..569744b792 100644
--- a/org.adempiere.base/src/org/compiere/model/MClient.java
+++ b/org.adempiere.base/src/org/compiere/model/MClient.java
@@ -66,7 +66,7 @@ public class MClient extends X_AD_Client
 	 */
 	public static MClient get (Properties ctx, int AD_Client_ID)
 	{
-		Integer key = new Integer (AD_Client_ID);
+		Integer key = Integer.valueOf(AD_Client_ID);
 		MClient client = (MClient)s_cache.get(key);
 		if (client != null)
 			return client;
@@ -97,7 +97,7 @@ public class MClient extends X_AD_Client
 		.setOrderBy(orderBy)
 		.list();
 		for(MClient client:list ){
-			s_cache.put (new Integer (client.getAD_Client_ID()), client);
+			s_cache.put (Integer.valueOf(client.getAD_Client_ID()), client);
 		}
 		MClient[] retValue = new MClient[list.size ()];
 		list.toArray (retValue);
diff --git a/org.adempiere.base/src/org/compiere/model/MClientInfo.java b/org.adempiere.base/src/org/compiere/model/MClientInfo.java
index 49e44cd991..9e1fe9f94b 100644
--- a/org.adempiere.base/src/org/compiere/model/MClientInfo.java
+++ b/org.adempiere.base/src/org/compiere/model/MClientInfo.java
@@ -61,7 +61,7 @@ public class MClientInfo extends X_AD_ClientInfo
 	 */
 	public static MClientInfo get (Properties ctx, int AD_Client_ID, String trxName)
 	{
-		Integer key = new Integer (AD_Client_ID);
+		Integer key = Integer.valueOf(AD_Client_ID);
 		MClientInfo info = (MClientInfo)s_cache.get(key);
 		if (info != null)
 			return info;
diff --git a/org.adempiere.base/src/org/compiere/model/MColorSchema.java b/org.adempiere.base/src/org/compiere/model/MColorSchema.java
index e69810a679..79521528a1 100644
--- a/org.adempiere.base/src/org/compiere/model/MColorSchema.java
+++ b/org.adempiere.base/src/org/compiere/model/MColorSchema.java
@@ -18,6 +18,7 @@ package org.compiere.model;
 
 import java.awt.Color;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.ResultSet;
 import java.util.Properties;
 
@@ -54,7 +55,7 @@ public class MColorSchema extends X_PA_ColorSchema
 			&& target != null && target.signum() != 0)
 		{
 			BigDecimal pp = actual.multiply(Env.ONEHUNDRED)
-				.divide(target, 0, BigDecimal.ROUND_HALF_UP);
+				.divide(target, 0, RoundingMode.HALF_UP);
 			percent = pp.intValue();
 		}
 		return getColor(ctx, PA_ColorSchema_ID, percent);
@@ -88,7 +89,7 @@ public class MColorSchema extends X_PA_ColorSchema
 			retValue.setDefault();
 			return retValue;
 		}
-		Integer key = new Integer (PA_ColorSchema_ID);
+		Integer key = Integer.valueOf(PA_ColorSchema_ID);
 		MColorSchema retValue = (MColorSchema)s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MColumn.java b/org.adempiere.base/src/org/compiere/model/MColumn.java
index 54b99947d4..93dd0e0a67 100644
--- a/org.adempiere.base/src/org/compiere/model/MColumn.java
+++ b/org.adempiere.base/src/org/compiere/model/MColumn.java
@@ -66,7 +66,7 @@ public class MColumn extends X_AD_Column
 	 */
 	public static MColumn get(Properties ctx, int AD_Column_ID, String trxName)
 	{
-		Integer key = new Integer (AD_Column_ID);
+		Integer key = Integer.valueOf(AD_Column_ID);
 		MColumn retValue = (MColumn) s_cache.get (key);
 		if (retValue != null) {
 			retValue.set_TrxName(trxName);
diff --git a/org.adempiere.base/src/org/compiere/model/MConversionRate.java b/org.adempiere.base/src/org/compiere/model/MConversionRate.java
index 009cd24b82..74c8de8287 100644
--- a/org.adempiere.base/src/org/compiere/model/MConversionRate.java
+++ b/org.adempiere.base/src/org/compiere/model/MConversionRate.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
@@ -142,7 +143,7 @@ public class MConversionRate extends X_C_Conversion_Rate
 		int stdPrecision = isCosting ? MCurrency.getCostingPrecision(ctx, CurTo_ID): MCurrency.getStdPrecision(ctx, CurTo_ID);		
 
 		if (retValue.scale() > stdPrecision)
-			retValue = retValue.setScale(stdPrecision, BigDecimal.ROUND_HALF_UP);
+			retValue = retValue.setScale(stdPrecision, RoundingMode.HALF_UP);
 			
 		return retValue;
 	}	//	convert
diff --git a/org.adempiere.base/src/org/compiere/model/MConversionType.java b/org.adempiere.base/src/org/compiere/model/MConversionType.java
index 93b9bc42f2..1fc540b595 100644
--- a/org.adempiere.base/src/org/compiere/model/MConversionType.java
+++ b/org.adempiere.base/src/org/compiere/model/MConversionType.java
@@ -52,7 +52,7 @@ public class MConversionType extends X_C_ConversionType
 	public static int getDefault (int AD_Client_ID)
 	{
 		//	Try Cache
-		Integer key = new Integer (AD_Client_ID);
+		Integer key = Integer.valueOf(AD_Client_ID);
 		Integer ii = (Integer)s_cache.get(key);
 		if (ii != null)
 			return ii.intValue();
@@ -66,7 +66,7 @@ public class MConversionType extends X_C_ConversionType
 			+ "ORDER BY IsDefault DESC, AD_Client_ID DESC";
 		C_ConversionType_ID = DB.getSQLValue(null, sql, AD_Client_ID);
 		//	Return
-		s_cache.put(key, new Integer(C_ConversionType_ID));
+		s_cache.put(key, Integer.valueOf(C_ConversionType_ID));
 		return C_ConversionType_ID;
 	}	//	getDefault
 	
diff --git a/org.adempiere.base/src/org/compiere/model/MCost.java b/org.adempiere.base/src/org/compiere/model/MCost.java
index e99068a6bb..f30b3845be 100644
--- a/org.adempiere.base/src/org/compiere/model/MCost.java
+++ b/org.adempiere.base/src/org/compiere/model/MCost.java
@@ -18,6 +18,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -59,7 +60,7 @@ public class MCost extends X_M_Cost
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -8904980122276406878L;
+	private static final long serialVersionUID = -9054858267574839079L;
 
 	/**
 	 * 	Retrieve/Calculate Current Cost Price
@@ -123,7 +124,7 @@ public class MCost extends X_M_Cost
 	 *	@param trxName trx
 	 *	@return cost price or null
 	 */
-	private static BigDecimal getCurrentCost (MProduct product, int M_ASI_ID,
+	protected static BigDecimal getCurrentCost (MProduct product, int M_ASI_ID,
 		MAcctSchema as, int Org_ID, int M_CostType_ID,
 		String costingMethod, BigDecimal qty, int C_OrderLine_ID,
 		boolean zeroCostsOK, String trxName)
@@ -243,15 +244,15 @@ public class MCost extends X_M_Cost
 		if (percentage.signum() == 0)	//	no percentages
 		{
 			if (costs.scale() > precision)
-				costs = costs.setScale(precision, BigDecimal.ROUND_HALF_UP);
+				costs = costs.setScale(precision, RoundingMode.HALF_UP);
 			return costs;
 		}
 		//
 		BigDecimal percentCost = costs.multiply(percentage);
-		percentCost = percentCost.divide(Env.ONEHUNDRED, precision, BigDecimal.ROUND_HALF_UP);
+		percentCost = percentCost.divide(Env.ONEHUNDRED, precision, RoundingMode.HALF_UP);
 		costs = costs.add(percentCost);
 		if (costs.scale() > precision)
-			costs = costs.setScale(precision, BigDecimal.ROUND_HALF_UP);
+			costs = costs.setScale(precision, RoundingMode.HALF_UP);
 		if (s_log.isLoggable(Level.FINER)) s_log.finer("Sum Costs = " + costs + " (Add=" + percentCost + ")");
 		return costs;
 	}	//	getCurrentCost
@@ -420,7 +421,7 @@ public class MCost extends X_M_Cost
 	}	//	getSeedCosts
 
 
-	private static BigDecimal getSeedCostFromPriceList(MProduct product,
+	protected static BigDecimal getSeedCostFromPriceList(MProduct product,
 			MAcctSchema as, int orgID) {
 		String sql = "SELECT pp.PriceList, pp.PriceStd FROM M_ProductPrice pp" +
 				" INNER JOIN M_PriceList_Version plv ON (pp.M_PriceList_Version_ID = plv.M_PriceList_Version_ID AND plv.ValidFrom <= trunc(sysdate))" +
@@ -921,8 +922,8 @@ public class MCost extends X_M_Cost
 				BigDecimal averageCurrent = oldStockQty.multiply(oldAverageAmt);
 				BigDecimal averageIncrease = matchQty.multiply(cost);
 				BigDecimal newAmt = averageCurrent.add(averageIncrease);
-				newAmt = newAmt.setScale(as.getCostingPrecision(), BigDecimal.ROUND_HALF_UP);
-				newAverageAmt = newAmt.divide(newStockQty, as.getCostingPrecision(), BigDecimal.ROUND_HALF_UP);
+				newAmt = newAmt.setScale(as.getCostingPrecision(), RoundingMode.HALF_UP);
+				newAverageAmt = newAmt.divide(newStockQty, as.getCostingPrecision(), RoundingMode.HALF_UP);
 				if (s_log.isLoggable(Level.FINER)) s_log.finer("Movement=" + movementQty + ", StockQty=" + newStockQty
 					+ ", Match=" + matchQty + ", Cost=" + cost + ", NewAvg=" + newAverageAmt);
 			}
@@ -1017,8 +1018,8 @@ public class MCost extends X_M_Cost
 				BigDecimal averageCurrent = oldStockQty.multiply(oldAverageAmt);
 				BigDecimal averageIncrease = matchQty.multiply(cost);
 				BigDecimal newAmt = averageCurrent.add(averageIncrease);
-				newAmt = newAmt.setScale(as.getCostingPrecision(), BigDecimal.ROUND_HALF_UP);
-				newAverageAmt = newAmt.divide(newStockQty, as.getCostingPrecision(), BigDecimal.ROUND_HALF_UP);
+				newAmt = newAmt.setScale(as.getCostingPrecision(), RoundingMode.HALF_UP);
+				newAverageAmt = newAmt.divide(newStockQty, as.getCostingPrecision(), RoundingMode.HALF_UP);
 				if (s_log.isLoggable(Level.FINER)) s_log.finer("Movement=" + movementQty + ", StockQty=" + newStockQty
 					+ ", Match=" + matchQty + ", Cost=" + cost + ", NewAvg=" + newAverageAmt);
 			}
@@ -1485,7 +1486,7 @@ public class MCost extends X_M_Cost
 	}	//	MCost
 
 	/** Data is entered Manually		*/
-	private boolean m_manual = true;
+	protected boolean m_manual = true;
 
 	/**
 	 * 	Add Cumulative Amt/Qty and Current Qty
@@ -1539,12 +1540,12 @@ public class MCost extends X_M_Cost
 		if (sumQty.signum() != 0)
 		{
 			BigDecimal oldSum = getCurrentCostPrice().multiply(getCurrentQty());
-			BigDecimal oldCost = oldSum.divide(sumQty, 12, BigDecimal.ROUND_HALF_UP);
-			BigDecimal newCost = amt.divide(sumQty, 12, BigDecimal.ROUND_HALF_UP); //amt is total already
+			BigDecimal oldCost = oldSum.divide(sumQty, 12, RoundingMode.HALF_UP);
+			BigDecimal newCost = amt.divide(sumQty, 12, RoundingMode.HALF_UP); //amt is total already
 			BigDecimal cost = oldCost.add(newCost);
 			if (cost.scale() > (getPrecision()*2))
 			{
-				cost = cost.setScale((getPrecision()*2), BigDecimal.ROUND_HALF_UP);
+				cost = cost.setScale((getPrecision()*2), RoundingMode.HALF_UP);
 			}
 			setCurrentCostPrice(cost);
 		}
@@ -1562,7 +1563,7 @@ public class MCost extends X_M_Cost
 		BigDecimal cost = amtUnit;
 		if (cost.scale() > (getPrecision()*2))
 		{
-			cost = cost.setScale((getPrecision()*2), BigDecimal.ROUND_HALF_UP);
+			cost = cost.setScale((getPrecision()*2), RoundingMode.HALF_UP);
 		}
 		setCurrentCostPrice(cost);
 	}	//	setWeightedAverageInitial
@@ -1571,7 +1572,7 @@ public class MCost extends X_M_Cost
 	 * 	Get Costing Precision
 	 *	@return precision (6)
 	 */
-	private int getPrecision()
+	protected int getPrecision()
 	{
 		MAcctSchema as = MAcctSchema.get(getCtx(), getC_AcctSchema_ID());
 		if (as != null)
@@ -1601,7 +1602,7 @@ public class MCost extends X_M_Cost
 		if (getCumulatedQty().signum() != 0
 			&& getCumulatedAmt().signum() != 0)
 			retValue = getCumulatedAmt()
-				.divide(getCumulatedQty(), getPrecision(), BigDecimal.ROUND_HALF_UP);
+				.divide(getCumulatedQty(), getPrecision(), RoundingMode.HALF_UP);
 		return retValue;
 	}	//	getHistoryAverage
 
diff --git a/org.adempiere.base/src/org/compiere/model/MCostDetail.java b/org.adempiere.base/src/org/compiere/model/MCostDetail.java
index 5c0f126e4d..14ac88cf36 100644
--- a/org.adempiere.base/src/org/compiere/model/MCostDetail.java
+++ b/org.adempiere.base/src/org/compiere/model/MCostDetail.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.List;
@@ -50,9 +51,9 @@ public class MCostDetail extends X_M_CostDetail
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -448632684360931078L;
+	private static final long serialVersionUID = -3896161579785627935L;
 
-	private static final String INOUTLINE_DOCBASETYPE_SQL =
+	protected static final String INOUTLINE_DOCBASETYPE_SQL =
 		    "SELECT c.DocBaseType From M_InOut io " +
 			"INNER JOIN M_InOutLine iol ON io.M_InOut_ID=iol.M_InOut_ID " +
 			"INNER JOIN C_DocType c ON io.C_DocType_ID=c.C_DocType_ID " +
@@ -982,7 +983,7 @@ public class MCostDetail extends X_M_CostDetail
 	 *	@param M_ASI_ID - asi corrected for costing level
 	 *	@return true if cost ok
 	 */
-	private boolean process (MAcctSchema as, MProduct product, MCostElement ce, 
+	protected boolean process (MAcctSchema as, MProduct product, MCostElement ce, 
 		int Org_ID, int M_ASI_ID)
 	{
 		//handle compatibility issue between average invoice and average po
@@ -1047,7 +1048,7 @@ public class MCostDetail extends X_M_CostDetail
 		int precision = as.getCostingPrecision();
 		BigDecimal price = amt;
 		if (qty.signum() != 0)
-			price = amt.divide(qty, precision, BigDecimal.ROUND_HALF_UP);
+			price = amt.divide(qty, precision, RoundingMode.HALF_UP);
 		
 		/** All Costing Methods
 		if (ce.isAverageInvoice())
diff --git a/org.adempiere.base/src/org/compiere/model/MCostElement.java b/org.adempiere.base/src/org/compiere/model/MCostElement.java
index 4c66911436..f5ee4f7620 100644
--- a/org.adempiere.base/src/org/compiere/model/MCostElement.java
+++ b/org.adempiere.base/src/org/compiere/model/MCostElement.java
@@ -44,7 +44,7 @@ public class MCostElement extends X_M_CostElement
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 3196322266971717530L;
+	private static final long serialVersionUID = 3423495977508725440L;
 
 
 	/**
@@ -186,7 +186,7 @@ public class MCostElement extends X_M_CostElement
 	 */
 	public static MCostElement get (Properties ctx, int M_CostElement_ID)
 	{
-		Integer key = new Integer (M_CostElement_ID);
+		Integer key = Integer.valueOf(M_CostElement_ID);
 		MCostElement retValue = (MCostElement) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
@@ -232,7 +232,7 @@ public class MCostElement extends X_M_CostElement
 	}	
 
 	/**	Cache						*/
-	private static CCache<Integer,MCostElement>	s_cache	= new CCache<Integer,MCostElement>(Table_Name, 20);
+	protected static CCache<Integer,MCostElement>	s_cache	= new CCache<Integer,MCostElement>(Table_Name, 20);
 	
 	/**	Logger	*/
 	private static CLogger	s_log	= CLogger.getCLogger (MCostElement.class);
diff --git a/org.adempiere.base/src/org/compiere/model/MCostQueue.java b/org.adempiere.base/src/org/compiere/model/MCostQueue.java
index 6f2aaa21aa..93972b1c01 100644
--- a/org.adempiere.base/src/org/compiere/model/MCostQueue.java
+++ b/org.adempiere.base/src/org/compiere/model/MCostQueue.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.ArrayList;
@@ -381,7 +382,7 @@ public class MCostQueue extends X_M_CostQueue
 		BigDecimal sumQty = getCurrentQty().add(qty);
 		if (sumQty.signum() != 0)
 		{
-			BigDecimal cost = sumAmt.divide(sumQty, precision, BigDecimal.ROUND_HALF_UP);
+			BigDecimal cost = sumAmt.divide(sumQty, precision, RoundingMode.HALF_UP);
 			setCurrentCostPrice(cost);
 		}
 		//
diff --git a/org.adempiere.base/src/org/compiere/model/MCurrency.java b/org.adempiere.base/src/org/compiere/model/MCurrency.java
index daf865d361..efae23d85f 100644
--- a/org.adempiere.base/src/org/compiere/model/MCurrency.java
+++ b/org.adempiere.base/src/org/compiere/model/MCurrency.java
@@ -125,7 +125,7 @@ public class MCurrency extends X_C_Currency
 	public static MCurrency get (Properties ctx, int C_Currency_ID)
 	{
 		//	Try Cache
-		Integer key = new Integer(C_Currency_ID);
+		Integer key = Integer.valueOf(C_Currency_ID);
 		MCurrency retValue = (MCurrency)s_currencies.get(key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MDesktop.java b/org.adempiere.base/src/org/compiere/model/MDesktop.java
index 98f0eb066e..88ab8c587c 100644
--- a/org.adempiere.base/src/org/compiere/model/MDesktop.java
+++ b/org.adempiere.base/src/org/compiere/model/MDesktop.java
@@ -223,7 +223,7 @@ public class MDesktop
 			while (rs.next())
 			{
 				int AD_Workbench_ID = rs.getInt(1);
-				m_workbenches.add (new Integer(AD_Workbench_ID));
+				m_workbenches.add (Integer.valueOf(AD_Workbench_ID));
 			}
 		}
 		catch (SQLException e)
diff --git a/org.adempiere.base/src/org/compiere/model/MDiscountSchema.java b/org.adempiere.base/src/org/compiere/model/MDiscountSchema.java
index 292baccabf..4342710982 100644
--- a/org.adempiere.base/src/org/compiere/model/MDiscountSchema.java
+++ b/org.adempiere.base/src/org/compiere/model/MDiscountSchema.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.ArrayList;
@@ -50,7 +51,7 @@ public class MDiscountSchema extends X_M_DiscountSchema
 	 */
 	public static MDiscountSchema get (Properties ctx, int M_DiscountSchema_ID)
 	{
-		Integer key = new Integer (M_DiscountSchema_ID);
+		Integer key = Integer.valueOf(M_DiscountSchema_ID);
 		MDiscountSchema retValue = (MDiscountSchema) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
@@ -203,7 +204,7 @@ public class MDiscountSchema extends X_M_DiscountSchema
 		//
 		BigDecimal onehundred = Env.ONEHUNDRED;
 		BigDecimal multiplier = (onehundred).subtract(discount);
-		multiplier = multiplier.divide(onehundred, 6, BigDecimal.ROUND_HALF_UP);
+		multiplier = multiplier.divide(onehundred, 6, RoundingMode.HALF_UP);
 		BigDecimal newPrice = Price.multiply(multiplier);
 		if (log.isLoggable(Level.FINE)) log.fine("=>" + newPrice);
 		return newPrice;
diff --git a/org.adempiere.base/src/org/compiere/model/MDistribution.java b/org.adempiere.base/src/org/compiere/model/MDistribution.java
index 963dc65f67..d3cb7d288e 100644
--- a/org.adempiere.base/src/org/compiere/model/MDistribution.java
+++ b/org.adempiere.base/src/org/compiere/model/MDistribution.java
@@ -153,7 +153,7 @@ public class MDistribution extends X_GL_Distribution
 	 */
 	public static MDistribution[] get (Properties ctx, int Account_ID)
 	{
-		Integer key = new Integer (Account_ID);
+		Integer key = Integer.valueOf(Account_ID);
 		MDistribution[] retValue = (MDistribution[])s_accounts.get(key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MDistributionLine.java b/org.adempiere.base/src/org/compiere/model/MDistributionLine.java
index 637fe98f16..643ca8c73b 100644
--- a/org.adempiere.base/src/org/compiere/model/MDistributionLine.java
+++ b/org.adempiere.base/src/org/compiere/model/MDistributionLine.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.ResultSet;
 import java.util.Properties;
 
@@ -193,7 +194,7 @@ public class MDistributionLine extends X_GL_DistributionLine
 	public void calculateAmt (BigDecimal amt, int precision)
 	{
 		m_amt = amt.multiply(getPercent());
-		m_amt = m_amt.divide(Env.ONEHUNDRED, precision, BigDecimal.ROUND_HALF_UP);
+		m_amt = m_amt.divide(Env.ONEHUNDRED, precision, RoundingMode.HALF_UP);
 	}	//	setAmt
 
 	/**
@@ -203,7 +204,7 @@ public class MDistributionLine extends X_GL_DistributionLine
 	public void calculateQty (BigDecimal qty)
 	{
 		m_qty = qty.multiply(getPercent());
-		m_qty = m_qty.divide(Env.ONEHUNDRED, BigDecimal.ROUND_HALF_UP);
+		m_qty = m_qty.divide(Env.ONEHUNDRED, RoundingMode.HALF_UP);
 	}	//	setAmt
 
 	
diff --git a/org.adempiere.base/src/org/compiere/model/MDistributionRunDetail.java b/org.adempiere.base/src/org/compiere/model/MDistributionRunDetail.java
index c4c54a2292..9652fb934e 100644
--- a/org.adempiere.base/src/org/compiere/model/MDistributionRunDetail.java
+++ b/org.adempiere.base/src/org/compiere/model/MDistributionRunDetail.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.ArrayList;
@@ -121,13 +122,13 @@ public class MDistributionRunDetail extends X_T_DistributionRunDetail
 		BigDecimal min = getMinQty();
 		if (min.scale() > m_precision)
 		{
-			setMinQty(min.setScale(m_precision, BigDecimal.ROUND_HALF_UP));
+			setMinQty(min.setScale(m_precision, RoundingMode.HALF_UP));
 			dirty = true;
 		}
 		BigDecimal qty = getQty();
 		if (qty.scale() > m_precision)
 		{
-			setQty(qty.setScale(m_precision, BigDecimal.ROUND_HALF_UP));
+			setQty(qty.setScale(m_precision, RoundingMode.HALF_UP));
 			dirty = true;
 		}
 		if (dirty)
@@ -162,7 +163,7 @@ public class MDistributionRunDetail extends X_T_DistributionRunDetail
 	 */
 	public BigDecimal adjustQty (BigDecimal difference)
 	{
-		BigDecimal diff = difference.setScale(m_precision, BigDecimal.ROUND_HALF_UP);
+		BigDecimal diff = difference.setScale(m_precision, RoundingMode.HALF_UP);
 		BigDecimal qty = getQty();
 		BigDecimal max = getMinQty().subtract(qty);
 		BigDecimal remaining = Env.ZERO;
diff --git a/org.adempiere.base/src/org/compiere/model/MDocTypeCounter.java b/org.adempiere.base/src/org/compiere/model/MDocTypeCounter.java
index 07e560db8c..c1514643d7 100644
--- a/org.adempiere.base/src/org/compiere/model/MDocTypeCounter.java
+++ b/org.adempiere.base/src/org/compiere/model/MDocTypeCounter.java
@@ -90,7 +90,7 @@ public class MDocTypeCounter extends X_C_DocTypeCounter
 	 */
 	public static MDocTypeCounter getCounterDocType (Properties ctx, int C_DocType_ID)
 	{
-		Integer key = new Integer (C_DocType_ID);
+		Integer key = Integer.valueOf(C_DocType_ID);
 		MDocTypeCounter retValue = (MDocTypeCounter)s_counter.get(key);
 		if (retValue != null)
 			return retValue;
@@ -141,7 +141,7 @@ public class MDocTypeCounter extends X_C_DocTypeCounter
 	 */
 	public static MDocTypeCounter get (Properties ctx, int C_DocTypeCounter_ID, String trxName)
 	{
-		Integer key = new Integer (C_DocTypeCounter_ID);
+		Integer key = Integer.valueOf(C_DocTypeCounter_ID);
 		MDocTypeCounter retValue = (MDocTypeCounter) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MGLCategory.java b/org.adempiere.base/src/org/compiere/model/MGLCategory.java
index af392f5d7e..cab8f91794 100644
--- a/org.adempiere.base/src/org/compiere/model/MGLCategory.java
+++ b/org.adempiere.base/src/org/compiere/model/MGLCategory.java
@@ -48,7 +48,7 @@ public class MGLCategory extends X_GL_Category
 	 */
 	public static MGLCategory get (Properties ctx, int GL_Category_ID)
 	{
-		Integer key = new Integer (GL_Category_ID);
+		Integer key = Integer.valueOf(GL_Category_ID);
 		MGLCategory retValue = (MGLCategory)s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MGoal.java b/org.adempiere.base/src/org/compiere/model/MGoal.java
index fbafd6b4b4..aa07f18e4c 100644
--- a/org.adempiere.base/src/org/compiere/model/MGoal.java
+++ b/org.adempiere.base/src/org/compiere/model/MGoal.java
@@ -18,6 +18,7 @@ package org.compiere.model;
 
 import java.awt.Color;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
@@ -416,7 +417,7 @@ public class MGoal extends X_PA_Goal
 		BigDecimal MeasureActual = getMeasureActual();
 		BigDecimal GoalPerformance = Env.ZERO;
 		if (MeasureTarget.signum() != 0)
-			GoalPerformance = MeasureActual.divide(MeasureTarget, 6, BigDecimal.ROUND_HALF_UP);
+			GoalPerformance = MeasureActual.divide(MeasureTarget, 6, RoundingMode.HALF_UP);
 		super.setGoalPerformance (GoalPerformance);
 		m_color = null;
 	}	//	setGoalPerformance
diff --git a/org.adempiere.base/src/org/compiere/model/MGroup.java b/org.adempiere.base/src/org/compiere/model/MGroup.java
index c2f602a7b1..1425a9c8e7 100644
--- a/org.adempiere.base/src/org/compiere/model/MGroup.java
+++ b/org.adempiere.base/src/org/compiere/model/MGroup.java
@@ -42,7 +42,7 @@ public class MGroup extends X_R_Group
 	 */
 	public static MGroup get (Properties ctx, int R_Group_ID)
 	{
-		Integer key = new Integer (R_Group_ID);
+		Integer key = Integer.valueOf(R_Group_ID);
 		MGroup retValue = (MGroup) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MHierarchy.java b/org.adempiere.base/src/org/compiere/model/MHierarchy.java
index dd1120eb6f..9200d66ada 100644
--- a/org.adempiere.base/src/org/compiere/model/MHierarchy.java
+++ b/org.adempiere.base/src/org/compiere/model/MHierarchy.java
@@ -42,7 +42,7 @@ public class MHierarchy extends X_PA_Hierarchy
 	 */
 	public static MHierarchy get (Properties ctx, int PA_Hierarchy_ID)
 	{
-		Integer key = new Integer (PA_Hierarchy_ID);
+		Integer key = Integer.valueOf(PA_Hierarchy_ID);
 		MHierarchy retValue = (MHierarchy)s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MHouseKeeping.java b/org.adempiere.base/src/org/compiere/model/MHouseKeeping.java
new file mode 100644
index 0000000000..67eb99316b
--- /dev/null
+++ b/org.adempiere.base/src/org/compiere/model/MHouseKeeping.java
@@ -0,0 +1,61 @@
+/**********************************************************************
+* This file is part of iDempiere ERP Open Source                      *
+* http://www.idempiere.org                                            *
+*                                                                     *
+* Copyright (C) Contributors                                          *
+*                                                                     *
+* This program is free software; you can redistribute it and/or       *
+* modify it under the terms of the GNU General Public License         *
+* as published by the Free Software Foundation; either version 2      *
+* of the License, or (at your option) any later version.              *
+*                                                                     *
+* This program is distributed in the hope that it will be useful,     *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of      *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        *
+* GNU General Public License for more details.                        *
+*                                                                     *
+* You should have received a copy of the GNU General Public License   *
+* along with this program; if not, write to the Free Software         *
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,          *
+* MA 02110-1301, USA.                                                 *
+*                                                                     *
+* Contributors:                                                       *
+* - TrekGlobal                                                        *
+* - Carlos Ruiz - globalqss                                           *
+**********************************************************************/
+package org.compiere.model;
+
+import java.sql.ResultSet;
+import java.util.Properties;
+
+import org.compiere.util.Msg;
+
+public class MHouseKeeping extends X_AD_HouseKeeping {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 6481567026614278994L;
+
+	public MHouseKeeping(Properties ctx, int AD_HouseKeeping_ID, String trxName) {
+		super(ctx, AD_HouseKeeping_ID, trxName);
+	}
+
+	public MHouseKeeping(Properties ctx, ResultSet rs, String trxName) {
+		super(ctx, rs, trxName);
+	}
+
+	@Override
+	protected boolean beforeSave(boolean newRecord) {
+		if (getAD_Table_ID() > 0) {
+			setTableName(null);
+		} else if (getTableName() != null) {
+			setIsExportXMLBackup(false);
+			setBackupFolder(null);
+		} else {
+			log.saveError("SaveError", Msg.parseTranslation(getCtx(), "@FillMandatory@ @AD_Table_ID@ @TableName@"));
+			return false;
+		}
+		return true;
+	}
+
+}
diff --git a/org.adempiere.base/src/org/compiere/model/MImage.java b/org.adempiere.base/src/org/compiere/model/MImage.java
index 2f52c87d36..b0f965684a 100644
--- a/org.adempiere.base/src/org/compiere/model/MImage.java
+++ b/org.adempiere.base/src/org/compiere/model/MImage.java
@@ -60,7 +60,7 @@ public class MImage extends X_AD_Image
 		if (AD_Image_ID == 0)
 			return new MImage (ctx, AD_Image_ID, null);
 		//
-		Integer key = new Integer (AD_Image_ID);
+		Integer key = Integer.valueOf(AD_Image_ID);
 		MImage retValue = (MImage) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MImportTemplate.java b/org.adempiere.base/src/org/compiere/model/MImportTemplate.java
index 1f3bf507ed..783e8eb007 100644
--- a/org.adempiere.base/src/org/compiere/model/MImportTemplate.java
+++ b/org.adempiere.base/src/org/compiere/model/MImportTemplate.java
@@ -13,11 +13,20 @@
  *****************************************************************************/
 package org.compiere.model;
 
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.nio.charset.Charset;
 import java.sql.ResultSet;
 import java.util.List;
 import java.util.Properties;
 
+import org.adempiere.exceptions.AdempiereException;
 import org.compiere.util.CCache;
 import org.compiere.util.CLogger;
 import org.compiere.util.DB;
@@ -132,5 +141,65 @@ public class MImportTemplate extends X_AD_ImportTemplate
 		int cnt = DB.getSQLValueEx(get_TrxName(), sql.toString(), getAD_ImportTemplate_ID(), roleID, roleID);
 		return cnt > 0;
 	}
+	
+	/**
+	 * Validate that InputStream header is CSVHeader or AliasCSVHeader
+	 * If the header is AliasCSVHeader it replaces it with the CSVHeader so it can be
+	 * processed
+	 * @param in input file
+	 * @return InputStream with the CSVHeader that can be processed by CsvMapReader
+	 */
+	public InputStream validateFile(InputStream in) {
+		// because the input stream cannot be reset we need to copy here the file to a new one (replacing the header if it's the alias)
+		Charset charset = Charset.forName(getCharacterSet());
+		BufferedReader reader = new BufferedReader(new InputStreamReader(in, charset));
+		File tmpfile = null;
+		InputStream is = null;
+		BufferedWriter bw = null;
+		try {
+			tmpfile = File.createTempFile("CSVImportAction", "csv");
+			bw = new BufferedWriter(new FileWriter(tmpfile));
+			String firstLine = null;
+			String line = null;
+			while ((line = reader.readLine()) != null) {
+				if (firstLine == null) {
+					firstLine = line;
+					/* Validate that m_file_istream header is CSVHeader or AliasCSVHeader */
+					if (   firstLine.equals(getCSVHeader())
+						|| firstLine.equals(getCSVAliasHeader())) {
+						bw.write(getCSVHeader());
+					} else {
+						reader.close();
+						throw new AdempiereException(Msg.getMsg(Env.getCtx(), "WrongCSVHeader"));
+					}
+				} else {
+					bw.write(line);
+				}
+				bw.write('\n');
+			}
+			is = new FileInputStream(tmpfile);
+		} catch (IOException e) {
+			throw new AdempiereException(e);
+		} finally {
+			if (in != null)
+				try {
+					in.close();
+				} catch (IOException e) {
+				}
+			
+			if (bw != null)
+				try {
+					bw.close();
+				} catch (IOException e) {
+				}
+			
+			if (reader != null)
+				try {
+					reader.close();
+				} catch (IOException e) {
+				}
+		}
+		return is;
+	}
 
 }	//	MImportTemplate
diff --git a/org.adempiere.base/src/org/compiere/model/MInOut.java b/org.adempiere.base/src/org/compiere/model/MInOut.java
index d02e7ea254..7691b08732 100644
--- a/org.adempiere.base/src/org/compiere/model/MInOut.java
+++ b/org.adempiere.base/src/org/compiere/model/MInOut.java
@@ -18,7 +18,10 @@ package org.compiere.model;
 
 import java.io.File;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
@@ -26,6 +29,7 @@ import java.util.Properties;
 import java.util.logging.Level;
 
 import org.adempiere.exceptions.AdempiereException;
+import org.adempiere.exceptions.DBException;
 import org.adempiere.exceptions.NegativeInventoryDisallowedException;
 import org.adempiere.exceptions.PeriodClosedException;
 import org.compiere.print.MPrintFormat;
@@ -148,7 +152,7 @@ public class MInOut extends X_M_InOut implements DocAction
 				if (oLines[i].getQtyEntered().compareTo(oLines[i].getQtyOrdered()) != 0)
 					line.setQtyEntered(lineQty
 						.multiply(oLines[i].getQtyEntered())
-						.divide(oLines[i].getQtyOrdered(), 12, BigDecimal.ROUND_HALF_UP));
+						.divide(oLines[i].getQtyOrdered(), 12, RoundingMode.HALF_UP));
 				line.setC_Project_ID(oLines[i].getC_Project_ID());
 				line.saveEx(trxName);
 				//	Delivered everything ?
@@ -2240,6 +2244,34 @@ public class MInOut extends X_M_InOut implements DocAction
 				asset.setDescription(asset.getDescription() + " (" + reversal.getDocumentNo() + " #" + rLine.getLine() + "<-)");
 				asset.saveEx();
 			}
+			// Un-Link inoutline to Invoiceline
+			String sql = "SELECT C_InvoiceLine_ID FROM C_InvoiceLine WHERE M_InOutLine_ID=?";
+			PreparedStatement pstmt = null;
+			ResultSet rs = null;
+			try
+			{
+				pstmt = DB.prepareStatement(sql, get_TrxName());
+				pstmt.setInt(1, sLines[i].getM_InOutLine_ID());
+				rs = pstmt.executeQuery();
+				while (rs.next())
+				{
+					int invoiceLineId = rs.getInt(1);
+					if (invoiceLineId > 0 ){
+						MInvoiceLine iLine = new MInvoiceLine(getCtx(),invoiceLineId , get_TrxName());
+						iLine.setM_InOutLine_ID(0);
+						iLine.saveEx();
+					}
+				}
+			}
+			catch (SQLException e)
+			{
+				throw new DBException(e, sql);
+			}
+			finally
+			{
+				DB.close(rs, pstmt);
+				rs = null; pstmt = null;
+			}
 		}
 		reversal.setC_Order_ID(getC_Order_ID());
 		// Set M_RMA_ID
diff --git a/org.adempiere.base/src/org/compiere/model/MInOutLine.java b/org.adempiere.base/src/org/compiere/model/MInOutLine.java
index b79c2a8d5b..e4dc303c82 100644
--- a/org.adempiere.base/src/org/compiere/model/MInOutLine.java
+++ b/org.adempiere.base/src/org/compiere/model/MInOutLine.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.ResultSet;
 import java.util.List;
 import java.util.Properties;
@@ -283,7 +284,7 @@ public class MInOutLine extends X_M_InOutLine
 		if (M_Locator_ID < 0)
 			throw new IllegalArgumentException ("M_Locator_ID is mandatory.");
 		//	set to 0 explicitly to reset
-		set_Value (COLUMNNAME_M_Locator_ID, new Integer(M_Locator_ID));
+		set_Value (COLUMNNAME_M_Locator_ID, Integer.valueOf(M_Locator_ID));
 	}	//	setM_Locator_ID
 
 	/**
@@ -335,7 +336,7 @@ public class MInOutLine extends X_M_InOutLine
 		if (QtyEntered != null && getC_UOM_ID() != 0)
 		{
 			int precision = MUOM.getPrecision(getCtx(), getC_UOM_ID());
-			QtyEntered = QtyEntered.setScale(precision, BigDecimal.ROUND_HALF_UP);
+			QtyEntered = QtyEntered.setScale(precision, RoundingMode.HALF_UP);
 		}
 		super.setQtyEntered (QtyEntered);
 	}	//	setQtyEntered
@@ -350,7 +351,7 @@ public class MInOutLine extends X_M_InOutLine
 		if (MovementQty != null && product != null)
 		{
 			int precision = product.getUOMPrecision();
-			MovementQty = MovementQty.setScale(precision, BigDecimal.ROUND_HALF_UP);
+			MovementQty = MovementQty.setScale(precision, RoundingMode.HALF_UP);
 		}
 		super.setMovementQty(MovementQty);
 	}	//	setMovementQty
diff --git a/org.adempiere.base/src/org/compiere/model/MInterestArea.java b/org.adempiere.base/src/org/compiere/model/MInterestArea.java
index d6eb1ff970..07f5019948 100644
--- a/org.adempiere.base/src/org/compiere/model/MInterestArea.java
+++ b/org.adempiere.base/src/org/compiere/model/MInterestArea.java
@@ -89,7 +89,7 @@ public class MInterestArea extends X_R_InterestArea
 	 */
 	public static MInterestArea get (Properties ctx, int R_InterestArea_ID)
 	{
-		Integer key = new Integer (R_InterestArea_ID);
+		Integer key = Integer.valueOf(R_InterestArea_ID);
 		MInterestArea retValue = (MInterestArea) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MInventory.java b/org.adempiere.base/src/org/compiere/model/MInventory.java
index 9260da7dd7..586f8661ce 100644
--- a/org.adempiere.base/src/org/compiere/model/MInventory.java
+++ b/org.adempiere.base/src/org/compiere/model/MInventory.java
@@ -54,7 +54,7 @@ public class MInventory extends X_M_Inventory implements DocAction
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -2155186682727239214L;
+	private static final long serialVersionUID = 4395759120481570701L;
 	/** Reversal Indicator			*/
 	public static String	REVERSE_INDICATOR = "^";
 	
@@ -66,7 +66,7 @@ public class MInventory extends X_M_Inventory implements DocAction
 	 */
 	public static MInventory get (Properties ctx, int M_Inventory_ID)
 	{
-		Integer key = new Integer (M_Inventory_ID);
+		Integer key = Integer.valueOf(M_Inventory_ID);
 		MInventory retValue = (MInventory) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
@@ -77,7 +77,7 @@ public class MInventory extends X_M_Inventory implements DocAction
 	} //	get
 
 	/**	Cache						*/
-	private static CCache<Integer,MInventory> s_cache = new CCache<Integer,MInventory>(Table_Name, 5, 5);
+	protected static CCache<Integer,MInventory> s_cache = new CCache<Integer,MInventory>(Table_Name, 5, 5);
 
 
 	/**
@@ -138,7 +138,7 @@ public class MInventory extends X_M_Inventory implements DocAction
 	
 	
 	/**	Lines						*/
-	private MInventoryLine[]	m_lines = null;
+	protected MInventoryLine[]	m_lines = null;
 	
 	/**
 	 * 	Get Lines
@@ -290,9 +290,9 @@ public class MInventory extends X_M_Inventory implements DocAction
 	}	//	processIt
 	
 	/**	Process Message 			*/
-	private String		m_processMsg = null;
+	protected String		m_processMsg = null;
 	/**	Just Prepared Flag			*/
-	private boolean		m_justPrepared = false;
+	protected boolean		m_justPrepared = false;
 
 	/**
 	 * 	Unlock Document.
@@ -656,7 +656,7 @@ public class MInventory extends X_M_Inventory implements DocAction
 	/**
 	 * 	Set the definite document number after completed
 	 */
-	private void setDefiniteDocumentNo() {
+	protected void setDefiniteDocumentNo() {
 		MDocType dt = MDocType.get(getCtx(), getC_DocType_ID());
 		if (dt.isOverwriteDateOnComplete()) {
 			setMovementDate(TimeUtil.getDay(0));
@@ -672,7 +672,7 @@ public class MInventory extends X_M_Inventory implements DocAction
 	/**
 	 * 	Check Material Policy.
 	 */
-	private void checkMaterialPolicy(MInventoryLine line, BigDecimal qtyDiff)
+	protected void checkMaterialPolicy(MInventoryLine line, BigDecimal qtyDiff)
 	{	
 		
 		int no = MInventoryLineMA.deleteInventoryLineMA(line.getM_InventoryLine_ID(), get_TrxName());
@@ -944,7 +944,7 @@ public class MInventory extends X_M_Inventory implements DocAction
 		return true;
 	}	//	reverseCorrectIt
 
-	private MInventory reverse(boolean accrual) {
+	protected MInventory reverse(boolean accrual) {
 		Timestamp reversalDate = accrual ? Env.getContextAsDate(getCtx(), "#Date") : getMovementDate();
 		if (reversalDate == null) {
 			reversalDate = new Timestamp(System.currentTimeMillis());
@@ -1113,13 +1113,13 @@ public class MInventory extends X_M_Inventory implements DocAction
 	
 	
 	/** Reversal Flag		*/
-	private boolean m_reversal = false;
+	protected boolean m_reversal = false;
 	
 	/**
 	 * 	Set Reversal
 	 *	@param reversal reversal
 	 */
-	private void setReversal(boolean reversal)
+	protected void setReversal(boolean reversal)
 	{
 		m_reversal = reversal;
 	}	//	setReversal
@@ -1127,7 +1127,7 @@ public class MInventory extends X_M_Inventory implements DocAction
 	 * 	Is Reversal
 	 *	@return reversal
 	 */
-	private boolean isReversal()
+	protected boolean isReversal()
 	{
 		return m_reversal;
 	}	//	isReversal
diff --git a/org.adempiere.base/src/org/compiere/model/MInventoryLine.java b/org.adempiere.base/src/org/compiere/model/MInventoryLine.java
index c56dd88947..c6ae8f53c8 100644
--- a/org.adempiere.base/src/org/compiere/model/MInventoryLine.java
+++ b/org.adempiere.base/src/org/compiere/model/MInventoryLine.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.ResultSet;
 import java.util.Properties;
 
@@ -40,7 +41,7 @@ public class MInventoryLine extends X_M_InventoryLine
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -3864175464877913555L;
+	private static final long serialVersionUID = 7083622834698840042L;
 
 	/**
 	 * 	Get Inventory Line with parameters
@@ -137,11 +138,11 @@ public class MInventoryLine extends X_M_InventoryLine
 	}
 	
 	/** Manually created				*/
-	// private boolean 	m_isManualEntry = true;
+	//protected boolean 	m_isManualEntry = true;
 	/** Parent							*/
-	private MInventory 	m_parent = null;
+	protected MInventory 	m_parent = null;
 	/** Product							*/
-	private MProduct 	m_product = null;
+	protected MProduct 	m_product = null;
 	
 	/**
 	 * 	Get Product
@@ -172,7 +173,7 @@ public class MInventoryLine extends X_M_InventoryLine
 			if (product != null)
 			{
 				int precision = product.getUOMPrecision(); 
-				QtyCount = QtyCount.setScale(precision, BigDecimal.ROUND_HALF_UP);
+				QtyCount = QtyCount.setScale(precision, RoundingMode.HALF_UP);
 			}
 		}
 		super.setQtyCount(QtyCount);
@@ -191,7 +192,7 @@ public class MInventoryLine extends X_M_InventoryLine
 			if (product != null)
 			{
 				int precision = product.getUOMPrecision(); 
-				QtyInternalUse = QtyInternalUse.setScale(precision, BigDecimal.ROUND_HALF_UP);
+				QtyInternalUse = QtyInternalUse.setScale(precision, RoundingMode.HALF_UP);
 			}
 		}
 		super.setQtyInternalUse(QtyInternalUse);
@@ -388,7 +389,7 @@ public class MInventoryLine extends X_M_InventoryLine
 	/**
 	 * 	Create Material Allocations for new Instances
 	 */
-	/*private void createMA()
+	/*protected void createMA()
 	{
 		MStorageOnHand[] storages = MStorageOnHand.getAll(getCtx(), getM_Product_ID(), 
 			getM_Locator_ID(), get_TrxName());
diff --git a/org.adempiere.base/src/org/compiere/model/MInvoice.java b/org.adempiere.base/src/org/compiere/model/MInvoice.java
index aa53bdc5a5..242b4e1305 100644
--- a/org.adempiere.base/src/org/compiere/model/MInvoice.java
+++ b/org.adempiere.base/src/org/compiere/model/MInvoice.java
@@ -247,7 +247,7 @@ public class MInvoice extends X_C_Invoice implements DocAction
 	 */
 	public static MInvoice get (Properties ctx, int C_Invoice_ID)
 	{
-		Integer key = new Integer (C_Invoice_ID);
+		Integer key = Integer.valueOf(C_Invoice_ID);
 		MInvoice retValue = (MInvoice) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
@@ -2420,12 +2420,19 @@ public class MInvoice extends X_C_Invoice implements DocAction
 				
 				if (mPO[i].getM_InOutLine_ID() == 0)
 				{
-					if (!mPO[i].reverse(reversalDate)) 
+					if(mPO[i].isPosted())
 					{
-						m_processMsg = "Could not Reverse MatchPO";
-						return null;
+						if (!mPO[i].reverse(reversalDate)) 
+						{
+							m_processMsg = "Could not Reverse MatchPO";
+							return null;
+						}
+						addDocsPostProcess(new MMatchPO(Env.getCtx(), mPO[i].getReversal_ID(), get_TrxName()));
+					} 
+					else
+					{
+						mPO[i].deleteEx(true);						
 					}
-					addDocsPostProcess(new MMatchPO(Env.getCtx(), mPO[i].getReversal_ID(), get_TrxName()));
 				}
 				else
 				{
diff --git a/org.adempiere.base/src/org/compiere/model/MInvoiceLine.java b/org.adempiere.base/src/org/compiere/model/MInvoiceLine.java
index eddde90d68..140b9a4a81 100644
--- a/org.adempiere.base/src/org/compiere/model/MInvoiceLine.java
+++ b/org.adempiere.base/src/org/compiere/model/MInvoiceLine.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
@@ -51,7 +52,7 @@ public class MInvoiceLine extends X_C_InvoiceLine
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -6174490999732876285L;
+	private static final long serialVersionUID = -1590896898028805978L;
 
 	/**
 	 * 	Get Invoice Line referencing InOut Line
@@ -101,10 +102,10 @@ public class MInvoiceLine extends X_C_InvoiceLine
 	}
 
 	/**	Static Logger	*/
-	private static CLogger	s_log	= CLogger.getCLogger (MInvoiceLine.class);
+	protected static CLogger	s_log	= CLogger.getCLogger (MInvoiceLine.class);
 
 	/** Tax							*/
-	private MTax 		m_tax = null;
+	protected MTax 		m_tax = null;
 	
 	
 	/**************************************************************************
@@ -159,24 +160,24 @@ public class MInvoiceLine extends X_C_InvoiceLine
 		super(ctx, rs, trxName);
 	}	//	MInvoiceLine
 
-	private int			m_M_PriceList_ID = 0;
-	private Timestamp	m_DateInvoiced = null;
-	private int			m_C_BPartner_ID = 0;
-	private int			m_C_BPartner_Location_ID = 0;
-	private boolean		m_IsSOTrx = true;
-	private boolean		m_priceSet = false;
-	private MProduct	m_product = null;
+	protected int			m_M_PriceList_ID = 0;
+	protected Timestamp	m_DateInvoiced = null;
+	protected int			m_C_BPartner_ID = 0;
+	protected int			m_C_BPartner_Location_ID = 0;
+	protected boolean		m_IsSOTrx = true;
+	protected boolean		m_priceSet = false;
+	protected MProduct	m_product = null;
 	/**	Charge					*/
-	private MCharge 		m_charge = null;
+	protected MCharge 		m_charge = null;
 	
 	/**	Cached Name of the line		*/
-	private String		m_name = null;
+	protected String		m_name = null;
 	/** Cached Precision			*/
-	private Integer		m_precision = null;
+	protected Integer		m_precision = null;
 	/** Product Pricing				*/
-	private IProductPricing	m_productPricing = null;
+	protected IProductPricing	m_productPricing = null;
 	/** Parent						*/
-	private MInvoice	m_parent = null;
+	protected MInvoice	m_parent = null;
 
 	/**
 	 * 	Set Defaults from Order.
@@ -192,7 +193,7 @@ public class MInvoiceLine extends X_C_InvoiceLine
 		m_C_BPartner_ID = invoice.getC_BPartner_ID();
 		m_C_BPartner_Location_ID = invoice.getC_BPartner_Location_ID();
 		m_IsSOTrx = invoice.isSOTrx();
-		m_precision = new Integer(invoice.getPrecision());
+		m_precision = Integer.valueOf(invoice.getPrecision());
 	}	//	setOrder
 
 	/**
@@ -343,7 +344,7 @@ public class MInvoiceLine extends X_C_InvoiceLine
 	public void setM_AttributeSetInstance_ID (int M_AttributeSetInstance_ID)
 	{
 		if (M_AttributeSetInstance_ID == 0)		//	 0 is valid ID
-			set_Value("M_AttributeSetInstance_ID", new Integer(0));
+			set_Value("M_AttributeSetInstance_ID", Integer.valueOf(0));
 		else
 			super.setM_AttributeSetInstance_ID (M_AttributeSetInstance_ID);
 	}	//	setM_AttributeSetInstance_ID
@@ -387,7 +388,7 @@ public class MInvoiceLine extends X_C_InvoiceLine
 			setPriceEntered(getPriceActual());
 		else
 			setPriceEntered(getPriceActual().multiply(getQtyInvoiced()
-				.divide(getQtyEntered(), 6, BigDecimal.ROUND_HALF_UP)));	//	precision
+				.divide(getQtyEntered(), 6, RoundingMode.HALF_UP)));	//	precision
 		//
 		if (getC_UOM_ID() == 0)
 			setC_UOM_ID(m_productPricing.getC_UOM_ID());
@@ -476,7 +477,7 @@ public class MInvoiceLine extends X_C_InvoiceLine
 		BigDecimal bd = getPriceActual().multiply(getQtyInvoiced());
 		int precision = getPrecision();
 		if (bd.scale() > precision)
-			bd = bd.setScale(precision, BigDecimal.ROUND_HALF_UP);
+			bd = bd.setScale(precision, RoundingMode.HALF_UP);
 		super.setLineNetAmt (bd);
 	}	//	setLineNetAmt
 	/**
@@ -528,7 +529,7 @@ public class MInvoiceLine extends X_C_InvoiceLine
 		if (QtyEntered != null && getC_UOM_ID() != 0)
 		{
 			int precision = MUOM.getPrecision(getCtx(), getC_UOM_ID());
-			QtyEntered = QtyEntered.setScale(precision, BigDecimal.ROUND_HALF_UP);
+			QtyEntered = QtyEntered.setScale(precision, RoundingMode.HALF_UP);
 		}
 		super.setQtyEntered (QtyEntered);
 	}	//	setQtyEntered
@@ -543,7 +544,7 @@ public class MInvoiceLine extends X_C_InvoiceLine
 		if (QtyInvoiced != null && product != null)
 		{
 			int precision = product.getUOMPrecision();
-			QtyInvoiced = QtyInvoiced.setScale(precision, BigDecimal.ROUND_HALF_UP);
+			QtyInvoiced = QtyInvoiced.setScale(precision, RoundingMode.HALF_UP);
 		}
 		super.setQtyInvoiced(QtyInvoiced);
 	}	//	setQtyInvoiced
@@ -768,7 +769,7 @@ public class MInvoiceLine extends X_C_InvoiceLine
 			log.warning("getPrecision = " + i + " - set to 2");
 			i = 2;
 		}
-		m_precision = new Integer(i);
+		m_precision = Integer.valueOf(i);
 		return m_precision.intValue();
 	}	//	getPrecision
 
@@ -1187,7 +1188,7 @@ public class MInvoiceLine extends X_C_InvoiceLine
 	/**
 	 * 	Allocate Landed Cost - Enforce Rounding
 	 */
-	private void allocateLandedCostRounding()
+	protected void allocateLandedCostRounding()
 	{
 		MLandedCostAllocation[] allocations = MLandedCostAllocation.getOfInvoiceLine(
 			getCtx(), getC_InvoiceLine_ID(), get_TrxName());
diff --git a/org.adempiere.base/src/org/compiere/model/MInvoicePaySchedule.java b/org.adempiere.base/src/org/compiere/model/MInvoicePaySchedule.java
index 72d58110d5..988a668f63 100644
--- a/org.adempiere.base/src/org/compiere/model/MInvoicePaySchedule.java
+++ b/org.adempiere.base/src/org/compiere/model/MInvoicePaySchedule.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
@@ -152,10 +153,10 @@ public class MInvoicePaySchedule extends X_C_InvoicePaySchedule
 		else
 		{
 			due = due.multiply(paySchedule.getPercentage())
-				.divide(Env.ONEHUNDRED, scale, BigDecimal.ROUND_HALF_UP);
+				.divide(Env.ONEHUNDRED, scale, RoundingMode.HALF_UP);
 			setDueAmt (due);
 			BigDecimal discount = due.multiply(paySchedule.getDiscount())
-				.divide(Env.ONEHUNDRED, scale, BigDecimal.ROUND_HALF_UP);
+				.divide(Env.ONEHUNDRED, scale, RoundingMode.HALF_UP);
 			setDiscountAmt (discount);
 			setIsValid(true);
 		}
diff --git a/org.adempiere.base/src/org/compiere/model/MInvoiceSchedule.java b/org.adempiere.base/src/org/compiere/model/MInvoiceSchedule.java
index ef18cc02c1..383b1fef46 100644
--- a/org.adempiere.base/src/org/compiere/model/MInvoiceSchedule.java
+++ b/org.adempiere.base/src/org/compiere/model/MInvoiceSchedule.java
@@ -49,7 +49,7 @@ public class MInvoiceSchedule extends X_C_InvoiceSchedule
 	 */
 	public static MInvoiceSchedule get (Properties ctx, int C_InvoiceSchedule_ID, String trxName)
 	{
-		Integer key = new Integer (C_InvoiceSchedule_ID);
+		Integer key = Integer.valueOf(C_InvoiceSchedule_ID);
 		MInvoiceSchedule retValue = (MInvoiceSchedule) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MInvoiceTax.java b/org.adempiere.base/src/org/compiere/model/MInvoiceTax.java
index e888b88f45..8256ba56ca 100644
--- a/org.adempiere.base/src/org/compiere/model/MInvoiceTax.java
+++ b/org.adempiere.base/src/org/compiere/model/MInvoiceTax.java
@@ -159,7 +159,7 @@ public class MInvoiceTax extends X_C_InvoiceTax
 	 */
 	protected void setPrecision (int precision)
 	{
-		m_precision = new Integer(precision);
+		m_precision = Integer.valueOf(precision);
 	}	//	setPrecision
 
 	/**
diff --git a/org.adempiere.base/src/org/compiere/model/MJournal.java b/org.adempiere.base/src/org/compiere/model/MJournal.java
index 36d16eeedd..05e8ece324 100644
--- a/org.adempiere.base/src/org/compiere/model/MJournal.java
+++ b/org.adempiere.base/src/org/compiere/model/MJournal.java
@@ -53,7 +53,7 @@ public class MJournal extends X_GL_Journal implements DocAction
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -364132249042527640L;
+	private static final long serialVersionUID = 6116307358915557651L;
 
 	/**
 	 * 	Standard Constructor
@@ -372,7 +372,7 @@ public class MJournal extends X_GL_Journal implements DocAction
 	 * 	Update Batch total
 	 *	@return true if ok
 	 */
-	private boolean updateBatch()
+	protected boolean updateBatch()
 	{
 		if (getGL_JournalBatch_ID()!=0) {	// idempiere 344 - nmicoud
 			StringBuilder sql = new StringBuilder("UPDATE GL_JournalBatch jb")
@@ -401,9 +401,9 @@ public class MJournal extends X_GL_Journal implements DocAction
 	}	//	process
 	
 	/**	Process Message 			*/
-	private String		m_processMsg = null;
+	protected String		m_processMsg = null;
 	/**	Just Prepared Flag			*/
-	private boolean		m_justPrepared = false;
+	protected boolean		m_justPrepared = false;
 
 	/**
 	 * 	Unlock Document.
@@ -628,7 +628,7 @@ public class MJournal extends X_GL_Journal implements DocAction
 	/**
 	 * 	Set the definite document number after completed
 	 */
-	private void setDefiniteDocumentNo() {
+	protected void setDefiniteDocumentNo() {
 		MDocType dt = MDocType.get(getCtx(), getC_DocType_ID());
 		if (dt.isOverwriteDateOnComplete()) {
 			if (this.getProcessedOn().signum() == 0) {
diff --git a/org.adempiere.base/src/org/compiere/model/MJournalBatch.java b/org.adempiere.base/src/org/compiere/model/MJournalBatch.java
index 493a4167c9..a3b6ffe9b4 100644
--- a/org.adempiere.base/src/org/compiere/model/MJournalBatch.java
+++ b/org.adempiere.base/src/org/compiere/model/MJournalBatch.java
@@ -52,7 +52,7 @@ public class MJournalBatch extends X_GL_JournalBatch implements DocAction
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -2494833602067696046L;
+	private static final long serialVersionUID = 3424249393848608297L;
 
 	/**
 	 * 	Create new Journal Batch by copying
@@ -275,9 +275,9 @@ public class MJournalBatch extends X_GL_JournalBatch implements DocAction
 	}	//	process
 	
 	/**	Process Message 			*/
-	private String		m_processMsg = null;
+	protected String		m_processMsg = null;
 	/**	Just Prepared Flag			*/
-	private boolean		m_justPrepared = false;
+	protected boolean		m_justPrepared = false;
 
 	/**
 	 * 	Unlock Document.
@@ -507,7 +507,7 @@ public class MJournalBatch extends X_GL_JournalBatch implements DocAction
 	/**
 	 * 	Set the definite document number after completed
 	 */
-	private void setDefiniteDocumentNo() {
+	protected void setDefiniteDocumentNo() {
 		MDocType dt = MDocType.get(getCtx(), getC_DocType_ID());
 		if (dt.isOverwriteDateOnComplete()) {
 			setDateDoc(TimeUtil.getDay(0));
diff --git a/org.adempiere.base/src/org/compiere/model/MJournalLine.java b/org.adempiere.base/src/org/compiere/model/MJournalLine.java
index d295c018f8..08dd1190de 100644
--- a/org.adempiere.base/src/org/compiere/model/MJournalLine.java
+++ b/org.adempiere.base/src/org/compiere/model/MJournalLine.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
@@ -39,7 +40,7 @@ public class MJournalLine extends X_GL_JournalLine
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 7584093911055786835L;
+	private static final long serialVersionUID = 253571209449736797L;
 
 	/**
 	 * 	Standard Constructor
@@ -95,7 +96,7 @@ public class MJournalLine extends X_GL_JournalLine
 	}	//	MJournalLine
 
 	/** Parent					*/
-	private MJournal	m_parent = null;
+	protected MJournal	m_parent = null;
 	
 	/**
 	 * 	Get Parent
@@ -110,11 +111,11 @@ public class MJournalLine extends X_GL_JournalLine
 	
 
 	/**	Currency Precision		*/
-	private int					m_precision = 2;
+	protected int					m_precision = 2;
 	/**	Account Combination		*/
-	private MAccount		 	m_account = null;
+	protected MAccount		 	m_account = null;
 	/** Account Element			*/
-	private MElementValue		m_accountElement = null;
+	protected MElementValue		m_accountElement = null;
 	
 	/**
 	 * 	Set Currency Info
@@ -308,11 +309,11 @@ public class MJournalLine extends X_GL_JournalLine
 		BigDecimal rate = getCurrencyRate();
 		BigDecimal amt = rate.multiply(getAmtSourceDr());
 		if (amt.scale() > getPrecision())
-			amt = amt.setScale(getPrecision(), BigDecimal.ROUND_HALF_UP);
+			amt = amt.setScale(getPrecision(), RoundingMode.HALF_UP);
 		setAmtAcctDr(amt);
 		amt = rate.multiply(getAmtSourceCr());
 		if (amt.scale() > getPrecision())
-			amt = amt.setScale(getPrecision(), BigDecimal.ROUND_HALF_UP);
+			amt = amt.setScale(getPrecision(), RoundingMode.HALF_UP);
 		setAmtAcctCr(amt);
 		//	Set Line Org to Doc Org if still not set
 		if(getAD_Org_ID() <= 0) 
@@ -354,7 +355,7 @@ public class MJournalLine extends X_GL_JournalLine
 	 * 	Update Journal and Batch Total
 	 *	@return true if success
 	 */
-	private boolean updateJournalTotal()
+	protected boolean updateJournalTotal()
 	{
 		//	Update Journal Total
 		StringBuilder sql = new StringBuilder("UPDATE GL_Journal j")
@@ -382,7 +383,7 @@ public class MJournalLine extends X_GL_JournalLine
 	}	//	updateJournalTotal
 
 	/** Update combination and optionally **/
-	private boolean getOrCreateCombination()
+	protected boolean getOrCreateCombination()
 	{
 		if (getC_ValidCombination_ID() == 0
 				|| (!is_new() && (is_ValueChanged("Account_ID")
@@ -458,7 +459,7 @@ public class MJournalLine extends X_GL_JournalLine
 	}	//	getOrCreateCombination
 
 	/** Fill Accounting Dimensions from line combination **/
-	private void fillDimensionsFromCombination()
+	protected void fillDimensionsFromCombination()
 	{
 		if (getC_ValidCombination_ID() > 0)
 		{
diff --git a/org.adempiere.base/src/org/compiere/model/MLandedCostAllocation.java b/org.adempiere.base/src/org/compiere/model/MLandedCostAllocation.java
index c882bc9f0e..4982a3b03e 100644
--- a/org.adempiere.base/src/org/compiere/model/MLandedCostAllocation.java
+++ b/org.adempiere.base/src/org/compiere/model/MLandedCostAllocation.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.ArrayList;
@@ -133,7 +134,7 @@ public class MLandedCostAllocation extends X_C_LandedCostAllocation
 	{
 		BigDecimal bd = BigDecimal.valueOf(Amt);
 		if (bd.scale() > precision)
-			bd = bd.setScale(precision, BigDecimal.ROUND_HALF_UP);
+			bd = bd.setScale(precision, RoundingMode.HALF_UP);
 		super.setAmt(bd);
 	}	//	setAmt
 
diff --git a/org.adempiere.base/src/org/compiere/model/MLocation.java b/org.adempiere.base/src/org/compiere/model/MLocation.java
index b29ad68f6f..e840425bb1 100644
--- a/org.adempiere.base/src/org/compiere/model/MLocation.java
+++ b/org.adempiere.base/src/org/compiere/model/MLocation.java
@@ -70,7 +70,7 @@ public class MLocation extends X_C_Location implements Comparator<Object>
 		if (C_Location_ID == 0)
 			return new MLocation(ctx, C_Location_ID, trxName);
 		//
-		Integer key = new Integer (C_Location_ID);
+		Integer key = Integer.valueOf(C_Location_ID);
 		MLocation retValue = null;
 		if (trxName == null)
 			retValue = (MLocation) s_cache.get (key);
diff --git a/org.adempiere.base/src/org/compiere/model/MLocator.java b/org.adempiere.base/src/org/compiere/model/MLocator.java
index c7b0cbb97e..4f5b8f50c5 100644
--- a/org.adempiere.base/src/org/compiere/model/MLocator.java
+++ b/org.adempiere.base/src/org/compiere/model/MLocator.java
@@ -39,7 +39,7 @@ public class MLocator extends X_M_Locator
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 3649134803161895263L;
+	private static final long serialVersionUID = -4502919527066173270L;
 
 	/**
 	 * 	Get oldest Default Locator of warehouse with locator
@@ -180,7 +180,7 @@ public class MLocator extends X_M_Locator
 	{
 		if (s_cache == null)
 			s_cache	= new CCache<Integer,MLocator>(Table_Name, 20);
-		Integer key = new Integer (M_Locator_ID);
+		Integer key = Integer.valueOf(M_Locator_ID);
 		MLocator retValue = (MLocator) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
@@ -191,7 +191,7 @@ public class MLocator extends X_M_Locator
 	} //	get
 
 	/**	Cache						*/
-	private volatile static CCache<Integer,MLocator> s_cache; 
+	protected volatile static CCache<Integer,MLocator> s_cache; 
 	 
 	/**	Logger						*/
 	private static CLogger		s_log = CLogger.getCLogger (MLocator.class);
diff --git a/org.adempiere.base/src/org/compiere/model/MLocatorLookup.java b/org.adempiere.base/src/org/compiere/model/MLocatorLookup.java
index 65d041dd29..5ea53dbd65 100644
--- a/org.adempiere.base/src/org/compiere/model/MLocatorLookup.java
+++ b/org.adempiere.base/src/org/compiere/model/MLocatorLookup.java
@@ -229,7 +229,7 @@ public final class MLocatorLookup extends Lookup implements Serializable
 		//
 		int key = loc.getM_Locator_ID();
 		if (saveInCache)
-			m_lookup.put(new Integer(key), loc);
+			m_lookup.put(Integer.valueOf(key), loc);
 		NamePair retValue = new KeyNamePair(key, loc.toString());
 		return retValue;
 	}	//	getDirect
@@ -375,7 +375,7 @@ public final class MLocatorLookup extends Lookup implements Serializable
 				{
 					int M_Locator_ID = rs.getInt(1);
 					MLocator loc = MLocator.get(m_ctx, M_Locator_ID);
-					m_lookup.put(new Integer(M_Locator_ID), loc);
+					m_lookup.put(Integer.valueOf(M_Locator_ID), loc);
 				}
 			}
 			catch (SQLException e)
diff --git a/org.adempiere.base/src/org/compiere/model/MLocatorType.java b/org.adempiere.base/src/org/compiere/model/MLocatorType.java
index a1d70ddfe5..3ec2e27e84 100644
--- a/org.adempiere.base/src/org/compiere/model/MLocatorType.java
+++ b/org.adempiere.base/src/org/compiere/model/MLocatorType.java
@@ -50,7 +50,7 @@ public class MLocatorType extends X_M_LocatorType {
 	public static MLocatorType get (Properties ctx, int M_LocatorType_ID) {
 		if (s_cache == null)
 			s_cache	= new CCache<Integer,MLocatorType>(Table_Name, 20);
-		Integer key = new Integer (M_LocatorType_ID);
+		Integer key = Integer.valueOf(M_LocatorType_ID);
 		MLocatorType retValue = (MLocatorType) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MLookup.java b/org.adempiere.base/src/org/compiere/model/MLookup.java
index 7f44ec8928..fbf48b26cc 100644
--- a/org.adempiere.base/src/org/compiere/model/MLookup.java
+++ b/org.adempiere.base/src/org/compiere/model/MLookup.java
@@ -101,7 +101,7 @@ public final class MLookup extends Lookup implements Serializable
 	/** Number of max rows to load	*/
 	private static final int	MAX_ROWS = 5000;
 	/**	Indicator for Null			*/
-	private static Integer 		MINUS_ONE = new Integer(-1);
+	private static Integer 		MINUS_ONE = Integer.valueOf(-1);
 
 	/** The Lookup Info Value Object        */
 	private MLookupInfo         m_info = null;
@@ -539,7 +539,7 @@ public final class MLookup extends Lookup implements Serializable
 					int keyValue = rs.getInt(1);
 					KeyNamePair p = new KeyNamePair(keyValue, name.toString());
 					if (saveInCache)		//	save if
-						m_lookup.put(new Integer(keyValue), p);
+						m_lookup.put(Integer.valueOf(keyValue), p);
 					directValue = p;
 				}
 				else
@@ -878,7 +878,7 @@ public final class MLookup extends Lookup implements Serializable
 					{
 						int key = rs.getInt(1);
 						KeyNamePair p = new KeyNamePair(key, name.toString());
-						m_lookup.put(new Integer(key), p);
+						m_lookup.put(Integer.valueOf(key), p);
 					}
 					else
 					{
diff --git a/org.adempiere.base/src/org/compiere/model/MMailText.java b/org.adempiere.base/src/org/compiere/model/MMailText.java
index 3cb26cc98b..7739de2c7b 100644
--- a/org.adempiere.base/src/org/compiere/model/MMailText.java
+++ b/org.adempiere.base/src/org/compiere/model/MMailText.java
@@ -40,7 +40,7 @@ public class MMailText extends X_R_MailText
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -5088779317275846829L;
+	private static final long serialVersionUID = -6458808409321394821L;
 
 	/**
 	 * 	Standard Constructor
@@ -65,22 +65,22 @@ public class MMailText extends X_R_MailText
 	}	//	MMailText
 
 	/**	Parse User			*/
-	private MUser		m_user = null;
+	protected MUser		m_user = null;
 	/** Parse BPartner		*/
-	private MBPartner	m_bpartner = null;
+	protected MBPartner	m_bpartner = null;
 	/** Parse PO			*/
-	private PO			m_po = null;
+	protected PO			m_po = null;
 	/** Translated Header	*/
-	private String		m_MailHeader = null;
+	protected String		m_MailHeader = null;
 	/** Translated Text		*/
-	private String		m_MailText = null;
+	protected String		m_MailText = null;
 	/** Translated Text 2	*/
-	private String		m_MailText2 = null;
+	protected String		m_MailText2 = null;
 	/** Translated Text 3	*/
-	private String		m_MailText3 = null;
+	protected String		m_MailText3 = null;
 	/** Translation Cache	*/
-	private static CCache<String,MMailTextTrl> s_cacheTrl = new CCache<String,MMailTextTrl> (Table_Name, 20);
-	private String m_language = null;
+	protected static CCache<String,MMailTextTrl> s_cacheTrl = new CCache<String,MMailTextTrl> (Table_Name, 20);
+	protected String m_language = null;
 	
 	/**
 	 * 	Get parsed/translated Mail Text
@@ -155,7 +155,7 @@ public class MMailText extends X_R_MailText
 	 *	@param text text
 	 *	@return parsed text
 	 */
-	private String parse (String text)
+	protected String parse (String text)
 	{
 		if (Util.isEmpty(text) || text.indexOf('@') == -1)
 			return text;
@@ -175,7 +175,7 @@ public class MMailText extends X_R_MailText
 	 *	@param po object
 	 *	@return parsed text
 	 */
-	private String parse (String text, PO po)
+	protected String parse (String text, PO po)
 	{
 		if (po == null || Util.isEmpty(text) || text.indexOf('@') == -1)
 			return text;
@@ -214,7 +214,7 @@ public class MMailText extends X_R_MailText
 	 *	@param po po
 	 *	@return translated variable or if not found the original tag
 	 */
-	private String parseVariable (String variable, PO po)
+	protected String parseVariable (String variable, PO po)
 	{
 		if (variable.contains("<") && variable.contains(">")) { // IDEMPIERE-3096
 			return Env.parseVariable("@"+variable+"@", po, get_TrxName(), true);
@@ -327,7 +327,7 @@ public class MMailText extends X_R_MailText
 	/**
 	 * 	Translate to BPartner Language
 	 */
-	private void translate()
+	protected void translate()
 	{
 		//	Default if no Translation
 		m_MailHeader = super.getMailHeader();
@@ -360,7 +360,7 @@ public class MMailText extends X_R_MailText
 	 *	@param AD_Language language
 	 *	@return trl
 	 */
-	private MMailTextTrl getTranslation (String AD_Language)
+	protected MMailTextTrl getTranslation (String AD_Language)
 	{
 		MMailTextTrl trl = null;
 		PreparedStatement pstmt = null;
diff --git a/org.adempiere.base/src/org/compiere/model/MMatchInv.java b/org.adempiere.base/src/org/compiere/model/MMatchInv.java
index 12c272e775..9bfb064ae4 100644
--- a/org.adempiere.base/src/org/compiere/model/MMatchInv.java
+++ b/org.adempiere.base/src/org/compiere/model/MMatchInv.java
@@ -48,7 +48,7 @@ public class MMatchInv extends X_M_MatchInv
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 3668871839074170205L;
+	private static final long serialVersionUID = -6673764788466220541L;
 
 
 	/**
@@ -310,7 +310,7 @@ public class MMatchInv extends X_M_MatchInv
 	
 	//
 	//AZ Goodwill
-	private String deleteMatchInvCostDetail()
+	protected String deleteMatchInvCostDetail()
 	{
 		// Get Account Schemas to delete MCostDetail
 		MAcctSchema[] acctschemas = MAcctSchema.getClientAcctSchema(getCtx(), getAD_Client_ID());
diff --git a/org.adempiere.base/src/org/compiere/model/MMatchPO.java b/org.adempiere.base/src/org/compiere/model/MMatchPO.java
index 167c843f76..e6b2c17b8b 100644
--- a/org.adempiere.base/src/org/compiere/model/MMatchPO.java
+++ b/org.adempiere.base/src/org/compiere/model/MMatchPO.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Savepoint;
@@ -59,7 +60,7 @@ public class MMatchPO extends X_M_MatchPO
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -3669451656879485463L;
+	private static final long serialVersionUID = 487498668807522050L;
 
 	/**
 	 * 	Get PO Match with order/invoice
@@ -341,7 +342,7 @@ public class MMatchPO extends X_M_MatchPO
 		}
 	}
 	
-	private static MMatchPO create(Properties ctx, MInvoiceLine iLine,
+	protected static MMatchPO create(Properties ctx, MInvoiceLine iLine,
 			MInOutLine sLine, int C_OrderLine_ID, Timestamp dateTrx,
 			BigDecimal qty, String trxName) {
 		MMatchPO retValue = null;
@@ -531,10 +532,7 @@ public class MMatchPO extends X_M_MatchPO
 										otherMatchPO = matchPO;
 										iLine = new MInvoiceLine(retValue.getCtx(), matchPO.getC_InvoiceLine_ID(), retValue.get_TrxName());
 										matchPO.setQty(matchPO.getQty().subtract(retValue.getQty()));										
-										if (matchPO.getQty().signum() == 0 )
-											matchPO.deleteEx(true);
-										else
-											matchPO.saveEx();
+										matchPO.saveEx();
 										break;
 									}
 									
@@ -594,6 +592,8 @@ public class MMatchPO extends X_M_MatchPO
 									} catch (Exception e) {}
 								}	
 							}
+							if (otherMatchPO.getQty().signum() == 0 )
+								otherMatchPO.deleteEx(true);
 						}
 					}
 					if (!retValue.save())
@@ -632,13 +632,13 @@ public class MMatchPO extends X_M_MatchPO
 	}	//	create
 	
 
-	private MMatchInv m_matchInv;
+	protected MMatchInv m_matchInv;
 
 	/**
 	 * Register the match inv created for immediate accounting purposes
 	 * @param matchInv
 	 */
-	private void setMatchInvCreated(MMatchInv matchInv) {
+	protected void setMatchInvCreated(MMatchInv matchInv) {
 		m_matchInv = matchInv;
 	}
 
@@ -733,13 +733,13 @@ public class MMatchPO extends X_M_MatchPO
 	}	//	MMatchPO
 	
 	/** Invoice Changed			*/
-	private boolean m_isInvoiceLineChange = false;
+	protected boolean m_isInvoiceLineChange = false;
 	/** InOut Changed			*/
-	private boolean m_isInOutLineChange = false;
+	protected boolean m_isInOutLineChange = false;
 	/** Order Line				*/
-	private MOrderLine		m_oLine = null;
+	protected MOrderLine		m_oLine = null;
 	/** Invoice Line			*/
-	private MInvoiceLine	m_iLine = null;
+	protected MInvoiceLine	m_iLine = null;
 	
 	
 	/**
@@ -865,7 +865,7 @@ public class MMatchPO extends X_M_MatchPO
 		// Bayu, Sistematika
 		// BF [ 2240484 ] Re MatchingPO, MMatchPO doesn't contains Invoice info
 		// If newRecord, set c_invoiceline_id while null
-		if (newRecord && getC_InvoiceLine_ID() == 0) 
+		if (newRecord && getC_InvoiceLine_ID() == 0 && getReversal_ID()==0) 
 		{
 			MMatchInv[] mpi = MMatchInv.getInOutLine(getCtx(), getM_InOutLine_ID(), get_TrxName());
 			for (int i = 0; i < mpi.length; i++) 
@@ -873,6 +873,12 @@ public class MMatchPO extends X_M_MatchPO
 				if (mpi[i].getC_InvoiceLine_ID() != 0 && 
 						mpi[i].getM_AttributeSetInstance_ID() == getM_AttributeSetInstance_ID()) 
 				{
+					//verify m_matchpo not created yet
+					int cnt = DB.getSQLValue(get_TrxName(), "SELECT Count(*) FROM M_MatchPO WHERE M_InOutLine_ID="+getM_InOutLine_ID()
+							+" AND C_InvoiceLine_ID="+mpi[i].getC_InvoiceLine_ID());
+					if (cnt > 0)
+						continue;
+					
 					if (mpi[i].getQty().compareTo(getQty()) == 0)  // same quantity
 					{
 						setC_InvoiceLine_ID(mpi[i].getC_InvoiceLine_ID());
@@ -943,7 +949,7 @@ public class MMatchPO extends X_M_MatchPO
 					BigDecimal poAmt = poPrice.multiply(getQty());
 					BigDecimal maxTolerance = poAmt.multiply(mt);
 					maxTolerance = maxTolerance.abs()
-						.divide(Env.ONEHUNDRED, 2, BigDecimal.ROUND_HALF_UP);
+						.divide(Env.ONEHUNDRED, 2, RoundingMode.HALF_UP);
 					difference = difference.abs();
 					boolean ok = difference.compareTo(maxTolerance) <= 0;
 					if (log.isLoggable(Level.CONFIG)) log.config("Difference=" + getPriceMatchDifference() 
@@ -992,7 +998,7 @@ public class MMatchPO extends X_M_MatchPO
 			{
 				MInOutLine line = new MInOutLine(getCtx(), getM_InOutLine_ID(), get_TrxName());
 				BigDecimal matchedQty = DB.getSQLValueBD(get_TrxName(), "SELECT Coalesce(SUM(Qty),0) FROM M_MatchPO WHERE M_InOutLine_ID=?" , getM_InOutLine_ID());
-				if (matchedQty != null && matchedQty.compareTo(line.getMovementQty()) > 0)
+				if (line.getMovementQty().signum() > 0 && matchedQty != null && matchedQty.compareTo(line.getMovementQty()) > 0)
 				{
 					throw new IllegalStateException("Total matched qty > movement qty. MatchedQty="+matchedQty+", MovementQty="+line.getMovementQty()+", Line="+line);
 				}
@@ -1000,8 +1006,8 @@ public class MMatchPO extends X_M_MatchPO
 			
 			if (getC_InvoiceLine_ID() > 0)
 			{
-				MInvoiceLine line = new MInvoiceLine(getCtx(), getC_InvoiceLine_ID(), get_TrxName());
-				BigDecimal matchedQty = DB.getSQLValueBD(get_TrxName(), "SELECT Coalesce(SUM(Qty),0) FROM M_MatchPO WHERE C_InvoiceLine_ID=?" , getC_InvoiceLine_ID());
+				MInvoiceLine line = new MInvoiceLine(getCtx(), getC_InvoiceLine_ID(), get_TrxName());				
+				BigDecimal matchedQty = DB.getSQLValueBD(get_TrxName(), "SELECT Coalesce(SUM(Qty),0) FROM M_MatchPO WHERE C_InvoiceLine_ID=?  AND Reversal_ID IS NULL " , getC_InvoiceLine_ID() );
 				if (matchedQty != null && matchedQty.compareTo(line.getQtyInvoiced()) > 0)
 				{
 					throw new IllegalStateException("Total matched qty > invoiced qty. MatchedQty="+matchedQty+", InvoicedQty="+line.getQtyInvoiced()+", Line="+line);
@@ -1039,15 +1045,21 @@ public class MMatchPO extends X_M_MatchPO
 			{
 				if (getM_InOutLine_ID() != 0)							//	new delivery
 					orderLine.setQtyDelivered(orderLine.getQtyDelivered().add(getQty()));
-				else //	if (getM_InOutLine_ID() == 0)					//	reset to 0
+				else if (!newRecord) //	if (getM_InOutLine_ID() == 0)					//	reset to 0
 					orderLine.setQtyDelivered(orderLine.getQtyDelivered().subtract(getQty()));
 				orderLine.setDateDelivered(getDateTrx());	//	overwrite=last
 			}
+			else if (!newRecord && getM_InOutLine_ID() > 0 && is_ValueChanged(COLUMNNAME_Qty))
+			{
+				BigDecimal oldQty = (BigDecimal)(get_ValueOld(COLUMNNAME_Qty));
+				orderLine.setQtyDelivered(orderLine.getQtyDelivered().subtract(oldQty.subtract(getQty())));
+			}
+			
 			if (m_isInvoiceLineChange && (newRecord || getC_InvoiceLine_ID() != get_ValueOldAsInt("C_InvoiceLine_ID")))
 			{
 				if (getC_InvoiceLine_ID() != 0)						//	first time
 					orderLine.setQtyInvoiced(orderLine.getQtyInvoiced().add(getQty()));
-				else //	if (getC_InvoiceLine_ID() == 0)				//	set to 0
+				else if (!newRecord) //	if (getC_InvoiceLine_ID() == 0)				//	set to 0
 					orderLine.setQtyInvoiced(orderLine.getQtyInvoiced().subtract(getQty()));
 				orderLine.setDateInvoiced(getDateTrx());	//	overwrite=last
 			}
@@ -1253,8 +1265,14 @@ public class MMatchPO extends X_M_MatchPO
 		{		
 			MMatchPO reversal = new MMatchPO (getCtx(), 0, get_TrxName());
 			reversal.setC_InvoiceLine_ID(getC_InvoiceLine_ID()); 
-			reversal.setM_InOutLine_ID(getM_InOutLine_ID()); 
-			PO.copyValues(this, reversal);
+			reversal.setM_InOutLine_ID(getM_InOutLine_ID());
+			if (getC_OrderLine_ID() != 0)			
+				reversal.setC_OrderLine_ID(getC_OrderLine_ID());
+			else{
+				reversal.setC_OrderLine_ID(getM_InOutLine().getC_OrderLine_ID());
+			}
+			reversal.setM_Product_ID(getM_Product_ID());
+			reversal.setM_AttributeSetInstance_ID(getM_AttributeSetInstance_ID());
 			reversal.setAD_Org_ID(this.getAD_Org_ID());
 			reversal.setDescription("(->" + this.getDocumentNo() + ")");
 			reversal.setQty(this.getQty().negate());
@@ -1262,14 +1280,16 @@ public class MMatchPO extends X_M_MatchPO
 			reversal.setDateTrx(reversalDate);
 			reversal.set_ValueNoCheck ("DocumentNo", null);
 			reversal.setPosted (false);
-			reversal.setReversal_ID(getM_MatchPO_ID());   
+			reversal.setProcessed(true);
+			reversal.setReversal_ID(getM_MatchPO_ID());   	
 			reversal.saveEx();
+
 			this.setDescription("(" + reversal.getDocumentNo() + "<-)");			
 			this.setReversal_ID(reversal.getM_MatchPO_ID());
 			this.saveEx();
-				
-			// reversal of mr if have both shipment and invoice line
-			if ( reversal.getM_InOutLine_ID() > 0 && reversal.getC_InvoiceLine_ID() > 0)
+
+			// auto create new matchpo if have invoice line
+			if ( reversal.getC_InvoiceLine_ID() > 0)
 			{
 				MMatchPO[] matchPOs = MMatchPO.getOrderLine(reversal.getCtx(), reversal.getC_OrderLine_ID(), reversal.get_TrxName());
 				BigDecimal matchQty = getQty();
@@ -1288,12 +1308,19 @@ public class MMatchPO extends X_M_MatchPO
 				
 				if (matchQty.signum() != 0)
 				{
-					MMatchPO matchPO = new MMatchPO (getCtx(), 0, get_TrxName());				
-					PO.copyValues(this, matchPO);
+					MMatchPO matchPO = new MMatchPO (getCtx(), 0, get_TrxName());		
+					matchPO.setC_OrderLine_ID(getC_OrderLine_ID());
 					matchPO.setC_InvoiceLine_ID(getC_InvoiceLine_ID()); 
-					matchPO.setM_InOutLine_ID(0); 
+					matchPO.setM_InOutLine_ID(0);
+					matchPO.setAD_Org_ID(getAD_Org_ID());
+					matchPO.setQty(getQty());
+					matchPO.setDateAcct(getDateAcct());
+					matchPO.setDateTrx(getDateTrx());
+					matchPO.setM_AttributeSetInstance_ID(getM_AttributeSetInstance_ID());
+					matchPO.setM_Product_ID(getM_Product_ID());
 					matchPO.setDescription(null);
-					matchPO.setPosted (false);
+					matchPO.setProcessed(true);
+					matchPO.setPosted (false);					
 					matchPO.saveEx();
 				}
 			}
diff --git a/org.adempiere.base/src/org/compiere/model/MMeasure.java b/org.adempiere.base/src/org/compiere/model/MMeasure.java
index aac86ad6d4..238bc1a72b 100644
--- a/org.adempiere.base/src/org/compiere/model/MMeasure.java
+++ b/org.adempiere.base/src/org/compiere/model/MMeasure.java
@@ -64,7 +64,7 @@ public class MMeasure extends X_PA_Measure
 	 */
 	public static MMeasure get (Properties ctx, int PA_Measure_ID)
 	{
-		Integer key = new Integer (PA_Measure_ID);
+		Integer key = Integer.valueOf(PA_Measure_ID);
 		MMeasure retValue = (MMeasure)s_cache.get (key);
 		if (retValue != null)
 			return retValue;
@@ -634,7 +634,7 @@ public class MMeasure extends X_PA_Measure
 					try
 					{
 						Class<?> clazz = Class.forName(cmd);
-						custom = (MeasureInterface)clazz.newInstance();
+						custom = (MeasureInterface)clazz.getDeclaredConstructor().newInstance();
 					}
 					catch (Exception e)
 					{
diff --git a/org.adempiere.base/src/org/compiere/model/MMeasureCalc.java b/org.adempiere.base/src/org/compiere/model/MMeasureCalc.java
index ccc13d6096..f61ca9bf9d 100644
--- a/org.adempiere.base/src/org/compiere/model/MMeasureCalc.java
+++ b/org.adempiere.base/src/org/compiere/model/MMeasureCalc.java
@@ -48,7 +48,7 @@ public class MMeasureCalc extends X_PA_MeasureCalc
 	 */
 	public static MMeasureCalc get (Properties ctx, int PA_MeasureCalc_ID)
 	{
-		Integer key = new Integer (PA_MeasureCalc_ID);
+		Integer key = Integer.valueOf(PA_MeasureCalc_ID);
 		MMeasureCalc retValue = (MMeasureCalc)s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MMovement.java b/org.adempiere.base/src/org/compiere/model/MMovement.java
index 297c9ec714..1a9d7fe67a 100644
--- a/org.adempiere.base/src/org/compiere/model/MMovement.java
+++ b/org.adempiere.base/src/org/compiere/model/MMovement.java
@@ -54,7 +54,7 @@ public class MMovement extends X_M_Movement implements DocAction
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -1628932946440487727L;
+	private static final long serialVersionUID = 3201199540429467933L;
 
 	/**
 	 * 	Standard Constructor
@@ -90,9 +90,9 @@ public class MMovement extends X_M_Movement implements DocAction
 	}	//	MMovement
 
 	/**	Lines						*/
-	private MMovementLine[]		m_lines = null;
+	protected MMovementLine[]		m_lines = null;
 	/** Confirmations				*/
-	private MMovementConfirm[]	m_confirms = null;
+	protected MMovementConfirm[]	m_confirms = null;
 	/** Reversal Indicator			*/
 	public static String	REVERSE_INDICATOR = "^";
 	
@@ -242,9 +242,9 @@ public class MMovement extends X_M_Movement implements DocAction
 	}	//	processIt
 	
 	/**	Process Message 			*/
-	private String		m_processMsg = null;
+	protected String		m_processMsg = null;
 	/**	Just Prepared Flag			*/
-	private boolean		m_justPrepared = false;
+	protected boolean		m_justPrepared = false;
 
 	/**
 	 * 	Unlock Document.
@@ -346,7 +346,7 @@ public class MMovement extends X_M_Movement implements DocAction
 	/**
 	 * 	Create Movement Confirmation
 	 */
-	private void createConfirmation()
+	protected void createConfirmation()
 	{
 		MMovementConfirm[] confirmations = getConfirmations(false);
 		if (confirmations.length > 0)
@@ -629,7 +629,7 @@ public class MMovement extends X_M_Movement implements DocAction
 	/**
 	 * 	Set the definite document number after completed
 	 */
-	private void setDefiniteDocumentNo() {
+	protected void setDefiniteDocumentNo() {
 		MDocType dt = MDocType.get(getCtx(), getC_DocType_ID());
 		if (dt.isOverwriteDateOnComplete()) {
 			setMovementDate(TimeUtil.getDay(0));
@@ -646,7 +646,7 @@ public class MMovement extends X_M_Movement implements DocAction
 	 * 	Check Material Policy
 	 * 	Sets line ASI
 	 */
-	private void checkMaterialPolicy(MMovementLine line,BigDecimal qtyToDeliver)
+	protected void checkMaterialPolicy(MMovementLine line,BigDecimal qtyToDeliver)
 	{
 		
 		int no = MMovementLineMA.deleteMovementLineMA(line.getM_MovementLine_ID(), get_TrxName());
@@ -825,7 +825,7 @@ public class MMovement extends X_M_Movement implements DocAction
 		return true;
 	}	//	reverseCorrectionIt
 	
-	private MMovement reverse(boolean accrual)
+	protected MMovement reverse(boolean accrual)
 	{
 		Timestamp reversalDate = accrual ? Env.getContextAsDate(getCtx(), "#Date") : getMovementDate();
 		if (reversalDate == null) {
@@ -1014,13 +1014,13 @@ public class MMovement extends X_M_Movement implements DocAction
 	}	//	getC_Currency_ID
 	
 	/** Reversal Flag		*/
-	private boolean m_reversal = false;
+	protected boolean m_reversal = false;
 	
 	/**
 	 * 	Set Reversal
 	 *	@param reversal reversal
 	 */
-	private void setReversal(boolean reversal)
+	protected void setReversal(boolean reversal)
 	{
 		m_reversal = reversal;
 	}	//	setReversal
@@ -1028,7 +1028,7 @@ public class MMovement extends X_M_Movement implements DocAction
 	 * 	Is Reversal
 	 *	@return reversal
 	 */
-	private boolean isReversal()
+	protected boolean isReversal()
 	{
 		return m_reversal;
 	}	//	isReversal
diff --git a/org.adempiere.base/src/org/compiere/model/MMovementConfirm.java b/org.adempiere.base/src/org/compiere/model/MMovementConfirm.java
index 05c415716e..76ff932c8f 100644
--- a/org.adempiere.base/src/org/compiere/model/MMovementConfirm.java
+++ b/org.adempiere.base/src/org/compiere/model/MMovementConfirm.java
@@ -51,7 +51,7 @@ public class MMovementConfirm extends X_M_MovementConfirm implements DocAction
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -5210710606049843678L;
+	private static final long serialVersionUID = -399427235334348654L;
 
 	/**
 	 * 	Create Confirmation or return existing one
@@ -127,15 +127,15 @@ public class MMovementConfirm extends X_M_MovementConfirm implements DocAction
 	}	//	MInOutConfirm
 	
 	/**	Confirm Lines					*/
-	private MMovementLineConfirm[]	m_lines = null;
+	protected MMovementLineConfirm[]	m_lines = null;
 	
 	/**	Physical Inventory From	*/
-	private MInventory				m_inventoryFrom = null;
+	protected MInventory				m_inventoryFrom = null;
 	/**	Physical Inventory To	*/
-	private MInventory				m_inventoryTo = null;
+	protected MInventory				m_inventoryTo = null;
 	/**	Physical Inventory Info	*/
-	private String					m_inventoryInfo = null;
-	private List<MInventory>		m_inventoryDoc = null;			
+	protected String					m_inventoryInfo = null;
+	protected List<MInventory>		m_inventoryDoc = null;		
 
 	/**
 	 * 	Get Lines
@@ -264,9 +264,9 @@ public class MMovementConfirm extends X_M_MovementConfirm implements DocAction
 	}	//	processIt
 	
 	/**	Process Message 			*/
-	private String		m_processMsg = null;
+	protected String		m_processMsg = null;
 	/**	Just Prepared Flag			*/
-	private boolean		m_justPrepared = false;
+	protected boolean		m_justPrepared = false;
 
 	/**
 	 * 	Unlock Document.
@@ -468,7 +468,7 @@ public class MMovementConfirm extends X_M_MovementConfirm implements DocAction
 	 *	@param confirm confirm line
 	 *	@return true if created
 	 */
-	private boolean createDifferenceDoc (MMovement move, MMovementLineConfirm confirm)
+	protected boolean createDifferenceDoc (MMovement move, MMovementLineConfirm confirm)
 	{
 		MMovementLine mLine = confirm.getLine();
 		
@@ -567,7 +567,7 @@ public class MMovementConfirm extends X_M_MovementConfirm implements DocAction
 	/**
 	 * 
 	 */
-	private void updateProcessMsg(String msg) {
+	protected void updateProcessMsg(String msg) {
 		if (m_processMsg != null)
 			m_processMsg = m_processMsg + " " + msg;
 		else
@@ -581,7 +581,7 @@ public class MMovementConfirm extends X_M_MovementConfirm implements DocAction
 	/**
 	 * @param inventory 
 	 */
-	private void setInventoryDocType(MInventory inventory) {
+	protected void setInventoryDocType(MInventory inventory) {
 		MDocType[] doctypes = MDocType.getOfDocBaseType(Env.getCtx(), X_C_DocType.DOCBASETYPE_MaterialPhysicalInventory);
 		for(MDocType doctype : doctypes)
 		{
diff --git a/org.adempiere.base/src/org/compiere/model/MMovementLine.java b/org.adempiere.base/src/org/compiere/model/MMovementLine.java
index ac2c73e162..299ad40ff6 100644
--- a/org.adempiere.base/src/org/compiere/model/MMovementLine.java
+++ b/org.adempiere.base/src/org/compiere/model/MMovementLine.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.ResultSet;
 import java.util.List;
 import java.util.Properties;
@@ -38,7 +39,7 @@ public class MMovementLine extends X_M_MovementLine
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -4078367839033015886L;
+	private static final long serialVersionUID = -5753062311388766921L;
 
 	/**
 	 * 	Standard Cosntructor
@@ -137,14 +138,14 @@ public class MMovementLine extends X_M_MovementLine
 			if (product != null)
 			{
 				int precision = product.getUOMPrecision(); 
-				MovementQty = MovementQty.setScale(precision, BigDecimal.ROUND_HALF_UP);
+				MovementQty = MovementQty.setScale(precision, RoundingMode.HALF_UP);
 			}
 		}
 		super.setMovementQty(MovementQty);
 	}	//	setMovementQty
 	
 	/** Parent							*/
-	private MMovement m_parent = null;
+	protected MMovement m_parent = null;
 	
 	/**
 	 * get Parent
diff --git a/org.adempiere.base/src/org/compiere/model/MMovementLineConfirm.java b/org.adempiere.base/src/org/compiere/model/MMovementLineConfirm.java
index be531e96d5..11068ec814 100644
--- a/org.adempiere.base/src/org/compiere/model/MMovementLineConfirm.java
+++ b/org.adempiere.base/src/org/compiere/model/MMovementLineConfirm.java
@@ -34,7 +34,7 @@ public class MMovementLineConfirm extends X_M_MovementLineConfirm
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 2406580342096137696L;
+	private static final long serialVersionUID = -5447921784818655144L;
 
 	/**
 	 * 	Standard Constructor
@@ -79,7 +79,7 @@ public class MMovementLineConfirm extends X_M_MovementLineConfirm
 	}	//	MMovementLineConfirm
 
 	/**	Movement Line			*/
-	private MMovementLine 	m_line = null;
+	protected MMovementLine 	m_line = null;
 	
 	/**
 	 * 	Set Movement Line
diff --git a/org.adempiere.base/src/org/compiere/model/MOrder.java b/org.adempiere.base/src/org/compiere/model/MOrder.java
index cfa0507cae..2174f90b0a 100644
--- a/org.adempiere.base/src/org/compiere/model/MOrder.java
+++ b/org.adempiere.base/src/org/compiere/model/MOrder.java
@@ -18,6 +18,7 @@ package org.compiere.model;
 
 import java.io.File;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Hashtable;
@@ -2183,7 +2184,7 @@ public class MOrder extends X_C_Order implements DocAction
 			if (oLine.getQtyEntered().compareTo(oLine.getQtyOrdered()) != 0)
 				ioLine.setQtyEntered(MovementQty
 					.multiply(oLine.getQtyEntered())
-					.divide(oLine.getQtyOrdered(), 6, BigDecimal.ROUND_HALF_UP));
+					.divide(oLine.getQtyOrdered(), 6, RoundingMode.HALF_UP));
 			if (!ioLine.save(get_TrxName()))
 			{
 				m_processMsg = "Could not create Shipment Line";
@@ -2270,7 +2271,7 @@ public class MOrder extends X_C_Order implements DocAction
 					iLine.setQtyEntered(iLine.getQtyInvoiced());
 				else
 					iLine.setQtyEntered(iLine.getQtyInvoiced().multiply(oLine.getQtyEntered())
-						.divide(oLine.getQtyOrdered(), 12, BigDecimal.ROUND_HALF_UP));
+						.divide(oLine.getQtyOrdered(), 12, RoundingMode.HALF_UP));
 				if (!iLine.save(get_TrxName()))
 				{
 					m_processMsg = "Could not create Invoice Line from Order Line";
diff --git a/org.adempiere.base/src/org/compiere/model/MOrderLandedCost.java b/org.adempiere.base/src/org/compiere/model/MOrderLandedCost.java
index adb1b17bdd..2ce645be9c 100644
--- a/org.adempiere.base/src/org/compiere/model/MOrderLandedCost.java
+++ b/org.adempiere.base/src/org/compiere/model/MOrderLandedCost.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.ResultSet;
 import java.util.ArrayList;
 import java.util.List;
@@ -146,7 +147,7 @@ public class MOrderLandedCost extends X_C_OrderLandedCost {
 				if (base.signum() != 0)
 				{
 					BigDecimal result = getAmt().multiply(base);
-					result = result.divide(total, orderLine.getParent().getC_Currency().getCostingPrecision(), BigDecimal.ROUND_HALF_UP);
+					result = result.divide(total, orderLine.getParent().getC_Currency().getCostingPrecision(), RoundingMode.HALF_UP);
 					allocation.setAmt(result.doubleValue(), orderLine.getParent().getC_Currency().getCostingPrecision());
 				}
 				allocation.saveEx();	
diff --git a/org.adempiere.base/src/org/compiere/model/MOrderLandedCostAllocation.java b/org.adempiere.base/src/org/compiere/model/MOrderLandedCostAllocation.java
index b9b9ac0774..e7d1de00e6 100644
--- a/org.adempiere.base/src/org/compiere/model/MOrderLandedCostAllocation.java
+++ b/org.adempiere.base/src/org/compiere/model/MOrderLandedCostAllocation.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.ResultSet;
 import java.util.List;
 import java.util.Properties;
@@ -63,7 +64,7 @@ public class MOrderLandedCostAllocation extends X_C_OrderLandedCostAllocation {
 	{
 		BigDecimal bd = BigDecimal.valueOf(Amt);
 		if (bd.scale() > precision)
-			bd = bd.setScale(precision, BigDecimal.ROUND_HALF_UP);
+			bd = bd.setScale(precision, RoundingMode.HALF_UP);
 		super.setAmt(bd);
 	}	//	setAmt
 	
diff --git a/org.adempiere.base/src/org/compiere/model/MOrderLine.java b/org.adempiere.base/src/org/compiere/model/MOrderLine.java
index f92d1deb5c..04841e5506 100644
--- a/org.adempiere.base/src/org/compiere/model/MOrderLine.java
+++ b/org.adempiere.base/src/org/compiere/model/MOrderLine.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Properties;
@@ -233,7 +234,7 @@ public class MOrderLine extends X_C_OrderLine
 	public void setHeaderInfo (MOrder order)
 	{
 		m_parent = order;
-		m_precision = new Integer(order.getPrecision());
+		m_precision = Integer.valueOf(order.getPrecision());
 		m_M_PriceList_ID = order.getM_PriceList_ID();
 		m_IsSOTrx = order.isSOTrx();
 	}	//	setHeaderInfo
@@ -305,7 +306,7 @@ public class MOrderLine extends X_C_OrderLine
 			setPriceEntered(getPriceActual());
 		else
 			setPriceEntered(getPriceActual().multiply(getQtyOrdered()
-				.divide(getQtyEntered(), 12, BigDecimal.ROUND_HALF_UP)));	//	recision
+				.divide(getQtyEntered(), 12, RoundingMode.HALF_UP)));	//	recision
 		
 		//	Calculate Discount
 		setDiscount(m_productPrice.getDiscount());
@@ -356,7 +357,7 @@ public class MOrderLine extends X_C_OrderLine
 		BigDecimal bd = getPriceActual().multiply(getQtyOrdered()); 
 		int precision = getPrecision();
 		if (bd.scale() > precision)
-			bd = bd.setScale(precision, BigDecimal.ROUND_HALF_UP);
+			bd = bd.setScale(precision, RoundingMode.HALF_UP);
 		super.setLineNetAmt (bd);
 	}	//	setLineNetAmt
 	
@@ -401,7 +402,7 @@ public class MOrderLine extends X_C_OrderLine
 			MCurrency cur = MCurrency.get(getCtx(), getC_Currency_ID());
 			if (cur.get_ID() != 0)
 			{
-				m_precision = new Integer (cur.getStdPrecision());
+				m_precision = Integer.valueOf(cur.getStdPrecision());
 				return m_precision.intValue();
 			}
 		}
@@ -410,7 +411,7 @@ public class MOrderLine extends X_C_OrderLine
 			+ "FROM C_Currency c INNER JOIN C_Order x ON (x.C_Currency_ID=c.C_Currency_ID) "
 			+ "WHERE x.C_Order_ID=?";
 		int i = DB.getSQLValue(get_TrxName(), sql, getC_Order_ID());
-		m_precision = new Integer(i);
+		m_precision = Integer.valueOf(i);
 		return m_precision.intValue();
 	}	//	getPrecision
 	
@@ -481,7 +482,7 @@ public class MOrderLine extends X_C_OrderLine
 	public void setM_AttributeSetInstance_ID (int M_AttributeSetInstance_ID)
 	{
 		if (M_AttributeSetInstance_ID == 0)		//	 0 is valid ID
-			set_Value("M_AttributeSetInstance_ID", new Integer(0));
+			set_Value("M_AttributeSetInstance_ID", Integer.valueOf(0));
 		else
 			super.setM_AttributeSetInstance_ID (M_AttributeSetInstance_ID);
 	}	//	setM_AttributeSetInstance_ID
@@ -676,7 +677,7 @@ public class MOrderLine extends X_C_OrderLine
 			return;
 		BigDecimal discount = list.subtract(getPriceActual())
 			.multiply(Env.ONEHUNDRED)
-			.divide(list, getPrecision(), BigDecimal.ROUND_HALF_UP);
+			.divide(list, getPrecision(), RoundingMode.HALF_UP);
 		setDiscount(discount);
 	}	//	setDiscount
 
@@ -717,7 +718,7 @@ public class MOrderLine extends X_C_OrderLine
 		if (QtyEntered != null && getC_UOM_ID() != 0)
 		{
 			int precision = MUOM.getPrecision(getCtx(), getC_UOM_ID());
-			QtyEntered = QtyEntered.setScale(precision, BigDecimal.ROUND_HALF_UP);
+			QtyEntered = QtyEntered.setScale(precision, RoundingMode.HALF_UP);
 		}
 		super.setQtyEntered (QtyEntered);
 	}	//	setQtyEntered
@@ -732,7 +733,7 @@ public class MOrderLine extends X_C_OrderLine
 		if (QtyOrdered != null && product != null)
 		{
 			int precision = product.getUOMPrecision();
-			QtyOrdered = QtyOrdered.setScale(precision, BigDecimal.ROUND_HALF_UP);
+			QtyOrdered = QtyOrdered.setScale(precision, RoundingMode.HALF_UP);
 		}
 		super.setQtyOrdered(QtyOrdered);
 	}	//	setQtyOrdered
diff --git a/org.adempiere.base/src/org/compiere/model/MOrderPaySchedule.java b/org.adempiere.base/src/org/compiere/model/MOrderPaySchedule.java
index ad9d8c3bec..7f722ed9c3 100644
--- a/org.adempiere.base/src/org/compiere/model/MOrderPaySchedule.java
+++ b/org.adempiere.base/src/org/compiere/model/MOrderPaySchedule.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
@@ -152,10 +153,10 @@ public class MOrderPaySchedule extends X_C_OrderPaySchedule
 		else
 		{
 			due = due.multiply(paySchedule.getPercentage())
-				.divide(Env.ONEHUNDRED, scale, BigDecimal.ROUND_HALF_UP);
+				.divide(Env.ONEHUNDRED, scale, RoundingMode.HALF_UP);
 			setDueAmt (due);
 			BigDecimal discount = due.multiply(paySchedule.getDiscount())
-				.divide(Env.ONEHUNDRED, scale, BigDecimal.ROUND_HALF_UP);
+				.divide(Env.ONEHUNDRED, scale, RoundingMode.HALF_UP);
 			setDiscountAmt (discount);
 			setIsValid(true);
 		}
diff --git a/org.adempiere.base/src/org/compiere/model/MOrderTax.java b/org.adempiere.base/src/org/compiere/model/MOrderTax.java
index 917a9c4120..0a9d37b55f 100644
--- a/org.adempiere.base/src/org/compiere/model/MOrderTax.java
+++ b/org.adempiere.base/src/org/compiere/model/MOrderTax.java
@@ -178,7 +178,7 @@ public class MOrderTax extends X_C_OrderTax
 	 */
 	protected void setPrecision (int precision)
 	{
-		m_precision = new Integer(precision);
+		m_precision = Integer.valueOf(precision);
 	}	//	setPrecision
 
 	/**
diff --git a/org.adempiere.base/src/org/compiere/model/MOrg.java b/org.adempiere.base/src/org/compiere/model/MOrg.java
index f0ed6d80a2..3847ddd09a 100644
--- a/org.adempiere.base/src/org/compiere/model/MOrg.java
+++ b/org.adempiere.base/src/org/compiere/model/MOrg.java
@@ -195,7 +195,7 @@ public class MOrg extends X_AD_Org
 				getAD_Org_ID());
 			if (C_BPartner_ID < 0)	//	not found = -1
 				C_BPartner_ID = 0;
-			m_linkedBPartner = new Integer (C_BPartner_ID);
+			m_linkedBPartner = Integer.valueOf(C_BPartner_ID);
 		}
 		return m_linkedBPartner.intValue();
 	}	//	getLinkedC_BPartner_ID
diff --git a/org.adempiere.base/src/org/compiere/model/MPInstance.java b/org.adempiere.base/src/org/compiere/model/MPInstance.java
index 29f10cb426..f1df9917df 100644
--- a/org.adempiere.base/src/org/compiere/model/MPInstance.java
+++ b/org.adempiere.base/src/org/compiere/model/MPInstance.java
@@ -151,7 +151,38 @@ public class MPInstance extends X_AD_PInstance
 		list.toArray(m_parameters);
 		return m_parameters;
 	}	//	getParameters
-
+	
+	/**
+	 * Validate that a set of process instance parameters are equal or not
+	 * to the current instance parameter
+	 * @param param array of parameters to compare
+	 * @return true if the process instance parameters are the same as the  array ones
+	 */
+	public boolean equalParameters(MPInstancePara[] params) {		
+		
+		//No parameters
+		if ((getParameters() == null || getParameters().length == 0) && (params == null || params.length == 0))
+				return true;
+		
+		//Different number of parameters
+		if (getParameters().length != params.length)
+			return false;
+		
+		int comparedParams = 0;
+		for (MPInstancePara instanceParameter : getParameters()) {
+			for (MPInstancePara para : params) {
+				if (instanceParameter.getParameterName().equals(para.getParameterName())) {
+					comparedParams++;
+					 if (!instanceParameter.equalParameter(para)) {
+						 return false;
+					 }
+					 break;
+				}
+			}
+		}
+		
+		return comparedParams == getParameters().length; //all the compared parameters have the same name and value 
+	}
 
 	/**	Log Entries					*/
 	private ArrayList<MPInstanceLog>	m_log	= new ArrayList<MPInstanceLog>();
@@ -245,7 +276,7 @@ public class MPInstance extends X_AD_PInstance
 			if (log.isLoggable(Level.INFO)) log.info("Set to 0 from " + Record_ID);
 			Record_ID = 0;
 		}
-		set_ValueNoCheck ("Record_ID", new Integer(Record_ID));
+		set_ValueNoCheck ("Record_ID", Integer.valueOf(Record_ID));
 	}	//	setRecord_ID
 
 	/**
diff --git a/org.adempiere.base/src/org/compiere/model/MPInstancePara.java b/org.adempiere.base/src/org/compiere/model/MPInstancePara.java
index 08f3b1199b..2bc0a24665 100644
--- a/org.adempiere.base/src/org/compiere/model/MPInstancePara.java
+++ b/org.adempiere.base/src/org/compiere/model/MPInstancePara.java
@@ -19,6 +19,7 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
+import java.util.Objects;
 import java.util.Properties;
 
 /**
@@ -233,6 +234,35 @@ public class MPInstancePara extends X_AD_PInstance_Para
 		return -1;
 	}
 	
+	public boolean equalParameter(MPInstancePara param) {
+		
+		if (param == null)
+			return false;
+
+		String str = getP_String() == null ? "" : getP_String();
+		String strParam = param.getP_String() == null ? "" : param.getP_String();
+		String str2 = getP_String_To() == null ? "" : getP_String_To();
+		String str2Param = param.getP_String_To() == null ? "" : param.getP_String_To();
+		if (!Objects.equals(str, strParam) || !Objects.equals(str2, str2Param))
+			return false;
+
+		BigDecimal bd = getP_Number();
+		BigDecimal bdParam = param.getP_Number();
+		BigDecimal bd2 = getP_Number_To();
+		BigDecimal bd2Param = param.getP_Number_To();
+		if (!Objects.equals(bd, bdParam) || !Objects.equals(bd2, bd2Param))
+			return false;
+
+		Timestamp ts = getP_Date();
+		Timestamp tsParam = param.getP_Date();
+		Timestamp ts2 = getP_Date_To();
+		Timestamp ts2Param = param.getP_Date_To();
+		if (!Objects.equals(ts, tsParam) || !Objects.equals(ts2, ts2Param))
+			return false;
+
+		return true;
+	}
+	
 	/**
 	 * Get existing AD_PInstance_Para record or create a new one if not found
 	 * @param ctx
diff --git a/org.adempiere.base/src/org/compiere/model/MPOS.java b/org.adempiere.base/src/org/compiere/model/MPOS.java
index cd8bb144c3..f63c154ac1 100644
--- a/org.adempiere.base/src/org/compiere/model/MPOS.java
+++ b/org.adempiere.base/src/org/compiere/model/MPOS.java
@@ -46,7 +46,7 @@ public class MPOS extends X_C_POS
 	 */
 	public static MPOS get (Properties ctx, int C_POS_ID)
 	{
-		Integer key = new Integer (C_POS_ID);
+		Integer key = Integer.valueOf(C_POS_ID);
 		MPOS retValue = (MPOS) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MPOSKeyLayout.java b/org.adempiere.base/src/org/compiere/model/MPOSKeyLayout.java
index 7e39faa9fd..0b52b5e166 100644
--- a/org.adempiere.base/src/org/compiere/model/MPOSKeyLayout.java
+++ b/org.adempiere.base/src/org/compiere/model/MPOSKeyLayout.java
@@ -46,7 +46,7 @@ public class MPOSKeyLayout extends X_C_POSKeyLayout
 	 */
 	public static MPOSKeyLayout get (Properties ctx, int C_POSKeyLayout_ID)
 	{
-		Integer key = new Integer (C_POSKeyLayout_ID);
+		Integer key = Integer.valueOf(C_POSKeyLayout_ID);
 		MPOSKeyLayout retValue = (MPOSKeyLayout) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MPOSTerminal.java b/org.adempiere.base/src/org/compiere/model/MPOSTerminal.java
index cee86a4956..e1be689b2b 100644
--- a/org.adempiere.base/src/org/compiere/model/MPOSTerminal.java
+++ b/org.adempiere.base/src/org/compiere/model/MPOSTerminal.java
@@ -65,7 +65,7 @@ public class MPOSTerminal extends X_U_POSTerminal
      */
     public static MPOSTerminal get(Properties ctx, int U_POSTerminal_ID)
     {
-        Integer key = new Integer(U_POSTerminal_ID);
+        Integer key = Integer.valueOf(U_POSTerminal_ID);
         MPOSTerminal retValue = (MPOSTerminal)s_cache.get(key);
         if (retValue == null)
         {
@@ -133,7 +133,7 @@ public class MPOSTerminal extends X_U_POSTerminal
         
         if (success)
         {
-            s_cache.remove(new Integer(get_ID()));
+            s_cache.remove(Integer.valueOf(get_ID()));
         }
         
         return success;
diff --git a/org.adempiere.base/src/org/compiere/model/MPayment.java b/org.adempiere.base/src/org/compiere/model/MPayment.java
index 33f16025b5..f09d39b812 100644
--- a/org.adempiere.base/src/org/compiere/model/MPayment.java
+++ b/org.adempiere.base/src/org/compiere/model/MPayment.java
@@ -1526,7 +1526,7 @@ public class MPayment extends X_C_Payment
 				pstmt.setInt(1, getC_Invoice_ID());
 				rs = pstmt.executeQuery();
 				if (rs.next())
-					documentSO = new Boolean ("Y".equals(rs.getString(1)));
+					documentSO = Boolean.valueOf("Y".equals(rs.getString(1)));
 			}
 			catch (Exception e)
 			{
@@ -1553,7 +1553,7 @@ public class MPayment extends X_C_Payment
 				pstmt.setInt(1, getC_Order_ID());
 				rs = pstmt.executeQuery();
 				if (rs.next())
-					documentSO = new Boolean ("Y".equals(rs.getString(1)));
+					documentSO = Boolean.valueOf("Y".equals(rs.getString(1)));
 			}
 			catch (Exception e)
 			{
@@ -1591,7 +1591,7 @@ public class MPayment extends X_C_Payment
 									return false;
 								}
 							} else {
-								documentSO = new Boolean ("Y".equals(rs.getString(1)));
+								documentSO = Boolean.valueOf("Y".equals(rs.getString(1)));
 							}
 						}
 					}
@@ -1622,7 +1622,7 @@ public class MPayment extends X_C_Payment
 			pstmt.setInt(1, getC_DocType_ID());
 			rs = pstmt.executeQuery();
 			if (rs.next())
-				paymentSO = new Boolean ("Y".equals(rs.getString(1)));
+				paymentSO = Boolean.valueOf("Y".equals(rs.getString(1)));
 		}
 		catch (Exception e)
 		{
diff --git a/org.adempiere.base/src/org/compiere/model/MPeriod.java b/org.adempiere.base/src/org/compiere/model/MPeriod.java
index b518226da9..7f9e351c37 100644
--- a/org.adempiere.base/src/org/compiere/model/MPeriod.java
+++ b/org.adempiere.base/src/org/compiere/model/MPeriod.java
@@ -68,7 +68,7 @@ public class MPeriod extends X_C_Period
 		if (C_Period_ID <= 0)
 			return null;
 		//
-		Integer key = new Integer(C_Period_ID);
+		Integer key = Integer.valueOf(C_Period_ID);
 		MPeriod retValue = (MPeriod) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
@@ -88,7 +88,7 @@ public class MPeriod extends X_C_Period
 	 */
 	public static MPeriod get (Properties ctx, Timestamp DateAcct)
 	{	
-		return get(ctx, DateAcct, 0);
+		return get(ctx, DateAcct, 0, null);
 	}	//	get
 	
 	/**
@@ -170,7 +170,7 @@ public class MPeriod extends X_C_Period
 			while (rs.next())
 			{
 				MPeriod period = new MPeriod(ctx, rs, trxName);
-				Integer key = new Integer(period.getC_Period_ID());
+				Integer key = Integer.valueOf(period.getC_Period_ID());
 				s_cache.put (key, period);
 				if (period.isStandardPeriod())
 					retValue = period;
@@ -200,7 +200,7 @@ public class MPeriod extends X_C_Period
 	 */
 	public static int getC_Period_ID (Properties ctx, Timestamp DateAcct)
 	{
-		MPeriod period = get (ctx, DateAcct);
+		MPeriod period = get (ctx, DateAcct, 0, null);
 		if (period == null)
 			return 0;
 		return period.getC_Period_ID();
@@ -215,7 +215,7 @@ public class MPeriod extends X_C_Period
 	 */
 	public static int getC_Period_ID (Properties ctx, Timestamp DateAcct, int AD_Org_ID)
 	{
-		MPeriod period = get (ctx, DateAcct, AD_Org_ID);
+		MPeriod period = get (ctx, DateAcct, AD_Org_ID, null);
 		if (period == null)
 			return 0;
 		return period.getC_Period_ID();
@@ -254,7 +254,7 @@ public class MPeriod extends X_C_Period
 			s_log.warning("No DocBaseType");
 			return false;
 		}
-		MPeriod period = MPeriod.get (ctx, DateAcct, AD_Org_ID);
+		MPeriod period = MPeriod.get (ctx, DateAcct, AD_Org_ID, null);
 		if (period == null)
 		{
 			s_log.warning("No Period for " + DateAcct + " (" + DocBaseType + ")");
@@ -398,7 +398,7 @@ public class MPeriod extends X_C_Period
 	public static MPeriod getFirstInYear (Properties ctx, Timestamp DateAcct, int AD_Org_ID)
 	{
 		MPeriod retValue = null;
-		int C_Calendar_ID = MPeriod.get(ctx, DateAcct, AD_Org_ID).getC_Calendar_ID();
+		int C_Calendar_ID = MPeriod.get(ctx, DateAcct, AD_Org_ID, null).getC_Calendar_ID();
 
         String sql = "SELECT * "
                     + "FROM C_Period "
@@ -780,7 +780,7 @@ public class MPeriod extends X_C_Period
 	public static void testPeriodOpen(Properties ctx, Timestamp dateAcct, String docBaseType)
 	throws PeriodClosedException 
 	{
-		if (!MPeriod.isOpen(ctx, dateAcct, docBaseType)) {
+		if (!MPeriod.isOpen(ctx, dateAcct, docBaseType, 0)) {
 			throw new PeriodClosedException(dateAcct, docBaseType);
 		}
 	}
@@ -815,7 +815,7 @@ public class MPeriod extends X_C_Period
 	throws PeriodClosedException
 	{
 		MDocType dt = MDocType.get(ctx, C_DocType_ID);
-		testPeriodOpen(ctx, dateAcct, dt.getDocBaseType());
+		testPeriodOpen(ctx, dateAcct, dt.getDocBaseType(), 0);
 	}
 	
 	/**
@@ -842,9 +842,9 @@ public class MPeriod extends X_C_Period
 	{
 		if (m_C_Calendar_ID == 0)
 		{
-			MYear year = (MYear) getC_Year();
-			if (year != null)
-				m_C_Calendar_ID = year.getC_Calendar_ID();
+			int calId = DB.getSQLValueEx(null, "SELECT C_Calendar_ID FROM C_Year WHERE C_Year_ID=?", getC_Year_ID());
+			if (calId >= 0)
+				m_C_Calendar_ID = calId;
 			else
 				log.severe("@NotFound@ C_Year_ID=" + getC_Year_ID());
 		}
diff --git a/org.adempiere.base/src/org/compiere/model/MPriceList.java b/org.adempiere.base/src/org/compiere/model/MPriceList.java
index b06188c463..4ff33827ef 100644
--- a/org.adempiere.base/src/org/compiere/model/MPriceList.java
+++ b/org.adempiere.base/src/org/compiere/model/MPriceList.java
@@ -50,7 +50,7 @@ public class MPriceList extends X_M_PriceList
 	 */
 	public static MPriceList get (Properties ctx, int M_PriceList_ID, String trxName)
 	{
-		Integer key = new Integer (M_PriceList_ID);
+		Integer key = Integer.valueOf(M_PriceList_ID);
 		MPriceList retValue = (MPriceList)s_cache.get(key);
 		if (retValue == null)
 		{
@@ -263,7 +263,7 @@ public class MPriceList extends X_M_PriceList
 		if (m_precision == null)
 		{
 			MCurrency c = MCurrency.get(getCtx(), getC_Currency_ID());
-			m_precision = new Integer (c.getStdPrecision());
+			m_precision = Integer.valueOf(c.getStdPrecision());
 		}
 		return m_precision.intValue();
 	}	//	getStandardPrecision
diff --git a/org.adempiere.base/src/org/compiere/model/MPrivateAccess.java b/org.adempiere.base/src/org/compiere/model/MPrivateAccess.java
index cc75c46764..15e42d7a53 100644
--- a/org.adempiere.base/src/org/compiere/model/MPrivateAccess.java
+++ b/org.adempiere.base/src/org/compiere/model/MPrivateAccess.java
@@ -94,7 +94,7 @@ public class MPrivateAccess extends X_AD_Private_Access
 			pstmt.setInt(2, AD_User_ID);
 			ResultSet rs = pstmt.executeQuery();
 			while (rs.next())
-				list.add(new Integer(rs.getInt(1))); 
+				list.add(Integer.valueOf(rs.getInt(1))); 
 			rs.close();
 			pstmt.close();
 			pstmt = null;
diff --git a/org.adempiere.base/src/org/compiere/model/MProcess.java b/org.adempiere.base/src/org/compiere/model/MProcess.java
index 724c27c790..8e07379176 100644
--- a/org.adempiere.base/src/org/compiere/model/MProcess.java
+++ b/org.adempiere.base/src/org/compiere/model/MProcess.java
@@ -54,7 +54,7 @@ public class MProcess extends X_AD_Process
 	 */
 	public static MProcess get (Properties ctx, int AD_Process_ID)
 	{
-		Integer key = new Integer (AD_Process_ID);
+		Integer key = Integer.valueOf(AD_Process_ID);
 		MProcess retValue = (MProcess) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
@@ -308,6 +308,24 @@ public class MProcess extends X_AD_Process
 		return (Classname != null && Classname.length() > 0);
 	}	//	is JavaProcess
 	
+	/**
+	 * 	Is Force Background
+	 *	@return true if force background
+	 */
+	public boolean isForceBackground()
+	{
+		return EXECUTIONTYPE_ForceBackground.equals(getExecutionType());
+	}
+	
+	/**
+	 * 	Is Force Foreground
+	 *	@return true if force foreground
+	 */
+	public boolean isForceForeground()
+	{
+		return EXECUTIONTYPE_ForceForeground.equals(getExecutionType());
+	}
+	
 	/**
 	 *  Start Database Process
 	 *  @param ProcedureName PL/SQL procedure name
diff --git a/org.adempiere.base/src/org/compiere/model/MProcessPara.java b/org.adempiere.base/src/org/compiere/model/MProcessPara.java
index 2de67394bb..0451b51724 100644
--- a/org.adempiere.base/src/org/compiere/model/MProcessPara.java
+++ b/org.adempiere.base/src/org/compiere/model/MProcessPara.java
@@ -47,7 +47,7 @@ public class MProcessPara extends X_AD_Process_Para
 	 */
 	public static MProcessPara get (Properties ctx, int AD_Process_Para_ID)
 	{
-		Integer key = new Integer (AD_Process_Para_ID);
+		Integer key = Integer.valueOf(AD_Process_Para_ID);
 		MProcessPara retValue = (MProcessPara)s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MProduct.java b/org.adempiere.base/src/org/compiere/model/MProduct.java
index fcd11091af..1e044332f4 100644
--- a/org.adempiere.base/src/org/compiere/model/MProduct.java
+++ b/org.adempiere.base/src/org/compiere/model/MProduct.java
@@ -65,7 +65,7 @@ public class MProduct extends X_M_Product
 		{
 			return null;
 		}
-		Integer key = new Integer (M_Product_ID);
+		Integer key = Integer.valueOf(M_Product_ID);
 		MProduct retValue = (MProduct) s_cache.get (key);
 		if (retValue != null)
 		{
@@ -423,7 +423,7 @@ public class MProduct extends X_M_Product
 			int C_UOM_ID = getC_UOM_ID();
 			if (C_UOM_ID == 0)
 				return 0;	//	EA
-			m_precision = new Integer (MUOM.getPrecision(getCtx(), C_UOM_ID));
+			m_precision = Integer.valueOf(MUOM.getPrecision(getCtx(), C_UOM_ID));
 		}
 		return m_precision.intValue();
 	}	//	getUOMPrecision
diff --git a/org.adempiere.base/src/org/compiere/model/MProductCategory.java b/org.adempiere.base/src/org/compiere/model/MProductCategory.java
index 4c1603765e..505012bac0 100644
--- a/org.adempiere.base/src/org/compiere/model/MProductCategory.java
+++ b/org.adempiere.base/src/org/compiere/model/MProductCategory.java
@@ -51,7 +51,7 @@ public class MProductCategory extends X_M_Product_Category
 	 */
 	public static MProductCategory get (Properties ctx, int M_Product_Category_ID)
 	{
-		Integer ii = new Integer (M_Product_Category_ID);
+		Integer ii = Integer.valueOf(M_Product_Category_ID);
 		MProductCategory retValue = (MProductCategory)s_cache.get(ii);
 		if (retValue != null)
 			return retValue;
@@ -72,7 +72,7 @@ public class MProductCategory extends X_M_Product_Category
 		if (M_Product_ID == 0 || M_Product_Category_ID == 0)
 			return false;
 		//	Look up
-		Integer product = new Integer (M_Product_ID);
+		Integer product = Integer.valueOf(M_Product_ID);
 		Integer category = (Integer)s_products.get(product);
 		if (category != null)
 			return category.intValue() == M_Product_Category_ID;
@@ -86,7 +86,7 @@ public class MProductCategory extends X_M_Product_Category
 			pstmt.setInt (1, M_Product_ID);
 			rs = pstmt.executeQuery ();
 			if (rs.next ())
-				category = new Integer(rs.getInt(1));
+				category = Integer.valueOf(rs.getInt(1));
 		}
 		catch (Exception e)
 		{
diff --git a/org.adempiere.base/src/org/compiere/model/MProductPrice.java b/org.adempiere.base/src/org/compiere/model/MProductPrice.java
index 510a975d8a..1c2d9f610c 100644
--- a/org.adempiere.base/src/org/compiere/model/MProductPrice.java
+++ b/org.adempiere.base/src/org/compiere/model/MProductPrice.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.ResultSet;
 import java.util.Properties;
 
@@ -136,9 +137,9 @@ public class MProductPrice extends X_M_ProductPrice
 	 */
 	public void setPrices (BigDecimal PriceList, BigDecimal PriceStd, BigDecimal PriceLimit)
 	{
-		setPriceLimit (PriceLimit.setScale(this.getM_PriceList_Version().getM_PriceList().getPricePrecision(), BigDecimal.ROUND_HALF_UP)); 
-		setPriceList (PriceList.setScale(this.getM_PriceList_Version().getM_PriceList().getPricePrecision(), BigDecimal.ROUND_HALF_UP)); 
-		setPriceStd (PriceStd.setScale(this.getM_PriceList_Version().getM_PriceList().getPricePrecision(), BigDecimal.ROUND_HALF_UP));
+		setPriceLimit (PriceLimit.setScale(this.getM_PriceList_Version().getM_PriceList().getPricePrecision(), RoundingMode.HALF_UP)); 
+		setPriceList (PriceList.setScale(this.getM_PriceList_Version().getM_PriceList().getPricePrecision(), RoundingMode.HALF_UP)); 
+		setPriceStd (PriceStd.setScale(this.getM_PriceList_Version().getM_PriceList().getPricePrecision(), RoundingMode.HALF_UP));
 	}	//	setPrice
 
 	/**
diff --git a/org.adempiere.base/src/org/compiere/model/MProductPricing.java b/org.adempiere.base/src/org/compiere/model/MProductPricing.java
index c2a06912fa..c658cc21ad 100644
--- a/org.adempiere.base/src/org/compiere/model/MProductPricing.java
+++ b/org.adempiere.base/src/org/compiere/model/MProductPricing.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
@@ -160,7 +161,7 @@ public class MProductPricing extends AbstractProductPricing
 			calculateDiscount();
 		setPrecision();		//	from Price List
 		//
-		m_found = new Boolean (m_calculated);
+		m_found = Boolean.valueOf(m_calculated);
 		return m_calculated;
 	}	//	calculatePrice
 
@@ -826,7 +827,7 @@ public class MProductPricing extends AbstractProductPricing
 			Discount = BigDecimal.valueOf((m_PriceList.doubleValue() - m_PriceStd.doubleValue())
 				/ m_PriceList.doubleValue() * 100.0);
 		if (Discount.scale() > 2)
-			Discount = Discount.setScale(2, BigDecimal.ROUND_HALF_UP);
+			Discount = Discount.setScale(2, RoundingMode.HALF_UP);
 		return Discount;
 	}	//	getDiscount
 
@@ -898,7 +899,7 @@ public class MProductPricing extends AbstractProductPricing
 	{
 		if (m_precision >= 0	//	-1 = no rounding
 			&& bd.scale() > m_precision)
-			return bd.setScale(m_precision, BigDecimal.ROUND_HALF_UP);
+			return bd.setScale(m_precision, RoundingMode.HALF_UP);
 		return bd;
 	}	//	round
 	
diff --git a/org.adempiere.base/src/org/compiere/model/MProduction.java b/org.adempiere.base/src/org/compiere/model/MProduction.java
index 9b82889191..f3b6898ad0 100644
--- a/org.adempiere.base/src/org/compiere/model/MProduction.java
+++ b/org.adempiere.base/src/org/compiere/model/MProduction.java
@@ -26,16 +26,16 @@ public class MProduction extends X_M_Production implements DocAction {
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 8047044372956625013L;
+	private static final long serialVersionUID = -4650232602150964606L;
 
 	/**
 	 * 
 	 */
 	/** Log								*/
 	@SuppressWarnings("unused")
-	private static CLogger		m_log = CLogger.getCLogger (MProduction.class);
-	private int lineno;
-	private int count;
+	protected static CLogger		m_log = CLogger.getCLogger (MProduction.class);
+	protected int lineno;
+	protected int count;
 
 	public MProduction(Properties ctx, int M_Production_ID, String trxName) {
 		super(ctx, M_Production_ID, trxName);
@@ -164,7 +164,7 @@ public class MProduction extends X_M_Production implements DocAction {
 		return false;
 	}
 
-	private Object processLines(MProductionLine[] lines) {
+	protected Object processLines(MProductionLine[] lines) {
 		StringBuilder errors = new StringBuilder();
 		for ( int i = 0; i<lines.length; i++) {
 			String error = lines[i].createTransactions(getMovementDate(), false);
@@ -247,7 +247,7 @@ public class MProduction extends X_M_Production implements DocAction {
 		return count;
 	}
 
-	private int createLines(boolean mustBeStocked, MProduct finishedProduct, BigDecimal requiredQty) {
+	protected int createLines(boolean mustBeStocked, MProduct finishedProduct, BigDecimal requiredQty) {
 		
 		int defaultLocator = 0;
 		
@@ -453,9 +453,9 @@ public class MProduction extends X_M_Production implements DocAction {
 	}
 
 	/**	Process Message 			*/
-	private String		m_processMsg = null;
+	protected String		m_processMsg = null;
 	/**	Just Prepared Flag			*/
-	private boolean		m_justPrepared = false;
+	protected boolean		m_justPrepared = false;
 
 	@Override
 	public boolean unlockIt() {
@@ -703,7 +703,7 @@ public class MProduction extends X_M_Production implements DocAction {
 		return true;
 	}
 
-	private MProduction reverse(boolean accrual) {
+	protected MProduction reverse(boolean accrual) {
 		Timestamp reversalDate = accrual ? Env.getContextAsDate(getCtx(), "#Date") : getMovementDate();
 		if (reversalDate == null) {
 			reversalDate = new Timestamp(System.currentTimeMillis());
@@ -760,7 +760,7 @@ public class MProduction extends X_M_Production implements DocAction {
 		return reversal;
 	}
 
-	private MProduction copyFrom(Timestamp reversalDate) {
+	protected MProduction copyFrom(Timestamp reversalDate) {
 		MProduction to = new MProduction(getCtx(), 0, get_TrxName());
 		PO.copyValues (this, to, getAD_Client_ID(), getAD_Org_ID());
 
diff --git a/org.adempiere.base/src/org/compiere/model/MProductionLine.java b/org.adempiere.base/src/org/compiere/model/MProductionLine.java
index 3cd26ae903..3cf60305af 100644
--- a/org.adempiere.base/src/org/compiere/model/MProductionLine.java
+++ b/org.adempiere.base/src/org/compiere/model/MProductionLine.java
@@ -20,9 +20,9 @@ public class MProductionLine extends X_M_ProductionLine {
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 5939914729719167512L;
+	private static final long serialVersionUID = 3720901152312853611L;
 
-	private MProduction productionParent;
+	protected MProduction productionParent;
 
 
 	/**
@@ -323,7 +323,7 @@ public class MProductionLine extends X_M_ProductionLine {
 		
 	}
 
-	private int getEndProduct_ID() {
+	protected int getEndProduct_ID() {
 		if (productionParent != null) {
 			return productionParent.getM_Product_ID();
 		} else if (getM_Production_ID() > 0) {
@@ -333,7 +333,7 @@ public class MProductionLine extends X_M_ProductionLine {
 		}
 	}
 
-	private int deleteMA() {
+	protected int deleteMA() {
 		String sql = "DELETE FROM M_ProductionLineMA WHERE M_ProductionLine_ID = " + get_ID();
 		int count = DB.executeUpdateEx( sql, get_TrxName() );
 		return count;
diff --git a/org.adempiere.base/src/org/compiere/model/MProjectType.java b/org.adempiere.base/src/org/compiere/model/MProjectType.java
index e86701589d..3b1edc7242 100644
--- a/org.adempiere.base/src/org/compiere/model/MProjectType.java
+++ b/org.adempiere.base/src/org/compiere/model/MProjectType.java
@@ -49,7 +49,7 @@ public class MProjectType extends X_C_ProjectType
 	 */
 	public static MProjectType get (Properties ctx, int C_ProjectType_ID)
 	{
-		Integer key = new Integer (C_ProjectType_ID);
+		Integer key = Integer.valueOf(C_ProjectType_ID);
 		MProjectType retValue = (MProjectType)s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MQuery.java b/org.adempiere.base/src/org/compiere/model/MQuery.java
index 9b27c76616..f04c37fe4a 100644
--- a/org.adempiere.base/src/org/compiere/model/MQuery.java
+++ b/org.adempiere.base/src/org/compiere/model/MQuery.java
@@ -131,11 +131,11 @@ public class MQuery implements Serializable
 				Double P_Number = null;
 				double d = rs.getDouble(4);
 				if (!rs.wasNull())
-					P_Number = new Double(d);
+					P_Number = Double.valueOf(d);
 				Double P_Number_To = null;
 				d = rs.getDouble(5);
 				if (!rs.wasNull())
-					P_Number_To = new Double(d);
+					P_Number_To = Double.valueOf(d);
 				//
 				Timestamp P_Date = rs.getTimestamp(6);
 				Timestamp P_Date_To = rs.getTimestamp(7);
@@ -311,7 +311,7 @@ public class MQuery implements Serializable
 		MQuery query = new MQuery();
 		if (columnName.endsWith("_ID"))
 			query.setTableName(columnName.substring(0, columnName.length()-3));
-		query.addRestriction(columnName, EQUAL, new Integer(value));
+		query.addRestriction(columnName, EQUAL, Integer.valueOf(value));
 		query.setRecordCount(1);	//	guess
 		return query;
 	}	//	getEqualQuery
@@ -527,7 +527,7 @@ public class MQuery implements Serializable
 		int Code)
 	{
 		Restriction r = new Restriction (ColumnName, Operator,
-			new Integer(Code), null, null, true, 0);
+			Integer.valueOf(Code), null, null, true, 0);
 		m_list.add(r);
 	}	//	addRestriction
 
@@ -1024,7 +1024,7 @@ class Restriction  implements Serializable
 		if (code instanceof Boolean)
 			Code = ((Boolean)code).booleanValue() ? "Y" : "N";
 		else if (code instanceof KeyNamePair)
-			Code = new Integer(((KeyNamePair)code).getKey());
+			Code = Integer.valueOf(((KeyNamePair)code).getKey());
 		else if (code instanceof ValueNamePair)
 			Code = ((ValueNamePair)code).getValue();
 		else
diff --git a/org.adempiere.base/src/org/compiere/model/MRMA.java b/org.adempiere.base/src/org/compiere/model/MRMA.java
index c15742b3f1..157e697a7e 100644
--- a/org.adempiere.base/src/org/compiere/model/MRMA.java
+++ b/org.adempiere.base/src/org/compiere/model/MRMA.java
@@ -47,7 +47,7 @@ public class MRMA extends X_M_RMA implements DocAction
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -6449007672684459651L;
+	private static final long serialVersionUID = 6196067840638153414L;
 
 	/**
 	 * 	Standard Constructor
@@ -83,11 +83,11 @@ public class MRMA extends X_M_RMA implements DocAction
 	}	//	MRMA
 
 	/** Lines					*/
-	private MRMALine[]		m_lines = null;
+	protected MRMALine[]		m_lines = null;
 	/**	Tax Lines					*/
-	private MRMATax[] 		m_taxes = null;
+	protected MRMATax[] 		m_taxes = null;
 	/** The Shipment			*/
-	private MInOut			m_inout = null;
+	protected MInOut			m_inout = null;
 
 	/**
 	 * 	Get Lines
@@ -300,9 +300,9 @@ public class MRMA extends X_M_RMA implements DocAction
 	}	//	process
 
 	/**	Process Message 			*/
-	private String		m_processMsg = null;
+	protected String		m_processMsg = null;
 	/**	Just Prepared Flag			*/
-	private boolean		m_justPrepared = false;
+	protected boolean		m_justPrepared = false;
 
 	/**
 	 * 	Unlock Document.
@@ -474,7 +474,7 @@ public class MRMA extends X_M_RMA implements DocAction
 	/**
 	 * 	Set the definite document number after completed
 	 */
-	private void setDefiniteDocumentNo() {
+	protected void setDefiniteDocumentNo() {
 		MDocType dt = MDocType.get(getCtx(), getC_DocType_ID());
 		/* No Document Date on RMA
 		if (dt.isOverwriteDateOnComplete()) {
@@ -492,7 +492,7 @@ public class MRMA extends X_M_RMA implements DocAction
 	 * 	Create Counter Document
 	 * 	@return InOut
 	 */
-	private MRMA createCounterDoc()
+	protected MRMA createCounterDoc()
 	{
 		//	Is this a counter doc ?
 		if (getRef_RMA_ID() > 0)
diff --git a/org.adempiere.base/src/org/compiere/model/MRMALine.java b/org.adempiere.base/src/org/compiere/model/MRMALine.java
index f37d2a8871..d9ff2f2dd9 100644
--- a/org.adempiere.base/src/org/compiere/model/MRMALine.java
+++ b/org.adempiere.base/src/org/compiere/model/MRMALine.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.ResultSet;
 import java.util.Properties;
 
@@ -40,7 +41,7 @@ public class MRMALine extends X_M_RMALine
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -3459158383642518763L;
+	private static final long serialVersionUID = 3088864372141663734L;
 
 	/**
 	 * 	Standard Constructor
@@ -73,25 +74,25 @@ public class MRMALine extends X_M_RMALine
 	}	//	MRMALine
 	
 	/**	Shipment Line			*/
-	private MInOutLine	m_ioLine = null;
+	protected MInOutLine	m_ioLine = null;
 	/**	Product					*/
-	private MProduct	m_product = null;
+	protected MProduct	m_product = null;
 	/**	Charge					*/
-	private MCharge		m_charge = null;
+	protected MCharge		m_charge = null;
 	/** Tax							*/
-	private MTax 		m_tax = null;
+	protected MTax 		m_tax = null;
 	/** Parent                  */
-	private MRMA		m_parent = null;
+	protected MRMA		m_parent = null;
     
-    private int precision = 0;
-    private BigDecimal unitAmount = Env.ZERO;
-    private BigDecimal originalQty = Env.ZERO;
-    private int taxId = 0;
+    protected int precision = 0;
+    protected BigDecimal unitAmount = Env.ZERO;
+    protected BigDecimal originalQty = Env.ZERO;
+    protected int taxId = 0;
     
     /**
      * Initialise parameters that are required
      */
-    private void init()
+    protected void init()
     {
         getShipLine();
         
@@ -223,7 +224,7 @@ public class MRMALine extends X_M_RMALine
      * Retrieves the invoiceLine Id associated with the Shipment/Receipt Line
      * @return Invoice Line ID
      */
-    private int getInvoiceLineId()
+    protected int getInvoiceLineId()
     {
     	int invoiceLine_ID = new Query(getCtx(), I_C_InvoiceLine.Table_Name, "M_InOutLine_ID=?", get_TrxName())
     	.setParameters(getM_InOutLine_ID())
@@ -249,7 +250,7 @@ public class MRMALine extends X_M_RMALine
         BigDecimal bd = getAmt().multiply(getQty()); 
 		int precision = getPrecision();
 		if (bd.scale() > precision)
-			bd = bd.setScale(precision, BigDecimal.ROUND_HALF_UP);
+			bd = bd.setScale(precision, RoundingMode.HALF_UP);
 		
         return bd;
     }   //  getAmt
diff --git a/org.adempiere.base/src/org/compiere/model/MRMATax.java b/org.adempiere.base/src/org/compiere/model/MRMATax.java
index bd80356233..c5d312af37 100644
--- a/org.adempiere.base/src/org/compiere/model/MRMATax.java
+++ b/org.adempiere.base/src/org/compiere/model/MRMATax.java
@@ -171,7 +171,7 @@ public class MRMATax extends X_M_RMATax
 	 */
 	protected void setPrecision (int precision)
 	{
-		m_precision = new Integer(precision);
+		m_precision = Integer.valueOf(precision);
 	}	//	setPrecision
 
 	/**
diff --git a/org.adempiere.base/src/org/compiere/model/MRegistrationAttribute.java b/org.adempiere.base/src/org/compiere/model/MRegistrationAttribute.java
index eb90a0d5b6..1e17010d66 100644
--- a/org.adempiere.base/src/org/compiere/model/MRegistrationAttribute.java
+++ b/org.adempiere.base/src/org/compiere/model/MRegistrationAttribute.java
@@ -64,7 +64,7 @@ public class MRegistrationAttribute extends X_A_RegistrationAttribute
 			while (rs.next())
 			{
 				MRegistrationAttribute value = new MRegistrationAttribute(ctx, rs, null);
-				Integer key = new Integer(value.getA_RegistrationAttribute_ID());
+				Integer key = Integer.valueOf(value.getA_RegistrationAttribute_ID());
 				s_cache.put(key, value);
 				list.add(value);
 			}
@@ -93,7 +93,7 @@ public class MRegistrationAttribute extends X_A_RegistrationAttribute
 	 */
 	public static MRegistrationAttribute get (Properties ctx, int A_RegistrationAttribute_ID, String trxName)
 	{
-		Integer key = new Integer(A_RegistrationAttribute_ID);
+		Integer key = Integer.valueOf(A_RegistrationAttribute_ID);
 		MRegistrationAttribute retValue = (MRegistrationAttribute)s_cache.get(key);
 		if (retValue == null)
 		{
diff --git a/org.adempiere.base/src/org/compiere/model/MRequest.java b/org.adempiere.base/src/org/compiere/model/MRequest.java
index 1f39b11155..5dcfc70c7c 100644
--- a/org.adempiere.base/src/org/compiere/model/MRequest.java
+++ b/org.adempiere.base/src/org/compiere/model/MRequest.java
@@ -119,8 +119,8 @@ public class MRequest extends X_R_Request
 		int R_RequestType_ID, String Summary, boolean isSelfService, String trxName)
 	{
 		this(ctx, 0, trxName);
-		set_Value ("SalesRep_ID", new Integer(SalesRep_ID));	//	could be 0
-		set_Value ("R_RequestType_ID", new Integer(R_RequestType_ID));
+		set_Value ("SalesRep_ID", Integer.valueOf(SalesRep_ID));	//	could be 0
+		set_Value ("R_RequestType_ID", Integer.valueOf(R_RequestType_ID));
 		setSummary (Summary);
 		setIsSelfService(isSelfService);
 		getRequestType();
diff --git a/org.adempiere.base/src/org/compiere/model/MRequestCategory.java b/org.adempiere.base/src/org/compiere/model/MRequestCategory.java
index d398642d6e..0674802345 100644
--- a/org.adempiere.base/src/org/compiere/model/MRequestCategory.java
+++ b/org.adempiere.base/src/org/compiere/model/MRequestCategory.java
@@ -42,7 +42,7 @@ public class MRequestCategory extends X_R_Category
 	 */
 	public static MRequestCategory get (Properties ctx, int R_Category_ID)
 	{
-		Integer key = new Integer (R_Category_ID);
+		Integer key = Integer.valueOf(R_Category_ID);
 		MRequestCategory retValue = (MRequestCategory) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MRequestType.java b/org.adempiere.base/src/org/compiere/model/MRequestType.java
index fcabf19f4a..10c7bcc7cc 100644
--- a/org.adempiere.base/src/org/compiere/model/MRequestType.java
+++ b/org.adempiere.base/src/org/compiere/model/MRequestType.java
@@ -52,7 +52,7 @@ public class MRequestType extends X_R_RequestType
 	 */
 	public static MRequestType get (Properties ctx, int R_RequestType_ID)
 	{
-		Integer key = new Integer (R_RequestType_ID);
+		Integer key = Integer.valueOf(R_RequestType_ID);
 		MRequestType retValue = (MRequestType)s_cache.get(key);
 		if (retValue == null)
 		{
diff --git a/org.adempiere.base/src/org/compiere/model/MRequisition.java b/org.adempiere.base/src/org/compiere/model/MRequisition.java
index ee15a69020..c41cee9ca3 100644
--- a/org.adempiere.base/src/org/compiere/model/MRequisition.java
+++ b/org.adempiere.base/src/org/compiere/model/MRequisition.java
@@ -18,6 +18,7 @@ package org.compiere.model;
 
 import java.io.File;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.List;
@@ -274,7 +275,7 @@ public class MRequisition extends X_M_Requisition implements DocAction
 		{
 			MRequisitionLine line = lines[i];
 			BigDecimal lineNet = line.getQty().multiply(line.getPriceActual());
-			lineNet = lineNet.setScale(precision, BigDecimal.ROUND_HALF_UP);
+			lineNet = lineNet.setScale(precision, RoundingMode.HALF_UP);
 			if (lineNet.compareTo(line.getLineNetAmt()) != 0)
 			{
 				line.setLineNetAmt(lineNet);
diff --git a/org.adempiere.base/src/org/compiere/model/MResolution.java b/org.adempiere.base/src/org/compiere/model/MResolution.java
index 7aee211616..ec8ec38a8a 100644
--- a/org.adempiere.base/src/org/compiere/model/MResolution.java
+++ b/org.adempiere.base/src/org/compiere/model/MResolution.java
@@ -43,7 +43,7 @@ public class MResolution extends X_R_Resolution
 	 */
 	public static MResolution get (Properties ctx, int R_Resolution_ID)
 	{
-		Integer key = new Integer (R_Resolution_ID);
+		Integer key = Integer.valueOf(R_Resolution_ID);
 		MResolution retValue = (MResolution) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MRfQ.java b/org.adempiere.base/src/org/compiere/model/MRfQ.java
index d5a5b5814b..1a6385c80a 100644
--- a/org.adempiere.base/src/org/compiere/model/MRfQ.java
+++ b/org.adempiere.base/src/org/compiere/model/MRfQ.java
@@ -50,7 +50,7 @@ public class MRfQ extends X_C_RfQ
 	 */
 	public static MRfQ get (Properties ctx, int C_RfQ_ID, String trxName)
 	{
-		Integer key = new Integer (C_RfQ_ID);
+		Integer key = Integer.valueOf(C_RfQ_ID);
 		MRfQ retValue = (MRfQ) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MRfQLine.java b/org.adempiere.base/src/org/compiere/model/MRfQLine.java
index ab39cf0438..6508d90540 100644
--- a/org.adempiere.base/src/org/compiere/model/MRfQLine.java
+++ b/org.adempiere.base/src/org/compiere/model/MRfQLine.java
@@ -48,7 +48,7 @@ public class MRfQLine extends X_C_RfQLine
 	 */
 	public static MRfQLine get (Properties ctx, int C_RfQLine_ID, String trxName)
 	{
-		Integer key = new Integer (C_RfQLine_ID);
+		Integer key = Integer.valueOf(C_RfQLine_ID);
 		MRfQLine retValue = (MRfQLine) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MRfQLineQty.java b/org.adempiere.base/src/org/compiere/model/MRfQLineQty.java
index 212c536174..3269807b41 100644
--- a/org.adempiere.base/src/org/compiere/model/MRfQLineQty.java
+++ b/org.adempiere.base/src/org/compiere/model/MRfQLineQty.java
@@ -48,7 +48,7 @@ public class MRfQLineQty extends X_C_RfQLineQty
 	 */
 	public static MRfQLineQty get (Properties ctx, int C_RfQLineQty_ID, String trxName)
 	{
-		Integer key = new Integer (C_RfQLineQty_ID);
+		Integer key = Integer.valueOf(C_RfQLineQty_ID);
 		MRfQLineQty retValue = (MRfQLineQty) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MRfQResponseLineQty.java b/org.adempiere.base/src/org/compiere/model/MRfQResponseLineQty.java
index 57e1560c00..bc5b1638e3 100644
--- a/org.adempiere.base/src/org/compiere/model/MRfQResponseLineQty.java
+++ b/org.adempiere.base/src/org/compiere/model/MRfQResponseLineQty.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.ResultSet;
 import java.util.Comparator;
 import java.util.Properties;
@@ -148,7 +149,7 @@ public class MRfQResponseLineQty extends X_C_RfQResponseLineQty implements Compa
 		//	Calculate
 	//	double result = price.doubleValue() * (100.0 - discount.doubleValue()) / 100.0;
 		BigDecimal factor = Env.ONEHUNDRED.subtract(discount);
-		return price.multiply(factor).divide(Env.ONEHUNDRED, 2, BigDecimal.ROUND_HALF_UP);  
+		return price.multiply(factor).divide(Env.ONEHUNDRED, 2, RoundingMode.HALF_UP);  
 	}	//	getNetAmt
 
 	
diff --git a/org.adempiere.base/src/org/compiere/model/MRole.java b/org.adempiere.base/src/org/compiere/model/MRole.java
index 7b07d0ba6b..8238abc2d8 100644
--- a/org.adempiere.base/src/org/compiere/model/MRole.java
+++ b/org.adempiere.base/src/org/compiere/model/MRole.java
@@ -902,7 +902,7 @@ public final class MRole extends X_AD_Role
 			rs = pstmt.executeQuery();
 			while (rs.next())
 			{
-				Integer ii = new Integer(rs.getInt(1));
+				Integer ii = Integer.valueOf(rs.getInt(1));
 				m_tableAccessLevel.put(ii, rs.getString(2));
 				String tableName = rs.getString(3); 
 				m_tableName.put(tableName, ii);
@@ -1345,7 +1345,7 @@ public final class MRole extends X_AD_Role
 		//	AccessLevel
 		//		1 = Org - 2 = Client - 4 = System
 		//		3 = Org+Client - 6 = Client+System - 7 = All
-		String roleAccessLevel = (String)m_tableAccessLevel.get(new Integer(AD_Table_ID));
+		String roleAccessLevel = (String)m_tableAccessLevel.get(Integer.valueOf(AD_Table_ID));
 		if (roleAccessLevel == null)
 		{
 			if (log.isLoggable(Level.FINE)) log.fine("NO - No AccessLevel - AD_Table_ID=" + AD_Table_ID);
@@ -1542,14 +1542,14 @@ public final class MRole extends X_AD_Role
 				pstmt.setInt(1, getAD_Role_ID());
 				rs = pstmt.executeQuery();
 				while (rs.next()) {
-					Integer winId = new Integer(rs.getInt(1));
+					Integer winId = Integer.valueOf(rs.getInt(1));
 					if ("N".equals(rs.getString(3))) {
 						// inactive window on direct access
 						if (m_windowAccess.containsKey(winId)) {
 							m_windowAccess.remove(winId);
 						}
 					} else {
-						directAccess.put(winId, new Boolean("Y".equals(rs.getString(2))));
+						directAccess.put(winId, Boolean.valueOf("Y".equals(rs.getString(2))));
 					}
 				}
 			}
@@ -1627,14 +1627,14 @@ public final class MRole extends X_AD_Role
 				pstmt.setInt(1, getAD_Role_ID());
 				rs = pstmt.executeQuery();
 				while (rs.next()) {
-					Integer procId = new Integer(rs.getInt(1));
+					Integer procId = Integer.valueOf(rs.getInt(1));
 					if ("N".equals(rs.getString(3))) {
 						// inactive process on direct access
 						if (m_processAccess.containsKey(procId)) {
 							m_processAccess.remove(procId);
 						}
 					} else {
-						directAccess.put(procId, new Boolean("Y".equals(rs.getString(2))));
+						directAccess.put(procId, Boolean.valueOf("Y".equals(rs.getString(2))));
 					}
 				}
 			}
@@ -1707,14 +1707,14 @@ public final class MRole extends X_AD_Role
 				pstmt.setInt(1, getAD_Role_ID());
 				rs = pstmt.executeQuery();
 				while (rs.next()) {
-					Integer taskId = new Integer(rs.getInt(1));
+					Integer taskId = Integer.valueOf(rs.getInt(1));
 					if ("N".equals(rs.getString(3))) {
 						// inactive task on direct access
 						if (m_taskAccess.containsKey(taskId)) {
 							m_taskAccess.remove(taskId);
 						}
 					} else {
-						directAccess.put(taskId, new Boolean("Y".equals(rs.getString(2))));
+						directAccess.put(taskId, Boolean.valueOf("Y".equals(rs.getString(2))));
 					}
 				}
 			}
@@ -1787,14 +1787,14 @@ public final class MRole extends X_AD_Role
 				pstmt.setInt(1, getAD_Role_ID());
 				rs = pstmt.executeQuery();
 				while (rs.next()) {
-					Integer formId = new Integer(rs.getInt(1));
+					Integer formId = Integer.valueOf(rs.getInt(1));
 					if ("N".equals(rs.getString(3))) {
 						// inactive form on direct access
 						if (m_formAccess.containsKey(formId)) {
 							m_formAccess.remove(formId);
 						}
 					} else {
-						directAccess.put(formId, new Boolean("Y".equals(rs.getString(2))));
+						directAccess.put(formId, Boolean.valueOf("Y".equals(rs.getString(2))));
 					}
 				}
 			}
@@ -1867,14 +1867,14 @@ public final class MRole extends X_AD_Role
 				pstmt.setInt(1, getAD_Role_ID());
 				rs = pstmt.executeQuery();
 				while (rs.next()) {
-					Integer formId = new Integer(rs.getInt(1));
+					Integer formId = Integer.valueOf(rs.getInt(1));
 					if ("N".equals(rs.getString(3))) {
 						// inactive workflow on direct access
 						if (m_workflowAccess.containsKey(formId)) {
 							m_workflowAccess.remove(formId);
 						}
 					} else {
-						directAccess.put(formId, new Boolean("Y".equals(rs.getString(2))));
+						directAccess.put(formId, Boolean.valueOf("Y".equals(rs.getString(2))));
 					}
 				}
 			}
@@ -3137,7 +3137,7 @@ public final class MRole extends X_AD_Role
 				pstmt.setInt(1, getAD_Role_ID());
 				rs = pstmt.executeQuery();
 				while (rs.next()) {
-					Integer infoId = new Integer(rs.getInt(1));
+					Integer infoId = Integer.valueOf(rs.getInt(1));
 					if ("N".equals(rs.getString(2))) {
 						// inactive info on direct access
 						if (m_infoAccess.containsKey(infoId)) {
@@ -3177,7 +3177,7 @@ public final class MRole extends X_AD_Role
 					+ "       AND (iwa.AD_Role_ID = ? OR iwa.AD_Role_ID IN"
 					+ "       		(SELECT ri.Included_Role_ID FROM AD_Role_Included ri WHERE ri.IsActive='Y' AND ri.AD_Role_ID=?))";
 			int cnt = DB.getSQLValueEx(get_TrxName(), sql, I_M_Product.Table_ID, getAD_Role_ID(), getAD_Role_ID());
-			m_canAccess_Info_Product = new Boolean(cnt > 0);
+			m_canAccess_Info_Product = Boolean.valueOf(cnt > 0);
 
 			// Verify if is excluded in the specific role (it can be allowed in included role and inactive in specific role)
 			if (m_canAccess_Info_Product) {
@@ -3192,7 +3192,7 @@ public final class MRole extends X_AD_Role
 						+ "       AND iwa.AD_Role_ID = ?";
 				int cntInactive = DB.getSQLValueEx(get_TrxName(), sqlInactive, I_M_Product.Table_ID, getAD_Role_ID());
 				if (cntInactive > 0)
-					m_canAccess_Info_Product = new Boolean(false);
+					m_canAccess_Info_Product = Boolean.FALSE;
 			}
 		}
 		return m_canAccess_Info_Product.booleanValue();
diff --git a/org.adempiere.base/src/org/compiere/model/MRule.java b/org.adempiere.base/src/org/compiere/model/MRule.java
index bb87a37f07..a2489408dc 100644
--- a/org.adempiere.base/src/org/compiere/model/MRule.java
+++ b/org.adempiere.base/src/org/compiere/model/MRule.java
@@ -65,7 +65,7 @@ public class MRule extends X_AD_Rule
 	 */
 	public static MRule get (Properties ctx, int AD_Rule_ID)
 	{
-		Integer key = new Integer (AD_Rule_ID);
+		Integer key = Integer.valueOf(AD_Rule_ID);
 		MRule retValue = (MRule) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
@@ -101,7 +101,7 @@ public class MRule extends X_AD_Rule
 		
 		if (retValue != null)
 		{
-			Integer key = new Integer (retValue.getAD_Rule_ID());
+			Integer key = Integer.valueOf(retValue.getAD_Rule_ID());
 			s_cache.put (key, retValue);
 		}
 		return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MSLACriteria.java b/org.adempiere.base/src/org/compiere/model/MSLACriteria.java
index 00f858f0b8..5f66ad22d5 100644
--- a/org.adempiere.base/src/org/compiere/model/MSLACriteria.java
+++ b/org.adempiere.base/src/org/compiere/model/MSLACriteria.java
@@ -50,7 +50,7 @@ public class MSLACriteria extends X_PA_SLA_Criteria
 	 */
 	public static MSLACriteria get (Properties ctx, int PA_SLA_Criteria_ID, String trxName)
 	{
-		Integer key = new Integer (PA_SLA_Criteria_ID);
+		Integer key = Integer.valueOf(PA_SLA_Criteria_ID);
 		MSLACriteria retValue = (MSLACriteria) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
@@ -134,7 +134,7 @@ public class MSLACriteria extends X_PA_SLA_Criteria
 		try
 		{
 			Class<?> clazz = Class.forName(getClassname());
-			SLACriteria retValue = (SLACriteria)clazz.newInstance();
+			SLACriteria retValue = (SLACriteria)clazz.getDeclaredConstructor().newInstance();
 			return retValue;
 		}
 		catch (Exception e)
diff --git a/org.adempiere.base/src/org/compiere/model/MSalesRegion.java b/org.adempiere.base/src/org/compiere/model/MSalesRegion.java
index d7e79c60db..7c3b408b32 100644
--- a/org.adempiere.base/src/org/compiere/model/MSalesRegion.java
+++ b/org.adempiere.base/src/org/compiere/model/MSalesRegion.java
@@ -43,7 +43,7 @@ public class MSalesRegion extends X_C_SalesRegion
 	 */
 	public static MSalesRegion get (Properties ctx, int C_SalesRegion_ID)
 	{
-		Integer key = new Integer (C_SalesRegion_ID);
+		Integer key = Integer.valueOf(C_SalesRegion_ID);
 		MSalesRegion retValue = (MSalesRegion) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MSchedule.java b/org.adempiere.base/src/org/compiere/model/MSchedule.java
index 7562ff3ec3..b2a7a9fe9f 100644
--- a/org.adempiere.base/src/org/compiere/model/MSchedule.java
+++ b/org.adempiere.base/src/org/compiere/model/MSchedule.java
@@ -145,7 +145,7 @@ public class MSchedule extends X_AD_Schedule
 
 	public static MSchedule get(Properties ctx, int AD_Schedule_ID) 
 	{
-		Integer key = new Integer (AD_Schedule_ID);
+		Integer key = Integer.valueOf(AD_Schedule_ID);
 		MSchedule retValue = (MSchedule)s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MSequence.java b/org.adempiere.base/src/org/compiere/model/MSequence.java
index a63e23aef3..446fde29d3 100644
--- a/org.adempiere.base/src/org/compiere/model/MSequence.java
+++ b/org.adempiere.base/src/org/compiere/model/MSequence.java
@@ -123,7 +123,11 @@ public class MSequence extends X_AD_Sequence
 			+ "FROM AD_Sequence "
 			+ "WHERE Name=?"
 			+ " AND IsActive='Y' AND IsTableID='Y' AND IsAutoSequence='Y' ";
-
+			
+			if(adempiereSys)
+				selectSQL += " FOR UPDATE OF CurrentNextSys";
+			else
+				selectSQL += " FOR UPDATE OF CurrentNext";
 		}
 		if (!DB.isOracle() && !DB.isPostgreSQL())
 			selectSQL = DB.getDatabase().convertStatement(selectSQL);
@@ -365,14 +369,27 @@ public class MSequence extends X_AD_Sequence
 					+ "AND s.IsActive='Y' AND s.IsTableID='N' AND s.IsAutoSequence='Y' "
 					+ "ORDER BY s.AD_Client_ID DESC";
 		}
-		if (DB.isPostgreSQL())
+		if (DB.isOracle() == false)
 		{
-			if ( ( isStartNewYear || isUseOrgLevel ) && !adempiereSys ) {
+			if ( isStartNewYear || isUseOrgLevel  ) {
 				selectSQL = selectSQL + " FOR UPDATE OF y";
 			} else {
 				selectSQL = selectSQL + " FOR UPDATE OF s";
 			}
 		}
+		else
+		{
+			if (isStartNewYear || isUseOrgLevel) {
+				selectSQL = selectSQL + " FOR UPDATE OF y.";
+			} else {
+				selectSQL = selectSQL + " FOR UPDATE OF s.";
+			}
+			
+			if(adempiereSys)
+				selectSQL = selectSQL + "CurrentNextSys";
+			else
+				selectSQL = selectSQL + "CurrentNext";
+		}		
 		if (!DB.isOracle() && !DB.isPostgreSQL())
 			selectSQL = DB.getDatabase().convertStatement(selectSQL);
 		Connection conn = null;
@@ -1212,7 +1229,7 @@ public class MSequence extends X_AD_Sequence
 				try
 				{
 					int no = DB.getNextID(0, "Test", null);
-					s_list.add(new Integer(no));
+					s_list.add(Integer.valueOf(no));
 				//	System.out.println("#" + m_i + ": " + no);
 				}
 				catch (Exception e)
diff --git a/org.adempiere.base/src/org/compiere/model/MSession.java b/org.adempiere.base/src/org/compiere/model/MSession.java
index 6800c1f5f3..e77d6c9826 100644
--- a/org.adempiere.base/src/org/compiere/model/MSession.java
+++ b/org.adempiere.base/src/org/compiere/model/MSession.java
@@ -59,7 +59,7 @@ public class MSession extends X_AD_Session
 		int AD_Session_ID = Env.getContextAsInt(ctx, "#AD_Session_ID");
 		MSession session = null;
 		if (AD_Session_ID > 0)
-			session = (MSession)s_sessions.get(new Integer(AD_Session_ID));
+			session = (MSession)s_sessions.get(Integer.valueOf(AD_Session_ID));
 		// Try to load
 		if (session == null && AD_Session_ID > 0)
 		{
@@ -76,7 +76,7 @@ public class MSession extends X_AD_Session
 			session.saveEx();
 			AD_Session_ID = session.getAD_Session_ID();
 			Env.setContext (ctx, "#AD_Session_ID", AD_Session_ID);
-			s_sessions.put (new Integer(AD_Session_ID), session);
+			s_sessions.put (Integer.valueOf(AD_Session_ID), session);
 		}	
 		return session;
 	}	//	get
@@ -94,14 +94,14 @@ public class MSession extends X_AD_Session
 		int AD_Session_ID = Env.getContextAsInt(ctx, "#AD_Session_ID");
 		MSession session = null;
 		if (AD_Session_ID > 0)
-			session = (MSession)s_sessions.get(new Integer(AD_Session_ID));
+			session = (MSession)s_sessions.get(Integer.valueOf(AD_Session_ID));
 		if (session == null)
 		{
 			session = new MSession (ctx, Remote_Addr, Remote_Host, WebSession, null);	//	remote session
 			session.saveEx();
 			AD_Session_ID = session.getAD_Session_ID();
 			Env.setContext(ctx, "#AD_Session_ID", AD_Session_ID);
-			s_sessions.put(new Integer(AD_Session_ID), session);
+			s_sessions.put(Integer.valueOf(AD_Session_ID), session);
 		}	
 		return session;
 	}	//	get
@@ -238,7 +238,7 @@ public class MSession extends X_AD_Session
 	{
 		setProcessed(true);
 		saveEx();
-		s_sessions.remove(new Integer(getAD_Session_ID()));
+		s_sessions.remove(Integer.valueOf(getAD_Session_ID()));
 		if (log.isLoggable(Level.INFO)) log.info(TimeUtil.formatElapsed(getCreated(), getUpdated()));
 	}	//	logout
 
diff --git a/org.adempiere.base/src/org/compiere/model/MStatus.java b/org.adempiere.base/src/org/compiere/model/MStatus.java
index 968c5a984c..164ce26f8a 100644
--- a/org.adempiere.base/src/org/compiere/model/MStatus.java
+++ b/org.adempiere.base/src/org/compiere/model/MStatus.java
@@ -51,7 +51,7 @@ public class MStatus extends X_R_Status
 	{
 		if (R_Status_ID == 0)
 			return null;
-		Integer key = new Integer (R_Status_ID);
+		Integer key = Integer.valueOf(R_Status_ID);
 		MStatus retValue = (MStatus)s_cache.get(key);
 		if (retValue == null)
 		{
@@ -69,7 +69,7 @@ public class MStatus extends X_R_Status
 	 */
 	public static MStatus getDefault (Properties ctx, int R_RequestType_ID)
 	{
-		Integer key = new Integer(R_RequestType_ID);
+		Integer key = Integer.valueOf(R_RequestType_ID);
 		MStatus retValue = (MStatus)s_cacheDefault.get(key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MStatusCategory.java b/org.adempiere.base/src/org/compiere/model/MStatusCategory.java
index 3ec805e663..644c025c2d 100644
--- a/org.adempiere.base/src/org/compiere/model/MStatusCategory.java
+++ b/org.adempiere.base/src/org/compiere/model/MStatusCategory.java
@@ -106,7 +106,7 @@ public class MStatusCategory extends X_R_StatusCategory
 	 */
 	public static MStatusCategory get (Properties ctx, int R_StatusCategory_ID)
 	{
-		Integer key = new Integer (R_StatusCategory_ID);
+		Integer key = Integer.valueOf(R_StatusCategory_ID);
 		MStatusCategory retValue = (MStatusCategory)s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MStore.java b/org.adempiere.base/src/org/compiere/model/MStore.java
index 0b01c99b69..ec845d2583 100644
--- a/org.adempiere.base/src/org/compiere/model/MStore.java
+++ b/org.adempiere.base/src/org/compiere/model/MStore.java
@@ -52,7 +52,7 @@ public class MStore extends X_W_Store
 	 */
 	public static MStore get (Properties ctx, int W_Store_ID)
 	{
-		Integer key = new Integer (W_Store_ID);
+		Integer key = Integer.valueOf(W_Store_ID);
 		MStore retValue = (MStore) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
@@ -133,7 +133,7 @@ public class MStore extends X_W_Store
 			return null;
 		
 		//	Save
-		Integer key = new Integer (wstore.getW_Store_ID());
+		Integer key = Integer.valueOf(wstore.getW_Store_ID());
 		s_cache.put (key, wstore);
 		return wstore;
 	}	//	get
diff --git a/org.adempiere.base/src/org/compiere/model/MStyle.java b/org.adempiere.base/src/org/compiere/model/MStyle.java
index 762269ba8b..b2b6e2aeb3 100644
--- a/org.adempiere.base/src/org/compiere/model/MStyle.java
+++ b/org.adempiere.base/src/org/compiere/model/MStyle.java
@@ -37,7 +37,7 @@ public class MStyle extends X_AD_Style {
 
 	public static MStyle get (Properties ctx, int AD_Style_ID)
 	{
-		Integer key = new Integer(AD_Style_ID);
+		Integer key = Integer.valueOf(AD_Style_ID);
 		MStyle retValue = (MStyle)s_cache.get(key);
 		if (retValue == null)
 		{
diff --git a/org.adempiere.base/src/org/compiere/model/MTax.java b/org.adempiere.base/src/org/compiere/model/MTax.java
index 04336ada00..5292933801 100644
--- a/org.adempiere.base/src/org/compiere/model/MTax.java
+++ b/org.adempiere.base/src/org/compiere/model/MTax.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.ResultSet;
 import java.util.List;
 import java.util.Properties;
@@ -91,7 +92,7 @@ public class MTax extends X_C_Tax
 	 */
 	public static MTax get (Properties ctx, int C_Tax_ID)
 	{
-		Integer key = new Integer (C_Tax_ID);
+		Integer key = Integer.valueOf(C_Tax_ID);
 		MTax retValue = (MTax) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
@@ -264,17 +265,17 @@ public class MTax extends X_C_Tax
 
 		BigDecimal tax = Env.ZERO;		
 		for (MTax taxc : taxarray) {
-			BigDecimal multiplier = taxc.getRate().divide(Env.ONEHUNDRED, 12, BigDecimal.ROUND_HALF_UP);		
+			BigDecimal multiplier = taxc.getRate().divide(Env.ONEHUNDRED, 12, RoundingMode.HALF_UP);		
 			if (!taxIncluded)	//	$100 * 6 / 100 == $6 == $100 * 0.06
 			{
-				BigDecimal itax = amount.multiply(multiplier).setScale(scale, BigDecimal.ROUND_HALF_UP);
+				BigDecimal itax = amount.multiply(multiplier).setScale(scale, RoundingMode.HALF_UP);
 				tax = tax.add(itax);
 			}
 			else			//	$106 - ($106 / (100+6)/100) == $6 == $106 - ($106/1.06)
 			{
 				multiplier = multiplier.add(Env.ONE);
-				BigDecimal base = amount.divide(multiplier, 12, BigDecimal.ROUND_HALF_UP); 
-				BigDecimal itax = amount.subtract(base).setScale(scale, BigDecimal.ROUND_HALF_UP);
+				BigDecimal base = amount.divide(multiplier, 12, RoundingMode.HALF_UP); 
+				BigDecimal itax = amount.subtract(base).setScale(scale, RoundingMode.HALF_UP);
 				tax = tax.add(itax);
 			}
 		}
diff --git a/org.adempiere.base/src/org/compiere/model/MTest.java b/org.adempiere.base/src/org/compiere/model/MTest.java
index c57b0f3cf8..ec6aa1296f 100644
--- a/org.adempiere.base/src/org/compiere/model/MTest.java
+++ b/org.adempiere.base/src/org/compiere/model/MTest.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
@@ -78,7 +79,7 @@ public class MTest extends X_Test
 		setT_DateTime(new Timestamp (System.currentTimeMillis()));
 		setT_Integer(testNo);
 		setT_Amount(new BigDecimal(testNo));
-		setT_Number(Env.ONE.divide(new BigDecimal(testNo), BigDecimal.ROUND_HALF_UP));
+		setT_Number(Env.ONE.divide(new BigDecimal(testNo), RoundingMode.HALF_UP));
 		//
 		setC_Currency_ID(100);		//	USD
 		setC_Location_ID(109);		//	Monroe
diff --git a/org.adempiere.base/src/org/compiere/model/MTree_Base.java b/org.adempiere.base/src/org/compiere/model/MTree_Base.java
index c70411cae8..d6160b0ddc 100644
--- a/org.adempiere.base/src/org/compiere/model/MTree_Base.java
+++ b/org.adempiere.base/src/org/compiere/model/MTree_Base.java
@@ -204,7 +204,7 @@ public class MTree_Base extends X_AD_Tree
 	 */
 	public static MTree_Base get (Properties ctx, int AD_Tree_ID, String trxName)
 	{
-		Integer key = new Integer (AD_Tree_ID);
+		Integer key = Integer.valueOf(AD_Tree_ID);
 		MTree_Base retValue = (MTree_Base) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MTree_NodeCMC.java b/org.adempiere.base/src/org/compiere/model/MTree_NodeCMC.java
index cb564c71cf..25b17f5316 100644
--- a/org.adempiere.base/src/org/compiere/model/MTree_NodeCMC.java
+++ b/org.adempiere.base/src/org/compiere/model/MTree_NodeCMC.java
@@ -149,6 +149,6 @@ public class MTree_NodeCMC extends X_AD_TreeNodeCMC
 	 */
 	public void setParent_ID (int Parent_ID)
 	{
-		set_Value ("Parent_ID", new Integer(Parent_ID));
+		set_Value ("Parent_ID", Integer.valueOf(Parent_ID));
 	}
 }	//	MTree_NodeCMC
diff --git a/org.adempiere.base/src/org/compiere/model/MUOM.java b/org.adempiere.base/src/org/compiere/model/MUOM.java
index 83bb1d2c0d..d9b4034b7e 100644
--- a/org.adempiere.base/src/org/compiere/model/MUOM.java
+++ b/org.adempiere.base/src/org/compiere/model/MUOM.java
@@ -17,6 +17,7 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.ResultSet;
 import java.util.Iterator;
 import java.util.List;
@@ -38,7 +39,7 @@ public class MUOM extends X_C_UOM
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -7248044516358949324L;
+	private static final long serialVersionUID = 3119054530389871561L;
 	/** X12 Element 355 Code	Second	*/
 	public static final String		X12_SECOND = "03";
 	/** X12 Element 355 Code	Minute	*/
@@ -97,7 +98,7 @@ public class MUOM extends X_C_UOM
 	/*************************************************************************/
 
 	/**	UOM Cache				*/
-	private static CCache<Integer,MUOM>	s_cache = new CCache<Integer,MUOM>(Table_Name, 30);
+	protected static CCache<Integer,MUOM>	s_cache = new CCache<Integer,MUOM>(Table_Name, 30);
 
 	/**
 	 * 	Get UOM from Cache
@@ -150,7 +151,7 @@ public class MUOM extends X_C_UOM
 	 * 	Load All UOMs
 	 * 	@param ctx context
 	 */
-	private static void loadUOMs (Properties ctx)
+	protected static void loadUOMs (Properties ctx)
 	{
 		List<MUOM> list = new Query(ctx, Table_Name, "IsActive='Y'", null)
 								.setApplyAccessFilter(MRole.SQL_NOTQUALIFIED, MRole.SQL_RO)
@@ -216,7 +217,7 @@ public class MUOM extends X_C_UOM
 		if (!stdPrecision)
 			precision = getCostingPrecision();
 		if (qty.scale() > precision)
-			return qty.setScale(getStdPrecision(), BigDecimal.ROUND_HALF_UP);
+			return qty.setScale(getStdPrecision(), RoundingMode.HALF_UP);
 		return qty;
 	}	//	round
 
diff --git a/org.adempiere.base/src/org/compiere/model/MUOMConversion.java b/org.adempiere.base/src/org/compiere/model/MUOMConversion.java
index cc239dd91a..58eaf42263 100644
--- a/org.adempiere.base/src/org/compiere/model/MUOMConversion.java
+++ b/org.adempiere.base/src/org/compiere/model/MUOMConversion.java
@@ -18,6 +18,7 @@ package org.compiere.model;
 
 import java.awt.Point;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -48,7 +49,7 @@ public class MUOMConversion extends X_C_UOM_Conversion
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -8449239579085422641L;
+	private static final long serialVersionUID = 3555218774291122619L;
 
 
 	/**
@@ -146,7 +147,7 @@ public class MUOMConversion extends X_C_UOM_Conversion
 	 * 	@param p Point with from(x) - to(y) C_UOM_ID
 	 * 	@return conversion multiplier or null
 	 */
-	static private BigDecimal getRate (Properties ctx, Point p)
+	static protected BigDecimal getRate (Properties ctx, Point p)
 	{
 		BigDecimal retValue = null;
 		if (Ini.isClient())
@@ -167,7 +168,7 @@ public class MUOMConversion extends X_C_UOM_Conversion
 	 * 	Create Conversion Matrix (Client)
 	 * 	@param ctx context
 	 */
-	private static void createRates (Properties ctx)
+	protected static void createRates (Properties ctx)
 	{
 		s_conversions = new CCache<Point,BigDecimal>(Table_Name, 20);
 		//
@@ -191,7 +192,7 @@ public class MUOMConversion extends X_C_UOM_Conversion
 					s_conversions.put(p, mr);
 				//	reverse
 				if (dr == null && mr != null)
-					dr = Env.ONE.divide(mr, BigDecimal.ROUND_HALF_UP);
+					dr = Env.ONE.divide(mr, RoundingMode.HALF_UP);
 				if (dr != null)
 					s_conversions.put(new Point(p.y,p.x), dr);
 			}
@@ -445,7 +446,7 @@ public class MUOMConversion extends X_C_UOM_Conversion
 		//	Calculate & Scale
 		retValue = retValue.multiply(qty);
 		if (retValue.scale() > precision)
-			retValue = retValue.setScale(precision, BigDecimal.ROUND_HALF_UP);
+			retValue = retValue.setScale(precision, RoundingMode.HALF_UP);
 		return retValue;
 	}   //  convert
 
@@ -601,7 +602,7 @@ public class MUOMConversion extends X_C_UOM_Conversion
 	{
 		if (M_Product_ID == 0)
 			return new MUOMConversion[0];
-		Integer key = new Integer (M_Product_ID);
+		Integer key = Integer.valueOf(M_Product_ID);
 		MUOMConversion[] result = (MUOMConversion[])s_conversionProduct.get(key);
 		if (result != null)
 			return result;
@@ -631,11 +632,11 @@ public class MUOMConversion extends X_C_UOM_Conversion
 	/** Static Logger					*/
 	private static final CLogger s_log = CLogger.getCLogger(MUOMConversion.class);
 	/**	Indicator for Rate					*/
-	private static final BigDecimal GETRATE = BigDecimal.valueOf(123.456);
+	protected static final BigDecimal GETRATE = BigDecimal.valueOf(123.456);
 	/**	Conversion Map: Key=Point(from,to) Value=BigDecimal	*/
-	private static CCache<Point,BigDecimal>	s_conversions = null;
+	protected static CCache<Point,BigDecimal>	s_conversions = null;
 	/** Product Conversion Map					*/
-	private static final CCache<Integer,MUOMConversion[]>	s_conversionProduct 
+	protected static final CCache<Integer,MUOMConversion[]>	s_conversionProduct 
 		= new CCache<Integer,MUOMConversion[]>(Table_Name, Table_Name+"_Of_Product", 20); 
 	
 	
diff --git a/org.adempiere.base/src/org/compiere/model/MUser.java b/org.adempiere.base/src/org/compiere/model/MUser.java
index 956457c375..05ce2ac997 100644
--- a/org.adempiere.base/src/org/compiere/model/MUser.java
+++ b/org.adempiere.base/src/org/compiere/model/MUser.java
@@ -136,7 +136,7 @@ public class MUser extends X_AD_User
 	 */
 	public static MUser get (Properties ctx, int AD_User_ID)
 	{
-		Integer key = new Integer(AD_User_ID);
+		Integer key = Integer.valueOf(AD_User_ID);
 		MUser retValue = (MUser)s_cache.get(key);
 		if (retValue == null)
 		{
diff --git a/org.adempiere.base/src/org/compiere/model/MUserRoles.java b/org.adempiere.base/src/org/compiere/model/MUserRoles.java
index be673ee89e..9521ecef3c 100644
--- a/org.adempiere.base/src/org/compiere/model/MUserRoles.java
+++ b/org.adempiere.base/src/org/compiere/model/MUserRoles.java
@@ -120,7 +120,7 @@ public class MUserRoles extends X_AD_User_Roles
 	 */
 	public void setAD_User_ID (int AD_User_ID)
 	{
-		set_ValueNoCheck ("AD_User_ID", new Integer(AD_User_ID));
+		set_ValueNoCheck ("AD_User_ID", Integer.valueOf(AD_User_ID));
 	}	//	setAD_User_ID
 	
 	/** 
@@ -130,7 +130,7 @@ public class MUserRoles extends X_AD_User_Roles
 	 **/
 	public void setAD_Role_ID (int AD_Role_ID)
 	{
-		set_ValueNoCheck ("AD_Role_ID", new Integer(AD_Role_ID));
+		set_ValueNoCheck ("AD_Role_ID", Integer.valueOf(AD_Role_ID));
 	}	//	setAD_Role_ID
 
 	@Override
diff --git a/org.adempiere.base/src/org/compiere/model/MValRule.java b/org.adempiere.base/src/org/compiere/model/MValRule.java
index ef38c0bc07..672f79a37f 100644
--- a/org.adempiere.base/src/org/compiere/model/MValRule.java
+++ b/org.adempiere.base/src/org/compiere/model/MValRule.java
@@ -50,7 +50,7 @@ public class MValRule extends X_AD_Val_Rule
 	 */
 	public static MValRule get (Properties ctx, int AD_Val_Rule_ID)
 	{
-		Integer key = new Integer (AD_Val_Rule_ID);
+		Integer key = Integer.valueOf(AD_Val_Rule_ID);
 		MValRule retValue = (MValRule) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/MWarehouse.java b/org.adempiere.base/src/org/compiere/model/MWarehouse.java
index 2f6d223310..71382d3d0c 100644
--- a/org.adempiere.base/src/org/compiere/model/MWarehouse.java
+++ b/org.adempiere.base/src/org/compiere/model/MWarehouse.java
@@ -41,7 +41,7 @@ public class MWarehouse extends X_M_Warehouse
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 2696705459515717619L;
+	private static final long serialVersionUID = -3065089372599460372L;
 
 	/**
 	 * 	Get from Cache
@@ -63,7 +63,7 @@ public class MWarehouse extends X_M_Warehouse
 	 */
 	public static MWarehouse get (Properties ctx, int M_Warehouse_ID, String trxName)
 	{
-		Integer key = new Integer(M_Warehouse_ID);
+		Integer key = Integer.valueOf(M_Warehouse_ID);
 		MWarehouse retValue = (MWarehouse)s_cache.get(key);
 		if (retValue != null)
 			return retValue;
@@ -109,7 +109,7 @@ public class MWarehouse extends X_M_Warehouse
 	}	//	get
 	
 	/**	Cache					*/
-	private static CCache<Integer,MWarehouse> s_cache = new CCache<Integer,MWarehouse>(Table_Name, 50 );	
+	protected static CCache<Integer,MWarehouse> s_cache = new CCache<Integer,MWarehouse>(Table_Name, 50 );	
 	/**
 	 * 	Standard Constructor
 	 *	@param ctx context
@@ -154,7 +154,7 @@ public class MWarehouse extends X_M_Warehouse
 	}	//	MWarehouse
 
 	/**	Warehouse Locators				*/
-	private MLocator[]	m_locators = null;
+	protected MLocator[]	m_locators = null;
 	
 	/**
 	 * 	Get Locators
diff --git a/org.adempiere.base/src/org/compiere/model/MWebProject.java b/org.adempiere.base/src/org/compiere/model/MWebProject.java
index 8f8ada66c4..1925fe3c47 100644
--- a/org.adempiere.base/src/org/compiere/model/MWebProject.java
+++ b/org.adempiere.base/src/org/compiere/model/MWebProject.java
@@ -43,7 +43,7 @@ public class MWebProject extends X_CM_WebProject
 	 */
 	public static MWebProject get (Properties ctx, int CM_WebProject_ID)
 	{
-		Integer key = new Integer (CM_WebProject_ID);
+		Integer key = Integer.valueOf(CM_WebProject_ID);
 		MWebProject retValue = (MWebProject)s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/model/PO.java b/org.adempiere.base/src/org/compiere/model/PO.java
index f1de8670b8..737c496505 100644
--- a/org.adempiere.base/src/org/compiere/model/PO.java
+++ b/org.adempiere.base/src/org/compiere/model/PO.java
@@ -256,7 +256,7 @@ public abstract class PO
 	private HashMap<String,Object>	m_attributes = null;
 
 	/** Zero Integer				*/
-	protected static final Integer I_ZERO = new Integer(0);
+	protected static final Integer I_ZERO = Integer.valueOf(0);
 	/** Accounting Columns			*/
 	private ArrayList <String>	s_acctColumns = null;
 
@@ -657,7 +657,7 @@ public abstract class PO
 		{
 			int result = ((Integer)nValue).intValue();
 			result -= ((Integer)oValue).intValue();
-			return new Integer(result);
+			return Integer.valueOf(result);
 		}
 		//
 		log.warning("Invalid type - New=" + nValue);
@@ -814,11 +814,11 @@ public abstract class PO
 			//  Integer can be set as BigDecimal
 			else if (value.getClass() == BigDecimal.class
 				&& p_info.getColumnClass(index) == Integer.class)
-				m_newValues[index] = new Integer (((BigDecimal)value).intValue());
+				m_newValues[index] = Integer.valueOf(((BigDecimal)value).intValue());
 			//	Set Boolean
 			else if (p_info.getColumnClass(index) == Boolean.class
 				&& ("Y".equals(value) || "N".equals(value)) )
-				m_newValues[index] = new Boolean("Y".equals(value));
+				m_newValues[index] = Boolean.valueOf("Y".equals(value));
 			// added by vpj-cd
 			// To solve BUG [ 1618423 ] Set Project Type button in Project window throws warning
 			// generated because C_Project.C_Project_Type_ID is defined as button in dictionary
@@ -830,7 +830,7 @@ public abstract class PO
 					&& p_info.getColumnClass(index) == Integer.class)
 				try
 				{
-					m_newValues[index] = new Integer((String)value);
+					m_newValues[index] = Integer.valueOf((String)value);
 				}
 				catch (NumberFormatException e)
 				{
@@ -1283,7 +1283,7 @@ public abstract class PO
 		if (ID > 0)
 		{
 			setKeyInfo();
-			m_IDs = new Object[] {new Integer(ID)};
+			m_IDs = new Object[] {Integer.valueOf(ID)};
 			//m_KeyColumns = new String[] {p_info.getTableName() + "_ID"};
 			load(trxName);
 		}
@@ -1399,11 +1399,11 @@ public abstract class PO
 			try
 			{
 				if (clazz == Integer.class)
-					m_oldValues[index] = decrypt(index, new Integer(rs.getInt(columnName)));
+					m_oldValues[index] = decrypt(index, Integer.valueOf(rs.getInt(columnName)));
 				else if (clazz == BigDecimal.class)
 					m_oldValues[index] = decrypt(index, rs.getBigDecimal(columnName));
 				else if (clazz == Boolean.class)
-					m_oldValues[index] = new Boolean ("Y".equals(decrypt(index, rs.getString(columnName))));
+					m_oldValues[index] = Boolean.valueOf("Y".equals(decrypt(index, rs.getString(columnName))));
 				else if (clazz == Timestamp.class)
 					m_oldValues[index] = decrypt(index, rs.getTimestamp(columnName));
 				else if (DisplayType.isLOB(dt))
@@ -1475,11 +1475,11 @@ public abstract class PO
 			try
 			{
 				if (clazz == Integer.class)
-					m_oldValues[index] = new Integer(value);
+					m_oldValues[index] = Integer.valueOf(value);
 				else if (clazz == BigDecimal.class)
 					m_oldValues[index] = new BigDecimal(value);
 				else if (clazz == Boolean.class)
-					m_oldValues[index] = new Boolean ("Y".equals(value));
+					m_oldValues[index] = Boolean.valueOf("Y".equals(value));
 				else if (clazz == Timestamp.class)
 					m_oldValues[index] = Timestamp.valueOf(value);
 				else if (DisplayType.isLOB(dt))
@@ -1626,23 +1626,23 @@ public abstract class PO
 			String colName = p_info.getColumnName(i);
 			//  Set Standard Values
 			if (colName.endsWith("tedBy"))
-				m_newValues[i] = new Integer (Env.getContextAsInt(p_ctx, "#AD_User_ID"));
+				m_newValues[i] = Integer.valueOf(Env.getContextAsInt(p_ctx, "#AD_User_ID"));
 			else if (colName.equals("Created") || colName.equals("Updated"))
 				m_newValues[i] = new Timestamp (System.currentTimeMillis());
 			else if (colName.equals(p_info.getTableName() + "_ID"))    //  KeyColumn
 				m_newValues[i] = I_ZERO;
 			else if (colName.equals("IsActive"))
-				m_newValues[i] = new Boolean(true);
+				m_newValues[i] = Boolean.TRUE;
 			else if (colName.equals("AD_Client_ID"))
-				m_newValues[i] = new Integer(Env.getAD_Client_ID(p_ctx));
+				m_newValues[i] = Integer.valueOf(Env.getAD_Client_ID(p_ctx));
 			else if (colName.equals("AD_Org_ID"))
-				m_newValues[i] = new Integer(Env.getAD_Org_ID(p_ctx));
+				m_newValues[i] = Integer.valueOf(Env.getAD_Org_ID(p_ctx));
 			else if (colName.equals("Processed"))
-				m_newValues[i] = new Boolean(false);
+				m_newValues[i] = Boolean.FALSE;
 			else if (colName.equals("Processing"))
-				m_newValues[i] = new Boolean(false);
+				m_newValues[i] = Boolean.FALSE;
 			else if (colName.equals("Posted"))
-				m_newValues[i] = new Boolean(false);
+				m_newValues[i] = Boolean.FALSE;
 		}
 	}   //  setDefaults
 
@@ -1748,7 +1748,7 @@ public abstract class PO
 	 */
 	final protected void setAD_Client_ID (int AD_Client_ID)
 	{
-		set_ValueNoCheck ("AD_Client_ID", new Integer(AD_Client_ID));
+		set_ValueNoCheck ("AD_Client_ID", Integer.valueOf(AD_Client_ID));
 	}	//	setAD_Client_ID
 
 	/**
@@ -1769,7 +1769,7 @@ public abstract class PO
 	 */
 	final public void setAD_Org_ID (int AD_Org_ID)
 	{
-		set_ValueNoCheck ("AD_Org_ID", new Integer(AD_Org_ID));
+		set_ValueNoCheck ("AD_Org_ID", Integer.valueOf(AD_Org_ID));
 	}	//	setAD_Org_ID
 
 	/**
@@ -1812,7 +1812,7 @@ public abstract class PO
 	 */
 	public final void setIsActive (boolean active)
 	{
-		set_Value("IsActive", new Boolean(active));
+		set_Value("IsActive", Boolean.valueOf(active));
 	}	//	setActive
 
 	/**
@@ -1875,7 +1875,7 @@ public abstract class PO
 	 */
 	final protected void setUpdatedBy (int AD_User_ID)
 	{
-		set_ValueNoCheck ("UpdatedBy", new Integer(AD_User_ID));
+		set_ValueNoCheck ("UpdatedBy", Integer.valueOf(AD_User_ID));
 	}	//	setAD_User_ID
 
 	/**	Cache						*/
@@ -2502,7 +2502,7 @@ public abstract class PO
 				if (!changes && !updatedBy)
 				{
 					int AD_User_ID = Env.getContextAsInt(p_ctx, "#AD_User_ID");
-					set_ValueNoCheck("UpdatedBy", new Integer(AD_User_ID));
+					set_ValueNoCheck("UpdatedBy", Integer.valueOf(AD_User_ID));
 					sql.append("UpdatedBy=").append(AD_User_ID);
 					changes = true;
 					updatedBy = true;
@@ -2681,7 +2681,7 @@ public abstract class PO
 			if (!updatedBy)	//	UpdatedBy not explicitly set
 			{
 				int AD_User_ID = Env.getContextAsInt(p_ctx, "#AD_User_ID");
-				set_ValueNoCheck("UpdatedBy", new Integer(AD_User_ID));
+				set_ValueNoCheck("UpdatedBy", Integer.valueOf(AD_User_ID));
 				if (withValues)
 				{
 					sql.append(",UpdatedBy=").append(AD_User_ID);
@@ -2755,7 +2755,7 @@ public abstract class PO
 				log.severe("No NextID (" + no + ")");
 				return saveFinish (true, false);
 			}
-			m_IDs[0] = new Integer(no);
+			m_IDs[0] = Integer.valueOf(no);
 			set_ValueNoCheck(m_KeyColumns[0], m_IDs[0]);
 		}
 		//uuid secondary key
@@ -4341,7 +4341,7 @@ public abstract class PO
 			pstmt = DB.prepareStatement(sql.toString(), trxName);
 			rs = pstmt.executeQuery();
 			while (rs.next())
-				list.add(new Integer(rs.getInt(1)));
+				list.add(Integer.valueOf(rs.getInt(1)));
 		}
 		catch (SQLException e)
 		{
diff --git a/org.adempiere.base/src/org/compiere/model/PO_Record.java b/org.adempiere.base/src/org/compiere/model/PO_Record.java
index 8eee24c98d..c1e58926f9 100644
--- a/org.adempiere.base/src/org/compiere/model/PO_Record.java
+++ b/org.adempiere.base/src/org/compiere/model/PO_Record.java
@@ -108,7 +108,7 @@ public class PO_Record
 			//	DELETE FROM table WHERE AD_Table_ID=#1 AND Record_ID=#2
 			if (s_cascades[i] != AD_Table_ID)
 			{
-				Object[] params = new Object[]{new Integer(AD_Table_ID), new Integer(Record_ID)};
+				Object[] params = new Object[]{Integer.valueOf(AD_Table_ID), Integer.valueOf(Record_ID)};
 				StringBuffer sql = new StringBuffer ("DELETE FROM ")
 					.append(s_cascadeNames[i])
 					.append(" WHERE AD_Table_ID=? AND Record_ID=?");
@@ -129,7 +129,7 @@ public class PO_Record
 			if (s_parents[j] == AD_Table_ID)
 			{
 				int AD_Table_IDchild = s_parentChilds[j];
-				Object[] params = new Object[]{new Integer(AD_Table_IDchild), new Integer(Record_ID)};
+				Object[] params = new Object[]{Integer.valueOf(AD_Table_IDchild), Integer.valueOf(Record_ID)};
 				for (int i = 0; i < s_cascades.length; i++)
 				{
 					StringBuffer sql = new StringBuffer ("DELETE FROM ")
diff --git a/org.adempiere.base/src/org/compiere/model/PaymentProcessor.java b/org.adempiere.base/src/org/compiere/model/PaymentProcessor.java
index 7ffdaae862..fd57f8e6e2 100644
--- a/org.adempiere.base/src/org/compiere/model/PaymentProcessor.java
+++ b/org.adempiere.base/src/org/compiere/model/PaymentProcessor.java
@@ -21,6 +21,7 @@ import java.io.DataOutputStream;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.net.URL;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
@@ -191,7 +192,7 @@ public abstract class PaymentProcessor
 		else
 		{
 			if (value.scale() < 2)
-				value = value.setScale(2, BigDecimal.ROUND_HALF_UP);
+				value = value.setScale(2, RoundingMode.HALF_UP);
 			return createPair (name, String.valueOf(value), maxLength);
 		}
 	}	//	createPair
diff --git a/org.adempiere.base/src/org/compiere/model/Scriptlet.java b/org.adempiere.base/src/org/compiere/model/Scriptlet.java
index 9b93eafa29..f502f2da3f 100644
--- a/org.adempiere.base/src/org/compiere/model/Scriptlet.java
+++ b/org.adempiere.base/src/org/compiere/model/Scriptlet.java
@@ -305,12 +305,12 @@ public class Scriptlet
 		//  Boolean
 		if (stringValue.equals("Y"))
 		{
-			m_ctx.put(convertKey(key), new Boolean(true));
+			m_ctx.put(convertKey(key), Boolean.TRUE);
 			return;
 		}
 		if (stringValue.equals("N"))
 		{
-			m_ctx.put(convertKey(key), new Boolean(false));
+			m_ctx.put(convertKey(key), Boolean.FALSE);
 			return;
 		}
 
diff --git a/org.adempiere.base/src/org/compiere/model/StandardTaxProvider.java b/org.adempiere.base/src/org/compiere/model/StandardTaxProvider.java
index a508cc3250..31aed1bd80 100644
--- a/org.adempiere.base/src/org/compiere/model/StandardTaxProvider.java
+++ b/org.adempiere.base/src/org/compiere/model/StandardTaxProvider.java
@@ -45,7 +45,7 @@ public class StandardTaxProvider implements ITaxProvider {
 		{
 			MOrderLine line = lines[i];
 			totalLines = totalLines.add(line.getLineNetAmt());
-			Integer taxID = new Integer(line.getC_Tax_ID());
+			Integer taxID = Integer.valueOf(line.getC_Tax_ID());
 			if (!taxList.contains(taxID))
 			{
 				MTax tax = new MTax(order.getCtx(), taxID, order.get_TrxName());
@@ -302,7 +302,7 @@ public class StandardTaxProvider implements ITaxProvider {
 		{
 			MRMALine line = lines[i];
 			totalLines = totalLines.add(line.getLineNetAmt());
-			Integer taxID = new Integer(line.getC_Tax_ID());
+			Integer taxID = Integer.valueOf(line.getC_Tax_ID());
 			if (!taxList.contains(taxID))
 			{
 				MTax tax = new MTax(rma.getCtx(), taxID, rma.get_TrxName());
diff --git a/org.adempiere.base/src/org/compiere/model/TranslationTable.java b/org.adempiere.base/src/org/compiere/model/TranslationTable.java
index 0336644ca6..dc8611cbbc 100644
--- a/org.adempiere.base/src/org/compiere/model/TranslationTable.java
+++ b/org.adempiere.base/src/org/compiere/model/TranslationTable.java
@@ -72,7 +72,7 @@ public class TranslationTable
 			return s_activeLanguages.intValue();
 		int no = DB.getSQLValue(null, 
 			"SELECT COUNT(*) FROM AD_Language WHERE IsActive='Y' AND IsSystemLanguage='Y'");
-		s_activeLanguages = new Integer(no);
+		s_activeLanguages = Integer.valueOf(no);
 		return s_activeLanguages.intValue();
 	}	//	getActiveLanguages
 	
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_AccessLog.java b/org.adempiere.base/src/org/compiere/model/X_AD_AccessLog.java
index b5ec33cde3..de596b81e9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_AccessLog.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_AccessLog.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_AccessLog
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_AccessLog extends PO implements I_AD_AccessLog, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_AccessLog (Properties ctx, int AD_AccessLog_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Alert.java b/org.adempiere.base/src/org/compiere/model/X_AD_Alert.java
index dc76fbbc78..2ab3118ce7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Alert.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Alert.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Alert
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Alert extends PO implements I_AD_Alert, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Alert (Properties ctx, int AD_Alert_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_AlertProcessor.java b/org.adempiere.base/src/org/compiere/model/X_AD_AlertProcessor.java
index 31b6ec993e..68ee837416 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_AlertProcessor.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_AlertProcessor.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_AlertProcessor
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_AlertProcessor extends PO implements I_AD_AlertProcessor, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_AlertProcessor (Properties ctx, int AD_AlertProcessor_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_AlertProcessorLog.java b/org.adempiere.base/src/org/compiere/model/X_AD_AlertProcessorLog.java
index c06fe4f99e..0374648793 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_AlertProcessorLog.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_AlertProcessorLog.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_AlertProcessorLog
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_AlertProcessorLog extends PO implements I_AD_AlertProcessorLog, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_AlertProcessorLog (Properties ctx, int AD_AlertProcessorLog_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_AlertRecipient.java b/org.adempiere.base/src/org/compiere/model/X_AD_AlertRecipient.java
index 5df843ba56..b8c6d02318 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_AlertRecipient.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_AlertRecipient.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_AlertRecipient
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_AlertRecipient extends PO implements I_AD_AlertRecipient, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_AlertRecipient (Properties ctx, int AD_AlertRecipient_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_AlertRule.java b/org.adempiere.base/src/org/compiere/model/X_AD_AlertRule.java
index a736bbf73b..10a1911a52 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_AlertRule.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_AlertRule.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_AlertRule
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_AlertRule extends PO implements I_AD_AlertRule, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_AlertRule (Properties ctx, int AD_AlertRule_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_AllClients_V.java b/org.adempiere.base/src/org/compiere/model/X_AD_AllClients_V.java
index 71ed342210..d9fdaf4ea0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_AllClients_V.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_AllClients_V.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_AllClients_V
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_AllClients_V extends PO implements I_AD_AllClients_V, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_AllClients_V (Properties ctx, int AD_AllClients_V_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_AllUsers_V.java b/org.adempiere.base/src/org/compiere/model/X_AD_AllUsers_V.java
index c071cf11c0..72e06f8c56 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_AllUsers_V.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_AllUsers_V.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_AllUsers_V
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_AllUsers_V extends PO implements I_AD_AllUsers_V, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_AllUsers_V (Properties ctx, int AD_AllUsers_V_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Archive.java b/org.adempiere.base/src/org/compiere/model/X_AD_Archive.java
index 7d16d0911a..d978159f94 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Archive.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Archive.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Archive
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Archive extends PO implements I_AD_Archive, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Archive (Properties ctx, int AD_Archive_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Attachment.java b/org.adempiere.base/src/org/compiere/model/X_AD_Attachment.java
index 7a2aac1027..3ceebba5c6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Attachment.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Attachment.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Attachment
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Attachment extends PO implements I_AD_Attachment, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Attachment (Properties ctx, int AD_Attachment_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_AttachmentNote.java b/org.adempiere.base/src/org/compiere/model/X_AD_AttachmentNote.java
index 613cf0d30c..c4ecebb4b2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_AttachmentNote.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_AttachmentNote.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_AttachmentNote
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_AttachmentNote extends PO implements I_AD_AttachmentNote, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_AttachmentNote (Properties ctx, int AD_AttachmentNote_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Attribute.java b/org.adempiere.base/src/org/compiere/model/X_AD_Attribute.java
index d41c0f21d0..1106e418c4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Attribute.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Attribute.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Attribute
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Attribute extends PO implements I_AD_Attribute, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Attribute (Properties ctx, int AD_Attribute_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Attribute_Value.java b/org.adempiere.base/src/org/compiere/model/X_AD_Attribute_Value.java
index d7ae8b2b11..9b03411ac9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Attribute_Value.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Attribute_Value.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Attribute_Value
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Attribute_Value extends PO implements I_AD_Attribute_Value, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Attribute_Value (Properties ctx, int AD_Attribute_Value_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_BroadcastMessage.java b/org.adempiere.base/src/org/compiere/model/X_AD_BroadcastMessage.java
index d42c0270bd..36876b867f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_BroadcastMessage.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_BroadcastMessage.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_BroadcastMessage
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_BroadcastMessage extends PO implements I_AD_BroadcastMessage, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_BroadcastMessage (Properties ctx, int AD_BroadcastMessage_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ChangeLog.java b/org.adempiere.base/src/org/compiere/model/X_AD_ChangeLog.java
index 8750ab7507..ab73da2e87 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ChangeLog.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ChangeLog.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ChangeLog
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_ChangeLog extends PO implements I_AD_ChangeLog, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_ChangeLog (Properties ctx, int AD_ChangeLog_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Chart.java b/org.adempiere.base/src/org/compiere/model/X_AD_Chart.java
index 4a2aa4552f..1d367e7ba6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Chart.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Chart.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Chart
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Chart extends PO implements I_AD_Chart, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Chart (Properties ctx, int AD_Chart_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ChartDatasource.java b/org.adempiere.base/src/org/compiere/model/X_AD_ChartDatasource.java
index 8f8a01fd8f..03b8a6faad 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ChartDatasource.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ChartDatasource.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ChartDatasource
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_ChartDatasource extends PO implements I_AD_ChartDatasource, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_ChartDatasource (Properties ctx, int AD_ChartDatasource_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Client.java b/org.adempiere.base/src/org/compiere/model/X_AD_Client.java
index 1df2340a57..903ba6e273 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Client.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Client.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Client
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Client extends PO implements I_AD_Client, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Client (Properties ctx, int AD_Client_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ClientInfo.java b/org.adempiere.base/src/org/compiere/model/X_AD_ClientInfo.java
index e86b5fb538..03f105349b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ClientInfo.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ClientInfo.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_ClientInfo
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_ClientInfo extends PO implements I_AD_ClientInfo, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_ClientInfo (Properties ctx, int AD_ClientInfo_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ClientShare.java b/org.adempiere.base/src/org/compiere/model/X_AD_ClientShare.java
index 34172721f2..36c33c5a86 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ClientShare.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ClientShare.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ClientShare
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_ClientShare extends PO implements I_AD_ClientShare, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_ClientShare (Properties ctx, int AD_ClientShare_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Color.java b/org.adempiere.base/src/org/compiere/model/X_AD_Color.java
index 41981c7510..95e83a7a40 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Color.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Color.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Color
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Color extends PO implements I_AD_Color, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Color (Properties ctx, int AD_Color_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Column.java b/org.adempiere.base/src/org/compiere/model/X_AD_Column.java
index 0668737e2e..e7c6ea62eb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Column.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Column.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Column
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Column extends PO implements I_AD_Column, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20180723L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Column (Properties ctx, int AD_Column_ID, String trxName)
@@ -1114,4 +1114,4 @@ public class X_AD_Column extends PO implements I_AD_Column, I_Persistent
 	{
 		return (String)get_Value(COLUMNNAME_VFormat);
 	}
-}
+}
\ No newline at end of file
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Column_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Column_Access.java
index fe99905fea..f4f93eb9af 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Column_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Column_Access.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Column_Access
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Column_Access extends PO implements I_AD_Column_Access, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Column_Access (Properties ctx, int AD_Column_Access_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_CtxHelp.java b/org.adempiere.base/src/org/compiere/model/X_AD_CtxHelp.java
index feb991baf2..7671e8c771 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_CtxHelp.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_CtxHelp.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_CtxHelp
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_CtxHelp extends PO implements I_AD_CtxHelp, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_CtxHelp (Properties ctx, int AD_CtxHelp_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_CtxHelpMsg.java b/org.adempiere.base/src/org/compiere/model/X_AD_CtxHelpMsg.java
index 330af81688..c658196017 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_CtxHelpMsg.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_CtxHelpMsg.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_CtxHelpMsg
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_CtxHelpMsg extends PO implements I_AD_CtxHelpMsg, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_CtxHelpMsg (Properties ctx, int AD_CtxHelpMsg_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_CtxHelpSuggestion.java b/org.adempiere.base/src/org/compiere/model/X_AD_CtxHelpSuggestion.java
index 6e0135fdc1..0e31e81bb4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_CtxHelpSuggestion.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_CtxHelpSuggestion.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_CtxHelpSuggestion
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_CtxHelpSuggestion extends PO implements I_AD_CtxHelpSuggestion, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_CtxHelpSuggestion (Properties ctx, int AD_CtxHelpSuggestion_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Desktop.java b/org.adempiere.base/src/org/compiere/model/X_AD_Desktop.java
index 3d27a1f724..d0dcc703ad 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Desktop.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Desktop.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Desktop
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Desktop extends PO implements I_AD_Desktop, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Desktop (Properties ctx, int AD_Desktop_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_DesktopWorkbench.java b/org.adempiere.base/src/org/compiere/model/X_AD_DesktopWorkbench.java
index e22693dc6e..047417c894 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_DesktopWorkbench.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_DesktopWorkbench.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_DesktopWorkbench
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_DesktopWorkbench extends PO implements I_AD_DesktopWorkbench, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_DesktopWorkbench (Properties ctx, int AD_DesktopWorkbench_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Document_Action_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Document_Action_Access.java
index 701cafbc67..329c77fc37 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Document_Action_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Document_Action_Access.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Document_Action_Access
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Document_Action_Access extends PO implements I_AD_Document_Action_Access, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Document_Action_Access (Properties ctx, int AD_Document_Action_Access_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Element.java b/org.adempiere.base/src/org/compiere/model/X_AD_Element.java
index 8b97505a64..e2c52bfbae 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Element.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Element.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Element
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Element extends PO implements I_AD_Element, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20180217L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Element (Properties ctx, int AD_Element_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_EntityType.java b/org.adempiere.base/src/org/compiere/model/X_AD_EntityType.java
index 895adfa9b4..d53f5f6bd5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_EntityType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_EntityType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_EntityType
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_EntityType extends PO implements I_AD_EntityType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_EntityType (Properties ctx, int AD_EntityType_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Error.java b/org.adempiere.base/src/org/compiere/model/X_AD_Error.java
index bf9d9ac4b0..ea6a35d09a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Error.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Error.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Error
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Error extends PO implements I_AD_Error, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Error (Properties ctx, int AD_Error_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Field.java b/org.adempiere.base/src/org/compiere/model/X_AD_Field.java
index 517fa2a2cb..93cbd8cff7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Field.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Field.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Field
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Field extends PO implements I_AD_Field, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20180217L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Field (Properties ctx, int AD_Field_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_FieldGroup.java b/org.adempiere.base/src/org/compiere/model/X_AD_FieldGroup.java
index 690306ef6f..125f697364 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_FieldGroup.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_FieldGroup.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_FieldGroup
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_FieldGroup extends PO implements I_AD_FieldGroup, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_FieldGroup (Properties ctx, int AD_FieldGroup_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_FieldSuggestion.java b/org.adempiere.base/src/org/compiere/model/X_AD_FieldSuggestion.java
index 996cdc59c1..483b53c5a5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_FieldSuggestion.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_FieldSuggestion.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_FieldSuggestion
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_FieldSuggestion extends PO implements I_AD_FieldSuggestion, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_FieldSuggestion (Properties ctx, int AD_FieldSuggestion_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Find.java b/org.adempiere.base/src/org/compiere/model/X_AD_Find.java
index f9287d0a81..0dce96a239 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Find.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Find.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Find
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Find extends PO implements I_AD_Find, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Find (Properties ctx, int AD_Find_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Form.java b/org.adempiere.base/src/org/compiere/model/X_AD_Form.java
index cd6f5fb16f..d7aa748a2c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Form.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Form.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Form
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Form extends PO implements I_AD_Form, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Form (Properties ctx, int AD_Form_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Form_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Form_Access.java
index 0e84efdf80..dcef497690 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Form_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Form_Access.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Form_Access
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Form_Access extends PO implements I_AD_Form_Access, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Form_Access (Properties ctx, int AD_Form_Access_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_HouseKeeping.java b/org.adempiere.base/src/org/compiere/model/X_AD_HouseKeeping.java
index 06f188041a..bf3ccfc572 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_HouseKeeping.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_HouseKeeping.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_HouseKeeping
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_HouseKeeping extends PO implements I_AD_HouseKeeping, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_HouseKeeping (Properties ctx, int AD_HouseKeeping_ID, String trxName)
@@ -40,7 +40,6 @@ public class X_AD_HouseKeeping extends PO implements I_AD_HouseKeeping, I_Persis
       /** if (AD_HouseKeeping_ID == 0)
         {
 			setAD_HouseKeeping_ID (0);
-			setAD_Table_ID (0);
 			setName (null);
 			setValue (null);
         } */
@@ -306,6 +305,23 @@ public class X_AD_HouseKeeping extends PO implements I_AD_HouseKeeping, I_Persis
 		return false;
 	}
 
+	/** Set DB Table Name.
+		@param TableName 
+		Name of the table in the database
+	  */
+	public void setTableName (String TableName)
+	{
+		set_Value (COLUMNNAME_TableName, TableName);
+	}
+
+	/** Get DB Table Name.
+		@return Name of the table in the database
+	  */
+	public String getTableName () 
+	{
+		return (String)get_Value(COLUMNNAME_TableName);
+	}
+
 	/** Set Search Key.
 		@param Value 
 		Search key for the record in the format required - must be unique
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Image.java b/org.adempiere.base/src/org/compiere/model/X_AD_Image.java
index edbbd23b32..5873d62a0a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Image.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Image.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Image
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Image extends PO implements I_AD_Image, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Image (Properties ctx, int AD_Image_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ImpFormat.java b/org.adempiere.base/src/org/compiere/model/X_AD_ImpFormat.java
index 1504ff0a9a..bfeee6f1e0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ImpFormat.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ImpFormat.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ImpFormat
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_ImpFormat extends PO implements I_AD_ImpFormat, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_ImpFormat (Properties ctx, int AD_ImpFormat_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ImpFormat_Row.java b/org.adempiere.base/src/org/compiere/model/X_AD_ImpFormat_Row.java
index fc2b98856b..aa8426702b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ImpFormat_Row.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ImpFormat_Row.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ImpFormat_Row
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_ImpFormat_Row extends PO implements I_AD_ImpFormat_Row, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_ImpFormat_Row (Properties ctx, int AD_ImpFormat_Row_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ImportTemplate.java b/org.adempiere.base/src/org/compiere/model/X_AD_ImportTemplate.java
index 33a92f0bd1..9298c43831 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ImportTemplate.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ImportTemplate.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ImportTemplate
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_ImportTemplate extends PO implements I_AD_ImportTemplate, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_ImportTemplate (Properties ctx, int AD_ImportTemplate_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ImportTemplateAccess.java b/org.adempiere.base/src/org/compiere/model/X_AD_ImportTemplateAccess.java
index e2d905b1be..ff1a7632fa 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ImportTemplateAccess.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ImportTemplateAccess.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_ImportTemplateAccess
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_ImportTemplateAccess extends PO implements I_AD_ImportTemplateAccess, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_ImportTemplateAccess (Properties ctx, int AD_ImportTemplateAccess_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_IndexColumn.java b/org.adempiere.base/src/org/compiere/model/X_AD_IndexColumn.java
index 6a435fde52..8d3c25492a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_IndexColumn.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_IndexColumn.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_IndexColumn
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_IndexColumn extends PO implements I_AD_IndexColumn, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_IndexColumn (Properties ctx, int AD_IndexColumn_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_InfoColumn.java b/org.adempiere.base/src/org/compiere/model/X_AD_InfoColumn.java
index 24cf9c8b9a..2fcdad614a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_InfoColumn.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_InfoColumn.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_InfoColumn
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_InfoColumn extends PO implements I_AD_InfoColumn, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20180828L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_InfoColumn (Properties ctx, int AD_InfoColumn_ID, String trxName)
@@ -53,6 +53,8 @@ public class X_AD_InfoColumn extends PO implements I_AD_InfoColumn, I_Persistent
 			setIsMandatory (false);
 // N
 			setIsQueryCriteria (false);
+			setIsReadOnly (true);
+// Y
 			setName (null);
 			setSelectClause (null);
 			setSeqNo (0);
@@ -369,7 +371,7 @@ public class X_AD_InfoColumn extends PO implements I_AD_InfoColumn, I_Persistent
 	{
 		return (String)get_Value(COLUMNNAME_Help);
 	}
-	
+
 	/** Set Input field validation.
 		@param InputFieldValidation 
 		Input field validaton query
@@ -378,14 +380,14 @@ public class X_AD_InfoColumn extends PO implements I_AD_InfoColumn, I_Persistent
 	{
 		set_Value (COLUMNNAME_InputFieldValidation, InputFieldValidation);
 	}
-	
+
 	/** Get Input field validation.
 		@return Input field validaton query
-	*/
+	  */
 	public String getInputFieldValidation () 
 	{
 		return (String)get_Value(COLUMNNAME_InputFieldValidation);
-	}		
+	}
 
 	/** Set Centrally maintained.
 		@param IsCentrallyMaintained 
@@ -434,31 +436,6 @@ public class X_AD_InfoColumn extends PO implements I_AD_InfoColumn, I_Persistent
 		}
 		return false;
 	}
-	
-	/**
-	 * Set Read Only.
-	 * 
-	 * @param IsReadOnly
-	 * Determines, if this field is Read Only
-	 */
-	public void setIsReadOnly(boolean IsReadOnly) {
-		set_Value(COLUMNNAME_IsReadOnly, Boolean.valueOf(IsReadOnly));
-	}
-
-	/**
-	 * Get Read Only.
-	 * 
-	 * @return Determines, if this field is Read Only
-	 */
-	public boolean isReadOnly() {
-		Object oo = get_Value(COLUMNNAME_IsReadOnly);
-		if (oo != null) {
-			if (oo instanceof Boolean)
-				return ((Boolean) oo).booleanValue();
-			return "Y".equals(oo);
-		}
-		return false;
-	}
 
 	/** Set Identifier.
 		@param IsIdentifier 
@@ -556,6 +533,30 @@ public class X_AD_InfoColumn extends PO implements I_AD_InfoColumn, I_Persistent
 		return false;
 	}
 
+	/** Set Read Only.
+		@param IsReadOnly 
+		Field is read only
+	  */
+	public void setIsReadOnly (boolean IsReadOnly)
+	{
+		set_Value (COLUMNNAME_IsReadOnly, Boolean.valueOf(IsReadOnly));
+	}
+
+	/** Get Read Only.
+		@return Field is read only
+	  */
+	public boolean isReadOnly () 
+	{
+		Object oo = get_Value(COLUMNNAME_IsReadOnly);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
 	/** Set Name.
 		@param Name 
 		Alphanumeric identifier of the entity
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_InfoProcess.java b/org.adempiere.base/src/org/compiere/model/X_AD_InfoProcess.java
index 8a2d00b4be..544dbf4a3f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_InfoProcess.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_InfoProcess.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_InfoProcess
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_InfoProcess extends PO implements I_AD_InfoProcess, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_InfoProcess (Properties ctx, int AD_InfoProcess_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_InfoRelated.java b/org.adempiere.base/src/org/compiere/model/X_AD_InfoRelated.java
index 88b3ad65fb..b097dcf200 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_InfoRelated.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_InfoRelated.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_InfoRelated
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_InfoRelated extends PO implements I_AD_InfoRelated, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_InfoRelated (Properties ctx, int AD_InfoRelated_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_InfoWindow.java b/org.adempiere.base/src/org/compiere/model/X_AD_InfoWindow.java
index c9e681dcc1..8db4fd2917 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_InfoWindow.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_InfoWindow.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_InfoWindow
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_InfoWindow extends PO implements I_AD_InfoWindow, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_InfoWindow (Properties ctx, int AD_InfoWindow_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_InfoWindow_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_InfoWindow_Access.java
index 217510ce64..236da7dcdb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_InfoWindow_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_InfoWindow_Access.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_InfoWindow_Access
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_InfoWindow_Access extends PO implements I_AD_InfoWindow_Access, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_InfoWindow_Access (Properties ctx, int AD_InfoWindow_Access_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Issue.java b/org.adempiere.base/src/org/compiere/model/X_AD_Issue.java
index 03a779ae12..65e8fb651f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Issue.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Issue.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Issue
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Issue extends PO implements I_AD_Issue, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Issue (Properties ctx, int AD_Issue_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_LabelPrinter.java b/org.adempiere.base/src/org/compiere/model/X_AD_LabelPrinter.java
index 7a7d9dbb6d..4755ebc329 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_LabelPrinter.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_LabelPrinter.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_LabelPrinter
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_LabelPrinter extends PO implements I_AD_LabelPrinter, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_LabelPrinter (Properties ctx, int AD_LabelPrinter_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_LabelPrinterFunction.java b/org.adempiere.base/src/org/compiere/model/X_AD_LabelPrinterFunction.java
index 8a2e588ebb..639a060504 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_LabelPrinterFunction.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_LabelPrinterFunction.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_LabelPrinterFunction
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_LabelPrinterFunction extends PO implements I_AD_LabelPrinterFunction, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_LabelPrinterFunction (Properties ctx, int AD_LabelPrinterFunction_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Language.java b/org.adempiere.base/src/org/compiere/model/X_AD_Language.java
index 7dc701b99f..01a4ef524d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Language.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Language.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Language
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Language extends PO implements I_AD_Language, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Language (Properties ctx, int AD_Language_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_LdapAccess.java b/org.adempiere.base/src/org/compiere/model/X_AD_LdapAccess.java
index 47d3aac060..81ac9c6da0 100755
--- a/org.adempiere.base/src/org/compiere/model/X_AD_LdapAccess.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_LdapAccess.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_LdapAccess
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_LdapAccess extends PO implements I_AD_LdapAccess, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_LdapAccess (Properties ctx, int AD_LdapAccess_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_LdapProcessor.java b/org.adempiere.base/src/org/compiere/model/X_AD_LdapProcessor.java
index 88bf104fa5..9a29cfe392 100755
--- a/org.adempiere.base/src/org/compiere/model/X_AD_LdapProcessor.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_LdapProcessor.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_LdapProcessor
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_LdapProcessor extends PO implements I_AD_LdapProcessor, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_LdapProcessor (Properties ctx, int AD_LdapProcessor_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_LdapProcessorLog.java b/org.adempiere.base/src/org/compiere/model/X_AD_LdapProcessorLog.java
index 8ddcb0a86b..fa73458aed 100755
--- a/org.adempiere.base/src/org/compiere/model/X_AD_LdapProcessorLog.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_LdapProcessorLog.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_LdapProcessorLog
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_LdapProcessorLog extends PO implements I_AD_LdapProcessorLog, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_LdapProcessorLog (Properties ctx, int AD_LdapProcessorLog_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Menu.java b/org.adempiere.base/src/org/compiere/model/X_AD_Menu.java
index 085690830d..0f2144019b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Menu.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Menu.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Menu
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Menu extends PO implements I_AD_Menu, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Menu (Properties ctx, int AD_Menu_ID, String trxName)
@@ -57,7 +57,7 @@ public class X_AD_Menu extends PO implements I_AD_Menu, I_Persistent
     }
 
     /** AccessLevel
-      * @return 6 - System - Client 
+      * @return 4 - System 
       */
     protected int get_AccessLevel()
     {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Message.java b/org.adempiere.base/src/org/compiere/model/X_AD_Message.java
index 9b60ad440b..45e944e93b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Message.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Message.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Message
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Message extends PO implements I_AD_Message, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Message (Properties ctx, int AD_Message_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_MigrationScript.java b/org.adempiere.base/src/org/compiere/model/X_AD_MigrationScript.java
index 400a1d5154..03d806454e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_MigrationScript.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_MigrationScript.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_MigrationScript
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_MigrationScript extends PO implements I_AD_MigrationScript, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_MigrationScript (Properties ctx, int AD_MigrationScript_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ModelValidator.java b/org.adempiere.base/src/org/compiere/model/X_AD_ModelValidator.java
index 9ca2773933..6a5015404a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ModelValidator.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ModelValidator.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ModelValidator
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_ModelValidator extends PO implements I_AD_ModelValidator, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_ModelValidator (Properties ctx, int AD_ModelValidator_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Modification.java b/org.adempiere.base/src/org/compiere/model/X_AD_Modification.java
index 74cc7a3638..cfaff4fd02 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Modification.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Modification.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Modification
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Modification extends PO implements I_AD_Modification, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Modification (Properties ctx, int AD_Modification_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Note.java b/org.adempiere.base/src/org/compiere/model/X_AD_Note.java
index 0930879734..f6bd608244 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Note.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Note.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Note
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Note extends PO implements I_AD_Note, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Note (Properties ctx, int AD_Note_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Org.java b/org.adempiere.base/src/org/compiere/model/X_AD_Org.java
index 5c10e3f2e3..1295175ccb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Org.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Org.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Org
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Org extends PO implements I_AD_Org, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Org (Properties ctx, int AD_Org_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_OrgInfo.java b/org.adempiere.base/src/org/compiere/model/X_AD_OrgInfo.java
index 4734c69e38..8b8796d065 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_OrgInfo.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_OrgInfo.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_OrgInfo
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_OrgInfo extends PO implements I_AD_OrgInfo, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_OrgInfo (Properties ctx, int AD_OrgInfo_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_OrgType.java b/org.adempiere.base/src/org/compiere/model/X_AD_OrgType.java
index ac809ae51c..fcda8f4817 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_OrgType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_OrgType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_OrgType
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_OrgType extends PO implements I_AD_OrgType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_OrgType (Properties ctx, int AD_OrgType_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PInstance.java b/org.adempiere.base/src/org/compiere/model/X_AD_PInstance.java
index d47d62618c..9e77c67485 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PInstance.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PInstance.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PInstance
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_PInstance extends PO implements I_AD_PInstance, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_PInstance (Properties ctx, int AD_PInstance_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PInstance_Log.java b/org.adempiere.base/src/org/compiere/model/X_AD_PInstance_Log.java
index cd2be66956..9734ff474e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PInstance_Log.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PInstance_Log.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for AD_PInstance_Log
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_PInstance_Log extends PO implements I_AD_PInstance_Log, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_PInstance_Log (Properties ctx, int AD_PInstance_Log_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PInstance_Para.java b/org.adempiere.base/src/org/compiere/model/X_AD_PInstance_Para.java
index 90468bfc4e..e0bd723dca 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PInstance_Para.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PInstance_Para.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PInstance_Para
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_PInstance_Para extends PO implements I_AD_PInstance_Para, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_PInstance_Para (Properties ctx, int AD_PInstance_Para_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Package_Exp.java b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Exp.java
index c778085c1d..0c983dccfb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Package_Exp.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Exp.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Package_Exp
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Package_Exp extends PO implements I_AD_Package_Exp, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Package_Exp (Properties ctx, int AD_Package_Exp_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Package_Exp_Detail.java b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Exp_Detail.java
index f3232a2b98..96ab9954a4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Package_Exp_Detail.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Exp_Detail.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Package_Exp_Detail
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Package_Exp_Detail extends PO implements I_AD_Package_Exp_Detail, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Package_Exp_Detail (Properties ctx, int AD_Package_Exp_Detail_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp.java b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp.java
index c4b767c63e..9d4e8415da 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Package_Imp
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Package_Imp extends PO implements I_AD_Package_Imp, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Package_Imp (Properties ctx, int AD_Package_Imp_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Backup.java b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Backup.java
index e07ac59023..89d18b11b9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Backup.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Backup.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Package_Imp_Backup
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Package_Imp_Backup extends PO implements I_AD_Package_Imp_Backup, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Package_Imp_Backup (Properties ctx, int AD_Package_Imp_Backup_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Detail.java b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Detail.java
index c2e07dd97f..28981f4b8e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Detail.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Detail.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Package_Imp_Detail
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Package_Imp_Detail extends PO implements I_AD_Package_Imp_Detail, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Package_Imp_Detail (Properties ctx, int AD_Package_Imp_Detail_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Inst.java b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Inst.java
index 18d9a77efe..9163653dbe 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Inst.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Inst.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Package_Imp_Inst
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Package_Imp_Inst extends PO implements I_AD_Package_Imp_Inst, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Package_Imp_Inst (Properties ctx, int AD_Package_Imp_Inst_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Proc.java b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Proc.java
index f09497dd6a..4c34a2c07c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Proc.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Proc.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Package_Imp_Proc
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Package_Imp_Proc extends PO implements I_AD_Package_Imp_Proc, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Package_Imp_Proc (Properties ctx, int AD_Package_Imp_Proc_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Package_UUID_Map.java b/org.adempiere.base/src/org/compiere/model/X_AD_Package_UUID_Map.java
index 5caf0caef5..ec51e2f866 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Package_UUID_Map.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Package_UUID_Map.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Package_UUID_Map
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Package_UUID_Map extends PO implements I_AD_Package_UUID_Map, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Package_UUID_Map (Properties ctx, int AD_Package_UUID_Map_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PasswordRule.java b/org.adempiere.base/src/org/compiere/model/X_AD_PasswordRule.java
index 33b7c40c7b..40bb371b62 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PasswordRule.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PasswordRule.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PasswordRule
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_PasswordRule extends PO implements I_AD_PasswordRule, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_PasswordRule (Properties ctx, int AD_PasswordRule_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Password_History.java b/org.adempiere.base/src/org/compiere/model/X_AD_Password_History.java
index 186c0b6180..22d2aedc59 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Password_History.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Password_History.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Password_History
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Password_History extends PO implements I_AD_Password_History, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Password_History (Properties ctx, int AD_Password_History_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PostIt.java b/org.adempiere.base/src/org/compiere/model/X_AD_PostIt.java
index 8b0e347e6f..3bd50138e6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PostIt.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PostIt.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_PostIt
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_PostIt extends PO implements I_AD_PostIt, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171107L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_PostIt (Properties ctx, int AD_PostIt_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Preference.java b/org.adempiere.base/src/org/compiere/model/X_AD_Preference.java
index 6d67fd4c35..3536e2569b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Preference.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Preference.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Preference
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Preference extends PO implements I_AD_Preference, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Preference (Properties ctx, int AD_Preference_ID, String trxName)
@@ -167,9 +167,9 @@ public class X_AD_Preference extends PO implements I_AD_Preference, I_Persistent
 		return ii.intValue();
 	}
 
-	public org.compiere.model.I_AD_User getAD_User() throws RuntimeException
+	public org.compiere.model.I_AD_AllUsers_V getAD_User() throws RuntimeException
     {
-		return (org.compiere.model.I_AD_User)MTable.get(getCtx(), org.compiere.model.I_AD_User.Table_Name)
+		return (org.compiere.model.I_AD_AllUsers_V)MTable.get(getCtx(), org.compiere.model.I_AD_AllUsers_V.Table_Name)
 			.getPO(getAD_User_ID(), get_TrxName());	}
 
 	/** Set User/Contact.
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PrintColor.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintColor.java
index d66c391e8f..8c00bed6f9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PrintColor.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PrintColor.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintColor
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_PrintColor extends PO implements I_AD_PrintColor, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_PrintColor (Properties ctx, int AD_PrintColor_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PrintFont.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintFont.java
index c42ef306c5..de6dfb9776 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PrintFont.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PrintFont.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintFont
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_PrintFont extends PO implements I_AD_PrintFont, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_PrintFont (Properties ctx, int AD_PrintFont_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PrintForm.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintForm.java
index 4261a86c3d..7442bf2fef 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PrintForm.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PrintForm.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintForm
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_PrintForm extends PO implements I_AD_PrintForm, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_PrintForm (Properties ctx, int AD_PrintForm_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PrintFormat.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintFormat.java
index 9d0bff6ddb..4058a2eed9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PrintFormat.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PrintFormat.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintFormat
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_PrintFormat extends PO implements I_AD_PrintFormat, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_PrintFormat (Properties ctx, int AD_PrintFormat_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PrintFormatItem.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintFormatItem.java
index bc14da064d..1c6a9df3cc 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PrintFormatItem.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PrintFormatItem.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintFormatItem
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_PrintFormatItem extends PO implements I_AD_PrintFormatItem, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_PrintFormatItem (Properties ctx, int AD_PrintFormatItem_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PrintGraph.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintGraph.java
index 30e3cfe934..d25297c012 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PrintGraph.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PrintGraph.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintGraph
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_PrintGraph extends PO implements I_AD_PrintGraph, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_PrintGraph (Properties ctx, int AD_PrintGraph_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PrintLabel.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintLabel.java
index 68fe38ef04..7a8145d185 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PrintLabel.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PrintLabel.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintLabel
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_PrintLabel extends PO implements I_AD_PrintLabel, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_PrintLabel (Properties ctx, int AD_PrintLabel_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PrintLabelLine.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintLabelLine.java
index 03000ec00f..d1283a59bc 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PrintLabelLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PrintLabelLine.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintLabelLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_PrintLabelLine extends PO implements I_AD_PrintLabelLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_PrintLabelLine (Properties ctx, int AD_PrintLabelLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PrintPaper.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintPaper.java
index f4b1d42303..a692ca0b3f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PrintPaper.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PrintPaper.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintPaper
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_PrintPaper extends PO implements I_AD_PrintPaper, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_PrintPaper (Properties ctx, int AD_PrintPaper_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PrintTableFormat.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintTableFormat.java
index 9ebc3155bf..5ef7aa9ab9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PrintTableFormat.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PrintTableFormat.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintTableFormat
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_PrintTableFormat extends PO implements I_AD_PrintTableFormat, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_PrintTableFormat (Properties ctx, int AD_PrintTableFormat_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Private_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Private_Access.java
index 63546bb6da..312ab463e3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Private_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Private_Access.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Private_Access
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Private_Access extends PO implements I_AD_Private_Access, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Private_Access (Properties ctx, int AD_Private_Access_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Process.java b/org.adempiere.base/src/org/compiere/model/X_AD_Process.java
index a0f95b9960..1dde19e614 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Process.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Process.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Process
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Process extends PO implements I_AD_Process, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Process (Properties ctx, int AD_Process_ID, String trxName)
@@ -284,6 +284,30 @@ public class X_AD_Process extends PO implements I_AD_Process, I_Persistent
 		return ii.intValue();
 	}
 
+	/** AllowMultipleExecution AD_Reference_ID=200158 */
+	public static final int ALLOWMULTIPLEEXECUTION_AD_Reference_ID=200158;
+	/** Disallow multiple executions = N */
+	public static final String ALLOWMULTIPLEEXECUTION_DisallowMultipleExecutions = "N";
+	/** Disallow multiple executions with the same parameters = P */
+	public static final String ALLOWMULTIPLEEXECUTION_DisallowMultipleExecutionsWithTheSameParameters = "P";
+	/** Set Multiple Execution.
+		@param AllowMultipleExecution 
+		Allow or disallow executing a process/report multiple times.
+	  */
+	public void setAllowMultipleExecution (String AllowMultipleExecution)
+	{
+
+		set_Value (COLUMNNAME_AllowMultipleExecution, AllowMultipleExecution);
+	}
+
+	/** Get Multiple Execution.
+		@return Allow or disallow executing a process/report multiple times.
+	  */
+	public String getAllowMultipleExecution () 
+	{
+		return (String)get_Value(COLUMNNAME_AllowMultipleExecution);
+	}
+
 	/** Set Classname.
 		@param Classname 
 		Java Classname
@@ -355,6 +379,30 @@ public class X_AD_Process extends PO implements I_AD_Process, I_Persistent
 		return (String)get_Value(COLUMNNAME_EntityType);
 	}
 
+	/** ExecutionType AD_Reference_ID=200157 */
+	public static final int EXECUTIONTYPE_AD_Reference_ID=200157;
+	/** Force Background = B */
+	public static final String EXECUTIONTYPE_ForceBackground = "B";
+	/** Force Foreground = F */
+	public static final String EXECUTIONTYPE_ForceForeground = "F";
+	/** Set Execution Type.
+		@param ExecutionType 
+		Execution Type defines whether the report/process will always run in background or foreground. 
+	  */
+	public void setExecutionType (String ExecutionType)
+	{
+
+		set_Value (COLUMNNAME_ExecutionType, ExecutionType);
+	}
+
+	/** Get Execution Type.
+		@return Execution Type defines whether the report/process will always run in background or foreground. 
+	  */
+	public String getExecutionType () 
+	{
+		return (String)get_Value(COLUMNNAME_ExecutionType);
+	}
+
 	/** Set Comment/Help.
 		@param Help 
 		Comment or Hint
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Process_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Process_Access.java
index f767ea3c38..8bb74d3802 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Process_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Process_Access.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Process_Access
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Process_Access extends PO implements I_AD_Process_Access, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Process_Access (Properties ctx, int AD_Process_Access_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Process_Para.java b/org.adempiere.base/src/org/compiere/model/X_AD_Process_Para.java
index 3c1ad2d58e..843e526885 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Process_Para.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Process_Para.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Process_Para
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Process_Para extends PO implements I_AD_Process_Para, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20180217L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Process_Para (Properties ctx, int AD_Process_Para_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_RecentItem.java b/org.adempiere.base/src/org/compiere/model/X_AD_RecentItem.java
index 70e97753d0..0b22018ea1 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_RecentItem.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_RecentItem.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_RecentItem
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_RecentItem extends PO implements I_AD_RecentItem, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_RecentItem (Properties ctx, int AD_RecentItem_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Record_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Record_Access.java
index 4825d916d1..2b30d0417c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Record_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Record_Access.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Record_Access
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Record_Access extends PO implements I_AD_Record_Access, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Record_Access (Properties ctx, int AD_Record_Access_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Ref_List.java b/org.adempiere.base/src/org/compiere/model/X_AD_Ref_List.java
index d213bbf341..229667b074 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Ref_List.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Ref_List.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Ref_List
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Ref_List extends PO implements I_AD_Ref_List, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Ref_List (Properties ctx, int AD_Ref_List_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Ref_Table.java b/org.adempiere.base/src/org/compiere/model/X_AD_Ref_Table.java
index fce09a0436..bf82c53b13 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Ref_Table.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Ref_Table.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Ref_Table
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Ref_Table extends PO implements I_AD_Ref_Table, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Ref_Table (Properties ctx, int AD_Ref_Table_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Reference.java b/org.adempiere.base/src/org/compiere/model/X_AD_Reference.java
index 04ef4a06de..95e5a2f7e4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Reference.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Reference.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Reference
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Reference extends PO implements I_AD_Reference, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Reference (Properties ctx, int AD_Reference_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Registration.java b/org.adempiere.base/src/org/compiere/model/X_AD_Registration.java
index ac2a93c087..b8f45fd84d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Registration.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Registration.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Registration
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Registration extends PO implements I_AD_Registration, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Registration (Properties ctx, int AD_Registration_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_RelationType.java b/org.adempiere.base/src/org/compiere/model/X_AD_RelationType.java
index 4cec58539e..7e68898dca 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_RelationType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_RelationType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_RelationType
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_RelationType extends PO implements I_AD_RelationType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_RelationType (Properties ctx, int AD_RelationType_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Replication.java b/org.adempiere.base/src/org/compiere/model/X_AD_Replication.java
index 33e6f26786..34b3f56a0a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Replication.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Replication.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Replication
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Replication extends PO implements I_AD_Replication, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Replication (Properties ctx, int AD_Replication_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ReplicationDocument.java b/org.adempiere.base/src/org/compiere/model/X_AD_ReplicationDocument.java
index 70e0686d29..70100e322d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ReplicationDocument.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ReplicationDocument.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_ReplicationDocument
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_ReplicationDocument extends PO implements I_AD_ReplicationDocument, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_ReplicationDocument (Properties ctx, int AD_ReplicationDocument_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ReplicationStrategy.java b/org.adempiere.base/src/org/compiere/model/X_AD_ReplicationStrategy.java
index e06d5f9110..7c38241387 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ReplicationStrategy.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ReplicationStrategy.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ReplicationStrategy
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_ReplicationStrategy extends PO implements I_AD_ReplicationStrategy, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_ReplicationStrategy (Properties ctx, int AD_ReplicationStrategy_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ReplicationTable.java b/org.adempiere.base/src/org/compiere/model/X_AD_ReplicationTable.java
index b2db117df7..0ab588d250 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ReplicationTable.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ReplicationTable.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ReplicationTable
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_ReplicationTable extends PO implements I_AD_ReplicationTable, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_ReplicationTable (Properties ctx, int AD_ReplicationTable_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Replication_Log.java b/org.adempiere.base/src/org/compiere/model/X_AD_Replication_Log.java
index e1a6db1eb3..66ca364ed9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Replication_Log.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Replication_Log.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Replication_Log
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Replication_Log extends PO implements I_AD_Replication_Log, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Replication_Log (Properties ctx, int AD_Replication_Log_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Replication_Run.java b/org.adempiere.base/src/org/compiere/model/X_AD_Replication_Run.java
index dc9d926426..90d3b4c95f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Replication_Run.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Replication_Run.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Replication_Run
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Replication_Run extends PO implements I_AD_Replication_Run, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Replication_Run (Properties ctx, int AD_Replication_Run_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ReportView.java b/org.adempiere.base/src/org/compiere/model/X_AD_ReportView.java
index 53d6997f2a..8c1b64affb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ReportView.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ReportView.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ReportView
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_ReportView extends PO implements I_AD_ReportView, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_ReportView (Properties ctx, int AD_ReportView_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ReportView_Col.java b/org.adempiere.base/src/org/compiere/model/X_AD_ReportView_Col.java
index 5a4035a272..0a75fe2089 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ReportView_Col.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ReportView_Col.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ReportView_Col
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_ReportView_Col extends PO implements I_AD_ReportView_Col, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_ReportView_Col (Properties ctx, int AD_ReportView_Col_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ReportView_Column.java b/org.adempiere.base/src/org/compiere/model/X_AD_ReportView_Column.java
index 2ba17cbd82..fc34c71b08 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ReportView_Column.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ReportView_Column.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_ReportView_Column
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_ReportView_Column extends PO implements I_AD_ReportView_Column, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_ReportView_Column (Properties ctx, int AD_ReportView_Column_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Role.java b/org.adempiere.base/src/org/compiere/model/X_AD_Role.java
index 760b9b35a6..bf7f34a9a9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Role.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Role.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Role
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Role extends PO implements I_AD_Role, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Role (Properties ctx, int AD_Role_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Role_Included.java b/org.adempiere.base/src/org/compiere/model/X_AD_Role_Included.java
index 5f618d1a01..d1517e47e8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Role_Included.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Role_Included.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Role_Included
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Role_Included extends PO implements I_AD_Role_Included, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Role_Included (Properties ctx, int AD_Role_Included_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Role_OrgAccess.java b/org.adempiere.base/src/org/compiere/model/X_AD_Role_OrgAccess.java
index 328d21a588..813e41d043 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Role_OrgAccess.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Role_OrgAccess.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Role_OrgAccess
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Role_OrgAccess extends PO implements I_AD_Role_OrgAccess, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Role_OrgAccess (Properties ctx, int AD_Role_OrgAccess_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Rule.java b/org.adempiere.base/src/org/compiere/model/X_AD_Rule.java
index 307544d4a4..fd35d3b657 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Rule.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Rule.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Rule
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Rule extends PO implements I_AD_Rule, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Rule (Properties ctx, int AD_Rule_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Schedule.java b/org.adempiere.base/src/org/compiere/model/X_AD_Schedule.java
index f730a6f8e5..ca4d034b55 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Schedule.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Schedule.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Schedule
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Schedule extends PO implements I_AD_Schedule, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Schedule (Properties ctx, int AD_Schedule_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Scheduler.java b/org.adempiere.base/src/org/compiere/model/X_AD_Scheduler.java
index e9ac09630d..b348696930 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Scheduler.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Scheduler.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Scheduler
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Scheduler extends PO implements I_AD_Scheduler, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Scheduler (Properties ctx, int AD_Scheduler_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_SchedulerLog.java b/org.adempiere.base/src/org/compiere/model/X_AD_SchedulerLog.java
index 07c017232c..63492ca443 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_SchedulerLog.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_SchedulerLog.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_SchedulerLog
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_SchedulerLog extends PO implements I_AD_SchedulerLog, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_SchedulerLog (Properties ctx, int AD_SchedulerLog_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_SchedulerRecipient.java b/org.adempiere.base/src/org/compiere/model/X_AD_SchedulerRecipient.java
index 5f09027c6b..a39d0863fc 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_SchedulerRecipient.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_SchedulerRecipient.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_SchedulerRecipient
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_SchedulerRecipient extends PO implements I_AD_SchedulerRecipient, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_SchedulerRecipient (Properties ctx, int AD_SchedulerRecipient_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Scheduler_Para.java b/org.adempiere.base/src/org/compiere/model/X_AD_Scheduler_Para.java
index 5216cfcff4..313f464934 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Scheduler_Para.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Scheduler_Para.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Scheduler_Para
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Scheduler_Para extends PO implements I_AD_Scheduler_Para, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Scheduler_Para (Properties ctx, int AD_Scheduler_Para_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_SearchDefinition.java b/org.adempiere.base/src/org/compiere/model/X_AD_SearchDefinition.java
index 26623acca7..ada380afec 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_SearchDefinition.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_SearchDefinition.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_SearchDefinition
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_SearchDefinition extends PO implements I_AD_SearchDefinition, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_SearchDefinition (Properties ctx, int AD_SearchDefinition_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Sequence.java b/org.adempiere.base/src/org/compiere/model/X_AD_Sequence.java
index 95e6f7f2f7..7a78291f82 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Sequence.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Sequence.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Sequence
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Sequence extends PO implements I_AD_Sequence, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Sequence (Properties ctx, int AD_Sequence_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Sequence_Audit.java b/org.adempiere.base/src/org/compiere/model/X_AD_Sequence_Audit.java
index 32ca920dc7..9c5a3e3fa5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Sequence_Audit.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Sequence_Audit.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Sequence_Audit
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Sequence_Audit extends PO implements I_AD_Sequence_Audit, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Sequence_Audit (Properties ctx, int AD_Sequence_Audit_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Sequence_No.java b/org.adempiere.base/src/org/compiere/model/X_AD_Sequence_No.java
index bc79dc3646..c91d9d4453 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Sequence_No.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Sequence_No.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Sequence_No
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Sequence_No extends PO implements I_AD_Sequence_No, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Sequence_No (Properties ctx, int AD_Sequence_No_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Session.java b/org.adempiere.base/src/org/compiere/model/X_AD_Session.java
index 93823f23d5..ba8209da5e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Session.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Session.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Session
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Session extends PO implements I_AD_Session, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Session (Properties ctx, int AD_Session_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_StatusLine.java b/org.adempiere.base/src/org/compiere/model/X_AD_StatusLine.java
index c4a49b6020..12dc01ee49 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_StatusLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_StatusLine.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_StatusLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_StatusLine extends PO implements I_AD_StatusLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_StatusLine (Properties ctx, int AD_StatusLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_StatusLineUsedIn.java b/org.adempiere.base/src/org/compiere/model/X_AD_StatusLineUsedIn.java
index d05c9ba525..9da12aaf37 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_StatusLineUsedIn.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_StatusLineUsedIn.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_StatusLineUsedIn
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_StatusLineUsedIn extends PO implements I_AD_StatusLineUsedIn, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_StatusLineUsedIn (Properties ctx, int AD_StatusLineUsedIn_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_StorageProvider.java b/org.adempiere.base/src/org/compiere/model/X_AD_StorageProvider.java
index 6491befa3d..2fb7a397f6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_StorageProvider.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_StorageProvider.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_StorageProvider
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_StorageProvider extends PO implements I_AD_StorageProvider, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_StorageProvider (Properties ctx, int AD_StorageProvider_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Style.java b/org.adempiere.base/src/org/compiere/model/X_AD_Style.java
index acccacf12a..1653489566 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Style.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Style.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Style
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Style extends PO implements I_AD_Style, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Style (Properties ctx, int AD_Style_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_StyleLine.java b/org.adempiere.base/src/org/compiere/model/X_AD_StyleLine.java
index 877fa15d50..d803a0f22c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_StyleLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_StyleLine.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_StyleLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_StyleLine extends PO implements I_AD_StyleLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_StyleLine (Properties ctx, int AD_StyleLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_SysConfig.java b/org.adempiere.base/src/org/compiere/model/X_AD_SysConfig.java
index 159394c56b..60fd5c7a14 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_SysConfig.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_SysConfig.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_SysConfig
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_SysConfig extends PO implements I_AD_SysConfig, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_SysConfig (Properties ctx, int AD_SysConfig_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_System.java b/org.adempiere.base/src/org/compiere/model/X_AD_System.java
index 163e5d09d6..a13306368b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_System.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_System.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_System
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_System extends PO implements I_AD_System, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_System (Properties ctx, int AD_System_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Tab.java b/org.adempiere.base/src/org/compiere/model/X_AD_Tab.java
index 3fc525799b..191ceab18d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Tab.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Tab.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Tab
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Tab extends PO implements I_AD_Tab, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Tab (Properties ctx, int AD_Tab_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Tab_Customization.java b/org.adempiere.base/src/org/compiere/model/X_AD_Tab_Customization.java
index 061bac2f90..f754ee70f6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Tab_Customization.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Tab_Customization.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Tab_Customization
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Tab_Customization extends PO implements I_AD_Tab_Customization, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Tab_Customization (Properties ctx, int AD_Tab_Customization_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Table.java b/org.adempiere.base/src/org/compiere/model/X_AD_Table.java
index 318a3af0c4..890f3b8da0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Table.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Table.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Table
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Table extends PO implements I_AD_Table, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Table (Properties ctx, int AD_Table_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_TableIndex.java b/org.adempiere.base/src/org/compiere/model/X_AD_TableIndex.java
index b7313adff7..1b15d66650 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_TableIndex.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_TableIndex.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_TableIndex
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_TableIndex extends PO implements I_AD_TableIndex, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_TableIndex (Properties ctx, int AD_TableIndex_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Table_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Table_Access.java
index 8dfbb208cd..2c22816436 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Table_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Table_Access.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Table_Access
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Table_Access extends PO implements I_AD_Table_Access, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Table_Access (Properties ctx, int AD_Table_Access_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Table_ScriptValidator.java b/org.adempiere.base/src/org/compiere/model/X_AD_Table_ScriptValidator.java
index 4b3131361c..d0fb9e7a52 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Table_ScriptValidator.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Table_ScriptValidator.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Table_ScriptValidator
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Table_ScriptValidator extends PO implements I_AD_Table_ScriptValidator, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Table_ScriptValidator (Properties ctx, int AD_Table_ScriptValidator_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Task.java b/org.adempiere.base/src/org/compiere/model/X_AD_Task.java
index be6109de99..4c04ba62d5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Task.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Task.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Task
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Task extends PO implements I_AD_Task, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Task (Properties ctx, int AD_Task_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_TaskInstance.java b/org.adempiere.base/src/org/compiere/model/X_AD_TaskInstance.java
index 7473f46d15..dad16b5c2d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_TaskInstance.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_TaskInstance.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_TaskInstance
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_TaskInstance extends PO implements I_AD_TaskInstance, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_TaskInstance (Properties ctx, int AD_TaskInstance_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Task_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Task_Access.java
index 5fa47596dd..11ccd74f5d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Task_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Task_Access.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Task_Access
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Task_Access extends PO implements I_AD_Task_Access, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Task_Access (Properties ctx, int AD_Task_Access_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ToolBarButton.java b/org.adempiere.base/src/org/compiere/model/X_AD_ToolBarButton.java
index bff44c6520..3de8d9791c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ToolBarButton.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ToolBarButton.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ToolBarButton
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_ToolBarButton extends PO implements I_AD_ToolBarButton, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_ToolBarButton (Properties ctx, int AD_ToolBarButton_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ToolBarButtonRestrict.java b/org.adempiere.base/src/org/compiere/model/X_AD_ToolBarButtonRestrict.java
index cd353098e3..693ad69c62 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ToolBarButtonRestrict.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ToolBarButtonRestrict.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_ToolBarButtonRestrict
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_ToolBarButtonRestrict extends PO implements I_AD_ToolBarButtonRestrict, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_ToolBarButtonRestrict (Properties ctx, int AD_ToolBarButtonRestrict_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Tree.java b/org.adempiere.base/src/org/compiere/model/X_AD_Tree.java
index 1548551f76..f9d08155ae 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Tree.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Tree.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Tree
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Tree extends PO implements I_AD_Tree, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Tree (Properties ctx, int AD_Tree_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_TreeBar.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeBar.java
index 10559faba2..cc1bd3495b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_TreeBar.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_TreeBar.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_TreeBar
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_TreeBar extends PO implements I_AD_TreeBar, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_TreeBar (Properties ctx, int AD_TreeBar_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNode.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNode.java
index 4cd0df51ad..cf01489dd3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNode.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNode.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_TreeNode
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_TreeNode extends PO implements I_AD_TreeNode, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_TreeNode (Properties ctx, int AD_TreeNode_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeBP.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeBP.java
index 8304dc2d98..e504f43eb7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeBP.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeBP.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_TreeNodeBP
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_TreeNodeBP extends PO implements I_AD_TreeNodeBP, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_TreeNodeBP (Properties ctx, int AD_TreeNodeBP_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMC.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMC.java
index 421937acdf..5d3b3b8ae9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMC.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMC.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_TreeNodeCMC
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_TreeNodeCMC extends PO implements I_AD_TreeNodeCMC, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_TreeNodeCMC (Properties ctx, int AD_TreeNodeCMC_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMM.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMM.java
index 724d6cec0a..70666dcc1b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMM.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMM.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_TreeNodeCMM
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_TreeNodeCMM extends PO implements I_AD_TreeNodeCMM, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_TreeNodeCMM (Properties ctx, int AD_TreeNodeCMM_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMS.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMS.java
index 2c9d5c103d..8cfa723717 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMS.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMS.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_TreeNodeCMS
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_TreeNodeCMS extends PO implements I_AD_TreeNodeCMS, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_TreeNodeCMS (Properties ctx, int AD_TreeNodeCMS_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMT.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMT.java
index 5bcb3aa625..fdc64a0c84 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMT.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMT.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_TreeNodeCMT
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_TreeNodeCMT extends PO implements I_AD_TreeNodeCMT, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_TreeNodeCMT (Properties ctx, int AD_TreeNodeCMT_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeMM.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeMM.java
index 9013b28ae5..8bfa6cd0d0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeMM.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeMM.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_TreeNodeMM
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_TreeNodeMM extends PO implements I_AD_TreeNodeMM, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_TreeNodeMM (Properties ctx, int AD_TreeNodeMM_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodePR.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodePR.java
index 9f29fc0012..40a029302f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodePR.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodePR.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_TreeNodePR
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_TreeNodePR extends PO implements I_AD_TreeNodePR, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_TreeNodePR (Properties ctx, int AD_TreeNodePR_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU1.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU1.java
index 3146d4f7c9..61fdecf4bd 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU1.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU1.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_TreeNodeU1
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_TreeNodeU1 extends PO implements I_AD_TreeNodeU1, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_TreeNodeU1 (Properties ctx, int AD_TreeNodeU1_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU2.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU2.java
index 2641b75719..164f4942aa 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU2.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU2.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_TreeNodeU2
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_TreeNodeU2 extends PO implements I_AD_TreeNodeU2, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_TreeNodeU2 (Properties ctx, int AD_TreeNodeU2_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU3.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU3.java
index dcd46157b0..48ff5a5697 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU3.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU3.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_TreeNodeU3
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_TreeNodeU3 extends PO implements I_AD_TreeNodeU3, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_TreeNodeU3 (Properties ctx, int AD_TreeNodeU3_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU4.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU4.java
index 2e027c8ebd..23d546cbe5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU4.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU4.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_TreeNodeU4
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_TreeNodeU4 extends PO implements I_AD_TreeNodeU4, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_TreeNodeU4 (Properties ctx, int AD_TreeNodeU4_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_User.java b/org.adempiere.base/src/org/compiere/model/X_AD_User.java
index 0a07969955..0dad803eff 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_User.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_User.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_User
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_User extends PO implements I_AD_User, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_User (Properties ctx, int AD_User_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_UserBPAccess.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserBPAccess.java
index 33508354b6..b637996917 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_UserBPAccess.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_UserBPAccess.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_UserBPAccess
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_UserBPAccess extends PO implements I_AD_UserBPAccess, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_UserBPAccess (Properties ctx, int AD_UserBPAccess_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Field.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Field.java
index 5bb7c4cfde..30c72cbde0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Field.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Field.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_UserDef_Field
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_UserDef_Field extends PO implements I_AD_UserDef_Field, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20180217L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_UserDef_Field (Properties ctx, int AD_UserDef_Field_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Tab.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Tab.java
index 31673da566..3b84622929 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Tab.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Tab.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_UserDef_Tab
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_UserDef_Tab extends PO implements I_AD_UserDef_Tab, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_UserDef_Tab (Properties ctx, int AD_UserDef_Tab_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Win.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Win.java
index c1bfa01199..4ae750abb7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Win.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Win.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_UserDef_Win
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_UserDef_Win extends PO implements I_AD_UserDef_Win, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_UserDef_Win (Properties ctx, int AD_UserDef_Win_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_UserMail.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserMail.java
index 7d23e9cdff..0ad48a223f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_UserMail.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_UserMail.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_UserMail
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_UserMail extends PO implements I_AD_UserMail, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_UserMail (Properties ctx, int AD_UserMail_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_UserPreference.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserPreference.java
index ce2825bbb9..d6e09a75f7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_UserPreference.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_UserPreference.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_UserPreference
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_UserPreference extends PO implements I_AD_UserPreference, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20180502L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_UserPreference (Properties ctx, int AD_UserPreference_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_UserQuery.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserQuery.java
index 635d1c35b0..8dbeef3841 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_UserQuery.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_UserQuery.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_UserQuery
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_UserQuery extends PO implements I_AD_UserQuery, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_UserQuery (Properties ctx, int AD_UserQuery_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_User_OrgAccess.java b/org.adempiere.base/src/org/compiere/model/X_AD_User_OrgAccess.java
index d1a1598edf..5eb0087074 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_User_OrgAccess.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_User_OrgAccess.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_User_OrgAccess
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_User_OrgAccess extends PO implements I_AD_User_OrgAccess, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_User_OrgAccess (Properties ctx, int AD_User_OrgAccess_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_User_Roles.java b/org.adempiere.base/src/org/compiere/model/X_AD_User_Roles.java
index 37a6ca8ae6..c4f2e96464 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_User_Roles.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_User_Roles.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_User_Roles
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_User_Roles extends PO implements I_AD_User_Roles, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_User_Roles (Properties ctx, int AD_User_Roles_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_User_Substitute.java b/org.adempiere.base/src/org/compiere/model/X_AD_User_Substitute.java
index b7cac16e47..77670ac5a3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_User_Substitute.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_User_Substitute.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_User_Substitute
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_User_Substitute extends PO implements I_AD_User_Substitute, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_User_Substitute (Properties ctx, int AD_User_Substitute_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Val_Rule.java b/org.adempiere.base/src/org/compiere/model/X_AD_Val_Rule.java
index 51b7cf3b9c..ecd2040c0a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Val_Rule.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Val_Rule.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Val_Rule
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Val_Rule extends PO implements I_AD_Val_Rule, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Val_Rule (Properties ctx, int AD_Val_Rule_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ViewColumn.java b/org.adempiere.base/src/org/compiere/model/X_AD_ViewColumn.java
index 4803c04b15..633aa3ba63 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ViewColumn.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ViewColumn.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_ViewColumn
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_ViewColumn extends PO implements I_AD_ViewColumn, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_ViewColumn (Properties ctx, int AD_ViewColumn_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ViewComponent.java b/org.adempiere.base/src/org/compiere/model/X_AD_ViewComponent.java
index 311a49940e..f0a196fe3e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ViewComponent.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ViewComponent.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ViewComponent
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_ViewComponent extends PO implements I_AD_ViewComponent, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_ViewComponent (Properties ctx, int AD_ViewComponent_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WF_Activity.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Activity.java
index b6159755fc..d98f8c04dc 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WF_Activity.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Activity.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_Activity
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_WF_Activity extends PO implements I_AD_WF_Activity, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_WF_Activity (Properties ctx, int AD_WF_Activity_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WF_ActivityApprover.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_ActivityApprover.java
index ea4f82ffe6..e3622924ad 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WF_ActivityApprover.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WF_ActivityApprover.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_WF_ActivityApprover
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_WF_ActivityApprover extends PO implements I_AD_WF_ActivityApprover, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_WF_ActivityApprover (Properties ctx, int AD_WF_ActivityApprover_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WF_ActivityResult.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_ActivityResult.java
index a95a7f07a2..074fcd1afb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WF_ActivityResult.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WF_ActivityResult.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_ActivityResult
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_WF_ActivityResult extends PO implements I_AD_WF_ActivityResult, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_WF_ActivityResult (Properties ctx, int AD_WF_ActivityResult_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WF_Block.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Block.java
index f5007e30e0..a165849c7c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WF_Block.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Block.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_Block
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_WF_Block extends PO implements I_AD_WF_Block, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_WF_Block (Properties ctx, int AD_WF_Block_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WF_EventAudit.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_EventAudit.java
index fb8cebedc4..6a78cdc3a9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WF_EventAudit.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WF_EventAudit.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_EventAudit
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_WF_EventAudit extends PO implements I_AD_WF_EventAudit, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_WF_EventAudit (Properties ctx, int AD_WF_EventAudit_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WF_NextCondition.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_NextCondition.java
index 41d636d47b..79df9d917d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WF_NextCondition.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WF_NextCondition.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_NextCondition
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_WF_NextCondition extends PO implements I_AD_WF_NextCondition, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_WF_NextCondition (Properties ctx, int AD_WF_NextCondition_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WF_Node.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Node.java
index acb0e8367c..9b5992a317 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WF_Node.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Node.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_Node
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_WF_Node extends PO implements I_AD_WF_Node, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_WF_Node (Properties ctx, int AD_WF_Node_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WF_NodeNext.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_NodeNext.java
index eb921e9704..182351d36a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WF_NodeNext.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WF_NodeNext.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_NodeNext
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_WF_NodeNext extends PO implements I_AD_WF_NodeNext, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_WF_NodeNext (Properties ctx, int AD_WF_NodeNext_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WF_Node_Para.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Node_Para.java
index ac156bd471..36252e761c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WF_Node_Para.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Node_Para.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_Node_Para
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_WF_Node_Para extends PO implements I_AD_WF_Node_Para, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_WF_Node_Para (Properties ctx, int AD_WF_Node_Para_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WF_Process.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Process.java
index be23861cd8..54b3791cde 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WF_Process.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Process.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_Process
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_WF_Process extends PO implements I_AD_WF_Process, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_WF_Process (Properties ctx, int AD_WF_Process_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WF_ProcessData.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_ProcessData.java
index f0bc13743b..a8026bc145 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WF_ProcessData.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WF_ProcessData.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_ProcessData
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_WF_ProcessData extends PO implements I_AD_WF_ProcessData, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_WF_ProcessData (Properties ctx, int AD_WF_ProcessData_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WF_Responsible.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Responsible.java
index df728016a8..a62ad98bd5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WF_Responsible.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Responsible.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_Responsible
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_WF_Responsible extends PO implements I_AD_WF_Responsible, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_WF_Responsible (Properties ctx, int AD_WF_Responsible_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Window.java b/org.adempiere.base/src/org/compiere/model/X_AD_Window.java
index 2947385d85..81c5354fcd 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Window.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Window.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Window
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Window extends PO implements I_AD_Window, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Window (Properties ctx, int AD_Window_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Window_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Window_Access.java
index b0d25d1e30..79f2646492 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Window_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Window_Access.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Window_Access
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Window_Access extends PO implements I_AD_Window_Access, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Window_Access (Properties ctx, int AD_Window_Access_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WizardProcess.java b/org.adempiere.base/src/org/compiere/model/X_AD_WizardProcess.java
index f6f56a0990..5b632abe4b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WizardProcess.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WizardProcess.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_WizardProcess
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_WizardProcess extends PO implements I_AD_WizardProcess, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_WizardProcess (Properties ctx, int AD_WizardProcess_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Workbench.java b/org.adempiere.base/src/org/compiere/model/X_AD_Workbench.java
index b48290d207..666f3e40d3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Workbench.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Workbench.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Workbench
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Workbench extends PO implements I_AD_Workbench, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Workbench (Properties ctx, int AD_Workbench_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WorkbenchWindow.java b/org.adempiere.base/src/org/compiere/model/X_AD_WorkbenchWindow.java
index 67dfbef2d4..82e98fdddc 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WorkbenchWindow.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WorkbenchWindow.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WorkbenchWindow
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_WorkbenchWindow extends PO implements I_AD_WorkbenchWindow, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_WorkbenchWindow (Properties ctx, int AD_WorkbenchWindow_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Workflow.java b/org.adempiere.base/src/org/compiere/model/X_AD_Workflow.java
index 9ad4807cad..180f0781ae 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Workflow.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Workflow.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Workflow
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Workflow extends PO implements I_AD_Workflow, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Workflow (Properties ctx, int AD_Workflow_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WorkflowProcessor.java b/org.adempiere.base/src/org/compiere/model/X_AD_WorkflowProcessor.java
index 0f9e30dfa9..db275e34f0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WorkflowProcessor.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WorkflowProcessor.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WorkflowProcessor
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_WorkflowProcessor extends PO implements I_AD_WorkflowProcessor, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_WorkflowProcessor (Properties ctx, int AD_WorkflowProcessor_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WorkflowProcessorLog.java b/org.adempiere.base/src/org/compiere/model/X_AD_WorkflowProcessorLog.java
index 7c1ea60660..724b61c301 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WorkflowProcessorLog.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WorkflowProcessorLog.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_WorkflowProcessorLog
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_WorkflowProcessorLog extends PO implements I_AD_WorkflowProcessorLog, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_WorkflowProcessorLog (Properties ctx, int AD_WorkflowProcessorLog_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Workflow_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Workflow_Access.java
index 0445819ec4..1d0f644170 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Workflow_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Workflow_Access.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Workflow_Access
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_Workflow_Access extends PO implements I_AD_Workflow_Access, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_Workflow_Access (Properties ctx, int AD_Workflow_Access_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ZoomCondition.java b/org.adempiere.base/src/org/compiere/model/X_AD_ZoomCondition.java
index c0ef1a9dbf..e8b1171fb7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ZoomCondition.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ZoomCondition.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_ZoomCondition
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_AD_ZoomCondition extends PO implements I_AD_ZoomCondition, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_AD_ZoomCondition (Properties ctx, int AD_ZoomCondition_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_ASP_ClientException.java b/org.adempiere.base/src/org/compiere/model/X_ASP_ClientException.java
index 9e51335337..02f4523579 100644
--- a/org.adempiere.base/src/org/compiere/model/X_ASP_ClientException.java
+++ b/org.adempiere.base/src/org/compiere/model/X_ASP_ClientException.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for ASP_ClientException
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_ASP_ClientException extends PO implements I_ASP_ClientException, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_ASP_ClientException (Properties ctx, int ASP_ClientException_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_ASP_ClientLevel.java b/org.adempiere.base/src/org/compiere/model/X_ASP_ClientLevel.java
index a0e32d5da3..24bf5e4c42 100644
--- a/org.adempiere.base/src/org/compiere/model/X_ASP_ClientLevel.java
+++ b/org.adempiere.base/src/org/compiere/model/X_ASP_ClientLevel.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for ASP_ClientLevel
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_ASP_ClientLevel extends PO implements I_ASP_ClientLevel, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_ASP_ClientLevel (Properties ctx, int ASP_ClientLevel_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_ASP_Field.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Field.java
index fd257738e8..8e91b096d4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_ASP_Field.java
+++ b/org.adempiere.base/src/org/compiere/model/X_ASP_Field.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for ASP_Field
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_ASP_Field extends PO implements I_ASP_Field, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_ASP_Field (Properties ctx, int ASP_Field_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_ASP_Form.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Form.java
index e730e47cad..4a751f1564 100644
--- a/org.adempiere.base/src/org/compiere/model/X_ASP_Form.java
+++ b/org.adempiere.base/src/org/compiere/model/X_ASP_Form.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for ASP_Form
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_ASP_Form extends PO implements I_ASP_Form, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_ASP_Form (Properties ctx, int ASP_Form_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_ASP_Level.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Level.java
index 00b0de2796..f302b5d2fc 100644
--- a/org.adempiere.base/src/org/compiere/model/X_ASP_Level.java
+++ b/org.adempiere.base/src/org/compiere/model/X_ASP_Level.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for ASP_Level
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_ASP_Level extends PO implements I_ASP_Level, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_ASP_Level (Properties ctx, int ASP_Level_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_ASP_Module.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Module.java
index 320fb7338b..e9e62433fb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_ASP_Module.java
+++ b/org.adempiere.base/src/org/compiere/model/X_ASP_Module.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for ASP_Module
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_ASP_Module extends PO implements I_ASP_Module, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_ASP_Module (Properties ctx, int ASP_Module_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_ASP_Process.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Process.java
index 204e08fd8b..1bac7fbf4e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_ASP_Process.java
+++ b/org.adempiere.base/src/org/compiere/model/X_ASP_Process.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for ASP_Process
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_ASP_Process extends PO implements I_ASP_Process, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_ASP_Process (Properties ctx, int ASP_Process_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_ASP_Process_Para.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Process_Para.java
index b6b540fed6..425a9af0d0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_ASP_Process_Para.java
+++ b/org.adempiere.base/src/org/compiere/model/X_ASP_Process_Para.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for ASP_Process_Para
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_ASP_Process_Para extends PO implements I_ASP_Process_Para, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_ASP_Process_Para (Properties ctx, int ASP_Process_Para_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_ASP_Ref_List.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Ref_List.java
index 620fb6a278..b1e537bebe 100644
--- a/org.adempiere.base/src/org/compiere/model/X_ASP_Ref_List.java
+++ b/org.adempiere.base/src/org/compiere/model/X_ASP_Ref_List.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for ASP_Ref_List
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_ASP_Ref_List extends PO implements I_ASP_Ref_List, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_ASP_Ref_List (Properties ctx, int ASP_Ref_List_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_ASP_Tab.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Tab.java
index 375928d804..b83a8a0856 100644
--- a/org.adempiere.base/src/org/compiere/model/X_ASP_Tab.java
+++ b/org.adempiere.base/src/org/compiere/model/X_ASP_Tab.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for ASP_Tab
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_ASP_Tab extends PO implements I_ASP_Tab, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_ASP_Tab (Properties ctx, int ASP_Tab_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_ASP_Task.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Task.java
index 0b582b5575..424a5bc034 100644
--- a/org.adempiere.base/src/org/compiere/model/X_ASP_Task.java
+++ b/org.adempiere.base/src/org/compiere/model/X_ASP_Task.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for ASP_Task
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_ASP_Task extends PO implements I_ASP_Task, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_ASP_Task (Properties ctx, int ASP_Task_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_ASP_Window.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Window.java
index 59266ed487..753185d5ae 100644
--- a/org.adempiere.base/src/org/compiere/model/X_ASP_Window.java
+++ b/org.adempiere.base/src/org/compiere/model/X_ASP_Window.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for ASP_Window
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_ASP_Window extends PO implements I_ASP_Window, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_ASP_Window (Properties ctx, int ASP_Window_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_ASP_Workflow.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Workflow.java
index 19f6b9fd0c..3ad98a6202 100644
--- a/org.adempiere.base/src/org/compiere/model/X_ASP_Workflow.java
+++ b/org.adempiere.base/src/org/compiere/model/X_ASP_Workflow.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for ASP_Workflow
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_ASP_Workflow extends PO implements I_ASP_Workflow, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_ASP_Workflow (Properties ctx, int ASP_Workflow_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset.java
index 4d633a2ebc..1f2abf5b66 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for A_Asset
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Asset extends PO implements I_A_Asset, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Asset (Properties ctx, int A_Asset_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Acct.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Acct.java
index f8e5752fb4..33bebdf396 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Acct.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Asset_Acct extends PO implements I_A_Asset_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Asset_Acct (Properties ctx, int A_Asset_Acct_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Addition.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Addition.java
index 734497572b..763d35afac 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Addition.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Addition.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Addition
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Asset_Addition extends PO implements I_A_Asset_Addition, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Asset_Addition (Properties ctx, int A_Asset_Addition_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Change.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Change.java
index f990bc11ff..5a0d961e2c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Change.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Change.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Change
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Asset_Change extends PO implements I_A_Asset_Change, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Asset_Change (Properties ctx, int A_Asset_Change_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Class.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Class.java
index 02928b4119..d1f8cfc16a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Class.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Class.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for A_Asset_Class
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Asset_Class extends PO implements I_A_Asset_Class, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Asset_Class (Properties ctx, int A_Asset_Class_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Delivery.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Delivery.java
index 092f4e0141..aaf1aac23c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Delivery.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Delivery.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Delivery
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Asset_Delivery extends PO implements I_A_Asset_Delivery, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Asset_Delivery (Properties ctx, int A_Asset_Delivery_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Disposed.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Disposed.java
index 5ed1af3f58..e22f75dbb9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Disposed.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Disposed.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Disposed
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Asset_Disposed extends PO implements I_A_Asset_Disposed, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Asset_Disposed (Properties ctx, int A_Asset_Disposed_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Group.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Group.java
index 40ee554af9..5fa630d5bc 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Group.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Group.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Group
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Asset_Group extends PO implements I_A_Asset_Group, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Asset_Group (Properties ctx, int A_Asset_Group_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Group_Acct.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Group_Acct.java
index 2280c9c8a7..66f92236fa 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Group_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Group_Acct.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Group_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Asset_Group_Acct extends PO implements I_A_Asset_Group_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Asset_Group_Acct (Properties ctx, int A_Asset_Group_Acct_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Fin.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Fin.java
index 0372691e53..fe1aaf5f91 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Fin.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Fin.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Info_Fin
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Asset_Info_Fin extends PO implements I_A_Asset_Info_Fin, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Asset_Info_Fin (Properties ctx, int A_Asset_Info_Fin_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Ins.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Ins.java
index c2df815982..8d56bc20ac 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Ins.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Ins.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Info_Ins
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Asset_Info_Ins extends PO implements I_A_Asset_Info_Ins, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Asset_Info_Ins (Properties ctx, int A_Asset_Info_Ins_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Lic.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Lic.java
index e4b628e999..68a848b205 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Lic.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Lic.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Info_Lic
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Asset_Info_Lic extends PO implements I_A_Asset_Info_Lic, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Asset_Info_Lic (Properties ctx, int A_Asset_Info_Lic_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Oth.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Oth.java
index 6dcd9640bc..7229599aac 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Oth.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Oth.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Info_Oth
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Asset_Info_Oth extends PO implements I_A_Asset_Info_Oth, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Asset_Info_Oth (Properties ctx, int A_Asset_Info_Oth_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Tax.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Tax.java
index 59e8b29c84..fc6286f6ca 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Tax.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Tax.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Info_Tax
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Asset_Info_Tax extends PO implements I_A_Asset_Info_Tax, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Asset_Info_Tax (Properties ctx, int A_Asset_Info_Tax_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Product.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Product.java
index 43c402fe5f..fa5565e88e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Product.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Product.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for A_Asset_Product
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Asset_Product extends PO implements I_A_Asset_Product, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Asset_Product (Properties ctx, int A_Asset_Product_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Retirement.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Retirement.java
index 5adb6df202..fc71abc92d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Retirement.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Retirement.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Retirement
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Asset_Retirement extends PO implements I_A_Asset_Retirement, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Asset_Retirement (Properties ctx, int A_Asset_Retirement_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Reval.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Reval.java
index 0d15cac48a..2c067bdde7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Reval.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Reval.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Reval
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Asset_Reval extends PO implements I_A_Asset_Reval, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Asset_Reval (Properties ctx, int A_Asset_Reval_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Reval_Entry.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Reval_Entry.java
index 88666a2479..e2bfc99f74 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Reval_Entry.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Reval_Entry.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Reval_Entry
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Asset_Reval_Entry extends PO implements I_A_Asset_Reval_Entry, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Asset_Reval_Entry (Properties ctx, int A_Asset_Reval_Entry_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Reval_Index.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Reval_Index.java
index d69c72d097..bdf17ddbf3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Reval_Index.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Reval_Index.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Reval_Index
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Asset_Reval_Index extends PO implements I_A_Asset_Reval_Index, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Asset_Reval_Index (Properties ctx, int A_Asset_Reval_Index_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Split.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Split.java
index 1ab214bc65..84ace0fa75 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Split.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Split.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Split
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Asset_Split extends PO implements I_A_Asset_Split, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Asset_Split (Properties ctx, int A_Asset_Split_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Spread.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Spread.java
index 70c6a4c38e..6320d49357 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Spread.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Spread.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Spread
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Asset_Spread extends PO implements I_A_Asset_Spread, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Asset_Spread (Properties ctx, int A_Asset_Spread_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Transfer.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Transfer.java
index 3b70ed2353..df3b98d945 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Transfer.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Transfer.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Transfer
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Asset_Transfer extends PO implements I_A_Asset_Transfer, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Asset_Transfer (Properties ctx, int A_Asset_Transfer_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Type.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Type.java
index 948709ed21..ff22ae74fe 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Type.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Type.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Type
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Asset_Type extends PO implements I_A_Asset_Type, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Asset_Type (Properties ctx, int A_Asset_Type_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Use.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Use.java
index 2bbec7553b..92f8f1fd64 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Use.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Use.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Use
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Asset_Use extends PO implements I_A_Asset_Use, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Asset_Use (Properties ctx, int A_Asset_Use_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation.java
index 7c9e3deef6..486e4f1f7c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for A_Depreciation
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Depreciation extends PO implements I_A_Depreciation, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Depreciation (Properties ctx, int A_Depreciation_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Build.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Build.java
index 2bfce6c0ce..14a20acf80 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Build.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Build.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Depreciation_Build
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Depreciation_Build extends PO implements I_A_Depreciation_Build, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Depreciation_Build (Properties ctx, int A_Depreciation_Build_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Convention.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Convention.java
index 36d72f15ad..197579a7f3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Convention.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Convention.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for A_Depreciation_Convention
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Depreciation_Convention extends PO implements I_A_Depreciation_Convention, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Depreciation_Convention (Properties ctx, int A_Depreciation_Convention_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Entry.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Entry.java
index 7a2a9d59c2..0a0b0845e6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Entry.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Entry.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Depreciation_Entry
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Depreciation_Entry extends PO implements I_A_Depreciation_Entry, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Depreciation_Entry (Properties ctx, int A_Depreciation_Entry_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Exp.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Exp.java
index e283ac618a..26517c9126 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Exp.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Exp.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Depreciation_Exp
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Depreciation_Exp extends PO implements I_A_Depreciation_Exp, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Depreciation_Exp (Properties ctx, int A_Depreciation_Exp_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Forecast.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Forecast.java
index 52fa5b6db4..2ff65c3787 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Forecast.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Forecast.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Depreciation_Forecast
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Depreciation_Forecast extends PO implements I_A_Depreciation_Forecast, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Depreciation_Forecast (Properties ctx, int A_Depreciation_Forecast_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Method.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Method.java
index 3c06084d42..82b7171d14 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Method.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Method.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Depreciation_Method
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Depreciation_Method extends PO implements I_A_Depreciation_Method, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Depreciation_Method (Properties ctx, int A_Depreciation_Method_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Table_Detail.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Table_Detail.java
index c2c4f6a56c..05d6bdbe5a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Table_Detail.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Table_Detail.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Depreciation_Table_Detail
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Depreciation_Table_Detail extends PO implements I_A_Depreciation_Table_Detail, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Depreciation_Table_Detail (Properties ctx, int A_Depreciation_Table_Detail_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Table_Header.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Table_Header.java
index 0bc23afacc..1b1a94f57b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Table_Header.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Table_Header.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Depreciation_Table_Header
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Depreciation_Table_Header extends PO implements I_A_Depreciation_Table_Header, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Depreciation_Table_Header (Properties ctx, int A_Depreciation_Table_Header_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Workfile.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Workfile.java
index 16d97c12d6..38fc9ba009 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Workfile.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Workfile.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Depreciation_Workfile
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Depreciation_Workfile extends PO implements I_A_Depreciation_Workfile, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Depreciation_Workfile (Properties ctx, int A_Depreciation_Workfile_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_FundingMode.java b/org.adempiere.base/src/org/compiere/model/X_A_FundingMode.java
index 0f25b8d8a6..08be981d8b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_FundingMode.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_FundingMode.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_FundingMode
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_FundingMode extends PO implements I_A_FundingMode, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_FundingMode (Properties ctx, int A_FundingMode_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_FundingMode_Acct.java b/org.adempiere.base/src/org/compiere/model/X_A_FundingMode_Acct.java
index 0c9c0f0838..62dc5b0b2b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_FundingMode_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_FundingMode_Acct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for A_FundingMode_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_FundingMode_Acct extends PO implements I_A_FundingMode_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_FundingMode_Acct (Properties ctx, int A_FundingMode_Acct_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Registration.java b/org.adempiere.base/src/org/compiere/model/X_A_Registration.java
index f3123ef939..61b8721c3b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Registration.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Registration.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Registration
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_Registration extends PO implements I_A_Registration, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_Registration (Properties ctx, int A_Registration_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_RegistrationAttribute.java b/org.adempiere.base/src/org/compiere/model/X_A_RegistrationAttribute.java
index 8bd9b5510b..13aef64c47 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_RegistrationAttribute.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_RegistrationAttribute.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_RegistrationAttribute
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_RegistrationAttribute extends PO implements I_A_RegistrationAttribute, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_RegistrationAttribute (Properties ctx, int A_RegistrationAttribute_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_RegistrationProduct.java b/org.adempiere.base/src/org/compiere/model/X_A_RegistrationProduct.java
index 750b9c82a9..24a406e853 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_RegistrationProduct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_RegistrationProduct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for A_RegistrationProduct
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_RegistrationProduct extends PO implements I_A_RegistrationProduct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_RegistrationProduct (Properties ctx, int A_RegistrationProduct_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_RegistrationValue.java b/org.adempiere.base/src/org/compiere/model/X_A_RegistrationValue.java
index a748be49e4..51937fc1f8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_RegistrationValue.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_RegistrationValue.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_RegistrationValue
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_A_RegistrationValue extends PO implements I_A_RegistrationValue, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_A_RegistrationValue (Properties ctx, int A_RegistrationValue_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_B_Bid.java b/org.adempiere.base/src/org/compiere/model/X_B_Bid.java
index d927a57258..3c107a2617 100644
--- a/org.adempiere.base/src/org/compiere/model/X_B_Bid.java
+++ b/org.adempiere.base/src/org/compiere/model/X_B_Bid.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for B_Bid
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_B_Bid extends PO implements I_B_Bid, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_B_Bid (Properties ctx, int B_Bid_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_B_BidComment.java b/org.adempiere.base/src/org/compiere/model/X_B_BidComment.java
index 0c3ea8d75a..5b2f8332be 100644
--- a/org.adempiere.base/src/org/compiere/model/X_B_BidComment.java
+++ b/org.adempiere.base/src/org/compiere/model/X_B_BidComment.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for B_BidComment
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_B_BidComment extends PO implements I_B_BidComment, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_B_BidComment (Properties ctx, int B_BidComment_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_B_Buyer.java b/org.adempiere.base/src/org/compiere/model/X_B_Buyer.java
index f5963f3509..143c7ce31b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_B_Buyer.java
+++ b/org.adempiere.base/src/org/compiere/model/X_B_Buyer.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for B_Buyer
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_B_Buyer extends PO implements I_B_Buyer, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_B_Buyer (Properties ctx, int B_Buyer_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_B_BuyerFunds.java b/org.adempiere.base/src/org/compiere/model/X_B_BuyerFunds.java
index ae6b1b3b54..4962f6b0c2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_B_BuyerFunds.java
+++ b/org.adempiere.base/src/org/compiere/model/X_B_BuyerFunds.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for B_BuyerFunds
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_B_BuyerFunds extends PO implements I_B_BuyerFunds, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_B_BuyerFunds (Properties ctx, int B_BuyerFunds_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_B_Offer.java b/org.adempiere.base/src/org/compiere/model/X_B_Offer.java
index 6f70f00278..fcd5223883 100644
--- a/org.adempiere.base/src/org/compiere/model/X_B_Offer.java
+++ b/org.adempiere.base/src/org/compiere/model/X_B_Offer.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for B_Offer
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_B_Offer extends PO implements I_B_Offer, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_B_Offer (Properties ctx, int B_Offer_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_B_Seller.java b/org.adempiere.base/src/org/compiere/model/X_B_Seller.java
index dc998173a7..aecc8d7293 100644
--- a/org.adempiere.base/src/org/compiere/model/X_B_Seller.java
+++ b/org.adempiere.base/src/org/compiere/model/X_B_Seller.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for B_Seller
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_B_Seller extends PO implements I_B_Seller, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_B_Seller (Properties ctx, int B_Seller_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_B_SellerFunds.java b/org.adempiere.base/src/org/compiere/model/X_B_SellerFunds.java
index 3dfa6bfc38..efecdb049e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_B_SellerFunds.java
+++ b/org.adempiere.base/src/org/compiere/model/X_B_SellerFunds.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for B_SellerFunds
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_B_SellerFunds extends PO implements I_B_SellerFunds, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_B_SellerFunds (Properties ctx, int B_SellerFunds_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_B_Topic.java b/org.adempiere.base/src/org/compiere/model/X_B_Topic.java
index 4cacacb13f..9f86371e9e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_B_Topic.java
+++ b/org.adempiere.base/src/org/compiere/model/X_B_Topic.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for B_Topic
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_B_Topic extends PO implements I_B_Topic, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_B_Topic (Properties ctx, int B_Topic_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_B_TopicCategory.java b/org.adempiere.base/src/org/compiere/model/X_B_TopicCategory.java
index a44fbfc233..5e68af2b68 100644
--- a/org.adempiere.base/src/org/compiere/model/X_B_TopicCategory.java
+++ b/org.adempiere.base/src/org/compiere/model/X_B_TopicCategory.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for B_TopicCategory
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_B_TopicCategory extends PO implements I_B_TopicCategory, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_B_TopicCategory (Properties ctx, int B_TopicCategory_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_B_TopicType.java b/org.adempiere.base/src/org/compiere/model/X_B_TopicType.java
index e3dadc9aa5..7e04054140 100644
--- a/org.adempiere.base/src/org/compiere/model/X_B_TopicType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_B_TopicType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for B_TopicType
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_B_TopicType extends PO implements I_B_TopicType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_B_TopicType (Properties ctx, int B_TopicType_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_AccessContainer.java b/org.adempiere.base/src/org/compiere/model/X_CM_AccessContainer.java
index e0ff873896..6638cd3a35 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_AccessContainer.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_AccessContainer.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for CM_AccessContainer
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_AccessContainer extends PO implements I_CM_AccessContainer, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_AccessContainer (Properties ctx, int CM_AccessContainer_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_AccessListBPGroup.java b/org.adempiere.base/src/org/compiere/model/X_CM_AccessListBPGroup.java
index 08dee700cb..49e5e38ec5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_AccessListBPGroup.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_AccessListBPGroup.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for CM_AccessListBPGroup
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_AccessListBPGroup extends PO implements I_CM_AccessListBPGroup, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_AccessListBPGroup (Properties ctx, int CM_AccessListBPGroup_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_AccessListRole.java b/org.adempiere.base/src/org/compiere/model/X_CM_AccessListRole.java
index f6a4333541..69865a168b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_AccessListRole.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_AccessListRole.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for CM_AccessListRole
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_AccessListRole extends PO implements I_CM_AccessListRole, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_AccessListRole (Properties ctx, int CM_AccessListRole_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_AccessMedia.java b/org.adempiere.base/src/org/compiere/model/X_CM_AccessMedia.java
index ed12430932..f3c738dd29 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_AccessMedia.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_AccessMedia.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for CM_AccessMedia
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_AccessMedia extends PO implements I_CM_AccessMedia, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_AccessMedia (Properties ctx, int CM_AccessMedia_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_AccessNewsChannel.java b/org.adempiere.base/src/org/compiere/model/X_CM_AccessNewsChannel.java
index c1681f6f86..dc8f4e5523 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_AccessNewsChannel.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_AccessNewsChannel.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for CM_AccessNewsChannel
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_AccessNewsChannel extends PO implements I_CM_AccessNewsChannel, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_AccessNewsChannel (Properties ctx, int CM_AccessNewsChannel_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_AccessProfile.java b/org.adempiere.base/src/org/compiere/model/X_CM_AccessProfile.java
index 268a01ac2e..e08cf77452 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_AccessProfile.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_AccessProfile.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_AccessProfile
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_AccessProfile extends PO implements I_CM_AccessProfile, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_AccessProfile (Properties ctx, int CM_AccessProfile_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_AccessStage.java b/org.adempiere.base/src/org/compiere/model/X_CM_AccessStage.java
index 06b7fd1a34..51b693248e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_AccessStage.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_AccessStage.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for CM_AccessStage
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_AccessStage extends PO implements I_CM_AccessStage, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_AccessStage (Properties ctx, int CM_AccessStage_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_Ad.java b/org.adempiere.base/src/org/compiere/model/X_CM_Ad.java
index 9b1207febd..c97e762a42 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_Ad.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_Ad.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_Ad
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_Ad extends PO implements I_CM_Ad, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_Ad (Properties ctx, int CM_Ad_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_Ad_Cat.java b/org.adempiere.base/src/org/compiere/model/X_CM_Ad_Cat.java
index 942419d13e..0f03fc6294 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_Ad_Cat.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_Ad_Cat.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_Ad_Cat
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_Ad_Cat extends PO implements I_CM_Ad_Cat, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_Ad_Cat (Properties ctx, int CM_Ad_Cat_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_BroadcastServer.java b/org.adempiere.base/src/org/compiere/model/X_CM_BroadcastServer.java
index 72d4de3ea9..ad2851188c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_BroadcastServer.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_BroadcastServer.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_BroadcastServer
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_BroadcastServer extends PO implements I_CM_BroadcastServer, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_BroadcastServer (Properties ctx, int CM_BroadcastServer_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_CStage.java b/org.adempiere.base/src/org/compiere/model/X_CM_CStage.java
index 139824bdce..c7dbe70955 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_CStage.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_CStage.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_CStage
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_CStage extends PO implements I_CM_CStage, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_CStage (Properties ctx, int CM_CStage_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_CStageTTable.java b/org.adempiere.base/src/org/compiere/model/X_CM_CStageTTable.java
index 01b65a9aaa..7aee589c1a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_CStageTTable.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_CStageTTable.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_CStageTTable
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_CStageTTable extends PO implements I_CM_CStageTTable, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_CStageTTable (Properties ctx, int CM_CStageTTable_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_CStage_Element.java b/org.adempiere.base/src/org/compiere/model/X_CM_CStage_Element.java
index 5e14e764d6..be2347fb11 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_CStage_Element.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_CStage_Element.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_CStage_Element
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_CStage_Element extends PO implements I_CM_CStage_Element, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_CStage_Element (Properties ctx, int CM_CStage_Element_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_Chat.java b/org.adempiere.base/src/org/compiere/model/X_CM_Chat.java
index 84475c3f7a..d782cbc412 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_Chat.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_Chat.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_Chat
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_Chat extends PO implements I_CM_Chat, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_Chat (Properties ctx, int CM_Chat_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_ChatEntry.java b/org.adempiere.base/src/org/compiere/model/X_CM_ChatEntry.java
index ace0f9ce3c..4b736caffc 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_ChatEntry.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_ChatEntry.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_ChatEntry
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_ChatEntry extends PO implements I_CM_ChatEntry, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_ChatEntry (Properties ctx, int CM_ChatEntry_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_ChatType.java b/org.adempiere.base/src/org/compiere/model/X_CM_ChatType.java
index 2ec0729401..0334403242 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_ChatType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_ChatType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_ChatType
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_ChatType extends PO implements I_CM_ChatType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_ChatType (Properties ctx, int CM_ChatType_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_ChatTypeUpdate.java b/org.adempiere.base/src/org/compiere/model/X_CM_ChatTypeUpdate.java
index a819746ba2..13db20d85e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_ChatTypeUpdate.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_ChatTypeUpdate.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for CM_ChatTypeUpdate
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_ChatTypeUpdate extends PO implements I_CM_ChatTypeUpdate, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_ChatTypeUpdate (Properties ctx, int CM_ChatTypeUpdate_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_ChatUpdate.java b/org.adempiere.base/src/org/compiere/model/X_CM_ChatUpdate.java
index 38419a5041..e1adf19110 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_ChatUpdate.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_ChatUpdate.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for CM_ChatUpdate
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_ChatUpdate extends PO implements I_CM_ChatUpdate, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_ChatUpdate (Properties ctx, int CM_ChatUpdate_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_Container.java b/org.adempiere.base/src/org/compiere/model/X_CM_Container.java
index 6f88e64a31..c413a3a962 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_Container.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_Container.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_Container
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_Container extends PO implements I_CM_Container, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_Container (Properties ctx, int CM_Container_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_ContainerTTable.java b/org.adempiere.base/src/org/compiere/model/X_CM_ContainerTTable.java
index 74ea1a84a5..95e4736558 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_ContainerTTable.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_ContainerTTable.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_ContainerTTable
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_ContainerTTable extends PO implements I_CM_ContainerTTable, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_ContainerTTable (Properties ctx, int CM_ContainerTTable_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_Container_Element.java b/org.adempiere.base/src/org/compiere/model/X_CM_Container_Element.java
index cb2f2ce6a0..4523ace80c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_Container_Element.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_Container_Element.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_Container_Element
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_Container_Element extends PO implements I_CM_Container_Element, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_Container_Element (Properties ctx, int CM_Container_Element_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_Container_URL.java b/org.adempiere.base/src/org/compiere/model/X_CM_Container_URL.java
index 96a91f06d2..e4ba36d0ef 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_Container_URL.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_Container_URL.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for CM_Container_URL
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_Container_URL extends PO implements I_CM_Container_URL, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_Container_URL (Properties ctx, int CM_Container_URL_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_Media.java b/org.adempiere.base/src/org/compiere/model/X_CM_Media.java
index 183ad6ff7e..4491c8c0b7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_Media.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_Media.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_Media
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_Media extends PO implements I_CM_Media, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_Media (Properties ctx, int CM_Media_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_MediaDeploy.java b/org.adempiere.base/src/org/compiere/model/X_CM_MediaDeploy.java
index 60ff14122e..2cf7a6eb77 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_MediaDeploy.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_MediaDeploy.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for CM_MediaDeploy
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_MediaDeploy extends PO implements I_CM_MediaDeploy, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_MediaDeploy (Properties ctx, int CM_MediaDeploy_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_Media_Server.java b/org.adempiere.base/src/org/compiere/model/X_CM_Media_Server.java
index fa62bcf83f..afbee399fd 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_Media_Server.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_Media_Server.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_Media_Server
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_Media_Server extends PO implements I_CM_Media_Server, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_Media_Server (Properties ctx, int CM_Media_Server_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_NewsChannel.java b/org.adempiere.base/src/org/compiere/model/X_CM_NewsChannel.java
index 6767993315..5ac7d685fc 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_NewsChannel.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_NewsChannel.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_NewsChannel
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_NewsChannel extends PO implements I_CM_NewsChannel, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_NewsChannel (Properties ctx, int CM_NewsChannel_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_NewsItem.java b/org.adempiere.base/src/org/compiere/model/X_CM_NewsItem.java
index f36fa00f94..5476004d39 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_NewsItem.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_NewsItem.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for CM_NewsItem
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_NewsItem extends PO implements I_CM_NewsItem, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_NewsItem (Properties ctx, int CM_NewsItem_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_Template.java b/org.adempiere.base/src/org/compiere/model/X_CM_Template.java
index 7f8b6a392e..b26e266aef 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_Template.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_Template.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_Template
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_Template extends PO implements I_CM_Template, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_Template (Properties ctx, int CM_Template_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_TemplateTable.java b/org.adempiere.base/src/org/compiere/model/X_CM_TemplateTable.java
index 54ea792e53..3351b39662 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_TemplateTable.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_TemplateTable.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_TemplateTable
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_TemplateTable extends PO implements I_CM_TemplateTable, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_TemplateTable (Properties ctx, int CM_TemplateTable_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_Template_Ad_Cat.java b/org.adempiere.base/src/org/compiere/model/X_CM_Template_Ad_Cat.java
index 673697ef6d..02419889e3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_Template_Ad_Cat.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_Template_Ad_Cat.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_Template_Ad_Cat
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_Template_Ad_Cat extends PO implements I_CM_Template_Ad_Cat, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_Template_Ad_Cat (Properties ctx, int CM_Template_Ad_Cat_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_WebAccessLog.java b/org.adempiere.base/src/org/compiere/model/X_CM_WebAccessLog.java
index 62c48d4ad3..15d8158dc4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_WebAccessLog.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_WebAccessLog.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for CM_WebAccessLog
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_WebAccessLog extends PO implements I_CM_WebAccessLog, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_WebAccessLog (Properties ctx, int CM_WebAccessLog_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_WebProject.java b/org.adempiere.base/src/org/compiere/model/X_CM_WebProject.java
index 98ff753e68..ca60bf3bc7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_WebProject.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_WebProject.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_WebProject
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_WebProject extends PO implements I_CM_WebProject, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_WebProject (Properties ctx, int CM_WebProject_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_WebProject_Domain.java b/org.adempiere.base/src/org/compiere/model/X_CM_WebProject_Domain.java
index 1c86af90d2..933d664ce7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_WebProject_Domain.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_WebProject_Domain.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_WebProject_Domain
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_WebProject_Domain extends PO implements I_CM_WebProject_Domain, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_WebProject_Domain (Properties ctx, int CM_WebProject_Domain_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_WikiToken.java b/org.adempiere.base/src/org/compiere/model/X_CM_WikiToken.java
index 51709ad29a..59145b7fd6 100755
--- a/org.adempiere.base/src/org/compiere/model/X_CM_WikiToken.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_WikiToken.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_WikiToken
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_CM_WikiToken extends PO implements I_CM_WikiToken, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_CM_WikiToken (Properties ctx, int CM_WikiToken_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_1099Box.java b/org.adempiere.base/src/org/compiere/model/X_C_1099Box.java
index 213acdae0e..2b420fc795 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_1099Box.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_1099Box.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_1099Box
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_1099Box extends PO implements I_C_1099Box, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_1099Box (Properties ctx, int C_1099Box_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_AcctProcessor.java b/org.adempiere.base/src/org/compiere/model/X_C_AcctProcessor.java
index b71d8cb0e8..b0bcc7ff32 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_AcctProcessor.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_AcctProcessor.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_AcctProcessor
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_AcctProcessor extends PO implements I_C_AcctProcessor, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_AcctProcessor (Properties ctx, int C_AcctProcessor_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_AcctProcessorLog.java b/org.adempiere.base/src/org/compiere/model/X_C_AcctProcessorLog.java
index 20e875ed5c..fffeb5d12a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_AcctProcessorLog.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_AcctProcessorLog.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_AcctProcessorLog
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_AcctProcessorLog extends PO implements I_C_AcctProcessorLog, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_AcctProcessorLog (Properties ctx, int C_AcctProcessorLog_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema.java b/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema.java
index 245e1d73e8..40531862b2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_AcctSchema
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_AcctSchema extends PO implements I_C_AcctSchema, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_AcctSchema (Properties ctx, int C_AcctSchema_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_Default.java b/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_Default.java
index d4f13131eb..83b33c0fe1 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_Default.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_Default.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_AcctSchema_Default
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_AcctSchema_Default (Properties ctx, int C_AcctSchema_Default_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_Element.java b/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_Element.java
index b3de7f0ec5..dcf56e1ada 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_Element.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_Element.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_AcctSchema_Element
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_AcctSchema_Element extends PO implements I_C_AcctSchema_Element, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_AcctSchema_Element (Properties ctx, int C_AcctSchema_Element_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_GL.java b/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_GL.java
index 3be4ab05f5..9df79a768c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_GL.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_GL.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_AcctSchema_GL
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_AcctSchema_GL extends PO implements I_C_AcctSchema_GL, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_AcctSchema_GL (Properties ctx, int C_AcctSchema_GL_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Activity.java b/org.adempiere.base/src/org/compiere/model/X_C_Activity.java
index f7adf94627..8dfda4866a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Activity.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Activity.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Activity
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Activity extends PO implements I_C_Activity, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Activity (Properties ctx, int C_Activity_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_AddressTransaction.java b/org.adempiere.base/src/org/compiere/model/X_C_AddressTransaction.java
index ffe8fd5cf6..ed57a5b608 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_AddressTransaction.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_AddressTransaction.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_AddressTransaction
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_AddressTransaction extends PO implements I_C_AddressTransaction, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_AddressTransaction (Properties ctx, int C_AddressTransaction_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_AddressValidation.java b/org.adempiere.base/src/org/compiere/model/X_C_AddressValidation.java
index 2f71abe670..886e487576 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_AddressValidation.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_AddressValidation.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_AddressValidation
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_AddressValidation extends PO implements I_C_AddressValidation, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_AddressValidation (Properties ctx, int C_AddressValidation_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_AddressValidationCfg.java b/org.adempiere.base/src/org/compiere/model/X_C_AddressValidationCfg.java
index 4b97d9cfe4..df78e2f93e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_AddressValidationCfg.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_AddressValidationCfg.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_AddressValidationCfg
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_AddressValidationCfg extends PO implements I_C_AddressValidationCfg, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_AddressValidationCfg (Properties ctx, int C_AddressValidationCfg_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_AllocationHdr.java b/org.adempiere.base/src/org/compiere/model/X_C_AllocationHdr.java
index 41a0afa913..bd9892ea5a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_AllocationHdr.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_AllocationHdr.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_AllocationHdr
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_AllocationHdr extends PO implements I_C_AllocationHdr, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_AllocationHdr (Properties ctx, int C_AllocationHdr_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_AllocationLine.java b/org.adempiere.base/src/org/compiere/model/X_C_AllocationLine.java
index b9c4c30e07..c42edcf29a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_AllocationLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_AllocationLine.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_AllocationLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_AllocationLine extends PO implements I_C_AllocationLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_AllocationLine (Properties ctx, int C_AllocationLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BP_BankAccount.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_BankAccount.java
index 10bdc36244..d16852e80f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BP_BankAccount.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BP_BankAccount.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BP_BankAccount
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_BP_BankAccount extends PO implements I_C_BP_BankAccount, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_BP_BankAccount (Properties ctx, int C_BP_BankAccount_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BP_Customer_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_Customer_Acct.java
index 39e90fce2a..b1ac744d29 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BP_Customer_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BP_Customer_Acct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_BP_Customer_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_BP_Customer_Acct extends PO implements I_C_BP_Customer_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_BP_Customer_Acct (Properties ctx, int C_BP_Customer_Acct_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BP_EDI.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_EDI.java
index 4011d46f3c..75374df374 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BP_EDI.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BP_EDI.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BP_EDI
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_BP_EDI extends PO implements I_C_BP_EDI, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_BP_EDI (Properties ctx, int C_BP_EDI_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BP_Employee_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_Employee_Acct.java
index e06c44f291..63d884c4a0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BP_Employee_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BP_Employee_Acct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_BP_Employee_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_BP_Employee_Acct extends PO implements I_C_BP_Employee_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_BP_Employee_Acct (Properties ctx, int C_BP_Employee_Acct_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BP_Group.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_Group.java
index 6834e812e4..3c11d5a06c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BP_Group.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BP_Group.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BP_Group
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_BP_Group extends PO implements I_C_BP_Group, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_BP_Group (Properties ctx, int C_BP_Group_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BP_Group_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_Group_Acct.java
index 96eab4cbaa..8263813459 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BP_Group_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BP_Group_Acct.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BP_Group_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_BP_Group_Acct extends PO implements I_C_BP_Group_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_BP_Group_Acct (Properties ctx, int C_BP_Group_Acct_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BP_Relation.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_Relation.java
index c272cd3f0a..5d708ab208 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BP_Relation.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BP_Relation.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BP_Relation
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_BP_Relation extends PO implements I_C_BP_Relation, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_BP_Relation (Properties ctx, int C_BP_Relation_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BP_ShippingAcct.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_ShippingAcct.java
index ebe736a2e3..dd3258a12d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BP_ShippingAcct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BP_ShippingAcct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_BP_ShippingAcct
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_BP_ShippingAcct extends PO implements I_C_BP_ShippingAcct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_BP_ShippingAcct (Properties ctx, int C_BP_ShippingAcct_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BP_Vendor_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_Vendor_Acct.java
index f8db6102d8..73269ba384 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BP_Vendor_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BP_Vendor_Acct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_BP_Vendor_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_BP_Vendor_Acct extends PO implements I_C_BP_Vendor_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_BP_Vendor_Acct (Properties ctx, int C_BP_Vendor_Acct_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BP_Withholding.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_Withholding.java
index 99bfef0814..3b5bfc6301 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BP_Withholding.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BP_Withholding.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BP_Withholding
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_BP_Withholding extends PO implements I_C_BP_Withholding, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_BP_Withholding (Properties ctx, int C_BP_Withholding_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BPartner.java b/org.adempiere.base/src/org/compiere/model/X_C_BPartner.java
index d93d071ea4..b5666c7f08 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BPartner.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BPartner.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BPartner
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_BPartner extends PO implements I_C_BPartner, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_BPartner (Properties ctx, int C_BPartner_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BPartner_Location.java b/org.adempiere.base/src/org/compiere/model/X_C_BPartner_Location.java
index 096cc3bff8..0d584f34fd 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BPartner_Location.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BPartner_Location.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BPartner_Location
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_BPartner_Location extends PO implements I_C_BPartner_Location, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171211L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_BPartner_Location (Properties ctx, int C_BPartner_Location_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BPartner_Product.java b/org.adempiere.base/src/org/compiere/model/X_C_BPartner_Product.java
index a05af3d081..c57fc9cdc8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BPartner_Product.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BPartner_Product.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for C_BPartner_Product
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_BPartner_Product extends PO implements I_C_BPartner_Product, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_BPartner_Product (Properties ctx, int C_BPartner_Product_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Bank.java b/org.adempiere.base/src/org/compiere/model/X_C_Bank.java
index f004ac932f..eb348fe17e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Bank.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Bank.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Bank
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Bank extends PO implements I_C_Bank, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Bank (Properties ctx, int C_Bank_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BankAccount.java b/org.adempiere.base/src/org/compiere/model/X_C_BankAccount.java
index df84db31cf..37addb0808 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BankAccount.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BankAccount.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BankAccount
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_BankAccount extends PO implements I_C_BankAccount, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_BankAccount (Properties ctx, int C_BankAccount_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BankAccountDoc.java b/org.adempiere.base/src/org/compiere/model/X_C_BankAccountDoc.java
index fa68dd0fa3..32b5c3d431 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BankAccountDoc.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BankAccountDoc.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BankAccountDoc
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_BankAccountDoc extends PO implements I_C_BankAccountDoc, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_BankAccountDoc (Properties ctx, int C_BankAccountDoc_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BankAccount_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_BankAccount_Acct.java
index 0090219907..f40c199bde 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BankAccount_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BankAccount_Acct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_BankAccount_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_BankAccount_Acct extends PO implements I_C_BankAccount_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_BankAccount_Acct (Properties ctx, int C_BankAccount_Acct_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BankAccount_Processor.java b/org.adempiere.base/src/org/compiere/model/X_C_BankAccount_Processor.java
index 4b40f91d6c..6844314481 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BankAccount_Processor.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BankAccount_Processor.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for C_BankAccount_Processor
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_BankAccount_Processor extends PO implements I_C_BankAccount_Processor, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_BankAccount_Processor (Properties ctx, int C_BankAccount_Processor_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BankStatement.java b/org.adempiere.base/src/org/compiere/model/X_C_BankStatement.java
index 1f3318747f..86d0b5b3e8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BankStatement.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BankStatement.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BankStatement
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_BankStatement extends PO implements I_C_BankStatement, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_BankStatement (Properties ctx, int C_BankStatement_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BankStatementLine.java b/org.adempiere.base/src/org/compiere/model/X_C_BankStatementLine.java
index 1fc22f0d26..2ba012b442 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BankStatementLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BankStatementLine.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BankStatementLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_BankStatementLine extends PO implements I_C_BankStatementLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_BankStatementLine (Properties ctx, int C_BankStatementLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BankStatementLoader.java b/org.adempiere.base/src/org/compiere/model/X_C_BankStatementLoader.java
index d4e4060085..f6fffcfe70 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BankStatementLoader.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BankStatementLoader.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BankStatementLoader
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_BankStatementLoader extends PO implements I_C_BankStatementLoader, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_BankStatementLoader (Properties ctx, int C_BankStatementLoader_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BankStatementMatcher.java b/org.adempiere.base/src/org/compiere/model/X_C_BankStatementMatcher.java
index ef481a8b07..ad82272afe 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BankStatementMatcher.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BankStatementMatcher.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BankStatementMatcher
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_BankStatementMatcher extends PO implements I_C_BankStatementMatcher, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_BankStatementMatcher (Properties ctx, int C_BankStatementMatcher_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Calendar.java b/org.adempiere.base/src/org/compiere/model/X_C_Calendar.java
index 3e18db84c5..034b854562 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Calendar.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Calendar.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Calendar
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Calendar extends PO implements I_C_Calendar, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Calendar (Properties ctx, int C_Calendar_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Campaign.java b/org.adempiere.base/src/org/compiere/model/X_C_Campaign.java
index 7e679affd5..e03602b671 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Campaign.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Campaign.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Campaign
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Campaign extends PO implements I_C_Campaign, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Campaign (Properties ctx, int C_Campaign_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Cash.java b/org.adempiere.base/src/org/compiere/model/X_C_Cash.java
index 2643e92571..6b87561583 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Cash.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Cash.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Cash
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Cash extends PO implements I_C_Cash, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Cash (Properties ctx, int C_Cash_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_CashBook.java b/org.adempiere.base/src/org/compiere/model/X_C_CashBook.java
index 385bc8240b..657bd67e1b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_CashBook.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_CashBook.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_CashBook
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_CashBook extends PO implements I_C_CashBook, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_CashBook (Properties ctx, int C_CashBook_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_CashBook_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_CashBook_Acct.java
index 28169b6088..cb6b4b5301 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_CashBook_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_CashBook_Acct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_CashBook_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_CashBook_Acct extends PO implements I_C_CashBook_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_CashBook_Acct (Properties ctx, int C_CashBook_Acct_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_CashLine.java b/org.adempiere.base/src/org/compiere/model/X_C_CashLine.java
index e04351a68f..3ea3a2ca38 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_CashLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_CashLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_CashLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_CashLine extends PO implements I_C_CashLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_CashLine (Properties ctx, int C_CashLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_CashPlan.java b/org.adempiere.base/src/org/compiere/model/X_C_CashPlan.java
index dd4bae7c1e..813387eb6c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_CashPlan.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_CashPlan.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_CashPlan
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_CashPlan extends PO implements I_C_CashPlan, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_CashPlan (Properties ctx, int C_CashPlan_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_CashPlanLine.java b/org.adempiere.base/src/org/compiere/model/X_C_CashPlanLine.java
index f748df0389..6c1fe9d1e2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_CashPlanLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_CashPlanLine.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_CashPlanLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_CashPlanLine extends PO implements I_C_CashPlanLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_CashPlanLine (Properties ctx, int C_CashPlanLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Channel.java b/org.adempiere.base/src/org/compiere/model/X_C_Channel.java
index e8c7cf371e..9355976fde 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Channel.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Channel.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Channel
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Channel extends PO implements I_C_Channel, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Channel (Properties ctx, int C_Channel_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Charge.java b/org.adempiere.base/src/org/compiere/model/X_C_Charge.java
index 380d6baf6d..742740cfda 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Charge.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Charge.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Charge
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Charge extends PO implements I_C_Charge, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Charge (Properties ctx, int C_Charge_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_ChargeType.java b/org.adempiere.base/src/org/compiere/model/X_C_ChargeType.java
index 4116d29613..62c9a436d5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_ChargeType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_ChargeType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ChargeType
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_ChargeType extends PO implements I_C_ChargeType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_ChargeType (Properties ctx, int C_ChargeType_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_ChargeType_DocType.java b/org.adempiere.base/src/org/compiere/model/X_C_ChargeType_DocType.java
index 9a7150cfdf..d4f5a331eb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_ChargeType_DocType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_ChargeType_DocType.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_ChargeType_DocType
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_ChargeType_DocType extends PO implements I_C_ChargeType_DocType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_ChargeType_DocType (Properties ctx, int C_ChargeType_DocType_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Charge_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_Charge_Acct.java
index b71022fd22..746949e58e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Charge_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Charge_Acct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_Charge_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Charge_Acct extends PO implements I_C_Charge_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Charge_Acct (Properties ctx, int C_Charge_Acct_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_City.java b/org.adempiere.base/src/org/compiere/model/X_C_City.java
index 1738169fec..35231e5fe7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_City.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_City.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_City
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_City extends PO implements I_C_City, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_City (Properties ctx, int C_City_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Commission.java b/org.adempiere.base/src/org/compiere/model/X_C_Commission.java
index 789ca94a28..d0f41c57c4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Commission.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Commission.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Commission
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Commission extends PO implements I_C_Commission, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Commission (Properties ctx, int C_Commission_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_CommissionAmt.java b/org.adempiere.base/src/org/compiere/model/X_C_CommissionAmt.java
index c75793a8be..d15581a67d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_CommissionAmt.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_CommissionAmt.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_CommissionAmt
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_CommissionAmt extends PO implements I_C_CommissionAmt, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_CommissionAmt (Properties ctx, int C_CommissionAmt_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_CommissionDetail.java b/org.adempiere.base/src/org/compiere/model/X_C_CommissionDetail.java
index 651a29d331..868d633d03 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_CommissionDetail.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_CommissionDetail.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_CommissionDetail
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_CommissionDetail extends PO implements I_C_CommissionDetail, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_CommissionDetail (Properties ctx, int C_CommissionDetail_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_CommissionLine.java b/org.adempiere.base/src/org/compiere/model/X_C_CommissionLine.java
index af16f9edf4..9b51cda83a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_CommissionLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_CommissionLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_CommissionLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_CommissionLine extends PO implements I_C_CommissionLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_CommissionLine (Properties ctx, int C_CommissionLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_CommissionRun.java b/org.adempiere.base/src/org/compiere/model/X_C_CommissionRun.java
index 3a3936366f..0b01a776ff 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_CommissionRun.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_CommissionRun.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_CommissionRun
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_CommissionRun extends PO implements I_C_CommissionRun, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_CommissionRun (Properties ctx, int C_CommissionRun_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_ContactActivity.java b/org.adempiere.base/src/org/compiere/model/X_C_ContactActivity.java
index 7046bcf9db..6938fb494e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_ContactActivity.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_ContactActivity.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ContactActivity
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_ContactActivity extends PO implements I_C_ContactActivity, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_ContactActivity (Properties ctx, int C_ContactActivity_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_ConversionType.java b/org.adempiere.base/src/org/compiere/model/X_C_ConversionType.java
index b36aea03f1..0315b5caf3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_ConversionType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_ConversionType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ConversionType
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_ConversionType extends PO implements I_C_ConversionType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_ConversionType (Properties ctx, int C_ConversionType_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Conversion_Rate.java b/org.adempiere.base/src/org/compiere/model/X_C_Conversion_Rate.java
index 4247638951..2ae7ab81e8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Conversion_Rate.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Conversion_Rate.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Conversion_Rate
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Conversion_Rate extends PO implements I_C_Conversion_Rate, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Conversion_Rate (Properties ctx, int C_Conversion_Rate_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Country.java b/org.adempiere.base/src/org/compiere/model/X_C_Country.java
index 97b8e2eae8..1a8a7f71af 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Country.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Country.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Country
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Country extends PO implements I_C_Country, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20180217L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Country (Properties ctx, int C_Country_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_CountryGroup.java b/org.adempiere.base/src/org/compiere/model/X_C_CountryGroup.java
index 72525c6ea5..e38f135b51 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_CountryGroup.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_CountryGroup.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_CountryGroup
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_CountryGroup extends PO implements I_C_CountryGroup, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_CountryGroup (Properties ctx, int C_CountryGroup_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_CountryGroupCountry.java b/org.adempiere.base/src/org/compiere/model/X_C_CountryGroupCountry.java
index 60924d7fea..307da5f57b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_CountryGroupCountry.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_CountryGroupCountry.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for C_CountryGroupCountry
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_CountryGroupCountry extends PO implements I_C_CountryGroupCountry, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_CountryGroupCountry (Properties ctx, int C_CountryGroupCountry_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Currency.java b/org.adempiere.base/src/org/compiere/model/X_C_Currency.java
index 9cb9d0bf70..5b9e0f1a59 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Currency.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Currency.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Currency
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Currency extends PO implements I_C_Currency, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Currency (Properties ctx, int C_Currency_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Currency_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_Currency_Acct.java
index e0c187d1bc..119f9b7172 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Currency_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Currency_Acct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_Currency_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Currency_Acct extends PO implements I_C_Currency_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Currency_Acct (Properties ctx, int C_Currency_Acct_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Cycle.java b/org.adempiere.base/src/org/compiere/model/X_C_Cycle.java
index a70fb4bf38..55e2032039 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Cycle.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Cycle.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Cycle
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Cycle extends PO implements I_C_Cycle, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Cycle (Properties ctx, int C_Cycle_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_CyclePhase.java b/org.adempiere.base/src/org/compiere/model/X_C_CyclePhase.java
index 7b82669731..65a58c9619 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_CyclePhase.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_CyclePhase.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_CyclePhase
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_CyclePhase extends PO implements I_C_CyclePhase, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_CyclePhase (Properties ctx, int C_CyclePhase_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_CycleStep.java b/org.adempiere.base/src/org/compiere/model/X_C_CycleStep.java
index 78a2cb64ca..c20ee0416a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_CycleStep.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_CycleStep.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_CycleStep
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_CycleStep extends PO implements I_C_CycleStep, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_CycleStep (Properties ctx, int C_CycleStep_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_DepositBatch.java b/org.adempiere.base/src/org/compiere/model/X_C_DepositBatch.java
index b57831e965..4997cab473 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_DepositBatch.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_DepositBatch.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_DepositBatch
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_DepositBatch extends PO implements I_C_DepositBatch, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_DepositBatch (Properties ctx, int C_DepositBatch_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_DepositBatchLine.java b/org.adempiere.base/src/org/compiere/model/X_C_DepositBatchLine.java
index b7ea8bf25c..fad261ace6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_DepositBatchLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_DepositBatchLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_DepositBatchLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_DepositBatchLine extends PO implements I_C_DepositBatchLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_DepositBatchLine (Properties ctx, int C_DepositBatchLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_DocType.java b/org.adempiere.base/src/org/compiere/model/X_C_DocType.java
index fcf5e3791c..6a50759af6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_DocType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_DocType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_DocType
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_DocType extends PO implements I_C_DocType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_DocType (Properties ctx, int C_DocType_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_DocTypeCounter.java b/org.adempiere.base/src/org/compiere/model/X_C_DocTypeCounter.java
index 56c9ae921a..a041a390dd 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_DocTypeCounter.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_DocTypeCounter.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_DocTypeCounter
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_DocTypeCounter extends PO implements I_C_DocTypeCounter, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_DocTypeCounter (Properties ctx, int C_DocTypeCounter_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Dunning.java b/org.adempiere.base/src/org/compiere/model/X_C_Dunning.java
index 912b540741..bc1756f97f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Dunning.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Dunning.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Dunning
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Dunning extends PO implements I_C_Dunning, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Dunning (Properties ctx, int C_Dunning_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_DunningLevel.java b/org.adempiere.base/src/org/compiere/model/X_C_DunningLevel.java
index f01397697e..edb6fd9f09 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_DunningLevel.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_DunningLevel.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_DunningLevel
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_DunningLevel extends PO implements I_C_DunningLevel, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_DunningLevel (Properties ctx, int C_DunningLevel_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_DunningRun.java b/org.adempiere.base/src/org/compiere/model/X_C_DunningRun.java
index a95d9771c2..c0b56f1d4f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_DunningRun.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_DunningRun.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_DunningRun
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_DunningRun extends PO implements I_C_DunningRun, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_DunningRun (Properties ctx, int C_DunningRun_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_DunningRunEntry.java b/org.adempiere.base/src/org/compiere/model/X_C_DunningRunEntry.java
index 0838bbbe07..d7a0ca4c6d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_DunningRunEntry.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_DunningRunEntry.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_DunningRunEntry
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_DunningRunEntry extends PO implements I_C_DunningRunEntry, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_DunningRunEntry (Properties ctx, int C_DunningRunEntry_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_DunningRunLine.java b/org.adempiere.base/src/org/compiere/model/X_C_DunningRunLine.java
index 57848b8138..29ee05fc2f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_DunningRunLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_DunningRunLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_DunningRunLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_DunningRunLine extends PO implements I_C_DunningRunLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_DunningRunLine (Properties ctx, int C_DunningRunLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Element.java b/org.adempiere.base/src/org/compiere/model/X_C_Element.java
index 0b2d0ded88..482d320ea0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Element.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Element.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Element
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Element extends PO implements I_C_Element, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Element (Properties ctx, int C_Element_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_ElementValue.java b/org.adempiere.base/src/org/compiere/model/X_C_ElementValue.java
index f6ef69d6bd..0ef24daafb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_ElementValue.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_ElementValue.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ElementValue
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_ElementValue extends PO implements I_C_ElementValue, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_ElementValue (Properties ctx, int C_ElementValue_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Greeting.java b/org.adempiere.base/src/org/compiere/model/X_C_Greeting.java
index 577d05bae6..6b4a618b28 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Greeting.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Greeting.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Greeting
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Greeting extends PO implements I_C_Greeting, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Greeting (Properties ctx, int C_Greeting_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_InterOrg_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_InterOrg_Acct.java
index 94326f4d77..07b95406f2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_InterOrg_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_InterOrg_Acct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_InterOrg_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_InterOrg_Acct extends PO implements I_C_InterOrg_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_InterOrg_Acct (Properties ctx, int C_InterOrg_Acct_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Invoice.java b/org.adempiere.base/src/org/compiere/model/X_C_Invoice.java
index f170d71778..f5e26d7808 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Invoice.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Invoice.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Invoice
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Invoice extends PO implements I_C_Invoice, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Invoice (Properties ctx, int C_Invoice_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_InvoiceBatch.java b/org.adempiere.base/src/org/compiere/model/X_C_InvoiceBatch.java
index 3fc1b33edc..3741dd97a8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_InvoiceBatch.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_InvoiceBatch.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_InvoiceBatch
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_InvoiceBatch extends PO implements I_C_InvoiceBatch, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_InvoiceBatch (Properties ctx, int C_InvoiceBatch_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_InvoiceBatchLine.java b/org.adempiere.base/src/org/compiere/model/X_C_InvoiceBatchLine.java
index e2654b8cc3..fe35b945b8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_InvoiceBatchLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_InvoiceBatchLine.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_InvoiceBatchLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_InvoiceBatchLine extends PO implements I_C_InvoiceBatchLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_InvoiceBatchLine (Properties ctx, int C_InvoiceBatchLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_InvoiceLine.java b/org.adempiere.base/src/org/compiere/model/X_C_InvoiceLine.java
index b542ea9e4a..66661fe987 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_InvoiceLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_InvoiceLine.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_InvoiceLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_InvoiceLine extends PO implements I_C_InvoiceLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_InvoiceLine (Properties ctx, int C_InvoiceLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_InvoicePaySchedule.java b/org.adempiere.base/src/org/compiere/model/X_C_InvoicePaySchedule.java
index df8e26710d..c9265e5167 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_InvoicePaySchedule.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_InvoicePaySchedule.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_InvoicePaySchedule
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_InvoicePaySchedule extends PO implements I_C_InvoicePaySchedule, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_InvoicePaySchedule (Properties ctx, int C_InvoicePaySchedule_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_InvoiceSchedule.java b/org.adempiere.base/src/org/compiere/model/X_C_InvoiceSchedule.java
index 3b5c312be1..435aecbbc0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_InvoiceSchedule.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_InvoiceSchedule.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_InvoiceSchedule
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_InvoiceSchedule extends PO implements I_C_InvoiceSchedule, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_InvoiceSchedule (Properties ctx, int C_InvoiceSchedule_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_InvoiceTax.java b/org.adempiere.base/src/org/compiere/model/X_C_InvoiceTax.java
index 0dd9842125..c59913f0d8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_InvoiceTax.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_InvoiceTax.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for C_InvoiceTax
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_InvoiceTax extends PO implements I_C_InvoiceTax, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_InvoiceTax (Properties ctx, int C_InvoiceTax_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Job.java b/org.adempiere.base/src/org/compiere/model/X_C_Job.java
index 7cce16736c..fe9e8569d9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Job.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Job.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Job
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Job extends PO implements I_C_Job, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Job (Properties ctx, int C_Job_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_JobAssignment.java b/org.adempiere.base/src/org/compiere/model/X_C_JobAssignment.java
index 48e32e520b..d5b3865a12 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_JobAssignment.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_JobAssignment.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_JobAssignment
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_JobAssignment extends PO implements I_C_JobAssignment, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_JobAssignment (Properties ctx, int C_JobAssignment_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_JobCategory.java b/org.adempiere.base/src/org/compiere/model/X_C_JobCategory.java
index 93a5c3faa7..b942772f2c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_JobCategory.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_JobCategory.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_JobCategory
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_JobCategory extends PO implements I_C_JobCategory, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_JobCategory (Properties ctx, int C_JobCategory_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_JobRemuneration.java b/org.adempiere.base/src/org/compiere/model/X_C_JobRemuneration.java
index c5c7c5dfbe..4a25fb3dde 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_JobRemuneration.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_JobRemuneration.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_JobRemuneration
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_JobRemuneration extends PO implements I_C_JobRemuneration, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_JobRemuneration (Properties ctx, int C_JobRemuneration_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_LandedCost.java b/org.adempiere.base/src/org/compiere/model/X_C_LandedCost.java
index d4c7021957..49f28dd0af 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_LandedCost.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_LandedCost.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_LandedCost
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_LandedCost extends PO implements I_C_LandedCost, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_LandedCost (Properties ctx, int C_LandedCost_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_LandedCostAllocation.java b/org.adempiere.base/src/org/compiere/model/X_C_LandedCostAllocation.java
index d3c4f478c1..1b1d779643 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_LandedCostAllocation.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_LandedCostAllocation.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_LandedCostAllocation
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_LandedCostAllocation extends PO implements I_C_LandedCostAllocation, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_LandedCostAllocation (Properties ctx, int C_LandedCostAllocation_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Location.java b/org.adempiere.base/src/org/compiere/model/X_C_Location.java
index 72d1d91db7..36c1fa4350 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Location.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Location.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Location
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Location extends PO implements I_C_Location, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Location (Properties ctx, int C_Location_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_NonBusinessDay.java b/org.adempiere.base/src/org/compiere/model/X_C_NonBusinessDay.java
index 0c34463935..ace424e645 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_NonBusinessDay.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_NonBusinessDay.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_NonBusinessDay
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_NonBusinessDay extends PO implements I_C_NonBusinessDay, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_NonBusinessDay (Properties ctx, int C_NonBusinessDay_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_OnlineTrxHistory.java b/org.adempiere.base/src/org/compiere/model/X_C_OnlineTrxHistory.java
index 9fe1f00da5..fbede86774 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_OnlineTrxHistory.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_OnlineTrxHistory.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_OnlineTrxHistory
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_OnlineTrxHistory extends PO implements I_C_OnlineTrxHistory, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_OnlineTrxHistory (Properties ctx, int C_OnlineTrxHistory_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Opportunity.java b/org.adempiere.base/src/org/compiere/model/X_C_Opportunity.java
index d2d618c3a8..fd474e5bb7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Opportunity.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Opportunity.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Opportunity
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Opportunity extends PO implements I_C_Opportunity, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Opportunity (Properties ctx, int C_Opportunity_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Order.java b/org.adempiere.base/src/org/compiere/model/X_C_Order.java
index f3534bcfed..5561a005b6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Order.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Order.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Order
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Order extends PO implements I_C_Order, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Order (Properties ctx, int C_Order_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_OrderLandedCost.java b/org.adempiere.base/src/org/compiere/model/X_C_OrderLandedCost.java
index 706575ca73..e6260ea59e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_OrderLandedCost.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_OrderLandedCost.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for C_OrderLandedCost
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_OrderLandedCost extends PO implements I_C_OrderLandedCost, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_OrderLandedCost (Properties ctx, int C_OrderLandedCost_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_OrderLandedCostAllocation.java b/org.adempiere.base/src/org/compiere/model/X_C_OrderLandedCostAllocation.java
index e002987396..548d32e0c1 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_OrderLandedCostAllocation.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_OrderLandedCostAllocation.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for C_OrderLandedCostAllocation
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_OrderLandedCostAllocation extends PO implements I_C_OrderLandedCostAllocation, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_OrderLandedCostAllocation (Properties ctx, int C_OrderLandedCostAllocation_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_OrderLine.java b/org.adempiere.base/src/org/compiere/model/X_C_OrderLine.java
index 6bef414946..1ece89e1c9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_OrderLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_OrderLine.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_OrderLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_OrderLine extends PO implements I_C_OrderLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_OrderLine (Properties ctx, int C_OrderLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_OrderPaySchedule.java b/org.adempiere.base/src/org/compiere/model/X_C_OrderPaySchedule.java
index 97831a1522..b6eadc21da 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_OrderPaySchedule.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_OrderPaySchedule.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_OrderPaySchedule
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_OrderPaySchedule extends PO implements I_C_OrderPaySchedule, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_OrderPaySchedule (Properties ctx, int C_OrderPaySchedule_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_OrderSource.java b/org.adempiere.base/src/org/compiere/model/X_C_OrderSource.java
index 544d827db2..aec63136d4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_OrderSource.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_OrderSource.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_OrderSource
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_OrderSource extends PO implements I_C_OrderSource, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_OrderSource (Properties ctx, int C_OrderSource_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_OrderTax.java b/org.adempiere.base/src/org/compiere/model/X_C_OrderTax.java
index e43bdc1dda..160fc81f54 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_OrderTax.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_OrderTax.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for C_OrderTax
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_OrderTax extends PO implements I_C_OrderTax, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_OrderTax (Properties ctx, int C_OrderTax_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_OrgAssignment.java b/org.adempiere.base/src/org/compiere/model/X_C_OrgAssignment.java
index a403df6c7d..4f70764cb6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_OrgAssignment.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_OrgAssignment.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for C_OrgAssignment
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_OrgAssignment extends PO implements I_C_OrgAssignment, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_OrgAssignment (Properties ctx, int C_OrgAssignment_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_POS.java b/org.adempiere.base/src/org/compiere/model/X_C_POS.java
index 4f76e2de9e..ffdbd3a765 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_POS.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_POS.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_POS
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_POS extends PO implements I_C_POS, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_POS (Properties ctx, int C_POS_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_POSKey.java b/org.adempiere.base/src/org/compiere/model/X_C_POSKey.java
index 2e12311efe..698b2e7937 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_POSKey.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_POSKey.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_POSKey
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_POSKey extends PO implements I_C_POSKey, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_POSKey (Properties ctx, int C_POSKey_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_POSKeyLayout.java b/org.adempiere.base/src/org/compiere/model/X_C_POSKeyLayout.java
index 8d853efc1d..3876fa1943 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_POSKeyLayout.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_POSKeyLayout.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_POSKeyLayout
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_POSKeyLayout extends PO implements I_C_POSKeyLayout, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_POSKeyLayout (Properties ctx, int C_POSKeyLayout_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_POSPayment.java b/org.adempiere.base/src/org/compiere/model/X_C_POSPayment.java
index 3ccdd275c0..3775ef0aee 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_POSPayment.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_POSPayment.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for C_POSPayment
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_POSPayment extends PO implements I_C_POSPayment, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_POSPayment (Properties ctx, int C_POSPayment_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_POSTenderType.java b/org.adempiere.base/src/org/compiere/model/X_C_POSTenderType.java
index c2bd54a581..adadc428d0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_POSTenderType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_POSTenderType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_POSTenderType
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_POSTenderType extends PO implements I_C_POSTenderType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_POSTenderType (Properties ctx, int C_POSTenderType_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_PaySchedule.java b/org.adempiere.base/src/org/compiere/model/X_C_PaySchedule.java
index 70ce39524b..73ab4ecef5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_PaySchedule.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_PaySchedule.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_PaySchedule
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_PaySchedule extends PO implements I_C_PaySchedule, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_PaySchedule (Properties ctx, int C_PaySchedule_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_PaySelection.java b/org.adempiere.base/src/org/compiere/model/X_C_PaySelection.java
index 2fc788f4fb..3bad2f3051 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_PaySelection.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_PaySelection.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_PaySelection
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_PaySelection extends PO implements I_C_PaySelection, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_PaySelection (Properties ctx, int C_PaySelection_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_PaySelectionCheck.java b/org.adempiere.base/src/org/compiere/model/X_C_PaySelectionCheck.java
index f724bd148e..1d647778b2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_PaySelectionCheck.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_PaySelectionCheck.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for C_PaySelectionCheck
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_PaySelectionCheck extends PO implements I_C_PaySelectionCheck, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_PaySelectionCheck (Properties ctx, int C_PaySelectionCheck_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_PaySelectionLine.java b/org.adempiere.base/src/org/compiere/model/X_C_PaySelectionLine.java
index 1dd21a85ef..65d226f6c0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_PaySelectionLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_PaySelectionLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_PaySelectionLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_PaySelectionLine extends PO implements I_C_PaySelectionLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_PaySelectionLine (Properties ctx, int C_PaySelectionLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Payment.java b/org.adempiere.base/src/org/compiere/model/X_C_Payment.java
index 696832c258..24e9fb9445 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Payment.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Payment.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Payment
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Payment extends PO implements I_C_Payment, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Payment (Properties ctx, int C_Payment_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_PaymentAllocate.java b/org.adempiere.base/src/org/compiere/model/X_C_PaymentAllocate.java
index d76d4069d5..f1ea93c956 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_PaymentAllocate.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_PaymentAllocate.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_PaymentAllocate
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_PaymentAllocate extends PO implements I_C_PaymentAllocate, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_PaymentAllocate (Properties ctx, int C_PaymentAllocate_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_PaymentBatch.java b/org.adempiere.base/src/org/compiere/model/X_C_PaymentBatch.java
index 84f510b627..50512c4667 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_PaymentBatch.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_PaymentBatch.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_PaymentBatch
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_PaymentBatch extends PO implements I_C_PaymentBatch, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_PaymentBatch (Properties ctx, int C_PaymentBatch_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_PaymentProcessor.java b/org.adempiere.base/src/org/compiere/model/X_C_PaymentProcessor.java
index 0fef208bdc..64d1f2fa94 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_PaymentProcessor.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_PaymentProcessor.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_PaymentProcessor
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_PaymentProcessor extends PO implements I_C_PaymentProcessor, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_PaymentProcessor (Properties ctx, int C_PaymentProcessor_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_PaymentTerm.java b/org.adempiere.base/src/org/compiere/model/X_C_PaymentTerm.java
index 721b79d949..0c0a911ded 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_PaymentTerm.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_PaymentTerm.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_PaymentTerm
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_PaymentTerm extends PO implements I_C_PaymentTerm, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_PaymentTerm (Properties ctx, int C_PaymentTerm_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_PaymentTransaction.java b/org.adempiere.base/src/org/compiere/model/X_C_PaymentTransaction.java
index 79c7cabe57..11863c8af5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_PaymentTransaction.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_PaymentTransaction.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for C_PaymentTransaction
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_PaymentTransaction extends PO implements I_C_PaymentTransaction, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_PaymentTransaction (Properties ctx, int C_PaymentTransaction_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Period.java b/org.adempiere.base/src/org/compiere/model/X_C_Period.java
index 24cbfce0cf..a0f3028bb4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Period.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Period.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Period
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Period extends PO implements I_C_Period, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Period (Properties ctx, int C_Period_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_PeriodControl.java b/org.adempiere.base/src/org/compiere/model/X_C_PeriodControl.java
index d18b90a989..e20a07ee45 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_PeriodControl.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_PeriodControl.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_PeriodControl
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_PeriodControl extends PO implements I_C_PeriodControl, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_PeriodControl (Properties ctx, int C_PeriodControl_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Phase.java b/org.adempiere.base/src/org/compiere/model/X_C_Phase.java
index 5e244d9b5b..b62d7e75b1 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Phase.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Phase.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Phase
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Phase extends PO implements I_C_Phase, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Phase (Properties ctx, int C_Phase_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Project.java b/org.adempiere.base/src/org/compiere/model/X_C_Project.java
index 12b849674e..dc3e3ce796 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Project.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Project.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Project
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Project extends PO implements I_C_Project, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Project (Properties ctx, int C_Project_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_ProjectIssue.java b/org.adempiere.base/src/org/compiere/model/X_C_ProjectIssue.java
index a9ad0bc784..a7387cca1f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_ProjectIssue.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_ProjectIssue.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ProjectIssue
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_ProjectIssue extends PO implements I_C_ProjectIssue, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_ProjectIssue (Properties ctx, int C_ProjectIssue_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_ProjectIssueMA.java b/org.adempiere.base/src/org/compiere/model/X_C_ProjectIssueMA.java
index 2c44be23be..30c96f0da4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_ProjectIssueMA.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_ProjectIssueMA.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ProjectIssueMA
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_ProjectIssueMA extends PO implements I_C_ProjectIssueMA, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_ProjectIssueMA (Properties ctx, int C_ProjectIssueMA_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_ProjectLine.java b/org.adempiere.base/src/org/compiere/model/X_C_ProjectLine.java
index ab2cbca727..6378171d0f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_ProjectLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_ProjectLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ProjectLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_ProjectLine extends PO implements I_C_ProjectLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_ProjectLine (Properties ctx, int C_ProjectLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_ProjectPhase.java b/org.adempiere.base/src/org/compiere/model/X_C_ProjectPhase.java
index da1a3f1a24..8fbe2612c2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_ProjectPhase.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_ProjectPhase.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ProjectPhase
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_ProjectPhase extends PO implements I_C_ProjectPhase, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_ProjectPhase (Properties ctx, int C_ProjectPhase_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_ProjectTask.java b/org.adempiere.base/src/org/compiere/model/X_C_ProjectTask.java
index ecaa0c1f2f..89d359a9da 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_ProjectTask.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_ProjectTask.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ProjectTask
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_ProjectTask extends PO implements I_C_ProjectTask, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_ProjectTask (Properties ctx, int C_ProjectTask_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_ProjectType.java b/org.adempiere.base/src/org/compiere/model/X_C_ProjectType.java
index f98f61a6e4..af4e4bac91 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_ProjectType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_ProjectType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ProjectType
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_ProjectType extends PO implements I_C_ProjectType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_ProjectType (Properties ctx, int C_ProjectType_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Project_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_Project_Acct.java
index e9ca01ae86..c411f7e802 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Project_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Project_Acct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_Project_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Project_Acct extends PO implements I_C_Project_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Project_Acct (Properties ctx, int C_Project_Acct_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Recurring.java b/org.adempiere.base/src/org/compiere/model/X_C_Recurring.java
index 1c10859731..780752e204 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Recurring.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Recurring.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Recurring
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Recurring extends PO implements I_C_Recurring, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Recurring (Properties ctx, int C_Recurring_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_RecurringGroup.java b/org.adempiere.base/src/org/compiere/model/X_C_RecurringGroup.java
index dd8373e827..0d5b3596cf 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_RecurringGroup.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_RecurringGroup.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RecurringGroup
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_RecurringGroup extends PO implements I_C_RecurringGroup, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_RecurringGroup (Properties ctx, int C_RecurringGroup_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Recurring_Run.java b/org.adempiere.base/src/org/compiere/model/X_C_Recurring_Run.java
index 074ab2ecd2..b010b68825 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Recurring_Run.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Recurring_Run.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for C_Recurring_Run
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Recurring_Run extends PO implements I_C_Recurring_Run, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Recurring_Run (Properties ctx, int C_Recurring_Run_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Region.java b/org.adempiere.base/src/org/compiere/model/X_C_Region.java
index a873001612..fb6fb6b7b4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Region.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Region.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Region
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Region extends PO implements I_C_Region, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Region (Properties ctx, int C_Region_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Remuneration.java b/org.adempiere.base/src/org/compiere/model/X_C_Remuneration.java
index 5004cb4aa5..a3e43adc0b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Remuneration.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Remuneration.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Remuneration
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Remuneration extends PO implements I_C_Remuneration, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Remuneration (Properties ctx, int C_Remuneration_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition.java b/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition.java
index d5e450fbc7..f977fec8bd 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RevenueRecognition
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_RevenueRecognition extends PO implements I_C_RevenueRecognition, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_RevenueRecognition (Properties ctx, int C_RevenueRecognition_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition_Plan.java b/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition_Plan.java
index a4e681d810..c1216e27b6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition_Plan.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition_Plan.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RevenueRecognition_Plan
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_RevenueRecognition_Plan extends PO implements I_C_RevenueRecognition_Plan, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_RevenueRecognition_Plan (Properties ctx, int C_RevenueRecognition_Plan_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition_Run.java b/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition_Run.java
index aaa2fd090c..b738b98acb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition_Run.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition_Run.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RevenueRecognition_Run
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_RevenueRecognition_Run extends PO implements I_C_RevenueRecognition_Run, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_RevenueRecognition_Run (Properties ctx, int C_RevenueRecognition_Run_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_RfQ.java b/org.adempiere.base/src/org/compiere/model/X_C_RfQ.java
index 9f45e54b3d..8177be8b58 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_RfQ.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_RfQ.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RfQ
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_RfQ extends PO implements I_C_RfQ, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_RfQ (Properties ctx, int C_RfQ_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_RfQLine.java b/org.adempiere.base/src/org/compiere/model/X_C_RfQLine.java
index 3bf57bb462..b1a8c2c129 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_RfQLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_RfQLine.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RfQLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_RfQLine extends PO implements I_C_RfQLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_RfQLine (Properties ctx, int C_RfQLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_RfQLineQty.java b/org.adempiere.base/src/org/compiere/model/X_C_RfQLineQty.java
index 7b1496c23e..e4ab30c2f7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_RfQLineQty.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_RfQLineQty.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RfQLineQty
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_RfQLineQty extends PO implements I_C_RfQLineQty, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_RfQLineQty (Properties ctx, int C_RfQLineQty_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_RfQResponse.java b/org.adempiere.base/src/org/compiere/model/X_C_RfQResponse.java
index b1497f717e..6efa253cd2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_RfQResponse.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_RfQResponse.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RfQResponse
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_RfQResponse extends PO implements I_C_RfQResponse, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_RfQResponse (Properties ctx, int C_RfQResponse_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_RfQResponseLine.java b/org.adempiere.base/src/org/compiere/model/X_C_RfQResponseLine.java
index 6f41a53e72..1654589ab5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_RfQResponseLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_RfQResponseLine.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for C_RfQResponseLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_RfQResponseLine extends PO implements I_C_RfQResponseLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_RfQResponseLine (Properties ctx, int C_RfQResponseLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_RfQResponseLineQty.java b/org.adempiere.base/src/org/compiere/model/X_C_RfQResponseLineQty.java
index e6ff508739..5498a2c0e7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_RfQResponseLineQty.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_RfQResponseLineQty.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RfQResponseLineQty
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_RfQResponseLineQty extends PO implements I_C_RfQResponseLineQty, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_RfQResponseLineQty (Properties ctx, int C_RfQResponseLineQty_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_RfQ_Topic.java b/org.adempiere.base/src/org/compiere/model/X_C_RfQ_Topic.java
index e244de6142..073e5e2547 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_RfQ_Topic.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_RfQ_Topic.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RfQ_Topic
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_RfQ_Topic extends PO implements I_C_RfQ_Topic, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_RfQ_Topic (Properties ctx, int C_RfQ_Topic_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_RfQ_TopicSubscriber.java b/org.adempiere.base/src/org/compiere/model/X_C_RfQ_TopicSubscriber.java
index a22c48e201..07ed1d5df2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_RfQ_TopicSubscriber.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_RfQ_TopicSubscriber.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RfQ_TopicSubscriber
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_RfQ_TopicSubscriber extends PO implements I_C_RfQ_TopicSubscriber, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_RfQ_TopicSubscriber (Properties ctx, int C_RfQ_TopicSubscriber_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_RfQ_TopicSubscriberOnly.java b/org.adempiere.base/src/org/compiere/model/X_C_RfQ_TopicSubscriberOnly.java
index 690f67999e..ddac070f79 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_RfQ_TopicSubscriberOnly.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_RfQ_TopicSubscriberOnly.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RfQ_TopicSubscriberOnly
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_RfQ_TopicSubscriberOnly extends PO implements I_C_RfQ_TopicSubscriberOnly, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_RfQ_TopicSubscriberOnly (Properties ctx, int C_RfQ_TopicSubscriberOnly_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_SalesRegion.java b/org.adempiere.base/src/org/compiere/model/X_C_SalesRegion.java
index 3be9d5598a..33fd679369 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_SalesRegion.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_SalesRegion.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_SalesRegion
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_SalesRegion extends PO implements I_C_SalesRegion, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_SalesRegion (Properties ctx, int C_SalesRegion_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_SalesStage.java b/org.adempiere.base/src/org/compiere/model/X_C_SalesStage.java
index 3cefd537aa..7b493785d7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_SalesStage.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_SalesStage.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_SalesStage
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_SalesStage extends PO implements I_C_SalesStage, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_SalesStage (Properties ctx, int C_SalesStage_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_ServiceLevel.java b/org.adempiere.base/src/org/compiere/model/X_C_ServiceLevel.java
index ea7c996994..cb44999a4d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_ServiceLevel.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_ServiceLevel.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ServiceLevel
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_ServiceLevel extends PO implements I_C_ServiceLevel, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_ServiceLevel (Properties ctx, int C_ServiceLevel_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_ServiceLevelLine.java b/org.adempiere.base/src/org/compiere/model/X_C_ServiceLevelLine.java
index 7857fa1cf0..a3a20b78ac 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_ServiceLevelLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_ServiceLevelLine.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ServiceLevelLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_ServiceLevelLine extends PO implements I_C_ServiceLevelLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_ServiceLevelLine (Properties ctx, int C_ServiceLevelLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_SubAcct.java b/org.adempiere.base/src/org/compiere/model/X_C_SubAcct.java
index 518c6fbb51..254d63c175 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_SubAcct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_SubAcct.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_SubAcct
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_SubAcct extends PO implements I_C_SubAcct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_SubAcct (Properties ctx, int C_SubAcct_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Subscription.java b/org.adempiere.base/src/org/compiere/model/X_C_Subscription.java
index c22486e66b..334a244e1f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Subscription.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Subscription.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Subscription
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Subscription extends PO implements I_C_Subscription, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Subscription (Properties ctx, int C_Subscription_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_SubscriptionType.java b/org.adempiere.base/src/org/compiere/model/X_C_SubscriptionType.java
index e409ba68c6..5642240202 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_SubscriptionType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_SubscriptionType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_SubscriptionType
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_SubscriptionType extends PO implements I_C_SubscriptionType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_SubscriptionType (Properties ctx, int C_SubscriptionType_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Subscription_Delivery.java b/org.adempiere.base/src/org/compiere/model/X_C_Subscription_Delivery.java
index 30e96a046f..c4dc6f21d9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Subscription_Delivery.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Subscription_Delivery.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Subscription_Delivery
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Subscription_Delivery extends PO implements I_C_Subscription_Delivery, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Subscription_Delivery (Properties ctx, int C_Subscription_Delivery_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Task.java b/org.adempiere.base/src/org/compiere/model/X_C_Task.java
index a9f204d1c9..ad9f8729c5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Task.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Task.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Task
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Task extends PO implements I_C_Task, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Task (Properties ctx, int C_Task_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Tax.java b/org.adempiere.base/src/org/compiere/model/X_C_Tax.java
index bd174b7b7c..4d22e55d19 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Tax.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Tax.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Tax
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Tax extends PO implements I_C_Tax, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Tax (Properties ctx, int C_Tax_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_TaxCategory.java b/org.adempiere.base/src/org/compiere/model/X_C_TaxCategory.java
index c587993a11..f3303f167f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_TaxCategory.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_TaxCategory.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_TaxCategory
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_TaxCategory extends PO implements I_C_TaxCategory, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_TaxCategory (Properties ctx, int C_TaxCategory_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_TaxDeclaration.java b/org.adempiere.base/src/org/compiere/model/X_C_TaxDeclaration.java
index fa286212dd..94409ffcea 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_TaxDeclaration.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_TaxDeclaration.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_TaxDeclaration
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_TaxDeclaration extends PO implements I_C_TaxDeclaration, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_TaxDeclaration (Properties ctx, int C_TaxDeclaration_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_TaxDeclarationAcct.java b/org.adempiere.base/src/org/compiere/model/X_C_TaxDeclarationAcct.java
index 4d8d6b2cf3..d7baebbafc 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_TaxDeclarationAcct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_TaxDeclarationAcct.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for C_TaxDeclarationAcct
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_TaxDeclarationAcct extends PO implements I_C_TaxDeclarationAcct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_TaxDeclarationAcct (Properties ctx, int C_TaxDeclarationAcct_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_TaxDeclarationLine.java b/org.adempiere.base/src/org/compiere/model/X_C_TaxDeclarationLine.java
index d39a190dcd..dd3e8c6920 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_TaxDeclarationLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_TaxDeclarationLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for C_TaxDeclarationLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_TaxDeclarationLine extends PO implements I_C_TaxDeclarationLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_TaxDeclarationLine (Properties ctx, int C_TaxDeclarationLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_TaxPostal.java b/org.adempiere.base/src/org/compiere/model/X_C_TaxPostal.java
index dbbf35a001..925e36a5bf 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_TaxPostal.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_TaxPostal.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_TaxPostal
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_TaxPostal extends PO implements I_C_TaxPostal, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_TaxPostal (Properties ctx, int C_TaxPostal_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_TaxProvider.java b/org.adempiere.base/src/org/compiere/model/X_C_TaxProvider.java
index 4c8dd0b103..775b77b52c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_TaxProvider.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_TaxProvider.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_TaxProvider
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_TaxProvider extends PO implements I_C_TaxProvider, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_TaxProvider (Properties ctx, int C_TaxProvider_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_TaxProviderCfg.java b/org.adempiere.base/src/org/compiere/model/X_C_TaxProviderCfg.java
index 00f27ccf28..f2e4f4334c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_TaxProviderCfg.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_TaxProviderCfg.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_TaxProviderCfg
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_TaxProviderCfg extends PO implements I_C_TaxProviderCfg, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_TaxProviderCfg (Properties ctx, int C_TaxProviderCfg_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Tax_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_Tax_Acct.java
index b3b61e17e7..3b59b8a83c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Tax_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Tax_Acct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_Tax_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Tax_Acct extends PO implements I_C_Tax_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Tax_Acct (Properties ctx, int C_Tax_Acct_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_UOM.java b/org.adempiere.base/src/org/compiere/model/X_C_UOM.java
index 57e3f2b5b4..6dbad6c724 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_UOM.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_UOM.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_UOM
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_UOM extends PO implements I_C_UOM, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_UOM (Properties ctx, int C_UOM_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_UOM_Conversion.java b/org.adempiere.base/src/org/compiere/model/X_C_UOM_Conversion.java
index f970595491..85a71ffaf8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_UOM_Conversion.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_UOM_Conversion.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_UOM_Conversion
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_UOM_Conversion extends PO implements I_C_UOM_Conversion, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_UOM_Conversion (Properties ctx, int C_UOM_Conversion_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_UserRemuneration.java b/org.adempiere.base/src/org/compiere/model/X_C_UserRemuneration.java
index 8be103bf32..357aa400dc 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_UserRemuneration.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_UserRemuneration.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_UserRemuneration
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_UserRemuneration extends PO implements I_C_UserRemuneration, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_UserRemuneration (Properties ctx, int C_UserRemuneration_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_ValidCombination.java b/org.adempiere.base/src/org/compiere/model/X_C_ValidCombination.java
index bf2ba7faa8..778a80c239 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_ValidCombination.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_ValidCombination.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ValidCombination
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_ValidCombination extends PO implements I_C_ValidCombination, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_ValidCombination (Properties ctx, int C_ValidCombination_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Withholding.java b/org.adempiere.base/src/org/compiere/model/X_C_Withholding.java
index 35fe4bf50d..1cc031c356 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Withholding.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Withholding.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Withholding
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Withholding extends PO implements I_C_Withholding, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Withholding (Properties ctx, int C_Withholding_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Withholding_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_Withholding_Acct.java
index 8f69dc40d1..f273ede362 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Withholding_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Withholding_Acct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_Withholding_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Withholding_Acct extends PO implements I_C_Withholding_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Withholding_Acct (Properties ctx, int C_Withholding_Acct_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Year.java b/org.adempiere.base/src/org/compiere/model/X_C_Year.java
index b0fa3c5d1f..463dc25997 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Year.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Year.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Year
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_Year extends PO implements I_C_Year, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_Year (Properties ctx, int C_Year_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_EXP_Format.java b/org.adempiere.base/src/org/compiere/model/X_EXP_Format.java
index 8b6d68864d..7becf9ddd3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_EXP_Format.java
+++ b/org.adempiere.base/src/org/compiere/model/X_EXP_Format.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for EXP_Format
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_EXP_Format extends PO implements I_EXP_Format, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_EXP_Format (Properties ctx, int EXP_Format_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_EXP_FormatLine.java b/org.adempiere.base/src/org/compiere/model/X_EXP_FormatLine.java
index e4fe337383..43dc8d08d7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_EXP_FormatLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_EXP_FormatLine.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for EXP_FormatLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_EXP_FormatLine extends PO implements I_EXP_FormatLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_EXP_FormatLine (Properties ctx, int EXP_FormatLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_EXP_Processor.java b/org.adempiere.base/src/org/compiere/model/X_EXP_Processor.java
index 8d699baf33..50e39a48b4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_EXP_Processor.java
+++ b/org.adempiere.base/src/org/compiere/model/X_EXP_Processor.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for EXP_Processor
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_EXP_Processor extends PO implements I_EXP_Processor, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_EXP_Processor (Properties ctx, int EXP_Processor_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_EXP_ProcessorParameter.java b/org.adempiere.base/src/org/compiere/model/X_EXP_ProcessorParameter.java
index 24901ecf47..27152b248e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_EXP_ProcessorParameter.java
+++ b/org.adempiere.base/src/org/compiere/model/X_EXP_ProcessorParameter.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for EXP_ProcessorParameter
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_EXP_ProcessorParameter extends PO implements I_EXP_ProcessorParameter, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_EXP_ProcessorParameter (Properties ctx, int EXP_ProcessorParameter_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_EXP_Processor_Type.java b/org.adempiere.base/src/org/compiere/model/X_EXP_Processor_Type.java
index b7a335edaa..03ca5deb0d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_EXP_Processor_Type.java
+++ b/org.adempiere.base/src/org/compiere/model/X_EXP_Processor_Type.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for EXP_Processor_Type
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_EXP_Processor_Type extends PO implements I_EXP_Processor_Type, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_EXP_Processor_Type (Properties ctx, int EXP_Processor_Type_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_Fact_Acct.java b/org.adempiere.base/src/org/compiere/model/X_Fact_Acct.java
index c14536bf7d..8c50fe2753 100644
--- a/org.adempiere.base/src/org/compiere/model/X_Fact_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_Fact_Acct.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for Fact_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_Fact_Acct extends PO implements I_Fact_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_Fact_Acct (Properties ctx, int Fact_Acct_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_Fact_Acct_Summary.java b/org.adempiere.base/src/org/compiere/model/X_Fact_Acct_Summary.java
index 67d17c57b6..b707891bda 100644
--- a/org.adempiere.base/src/org/compiere/model/X_Fact_Acct_Summary.java
+++ b/org.adempiere.base/src/org/compiere/model/X_Fact_Acct_Summary.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for Fact_Acct_Summary
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_Fact_Acct_Summary extends PO implements I_Fact_Acct_Summary, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_Fact_Acct_Summary (Properties ctx, int Fact_Acct_Summary_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_Fact_Reconciliation.java b/org.adempiere.base/src/org/compiere/model/X_Fact_Reconciliation.java
index da097cf15a..2883368ac8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_Fact_Reconciliation.java
+++ b/org.adempiere.base/src/org/compiere/model/X_Fact_Reconciliation.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for Fact_Reconciliation
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_Fact_Reconciliation extends PO implements I_Fact_Reconciliation, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_Fact_Reconciliation (Properties ctx, int Fact_Reconciliation_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_GL_Budget.java b/org.adempiere.base/src/org/compiere/model/X_GL_Budget.java
index 73fa25b37e..b73fe57d5d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_GL_Budget.java
+++ b/org.adempiere.base/src/org/compiere/model/X_GL_Budget.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_Budget
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_GL_Budget extends PO implements I_GL_Budget, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_GL_Budget (Properties ctx, int GL_Budget_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_GL_BudgetControl.java b/org.adempiere.base/src/org/compiere/model/X_GL_BudgetControl.java
index c1b3b45dce..11f393c443 100644
--- a/org.adempiere.base/src/org/compiere/model/X_GL_BudgetControl.java
+++ b/org.adempiere.base/src/org/compiere/model/X_GL_BudgetControl.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_BudgetControl
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_GL_BudgetControl extends PO implements I_GL_BudgetControl, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_GL_BudgetControl (Properties ctx, int GL_BudgetControl_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_GL_Category.java b/org.adempiere.base/src/org/compiere/model/X_GL_Category.java
index 326750e4a7..db5a5b022d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_GL_Category.java
+++ b/org.adempiere.base/src/org/compiere/model/X_GL_Category.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_Category
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_GL_Category extends PO implements I_GL_Category, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_GL_Category (Properties ctx, int GL_Category_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_GL_Distribution.java b/org.adempiere.base/src/org/compiere/model/X_GL_Distribution.java
index e185af0355..60806007c1 100644
--- a/org.adempiere.base/src/org/compiere/model/X_GL_Distribution.java
+++ b/org.adempiere.base/src/org/compiere/model/X_GL_Distribution.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_Distribution
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_GL_Distribution extends PO implements I_GL_Distribution, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_GL_Distribution (Properties ctx, int GL_Distribution_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_GL_DistributionLine.java b/org.adempiere.base/src/org/compiere/model/X_GL_DistributionLine.java
index b865d4148e..f0e49e77fd 100644
--- a/org.adempiere.base/src/org/compiere/model/X_GL_DistributionLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_GL_DistributionLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_DistributionLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_GL_DistributionLine extends PO implements I_GL_DistributionLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_GL_DistributionLine (Properties ctx, int GL_DistributionLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_GL_Fund.java b/org.adempiere.base/src/org/compiere/model/X_GL_Fund.java
index 7358722e12..155b535feb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_GL_Fund.java
+++ b/org.adempiere.base/src/org/compiere/model/X_GL_Fund.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_Fund
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_GL_Fund extends PO implements I_GL_Fund, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_GL_Fund (Properties ctx, int GL_Fund_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_GL_FundRestriction.java b/org.adempiere.base/src/org/compiere/model/X_GL_FundRestriction.java
index 7200984ef5..870b1155da 100644
--- a/org.adempiere.base/src/org/compiere/model/X_GL_FundRestriction.java
+++ b/org.adempiere.base/src/org/compiere/model/X_GL_FundRestriction.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_FundRestriction
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_GL_FundRestriction extends PO implements I_GL_FundRestriction, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_GL_FundRestriction (Properties ctx, int GL_FundRestriction_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_GL_Journal.java b/org.adempiere.base/src/org/compiere/model/X_GL_Journal.java
index 5eb5f7e051..08095e6512 100644
--- a/org.adempiere.base/src/org/compiere/model/X_GL_Journal.java
+++ b/org.adempiere.base/src/org/compiere/model/X_GL_Journal.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_Journal
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_GL_Journal extends PO implements I_GL_Journal, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_GL_Journal (Properties ctx, int GL_Journal_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_GL_JournalBatch.java b/org.adempiere.base/src/org/compiere/model/X_GL_JournalBatch.java
index c4ba8441cc..7208789d6c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_GL_JournalBatch.java
+++ b/org.adempiere.base/src/org/compiere/model/X_GL_JournalBatch.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_JournalBatch
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_GL_JournalBatch extends PO implements I_GL_JournalBatch, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_GL_JournalBatch (Properties ctx, int GL_JournalBatch_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_GL_JournalGenerator.java b/org.adempiere.base/src/org/compiere/model/X_GL_JournalGenerator.java
index 200f1acdba..104ed094f0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_GL_JournalGenerator.java
+++ b/org.adempiere.base/src/org/compiere/model/X_GL_JournalGenerator.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_JournalGenerator
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_GL_JournalGenerator extends PO implements I_GL_JournalGenerator, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_GL_JournalGenerator (Properties ctx, int GL_JournalGenerator_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_GL_JournalGeneratorLine.java b/org.adempiere.base/src/org/compiere/model/X_GL_JournalGeneratorLine.java
index 8368975761..395d0894b0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_GL_JournalGeneratorLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_GL_JournalGeneratorLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_JournalGeneratorLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_GL_JournalGeneratorLine extends PO implements I_GL_JournalGeneratorLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_GL_JournalGeneratorLine (Properties ctx, int GL_JournalGeneratorLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_GL_JournalGeneratorSource.java b/org.adempiere.base/src/org/compiere/model/X_GL_JournalGeneratorSource.java
index 84c7b647c3..17fabe7f0c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_GL_JournalGeneratorSource.java
+++ b/org.adempiere.base/src/org/compiere/model/X_GL_JournalGeneratorSource.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for GL_JournalGeneratorSource
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_GL_JournalGeneratorSource extends PO implements I_GL_JournalGeneratorSource, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_GL_JournalGeneratorSource (Properties ctx, int GL_JournalGeneratorSource_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_GL_JournalLine.java b/org.adempiere.base/src/org/compiere/model/X_GL_JournalLine.java
index 4d16072a7b..02cf8ea35d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_GL_JournalLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_GL_JournalLine.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_JournalLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_GL_JournalLine extends PO implements I_GL_JournalLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_GL_JournalLine (Properties ctx, int GL_JournalLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_IMP_Processor.java b/org.adempiere.base/src/org/compiere/model/X_IMP_Processor.java
index 860cd3342e..54cb6baa21 100644
--- a/org.adempiere.base/src/org/compiere/model/X_IMP_Processor.java
+++ b/org.adempiere.base/src/org/compiere/model/X_IMP_Processor.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for IMP_Processor
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_IMP_Processor extends PO implements I_IMP_Processor, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_IMP_Processor (Properties ctx, int IMP_Processor_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_IMP_ProcessorLog.java b/org.adempiere.base/src/org/compiere/model/X_IMP_ProcessorLog.java
index 30b47020f3..66d658c68f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_IMP_ProcessorLog.java
+++ b/org.adempiere.base/src/org/compiere/model/X_IMP_ProcessorLog.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for IMP_ProcessorLog
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_IMP_ProcessorLog extends PO implements I_IMP_ProcessorLog, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_IMP_ProcessorLog (Properties ctx, int IMP_ProcessorLog_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_IMP_ProcessorParameter.java b/org.adempiere.base/src/org/compiere/model/X_IMP_ProcessorParameter.java
index c207d94b7c..d45d98f45a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_IMP_ProcessorParameter.java
+++ b/org.adempiere.base/src/org/compiere/model/X_IMP_ProcessorParameter.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for IMP_ProcessorParameter
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_IMP_ProcessorParameter extends PO implements I_IMP_ProcessorParameter, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_IMP_ProcessorParameter (Properties ctx, int IMP_ProcessorParameter_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_IMP_Processor_Type.java b/org.adempiere.base/src/org/compiere/model/X_IMP_Processor_Type.java
index dff1b39cab..78c75d00ef 100644
--- a/org.adempiere.base/src/org/compiere/model/X_IMP_Processor_Type.java
+++ b/org.adempiere.base/src/org/compiere/model/X_IMP_Processor_Type.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for IMP_Processor_Type
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_IMP_Processor_Type extends PO implements I_IMP_Processor_Type, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_IMP_Processor_Type (Properties ctx, int IMP_Processor_Type_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_Asset.java b/org.adempiere.base/src/org/compiere/model/X_I_Asset.java
index 9d65c4f233..27124add72 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_Asset.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_Asset.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_Asset
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_I_Asset extends PO implements I_I_Asset, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_I_Asset (Properties ctx, int I_Asset_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_BPartner.java b/org.adempiere.base/src/org/compiere/model/X_I_BPartner.java
index 8fae413fee..dbccf4dc8d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_BPartner.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_BPartner.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_BPartner
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_I_BPartner extends PO implements I_I_BPartner, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_I_BPartner (Properties ctx, int I_BPartner_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_BankStatement.java b/org.adempiere.base/src/org/compiere/model/X_I_BankStatement.java
index 39df566d2c..63e1b45368 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_BankStatement.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_BankStatement.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for I_BankStatement
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_I_BankStatement extends PO implements I_I_BankStatement, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_I_BankStatement (Properties ctx, int I_BankStatement_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_Conversion_Rate.java b/org.adempiere.base/src/org/compiere/model/X_I_Conversion_Rate.java
index 87ae170a81..0f18934a6b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_Conversion_Rate.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_Conversion_Rate.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_Conversion_Rate
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_I_Conversion_Rate extends PO implements I_I_Conversion_Rate, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_I_Conversion_Rate (Properties ctx, int I_Conversion_Rate_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_ElementValue.java b/org.adempiere.base/src/org/compiere/model/X_I_ElementValue.java
index 02c718d01b..5c5c5e25b2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_ElementValue.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_ElementValue.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_ElementValue
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_I_ElementValue extends PO implements I_I_ElementValue, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_I_ElementValue (Properties ctx, int I_ElementValue_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_FAJournal.java b/org.adempiere.base/src/org/compiere/model/X_I_FAJournal.java
index 5fb93c1d5b..dc0206cac3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_FAJournal.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_FAJournal.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_FAJournal
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_I_FAJournal extends PO implements I_I_FAJournal, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_I_FAJournal (Properties ctx, int I_FAJournal_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_FixedAsset.java b/org.adempiere.base/src/org/compiere/model/X_I_FixedAsset.java
index b869eaf1f0..947800f78e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_FixedAsset.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_FixedAsset.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for I_FixedAsset
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_I_FixedAsset extends PO implements I_I_FixedAsset, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_I_FixedAsset (Properties ctx, int I_FixedAsset_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_GLJournal.java b/org.adempiere.base/src/org/compiere/model/X_I_GLJournal.java
index afedc363b7..588b6b7063 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_GLJournal.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_GLJournal.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_GLJournal
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_I_GLJournal extends PO implements I_I_GLJournal, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_I_GLJournal (Properties ctx, int I_GLJournal_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_InOutLineConfirm.java b/org.adempiere.base/src/org/compiere/model/X_I_InOutLineConfirm.java
index f5c7c21571..9d59a84541 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_InOutLineConfirm.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_InOutLineConfirm.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_InOutLineConfirm
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_I_InOutLineConfirm extends PO implements I_I_InOutLineConfirm, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_I_InOutLineConfirm (Properties ctx, int I_InOutLineConfirm_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_Inventory.java b/org.adempiere.base/src/org/compiere/model/X_I_Inventory.java
index 213b71d35b..c5ddd18ffb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_Inventory.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_Inventory.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_Inventory
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_I_Inventory extends PO implements I_I_Inventory, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_I_Inventory (Properties ctx, int I_Inventory_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_Invoice.java b/org.adempiere.base/src/org/compiere/model/X_I_Invoice.java
index cf4457b01b..54d50daf24 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_Invoice.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_Invoice.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for I_Invoice
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_I_Invoice extends PO implements I_I_Invoice, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_I_Invoice (Properties ctx, int I_Invoice_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_Order.java b/org.adempiere.base/src/org/compiere/model/X_I_Order.java
index b1c26263b9..409be35f18 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_Order.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_Order.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for I_Order
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_I_Order extends PO implements I_I_Order, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_I_Order (Properties ctx, int I_Order_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_Payment.java b/org.adempiere.base/src/org/compiere/model/X_I_Payment.java
index ec0e46fa99..7544adc436 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_Payment.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_Payment.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for I_Payment
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_I_Payment extends PO implements I_I_Payment, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_I_Payment (Properties ctx, int I_Payment_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_PriceList.java b/org.adempiere.base/src/org/compiere/model/X_I_PriceList.java
index 2309b2d820..34192b5993 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_PriceList.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_PriceList.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for I_PriceList
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_I_PriceList extends PO implements I_I_PriceList, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_I_PriceList (Properties ctx, int I_PriceList_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_Product.java b/org.adempiere.base/src/org/compiere/model/X_I_Product.java
index fe0110ba79..7b3365381f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_Product.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_Product.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_Product
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_I_Product extends PO implements I_I_Product, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_I_Product (Properties ctx, int I_Product_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_ReportLine.java b/org.adempiere.base/src/org/compiere/model/X_I_ReportLine.java
index 0ec856ecf7..a1eff1db11 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_ReportLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_ReportLine.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_ReportLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_I_ReportLine extends PO implements I_I_ReportLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_I_ReportLine (Properties ctx, int I_ReportLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_K_Category.java b/org.adempiere.base/src/org/compiere/model/X_K_Category.java
index ad5f23be1d..549657a02e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_K_Category.java
+++ b/org.adempiere.base/src/org/compiere/model/X_K_Category.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for K_Category
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_K_Category extends PO implements I_K_Category, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_K_Category (Properties ctx, int K_Category_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_K_CategoryValue.java b/org.adempiere.base/src/org/compiere/model/X_K_CategoryValue.java
index 516e7b1edb..c59f38a9ab 100644
--- a/org.adempiere.base/src/org/compiere/model/X_K_CategoryValue.java
+++ b/org.adempiere.base/src/org/compiere/model/X_K_CategoryValue.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for K_CategoryValue
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_K_CategoryValue extends PO implements I_K_CategoryValue, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_K_CategoryValue (Properties ctx, int K_CategoryValue_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_K_Comment.java b/org.adempiere.base/src/org/compiere/model/X_K_Comment.java
index a5d6d623d3..3711abf51a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_K_Comment.java
+++ b/org.adempiere.base/src/org/compiere/model/X_K_Comment.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for K_Comment
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_K_Comment extends PO implements I_K_Comment, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_K_Comment (Properties ctx, int K_Comment_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_K_Entry.java b/org.adempiere.base/src/org/compiere/model/X_K_Entry.java
index 48318ee745..225cbb3b80 100644
--- a/org.adempiere.base/src/org/compiere/model/X_K_Entry.java
+++ b/org.adempiere.base/src/org/compiere/model/X_K_Entry.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for K_Entry
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_K_Entry extends PO implements I_K_Entry, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_K_Entry (Properties ctx, int K_Entry_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_K_EntryCategory.java b/org.adempiere.base/src/org/compiere/model/X_K_EntryCategory.java
index 7c3f527fcc..55cb8a4722 100644
--- a/org.adempiere.base/src/org/compiere/model/X_K_EntryCategory.java
+++ b/org.adempiere.base/src/org/compiere/model/X_K_EntryCategory.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for K_EntryCategory
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_K_EntryCategory extends PO implements I_K_EntryCategory, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_K_EntryCategory (Properties ctx, int K_EntryCategory_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_K_EntryRelated.java b/org.adempiere.base/src/org/compiere/model/X_K_EntryRelated.java
index 3a6fb68766..c305cb9d37 100644
--- a/org.adempiere.base/src/org/compiere/model/X_K_EntryRelated.java
+++ b/org.adempiere.base/src/org/compiere/model/X_K_EntryRelated.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for K_EntryRelated
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_K_EntryRelated extends PO implements I_K_EntryRelated, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_K_EntryRelated (Properties ctx, int K_EntryRelated_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_K_Index.java b/org.adempiere.base/src/org/compiere/model/X_K_Index.java
index 30f7f643b8..0befa1f32b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_K_Index.java
+++ b/org.adempiere.base/src/org/compiere/model/X_K_Index.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for K_Index
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_K_Index extends PO implements I_K_Index, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_K_Index (Properties ctx, int K_Index_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_K_IndexLog.java b/org.adempiere.base/src/org/compiere/model/X_K_IndexLog.java
index b701d2b2bb..6464f68287 100644
--- a/org.adempiere.base/src/org/compiere/model/X_K_IndexLog.java
+++ b/org.adempiere.base/src/org/compiere/model/X_K_IndexLog.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for K_IndexLog
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_K_IndexLog extends PO implements I_K_IndexLog, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_K_IndexLog (Properties ctx, int K_IndexLog_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_K_IndexStop.java b/org.adempiere.base/src/org/compiere/model/X_K_IndexStop.java
index 97b16e175c..3da38bf997 100644
--- a/org.adempiere.base/src/org/compiere/model/X_K_IndexStop.java
+++ b/org.adempiere.base/src/org/compiere/model/X_K_IndexStop.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for K_IndexStop
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_K_IndexStop extends PO implements I_K_IndexStop, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_K_IndexStop (Properties ctx, int K_IndexStop_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_K_Source.java b/org.adempiere.base/src/org/compiere/model/X_K_Source.java
index 6314bbac6f..ab4fdb6dc5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_K_Source.java
+++ b/org.adempiere.base/src/org/compiere/model/X_K_Source.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for K_Source
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_K_Source extends PO implements I_K_Source, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_K_Source (Properties ctx, int K_Source_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_K_Synonym.java b/org.adempiere.base/src/org/compiere/model/X_K_Synonym.java
index a772393205..7a3e025e56 100644
--- a/org.adempiere.base/src/org/compiere/model/X_K_Synonym.java
+++ b/org.adempiere.base/src/org/compiere/model/X_K_Synonym.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for K_Synonym
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_K_Synonym extends PO implements I_K_Synonym, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_K_Synonym (Properties ctx, int K_Synonym_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_K_Topic.java b/org.adempiere.base/src/org/compiere/model/X_K_Topic.java
index a058b4e1df..a81642ecd7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_K_Topic.java
+++ b/org.adempiere.base/src/org/compiere/model/X_K_Topic.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for K_Topic
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_K_Topic extends PO implements I_K_Topic, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_K_Topic (Properties ctx, int K_Topic_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_K_Type.java b/org.adempiere.base/src/org/compiere/model/X_K_Type.java
index 34d95fc090..fd883c7024 100644
--- a/org.adempiere.base/src/org/compiere/model/X_K_Type.java
+++ b/org.adempiere.base/src/org/compiere/model/X_K_Type.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for K_Type
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_K_Type extends PO implements I_K_Type, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_K_Type (Properties ctx, int K_Type_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Attribute.java b/org.adempiere.base/src/org/compiere/model/X_M_Attribute.java
index ae7a62972f..95eac1efc7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Attribute.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Attribute.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Attribute
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_Attribute extends PO implements I_M_Attribute, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20180911L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_Attribute (Properties ctx, int M_Attribute_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_AttributeInstance.java b/org.adempiere.base/src/org/compiere/model/X_M_AttributeInstance.java
index 58ad542096..23d53e7446 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_AttributeInstance.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_AttributeInstance.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_AttributeInstance
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_AttributeInstance extends PO implements I_M_AttributeInstance, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20180911L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_AttributeInstance (Properties ctx, int M_AttributeInstance_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_AttributeSearch.java b/org.adempiere.base/src/org/compiere/model/X_M_AttributeSearch.java
index c2a2c4530d..e13892f402 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_AttributeSearch.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_AttributeSearch.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_AttributeSearch
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_AttributeSearch extends PO implements I_M_AttributeSearch, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_AttributeSearch (Properties ctx, int M_AttributeSearch_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_AttributeSet.java b/org.adempiere.base/src/org/compiere/model/X_M_AttributeSet.java
index 1001ffe2bd..9c72291551 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_AttributeSet.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_AttributeSet.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_AttributeSet
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_AttributeSet extends PO implements I_M_AttributeSet, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_AttributeSet (Properties ctx, int M_AttributeSet_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_AttributeSetExclude.java b/org.adempiere.base/src/org/compiere/model/X_M_AttributeSetExclude.java
index 3d9b4d8da1..87d9ee2e6a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_AttributeSetExclude.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_AttributeSetExclude.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for M_AttributeSetExclude
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_AttributeSetExclude extends PO implements I_M_AttributeSetExclude, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_AttributeSetExclude (Properties ctx, int M_AttributeSetExclude_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_AttributeSetInstance.java b/org.adempiere.base/src/org/compiere/model/X_M_AttributeSetInstance.java
index 88838ba469..afca6c1c25 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_AttributeSetInstance.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_AttributeSetInstance.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_AttributeSetInstance
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_AttributeSetInstance extends PO implements I_M_AttributeSetInstance, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_AttributeSetInstance (Properties ctx, int M_AttributeSetInstance_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_AttributeUse.java b/org.adempiere.base/src/org/compiere/model/X_M_AttributeUse.java
index 9d2ab75e8c..ef2a3aa4a2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_AttributeUse.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_AttributeUse.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_AttributeUse
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_AttributeUse extends PO implements I_M_AttributeUse, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_AttributeUse (Properties ctx, int M_AttributeUse_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_AttributeValue.java b/org.adempiere.base/src/org/compiere/model/X_M_AttributeValue.java
index 663512aa3b..a2bdb33603 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_AttributeValue.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_AttributeValue.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_AttributeValue
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_AttributeValue extends PO implements I_M_AttributeValue, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_AttributeValue (Properties ctx, int M_AttributeValue_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_BOM.java b/org.adempiere.base/src/org/compiere/model/X_M_BOM.java
index 98eb1696fc..c418509d94 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_BOM.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_BOM.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_BOM
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_BOM extends PO implements I_M_BOM, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_BOM (Properties ctx, int M_BOM_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_BOMAlternative.java b/org.adempiere.base/src/org/compiere/model/X_M_BOMAlternative.java
index 3743b54fc6..96aa125992 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_BOMAlternative.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_BOMAlternative.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_BOMAlternative
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_BOMAlternative extends PO implements I_M_BOMAlternative, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_BOMAlternative (Properties ctx, int M_BOMAlternative_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_BOMProduct.java b/org.adempiere.base/src/org/compiere/model/X_M_BOMProduct.java
index bca9ff9282..3779568e8e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_BOMProduct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_BOMProduct.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_BOMProduct
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_BOMProduct extends PO implements I_M_BOMProduct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_BOMProduct (Properties ctx, int M_BOMProduct_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_BP_Price.java b/org.adempiere.base/src/org/compiere/model/X_M_BP_Price.java
index 5c60bbad24..d6030bd2a1 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_BP_Price.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_BP_Price.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_BP_Price
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_BP_Price extends PO implements I_M_BP_Price, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_BP_Price (Properties ctx, int M_BP_Price_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ChangeNotice.java b/org.adempiere.base/src/org/compiere/model/X_M_ChangeNotice.java
index ac834a15c8..a834fcf9d3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ChangeNotice.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ChangeNotice.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ChangeNotice
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_ChangeNotice extends PO implements I_M_ChangeNotice, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_ChangeNotice (Properties ctx, int M_ChangeNotice_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ChangeRequest.java b/org.adempiere.base/src/org/compiere/model/X_M_ChangeRequest.java
index bc3e48db25..3918dde495 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ChangeRequest.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ChangeRequest.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ChangeRequest
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_ChangeRequest extends PO implements I_M_ChangeRequest, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_ChangeRequest (Properties ctx, int M_ChangeRequest_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_CommodityShipment.java b/org.adempiere.base/src/org/compiere/model/X_M_CommodityShipment.java
index ad4f8d52bc..8890498dfd 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_CommodityShipment.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_CommodityShipment.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for M_CommodityShipment
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_CommodityShipment extends PO implements I_M_CommodityShipment, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_CommodityShipment (Properties ctx, int M_CommodityShipment_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Cost.java b/org.adempiere.base/src/org/compiere/model/X_M_Cost.java
index ab43a07755..59c76a0726 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Cost.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Cost.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_Cost
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_Cost extends PO implements I_M_Cost, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_Cost (Properties ctx, int M_Cost_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_CostDetail.java b/org.adempiere.base/src/org/compiere/model/X_M_CostDetail.java
index 3f43a232e6..2842db5c8c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_CostDetail.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_CostDetail.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_CostDetail
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_CostDetail extends PO implements I_M_CostDetail, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_CostDetail (Properties ctx, int M_CostDetail_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_CostElement.java b/org.adempiere.base/src/org/compiere/model/X_M_CostElement.java
index 6fadada90f..54ec863cef 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_CostElement.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_CostElement.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_CostElement
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_CostElement extends PO implements I_M_CostElement, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_CostElement (Properties ctx, int M_CostElement_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_CostHistory.java b/org.adempiere.base/src/org/compiere/model/X_M_CostHistory.java
index 92538667b9..b4ca16e464 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_CostHistory.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_CostHistory.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_CostHistory
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_CostHistory extends PO implements I_M_CostHistory, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_CostHistory (Properties ctx, int M_CostHistory_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_CostQueue.java b/org.adempiere.base/src/org/compiere/model/X_M_CostQueue.java
index 7db89773e4..acb43e1c1f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_CostQueue.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_CostQueue.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_CostQueue
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_CostQueue extends PO implements I_M_CostQueue, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_CostQueue (Properties ctx, int M_CostQueue_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_CostType.java b/org.adempiere.base/src/org/compiere/model/X_M_CostType.java
index d279dfd63d..1e2996a6d6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_CostType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_CostType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_CostType
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_CostType extends PO implements I_M_CostType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_CostType (Properties ctx, int M_CostType_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Demand.java b/org.adempiere.base/src/org/compiere/model/X_M_Demand.java
index 23e7595fb5..e3de87ff7f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Demand.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Demand.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Demand
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_Demand extends PO implements I_M_Demand, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_Demand (Properties ctx, int M_Demand_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_DemandDetail.java b/org.adempiere.base/src/org/compiere/model/X_M_DemandDetail.java
index 41a930eaf4..4e57effd58 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_DemandDetail.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_DemandDetail.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_DemandDetail
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_DemandDetail extends PO implements I_M_DemandDetail, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_DemandDetail (Properties ctx, int M_DemandDetail_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_DemandLine.java b/org.adempiere.base/src/org/compiere/model/X_M_DemandLine.java
index ac52509c38..6ce4597aa4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_DemandLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_DemandLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_DemandLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_DemandLine extends PO implements I_M_DemandLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_DemandLine (Properties ctx, int M_DemandLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_DiscountSchema.java b/org.adempiere.base/src/org/compiere/model/X_M_DiscountSchema.java
index c83a48c823..ac4e04f37e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_DiscountSchema.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_DiscountSchema.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_DiscountSchema
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_DiscountSchema extends PO implements I_M_DiscountSchema, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_DiscountSchema (Properties ctx, int M_DiscountSchema_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_DiscountSchemaBreak.java b/org.adempiere.base/src/org/compiere/model/X_M_DiscountSchemaBreak.java
index 4f9fa6a6eb..2b9446a1ac 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_DiscountSchemaBreak.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_DiscountSchemaBreak.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_DiscountSchemaBreak
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_DiscountSchemaBreak extends PO implements I_M_DiscountSchemaBreak, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_DiscountSchemaBreak (Properties ctx, int M_DiscountSchemaBreak_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_DiscountSchemaLine.java b/org.adempiere.base/src/org/compiere/model/X_M_DiscountSchemaLine.java
index e8877f3d00..6530d7160e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_DiscountSchemaLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_DiscountSchemaLine.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_DiscountSchemaLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_DiscountSchemaLine extends PO implements I_M_DiscountSchemaLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_DiscountSchemaLine (Properties ctx, int M_DiscountSchemaLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_DistributionList.java b/org.adempiere.base/src/org/compiere/model/X_M_DistributionList.java
index 161cfaaaf0..6d7b421dca 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_DistributionList.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_DistributionList.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_DistributionList
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_DistributionList extends PO implements I_M_DistributionList, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_DistributionList (Properties ctx, int M_DistributionList_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_DistributionListLine.java b/org.adempiere.base/src/org/compiere/model/X_M_DistributionListLine.java
index 626dee78d5..ea49587c64 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_DistributionListLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_DistributionListLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_DistributionListLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_DistributionListLine extends PO implements I_M_DistributionListLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_DistributionListLine (Properties ctx, int M_DistributionListLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_DistributionRun.java b/org.adempiere.base/src/org/compiere/model/X_M_DistributionRun.java
index f9b4ae0e7b..ca49c5bb03 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_DistributionRun.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_DistributionRun.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_DistributionRun
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_DistributionRun extends PO implements I_M_DistributionRun, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_DistributionRun (Properties ctx, int M_DistributionRun_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_DistributionRunLine.java b/org.adempiere.base/src/org/compiere/model/X_M_DistributionRunLine.java
index 6be79ec3a9..ace0b819a2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_DistributionRunLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_DistributionRunLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_DistributionRunLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_DistributionRunLine extends PO implements I_M_DistributionRunLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_DistributionRunLine (Properties ctx, int M_DistributionRunLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Forecast.java b/org.adempiere.base/src/org/compiere/model/X_M_Forecast.java
index f3a7314463..5834e185c0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Forecast.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Forecast.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Forecast
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_Forecast extends PO implements I_M_Forecast, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_Forecast (Properties ctx, int M_Forecast_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ForecastLine.java b/org.adempiere.base/src/org/compiere/model/X_M_ForecastLine.java
index 4528619a15..7042fd4978 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ForecastLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ForecastLine.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ForecastLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_ForecastLine extends PO implements I_M_ForecastLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_ForecastLine (Properties ctx, int M_ForecastLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Freight.java b/org.adempiere.base/src/org/compiere/model/X_M_Freight.java
index 1e41844c14..0ae331f0c4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Freight.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Freight.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Freight
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_Freight extends PO implements I_M_Freight, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_Freight (Properties ctx, int M_Freight_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_FreightCategory.java b/org.adempiere.base/src/org/compiere/model/X_M_FreightCategory.java
index 7b8724bc43..c3893d75ad 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_FreightCategory.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_FreightCategory.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_FreightCategory
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_FreightCategory extends PO implements I_M_FreightCategory, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_FreightCategory (Properties ctx, int M_FreightCategory_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_InOut.java b/org.adempiere.base/src/org/compiere/model/X_M_InOut.java
index 10170d92c1..6b62e9a9ea 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_InOut.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_InOut.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_InOut
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_InOut extends PO implements I_M_InOut, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_InOut (Properties ctx, int M_InOut_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_InOutConfirm.java b/org.adempiere.base/src/org/compiere/model/X_M_InOutConfirm.java
index a20e97a7dd..8476efff25 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_InOutConfirm.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_InOutConfirm.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_InOutConfirm
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_InOutConfirm extends PO implements I_M_InOutConfirm, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_InOutConfirm (Properties ctx, int M_InOutConfirm_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_InOutLine.java b/org.adempiere.base/src/org/compiere/model/X_M_InOutLine.java
index 2abb75fe5e..ab52612bed 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_InOutLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_InOutLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_InOutLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_InOutLine extends PO implements I_M_InOutLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_InOutLine (Properties ctx, int M_InOutLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_InOutLineConfirm.java b/org.adempiere.base/src/org/compiere/model/X_M_InOutLineConfirm.java
index a3a6e32c22..67edcd14ae 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_InOutLineConfirm.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_InOutLineConfirm.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_InOutLineConfirm
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_InOutLineConfirm extends PO implements I_M_InOutLineConfirm, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_InOutLineConfirm (Properties ctx, int M_InOutLineConfirm_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_InOutLineMA.java b/org.adempiere.base/src/org/compiere/model/X_M_InOutLineMA.java
index d85cc93f41..7228ad955d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_InOutLineMA.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_InOutLineMA.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_InOutLineMA
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_InOutLineMA extends PO implements I_M_InOutLineMA, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_InOutLineMA (Properties ctx, int M_InOutLineMA_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Inventory.java b/org.adempiere.base/src/org/compiere/model/X_M_Inventory.java
index b8ba81b997..2fe6846a9a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Inventory.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Inventory.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Inventory
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_Inventory extends PO implements I_M_Inventory, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_Inventory (Properties ctx, int M_Inventory_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_InventoryLine.java b/org.adempiere.base/src/org/compiere/model/X_M_InventoryLine.java
index 1dd5d89391..2e3d81a36e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_InventoryLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_InventoryLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_InventoryLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_InventoryLine extends PO implements I_M_InventoryLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_InventoryLine (Properties ctx, int M_InventoryLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_InventoryLineMA.java b/org.adempiere.base/src/org/compiere/model/X_M_InventoryLineMA.java
index 3cbd30b5dd..db945eec29 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_InventoryLineMA.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_InventoryLineMA.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_InventoryLineMA
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_InventoryLineMA extends PO implements I_M_InventoryLineMA, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_InventoryLineMA (Properties ctx, int M_InventoryLineMA_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Locator.java b/org.adempiere.base/src/org/compiere/model/X_M_Locator.java
index 1c5242b9af..fe0262ec8b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Locator.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Locator.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Locator
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_Locator extends PO implements I_M_Locator, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_Locator (Properties ctx, int M_Locator_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_LocatorType.java b/org.adempiere.base/src/org/compiere/model/X_M_LocatorType.java
index 95ca8363a3..511ac1388d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_LocatorType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_LocatorType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_LocatorType
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_LocatorType extends PO implements I_M_LocatorType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_LocatorType (Properties ctx, int M_LocatorType_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Lot.java b/org.adempiere.base/src/org/compiere/model/X_M_Lot.java
index 49a7632b19..9ff58d767e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Lot.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Lot.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Lot
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_Lot extends PO implements I_M_Lot, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_Lot (Properties ctx, int M_Lot_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_LotCtl.java b/org.adempiere.base/src/org/compiere/model/X_M_LotCtl.java
index 4652555295..eb5ab5738b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_LotCtl.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_LotCtl.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_LotCtl
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_LotCtl extends PO implements I_M_LotCtl, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_LotCtl (Properties ctx, int M_LotCtl_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_LotCtlExclude.java b/org.adempiere.base/src/org/compiere/model/X_M_LotCtlExclude.java
index 891df20aa2..6c8859b795 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_LotCtlExclude.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_LotCtlExclude.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for M_LotCtlExclude
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_LotCtlExclude extends PO implements I_M_LotCtlExclude, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_LotCtlExclude (Properties ctx, int M_LotCtlExclude_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_MatchInv.java b/org.adempiere.base/src/org/compiere/model/X_M_MatchInv.java
index 2bfb54a00d..58cb7bde57 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_MatchInv.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_MatchInv.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_MatchInv
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_MatchInv extends PO implements I_M_MatchInv, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_MatchInv (Properties ctx, int M_MatchInv_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_MatchPO.java b/org.adempiere.base/src/org/compiere/model/X_M_MatchPO.java
index 635938515f..b11b9923d9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_MatchPO.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_MatchPO.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_MatchPO
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_MatchPO extends PO implements I_M_MatchPO, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_MatchPO (Properties ctx, int M_MatchPO_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Movement.java b/org.adempiere.base/src/org/compiere/model/X_M_Movement.java
index 74a117ab84..d68bb1c986 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Movement.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Movement.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Movement
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_Movement extends PO implements I_M_Movement, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_Movement (Properties ctx, int M_Movement_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_MovementConfirm.java b/org.adempiere.base/src/org/compiere/model/X_M_MovementConfirm.java
index 0d3ceb5e5a..b61c1fd48b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_MovementConfirm.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_MovementConfirm.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_MovementConfirm
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_MovementConfirm extends PO implements I_M_MovementConfirm, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_MovementConfirm (Properties ctx, int M_MovementConfirm_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_MovementLine.java b/org.adempiere.base/src/org/compiere/model/X_M_MovementLine.java
index aff196e7a7..9aee7f0705 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_MovementLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_MovementLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_MovementLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_MovementLine extends PO implements I_M_MovementLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_MovementLine (Properties ctx, int M_MovementLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_MovementLineConfirm.java b/org.adempiere.base/src/org/compiere/model/X_M_MovementLineConfirm.java
index 293656695c..769b1dcd00 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_MovementLineConfirm.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_MovementLineConfirm.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_MovementLineConfirm
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_MovementLineConfirm extends PO implements I_M_MovementLineConfirm, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_MovementLineConfirm (Properties ctx, int M_MovementLineConfirm_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_MovementLineMA.java b/org.adempiere.base/src/org/compiere/model/X_M_MovementLineMA.java
index d4e1efa1bc..9da2d45d17 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_MovementLineMA.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_MovementLineMA.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_MovementLineMA
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_MovementLineMA extends PO implements I_M_MovementLineMA, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_MovementLineMA (Properties ctx, int M_MovementLineMA_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_OperationResource.java b/org.adempiere.base/src/org/compiere/model/X_M_OperationResource.java
index 4fb843e489..004ce3087c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_OperationResource.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_OperationResource.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_OperationResource
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_OperationResource extends PO implements I_M_OperationResource, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_OperationResource (Properties ctx, int M_OperationResource_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Package.java b/org.adempiere.base/src/org/compiere/model/X_M_Package.java
index e98ab58bf8..de2c462c55 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Package.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Package.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_Package
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_Package extends PO implements I_M_Package, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_Package (Properties ctx, int M_Package_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_PackageLine.java b/org.adempiere.base/src/org/compiere/model/X_M_PackageLine.java
index 19e7db74b5..e1f44e78f2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_PackageLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_PackageLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_PackageLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_PackageLine extends PO implements I_M_PackageLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_PackageLine (Properties ctx, int M_PackageLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_PackageMPS.java b/org.adempiere.base/src/org/compiere/model/X_M_PackageMPS.java
index dcfb13f9c9..7cf6650219 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_PackageMPS.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_PackageMPS.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_PackageMPS
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_PackageMPS extends PO implements I_M_PackageMPS, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_PackageMPS (Properties ctx, int M_PackageMPS_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_PartType.java b/org.adempiere.base/src/org/compiere/model/X_M_PartType.java
index e67d675869..a37ec11a1b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_PartType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_PartType.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for M_PartType
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_PartType extends PO implements I_M_PartType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_PartType (Properties ctx, int M_PartType_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_PerpetualInv.java b/org.adempiere.base/src/org/compiere/model/X_M_PerpetualInv.java
index 79a4e3941c..450acaba17 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_PerpetualInv.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_PerpetualInv.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_PerpetualInv
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_PerpetualInv extends PO implements I_M_PerpetualInv, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_PerpetualInv (Properties ctx, int M_PerpetualInv_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_PriceList.java b/org.adempiere.base/src/org/compiere/model/X_M_PriceList.java
index b327ac4fe3..a2b8caefeb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_PriceList.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_PriceList.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_PriceList
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_PriceList extends PO implements I_M_PriceList, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_PriceList (Properties ctx, int M_PriceList_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_PriceList_Version.java b/org.adempiere.base/src/org/compiere/model/X_M_PriceList_Version.java
index 6a9a52b983..942a48bdd7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_PriceList_Version.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_PriceList_Version.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_PriceList_Version
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_PriceList_Version extends PO implements I_M_PriceList_Version, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_PriceList_Version (Properties ctx, int M_PriceList_Version_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Product.java b/org.adempiere.base/src/org/compiere/model/X_M_Product.java
index 912006c762..9c4597e5fe 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Product.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Product.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Product
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_Product extends PO implements I_M_Product, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_Product (Properties ctx, int M_Product_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ProductDownload.java b/org.adempiere.base/src/org/compiere/model/X_M_ProductDownload.java
index 92815ad09b..ebe0e42b23 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ProductDownload.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ProductDownload.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ProductDownload
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_ProductDownload extends PO implements I_M_ProductDownload, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_ProductDownload (Properties ctx, int M_ProductDownload_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ProductOperation.java b/org.adempiere.base/src/org/compiere/model/X_M_ProductOperation.java
index ff5f339949..d559275b24 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ProductOperation.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ProductOperation.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ProductOperation
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_ProductOperation extends PO implements I_M_ProductOperation, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_ProductOperation (Properties ctx, int M_ProductOperation_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ProductPrice.java b/org.adempiere.base/src/org/compiere/model/X_M_ProductPrice.java
index 7759e49e9d..ff65315294 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ProductPrice.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ProductPrice.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_ProductPrice
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_ProductPrice extends PO implements I_M_ProductPrice, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_ProductPrice (Properties ctx, int M_ProductPrice_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ProductPriceVendorBreak.java b/org.adempiere.base/src/org/compiere/model/X_M_ProductPriceVendorBreak.java
index 2dbafab5c8..d9dac5fba7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ProductPriceVendorBreak.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ProductPriceVendorBreak.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_ProductPriceVendorBreak
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_ProductPriceVendorBreak extends PO implements I_M_ProductPriceVendorBreak, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_ProductPriceVendorBreak (Properties ctx, int M_ProductPriceVendorBreak_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Product_Acct.java b/org.adempiere.base/src/org/compiere/model/X_M_Product_Acct.java
index 5a75aba00d..cd7a4f8d07 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Product_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Product_Acct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for M_Product_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_Product_Acct extends PO implements I_M_Product_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_Product_Acct (Properties ctx, int M_Product_Acct_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Product_BOM.java b/org.adempiere.base/src/org/compiere/model/X_M_Product_BOM.java
index 53f51d392d..5cde4214ce 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Product_BOM.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Product_BOM.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Product_BOM
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_Product_BOM extends PO implements I_M_Product_BOM, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_Product_BOM (Properties ctx, int M_Product_BOM_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Product_Category.java b/org.adempiere.base/src/org/compiere/model/X_M_Product_Category.java
index 3c51bbd99d..923db0d855 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Product_Category.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Product_Category.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Product_Category
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_Product_Category extends PO implements I_M_Product_Category, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_Product_Category (Properties ctx, int M_Product_Category_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Product_Category_Acct.java b/org.adempiere.base/src/org/compiere/model/X_M_Product_Category_Acct.java
index 767eb32a29..2df30b3ae6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Product_Category_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Product_Category_Acct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for M_Product_Category_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_Product_Category_Acct extends PO implements I_M_Product_Category_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_Product_Category_Acct (Properties ctx, int M_Product_Category_Acct_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Product_PO.java b/org.adempiere.base/src/org/compiere/model/X_M_Product_PO.java
index 50881b164a..3a873c3194 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Product_PO.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Product_PO.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_Product_PO
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_Product_PO extends PO implements I_M_Product_PO, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_Product_PO (Properties ctx, int M_Product_PO_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Product_QualityTest.java b/org.adempiere.base/src/org/compiere/model/X_M_Product_QualityTest.java
index 15b7cbbe15..7af76c11eb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Product_QualityTest.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Product_QualityTest.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Product_QualityTest
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_Product_QualityTest extends PO implements I_M_Product_QualityTest, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_Product_QualityTest (Properties ctx, int M_Product_QualityTest_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Production.java b/org.adempiere.base/src/org/compiere/model/X_M_Production.java
index 78b4b9a068..31d4b55d6c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Production.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Production.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Production
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_Production extends PO implements I_M_Production, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_Production (Properties ctx, int M_Production_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ProductionLine.java b/org.adempiere.base/src/org/compiere/model/X_M_ProductionLine.java
index 8a41f76288..c826537d1d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ProductionLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ProductionLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ProductionLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_ProductionLine extends PO implements I_M_ProductionLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_ProductionLine (Properties ctx, int M_ProductionLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ProductionLineMA.java b/org.adempiere.base/src/org/compiere/model/X_M_ProductionLineMA.java
index 0e700172fb..f3aee63a00 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ProductionLineMA.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ProductionLineMA.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ProductionLineMA
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_ProductionLineMA extends PO implements I_M_ProductionLineMA, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_ProductionLineMA (Properties ctx, int M_ProductionLineMA_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ProductionPlan.java b/org.adempiere.base/src/org/compiere/model/X_M_ProductionPlan.java
index 0f53b29944..0cbe3332e8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ProductionPlan.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ProductionPlan.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ProductionPlan
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_ProductionPlan extends PO implements I_M_ProductionPlan, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_ProductionPlan (Properties ctx, int M_ProductionPlan_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Promotion.java b/org.adempiere.base/src/org/compiere/model/X_M_Promotion.java
index b1507f19b4..8c17b9a591 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Promotion.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Promotion.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Promotion
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_Promotion extends PO implements I_M_Promotion, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_Promotion (Properties ctx, int M_Promotion_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_PromotionDistribution.java b/org.adempiere.base/src/org/compiere/model/X_M_PromotionDistribution.java
index 1cac7cf25a..ddcd798011 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_PromotionDistribution.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_PromotionDistribution.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_PromotionDistribution
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_PromotionDistribution extends PO implements I_M_PromotionDistribution, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_PromotionDistribution (Properties ctx, int M_PromotionDistribution_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_PromotionGroup.java b/org.adempiere.base/src/org/compiere/model/X_M_PromotionGroup.java
index 84c412a868..e795bb1111 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_PromotionGroup.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_PromotionGroup.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_PromotionGroup
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_PromotionGroup extends PO implements I_M_PromotionGroup, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_PromotionGroup (Properties ctx, int M_PromotionGroup_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_PromotionGroupLine.java b/org.adempiere.base/src/org/compiere/model/X_M_PromotionGroupLine.java
index 34163b8f5e..03ef4eebef 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_PromotionGroupLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_PromotionGroupLine.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for M_PromotionGroupLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_PromotionGroupLine extends PO implements I_M_PromotionGroupLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_PromotionGroupLine (Properties ctx, int M_PromotionGroupLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_PromotionLine.java b/org.adempiere.base/src/org/compiere/model/X_M_PromotionLine.java
index 7e144ddf78..8be3285dea 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_PromotionLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_PromotionLine.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_PromotionLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_PromotionLine extends PO implements I_M_PromotionLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_PromotionLine (Properties ctx, int M_PromotionLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_PromotionPreCondition.java b/org.adempiere.base/src/org/compiere/model/X_M_PromotionPreCondition.java
index 4debe6faa2..8a91e2e9ec 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_PromotionPreCondition.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_PromotionPreCondition.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for M_PromotionPreCondition
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_PromotionPreCondition extends PO implements I_M_PromotionPreCondition, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_PromotionPreCondition (Properties ctx, int M_PromotionPreCondition_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_PromotionReward.java b/org.adempiere.base/src/org/compiere/model/X_M_PromotionReward.java
index 862e7f015d..77ad0dc5c5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_PromotionReward.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_PromotionReward.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_PromotionReward
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_PromotionReward extends PO implements I_M_PromotionReward, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_PromotionReward (Properties ctx, int M_PromotionReward_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_QualityTest.java b/org.adempiere.base/src/org/compiere/model/X_M_QualityTest.java
index 5dfd02cdb4..b5d33cc91b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_QualityTest.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_QualityTest.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_QualityTest
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_QualityTest extends PO implements I_M_QualityTest, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_QualityTest (Properties ctx, int M_QualityTest_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_QualityTestResult.java b/org.adempiere.base/src/org/compiere/model/X_M_QualityTestResult.java
index 578e4aef28..6d64d4fcad 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_QualityTestResult.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_QualityTestResult.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for M_QualityTestResult
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_QualityTestResult extends PO implements I_M_QualityTestResult, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_QualityTestResult (Properties ctx, int M_QualityTestResult_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_RMA.java b/org.adempiere.base/src/org/compiere/model/X_M_RMA.java
index fd23ea63f8..6c611bb0b7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_RMA.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_RMA.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_RMA
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_RMA extends PO implements I_M_RMA, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_RMA (Properties ctx, int M_RMA_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_RMALine.java b/org.adempiere.base/src/org/compiere/model/X_M_RMALine.java
index 28002fecc6..1d1b477b27 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_RMALine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_RMALine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_RMALine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_RMALine extends PO implements I_M_RMALine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_RMALine (Properties ctx, int M_RMALine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_RMATax.java b/org.adempiere.base/src/org/compiere/model/X_M_RMATax.java
index fbabafd5f8..b1dfb7b80b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_RMATax.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_RMATax.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_RMATax
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_RMATax extends PO implements I_M_RMATax, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_RMATax (Properties ctx, int M_RMATax_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_RMAType.java b/org.adempiere.base/src/org/compiere/model/X_M_RMAType.java
index 786e0b024d..a6674bec39 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_RMAType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_RMAType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_RMAType
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_RMAType extends PO implements I_M_RMAType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_RMAType (Properties ctx, int M_RMAType_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_RelatedProduct.java b/org.adempiere.base/src/org/compiere/model/X_M_RelatedProduct.java
index 8faeeac8d9..3c82521214 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_RelatedProduct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_RelatedProduct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for M_RelatedProduct
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_RelatedProduct extends PO implements I_M_RelatedProduct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_RelatedProduct (Properties ctx, int M_RelatedProduct_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Replenish.java b/org.adempiere.base/src/org/compiere/model/X_M_Replenish.java
index f1092cc673..9da150cb49 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Replenish.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Replenish.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_Replenish
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_Replenish extends PO implements I_M_Replenish, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_Replenish (Properties ctx, int M_Replenish_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Requisition.java b/org.adempiere.base/src/org/compiere/model/X_M_Requisition.java
index 549d126bcf..22f58c3003 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Requisition.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Requisition.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Requisition
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_Requisition extends PO implements I_M_Requisition, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_Requisition (Properties ctx, int M_Requisition_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_RequisitionLine.java b/org.adempiere.base/src/org/compiere/model/X_M_RequisitionLine.java
index d580bbcb6e..632da959a7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_RequisitionLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_RequisitionLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_RequisitionLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_RequisitionLine extends PO implements I_M_RequisitionLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_RequisitionLine (Properties ctx, int M_RequisitionLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_SerNoCtl.java b/org.adempiere.base/src/org/compiere/model/X_M_SerNoCtl.java
index bf40b2bcd7..b0dd4aa97b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_SerNoCtl.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_SerNoCtl.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_SerNoCtl
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_SerNoCtl extends PO implements I_M_SerNoCtl, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_SerNoCtl (Properties ctx, int M_SerNoCtl_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_SerNoCtlExclude.java b/org.adempiere.base/src/org/compiere/model/X_M_SerNoCtlExclude.java
index 67642082a1..b52ec549c5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_SerNoCtlExclude.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_SerNoCtlExclude.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for M_SerNoCtlExclude
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_SerNoCtlExclude extends PO implements I_M_SerNoCtlExclude, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_SerNoCtlExclude (Properties ctx, int M_SerNoCtlExclude_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Shipper.java b/org.adempiere.base/src/org/compiere/model/X_M_Shipper.java
index 8ac6f8d234..b5d76eda61 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Shipper.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Shipper.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for M_Shipper
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_Shipper extends PO implements I_M_Shipper, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_Shipper (Properties ctx, int M_Shipper_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ShipperCfg.java b/org.adempiere.base/src/org/compiere/model/X_M_ShipperCfg.java
index 88ebc91947..2d4476c5e1 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ShipperCfg.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ShipperCfg.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ShipperCfg
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_ShipperCfg extends PO implements I_M_ShipperCfg, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_ShipperCfg (Properties ctx, int M_ShipperCfg_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ShipperLabels.java b/org.adempiere.base/src/org/compiere/model/X_M_ShipperLabels.java
index c29614f5ee..d605188097 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ShipperLabels.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ShipperLabels.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for M_ShipperLabels
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_ShipperLabels extends PO implements I_M_ShipperLabels, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_ShipperLabels (Properties ctx, int M_ShipperLabels_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ShipperLabelsCfg.java b/org.adempiere.base/src/org/compiere/model/X_M_ShipperLabelsCfg.java
index 088d701d94..533cf310d6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ShipperLabelsCfg.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ShipperLabelsCfg.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ShipperLabelsCfg
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_ShipperLabelsCfg extends PO implements I_M_ShipperLabelsCfg, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_ShipperLabelsCfg (Properties ctx, int M_ShipperLabelsCfg_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ShipperPackaging.java b/org.adempiere.base/src/org/compiere/model/X_M_ShipperPackaging.java
index bce2b461d8..e0347c0f9c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ShipperPackaging.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ShipperPackaging.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_ShipperPackaging
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_ShipperPackaging extends PO implements I_M_ShipperPackaging, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_ShipperPackaging (Properties ctx, int M_ShipperPackaging_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ShipperPackagingCfg.java b/org.adempiere.base/src/org/compiere/model/X_M_ShipperPackagingCfg.java
index de0b4369d2..fbb0462d99 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ShipperPackagingCfg.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ShipperPackagingCfg.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ShipperPackagingCfg
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_ShipperPackagingCfg extends PO implements I_M_ShipperPackagingCfg, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_ShipperPackagingCfg (Properties ctx, int M_ShipperPackagingCfg_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ShipperPickupTypes.java b/org.adempiere.base/src/org/compiere/model/X_M_ShipperPickupTypes.java
index a0ef6b86c8..357646b248 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ShipperPickupTypes.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ShipperPickupTypes.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for M_ShipperPickupTypes
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_ShipperPickupTypes extends PO implements I_M_ShipperPickupTypes, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_ShipperPickupTypes (Properties ctx, int M_ShipperPickupTypes_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ShipperPickupTypesCfg.java b/org.adempiere.base/src/org/compiere/model/X_M_ShipperPickupTypesCfg.java
index 667d39f5f4..eaccb58ca8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ShipperPickupTypesCfg.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ShipperPickupTypesCfg.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ShipperPickupTypesCfg
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_ShipperPickupTypesCfg extends PO implements I_M_ShipperPickupTypesCfg, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_ShipperPickupTypesCfg (Properties ctx, int M_ShipperPickupTypesCfg_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ShippingProcessor.java b/org.adempiere.base/src/org/compiere/model/X_M_ShippingProcessor.java
index 9064f53fdf..e12e1a83f4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ShippingProcessor.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ShippingProcessor.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for M_ShippingProcessor
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_ShippingProcessor extends PO implements I_M_ShippingProcessor, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_ShippingProcessor (Properties ctx, int M_ShippingProcessor_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ShippingProcessorCfg.java b/org.adempiere.base/src/org/compiere/model/X_M_ShippingProcessorCfg.java
index 333c35d6ce..38e1561246 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ShippingProcessorCfg.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ShippingProcessorCfg.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ShippingProcessorCfg
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_ShippingProcessorCfg extends PO implements I_M_ShippingProcessorCfg, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_ShippingProcessorCfg (Properties ctx, int M_ShippingProcessorCfg_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ShippingTransaction.java b/org.adempiere.base/src/org/compiere/model/X_M_ShippingTransaction.java
index 8de79d27fc..8237b600f7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ShippingTransaction.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ShippingTransaction.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_ShippingTransaction
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_ShippingTransaction extends PO implements I_M_ShippingTransaction, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_ShippingTransaction (Properties ctx, int M_ShippingTransaction_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ShippingTransactionLine.java b/org.adempiere.base/src/org/compiere/model/X_M_ShippingTransactionLine.java
index 90f1dd9ce0..95e2e7cbaf 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ShippingTransactionLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ShippingTransactionLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ShippingTransactionLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_ShippingTransactionLine extends PO implements I_M_ShippingTransactionLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_ShippingTransactionLine (Properties ctx, int M_ShippingTransactionLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_StorageOnHand.java b/org.adempiere.base/src/org/compiere/model/X_M_StorageOnHand.java
index 10caa3dc05..a1d538af88 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_StorageOnHand.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_StorageOnHand.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_StorageOnHand
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_StorageOnHand extends PO implements I_M_StorageOnHand, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_StorageOnHand (Properties ctx, int M_StorageOnHand_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_StorageReservation.java b/org.adempiere.base/src/org/compiere/model/X_M_StorageReservation.java
index 7d6bb3389a..b5f0071c93 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_StorageReservation.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_StorageReservation.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_StorageReservation
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_StorageReservation extends PO implements I_M_StorageReservation, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_StorageReservation (Properties ctx, int M_StorageReservation_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Substitute.java b/org.adempiere.base/src/org/compiere/model/X_M_Substitute.java
index 267eca40ce..74c2e8854f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Substitute.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Substitute.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Substitute
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_Substitute extends PO implements I_M_Substitute, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_Substitute (Properties ctx, int M_Substitute_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Transaction.java b/org.adempiere.base/src/org/compiere/model/X_M_Transaction.java
index fba1d126a2..76e9ff4efa 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Transaction.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Transaction.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Transaction
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_Transaction extends PO implements I_M_Transaction, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_Transaction (Properties ctx, int M_Transaction_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_TransactionAllocation.java b/org.adempiere.base/src/org/compiere/model/X_M_TransactionAllocation.java
index afb0fdc9d6..f3abb5e40f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_TransactionAllocation.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_TransactionAllocation.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_TransactionAllocation
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_TransactionAllocation extends PO implements I_M_TransactionAllocation, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_TransactionAllocation (Properties ctx, int M_TransactionAllocation_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Warehouse.java b/org.adempiere.base/src/org/compiere/model/X_M_Warehouse.java
index b34188cb38..adb02209c2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Warehouse.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Warehouse.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Warehouse
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_Warehouse extends PO implements I_M_Warehouse, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_Warehouse (Properties ctx, int M_Warehouse_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Warehouse_Acct.java b/org.adempiere.base/src/org/compiere/model/X_M_Warehouse_Acct.java
index 920f808df2..843f0276db 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Warehouse_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Warehouse_Acct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for M_Warehouse_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_M_Warehouse_Acct extends PO implements I_M_Warehouse_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_M_Warehouse_Acct (Properties ctx, int M_Warehouse_Acct_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_Achievement.java b/org.adempiere.base/src/org/compiere/model/X_PA_Achievement.java
index 770e38694d..e8b1b6b028 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_Achievement.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_Achievement.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_Achievement
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PA_Achievement extends PO implements I_PA_Achievement, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PA_Achievement (Properties ctx, int PA_Achievement_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_Benchmark.java b/org.adempiere.base/src/org/compiere/model/X_PA_Benchmark.java
index 68d9390637..f766c561cb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_Benchmark.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_Benchmark.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_Benchmark
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PA_Benchmark extends PO implements I_PA_Benchmark, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PA_Benchmark (Properties ctx, int PA_Benchmark_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_BenchmarkData.java b/org.adempiere.base/src/org/compiere/model/X_PA_BenchmarkData.java
index 7443bae26f..9ebd073117 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_BenchmarkData.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_BenchmarkData.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_BenchmarkData
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PA_BenchmarkData extends PO implements I_PA_BenchmarkData, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PA_BenchmarkData (Properties ctx, int PA_BenchmarkData_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_ColorSchema.java b/org.adempiere.base/src/org/compiere/model/X_PA_ColorSchema.java
index 0ce8f8ad29..03174a78b0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_ColorSchema.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_ColorSchema.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_ColorSchema
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PA_ColorSchema extends PO implements I_PA_ColorSchema, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PA_ColorSchema (Properties ctx, int PA_ColorSchema_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_DashboardContent.java b/org.adempiere.base/src/org/compiere/model/X_PA_DashboardContent.java
index 16f5f981b4..d8ac61bc81 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_DashboardContent.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_DashboardContent.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_DashboardContent
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PA_DashboardContent extends PO implements I_PA_DashboardContent, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PA_DashboardContent (Properties ctx, int PA_DashboardContent_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_DashboardContent_Access.java b/org.adempiere.base/src/org/compiere/model/X_PA_DashboardContent_Access.java
index a1d931f383..34e5b416ff 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_DashboardContent_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_DashboardContent_Access.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for PA_DashboardContent_Access
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PA_DashboardContent_Access extends PO implements I_PA_DashboardContent_Access, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PA_DashboardContent_Access (Properties ctx, int PA_DashboardContent_Access_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_DashboardPreference.java b/org.adempiere.base/src/org/compiere/model/X_PA_DashboardPreference.java
index 9b946d4b96..9ee2a453c1 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_DashboardPreference.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_DashboardPreference.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for PA_DashboardPreference
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PA_DashboardPreference extends PO implements I_PA_DashboardPreference, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PA_DashboardPreference (Properties ctx, int PA_DashboardPreference_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_DocumentStatus.java b/org.adempiere.base/src/org/compiere/model/X_PA_DocumentStatus.java
index 80144d30df..189516efba 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_DocumentStatus.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_DocumentStatus.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for PA_DocumentStatus
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PA_DocumentStatus extends PO implements I_PA_DocumentStatus, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PA_DocumentStatus (Properties ctx, int PA_DocumentStatus_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_Goal.java b/org.adempiere.base/src/org/compiere/model/X_PA_Goal.java
index 626ad71b37..b423c94b71 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_Goal.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_Goal.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_Goal
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PA_Goal extends PO implements I_PA_Goal, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PA_Goal (Properties ctx, int PA_Goal_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_GoalRestriction.java b/org.adempiere.base/src/org/compiere/model/X_PA_GoalRestriction.java
index 00b9728002..b99d440889 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_GoalRestriction.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_GoalRestriction.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_GoalRestriction
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PA_GoalRestriction extends PO implements I_PA_GoalRestriction, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PA_GoalRestriction (Properties ctx, int PA_GoalRestriction_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_Hierarchy.java b/org.adempiere.base/src/org/compiere/model/X_PA_Hierarchy.java
index c173be6cf0..a4a8a91889 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_Hierarchy.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_Hierarchy.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_Hierarchy
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PA_Hierarchy extends PO implements I_PA_Hierarchy, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PA_Hierarchy (Properties ctx, int PA_Hierarchy_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_Measure.java b/org.adempiere.base/src/org/compiere/model/X_PA_Measure.java
index 07fc46b9f7..24c4c02b5f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_Measure.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_Measure.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_Measure
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PA_Measure extends PO implements I_PA_Measure, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PA_Measure (Properties ctx, int PA_Measure_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_MeasureCalc.java b/org.adempiere.base/src/org/compiere/model/X_PA_MeasureCalc.java
index 07cb4b0fd0..91c39132d4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_MeasureCalc.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_MeasureCalc.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_MeasureCalc
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PA_MeasureCalc extends PO implements I_PA_MeasureCalc, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PA_MeasureCalc (Properties ctx, int PA_MeasureCalc_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_Ratio.java b/org.adempiere.base/src/org/compiere/model/X_PA_Ratio.java
index 1643e645d9..ce97c213a9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_Ratio.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_Ratio.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_Ratio
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PA_Ratio extends PO implements I_PA_Ratio, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PA_Ratio (Properties ctx, int PA_Ratio_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_RatioElement.java b/org.adempiere.base/src/org/compiere/model/X_PA_RatioElement.java
index 7710779ead..462fafee6e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_RatioElement.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_RatioElement.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_RatioElement
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PA_RatioElement extends PO implements I_PA_RatioElement, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PA_RatioElement (Properties ctx, int PA_RatioElement_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_Report.java b/org.adempiere.base/src/org/compiere/model/X_PA_Report.java
index f48adf7693..420bcb3b3a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_Report.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_Report.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_Report
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PA_Report extends PO implements I_PA_Report, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PA_Report (Properties ctx, int PA_Report_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_ReportColumn.java b/org.adempiere.base/src/org/compiere/model/X_PA_ReportColumn.java
index a6e5a5763f..04dd25606b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_ReportColumn.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_ReportColumn.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_ReportColumn
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PA_ReportColumn (Properties ctx, int PA_ReportColumn_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_ReportColumnSet.java b/org.adempiere.base/src/org/compiere/model/X_PA_ReportColumnSet.java
index d46ae45953..8970a6f3aa 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_ReportColumnSet.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_ReportColumnSet.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_ReportColumnSet
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PA_ReportColumnSet extends PO implements I_PA_ReportColumnSet, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PA_ReportColumnSet (Properties ctx, int PA_ReportColumnSet_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_ReportCube.java b/org.adempiere.base/src/org/compiere/model/X_PA_ReportCube.java
index 1923ab43d0..d34a051a34 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_ReportCube.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_ReportCube.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_ReportCube
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PA_ReportCube extends PO implements I_PA_ReportCube, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PA_ReportCube (Properties ctx, int PA_ReportCube_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_ReportLine.java b/org.adempiere.base/src/org/compiere/model/X_PA_ReportLine.java
index 05f9391355..4fabea181e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_ReportLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_ReportLine.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_ReportLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PA_ReportLine extends PO implements I_PA_ReportLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PA_ReportLine (Properties ctx, int PA_ReportLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_ReportLineSet.java b/org.adempiere.base/src/org/compiere/model/X_PA_ReportLineSet.java
index c7278d121d..90794279af 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_ReportLineSet.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_ReportLineSet.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_ReportLineSet
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PA_ReportLineSet extends PO implements I_PA_ReportLineSet, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PA_ReportLineSet (Properties ctx, int PA_ReportLineSet_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_ReportSource.java b/org.adempiere.base/src/org/compiere/model/X_PA_ReportSource.java
index 521ffc2d66..276a5d3ab4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_ReportSource.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_ReportSource.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_ReportSource
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PA_ReportSource extends PO implements I_PA_ReportSource, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PA_ReportSource (Properties ctx, int PA_ReportSource_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_SLA_Criteria.java b/org.adempiere.base/src/org/compiere/model/X_PA_SLA_Criteria.java
index 4df3c00803..43fa8f664b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_SLA_Criteria.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_SLA_Criteria.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_SLA_Criteria
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PA_SLA_Criteria extends PO implements I_PA_SLA_Criteria, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PA_SLA_Criteria (Properties ctx, int PA_SLA_Criteria_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_SLA_Goal.java b/org.adempiere.base/src/org/compiere/model/X_PA_SLA_Goal.java
index 5c61d3ac64..8dc3fbf6ac 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_SLA_Goal.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_SLA_Goal.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_SLA_Goal
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PA_SLA_Goal extends PO implements I_PA_SLA_Goal, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PA_SLA_Goal (Properties ctx, int PA_SLA_Goal_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_SLA_Measure.java b/org.adempiere.base/src/org/compiere/model/X_PA_SLA_Measure.java
index aa70ab8067..f68acea351 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_SLA_Measure.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_SLA_Measure.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_SLA_Measure
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PA_SLA_Measure extends PO implements I_PA_SLA_Measure, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PA_SLA_Measure (Properties ctx, int PA_SLA_Measure_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_RV_BPartner.java b/org.adempiere.base/src/org/compiere/model/X_RV_BPartner.java
index b924f3cad8..a1c0af67ad 100644
--- a/org.adempiere.base/src/org/compiere/model/X_RV_BPartner.java
+++ b/org.adempiere.base/src/org/compiere/model/X_RV_BPartner.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for RV_BPartner
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_RV_BPartner extends PO implements I_RV_BPartner, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_RV_BPartner (Properties ctx, int RV_BPartner_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_RV_WarehousePrice.java b/org.adempiere.base/src/org/compiere/model/X_RV_WarehousePrice.java
index 3910fc94d9..e29bdc4596 100644
--- a/org.adempiere.base/src/org/compiere/model/X_RV_WarehousePrice.java
+++ b/org.adempiere.base/src/org/compiere/model/X_RV_WarehousePrice.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for RV_WarehousePrice
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_RV_WarehousePrice extends PO implements I_RV_WarehousePrice, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_RV_WarehousePrice (Properties ctx, int RV_WarehousePrice_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_Category.java b/org.adempiere.base/src/org/compiere/model/X_R_Category.java
index b4e3ef455a..650591b0f7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_Category.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_Category.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_Category
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_R_Category extends PO implements I_R_Category, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_R_Category (Properties ctx, int R_Category_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_CategoryUpdates.java b/org.adempiere.base/src/org/compiere/model/X_R_CategoryUpdates.java
index b9a666f7e5..77ca6f2eec 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_CategoryUpdates.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_CategoryUpdates.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for R_CategoryUpdates
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_R_CategoryUpdates extends PO implements I_R_CategoryUpdates, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_R_CategoryUpdates (Properties ctx, int R_CategoryUpdates_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_ContactInterest.java b/org.adempiere.base/src/org/compiere/model/X_R_ContactInterest.java
index 253606d4e3..b18f409b58 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_ContactInterest.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_ContactInterest.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_ContactInterest
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_R_ContactInterest extends PO implements I_R_ContactInterest, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_R_ContactInterest (Properties ctx, int R_ContactInterest_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_Group.java b/org.adempiere.base/src/org/compiere/model/X_R_Group.java
index a46e4932ba..adeb2ba63a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_Group.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_Group.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_Group
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_R_Group extends PO implements I_R_Group, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_R_Group (Properties ctx, int R_Group_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_GroupUpdates.java b/org.adempiere.base/src/org/compiere/model/X_R_GroupUpdates.java
index 8329a07949..609dedb960 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_GroupUpdates.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_GroupUpdates.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for R_GroupUpdates
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_R_GroupUpdates extends PO implements I_R_GroupUpdates, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_R_GroupUpdates (Properties ctx, int R_GroupUpdates_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_InterestArea.java b/org.adempiere.base/src/org/compiere/model/X_R_InterestArea.java
index 4ddd7d530e..eca0fa07d7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_InterestArea.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_InterestArea.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_InterestArea
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_R_InterestArea extends PO implements I_R_InterestArea, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_R_InterestArea (Properties ctx, int R_InterestArea_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_IssueKnown.java b/org.adempiere.base/src/org/compiere/model/X_R_IssueKnown.java
index 5563047de7..0b954751bf 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_IssueKnown.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_IssueKnown.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_IssueKnown
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_R_IssueKnown extends PO implements I_R_IssueKnown, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_R_IssueKnown (Properties ctx, int R_IssueKnown_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_IssueProject.java b/org.adempiere.base/src/org/compiere/model/X_R_IssueProject.java
index ea6e82cf6d..778337ad5a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_IssueProject.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_IssueProject.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_IssueProject
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_R_IssueProject extends PO implements I_R_IssueProject, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_R_IssueProject (Properties ctx, int R_IssueProject_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_IssueRecommendation.java b/org.adempiere.base/src/org/compiere/model/X_R_IssueRecommendation.java
index 6800d0bc0c..149a4012c3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_IssueRecommendation.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_IssueRecommendation.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_IssueRecommendation
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_R_IssueRecommendation extends PO implements I_R_IssueRecommendation, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_R_IssueRecommendation (Properties ctx, int R_IssueRecommendation_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_IssueStatus.java b/org.adempiere.base/src/org/compiere/model/X_R_IssueStatus.java
index 83faf2f888..5adf8812ec 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_IssueStatus.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_IssueStatus.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_IssueStatus
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_R_IssueStatus extends PO implements I_R_IssueStatus, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_R_IssueStatus (Properties ctx, int R_IssueStatus_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_IssueSystem.java b/org.adempiere.base/src/org/compiere/model/X_R_IssueSystem.java
index f5fa6d7edd..efb9af79c2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_IssueSystem.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_IssueSystem.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_IssueSystem
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_R_IssueSystem extends PO implements I_R_IssueSystem, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_R_IssueSystem (Properties ctx, int R_IssueSystem_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_IssueUser.java b/org.adempiere.base/src/org/compiere/model/X_R_IssueUser.java
index 7f24656abd..9928a6c4ba 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_IssueUser.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_IssueUser.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_IssueUser
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_R_IssueUser extends PO implements I_R_IssueUser, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_R_IssueUser (Properties ctx, int R_IssueUser_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_MailText.java b/org.adempiere.base/src/org/compiere/model/X_R_MailText.java
index 6b63ffb2dd..c9f3b0b06e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_MailText.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_MailText.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_MailText
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_R_MailText extends PO implements I_R_MailText, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_R_MailText (Properties ctx, int R_MailText_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_Request.java b/org.adempiere.base/src/org/compiere/model/X_R_Request.java
index 283026357d..078bda790e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_Request.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_Request.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_Request
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_R_Request extends PO implements I_R_Request, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_R_Request (Properties ctx, int R_Request_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_RequestAction.java b/org.adempiere.base/src/org/compiere/model/X_R_RequestAction.java
index c416defb80..9dc24604e4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_RequestAction.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_RequestAction.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for R_RequestAction
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_R_RequestAction extends PO implements I_R_RequestAction, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_R_RequestAction (Properties ctx, int R_RequestAction_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_RequestProcessor.java b/org.adempiere.base/src/org/compiere/model/X_R_RequestProcessor.java
index 062baf2ba0..11749b87d5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_RequestProcessor.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_RequestProcessor.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_RequestProcessor
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_R_RequestProcessor extends PO implements I_R_RequestProcessor, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_R_RequestProcessor (Properties ctx, int R_RequestProcessor_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_RequestProcessorLog.java b/org.adempiere.base/src/org/compiere/model/X_R_RequestProcessorLog.java
index e3aff02241..611e3d693a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_RequestProcessorLog.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_RequestProcessorLog.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for R_RequestProcessorLog
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_R_RequestProcessorLog extends PO implements I_R_RequestProcessorLog, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_R_RequestProcessorLog (Properties ctx, int R_RequestProcessorLog_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_RequestProcessor_Route.java b/org.adempiere.base/src/org/compiere/model/X_R_RequestProcessor_Route.java
index 683432f1c2..1a6c0568c8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_RequestProcessor_Route.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_RequestProcessor_Route.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_RequestProcessor_Route
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_R_RequestProcessor_Route extends PO implements I_R_RequestProcessor_Route, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_R_RequestProcessor_Route (Properties ctx, int R_RequestProcessor_Route_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_RequestType.java b/org.adempiere.base/src/org/compiere/model/X_R_RequestType.java
index 759584bb43..b86704e287 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_RequestType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_RequestType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_RequestType
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_R_RequestType extends PO implements I_R_RequestType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_R_RequestType (Properties ctx, int R_RequestType_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_RequestTypeUpdates.java b/org.adempiere.base/src/org/compiere/model/X_R_RequestTypeUpdates.java
index a7c27a3412..6b88be7b33 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_RequestTypeUpdates.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_RequestTypeUpdates.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for R_RequestTypeUpdates
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_R_RequestTypeUpdates extends PO implements I_R_RequestTypeUpdates, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_R_RequestTypeUpdates (Properties ctx, int R_RequestTypeUpdates_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_RequestUpdate.java b/org.adempiere.base/src/org/compiere/model/X_R_RequestUpdate.java
index a9dc2f4040..d21a5dbcc7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_RequestUpdate.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_RequestUpdate.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_RequestUpdate
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_R_RequestUpdate extends PO implements I_R_RequestUpdate, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_R_RequestUpdate (Properties ctx, int R_RequestUpdate_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_RequestUpdates.java b/org.adempiere.base/src/org/compiere/model/X_R_RequestUpdates.java
index e4c20a51a4..3a3b0995ed 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_RequestUpdates.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_RequestUpdates.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for R_RequestUpdates
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_R_RequestUpdates extends PO implements I_R_RequestUpdates, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_R_RequestUpdates (Properties ctx, int R_RequestUpdates_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_Resolution.java b/org.adempiere.base/src/org/compiere/model/X_R_Resolution.java
index 100ffe01e2..9a0e45321c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_Resolution.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_Resolution.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_Resolution
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_R_Resolution extends PO implements I_R_Resolution, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_R_Resolution (Properties ctx, int R_Resolution_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_StandardResponse.java b/org.adempiere.base/src/org/compiere/model/X_R_StandardResponse.java
index 39002555ea..f6dea8d0cc 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_StandardResponse.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_StandardResponse.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_StandardResponse
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_R_StandardResponse extends PO implements I_R_StandardResponse, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_R_StandardResponse (Properties ctx, int R_StandardResponse_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_Status.java b/org.adempiere.base/src/org/compiere/model/X_R_Status.java
index b189758a04..49237a5572 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_Status.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_Status.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_Status
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_R_Status extends PO implements I_R_Status, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_R_Status (Properties ctx, int R_Status_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_StatusCategory.java b/org.adempiere.base/src/org/compiere/model/X_R_StatusCategory.java
index f37201b06d..4275be1598 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_StatusCategory.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_StatusCategory.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_StatusCategory
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_R_StatusCategory extends PO implements I_R_StatusCategory, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_R_StatusCategory (Properties ctx, int R_StatusCategory_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_S_ExpenseType.java b/org.adempiere.base/src/org/compiere/model/X_S_ExpenseType.java
index 285b94d88d..63a0d11f3b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_S_ExpenseType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_S_ExpenseType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_ExpenseType
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_S_ExpenseType extends PO implements I_S_ExpenseType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_S_ExpenseType (Properties ctx, int S_ExpenseType_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_S_Resource.java b/org.adempiere.base/src/org/compiere/model/X_S_Resource.java
index 5e6733f6a9..844b02bb95 100644
--- a/org.adempiere.base/src/org/compiere/model/X_S_Resource.java
+++ b/org.adempiere.base/src/org/compiere/model/X_S_Resource.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_Resource
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_S_Resource extends PO implements I_S_Resource, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_S_Resource (Properties ctx, int S_Resource_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_S_ResourceAssignment.java b/org.adempiere.base/src/org/compiere/model/X_S_ResourceAssignment.java
index a343a2bbaf..6c9193da62 100644
--- a/org.adempiere.base/src/org/compiere/model/X_S_ResourceAssignment.java
+++ b/org.adempiere.base/src/org/compiere/model/X_S_ResourceAssignment.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_ResourceAssignment
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_S_ResourceAssignment extends PO implements I_S_ResourceAssignment, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_S_ResourceAssignment (Properties ctx, int S_ResourceAssignment_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_S_ResourceType.java b/org.adempiere.base/src/org/compiere/model/X_S_ResourceType.java
index db683b7469..021742a8c5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_S_ResourceType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_S_ResourceType.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_ResourceType
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_S_ResourceType extends PO implements I_S_ResourceType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_S_ResourceType (Properties ctx, int S_ResourceType_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_S_ResourceUnAvailable.java b/org.adempiere.base/src/org/compiere/model/X_S_ResourceUnAvailable.java
index cb66eea379..33a32fbb29 100644
--- a/org.adempiere.base/src/org/compiere/model/X_S_ResourceUnAvailable.java
+++ b/org.adempiere.base/src/org/compiere/model/X_S_ResourceUnAvailable.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_ResourceUnAvailable
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_S_ResourceUnAvailable extends PO implements I_S_ResourceUnAvailable, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_S_ResourceUnAvailable (Properties ctx, int S_ResourceUnAvailable_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_S_TimeExpense.java b/org.adempiere.base/src/org/compiere/model/X_S_TimeExpense.java
index 04b016e6d1..ca88cb873d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_S_TimeExpense.java
+++ b/org.adempiere.base/src/org/compiere/model/X_S_TimeExpense.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_TimeExpense
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_S_TimeExpense extends PO implements I_S_TimeExpense, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_S_TimeExpense (Properties ctx, int S_TimeExpense_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_S_TimeExpenseLine.java b/org.adempiere.base/src/org/compiere/model/X_S_TimeExpenseLine.java
index 6665aec13c..bc8bf45306 100644
--- a/org.adempiere.base/src/org/compiere/model/X_S_TimeExpenseLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_S_TimeExpenseLine.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_TimeExpenseLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_S_TimeExpenseLine extends PO implements I_S_TimeExpenseLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_S_TimeExpenseLine (Properties ctx, int S_TimeExpenseLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_S_TimeType.java b/org.adempiere.base/src/org/compiere/model/X_S_TimeType.java
index 38d127b6ac..1feece5959 100644
--- a/org.adempiere.base/src/org/compiere/model/X_S_TimeType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_S_TimeType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_TimeType
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_S_TimeType extends PO implements I_S_TimeType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_S_TimeType (Properties ctx, int S_TimeType_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_S_Training.java b/org.adempiere.base/src/org/compiere/model/X_S_Training.java
index 9721f4d54f..3d8d21101d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_S_Training.java
+++ b/org.adempiere.base/src/org/compiere/model/X_S_Training.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_Training
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_S_Training extends PO implements I_S_Training, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_S_Training (Properties ctx, int S_Training_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_S_Training_Class.java b/org.adempiere.base/src/org/compiere/model/X_S_Training_Class.java
index dc3eec43be..9b90b8aac8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_S_Training_Class.java
+++ b/org.adempiere.base/src/org/compiere/model/X_S_Training_Class.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_Training_Class
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_S_Training_Class extends PO implements I_S_Training_Class, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_S_Training_Class (Properties ctx, int S_Training_Class_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_T_1099Extract.java b/org.adempiere.base/src/org/compiere/model/X_T_1099Extract.java
index e005cd3f86..54cf1d6732 100644
--- a/org.adempiere.base/src/org/compiere/model/X_T_1099Extract.java
+++ b/org.adempiere.base/src/org/compiere/model/X_T_1099Extract.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for T_1099Extract
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_T_1099Extract extends PO implements I_T_1099Extract, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_T_1099Extract (Properties ctx, int T_1099Extract_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_T_Aging.java b/org.adempiere.base/src/org/compiere/model/X_T_Aging.java
index 46af9be08c..df5c4bb57b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_T_Aging.java
+++ b/org.adempiere.base/src/org/compiere/model/X_T_Aging.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for T_Aging
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_T_Aging extends PO implements I_T_Aging, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_T_Aging (Properties ctx, int T_Aging_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_T_BOM_Indented.java b/org.adempiere.base/src/org/compiere/model/X_T_BOM_Indented.java
index 2b56720da1..cc73c64dae 100644
--- a/org.adempiere.base/src/org/compiere/model/X_T_BOM_Indented.java
+++ b/org.adempiere.base/src/org/compiere/model/X_T_BOM_Indented.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for T_BOM_Indented
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_T_BOM_Indented extends PO implements I_T_BOM_Indented, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_T_BOM_Indented (Properties ctx, int T_BOM_Indented_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_T_BankRegister.java b/org.adempiere.base/src/org/compiere/model/X_T_BankRegister.java
index 6ae552c9d6..7c9ccf369d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_T_BankRegister.java
+++ b/org.adempiere.base/src/org/compiere/model/X_T_BankRegister.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for T_BankRegister
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_T_BankRegister extends PO implements I_T_BankRegister, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_T_BankRegister (Properties ctx, int T_BankRegister_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_T_CashFlow.java b/org.adempiere.base/src/org/compiere/model/X_T_CashFlow.java
index 76ba998f2b..b94e26f681 100644
--- a/org.adempiere.base/src/org/compiere/model/X_T_CashFlow.java
+++ b/org.adempiere.base/src/org/compiere/model/X_T_CashFlow.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for T_CashFlow
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_T_CashFlow extends PO implements I_T_CashFlow, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_T_CashFlow (Properties ctx, int T_CashFlow_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_T_DistributionRunDetail.java b/org.adempiere.base/src/org/compiere/model/X_T_DistributionRunDetail.java
index 858a7d54a3..e8fc4243db 100644
--- a/org.adempiere.base/src/org/compiere/model/X_T_DistributionRunDetail.java
+++ b/org.adempiere.base/src/org/compiere/model/X_T_DistributionRunDetail.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for T_DistributionRunDetail
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_T_DistributionRunDetail extends PO implements I_T_DistributionRunDetail, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_T_DistributionRunDetail (Properties ctx, int T_DistributionRunDetail_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_T_InventoryValue.java b/org.adempiere.base/src/org/compiere/model/X_T_InventoryValue.java
index 84fbda6a5c..604bd7c45e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_T_InventoryValue.java
+++ b/org.adempiere.base/src/org/compiere/model/X_T_InventoryValue.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for T_InventoryValue
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_T_InventoryValue extends PO implements I_T_InventoryValue, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_T_InventoryValue (Properties ctx, int T_InventoryValue_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_T_InvoiceGL.java b/org.adempiere.base/src/org/compiere/model/X_T_InvoiceGL.java
index 65247e9b8f..615cef0ff3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_T_InvoiceGL.java
+++ b/org.adempiere.base/src/org/compiere/model/X_T_InvoiceGL.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for T_InvoiceGL
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_T_InvoiceGL extends PO implements I_T_InvoiceGL, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_T_InvoiceGL (Properties ctx, int T_InvoiceGL_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_T_Reconciliation.java b/org.adempiere.base/src/org/compiere/model/X_T_Reconciliation.java
index 0ea44ca429..d354aa177a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_T_Reconciliation.java
+++ b/org.adempiere.base/src/org/compiere/model/X_T_Reconciliation.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for T_Reconciliation
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_T_Reconciliation extends PO implements I_T_Reconciliation, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_T_Reconciliation (Properties ctx, int T_Reconciliation_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_T_Replenish.java b/org.adempiere.base/src/org/compiere/model/X_T_Replenish.java
index 6af6f4a04e..f38431bb0f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_T_Replenish.java
+++ b/org.adempiere.base/src/org/compiere/model/X_T_Replenish.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for T_Replenish
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_T_Replenish extends PO implements I_T_Replenish, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_T_Replenish (Properties ctx, int T_Replenish_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_T_Report.java b/org.adempiere.base/src/org/compiere/model/X_T_Report.java
index be5977418a..4f400979fe 100644
--- a/org.adempiere.base/src/org/compiere/model/X_T_Report.java
+++ b/org.adempiere.base/src/org/compiere/model/X_T_Report.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for T_Report
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_T_Report extends PO implements I_T_Report, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_T_Report (Properties ctx, int T_Report_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_T_ReportStatement.java b/org.adempiere.base/src/org/compiere/model/X_T_ReportStatement.java
index 0b1c01a2d6..39a845b73d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_T_ReportStatement.java
+++ b/org.adempiere.base/src/org/compiere/model/X_T_ReportStatement.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for T_ReportStatement
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_T_ReportStatement extends PO implements I_T_ReportStatement, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_T_ReportStatement (Properties ctx, int T_ReportStatement_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_T_Transaction.java b/org.adempiere.base/src/org/compiere/model/X_T_Transaction.java
index 1915c8776e..794ddc60bf 100644
--- a/org.adempiere.base/src/org/compiere/model/X_T_Transaction.java
+++ b/org.adempiere.base/src/org/compiere/model/X_T_Transaction.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for T_Transaction
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_T_Transaction extends PO implements I_T_Transaction, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_T_Transaction (Properties ctx, int T_Transaction_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_Test.java b/org.adempiere.base/src/org/compiere/model/X_Test.java
index 311be44dfa..373f6a2bd1 100644
--- a/org.adempiere.base/src/org/compiere/model/X_Test.java
+++ b/org.adempiere.base/src/org/compiere/model/X_Test.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for Test
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_Test extends PO implements I_Test, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_Test (Properties ctx, int Test_ID, String trxName)
@@ -217,6 +217,20 @@ public class X_Test extends PO implements I_Test, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Color.
+		@param Color Color	  */
+	public void setColor (String Color)
+	{
+		set_Value (COLUMNNAME_Color, Color);
+	}
+
+	/** Get Color.
+		@return Color	  */
+	public String getColor () 
+	{
+		return (String)get_Value(COLUMNNAME_Color);
+	}
+
 	public org.compiere.model.I_C_Payment getC_Payment() throws RuntimeException
     {
 		return (org.compiere.model.I_C_Payment)MTable.get(getCtx(), org.compiere.model.I_C_Payment.Table_Name)
diff --git a/org.adempiere.base/src/org/compiere/model/X_U_BlackListCheque.java b/org.adempiere.base/src/org/compiere/model/X_U_BlackListCheque.java
index 7922f853ee..f7b1bec3f3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_U_BlackListCheque.java
+++ b/org.adempiere.base/src/org/compiere/model/X_U_BlackListCheque.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for U_BlackListCheque
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_U_BlackListCheque extends PO implements I_U_BlackListCheque, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_U_BlackListCheque (Properties ctx, int U_BlackListCheque_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_U_POSTerminal.java b/org.adempiere.base/src/org/compiere/model/X_U_POSTerminal.java
index e7401f4fa8..a7c943cb63 100644
--- a/org.adempiere.base/src/org/compiere/model/X_U_POSTerminal.java
+++ b/org.adempiere.base/src/org/compiere/model/X_U_POSTerminal.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for U_POSTerminal
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_U_POSTerminal extends PO implements I_U_POSTerminal, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_U_POSTerminal (Properties ctx, int U_POSTerminal_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_U_RoleMenu.java b/org.adempiere.base/src/org/compiere/model/X_U_RoleMenu.java
index 5a6b926337..98bee63961 100644
--- a/org.adempiere.base/src/org/compiere/model/X_U_RoleMenu.java
+++ b/org.adempiere.base/src/org/compiere/model/X_U_RoleMenu.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for U_RoleMenu
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_U_RoleMenu extends PO implements I_U_RoleMenu, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_U_RoleMenu (Properties ctx, int U_RoleMenu_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_U_WebMenu.java b/org.adempiere.base/src/org/compiere/model/X_U_WebMenu.java
index fa53b4787b..c6b469883d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_U_WebMenu.java
+++ b/org.adempiere.base/src/org/compiere/model/X_U_WebMenu.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for U_WebMenu
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_U_WebMenu extends PO implements I_U_WebMenu, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_U_WebMenu (Properties ctx, int U_WebMenu_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_U_Web_Properties.java b/org.adempiere.base/src/org/compiere/model/X_U_Web_Properties.java
index b0378e1e5d..2aec7ba39f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_U_Web_Properties.java
+++ b/org.adempiere.base/src/org/compiere/model/X_U_Web_Properties.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for U_Web_Properties
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_U_Web_Properties extends PO implements I_U_Web_Properties, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_U_Web_Properties (Properties ctx, int U_Web_Properties_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_WS_WebService.java b/org.adempiere.base/src/org/compiere/model/X_WS_WebService.java
index aab4d62f32..8b51da91f8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_WS_WebService.java
+++ b/org.adempiere.base/src/org/compiere/model/X_WS_WebService.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for WS_WebService
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_WS_WebService extends PO implements I_WS_WebService, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_WS_WebService (Properties ctx, int WS_WebService_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceFieldInput.java b/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceFieldInput.java
index 2e3d12d51b..096b79a69b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceFieldInput.java
+++ b/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceFieldInput.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for WS_WebServiceFieldInput
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_WS_WebServiceFieldInput extends PO implements I_WS_WebServiceFieldInput, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_WS_WebServiceFieldInput (Properties ctx, int WS_WebServiceFieldInput_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceFieldOutput.java b/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceFieldOutput.java
index 705cb6c9d8..ac41fd0674 100644
--- a/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceFieldOutput.java
+++ b/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceFieldOutput.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for WS_WebServiceFieldOutput
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_WS_WebServiceFieldOutput extends PO implements I_WS_WebServiceFieldOutput, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_WS_WebServiceFieldOutput (Properties ctx, int WS_WebServiceFieldOutput_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceMethod.java b/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceMethod.java
index 83f2ff7c56..fa59ec38d4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceMethod.java
+++ b/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceMethod.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for WS_WebServiceMethod
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_WS_WebServiceMethod extends PO implements I_WS_WebServiceMethod, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_WS_WebServiceMethod (Properties ctx, int WS_WebServiceMethod_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceType.java b/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceType.java
index 265d6e62b8..f2d786c205 100644
--- a/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for WS_WebServiceType
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_WS_WebServiceType extends PO implements I_WS_WebServiceType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_WS_WebServiceType (Properties ctx, int WS_WebServiceType_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceTypeAccess.java b/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceTypeAccess.java
index 289ed57d99..43128984b4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceTypeAccess.java
+++ b/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceTypeAccess.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for WS_WebServiceTypeAccess
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_WS_WebServiceTypeAccess extends PO implements I_WS_WebServiceTypeAccess, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_WS_WebServiceTypeAccess (Properties ctx, int WS_WebServiceTypeAccess_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_WS_WebService_Para.java b/org.adempiere.base/src/org/compiere/model/X_WS_WebService_Para.java
index 17de8c9951..fa6e871a0c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_WS_WebService_Para.java
+++ b/org.adempiere.base/src/org/compiere/model/X_WS_WebService_Para.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for WS_WebService_Para
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_WS_WebService_Para extends PO implements I_WS_WebService_Para, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_WS_WebService_Para (Properties ctx, int WS_WebService_Para_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_W_Advertisement.java b/org.adempiere.base/src/org/compiere/model/X_W_Advertisement.java
index 723294f4cb..a737da749c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_W_Advertisement.java
+++ b/org.adempiere.base/src/org/compiere/model/X_W_Advertisement.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for W_Advertisement
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_W_Advertisement extends PO implements I_W_Advertisement, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_W_Advertisement (Properties ctx, int W_Advertisement_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_W_Basket.java b/org.adempiere.base/src/org/compiere/model/X_W_Basket.java
index 70d932fc25..aed5a89911 100644
--- a/org.adempiere.base/src/org/compiere/model/X_W_Basket.java
+++ b/org.adempiere.base/src/org/compiere/model/X_W_Basket.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for W_Basket
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_W_Basket extends PO implements I_W_Basket, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_W_Basket (Properties ctx, int W_Basket_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_W_BasketLine.java b/org.adempiere.base/src/org/compiere/model/X_W_BasketLine.java
index d30e99e8a8..8c34b3669f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_W_BasketLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_W_BasketLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for W_BasketLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_W_BasketLine extends PO implements I_W_BasketLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_W_BasketLine (Properties ctx, int W_BasketLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_W_Click.java b/org.adempiere.base/src/org/compiere/model/X_W_Click.java
index 263f37ca07..ce6c7a6198 100644
--- a/org.adempiere.base/src/org/compiere/model/X_W_Click.java
+++ b/org.adempiere.base/src/org/compiere/model/X_W_Click.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for W_Click
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_W_Click extends PO implements I_W_Click, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_W_Click (Properties ctx, int W_Click_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_W_ClickCount.java b/org.adempiere.base/src/org/compiere/model/X_W_ClickCount.java
index 57ec0665a4..1e53c5c162 100644
--- a/org.adempiere.base/src/org/compiere/model/X_W_ClickCount.java
+++ b/org.adempiere.base/src/org/compiere/model/X_W_ClickCount.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for W_ClickCount
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_W_ClickCount extends PO implements I_W_ClickCount, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_W_ClickCount (Properties ctx, int W_ClickCount_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_W_Counter.java b/org.adempiere.base/src/org/compiere/model/X_W_Counter.java
index beae7a9429..9349ea2abf 100644
--- a/org.adempiere.base/src/org/compiere/model/X_W_Counter.java
+++ b/org.adempiere.base/src/org/compiere/model/X_W_Counter.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for W_Counter
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_W_Counter extends PO implements I_W_Counter, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_W_Counter (Properties ctx, int W_Counter_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_W_CounterCount.java b/org.adempiere.base/src/org/compiere/model/X_W_CounterCount.java
index d972274bce..983e98b835 100644
--- a/org.adempiere.base/src/org/compiere/model/X_W_CounterCount.java
+++ b/org.adempiere.base/src/org/compiere/model/X_W_CounterCount.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for W_CounterCount
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_W_CounterCount extends PO implements I_W_CounterCount, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_W_CounterCount (Properties ctx, int W_CounterCount_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_W_MailMsg.java b/org.adempiere.base/src/org/compiere/model/X_W_MailMsg.java
index 9e6383d5f3..ad155c9fb6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_W_MailMsg.java
+++ b/org.adempiere.base/src/org/compiere/model/X_W_MailMsg.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for W_MailMsg
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_W_MailMsg extends PO implements I_W_MailMsg, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_W_MailMsg (Properties ctx, int W_MailMsg_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/X_W_Store.java b/org.adempiere.base/src/org/compiere/model/X_W_Store.java
index 9158fb2e4f..177ccadf4e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_W_Store.java
+++ b/org.adempiere.base/src/org/compiere/model/X_W_Store.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for W_Store
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_W_Store extends PO implements I_W_Store, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_W_Store (Properties ctx, int W_Store_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/print/DataEngine.java b/org.adempiere.base/src/org/compiere/print/DataEngine.java
index a7d80cc06c..e65a67f1a6 100644
--- a/org.adempiere.base/src/org/compiere/print/DataEngine.java
+++ b/org.adempiere.base/src/org/compiere/print/DataEngine.java
@@ -984,7 +984,7 @@ public class DataEngine
 								if (!rs.wasNull())
 								{
 									boolean b = s.equals("Y");
-									pde = new PrintDataElement(pdc.getColumnName(), new Boolean(b), pdc.getDisplayType(), pdc.getFormatPattern());
+									pde = new PrintDataElement(pdc.getColumnName(), Boolean.valueOf(b), pdc.getDisplayType(), pdc.getFormatPattern());
 								}
 							}
 							else if (pdc.getDisplayType() == DisplayType.TextLong)
diff --git a/org.adempiere.base/src/org/compiere/print/MPrintColor.java b/org.adempiere.base/src/org/compiere/print/MPrintColor.java
index 9d69c80124..489f3b8f08 100644
--- a/org.adempiere.base/src/org/compiere/print/MPrintColor.java
+++ b/org.adempiere.base/src/org/compiere/print/MPrintColor.java
@@ -92,7 +92,7 @@ public class MPrintColor extends X_AD_PrintColor
 	{
 	//	if (AD_PrintColor_ID == 0)
 	//		return new MPrintColor (ctx, 0);
-		Integer key = new Integer(AD_PrintColor_ID);
+		Integer key = Integer.valueOf(AD_PrintColor_ID);
 		MPrintColor pc = (MPrintColor)s_colors.get(key);
 		if (pc == null)
 		{
diff --git a/org.adempiere.base/src/org/compiere/print/MPrintFont.java b/org.adempiere.base/src/org/compiere/print/MPrintFont.java
index 5b0d28dd54..ea70daabc4 100644
--- a/org.adempiere.base/src/org/compiere/print/MPrintFont.java
+++ b/org.adempiere.base/src/org/compiere/print/MPrintFont.java
@@ -205,7 +205,7 @@ public class MPrintFont extends X_AD_PrintFont
 	 */
 	static public MPrintFont get (int AD_PrintFont_ID)
 	{
-		Integer key = new Integer(AD_PrintFont_ID);
+		Integer key = Integer.valueOf(AD_PrintFont_ID);
 		MPrintFont pf = (MPrintFont)s_fonts.get(key);
 		if (pf == null)
 		{
diff --git a/org.adempiere.base/src/org/compiere/print/MPrintFormat.java b/org.adempiere.base/src/org/compiere/print/MPrintFormat.java
index 90381f9579..a69b64d256 100644
--- a/org.adempiere.base/src/org/compiere/print/MPrintFormat.java
+++ b/org.adempiere.base/src/org/compiere/print/MPrintFormat.java
@@ -147,7 +147,7 @@ public class MPrintFormat extends X_AD_PrintFormat
 		{
 			//	Sort Order and Column must be > 0
 			if (m_items[i].getSortNo() != 0 && m_items[i].getAD_Column_ID() != 0)
-				map.put(new Integer(m_items[i].getSortNo()), new Integer(m_items[i].getAD_Column_ID()));
+				map.put(Integer.valueOf(m_items[i].getSortNo()), Integer.valueOf(m_items[i].getAD_Column_ID()));
 		}
 		//	Get SortNo and Sort them
 		Integer[] keys = new Integer[map.keySet().size()];
@@ -174,7 +174,7 @@ public class MPrintFormat extends X_AD_PrintFormat
 		for (int i = 0; i < m_items.length; i++)
 		{
 			if (m_items[i].getAD_Column_ID() != 0 && m_items[i].isPrinted())
-				list.add(new Integer(m_items[i].getAD_Column_ID()));
+				list.add(Integer.valueOf(m_items[i].getAD_Column_ID()));
 		}
 		//	Convert
 		int[] retValue = new int[list.size()];
@@ -1087,7 +1087,7 @@ public class MPrintFormat extends X_AD_PrintFormat
 	 */
 	static public MPrintFormat get (Properties ctx, int AD_PrintFormat_ID, boolean readFromDisk)
 	{
-		Integer key = new Integer(AD_PrintFormat_ID);
+		Integer key = Integer.valueOf(AD_PrintFormat_ID);
 		MPrintFormat pf = null;
 		if (!readFromDisk)
 			pf = (MPrintFormat)s_formats.get(key);
@@ -1154,7 +1154,7 @@ public class MPrintFormat extends X_AD_PrintFormat
 	 */
 	static public void deleteFromCache (int AD_PrintFormat_ID)
 	{
-		Integer key = new Integer(AD_PrintFormat_ID);
+		Integer key = Integer.valueOf(AD_PrintFormat_ID);
 		s_formats.put(key, null);
 	}	//	deleteFromCache
 
@@ -1197,9 +1197,9 @@ public class MPrintFormat extends X_AD_PrintFormat
 		// add sql parameter
 		List<Object> lsParameter = new ArrayList<Object>();
 
-		lsParameter.add(new Integer(AD_Table_ID));
+		lsParameter.add(Integer.valueOf(AD_Table_ID));
 		if (AD_Window_ID > 0)
-			lsParameter.add(new Integer(AD_Window_ID));		
+			lsParameter.add(Integer.valueOf(AD_Window_ID));		
 		
 		// init query
 		Query query = new Query(Env.getCtx(), MPrintFormat.Table_Name, sqlWhere, trxName);
diff --git a/org.adempiere.base/src/org/compiere/print/MPrintFormatItem.java b/org.adempiere.base/src/org/compiere/print/MPrintFormatItem.java
index 8035008339..96c2bf1145 100644
--- a/org.adempiere.base/src/org/compiere/print/MPrintFormatItem.java
+++ b/org.adempiere.base/src/org/compiere/print/MPrintFormatItem.java
@@ -392,7 +392,7 @@ public class MPrintFormatItem extends X_AD_PrintFormatItem
 	public String getColumnName()
 	{
 		if (m_columnName == null)	//	Get Column Name from AD_Column not index
-			m_columnName = getColumnName (new Integer(getAD_Column_ID()));
+			m_columnName = getColumnName (Integer.valueOf(getAD_Column_ID()));
 		return m_columnName;
 	}	//	getColumnName
 
diff --git a/org.adempiere.base/src/org/compiere/print/MPrintPaper.java b/org.adempiere.base/src/org/compiere/print/MPrintPaper.java
index ed153ab6e0..d6bb08dc5a 100644
--- a/org.adempiere.base/src/org/compiere/print/MPrintPaper.java
+++ b/org.adempiere.base/src/org/compiere/print/MPrintPaper.java
@@ -62,7 +62,7 @@ public class MPrintPaper extends X_AD_PrintPaper
 	 */
 	static public MPrintPaper get (int AD_PrintPaper_ID)
 	{
-		Integer key = new Integer(AD_PrintPaper_ID);
+		Integer key = Integer.valueOf(AD_PrintPaper_ID);
 		MPrintPaper pp = (MPrintPaper)s_papers.get(key);
 		if (pp == null)
 		{
diff --git a/org.adempiere.base/src/org/compiere/print/MPrintTableFormat.java b/org.adempiere.base/src/org/compiere/print/MPrintTableFormat.java
index 558ba699c8..50afc0c615 100644
--- a/org.adempiere.base/src/org/compiere/print/MPrintTableFormat.java
+++ b/org.adempiere.base/src/org/compiere/print/MPrintTableFormat.java
@@ -549,7 +549,7 @@ public class MPrintTableFormat extends X_AD_PrintTableFormat
 	 */
 	static public MPrintTableFormat get (Properties ctx, int AD_PrintTableFormat_ID, Font standard_font)
 	{
-		Integer ii = new Integer (AD_PrintTableFormat_ID);
+		Integer ii = Integer.valueOf(AD_PrintTableFormat_ID);
 		MPrintTableFormat tf = (MPrintTableFormat)s_cache.get(ii);
 		if (tf == null)
 		{
diff --git a/org.adempiere.base/src/org/compiere/print/PrintData.java b/org.adempiere.base/src/org/compiere/print/PrintData.java
index 9af356724d..723760c46f 100644
--- a/org.adempiere.base/src/org/compiere/print/PrintData.java
+++ b/org.adempiere.base/src/org/compiere/print/PrintData.java
@@ -252,9 +252,9 @@ public class PrintData implements Serializable
 	{
 		m_matrix.addRow(nodes);
 		if (functionRow)
-			m_functionRows.add(new Integer(m_matrix.getRowIndex()));
+			m_functionRows.add(Integer.valueOf(m_matrix.getRowIndex()));
 		if (m_hasLevelNo && levelNo != 0)
-			addNode(new PrintDataElement(LEVEL_NO, new Integer(levelNo), DisplayType.Integer, null));
+			addNode(new PrintDataElement(LEVEL_NO, Integer.valueOf(levelNo), DisplayType.Integer, null));
 	}	//	addRow
 
 	/**
@@ -301,7 +301,7 @@ public class PrintData implements Serializable
 	 */
 	public boolean isFunctionRow (int row)
 	{
-		return m_functionRows.contains(new Integer(row));
+		return m_functionRows.contains(Integer.valueOf(row));
 	}	//	isFunctionRow
 
 	/**
@@ -310,7 +310,7 @@ public class PrintData implements Serializable
 	 */
 	public boolean isFunctionRow ()
 	{
-		return m_functionRows.contains(new Integer(m_matrix.getRowIndex()));
+		return m_functionRows.contains(Integer.valueOf(m_matrix.getRowIndex()));
 	}	//	isFunctionRow
 
 	/**
diff --git a/org.adempiere.base/src/org/compiere/print/PrintDataFunction.java b/org.adempiere.base/src/org/compiere/print/PrintDataFunction.java
index ddba97f545..86d2444c20 100644
--- a/org.adempiere.base/src/org/compiere/print/PrintDataFunction.java
+++ b/org.adempiere.base/src/org/compiere/print/PrintDataFunction.java
@@ -17,6 +17,7 @@
 package org.compiere.print;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 
 import org.compiere.util.DisplayType;
 import org.compiere.util.Env;
@@ -132,25 +133,25 @@ public class PrintDataFunction
 		//	Mean = sum/count - round to 4 digits
 		if (function == F_MEAN)
 		{
-			BigDecimal mean = m_sum.divide(count, 4, BigDecimal.ROUND_HALF_UP);
+			BigDecimal mean = m_sum.divide(count, 4, RoundingMode.HALF_UP);
 			if (mean.scale() > 4)
-				mean = mean.setScale(4, BigDecimal.ROUND_HALF_UP);
+				mean = mean.setScale(4, RoundingMode.HALF_UP);
 			return mean;
 		}
 		//	Variance = ( sum of squares - (square of sum / count) ) / count
 		BigDecimal ss = m_sum.multiply(m_sum);
-		ss = ss.divide(count, 10, BigDecimal.ROUND_HALF_UP);
-		BigDecimal variance = m_sumSquare.subtract(ss).divide(count, 10, BigDecimal.ROUND_HALF_UP);
+		ss = ss.divide(count, 10, RoundingMode.HALF_UP);
+		BigDecimal variance = m_sumSquare.subtract(ss).divide(count, 10, RoundingMode.HALF_UP);
 		if (function == F_VARIANCE)
 		{
 			if (variance.scale() > 4)
-				variance = variance.setScale(4, BigDecimal.ROUND_HALF_UP);
+				variance = variance.setScale(4, RoundingMode.HALF_UP);
 			return variance;
 		}
 		//	Standard Deviation
 		BigDecimal deviation = BigDecimal.valueOf(Math.sqrt(variance.doubleValue()));
 		if (deviation.scale() > 4)
-			deviation = deviation.setScale(4, BigDecimal.ROUND_HALF_UP);
+			deviation = deviation.setScale(4, RoundingMode.HALF_UP);
 		return deviation;
 	}	//	getValue
 
diff --git a/org.adempiere.base/src/org/compiere/print/ReportEngine.java b/org.adempiere.base/src/org/compiere/print/ReportEngine.java
index 0de7d5fcbc..f8577f1ee5 100644
--- a/org.adempiere.base/src/org/compiere/print/ReportEngine.java
+++ b/org.adempiere.base/src/org/compiere/print/ReportEngine.java
@@ -729,7 +729,7 @@ queued-job-count = 0  (class javax.print.attribute.standard.QueuedJobCount)
 						{
 							td td = new td();
 							tr.addElement(td);
-							Object obj = m_printData.getNode(new Integer(item.getAD_Column_ID()));
+							Object obj = m_printData.getNode(Integer.valueOf(item.getAD_Column_ID()));
 							if (obj == null){
 								td.addElement("&nbsp;");
 								if (colSuppressRepeats[printColIndex]){
@@ -945,7 +945,7 @@ queued-job-count = 0  (class javax.print.attribute.standard.QueuedJobCount)
 						else
 						{
 							printColIndex++;
-							Object obj = m_printData.getNode(new Integer(item.getAD_Column_ID()));
+							Object obj = m_printData.getNode(Integer.valueOf(item.getAD_Column_ID()));
 							String data = "";
 							if (obj == null){
 								if (colSuppressRepeats[printColIndex]){
diff --git a/org.adempiere.base/src/org/compiere/print/layout/ImageElement.java b/org.adempiere.base/src/org/compiere/print/layout/ImageElement.java
index 170b01cb0c..1aa56b9982 100644
--- a/org.adempiere.base/src/org/compiere/print/layout/ImageElement.java
+++ b/org.adempiere.base/src/org/compiere/print/layout/ImageElement.java
@@ -89,7 +89,7 @@ public class ImageElement extends PrintElement
 	 */
 	public static ImageElement get (int AD_PrintFormatItem_ID)
 	{
-		Object key = new Integer(AD_PrintFormatItem_ID);
+		Object key = Integer.valueOf(AD_PrintFormatItem_ID);
 		ImageElement image = (ImageElement)s_cache.get(key);
 		if (image == null)
 		{
diff --git a/org.adempiere.base/src/org/compiere/print/layout/LayoutEngine.java b/org.adempiere.base/src/org/compiere/print/layout/LayoutEngine.java
index e2abc30d48..4e551fb4c8 100644
--- a/org.adempiere.base/src/org/compiere/print/layout/LayoutEngine.java
+++ b/org.adempiere.base/src/org/compiere/print/layout/LayoutEngine.java
@@ -1233,7 +1233,7 @@ public class LayoutEngine implements Pageable, Printable, Doc
 		int AD_Column_ID = item.getAD_Column_ID();
 		if (log.isLoggable(Level.INFO)) log.info(format + " - Item=" + item.getName() + " (" + AD_Column_ID + ")");
 		//
-		Object obj = data.getNode(new Integer(AD_Column_ID));
+		Object obj = data.getNode(Integer.valueOf(AD_Column_ID));
 		//	Object obj = data.getNode(item.getColumnName());	//	slower
 		if (obj == null)
 		{
@@ -1267,7 +1267,7 @@ public class LayoutEngine implements Pageable, Printable, Doc
 			return null;
 		}
 		MQuery query = new MQuery (format.getAD_Table_ID());
-		query.addRestriction(item.getColumnName(), MQuery.EQUAL, new Integer(Record_ID));
+		query.addRestriction(item.getColumnName(), MQuery.EQUAL, Integer.valueOf(Record_ID));
 		format.setTranslationViewQuery(query);
 		if (log.isLoggable(Level.FINE))
 			log.fine(query.toString());
@@ -1363,7 +1363,7 @@ public class LayoutEngine implements Pageable, Printable, Doc
 		String FieldAlignmentType, boolean isForm)
 	{
 		//	Get Data
-		Object obj = m_data.getNode(new Integer(item.getAD_Column_ID()));
+		Object obj = m_data.getNode(Integer.valueOf(item.getAD_Column_ID()));
 		if (obj == null)
 			return null;
 		else if (obj instanceof PrintDataElement)
@@ -1479,7 +1479,7 @@ public class LayoutEngine implements Pageable, Printable, Doc
 	 */
 	private PrintElement createImageElement (MPrintFormatItem item, PrintData printData)
 	{
-		Object obj = printData.getNode(new Integer(item.getAD_Column_ID())); 
+		Object obj = printData.getNode(Integer.valueOf(item.getAD_Column_ID())); 
 		if (obj == null)
 			return null;
 		else if (obj instanceof PrintDataElement)
@@ -1518,7 +1518,7 @@ public class LayoutEngine implements Pageable, Printable, Doc
 	private PrintElement createBarcodeElement (MPrintFormatItem item, PrintData printData)
 	{
 		//	Get Data
-		Object obj = printData.getNode(new Integer(item.getAD_Column_ID()));
+		Object obj = printData.getNode(Integer.valueOf(item.getAD_Column_ID()));
 		if (obj == null)
 			return null;
 		else if (obj instanceof PrintDataElement)
@@ -1620,7 +1620,7 @@ public class LayoutEngine implements Pageable, Printable, Doc
 			{
 				if (item.isNextLine() && item.getBelowColumn() != 0)
 				{
-					additionalLines.put(new Integer(col), new Integer(item.getBelowColumn()-1));
+					additionalLines.put(Integer.valueOf(col), Integer.valueOf(item.getBelowColumn()-1));
 					if (!item.isSuppressNull())
 					{
 						item.setIsSuppressNull(true);	//	display size will be set to 0 in TableElement
@@ -1676,13 +1676,13 @@ public class LayoutEngine implements Pageable, Printable, Doc
 			printData.setRowIndex(row);
 			if (printData.isFunctionRow())
 			{
-				functionRows.add(new Integer(row));
+				functionRows.add(Integer.valueOf(row));
 				rowColFont.put(new Point(row, TableElement.ALL), tf.getFunct_Font());
 				rowColColor.put(new Point(row, TableElement.ALL), tf.getFunctFG_Color());
 				rowColBackground.put(new Point(row, TableElement.ALL), tf.getFunctBG_Color());
 				if (printData.isPageBreak())
 				{
-					pageBreak.add(new Integer(row));
+					pageBreak.add(Integer.valueOf(row));
 					if (log.isLoggable(Level.FINER))
 						log.finer("PageBreak row=" + row);
 				}
@@ -1737,7 +1737,7 @@ public class LayoutEngine implements Pageable, Printable, Doc
 					{
 						Object obj = null;
 						if (item.getAD_Column_ID() > 0) // teo_sarca, [ 1673542 ]
-							obj = printData.getNode(new Integer(item.getAD_Column_ID()));
+							obj = printData.getNode(Integer.valueOf(item.getAD_Column_ID()));
 						if (obj == null)
 							;
 						else if (obj instanceof PrintDataElement)
diff --git a/org.adempiere.base/src/org/compiere/print/layout/StringElement.java b/org.adempiere.base/src/org/compiere/print/layout/StringElement.java
index 445d6a5f88..c892872ed2 100644
--- a/org.adempiere.base/src/org/compiere/print/layout/StringElement.java
+++ b/org.adempiere.base/src/org/compiere/print/layout/StringElement.java
@@ -380,7 +380,7 @@ public class StringElement extends PrintElement
 			String tableName = MQuery.getZoomTableName(columnName);
 			Object code = m_ID.getID();
 			if (m_ID instanceof KeyNamePair)
-				code = new Integer(((KeyNamePair)m_ID).getKey());
+				code = Integer.valueOf(((KeyNamePair)m_ID).getKey());
 			//
 			MQuery query = new MQuery(tableName);
 			query.addRestriction(columnName, MQuery.EQUAL, code);
diff --git a/org.adempiere.base/src/org/compiere/print/layout/TableElement.java b/org.adempiere.base/src/org/compiere/print/layout/TableElement.java
index d49fd59123..f77a8ed583 100644
--- a/org.adempiere.base/src/org/compiere/print/layout/TableElement.java
+++ b/org.adempiere.base/src/org/compiere/print/layout/TableElement.java
@@ -301,9 +301,9 @@ public class TableElement extends PrintElement
 		{
 			int col = dataCol;
 			//	Print below existing column
-			if (m_additionalLines.containsKey(new Integer(dataCol)))
+			if (m_additionalLines.containsKey(Integer.valueOf(dataCol)))
 			{
-				col = ((Integer)m_additionalLines.get(new Integer(dataCol))).intValue();
+				col = ((Integer)m_additionalLines.get(Integer.valueOf(dataCol))).intValue();
 				if (log.isLoggable(Level.FINEST)) log.finest("DataColumn=" + dataCol + ", BelowColumn=" + col);
 			}
 			float colWidth = 0;
@@ -545,7 +545,7 @@ public class TableElement extends PrintElement
 			//	Print below existing column
 			if (col != dataCol)
 			{
-				m_columnWidths.add(new Float(0.0));		//	for the data column
+				m_columnWidths.add(Float.valueOf((float)0.0));		//	for the data column
 				Float origWidth=null;
 				try{
 					origWidth = (Float)m_columnWidths.get(col);
@@ -554,14 +554,14 @@ public class TableElement extends PrintElement
 					log.log(Level.SEVERE, "Column " + dataCol + " below " + col + " - no value for orig width");
 				else
 				{
-					if (origWidth.compareTo(new Float(colWidth)) >= 0)
+					if (origWidth.compareTo(Float.valueOf(colWidth)) >= 0)
 					{
 						if (log.isLoggable(Level.FINEST)) log.finest("Same Width - Col=" + col 
 								+ " - OrigWidth=" + origWidth + " - Width=" + colWidth + " - Total=" + p_width);
 					}
 					else
 					{
-						m_columnWidths.set(col, new Float(colWidth));
+						m_columnWidths.set(col, Float.valueOf(colWidth));
 						p_width += (colWidth - origWidth.floatValue());
 						if (log.isLoggable(Level.FINEST)) log.finest("New Width - Col=" + col 
 								+ " - OrigWidth=" + origWidth + " - Width=" + colWidth + " - Total=" + p_width);
@@ -571,7 +571,7 @@ public class TableElement extends PrintElement
 			//	Add new Column
 			else
 			{
-				m_columnWidths.add(new Float(colWidth));
+				m_columnWidths.add(Float.valueOf(colWidth));
 				p_width += colWidth;
 				if (log.isLoggable(Level.FINEST)) log.finest("Width - Col=" + dataCol 
 						+ " - Width=" + colWidth + " - Total=" + p_width);
@@ -591,7 +591,7 @@ public class TableElement extends PrintElement
 					rowHeight = (float)dimensions.get(col).height;
 			}	//	for all columns
 			rowHeight += m_tFormat.getLineStroke().floatValue() + (2*V_GAP);
-			m_rowHeights.add(new Float(rowHeight));
+			m_rowHeights.add(Float.valueOf(rowHeight));
 			p_height += rowHeight;
 		}	//	for all rows
 		//	HeaderRow
@@ -614,8 +614,8 @@ public class TableElement extends PrintElement
 		if (m_firstPage.height >= p_height && m_pageBreak.size() == 0)
 		{
 			if (log.isLoggable(Level.FINEST)) log.finest("Page Y=1 - PageHeight=" + m_firstPage.height + " - TableHeight=" + p_height);
-			m_firstRowOnPage.add(new Integer(0));	//	Y
-			m_pageHeight.add(new Float(p_height));	//	Y index only
+			m_firstRowOnPage.add(Integer.valueOf(0));	//	Y
+			m_pageHeight.add(Float.valueOf(p_height));	//	Y index only
 		}
 		//	multiple pages on Y | Axis
 		else
@@ -652,10 +652,10 @@ public class TableElement extends PrintElement
 				if (pageBreak)
 				{
 					availableHeight = firstPage ? m_firstPage.height : m_nextPages.height;
-					m_firstRowOnPage.add(new Integer(dataRow+addlRows));	//	Y
+					m_firstRowOnPage.add(Integer.valueOf(dataRow+addlRows));	//	Y
 					if (!firstPage)
 					{
-						m_pageHeight.add(new Float(usedHeight));	//	Y index only
+						m_pageHeight.add(Float.valueOf(usedHeight));	//	Y index only
 						if (log.isLoggable(Level.FINEST)) log.finest("Page Y=" + m_pageHeight.size()
 								+ " - PageHeight=" + usedHeight);
 					}
@@ -678,7 +678,7 @@ public class TableElement extends PrintElement
 					+ ", Row=" + dataRow + ",AddlRows=" + addlRows + ", Height=" + rowHeight 
 					+ " - Available=" + availableHeight + ", Used=" + usedHeight);
 			}	//	for all rows
-			m_pageHeight.add(new Float(usedHeight));			//	Y index only
+			m_pageHeight.add(Float.valueOf(usedHeight));			//	Y index only
 			if (log.isLoggable(Level.FINEST)) log.finest("Page Y=" + m_pageHeight.size()
 					+ " - PageHeight=" + usedHeight);
 		}	//	multiple Y | pages
@@ -688,7 +688,7 @@ public class TableElement extends PrintElement
 		{
 			if (log.isLoggable(Level.FINEST)) log.finest("Page X=1 - PageWidth=" + m_firstPage.width 
 					+ " - TableWidth=" + p_width);
-			m_firstColumnOnPage.add(new Integer(0));	//	X
+			m_firstColumnOnPage.add(Integer.valueOf(0));	//	X
 			//
 			distributeColumns (m_firstPage.width-(int)p_width, 0, m_columnWidths.size());
 		}
@@ -706,7 +706,7 @@ public class TableElement extends PrintElement
 					if (col != 0)
 						distributeColumns (availableWidth, lastStart, col);
 					//
-					m_firstColumnOnPage.add(new Integer(col));	//	X
+					m_firstColumnOnPage.add(Integer.valueOf(col));	//	X
 					if (log.isLoggable(Level.FINEST)) log.finest("Page X=" + m_firstColumnOnPage.size()
 							+ " - Col=" + col);
 					lastStart = col;
@@ -761,12 +761,12 @@ public class TableElement extends PrintElement
 					int additionalPart = columnWidth * availableWidth / totalWidth;
 					if (remainingWidth < additionalPart)
 					{
-						m_columnWidths.set(col, new Float(columnWidth+remainingWidth));
+						m_columnWidths.set(col, Float.valueOf(columnWidth+remainingWidth));
 						remainingWidth = 0;
 					}
 					else
 					{
-						m_columnWidths.set(col, new Float(columnWidth+additionalPart));
+						m_columnWidths.set(col, Float.valueOf(columnWidth+additionalPart));
 						remainingWidth -= additionalPart;
 					}
 					if (log.isLoggable(Level.FINEST)) log.finest("  col=" + col + " - From " + columnWidth + " to " + m_columnWidths.get(col));
@@ -779,7 +779,7 @@ public class TableElement extends PrintElement
 			int columnWidth = ((Float)m_columnWidths.get(c)).intValue();
 			if (columnWidth > 0)
 			{
-				m_columnWidths.set(c, new Float(columnWidth+remainingWidth));
+				m_columnWidths.set(c, Float.valueOf(columnWidth+remainingWidth));
 				if (log.isLoggable(Level.FINEST)) log.finest("Final col=" + c + " - From " + columnWidth + " to " + m_columnWidths.get(c));
 				remainingWidth = 0;
 			}
@@ -1073,7 +1073,7 @@ public class TableElement extends PrintElement
 		String tableName = MQuery.getZoomTableName(columnName);
 		Object code = pp.getID();
 		if (pp instanceof KeyNamePair)
-			code = new Integer(((KeyNamePair)pp).getKey());
+			code = Integer.valueOf(((KeyNamePair)pp).getKey());
 		//
 		MQuery query = new MQuery(tableName);
 		query.addRestriction(columnName, MQuery.EQUAL, code, null, pp.toString());
@@ -1612,8 +1612,8 @@ public class TableElement extends PrintElement
             else
             {
                 //  next line is a funcion column -> underline this
-                boolean nextIsFunction = m_functionRows.contains(new Integer(row+1));
-                if (nextIsFunction && m_functionRows.contains(new Integer(row)))
+                boolean nextIsFunction = m_functionRows.contains(Integer.valueOf(row+1));
+                if (nextIsFunction && m_functionRows.contains(Integer.valueOf(row)))
                     nextIsFunction = false;     //  this is a function line too
                 if (nextIsFunction)
                 {
diff --git a/org.adempiere.base/src/org/compiere/print/util/SwapFile.java b/org.adempiere.base/src/org/compiere/print/util/SwapFile.java
index 89f8f8438b..89b8db5e38 100644
--- a/org.adempiere.base/src/org/compiere/print/util/SwapFile.java
+++ b/org.adempiere.base/src/org/compiere/print/util/SwapFile.java
@@ -213,7 +213,6 @@ public class SwapFile
 	protected void finalize() throws Throwable //NOSONAR
 	{
 		dispose();
-		super.finalize();
 	}
 
 
diff --git a/org.adempiere.base/src/org/compiere/process/DocAction.java b/org.adempiere.base/src/org/compiere/process/DocAction.java
index 5b0a238be3..9f1ccd6c2f 100644
--- a/org.adempiere.base/src/org/compiere/process/DocAction.java
+++ b/org.adempiere.base/src/org/compiere/process/DocAction.java
@@ -61,7 +61,7 @@ public interface DocAction
 	/** Invalidate = IN */
 	public static final String ACTION_Invalidate = "IN";
 	/** ReOpen = OP */
-	public static final String ACTION_ReOpen = "OP";
+	// public static final String ACTION_ReOpen = "OP";
 
 	/** Drafted = DR */
 	public static final String STATUS_Drafted = "DR";
diff --git a/org.adempiere.base/src/org/compiere/process/DocActionTemplate.java b/org.adempiere.base/src/org/compiere/process/DocActionTemplate.java
index 1e775a36f8..d5053e8ace 100644
--- a/org.adempiere.base/src/org/compiere/process/DocActionTemplate.java
+++ b/org.adempiere.base/src/org/compiere/process/DocActionTemplate.java
@@ -26,7 +26,6 @@ import org.compiere.model.ModelValidationEngine;
 import org.compiere.model.ModelValidator;
 import org.compiere.model.PO;
 import org.compiere.model.POInfo;
-import org.compiere.util.TimeUtil;
 
 /**
  *	Template for DocAction
diff --git a/org.adempiere.base/src/org/compiere/process/DocumentEngine.java b/org.adempiere.base/src/org/compiere/process/DocumentEngine.java
index e86b21c651..4773229560 100644
--- a/org.adempiere.base/src/org/compiere/process/DocumentEngine.java
+++ b/org.adempiere.base/src/org/compiere/process/DocumentEngine.java
@@ -692,7 +692,7 @@ public class DocumentEngine implements DocAction
 				ACTION_Post, ACTION_Void};
 
 		if (isClosed())
-			return new String[] {ACTION_Post, ACTION_ReOpen};
+			return new String[] {ACTION_Post, ACTION_ReActivate};
 
 		if (isReversed() || isVoided())
 			return new String[] {ACTION_Post};
@@ -965,11 +965,13 @@ public class DocumentEngine implements DocAction
 			options[index++] = DocumentEngine.ACTION_Void;
 			options[index++] = DocumentEngine.ACTION_Prepare;
 		}
+		/*  IDEMPIERE-3599 - commented to allow adding options to these terminal status
 		//	Closed, Voided, REversed    ..  CL/VO/RE
 		else if (docStatus.equals(DocumentEngine.STATUS_Closed)
 			|| docStatus.equals(DocumentEngine.STATUS_Voided)
 			|| docStatus.equals(DocumentEngine.STATUS_Reversed))
 			return 0;
+		*/
 
 		/********************
 		 *  Order
diff --git a/org.adempiere.base/src/org/compiere/process/ProcessInfo.java b/org.adempiere.base/src/org/compiere/process/ProcessInfo.java
index 6b097479df..a6566a4c32 100644
--- a/org.adempiere.base/src/org/compiere/process/ProcessInfo.java
+++ b/org.adempiere.base/src/org/compiere/process/ProcessInfo.java
@@ -22,8 +22,14 @@ import java.math.BigDecimal;
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.List;
 
+import org.compiere.model.MPInstance;
+import org.compiere.model.MPInstancePara;
+import org.compiere.model.MProcess;
+import org.compiere.model.MSession;
 import org.compiere.model.PO;
+import org.compiere.model.Query;
 import org.compiere.util.DisplayType;
 import org.compiere.util.Env;
 import org.compiere.util.Ini;
@@ -541,7 +547,7 @@ public class ProcessInfo implements Serializable
 	 */
 	public void setAD_Client_ID (int AD_Client_ID)
 	{
-		m_AD_Client_ID = new Integer (AD_Client_ID);
+		m_AD_Client_ID = Integer.valueOf(AD_Client_ID);
 	}
 	/**
 	 * Method getAD_Client_ID
@@ -558,7 +564,7 @@ public class ProcessInfo implements Serializable
 	 */
 	public void setAD_User_ID (int AD_User_ID)
 	{
-		m_AD_User_ID = new Integer (AD_User_ID);
+		m_AD_User_ID = Integer.valueOf(AD_User_ID);
 	}
 	/**
 	 * Method getAD_User_ID
@@ -859,5 +865,58 @@ public class ProcessInfo implements Serializable
 	public void setPDFFileName(String fileName) {
 		this.m_PDFfileName = fileName;
 	}
+	
+	/**
+	 * Validates to inform a user running again a process that is already in execution.
+	 * @return true if the same process is already running
+	 */
+	public boolean isProcessRunning(MPInstancePara[] params) {
+		MProcess process = MProcess.get(Env.getCtx(), getAD_Process_ID());
+		
+		String multipleExecutions = process.getAllowMultipleExecution();
+		if (multipleExecutions == null || multipleExecutions.isEmpty())
+			return false;
+		
+		Timestamp lastRebootDate = getLastServerRebootDate();
+		if (lastRebootDate == null)
+			return false;
+		
+		List<MPInstance> processInstanceList = new Query(Env.getCtx(), MPInstance.Table_Name, " AD_Process_ID=? AND AD_User_ID=? AND IsProcessing='Y' AND record_ID = ? AND Created > ? ", null)
+				.setParameters(getAD_Process_ID(), getAD_User_ID(), getRecord_ID(), lastRebootDate)
+				.setClient_ID()
+				.setOnlyActiveRecords(true)
+				.list();
+		
+		if (processInstanceList == null || processInstanceList.isEmpty())
+			return false;
+		
+		//Never allow multiple executions
+		if (multipleExecutions.equals(MProcess.ALLOWMULTIPLEEXECUTION_DisallowMultipleExecutions)) 
+			return true;
+		
+		//Disallow multiple executions with the same params
+		if (multipleExecutions.equals(MProcess.ALLOWMULTIPLEEXECUTION_DisallowMultipleExecutionsWithTheSameParameters)) {
+			for (MPInstance instance : processInstanceList) {
+				if (instance.equalParameters(params))
+					return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	private Timestamp getLastServerRebootDate() {
+		MSession currentSession = MSession.get(Env.getCtx(), false);
+		if (currentSession == null)
+			return null;
+		
+		MSession lastServerSession = new Query(Env.getCtx(), MSession.Table_Name, " serverName=? AND websession=?", null)
+				.setParameters(currentSession.getServerName(), "Server")
+				.setOrderBy("AD_Session_ID desc")
+				.setOnlyActiveRecords(true)
+				.first();
 
+		return lastServerSession.getCreated();
+	}
+	
 }   //  ProcessInfo
diff --git a/org.adempiere.base/src/org/compiere/process/SvrProcess.java b/org.adempiere.base/src/org/compiere/process/SvrProcess.java
index 4c71c3aa86..e4cb3092c8 100644
--- a/org.adempiere.base/src/org/compiere/process/SvrProcess.java
+++ b/org.adempiere.base/src/org/compiere/process/SvrProcess.java
@@ -527,7 +527,7 @@ public abstract class SvrProcess implements ProcessCall
 		try
 		{
 			Class<?> clazz = Class.forName(className);
-			Object object = clazz.newInstance();
+			Object object = clazz.getDeclaredConstructor().newInstance();
 			Method[] methods = clazz.getMethods();
 			for (int i = 0; i < methods.length; i++)
 			{
diff --git a/org.adempiere.base/src/org/compiere/report/FinReportJasper.java b/org.adempiere.base/src/org/compiere/report/FinReportJasper.java
index b60797e30b..129b5c2869 100644
--- a/org.adempiere.base/src/org/compiere/report/FinReportJasper.java
+++ b/org.adempiere.base/src/org/compiere/report/FinReportJasper.java
@@ -61,7 +61,7 @@ public class FinReportJasper extends FinReport
 		for (int i = 0; i < oldpara.length; i++)
 			list.add (oldpara[i]);
 		// and add the T_Report_AD_PInstance_ID parameter
-		list.add (new ProcessInfoParameter("T_Report_AD_PInstance_ID", new Integer(getAD_PInstance_ID()), null, null, null));
+		list.add (new ProcessInfoParameter("T_Report_AD_PInstance_ID", Integer.valueOf(getAD_PInstance_ID()), null, null, null));
 		ProcessInfoParameter[] pars = new ProcessInfoParameter[list.size()];
 		list.toArray(pars);
 
diff --git a/org.adempiere.base/src/org/compiere/report/MReportTree.java b/org.adempiere.base/src/org/compiere/report/MReportTree.java
index 307891c84b..8d16fab310 100644
--- a/org.adempiere.base/src/org/compiere/report/MReportTree.java
+++ b/org.adempiere.base/src/org/compiere/report/MReportTree.java
@@ -24,6 +24,8 @@ import java.util.Enumeration;
 import java.util.Properties;
 import java.util.logging.Level;
 
+import javax.swing.tree.TreeNode;
+
 import org.compiere.model.MAcctSchemaElement;
 import org.compiere.model.MHierarchy;
 import org.compiere.model.MRole;
@@ -250,13 +252,11 @@ public class MReportTree
 		StringBuffer result = null;
 		if (node != null && node.isSummary ())
 		{
-			
-			@SuppressWarnings("unchecked")
-			Enumeration<MTreeNode> en = (Enumeration<MTreeNode>)node.preorderEnumeration ();
+			Enumeration<TreeNode> en = node.preorderEnumeration ();
 			StringBuffer sb = new StringBuffer ();
 			while (en.hasMoreElements ())
 			{
-				MTreeNode nn = en.nextElement ();
+				MTreeNode nn = (MTreeNode)en.nextElement ();
 				if (!nn.isSummary ())
 				{
 					if (sb.length () > 0)
@@ -303,7 +303,7 @@ public class MReportTree
 				MTreeNode nn = (MTreeNode)en.nextElement();
 				if (!nn.isSummary())
 				{
-					list.add(new Integer(nn.getNode_ID()));
+					list.add(Integer.valueOf(nn.getNode_ID()));
 					if (log.isLoggable(Level.FINEST)) log.finest("- " + nn);
 				}
 				else
@@ -311,7 +311,7 @@ public class MReportTree
 			}
 		}
 		else	//	not found or not summary 
-			list.add(new Integer(ID));
+			list.add(Integer.valueOf(ID));
 		//
 		Integer[] retValue = new Integer[list.size()];
 		list.toArray(retValue);
diff --git a/org.adempiere.base/src/org/compiere/report/core/RModel.java b/org.adempiere.base/src/org/compiere/report/core/RModel.java
index dd1ada7c34..713bf10706 100644
--- a/org.adempiere.base/src/org/compiere/report/core/RModel.java
+++ b/org.adempiere.base/src/org/compiere/report/core/RModel.java
@@ -226,7 +226,7 @@ public class RModel implements Serializable
 		if (log.isLoggable(Level.CONFIG)) log.config( "RModel.setGroup col=" + col);
 		if (col < 0 || col >= m_data.cols.size())
 			return;
-		Integer ii = new Integer(col);
+		Integer ii = Integer.valueOf(col);
 		if (!m_data.groups.contains(ii))
 			m_data.groups.add(ii);
 	}   //  setGroup
@@ -262,7 +262,7 @@ public class RModel implements Serializable
 		if (log.isLoggable(Level.CONFIG)) log.config( "RModel.setFunction col=" + col + " - " + function);
 		if (col < 0 || col >= m_data.cols.size())
 			return;
-		m_data.functions.put(new Integer(col), function);
+		m_data.functions.put(Integer.valueOf(col), function);
 	}   //  setFunction
 
 	/*************************************************************************/
diff --git a/org.adempiere.base/src/org/compiere/report/core/RModelData.java b/org.adempiere.base/src/org/compiere/report/core/RModelData.java
index 0d65821ca8..1adbb75652 100644
--- a/org.adempiere.base/src/org/compiere/report/core/RModelData.java
+++ b/org.adempiere.base/src/org/compiere/report/core/RModelData.java
@@ -148,13 +148,13 @@ public class RModelData
 					else if (rc.getColClass() == BigDecimal.class)
 						row.add(rs.getBigDecimal(index++));
 					else if (rc.getColClass() == Double.class)
-						row.add(new Double(rs.getDouble(index++)));
+						row.add(Double.valueOf(rs.getDouble(index++)));
 					else if (rc.getColClass() == Integer.class)
-						row.add(new Integer(rs.getInt(index++)));
+						row.add(Integer.valueOf(rs.getInt(index++)));
 					else if (rc.getColClass() == Timestamp.class)
 						row.add(rs.getTimestamp(index++));
 					else if (rc.getColClass() == Boolean.class)
-						row.add(new Boolean("Y".equals(rs.getString(index++))));
+						row.add(Boolean.valueOf("Y".equals(rs.getString(index++))));
 					else    //  should not happen
 					{
 						row.add(rs.getString(index++));
@@ -290,7 +290,7 @@ public class RModelData
 						}
 					}   //  for all columns
 					//
-					m_groupRows.add(new Integer(rows.size())); //  group row indicator
+					m_groupRows.add(Integer.valueOf(rows.size())); //  group row indicator
 					rows.add(newRow);
 					groupBysValue[level] = row.get(idx);
 				}
@@ -347,7 +347,7 @@ public class RModelData
 			//  remove empty row added earlier to force group change
 			if (gSize > 0)
 				rows.remove(rows.size()-1);
-			m_groupRows.add(new Integer(rows.size())); //  group row indicator
+			m_groupRows.add(Integer.valueOf(rows.size())); //  group row indicator
 			rows.add(newRow);
 		}
 		if (log.isLoggable(Level.FINE)) log.fine("End Rows=" + rows.size());
@@ -367,7 +367,7 @@ public class RModelData
 		{
 			m_groupRowsIndicator = new ArrayList<Boolean>(rows.size());
 			for (int r = 0; r < rows.size(); r++)
-				m_groupRowsIndicator.add(new Boolean(m_groupRows.contains(new Integer(r))));
+				m_groupRowsIndicator.add(Boolean.valueOf(m_groupRows.contains(Integer.valueOf(r))));
 		}
 		if (row < 0 || row >= m_groupRowsIndicator.size())
 			return false;
diff --git a/org.adempiere.base/src/org/compiere/sla/DeliveryAccuracy.java b/org.adempiere.base/src/org/compiere/sla/DeliveryAccuracy.java
index c4bbfee1f8..18b95b2114 100644
--- a/org.adempiere.base/src/org/compiere/sla/DeliveryAccuracy.java
+++ b/org.adempiere.base/src/org/compiere/sla/DeliveryAccuracy.java
@@ -17,6 +17,7 @@
 package org.compiere.sla;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
@@ -146,7 +147,7 @@ public class DeliveryAccuracy extends SLACriteria
 			
 		//	Calculate with 2 digits precision
 		if (count != 0)
-			retValue = total.divide(new BigDecimal(count), 2, BigDecimal.ROUND_HALF_UP);
+			retValue = total.divide(new BigDecimal(count), 2, RoundingMode.HALF_UP);
 		return retValue;
 	}	//	calculateMeasure
 
diff --git a/org.adempiere.base/src/org/compiere/util/AmtInWords_HR.java b/org.adempiere.base/src/org/compiere/util/AmtInWords_HR.java
index 76b5513bf9..11eee07493 100644
--- a/org.adempiere.base/src/org/compiere/util/AmtInWords_HR.java
+++ b/org.adempiere.base/src/org/compiere/util/AmtInWords_HR.java
@@ -2,6 +2,8 @@ package org.compiere.util;
 
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
+
 import static java.math.BigDecimal.valueOf;
 import java.util.HashMap;
 import java.util.Map;
@@ -74,10 +76,10 @@ između
     StringBuilder rezultat = new StringBuilder();
 
     // zaokruži na dvije decimale
-    broj = broj.setScale(2, BigDecimal.ROUND_HALF_EVEN);
+    broj = broj.setScale(2, RoundingMode.HALF_EVEN);
 
     // kune (dio bez decimala)
-    BigDecimal kune = broj.setScale(0, BigDecimal.ROUND_DOWN);
+    BigDecimal kune = broj.setScale(0, RoundingMode.DOWN);
     rezultat.append(slovima(kune, "kuna", false, false));
 
     rezultat.append(RAZMAK + "i" + RAZMAK);
diff --git a/org.adempiere.base/src/org/compiere/util/AmtInWords_PT.java b/org.adempiere.base/src/org/compiere/util/AmtInWords_PT.java
index 46f8379ef2..9511337e6a 100644
--- a/org.adempiere.base/src/org/compiere/util/AmtInWords_PT.java
+++ b/org.adempiere.base/src/org/compiere/util/AmtInWords_PT.java
@@ -13,6 +13,7 @@
 package org.compiere.util;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 
 /**
  *	Portuguese Amount in Words
@@ -248,7 +249,7 @@ public class AmtInWords_PT implements AmtInWords
 	
 	public String getAmtInWords (BigDecimal amount) throws Exception
 	{	
-		amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
+		amount = amount.setScale(2, RoundingMode.HALF_UP);
 		
 		String samount = amount.toString();
 		samount = samount.replaceAll("\\.", ",");
diff --git a/org.adempiere.base/src/org/compiere/util/AmtInWords_ZH.java b/org.adempiere.base/src/org/compiere/util/AmtInWords_ZH.java
index d273dd977a..a07f1c2bf6 100644
--- a/org.adempiere.base/src/org/compiere/util/AmtInWords_ZH.java
+++ b/org.adempiere.base/src/org/compiere/util/AmtInWords_ZH.java
@@ -16,6 +16,7 @@
  *****************************************************************************/
 package org.compiere.util;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 
 /**
  *	Amount in Words for Zh_CN (CNY in Simplified Chinese) 
@@ -139,7 +140,7 @@ public class AmtInWords_ZH implements AmtInWords
 		}
 		
 		// round to 1/100, get long number ,eg -5432.135 = 543214
-		long lnumber = number.movePointRight(2).setScale(0, BigDecimal.ROUND_HALF_UP).abs().longValue();
+		long lnumber = number.movePointRight(2).setScale(0, RoundingMode.HALF_UP).abs().longValue();
 		
 		// number must less 10000000000000 (10^13)
 		if (lnumber >= 1000000000000000L) {		
diff --git a/org.adempiere.base/src/org/compiere/util/CCachedRowSet.java b/org.adempiere.base/src/org/compiere/util/CCachedRowSet.java
index 7291952c30..bb1f225a2b 100644
--- a/org.adempiere.base/src/org/compiere/util/CCachedRowSet.java
+++ b/org.adempiere.base/src/org/compiere/util/CCachedRowSet.java
@@ -188,6 +188,7 @@ public class CCachedRowSet extends CachedRowSetImpl implements CachedRowSet
 	 */
 	public static void main (String[] args)
 	{
+		CachedRowSetImpl rs = null;
 		try
 		{
 			Locale.setDefault(Locale.CANADA);
@@ -195,12 +196,18 @@ public class CCachedRowSet extends CachedRowSetImpl implements CachedRowSet
 			System.out.println("OK 1");
 			get();
 			System.out.println("OK 1a");
-			new CachedRowSetImpl();
+			rs = new CachedRowSetImpl();
 			System.out.println("OK 2");
 		}
 		catch (Exception e)
 		{
 			e.printStackTrace();
+			if (rs != null)
+				try {
+					rs.close();
+				} catch (SQLException e1) {
+					e1.printStackTrace();
+				}
 		}
 	}	//	main
 	
diff --git a/org.adempiere.base/src/org/compiere/util/CLogMgt.java b/org.adempiere.base/src/org/compiere/util/CLogMgt.java
index 3123fcd2e9..069e750005 100644
--- a/org.adempiere.base/src/org/compiere/util/CLogMgt.java
+++ b/org.adempiere.base/src/org/compiere/util/CLogMgt.java
@@ -16,8 +16,6 @@
  *****************************************************************************/
 package org.compiere.util;
 
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import java.io.BufferedInputStream;
 import java.io.InputStream;
 import java.io.PrintWriter;
@@ -62,15 +60,12 @@ public class CLogMgt
 	
 	private static final Map<String, Level> levelMap = new HashMap<String, Level>();
 	
-	private final static PropertyChangeListener listener = new PropertyChangeListener() {			
+	private final static Runnable configurationListener = new Runnable() {
 		@Override
-		public void propertyChange(PropertyChangeEvent evt) {
-			if (evt.getPropertyName() == null) {
-				reInit();
-			}
+		public void run() {
+			reInit();
 		}
-	};	
-	
+	};
 	
 	private static synchronized void reInit() {
 		CLogMgt.initialize(Ini.isClient());
@@ -193,8 +188,8 @@ public class CLogMgt
 		setFormatter(CLogFormatter.get());
 		setFilter(CLogFilter.get());
 	
-		mgr.removePropertyChangeListener(listener);
-		mgr.addPropertyChangeListener(listener);
+		mgr.removeConfigurationListener(configurationListener);
+		mgr.addConfigurationListener(configurationListener);
 	}	//	initialize
 
 
diff --git a/org.adempiere.base/src/org/compiere/util/DB.java b/org.adempiere.base/src/org/compiere/util/DB.java
index 189c020788..41065426a4 100644
--- a/org.adempiere.base/src/org/compiere/util/DB.java
+++ b/org.adempiere.base/src/org/compiere/util/DB.java
@@ -147,7 +147,7 @@ public final class DB
 		try
 		{
 			Class<?> clazz = Class.forName("org.compiere.MigrateData");
-			clazz.newInstance();
+			clazz.getDeclaredConstructor().newInstance();
 		}
 		catch (Exception e)
 		{
@@ -961,7 +961,7 @@ public final class DB
 	 */
 	public static int executeUpdate (String sql, int param, String trxName, int timeOut)
 	{
-		return executeUpdate (sql, new Object[]{new Integer(param)}, false, trxName, timeOut);
+		return executeUpdate (sql, new Object[]{Integer.valueOf(param)}, false, trxName, timeOut);
 	}	//	executeUpdate
 
 	/**
@@ -990,7 +990,7 @@ public final class DB
 	 */
 	public static int executeUpdate (String sql, int param, boolean ignoreError, String trxName, int timeOut)
 	{
-		return executeUpdate (sql, new Object[]{new Integer(param)}, ignoreError, trxName, timeOut);
+		return executeUpdate (sql, new Object[]{Integer.valueOf(param)}, ignoreError, trxName, timeOut);
 	}	//	executeUpdate
 
 	/**
diff --git a/org.adempiere.base/src/org/compiere/util/DisplayType.java b/org.adempiere.base/src/org/compiere/util/DisplayType.java
index 517d8f0d72..e7c5fb5c96 100644
--- a/org.adempiere.base/src/org/compiere/util/DisplayType.java
+++ b/org.adempiere.base/src/org/compiere/util/DisplayType.java
@@ -655,6 +655,9 @@ public final class DisplayType
 		if (!DisplayType.isText(displayType))
 			s_log.severe("Unhandled Data Type = " + displayType);
 
+		if (columnName.endsWith("_ID"))
+			return "NUMBER(10)";
+
 		return "VARCHAR2(" + fieldLength + ")";
 	}	//	getSQLDataType
 
diff --git a/org.adempiere.base/src/org/compiere/util/Language.java b/org.adempiere.base/src/org/compiere/util/Language.java
index 366ac3f435..980fb7134e 100644
--- a/org.adempiere.base/src/org/compiere/util/Language.java
+++ b/org.adempiere.base/src/org/compiere/util/Language.java
@@ -443,7 +443,7 @@ public class Language implements Serializable
 	{
 		if (m_leftToRight == null)
 			//  returns true if language not iw, ar, fa, ur
-			m_leftToRight = new Boolean(ComponentOrientation.getOrientation(m_locale).isLeftToRight());
+			m_leftToRight = Boolean.valueOf(ComponentOrientation.getOrientation(m_locale).isLeftToRight());
 		return m_leftToRight.booleanValue();
 	}   //  isLeftToRight
 
@@ -456,7 +456,7 @@ public class Language implements Serializable
 		if (m_decimalPoint == null)
 		{
 			DecimalFormatSymbols dfs = new DecimalFormatSymbols(m_locale);
-			m_decimalPoint = new Boolean(dfs.getDecimalSeparator() == '.');
+			m_decimalPoint = Boolean.valueOf(dfs.getDecimalSeparator() == '.');
 		}
 		return m_decimalPoint.booleanValue();
 	}   //  isDecimalPoint
diff --git a/org.adempiere.base/src/org/compiere/util/Login.java b/org.adempiere.base/src/org/compiere/util/Login.java
index 37b99a26d2..9ca1beea23 100644
--- a/org.adempiere.base/src/org/compiere/util/Login.java
+++ b/org.adempiere.base/src/org/compiere/util/Login.java
@@ -121,13 +121,13 @@ public class Login
 	{
 		//	Java System version check
 		String jVersion = System.getProperty("java.version");
-		if (jVersion.startsWith("1.8.0"))
+		if (jVersion.startsWith("1.8.0") || jVersion.startsWith("9.") || jVersion.startsWith("10."))
 			return true;
 
 		//  Error Message
 		StringBuilder msg = new StringBuilder();
 		msg.append(System.getProperty("java.vm.name")).append(" - ").append(jVersion);
-		msg.append("  <>  1.8.0");
+		msg.append("  <>  1.8.0 | 9 | 10");
 		//
 		if (isClient)
 			JOptionPane.showMessageDialog(null, msg.toString(),
diff --git a/org.adempiere.base/src/org/compiere/util/Msg.java b/org.adempiere.base/src/org/compiere/util/Msg.java
index 41f5e198a9..06458a4b28 100644
--- a/org.adempiere.base/src/org/compiere/util/Msg.java
+++ b/org.adempiere.base/src/org/compiere/util/Msg.java
@@ -429,7 +429,7 @@ public final class Msg
 		{
 			className += language.getLanguageCode().toUpperCase();
 			Class<?> clazz = Class.forName(className);
-			AmtInWords aiw = (AmtInWords)clazz.newInstance();
+			AmtInWords aiw = (AmtInWords)clazz.getDeclaredConstructor().newInstance();
 			return aiw.getAmtInWords(amount);
 		}
 		catch (ClassNotFoundException e)
diff --git a/org.adempiere.base/src/org/compiere/util/SecureEngine.java b/org.adempiere.base/src/org/compiere/util/SecureEngine.java
index 23e51937df..3be126c074 100644
--- a/org.adempiere.base/src/org/compiere/util/SecureEngine.java
+++ b/org.adempiere.base/src/org/compiere/util/SecureEngine.java
@@ -193,7 +193,7 @@ public class SecureEngine
 		try
 		{
 			Class<?> clazz = Class.forName(realClass);
-			implementation = (SecureInterface)clazz.newInstance();
+			implementation = (SecureInterface)clazz.getDeclaredConstructor().newInstance();
 		}
 		catch (Exception e)
 		{
diff --git a/org.adempiere.base/src/org/compiere/util/Trx.java b/org.adempiere.base/src/org/compiere/util/Trx.java
index 22c74b982d..ab2f85d437 100644
--- a/org.adempiere.base/src/org/compiere/util/Trx.java
+++ b/org.adempiere.base/src/org/compiere/util/Trx.java
@@ -624,7 +624,6 @@ public class Trx
 				}
 				catch (SQLException e2) {;}
 			}
-			trx = null;
 			// Throw exception
 			if (e instanceof RuntimeException)
 			{
@@ -750,6 +749,5 @@ public class Trx
 				}
 			}, 2, TimeUnit.SECONDS);
 		}
-		super.finalize();
 	}
 }	//	Trx
diff --git a/org.adempiere.base/src/org/compiere/util/WebSessionCtx.java b/org.adempiere.base/src/org/compiere/util/WebSessionCtx.java
index 83e7734d36..7176d5400a 100644
--- a/org.adempiere.base/src/org/compiere/util/WebSessionCtx.java
+++ b/org.adempiere.base/src/org/compiere/util/WebSessionCtx.java
@@ -267,7 +267,7 @@ public class WebSessionCtx implements Serializable
 		if (wstore == null)
 			return new Properties();
 		//
-		Integer key = new Integer (wstore.getW_Store_ID());
+		Integer key = Integer.valueOf(wstore.getW_Store_ID());
 		Properties newCtx = (Properties)s_cacheCtx.get(key);
 		
 		/**	Create New Context		*/
diff --git a/org.adempiere.base/src/org/compiere/util/ZipUtil.java b/org.adempiere.base/src/org/compiere/util/ZipUtil.java
index 292240de04..34b03e074f 100644
--- a/org.adempiere.base/src/org/compiere/util/ZipUtil.java
+++ b/org.adempiere.base/src/org/compiere/util/ZipUtil.java
@@ -401,6 +401,8 @@ public class ZipUtil
 				return pathEntries[i];
 		}
 		path = System.getProperty("sun.boot.class.path");
+		if (path == null)
+			return null;
 		pathEntries = path.split(System.getProperty("path.separator"));
 		for (int i = 0; i < pathEntries.length; i++)
 		{
diff --git a/org.adempiere.base/src/org/compiere/wf/MWFActivity.java b/org.adempiere.base/src/org/compiere/wf/MWFActivity.java
index 954bd49eed..53c007b0b7 100644
--- a/org.adempiere.base/src/org/compiere/wf/MWFActivity.java
+++ b/org.adempiere.base/src/org/compiere/wf/MWFActivity.java
@@ -1291,7 +1291,7 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable
 		if (value == null)
 			;
 		else if (displayType == DisplayType.YesNo)
-			dbValue = new Boolean("Y".equals(value));
+			dbValue = Boolean.valueOf("Y".equals(value));
 		else if (DisplayType.isNumeric(displayType))
 			dbValue = new BigDecimal (value);
 		else if (DisplayType.isID(displayType)) {
diff --git a/org.adempiere.base/src/org/compiere/wf/MWFBlock.java b/org.adempiere.base/src/org/compiere/wf/MWFBlock.java
index aad279f718..6b69e444e9 100644
--- a/org.adempiere.base/src/org/compiere/wf/MWFBlock.java
+++ b/org.adempiere.base/src/org/compiere/wf/MWFBlock.java
@@ -45,7 +45,7 @@ public class MWFBlock extends X_AD_WF_Block
 	 */
 	public static MWFBlock get (Properties ctx, int AD_WF_Block_ID)
 	{
-		Integer key = new Integer (AD_WF_Block_ID);
+		Integer key = Integer.valueOf(AD_WF_Block_ID);
 		MWFBlock retValue = (MWFBlock) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/compiere/wf/MWFNode.java b/org.adempiere.base/src/org/compiere/wf/MWFNode.java
index 042b441174..69994490a7 100644
--- a/org.adempiere.base/src/org/compiere/wf/MWFNode.java
+++ b/org.adempiere.base/src/org/compiere/wf/MWFNode.java
@@ -18,6 +18,7 @@ package org.compiere.wf;
 
 import java.awt.Point;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -142,7 +143,7 @@ public class MWFNode extends X_AD_WF_Node
 		//	Save to Cache
 		String key = null;
 		try {
-			Integer wfnodeid = new Integer (rs.getInt("AD_WF_Node_ID"));
+			Integer wfnodeid = Integer.valueOf(rs.getInt("AD_WF_Node_ID"));
 			if (wfnodeid != null && wfnodeid.intValue() > 0)
 				key = Env.getAD_Language(ctx) + "_" + wfnodeid;
 		} catch (SQLException e) {
@@ -496,7 +497,7 @@ public class MWFNode extends X_AD_WF_Node
 			return 0;
 		//
 		BigDecimal change = new BigDecimal (seconds)
-			.divide(divide, BigDecimal.ROUND_DOWN)
+			.divide(divide, RoundingMode.DOWN)
 			.multiply(getDynPriorityChange());
 		return change.intValue();
 	}	//	calculateDynamicPriority
diff --git a/org.adempiere.base/src/org/compiere/wf/MWFNodeNext.java b/org.adempiere.base/src/org/compiere/wf/MWFNodeNext.java
index 83426263be..10e4d87b57 100644
--- a/org.adempiere.base/src/org/compiere/wf/MWFNodeNext.java
+++ b/org.adempiere.base/src/org/compiere/wf/MWFNodeNext.java
@@ -221,7 +221,7 @@ public class MWFNodeNext extends X_AD_WF_NodeNext
 	 */
 	public void setFromSplitAnd (boolean fromSplitAnd)
 	{
-		m_fromSplitAnd = new Boolean(fromSplitAnd);
+		m_fromSplitAnd = Boolean.valueOf(fromSplitAnd);
 	}	//	setFromSplitAnd
 
 	/**
@@ -246,7 +246,7 @@ public class MWFNodeNext extends X_AD_WF_NodeNext
 	 */
 	private void setToJoinAnd (boolean toJoinAnd)
 	{
-		m_toJoinAnd = new Boolean(toJoinAnd);
+		m_toJoinAnd = Boolean.valueOf(toJoinAnd);
 	}	//	setToJoinAnd
 
 }	//	MWFNodeNext
diff --git a/org.adempiere.base/src/org/compiere/wf/MWFResponsible.java b/org.adempiere.base/src/org/compiere/wf/MWFResponsible.java
index aeae1dccd2..9108911e02 100644
--- a/org.adempiere.base/src/org/compiere/wf/MWFResponsible.java
+++ b/org.adempiere.base/src/org/compiere/wf/MWFResponsible.java
@@ -46,7 +46,7 @@ public class MWFResponsible extends X_AD_WF_Responsible
 	 */
 	public static MWFResponsible get (Properties ctx, int AD_WF_Responsible_ID)
 	{
-		Integer key = new Integer (AD_WF_Responsible_ID);
+		Integer key = Integer.valueOf(AD_WF_Responsible_ID);
 		MWFResponsible retValue = (MWFResponsible) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
diff --git a/org.adempiere.base/src/org/eevolution/model/I_C_TaxBase.java b/org.adempiere.base/src/org/eevolution/model/I_C_TaxBase.java
index 438ab1c0ad..a1834cd3aa 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_C_TaxBase.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_C_TaxBase.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_TaxBase
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_C_TaxBase 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_C_TaxDefinition.java b/org.adempiere.base/src/org/eevolution/model/I_C_TaxDefinition.java
index 27eaaf02cc..3890cbaae4 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_C_TaxDefinition.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_C_TaxDefinition.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_TaxDefinition
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_C_TaxDefinition 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_C_TaxGroup.java b/org.adempiere.base/src/org/eevolution/model/I_C_TaxGroup.java
index e70a1b4979..a66d5230b2 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_C_TaxGroup.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_C_TaxGroup.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_TaxGroup
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_C_TaxGroup 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_C_TaxType.java b/org.adempiere.base/src/org/eevolution/model/I_C_TaxType.java
index e730dc40dd..d9b00456d5 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_C_TaxType.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_C_TaxType.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_TaxType
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_C_TaxType 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_DD_NetworkDistribution.java b/org.adempiere.base/src/org/eevolution/model/I_DD_NetworkDistribution.java
index ecf03bb77e..61ba3338da 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_DD_NetworkDistribution.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_DD_NetworkDistribution.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for DD_NetworkDistribution
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_DD_NetworkDistribution 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_DD_NetworkDistributionLine.java b/org.adempiere.base/src/org/eevolution/model/I_DD_NetworkDistributionLine.java
index 38f39f3e91..3aa8cd84a7 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_DD_NetworkDistributionLine.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_DD_NetworkDistributionLine.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for DD_NetworkDistributionLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_DD_NetworkDistributionLine 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_DD_Order.java b/org.adempiere.base/src/org/eevolution/model/I_DD_Order.java
index 1ed4197f30..2b473714b4 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_DD_Order.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_DD_Order.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for DD_Order
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_DD_Order 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_DD_OrderLine.java b/org.adempiere.base/src/org/eevolution/model/I_DD_OrderLine.java
index 746ca3e419..b79c4baee8 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_DD_OrderLine.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_DD_OrderLine.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for DD_OrderLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_DD_OrderLine 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_HR_Attribute.java b/org.adempiere.base/src/org/eevolution/model/I_HR_Attribute.java
index 3ddb6102a3..6f43193b41 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_HR_Attribute.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_HR_Attribute.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for HR_Attribute
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_HR_Attribute 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_HR_Concept.java b/org.adempiere.base/src/org/eevolution/model/I_HR_Concept.java
index a57e63825b..d8e10a2866 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_HR_Concept.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_HR_Concept.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for HR_Concept
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_HR_Concept 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_HR_Concept_Acct.java b/org.adempiere.base/src/org/eevolution/model/I_HR_Concept_Acct.java
index 77e247e3a6..741e505f61 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_HR_Concept_Acct.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_HR_Concept_Acct.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for HR_Concept_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_HR_Concept_Acct 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_HR_Concept_Category.java b/org.adempiere.base/src/org/eevolution/model/I_HR_Concept_Category.java
index 1efea77375..00fd7d8697 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_HR_Concept_Category.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_HR_Concept_Category.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for HR_Concept_Category
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_HR_Concept_Category 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_HR_Contract.java b/org.adempiere.base/src/org/eevolution/model/I_HR_Contract.java
index 3116ba50ff..434cd5d5bd 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_HR_Contract.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_HR_Contract.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for HR_Contract
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_HR_Contract 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_HR_Department.java b/org.adempiere.base/src/org/eevolution/model/I_HR_Department.java
index 4071e8061c..bba3ee5efb 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_HR_Department.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_HR_Department.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for HR_Department
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_HR_Department 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_HR_Employee.java b/org.adempiere.base/src/org/eevolution/model/I_HR_Employee.java
index cec4b8eb1f..c5a5c27189 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_HR_Employee.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_HR_Employee.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for HR_Employee
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_HR_Employee 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_HR_Job.java b/org.adempiere.base/src/org/eevolution/model/I_HR_Job.java
index 1eee456ba3..6286657463 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_HR_Job.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_HR_Job.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for HR_Job
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_HR_Job 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_HR_List.java b/org.adempiere.base/src/org/eevolution/model/I_HR_List.java
index c8fd6a0db4..2250294d18 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_HR_List.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_HR_List.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for HR_List
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_HR_List 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_HR_ListLine.java b/org.adempiere.base/src/org/eevolution/model/I_HR_ListLine.java
index 3f5138403e..f578142dca 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_HR_ListLine.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_HR_ListLine.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for HR_ListLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_HR_ListLine 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_HR_ListType.java b/org.adempiere.base/src/org/eevolution/model/I_HR_ListType.java
index bb94213fe0..401b6397b1 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_HR_ListType.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_HR_ListType.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for HR_ListType
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_HR_ListType 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_HR_ListVersion.java b/org.adempiere.base/src/org/eevolution/model/I_HR_ListVersion.java
index 7ed3ec104a..c5577260ce 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_HR_ListVersion.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_HR_ListVersion.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for HR_ListVersion
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_HR_ListVersion 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_HR_Movement.java b/org.adempiere.base/src/org/eevolution/model/I_HR_Movement.java
index 8230b883c1..76f43a1916 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_HR_Movement.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_HR_Movement.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for HR_Movement
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_HR_Movement 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_HR_Payroll.java b/org.adempiere.base/src/org/eevolution/model/I_HR_Payroll.java
index 10b093f848..d159475a3a 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_HR_Payroll.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_HR_Payroll.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for HR_Payroll
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_HR_Payroll 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_HR_PayrollConcept.java b/org.adempiere.base/src/org/eevolution/model/I_HR_PayrollConcept.java
index 85c985f5e1..007e075cf1 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_HR_PayrollConcept.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_HR_PayrollConcept.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for HR_PayrollConcept
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_HR_PayrollConcept 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_HR_Period.java b/org.adempiere.base/src/org/eevolution/model/I_HR_Period.java
index afa76b820d..f36c5b5782 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_HR_Period.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_HR_Period.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for HR_Period
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_HR_Period 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_HR_Process.java b/org.adempiere.base/src/org/eevolution/model/I_HR_Process.java
index 7ce06d904d..c754fd6cae 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_HR_Process.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_HR_Process.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for HR_Process
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_HR_Process 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_HR_Year.java b/org.adempiere.base/src/org/eevolution/model/I_HR_Year.java
index 4613e48573..5f1ff1ad34 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_HR_Year.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_HR_Year.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for HR_Year
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_HR_Year 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_I_HR_Movement.java b/org.adempiere.base/src/org/eevolution/model/I_I_HR_Movement.java
index b0589715b9..e7a8899209 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_I_HR_Movement.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_I_HR_Movement.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_HR_Movement
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_I_HR_Movement 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_I_Movement.java b/org.adempiere.base/src/org/eevolution/model/I_I_Movement.java
index a2053d2e96..19ff51f6fd 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_I_Movement.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_I_Movement.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_Movement
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_I_Movement 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_I_ProductPlanning.java b/org.adempiere.base/src/org/eevolution/model/I_I_ProductPlanning.java
index 6780658f6b..9c89f28933 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_I_ProductPlanning.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_I_ProductPlanning.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_ProductPlanning
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_I_ProductPlanning 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_PP_Cost_Collector.java b/org.adempiere.base/src/org/eevolution/model/I_PP_Cost_Collector.java
index c59ac39ebd..c43c600211 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_PP_Cost_Collector.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_PP_Cost_Collector.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PP_Cost_Collector
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_PP_Cost_Collector 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_PP_Cost_CollectorMA.java b/org.adempiere.base/src/org/eevolution/model/I_PP_Cost_CollectorMA.java
index 3c8b29ca53..a464a7b7ff 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_PP_Cost_CollectorMA.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_PP_Cost_CollectorMA.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PP_Cost_CollectorMA
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_PP_Cost_CollectorMA 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_PP_MRP.java b/org.adempiere.base/src/org/eevolution/model/I_PP_MRP.java
index 7127437e77..c43a24fb50 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_PP_MRP.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_PP_MRP.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PP_MRP
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_PP_MRP 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_PP_Order.java b/org.adempiere.base/src/org/eevolution/model/I_PP_Order.java
index ced002b08d..5b645c6c0d 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_PP_Order.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_PP_Order.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PP_Order
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_PP_Order 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_PP_Order_BOM.java b/org.adempiere.base/src/org/eevolution/model/I_PP_Order_BOM.java
index a310fa278f..c1eabe2b94 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_PP_Order_BOM.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_PP_Order_BOM.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PP_Order_BOM
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_PP_Order_BOM 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_PP_Order_BOMLine.java b/org.adempiere.base/src/org/eevolution/model/I_PP_Order_BOMLine.java
index d1d828b887..8502d6fb2d 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_PP_Order_BOMLine.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_PP_Order_BOMLine.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PP_Order_BOMLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_PP_Order_BOMLine 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_PP_Order_Cost.java b/org.adempiere.base/src/org/eevolution/model/I_PP_Order_Cost.java
index 820dac51f6..14a1eca225 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_PP_Order_Cost.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_PP_Order_Cost.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PP_Order_Cost
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_PP_Order_Cost 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_PP_Order_Node.java b/org.adempiere.base/src/org/eevolution/model/I_PP_Order_Node.java
index dbd12c0cc1..8dc414f68b 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_PP_Order_Node.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_PP_Order_Node.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PP_Order_Node
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_PP_Order_Node 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_PP_Order_NodeNext.java b/org.adempiere.base/src/org/eevolution/model/I_PP_Order_NodeNext.java
index 3e4110b27a..3a7deb929d 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_PP_Order_NodeNext.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_PP_Order_NodeNext.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PP_Order_NodeNext
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_PP_Order_NodeNext 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_PP_Order_Node_Asset.java b/org.adempiere.base/src/org/eevolution/model/I_PP_Order_Node_Asset.java
index da109e87b9..25617598bf 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_PP_Order_Node_Asset.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_PP_Order_Node_Asset.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PP_Order_Node_Asset
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_PP_Order_Node_Asset 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_PP_Order_Node_Product.java b/org.adempiere.base/src/org/eevolution/model/I_PP_Order_Node_Product.java
index 39b316dbcf..81107ebb7e 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_PP_Order_Node_Product.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_PP_Order_Node_Product.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PP_Order_Node_Product
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_PP_Order_Node_Product 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_PP_Order_Workflow.java b/org.adempiere.base/src/org/eevolution/model/I_PP_Order_Workflow.java
index c3876e2dd3..0126c83788 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_PP_Order_Workflow.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_PP_Order_Workflow.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PP_Order_Workflow
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_PP_Order_Workflow 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_PP_Product_BOM.java b/org.adempiere.base/src/org/eevolution/model/I_PP_Product_BOM.java
index 8e1972c610..4ecd76ba96 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_PP_Product_BOM.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_PP_Product_BOM.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PP_Product_BOM
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_PP_Product_BOM 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_PP_Product_BOMLine.java b/org.adempiere.base/src/org/eevolution/model/I_PP_Product_BOMLine.java
index cc54abdded..6e6dfab875 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_PP_Product_BOMLine.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_PP_Product_BOMLine.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PP_Product_BOMLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_PP_Product_BOMLine 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_PP_Product_Planning.java b/org.adempiere.base/src/org/eevolution/model/I_PP_Product_Planning.java
index 399fce7c1d..567fe43220 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_PP_Product_Planning.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_PP_Product_Planning.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PP_Product_Planning
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_PP_Product_Planning 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_PP_WF_Node_Asset.java b/org.adempiere.base/src/org/eevolution/model/I_PP_WF_Node_Asset.java
index cb1e060e46..eb60ca6788 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_PP_WF_Node_Asset.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_PP_WF_Node_Asset.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PP_WF_Node_Asset
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_PP_WF_Node_Asset 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_PP_WF_Node_Product.java b/org.adempiere.base/src/org/eevolution/model/I_PP_WF_Node_Product.java
index e8d495ad75..c00eef3f94 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_PP_WF_Node_Product.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_PP_WF_Node_Product.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PP_WF_Node_Product
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_PP_WF_Node_Product 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_QM_Specification.java b/org.adempiere.base/src/org/eevolution/model/I_QM_Specification.java
index eb3fa5d1ab..d21f3446fb 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_QM_Specification.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_QM_Specification.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for QM_Specification
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_QM_Specification 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_QM_SpecificationLine.java b/org.adempiere.base/src/org/eevolution/model/I_QM_SpecificationLine.java
index 5010123da2..624dc4f334 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_QM_SpecificationLine.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_QM_SpecificationLine.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for QM_SpecificationLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_QM_SpecificationLine 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_T_BOMLine.java b/org.adempiere.base/src/org/eevolution/model/I_T_BOMLine.java
index 9d37a3d6da..b4960a1319 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_T_BOMLine.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_T_BOMLine.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for T_BOMLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_T_BOMLine 
diff --git a/org.adempiere.base/src/org/eevolution/model/I_T_MRP_CRP.java b/org.adempiere.base/src/org/eevolution/model/I_T_MRP_CRP.java
index ef61cc4654..faa4dbe492 100644
--- a/org.adempiere.base/src/org/eevolution/model/I_T_MRP_CRP.java
+++ b/org.adempiere.base/src/org/eevolution/model/I_T_MRP_CRP.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for T_MRP_CRP
  *  @author iDempiere (generated) 
- *  @version Release 5.1
+ *  @version Release 6.1
  */
 @SuppressWarnings("all")
 public interface I_T_MRP_CRP 
diff --git a/org.adempiere.base/src/org/eevolution/model/MDDOrderLine.java b/org.adempiere.base/src/org/eevolution/model/MDDOrderLine.java
index b6ea792e48..e6a6b91d66 100644
--- a/org.adempiere.base/src/org/eevolution/model/MDDOrderLine.java
+++ b/org.adempiere.base/src/org/eevolution/model/MDDOrderLine.java
@@ -17,6 +17,7 @@
 package org.eevolution.model;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.ResultSet;
 import java.util.ArrayList;
 import java.util.Properties;
@@ -285,7 +286,7 @@ public class MDDOrderLine extends X_DD_OrderLine
 	public void setM_AttributeSetInstance_ID (int M_AttributeSetInstance_ID)
 	{
 		if (M_AttributeSetInstance_ID == 0)		//	 0 is valid ID
-			set_Value("M_AttributeSetInstance_ID", new Integer(0));
+			set_Value("M_AttributeSetInstance_ID", Integer.valueOf(0));
 		else
 			super.setM_AttributeSetInstance_ID (M_AttributeSetInstance_ID);
 	}	//	setM_AttributeSetInstance_ID
@@ -485,7 +486,7 @@ public class MDDOrderLine extends X_DD_OrderLine
 		if (QtyEntered != null && getC_UOM_ID() != 0)
 		{
 			int precision = MUOM.getPrecision(getCtx(), getC_UOM_ID());
-			QtyEntered = QtyEntered.setScale(precision, BigDecimal.ROUND_HALF_UP);
+			QtyEntered = QtyEntered.setScale(precision, RoundingMode.HALF_UP);
 		}
 		super.setQtyEntered (QtyEntered);
 	}	//	setQtyEntered
@@ -500,7 +501,7 @@ public class MDDOrderLine extends X_DD_OrderLine
 		if (QtyOrdered != null && product != null)
 		{
 			int precision = product.getUOMPrecision();
-			QtyOrdered = QtyOrdered.setScale(precision, BigDecimal.ROUND_HALF_UP);
+			QtyOrdered = QtyOrdered.setScale(precision, RoundingMode.HALF_UP);
 		}
 		super.setQtyOrdered(QtyOrdered);
 	}	//	setQtyOrdered
diff --git a/org.adempiere.base/src/org/eevolution/model/MPPProductBOMLine.java b/org.adempiere.base/src/org/eevolution/model/MPPProductBOMLine.java
index 96df7ec20e..6750910dae 100644
--- a/org.adempiere.base/src/org/eevolution/model/MPPProductBOMLine.java
+++ b/org.adempiere.base/src/org/eevolution/model/MPPProductBOMLine.java
@@ -226,8 +226,8 @@ public class MPPProductBOMLine extends X_PP_Product_BOMLine
 		//
 		if (includeScrapQty)
 		{
-			BigDecimal scrapDec = getScrap().divide(Env.ONEHUNDRED, 12, BigDecimal.ROUND_UP);
-			qty = qty.divide(Env.ONE.subtract(scrapDec), precision, BigDecimal.ROUND_HALF_UP);
+			BigDecimal scrapDec = getScrap().divide(Env.ONEHUNDRED, 12, RoundingMode.UP);
+			qty = qty.divide(Env.ONE.subtract(scrapDec), precision, RoundingMode.HALF_UP);
 		}
 		//
 		if (qty.scale() > precision)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_C_TaxBase.java b/org.adempiere.base/src/org/eevolution/model/X_C_TaxBase.java
index 1b0f944919..2e41b02d12 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_C_TaxBase.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_C_TaxBase.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_TaxBase
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_TaxBase extends PO implements I_C_TaxBase, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_TaxBase (Properties ctx, int C_TaxBase_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_C_TaxDefinition.java b/org.adempiere.base/src/org/eevolution/model/X_C_TaxDefinition.java
index 7e360b2e01..fcc377f4db 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_C_TaxDefinition.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_C_TaxDefinition.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_TaxDefinition
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_TaxDefinition extends PO implements I_C_TaxDefinition, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_TaxDefinition (Properties ctx, int C_TaxDefinition_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_C_TaxGroup.java b/org.adempiere.base/src/org/eevolution/model/X_C_TaxGroup.java
index 5db3ed6bf8..2a4459c72b 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_C_TaxGroup.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_C_TaxGroup.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_TaxGroup
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_TaxGroup extends PO implements I_C_TaxGroup, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_TaxGroup (Properties ctx, int C_TaxGroup_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_C_TaxType.java b/org.adempiere.base/src/org/eevolution/model/X_C_TaxType.java
index cca2f1f808..08105883fa 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_C_TaxType.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_C_TaxType.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_TaxType
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_C_TaxType extends PO implements I_C_TaxType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_C_TaxType (Properties ctx, int C_TaxType_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_DD_NetworkDistribution.java b/org.adempiere.base/src/org/eevolution/model/X_DD_NetworkDistribution.java
index c2eca594bc..6e04960692 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_DD_NetworkDistribution.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_DD_NetworkDistribution.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for DD_NetworkDistribution
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_DD_NetworkDistribution extends PO implements I_DD_NetworkDistribution, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_DD_NetworkDistribution (Properties ctx, int DD_NetworkDistribution_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_DD_NetworkDistributionLine.java b/org.adempiere.base/src/org/eevolution/model/X_DD_NetworkDistributionLine.java
index c78d3e82b2..ef66c0e2c7 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_DD_NetworkDistributionLine.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_DD_NetworkDistributionLine.java
@@ -26,14 +26,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for DD_NetworkDistributionLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_DD_NetworkDistributionLine extends PO implements I_DD_NetworkDistributionLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_DD_NetworkDistributionLine (Properties ctx, int DD_NetworkDistributionLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_DD_Order.java b/org.adempiere.base/src/org/eevolution/model/X_DD_Order.java
index f6ab8a4e7f..2f0d6cae39 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_DD_Order.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_DD_Order.java
@@ -27,14 +27,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for DD_Order
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_DD_Order extends PO implements I_DD_Order, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_DD_Order (Properties ctx, int DD_Order_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_DD_OrderLine.java b/org.adempiere.base/src/org/eevolution/model/X_DD_OrderLine.java
index 3d4e4c66ec..785a563802 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_DD_OrderLine.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_DD_OrderLine.java
@@ -27,14 +27,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for DD_OrderLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_DD_OrderLine extends PO implements I_DD_OrderLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_DD_OrderLine (Properties ctx, int DD_OrderLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_Attribute.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Attribute.java
index ddf04ae4be..161ea38610 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_Attribute.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_Attribute.java
@@ -26,14 +26,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for HR_Attribute
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_HR_Attribute extends PO implements I_HR_Attribute, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_HR_Attribute (Properties ctx, int HR_Attribute_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_Concept.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Concept.java
index 65d4bb4c24..cacd330e5a 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_Concept.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_Concept.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for HR_Concept
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_HR_Concept extends PO implements I_HR_Concept, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_HR_Concept (Properties ctx, int HR_Concept_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_Concept_Acct.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Concept_Acct.java
index c1afc39141..c538bf1694 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_Concept_Acct.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_Concept_Acct.java
@@ -23,14 +23,14 @@ import org.compiere.model.*;
 
 /** Generated Model for HR_Concept_Acct
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_HR_Concept_Acct extends PO implements I_HR_Concept_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_HR_Concept_Acct (Properties ctx, int HR_Concept_Acct_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_Concept_Category.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Concept_Category.java
index ab0b8e6501..cd12d28e2c 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_Concept_Category.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_Concept_Category.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for HR_Concept_Category
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_HR_Concept_Category extends PO implements I_HR_Concept_Category, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_HR_Concept_Category (Properties ctx, int HR_Concept_Category_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_Contract.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Contract.java
index a153b26c5a..c2e737af6f 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_Contract.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_Contract.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for HR_Contract
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_HR_Contract extends PO implements I_HR_Contract, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_HR_Contract (Properties ctx, int HR_Contract_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_Department.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Department.java
index cdf687e035..7773c32ad6 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_Department.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_Department.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for HR_Department
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_HR_Department extends PO implements I_HR_Department, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_HR_Department (Properties ctx, int HR_Department_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_Employee.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Employee.java
index 25d439efc2..14e7393f9e 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_Employee.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_Employee.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for HR_Employee
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_HR_Employee extends PO implements I_HR_Employee, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_HR_Employee (Properties ctx, int HR_Employee_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_Job.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Job.java
index c4d36e50be..8c09fb4cd6 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_Job.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_Job.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for HR_Job
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_HR_Job extends PO implements I_HR_Job, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_HR_Job (Properties ctx, int HR_Job_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_List.java b/org.adempiere.base/src/org/eevolution/model/X_HR_List.java
index a354397be7..0e2358aebe 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_List.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_List.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for HR_List
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_HR_List extends PO implements I_HR_List, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_HR_List (Properties ctx, int HR_List_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_ListLine.java b/org.adempiere.base/src/org/eevolution/model/X_HR_ListLine.java
index fbe62b2951..dd57c1f1fd 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_ListLine.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_ListLine.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for HR_ListLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_HR_ListLine extends PO implements I_HR_ListLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_HR_ListLine (Properties ctx, int HR_ListLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_ListType.java b/org.adempiere.base/src/org/eevolution/model/X_HR_ListType.java
index acf90ff9f1..7f1e9060b0 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_ListType.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_ListType.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for HR_ListType
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_HR_ListType extends PO implements I_HR_ListType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_HR_ListType (Properties ctx, int HR_ListType_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_ListVersion.java b/org.adempiere.base/src/org/eevolution/model/X_HR_ListVersion.java
index 982f9127fc..241a5059c2 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_ListVersion.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_ListVersion.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for HR_ListVersion
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_HR_ListVersion extends PO implements I_HR_ListVersion, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_HR_ListVersion (Properties ctx, int HR_ListVersion_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_Movement.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Movement.java
index 2dc3df3ab5..a2747550ea 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_Movement.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_Movement.java
@@ -27,14 +27,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for HR_Movement
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_HR_Movement extends PO implements I_HR_Movement, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_HR_Movement (Properties ctx, int HR_Movement_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_Payroll.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Payroll.java
index da52ea3022..b96f3c0421 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_Payroll.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_Payroll.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for HR_Payroll
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_HR_Payroll extends PO implements I_HR_Payroll, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_HR_Payroll (Properties ctx, int HR_Payroll_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_PayrollConcept.java b/org.adempiere.base/src/org/eevolution/model/X_HR_PayrollConcept.java
index ae5dcb5b28..09434634c7 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_PayrollConcept.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_PayrollConcept.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for HR_PayrollConcept
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_HR_PayrollConcept extends PO implements I_HR_PayrollConcept, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_HR_PayrollConcept (Properties ctx, int HR_PayrollConcept_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_Period.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Period.java
index 2b170c5f5b..128579a94c 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_Period.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_Period.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for HR_Period
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_HR_Period extends PO implements I_HR_Period, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_HR_Period (Properties ctx, int HR_Period_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_Process.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Process.java
index 9b17c64f1b..4149d67b4c 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_Process.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_Process.java
@@ -27,14 +27,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for HR_Process
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_HR_Process extends PO implements I_HR_Process, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_HR_Process (Properties ctx, int HR_Process_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_Year.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Year.java
index d8daba1503..2fd09e999d 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_Year.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_Year.java
@@ -24,14 +24,14 @@ import org.compiere.model.*;
 
 /** Generated Model for HR_Year
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_HR_Year extends PO implements I_HR_Year, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_HR_Year (Properties ctx, int HR_Year_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_I_HR_Movement.java b/org.adempiere.base/src/org/eevolution/model/X_I_HR_Movement.java
index 0db9ef40f7..ebb196de91 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_I_HR_Movement.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_I_HR_Movement.java
@@ -27,14 +27,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_HR_Movement
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_I_HR_Movement extends PO implements I_I_HR_Movement, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_I_HR_Movement (Properties ctx, int I_HR_Movement_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_I_Movement.java b/org.adempiere.base/src/org/eevolution/model/X_I_Movement.java
index 43e1267cc4..fb494177e7 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_I_Movement.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_I_Movement.java
@@ -26,14 +26,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for I_Movement
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_I_Movement extends PO implements I_I_Movement, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_I_Movement (Properties ctx, int I_Movement_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_I_ProductPlanning.java b/org.adempiere.base/src/org/eevolution/model/X_I_ProductPlanning.java
index 7099f6601d..abba985752 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_I_ProductPlanning.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_I_ProductPlanning.java
@@ -26,14 +26,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for I_ProductPlanning
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_I_ProductPlanning extends PO implements I_I_ProductPlanning, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_I_ProductPlanning (Properties ctx, int I_ProductPlanning_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_Cost_Collector.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Cost_Collector.java
index 1b7ce8b2bf..69f518cb26 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_Cost_Collector.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_Cost_Collector.java
@@ -27,14 +27,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PP_Cost_Collector
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PP_Cost_Collector extends PO implements I_PP_Cost_Collector, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PP_Cost_Collector (Properties ctx, int PP_Cost_Collector_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_Cost_CollectorMA.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Cost_CollectorMA.java
index 0f8682e496..4781b0f3ce 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_Cost_CollectorMA.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_Cost_CollectorMA.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for PP_Cost_CollectorMA
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PP_Cost_CollectorMA extends PO implements I_PP_Cost_CollectorMA, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PP_Cost_CollectorMA (Properties ctx, int PP_Cost_CollectorMA_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_MRP.java b/org.adempiere.base/src/org/eevolution/model/X_PP_MRP.java
index 373f08a773..3b225b1e73 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_MRP.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_MRP.java
@@ -27,14 +27,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PP_MRP
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PP_MRP extends PO implements I_PP_MRP, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PP_MRP (Properties ctx, int PP_MRP_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_Order.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Order.java
index 5d06c2f984..b9da9c05b4 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_Order.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_Order.java
@@ -27,14 +27,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PP_Order
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PP_Order extends PO implements I_PP_Order, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PP_Order (Properties ctx, int PP_Order_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_BOM.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_BOM.java
index 5686879a5e..345cc4a064 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_BOM.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_BOM.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PP_Order_BOM
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PP_Order_BOM extends PO implements I_PP_Order_BOM, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PP_Order_BOM (Properties ctx, int PP_Order_BOM_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_BOMLine.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_BOMLine.java
index bcd6f4d532..0b5ec7ba30 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_BOMLine.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_BOMLine.java
@@ -27,14 +27,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PP_Order_BOMLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PP_Order_BOMLine extends PO implements I_PP_Order_BOMLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PP_Order_BOMLine (Properties ctx, int PP_Order_BOMLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Cost.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Cost.java
index f767425591..8c43120de4 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Cost.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Cost.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for PP_Order_Cost
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PP_Order_Cost extends PO implements I_PP_Order_Cost, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PP_Order_Cost (Properties ctx, int PP_Order_Cost_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node.java
index aa686700d3..5b494996f8 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node.java
@@ -27,14 +27,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PP_Order_Node
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PP_Order_Node extends PO implements I_PP_Order_Node, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PP_Order_Node (Properties ctx, int PP_Order_Node_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_NodeNext.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_NodeNext.java
index 65994a4df3..1e8e677989 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_NodeNext.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_NodeNext.java
@@ -23,14 +23,14 @@ import org.compiere.model.*;
 
 /** Generated Model for PP_Order_NodeNext
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PP_Order_NodeNext extends PO implements I_PP_Order_NodeNext, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PP_Order_NodeNext (Properties ctx, int PP_Order_NodeNext_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node_Asset.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node_Asset.java
index 934aebe2ba..fd54130b36 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node_Asset.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node_Asset.java
@@ -23,14 +23,14 @@ import org.compiere.model.*;
 
 /** Generated Model for PP_Order_Node_Asset
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PP_Order_Node_Asset extends PO implements I_PP_Order_Node_Asset, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PP_Order_Node_Asset (Properties ctx, int PP_Order_Node_Asset_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node_Product.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node_Product.java
index 628a47dffe..55a05fad2f 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node_Product.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node_Product.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for PP_Order_Node_Product
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PP_Order_Node_Product extends PO implements I_PP_Order_Node_Product, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PP_Order_Node_Product (Properties ctx, int PP_Order_Node_Product_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Workflow.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Workflow.java
index 390fb922b1..13894d821c 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Workflow.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Workflow.java
@@ -27,14 +27,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PP_Order_Workflow
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PP_Order_Workflow extends PO implements I_PP_Order_Workflow, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PP_Order_Workflow (Properties ctx, int PP_Order_Workflow_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_Product_BOM.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Product_BOM.java
index 7d20f75185..87747f9394 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_Product_BOM.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_Product_BOM.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PP_Product_BOM
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PP_Product_BOM extends PO implements I_PP_Product_BOM, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PP_Product_BOM (Properties ctx, int PP_Product_BOM_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_Product_BOMLine.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Product_BOMLine.java
index b03f3b23e5..23462c6b2c 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_Product_BOMLine.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_Product_BOMLine.java
@@ -27,14 +27,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PP_Product_BOMLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PP_Product_BOMLine extends PO implements I_PP_Product_BOMLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PP_Product_BOMLine (Properties ctx, int PP_Product_BOMLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_Product_Planning.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Product_Planning.java
index 66671bf73e..d1be3579a8 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_Product_Planning.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_Product_Planning.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PP_Product_Planning
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PP_Product_Planning extends PO implements I_PP_Product_Planning, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PP_Product_Planning (Properties ctx, int PP_Product_Planning_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_WF_Node_Asset.java b/org.adempiere.base/src/org/eevolution/model/X_PP_WF_Node_Asset.java
index 2437a35a9d..b16d73425f 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_WF_Node_Asset.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_WF_Node_Asset.java
@@ -23,14 +23,14 @@ import org.compiere.model.*;
 
 /** Generated Model for PP_WF_Node_Asset
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PP_WF_Node_Asset extends PO implements I_PP_WF_Node_Asset, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PP_WF_Node_Asset (Properties ctx, int PP_WF_Node_Asset_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_WF_Node_Product.java b/org.adempiere.base/src/org/eevolution/model/X_PP_WF_Node_Product.java
index 4c2a899b0e..62b8f4d2a0 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_WF_Node_Product.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_WF_Node_Product.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for PP_WF_Node_Product
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_PP_WF_Node_Product extends PO implements I_PP_WF_Node_Product, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_PP_WF_Node_Product (Properties ctx, int PP_WF_Node_Product_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_QM_Specification.java b/org.adempiere.base/src/org/eevolution/model/X_QM_Specification.java
index 8196f77536..6ac8f44317 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_QM_Specification.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_QM_Specification.java
@@ -24,14 +24,14 @@ import org.compiere.model.*;
 
 /** Generated Model for QM_Specification
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_QM_Specification extends PO implements I_QM_Specification, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_QM_Specification (Properties ctx, int QM_Specification_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_QM_SpecificationLine.java b/org.adempiere.base/src/org/eevolution/model/X_QM_SpecificationLine.java
index 52889eacdd..1b5471e041 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_QM_SpecificationLine.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_QM_SpecificationLine.java
@@ -24,14 +24,14 @@ import org.compiere.model.*;
 
 /** Generated Model for QM_SpecificationLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_QM_SpecificationLine extends PO implements I_QM_SpecificationLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_QM_SpecificationLine (Properties ctx, int QM_SpecificationLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_T_BOMLine.java b/org.adempiere.base/src/org/eevolution/model/X_T_BOMLine.java
index 9fbd6ea4e4..04a8b9cb0a 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_T_BOMLine.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_T_BOMLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for T_BOMLine
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_T_BOMLine extends PO implements I_T_BOMLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_T_BOMLine (Properties ctx, int T_BOMLine_ID, String trxName)
diff --git a/org.adempiere.base/src/org/eevolution/model/X_T_MRP_CRP.java b/org.adempiere.base/src/org/eevolution/model/X_T_MRP_CRP.java
index b62d12fdf3..ad042f8b5b 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_T_MRP_CRP.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_T_MRP_CRP.java
@@ -23,14 +23,14 @@ import org.compiere.model.*;
 
 /** Generated Model for T_MRP_CRP
  *  @author iDempiere (generated) 
- *  @version Release 5.1 - $Id$ */
+ *  @version Release 6.1 - $Id$ */
 public class X_T_MRP_CRP extends PO implements I_T_MRP_CRP, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20181104L;
 
     /** Standard Constructor */
     public X_T_MRP_CRP (Properties ctx, int T_MRP_CRP_ID, String trxName)
diff --git a/org.adempiere.base/src/org/globalqss/process/CashFlow.java b/org.adempiere.base/src/org/globalqss/process/CashFlow.java
index 3ff691291e..3fc4e72490 100644
--- a/org.adempiere.base/src/org/globalqss/process/CashFlow.java
+++ b/org.adempiere.base/src/org/globalqss/process/CashFlow.java
@@ -17,6 +17,7 @@
 package org.globalqss.process;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
@@ -229,7 +230,7 @@ public class CashFlow  extends SvrProcess {
 					open = open.subtract(paid);
 				}
 				if (open.scale() > curr.getStdPrecision())
-					open = open.setScale(curr.getStdPrecision(), BigDecimal.ROUND_HALF_UP);
+					open = open.setScale(curr.getStdPrecision(), RoundingMode.HALF_UP);
 				BigDecimal invoiced = order.getGrandTotal().subtract(open);
 				if (isPaySchedule) {
 					MOrderPaySchedule[] schedule = MOrderPaySchedule.getOrderPaySchedule(getCtx(), order_id, 0, get_TrxName());
diff --git a/org.adempiere.base/src/org/globalqss/process/GLJournalGenerate.java b/org.adempiere.base/src/org/globalqss/process/GLJournalGenerate.java
index 62b08b662f..9d9487e753 100644
--- a/org.adempiere.base/src/org/globalqss/process/GLJournalGenerate.java
+++ b/org.adempiere.base/src/org/globalqss/process/GLJournalGenerate.java
@@ -26,6 +26,7 @@ package org.globalqss.process;
 
 import java.math.BigDecimal;
 import java.math.MathContext;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -543,11 +544,11 @@ public class GLJournalGenerate extends SvrProcess
 		if (roundFactor < 0) {
 			BigDecimal divisor = BigDecimal.valueOf(Math.pow(10, -roundFactor));
 			sourceAmt = sourceAmt.divide(divisor, MathContext.UNLIMITED);
-			sourceAmt = sourceAmt.setScale(0, BigDecimal.ROUND_HALF_UP);
+			sourceAmt = sourceAmt.setScale(0, RoundingMode.HALF_UP);
 			sourceAmt = sourceAmt.multiply(divisor, MathContext.UNLIMITED);
-			sourceAmt = sourceAmt.setScale(0, BigDecimal.ROUND_HALF_UP);
+			sourceAmt = sourceAmt.setScale(0, RoundingMode.HALF_UP);
 		} else {
-			sourceAmt = sourceAmt.setScale(roundFactor, BigDecimal.ROUND_HALF_UP);
+			sourceAmt = sourceAmt.setScale(roundFactor, RoundingMode.HALF_UP);
 		}
 		return sourceAmt;
 	}
diff --git a/org.adempiere.bundles.external-feature/feature.xml b/org.adempiere.bundles.external-feature/feature.xml
index 184f2e9626..08f24fbab0 100644
--- a/org.adempiere.bundles.external-feature/feature.xml
+++ b/org.adempiere.bundles.external-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.bundles.external.feature"
       label="External bundles"
-      version="5.1.0.qualifier"
+      version="6.1.0.qualifier"
       provider-name="Adempiere.org">
 
    <description url="http://www.example.com/description">
@@ -31,13 +31,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="javax.xml.ws"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.apache.servicemix.bundles.cglib"
          download-size="0"
@@ -52,13 +45,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.apache.poi"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.apache.xerces"
          download-size="0"
@@ -108,4 +94,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.apache.poi.poi"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/org.adempiere.bundles.external-feature/pom.xml b/org.adempiere.bundles.external-feature/pom.xml
index 09281113ed..698a7e1612 100644
--- a/org.adempiere.bundles.external-feature/pom.xml
+++ b/org.adempiere.bundles.external-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.bundles.external.feature</artifactId>
diff --git a/org.adempiere.eclipse.equinox.http.servlet/.classpath b/org.adempiere.eclipse.equinox.http.servlet/.classpath
index cf36b56119..423c974870 100644
--- a/org.adempiere.eclipse.equinox.http.servlet/.classpath
+++ b/org.adempiere.eclipse.equinox.http.servlet/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.adempiere.eclipse.equinox.http.servlet/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.eclipse.equinox.http.servlet/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.adempiere.eclipse.equinox.http.servlet/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.eclipse.equinox.http.servlet/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF b/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
index c58c7561b8..72aaa47d0d 100644
--- a/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
+++ b/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Bundle-SymbolicName: org.adempiere.eclipse.equinox.http.servlet
 Eclipse-LazyStart: true
 Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt:
@@ -8,7 +8,7 @@ Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt:
  et;tag=v20100503
 Bundle-Activator: org.eclipse.equinox.http.servlet.internal.Activator
 Export-Package: org.eclipse.equinox.http.servlet;version="1.1.0"
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.1.0.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
 Bundle-Name: %bundleName
diff --git a/org.adempiere.eclipse.equinox.http.servlet/pom.xml b/org.adempiere.eclipse.equinox.http.servlet/pom.xml
index 7e23e87bf3..7a77bad04f 100644
--- a/org.adempiere.eclipse.equinox.http.servlet/pom.xml
+++ b/org.adempiere.eclipse.equinox.http.servlet/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.eclipse.equinox.http.servlet</artifactId>
diff --git a/org.adempiere.eclipse.equinox.http.servletbridge/.classpath b/org.adempiere.eclipse.equinox.http.servletbridge/.classpath
index cf36b56119..423c974870 100644
--- a/org.adempiere.eclipse.equinox.http.servletbridge/.classpath
+++ b/org.adempiere.eclipse.equinox.http.servletbridge/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.adempiere.eclipse.equinox.http.servletbridge/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.eclipse.equinox.http.servletbridge/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.adempiere.eclipse.equinox.http.servletbridge/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.eclipse.equinox.http.servletbridge/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.adempiere.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF b/org.adempiere.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF
index fd8b5fcad9..d7c04d65b6 100644
--- a/org.adempiere.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF
+++ b/org.adempiere.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Bundle-Name: %bundleName
 Bundle-SymbolicName: org.adempiere.eclipse.equinox.http.servletbridge;singleton:=true
 Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt:
@@ -9,7 +9,7 @@ Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt:
  letbridge;tag=v20100503
 Bundle-Activator: org.eclipse.equinox.http.servletbridge.internal.Acti
  vator
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.1.0.qualifier
 Import-Package: javax.servlet;version="2.3",javax.servlet.http;version
  ="2.3",org.eclipse.equinox.http.servlet;version="1.0.0",org.eclipse.e
  quinox.servletbridge;version="1.0.0",org.osgi.framework;version="1.3.
diff --git a/org.adempiere.eclipse.equinox.http.servletbridge/pom.xml b/org.adempiere.eclipse.equinox.http.servletbridge/pom.xml
index 573283813e..5e04172656 100644
--- a/org.adempiere.eclipse.equinox.http.servletbridge/pom.xml
+++ b/org.adempiere.eclipse.equinox.http.servletbridge/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.eclipse.equinox.http.servletbridge</artifactId>
diff --git a/org.adempiere.eclipse.equinox.servletbridge/.classpath b/org.adempiere.eclipse.equinox.servletbridge/.classpath
index cf36b56119..423c974870 100644
--- a/org.adempiere.eclipse.equinox.servletbridge/.classpath
+++ b/org.adempiere.eclipse.equinox.servletbridge/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF b/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF
index 070c38ed5e..5ca54f9ae7 100644
--- a/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF
+++ b/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
 Manifest-Version: 1.0
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Bundle-Name: %bundleName
 Bundle-SymbolicName: org.adempiere.eclipse.equinox.servletbridge;singleton:=true
 Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt:
  org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.servletbr
  idge;tag=v20100503
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.1.0.qualifier
 Export-Package: org.eclipse.equinox.servletbridge;version="1.1.0"
 Import-Package: javax.servlet;version="2.3.0",
  javax.servlet.http;version="2.3.0",
diff --git a/org.adempiere.eclipse.equinox.servletbridge/pom.xml b/org.adempiere.eclipse.equinox.servletbridge/pom.xml
index b591d306ba..10d4941702 100644
--- a/org.adempiere.eclipse.equinox.servletbridge/pom.xml
+++ b/org.adempiere.eclipse.equinox.servletbridge/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.eclipse.equinox.servletbridge</artifactId>
diff --git a/org.adempiere.extend/.classpath b/org.adempiere.extend/.classpath
index cf36b56119..423c974870 100644
--- a/org.adempiere.extend/.classpath
+++ b/org.adempiere.extend/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.adempiere.extend/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.extend/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.adempiere.extend/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.extend/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.adempiere.extend/META-INF/MANIFEST.MF b/org.adempiere.extend/META-INF/MANIFEST.MF
index 36dc00e646..5e8ac5d720 100644
--- a/org.adempiere.extend/META-INF/MANIFEST.MF
+++ b/org.adempiere.extend/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere extend
 Bundle-SymbolicName: org.adempiere.extend;singleton:=true
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.1.0.qualifier
 Eclipse-RegisterBuddy: org.adempiere.tools
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Export-Package: compiere.model,
  test
 Fragment-Host: org.adempiere.base;bundle-version="0.0.0"
@@ -17,3 +17,4 @@ Import-Package: junit.framework;version="3.8.2",
  org.supercsv.prefs
 Bundle-ClassPath: .
 Automatic-Module-Name: org.adempiere.extend
+Bundle-Vendor: iDempiere Community
diff --git a/org.adempiere.extend/pom.xml b/org.adempiere.extend/pom.xml
index 63cc9473f9..d8feaabe5c 100644
--- a/org.adempiere.extend/pom.xml
+++ b/org.adempiere.extend/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.extend</artifactId>
diff --git a/org.adempiere.extend/src/compiere/model/CalloutUser.java b/org.adempiere.extend/src/compiere/model/CalloutUser.java
index 1469b04c7f..f29ceb060d 100644
--- a/org.adempiere.extend/src/compiere/model/CalloutUser.java
+++ b/org.adempiere.extend/src/compiere/model/CalloutUser.java
@@ -112,7 +112,7 @@ public class CalloutUser extends CalloutEngine
 				if (locID == 0)
 					mTab.setValue("C_BPartner_Location_ID", null);
 				else
-					mTab.setValue("C_BPartner_Location_ID", new Integer(locID));
+					mTab.setValue("C_BPartner_Location_ID", Integer.valueOf(locID));
 
 				//	Contact - overwritten by InfoBP selection
 				int contID = rs.getInt("AD_User_ID");
@@ -125,7 +125,7 @@ public class CalloutUser extends CalloutEngine
 				if (contID == 0)
 					mTab.setValue("AD_User_ID", null);
 				else
-					mTab.setValue("AD_User_ID", new Integer(contID));
+					mTab.setValue("AD_User_ID", Integer.valueOf(contID));
 			}
 		}
 		catch (SQLException e)
diff --git a/org.adempiere.extend/src/compiere/model/MyValidator.java b/org.adempiere.extend/src/compiere/model/MyValidator.java
index bb4b768ffd..f81fb746a0 100644
--- a/org.adempiere.extend/src/compiere/model/MyValidator.java
+++ b/org.adempiere.extend/src/compiere/model/MyValidator.java
@@ -168,7 +168,7 @@ public class MyValidator implements ModelValidator
 		//	Calculate Discount
 		BigDecimal discountPercent = new BigDecimal(3);	//	3% example
 		BigDecimal discountAmt = totalLines.multiply(discountPercent);
-		discountAmt = discountAmt.divide(Env.ONEHUNDRED, order.getPrecision(), BigDecimal.ROUND_HALF_UP);
+		discountAmt = discountAmt.divide(Env.ONEHUNDRED, order.getPrecision(), RoundingMode.HALF_UP);
 		discountLine.setPrice(discountAmt.negate());
 		if (!discountLine.save())
 			return "Could not save discount line";
diff --git a/org.adempiere.extend/src/test/AdempiereTestCase.java b/org.adempiere.extend/src/test/AdempiereTestCase.java
index 1260481f08..b53f677ba8 100644
--- a/org.adempiere.extend/src/test/AdempiereTestCase.java
+++ b/org.adempiere.extend/src/test/AdempiereTestCase.java
@@ -148,8 +148,8 @@ public class AdempiereTestCase extends TestCase
 
 		//m_Ctx = new Properties();
 		m_Ctx = Env.getCtx();
-		m_Ctx.setProperty("#AD_User_ID", new Integer(AD_User_ID_Value).toString());
-		m_Ctx.setProperty("#AD_Client_ID", new Integer(AD_Client_ID_Value).toString());
+		m_Ctx.setProperty("#AD_User_ID", Integer.valueOf(AD_User_ID_Value).toString());
+		m_Ctx.setProperty("#AD_Client_ID", Integer.valueOf(AD_Client_ID_Value).toString());
 
 		if (fileName_Value.length() < 1) {
 			assertEquals("Please specify path to idempiere.properties file!", true, false);
diff --git a/org.adempiere.extend/src/test/functional/MStorageTest.java b/org.adempiere.extend/src/test/functional/MStorageTest.java
index 1fafe26782..9e80c2817b 100644
--- a/org.adempiere.extend/src/test/functional/MStorageTest.java
+++ b/org.adempiere.extend/src/test/functional/MStorageTest.java
@@ -14,6 +14,7 @@
 package test.functional;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 
 import org.compiere.model.MLocator;
 import org.compiere.model.MStorageOnHand;
@@ -44,12 +45,12 @@ public class MStorageTest extends AdempiereTestCase
 		loc.setXYZ("X"+locatorValue, "Y"+locatorValue, "Z"+locatorValue);
 		loc.saveEx();
 		//
-		BigDecimal targetQty = BigDecimal.valueOf(qtyOnHand).setScale(12, BigDecimal.ROUND_HALF_UP);
+		BigDecimal targetQty = BigDecimal.valueOf(qtyOnHand).setScale(12, RoundingMode.HALF_UP);
 		MStorageOnHand s1 = MStorageOnHand.getCreate(getCtx(), loc.get_ID(), product_id, 0,null, getTrxName());
 		s1.setQtyOnHand(targetQty);
 		s1.saveEx();
 		//
-		BigDecimal qty = MStorageReservation.getQtyAvailable(wh.get_ID(), product_id, 0, getTrxName()).setScale(12, BigDecimal.ROUND_HALF_UP);
+		BigDecimal qty = MStorageReservation.getQtyAvailable(wh.get_ID(), product_id, 0, getTrxName()).setScale(12, RoundingMode.HALF_UP);
 		assertEquals("Error on locator "+locatorValue, targetQty, qty);
 		//
 		return loc;
@@ -57,8 +58,8 @@ public class MStorageTest extends AdempiereTestCase
 	private void assertWarehouseQty(MWarehouse wh, BigDecimal targetQty)
 	{
 		BigDecimal qty = MStorageReservation.getQtyAvailable(wh.get_ID(), product_id, 0, getTrxName());
-		qty = qty.setScale(12, BigDecimal.ROUND_HALF_UP);
-		targetQty = targetQty.setScale(12, BigDecimal.ROUND_HALF_UP);
+		qty = qty.setScale(12, RoundingMode.HALF_UP);
+		targetQty = targetQty.setScale(12, RoundingMode.HALF_UP);
 		assertEquals(targetQty, qty);
 	}
 	
diff --git a/org.adempiere.extend/src/test/performance/SingleMProductTest.java b/org.adempiere.extend/src/test/performance/SingleMProductTest.java
index b6183034f3..42ec6e259f 100644
--- a/org.adempiere.extend/src/test/performance/SingleMProductTest.java
+++ b/org.adempiere.extend/src/test/performance/SingleMProductTest.java
@@ -45,7 +45,7 @@ public class SingleMProductTest extends TestCase {
 		AD_User_ID_Value = Integer.parseInt(testProperties.getProperty(AD_User_ID_Key, AD_User_ID_DefaultValue) );
 		
 		m_Ctx = new Properties();
-		m_Ctx.setProperty("#AD_User_ID", new Integer(AD_User_ID_Value).toString());
+		m_Ctx.setProperty("#AD_User_ID", Integer.valueOf(AD_User_ID_Value).toString());
 		System.out.println("m_Ctx: " + m_Ctx);
 		
 		if (fileName_Value.length() < 1) {
diff --git a/org.adempiere.install/.classpath b/org.adempiere.install/.classpath
index 1917c2a589..b89f6895b7 100644
--- a/org.adempiere.install/.classpath
+++ b/org.adempiere.install/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+			<attribute name="add-exports" value="java.base/sun.security.tools.keytool=ALL-UNNAMED"/>
+		</attributes>
 		<accessrules>
 			<accessrule kind="accessible" pattern="sun/security/tools/*"/>
 		</accessrules>
diff --git a/org.adempiere.install/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.install/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.adempiere.install/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.install/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.adempiere.install/META-INF/MANIFEST.MF b/org.adempiere.install/META-INF/MANIFEST.MF
index 7f0b1fb4c1..feb52b1ba1 100644
--- a/org.adempiere.install/META-INF/MANIFEST.MF
+++ b/org.adempiere.install/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Setup
 Bundle-SymbolicName: org.adempiere.install;singleton:=true
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.1.0.qualifier
 Export-Package: org.adempiere.install,
  org.compiere.install
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Import-Package: javax.mail;version="1.5",
  javax.mail.internet;version="1.5",
  org.apache.tools.ant,
@@ -18,3 +18,4 @@ Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.adempiere.install.InstallBundleActivator
 Bundle-ClassPath: .
 Automatic-Module-Name: org.adempiere.install
+Bundle-Vendor: iDempiere Community
diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch
index 8aa2002c82..ffbf7268a8 100644
--- a/org.adempiere.install/install.app.launch
+++ b/org.adempiere.install/install.app.launch
@@ -1,36 +1,39 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.adempiere.install.application"/>
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="true"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/install.app"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="includeOptional" value="false"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-install.app"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.compatibility.bootdelegation=true"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.adempiere.server.server_product"/>
-<stringAttribute key="selected_target_plugins" value="bcpkix@default:default,bcprov@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,com.sun.mail.javax.mail@default:default,groovy-all@default:default,javax.activation@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant*1.9.6.v201510161327@default:default,org.apache.commons.codec*1.6.0.v201305230611@default:false,org.apache.commons.codec*1.9.0.v20170208-1614@default:false,org.apache.commons.collections@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,org.apache.commons.net@default:default,org.apache.felix.scr@1:true,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.jfree.chart-osgi@default:default,org.jfree.jcommon-osgi@default:default,org.junit@default:default,org.krysalis.barcode4j@default:default,org.passay@default:default,org.restlet*2.0.5.v201605172130@default:default,org.restlet*2.3.2.v20150501-1520@default:default,slf4j.api@default:default,slf4j.jcl@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="false"/>
+    <booleanAttribute key="append.args" value="true"/>
+    <stringAttribute key="application" value="org.adempiere.install.application"/>
+    <booleanAttribute key="askclear" value="true"/>
+    <booleanAttribute key="automaticAdd" value="false"/>
+    <booleanAttribute key="automaticValidate" value="true"/>
+    <stringAttribute key="bootstrap" value=""/>
+    <stringAttribute key="checked" value="[NONE]"/>
+    <booleanAttribute key="clearConfig" value="true"/>
+    <booleanAttribute key="clearws" value="false"/>
+    <booleanAttribute key="clearwslog" value="false"/>
+    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/install.app"/>
+    <booleanAttribute key="default" value="false"/>
+    <booleanAttribute key="includeOptional" value="false"/>
+    <stringAttribute key="location" value="${workspace_loc}/runtime-install.app"/>
+    <mapAttribute key="org.eclipse.debug.core.environmentVariables">
+        <mapEntry key="J2D_UISCALE" value="1"/>
+    </mapAttribute>
+    <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+        <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+    </listAttribute>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.compatibility.bootdelegation=true"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
+    <stringAttribute key="pde.version" value="3.3"/>
+    <stringAttribute key="product" value="org.adempiere.server.server_product"/>
+    <stringAttribute key="selected_target_plugins" value="bcpkix@default:default,bcprov@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,com.sun.mail.javax.mail@default:default,groovy@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.jms@default:default,javax.transaction@default:false,javax.xml@default:default,jaxb-api@default:default,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant*1.9.6.v201510161327@default:default,org.apache.commons.codec*1.6.0.v201305230611@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,org.apache.commons.net@default:default,org.apache.felix.scr@1:true,org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default,org.apache.poi.poi-ooxml@default:default,org.apache.poi.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi*3.13.100.v20180827-1536@-1:true,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services*3.7.100.v20180827-1536@default:default,org.eclipse.osgi.util*3.5.100.v20180827-1536@default:default,org.hamcrest.core@default:default,org.jfree.chart-osgi@default:default,org.jfree.jcommon-osgi@default:default,org.junit@default:default,org.krysalis.barcode4j@default:default,org.passay@default:default,org.restlet*2.3.2.v20150501-1520@default:default,slf4j.api@default:default,slf4j.jcl@default:false"/>
+    <stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default"/>
+    <booleanAttribute key="show_selected_only" value="false"/>
+    <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
+    <booleanAttribute key="tracing" value="false"/>
+    <booleanAttribute key="useCustomFeatures" value="false"/>
+    <booleanAttribute key="useDefaultConfig" value="true"/>
+    <booleanAttribute key="useDefaultConfigArea" value="true"/>
+    <booleanAttribute key="useProduct" value="false"/>
 </launchConfiguration>
diff --git a/org.adempiere.install/install.console.app.launch b/org.adempiere.install/install.console.app.launch
index 6018f28da0..d1878f48b5 100644
--- a/org.adempiere.install/install.console.app.launch
+++ b/org.adempiere.install/install.console.app.launch
@@ -1,32 +1,33 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.adempiere.install.console-application"/>
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="true"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/install.console.app"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="includeOptional" value="false"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-install.console.app"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.adempiere.server.server_product"/>
-<stringAttribute key="selected_target_plugins" value="bcpkix*1.55.0@default:default,bcpkix*1.56.0@default:default,bcprov*1.55.0@default:default,bcprov*1.56.0@default:default,com.itextpdf@default:default,com.sun.mail.javax.mail@default:default,groovy-all*2.4.7@default:default,groovy-all*2.4.8@default:default,javax.activation@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.passay@default:default,org.restlet@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.slf4j.jdk14@default:false"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="false"/>
+    <booleanAttribute key="append.args" value="true"/>
+    <stringAttribute key="application" value="org.adempiere.install.console-application"/>
+    <booleanAttribute key="askclear" value="true"/>
+    <booleanAttribute key="automaticAdd" value="false"/>
+    <booleanAttribute key="automaticValidate" value="true"/>
+    <stringAttribute key="bootstrap" value=""/>
+    <stringAttribute key="checked" value="[NONE]"/>
+    <booleanAttribute key="clearConfig" value="true"/>
+    <booleanAttribute key="clearws" value="false"/>
+    <booleanAttribute key="clearwslog" value="false"/>
+    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/install.console.app"/>
+    <booleanAttribute key="default" value="false"/>
+    <booleanAttribute key="includeOptional" value="false"/>
+    <stringAttribute key="location" value="${workspace_loc}/../runtime-install.console.app"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.compatibility.bootdelegation=true"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
+    <stringAttribute key="pde.version" value="3.3"/>
+    <stringAttribute key="product" value="org.adempiere.server.server_product"/>
+    <stringAttribute key="selected_target_plugins" value="bcpkix@default:default,bcprov@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,com.sun.mail.javax.mail@default:default,groovy@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.jms@default:default,javax.transaction@default:false,javax.xml@default:default,jaxb-api@default:default,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant*1.9.6.v201510161327@default:default,org.apache.commons.codec*1.6.0.v201305230611@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,org.apache.commons.net@default:default,org.apache.felix.scr@1:true,org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default,org.apache.poi.poi-ooxml@default:default,org.apache.poi.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi*3.13.100.v20180827-1536@-1:true,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services*3.7.100.v20180827-1536@default:default,org.eclipse.osgi.util*3.5.100.v20180827-1536@default:default,org.hamcrest.core@default:default,org.jfree.chart-osgi@default:default,org.jfree.jcommon-osgi@default:default,org.junit@default:default,org.krysalis.barcode4j@default:default,org.passay@default:default,org.restlet*2.3.2.v20150501-1520@default:default,slf4j.api@default:default,slf4j.jcl@default:false"/>
+    <stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default"/>
+    <booleanAttribute key="show_selected_only" value="false"/>
+    <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
+    <booleanAttribute key="tracing" value="false"/>
+    <booleanAttribute key="useCustomFeatures" value="false"/>
+    <booleanAttribute key="useDefaultConfig" value="true"/>
+    <booleanAttribute key="useDefaultConfigArea" value="true"/>
+    <booleanAttribute key="useProduct" value="false"/>
 </launchConfiguration>
diff --git a/org.adempiere.install/pom.xml b/org.adempiere.install/pom.xml
index 078bc2bbf9..997805a718 100644
--- a/org.adempiere.install/pom.xml
+++ b/org.adempiere.install/pom.xml
@@ -4,9 +4,24 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.install</artifactId>
 	<packaging>eclipse-plugin</packaging>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-compiler-plugin</artifactId>
+				<configuration>
+					<compilerArgs>
+		      			<arg>--add-exports</arg>
+		      			<arg>java.base/sun.security.tools.keytool=ALL-UNNAMED</arg>
+					</compilerArgs>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/org.adempiere.install/src/org/compiere/install/ConfigVM.java b/org.adempiere.install/src/org/compiere/install/ConfigVM.java
index c503a2b079..4c2764b0fd 100644
--- a/org.adempiere.install/src/org/compiere/install/ConfigVM.java
+++ b/org.adempiere.install/src/org/compiere/install/ConfigVM.java
@@ -75,7 +75,7 @@ public class ConfigVM extends Config
 		System.setProperty(ConfigurationData.JAVA_HOME, javaHome.getAbsolutePath());
 
 		//	Java Version
-		final String[] versions = new String[]{"1.7.0", "1.8.0"};
+		final String[] versions = new String[]{"1.7.0", "1.8.0", "9", "9.", "10", "10.", "11", "11.", "12", "12."};
 		pass = false;
 		String thisJV = System.getProperty("java.version");
 		for(String version : versions) 
diff --git a/org.adempiere.install/src/org/compiere/install/ConfigurationData.java b/org.adempiere.install/src/org/compiere/install/ConfigurationData.java
index 1d862e2312..4c26a33fc7 100644
--- a/org.adempiere.install/src/org/compiere/install/ConfigurationData.java
+++ b/org.adempiere.install/src/org/compiere/install/ConfigurationData.java
@@ -1569,4 +1569,10 @@ public class ConfigurationData
 	{
 		p_properties.setProperty(key, value);
 	}	//	setProperty
+
+	public void dbChanged() {
+		p_properties.remove(ADEMPIERE_DB_NAME);
+		p_properties.remove(ADEMPIERE_DB_PORT);
+	}
+
 }	//	ConfigurationData
diff --git a/org.adempiere.install/src/org/compiere/install/ConfigurationPanel.java b/org.adempiere.install/src/org/compiere/install/ConfigurationPanel.java
index bd99e78aa8..41bb66d8bc 100644
--- a/org.adempiere.install/src/org/compiere/install/ConfigurationPanel.java
+++ b/org.adempiere.install/src/org/compiere/install/ConfigurationPanel.java
@@ -538,7 +538,7 @@ public class ConfigurationPanel extends JPanel implements ActionListener, IDBCon
 					m_success = true;
 				bTest.setEnabled(true);
 				m_testing = false;
-				return new Boolean(m_success);
+				return Boolean.valueOf(m_success);
 			}
 			//	Finish it
 			public void finished()
diff --git a/org.adempiere.install/src/org/compiere/install/KeyStoreMgt.java b/org.adempiere.install/src/org/compiere/install/KeyStoreMgt.java
index 29b3be5a52..024bc3da14 100644
--- a/org.adempiere.install/src/org/compiere/install/KeyStoreMgt.java
+++ b/org.adempiere.install/src/org/compiere/install/KeyStoreMgt.java
@@ -19,7 +19,6 @@ package org.compiere.install;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
-import java.lang.reflect.Method;
 import java.net.InetAddress;
 import java.security.Key;
 import java.security.KeyStore;
@@ -35,6 +34,8 @@ import org.compiere.Adempiere;
 import org.compiere.util.CLogMgt;
 import org.compiere.util.CLogger;
 
+import sun.security.tools.keytool.Main;
+
 /**
  *	Class to manage SSL KeyStore
  *	
@@ -459,16 +460,7 @@ public class KeyStoreMgt
                 //vpj-cd add support java 6
 		try
         {
-			Class<?> keyTool = null;
-			try{
-				// java 7 
-				keyTool = Class.forName("sun.security.tools.KeyTool");
-			}catch (ClassNotFoundException ex){
-				// java 8 
-				keyTool = Class.forName("sun.security.tools.keytool.Main");
-			}
-			Method mainMethod = keyTool.getDeclaredMethod("main", String[].class);
-			mainMethod.invoke(null, new Object[]{args});
+			Main.main(args);;
         }
         catch (Exception e)
         {
diff --git a/org.adempiere.install/src/org/compiere/install/console/ConfigurationConsole.java b/org.adempiere.install/src/org/compiere/install/console/ConfigurationConsole.java
index 81829c1359..643b12273e 100644
--- a/org.adempiere.install/src/org/compiere/install/console/ConfigurationConsole.java
+++ b/org.adempiere.install/src/org/compiere/install/console/ConfigurationConsole.java
@@ -55,6 +55,7 @@ public class ConfigurationConsole {
 
 			dbExists(reader, writer);
 			dbType(reader, writer);
+
 			dbHostname(reader, writer);
 			dbPort(reader, writer);
 			dbName(reader, writer);
@@ -475,6 +476,8 @@ public class ConfigurationConsole {
 					writer.println("Invalid input, please enter numeric value of 1 to " + ConfigurationData.DBTYPE.length);
 					continue;
 				}
+				if (dbTypeSelected+1 != inputIndex)
+					data.dbChanged();
 				data.initDatabase(ConfigurationData.DBTYPE[inputIndex-1]);
 				data.setDatabaseType(ConfigurationData.DBTYPE[inputIndex-1]);
 				break;
diff --git a/org.adempiere.install/src/org/compiere/install/util/AppsAction.java b/org.adempiere.install/src/org/compiere/install/util/AppsAction.java
index c74d8d6870..de5a507b5e 100644
--- a/org.adempiere.install/src/org/compiere/install/util/AppsAction.java
+++ b/org.adempiere.install/src/org/compiere/install/util/AppsAction.java
@@ -96,11 +96,11 @@ public final class AppsAction extends AbstractAction
 		int pos = toolTipText.indexOf('&');
 		if (pos != -1  && toolTipText.length() > pos)	//	We have a nemonic - creates ALT-_
 		{
-			Character ch = new Character(toolTipText.toUpperCase().charAt(pos+1));
+			Character ch = Character.valueOf(toolTipText.toUpperCase().charAt(pos+1));
 			if (ch != ' ')
 			{
 				toolTipText = toolTipText.substring(0, pos) + toolTipText.substring(pos+1);
-				putValue(Action.MNEMONIC_KEY, new Integer(ch.hashCode()));
+				putValue(Action.MNEMONIC_KEY, Integer.valueOf(ch.hashCode()));
 			}
 		}
 		//
@@ -125,7 +125,7 @@ public final class AppsAction extends AbstractAction
 		putValue(Action.SHORT_DESCRIPTION, toolTipText);	//	Tooltip
 		putValue(Action.ACTION_COMMAND_KEY, m_action);      //  ActionCammand
 		putValue(Action.ACCELERATOR_KEY, accelerator);      //  KeyStroke
-	//	putValue(Action.MNEMONIC_KEY, new Integer(0));      //  Mnemonic
+	//	putValue(Action.MNEMONIC_KEY, Integer.valueOf(0));      //  Mnemonic
 	//	putValue(Action.DEFAULT, text);						//	Not Used
 
 		//	Create Button
diff --git a/org.adempiere.install/src/org/compiere/install/util/ConfirmPanel.java b/org.adempiere.install/src/org/compiere/install/util/ConfirmPanel.java
index 30cc4f97e1..c313a0b2db 100644
--- a/org.adempiere.install/src/org/compiere/install/util/ConfirmPanel.java
+++ b/org.adempiere.install/src/org/compiere/install/util/ConfirmPanel.java
@@ -20,6 +20,7 @@ import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.FlowLayout;
 import java.awt.Insets;
+import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 
@@ -241,7 +242,7 @@ public final class ConfirmPanel extends JPanel
 	public static final JButton createProcessButton (String text)
 	{
 		AppsAction aa = new AppsAction (A_PROCESS, 
-			KeyStroke.getKeyStroke(KeyEvent.VK_F4, KeyEvent.SHIFT_MASK), text);
+			KeyStroke.getKeyStroke(KeyEvent.VK_F4, ActionEvent.SHIFT_MASK), text);
 		JButton button = (JButton)aa.getButton();
 		button.setMargin(s_insets);
 		return button;
diff --git a/org.adempiere.install/src/org/compiere/install/util/OnlineHelp.java b/org.adempiere.install/src/org/compiere/install/util/OnlineHelp.java
index a31db24494..5761627216 100644
--- a/org.adempiere.install/src/org/compiere/install/util/OnlineHelp.java
+++ b/org.adempiere.install/src/org/compiere/install/util/OnlineHelp.java
@@ -266,7 +266,7 @@ class Worker extends Thread
 			InputStream is = conn.getInputStream();
 			HTMLEditorKit kit = new HTMLEditorKit();
 			HTMLDocument doc = (HTMLDocument)kit.createDefaultDocument();
-			doc.putProperty("IgnoreCharsetDirective", new Boolean(true));
+			doc.putProperty("IgnoreCharsetDirective", Boolean.TRUE);
 			kit.read (new InputStreamReader(is), doc, 0);
 
 			//  Get The Links to the Help Pages
diff --git a/org.adempiere.payment.processor-feature/feature.xml b/org.adempiere.payment.processor-feature/feature.xml
index 30ea714266..1a5a812a31 100644
--- a/org.adempiere.payment.processor-feature/feature.xml
+++ b/org.adempiere.payment.processor-feature/feature.xml
@@ -2,7 +2,8 @@
 <feature
       id="org.adempiere.payment.processor.feature"
       label="Payment Processor"
-      version="5.1.0.qualifier">
+      version="6.1.0.qualifier"
+      provider-name="iDempiere Community">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
diff --git a/org.adempiere.payment.processor-feature/pom.xml b/org.adempiere.payment.processor-feature/pom.xml
index 858e95b1e9..4635582875 100644
--- a/org.adempiere.payment.processor-feature/pom.xml
+++ b/org.adempiere.payment.processor-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.payment.processor.feature</artifactId>
diff --git a/org.adempiere.payment.processor/.classpath b/org.adempiere.payment.processor/.classpath
index 7cbaeca459..16d91fc017 100644
--- a/org.adempiere.payment.processor/.classpath
+++ b/org.adempiere.payment.processor/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry exported="true" kind="lib" path="lib/jpayment.jar"/>
diff --git a/org.adempiere.payment.processor/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.payment.processor/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.adempiere.payment.processor/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.payment.processor/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.adempiere.payment.processor/META-INF/MANIFEST.MF b/org.adempiere.payment.processor/META-INF/MANIFEST.MF
index 7da604b92f..346d25ee01 100644
--- a/org.adempiere.payment.processor/META-INF/MANIFEST.MF
+++ b/org.adempiere.payment.processor/META-INF/MANIFEST.MF
@@ -2,12 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Payment Processor
 Bundle-SymbolicName: org.adempiere.payment.processor;singleton:=true
-Bundle-Version: 5.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Version: 6.1.0.qualifier
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
 Bundle-ClassPath: .,
  lib/jpayment.jar,
  lib/payflow.jar,
  lib/Verisign.jar
 Automatic-Module-Name: org.adempiere.payment.processor
+Bundle-Vendor: iDempiere Community
 
diff --git a/org.adempiere.payment.processor/copyjars.xml b/org.adempiere.payment.processor/copyjars.xml
index 2979a86b89..c9b8ba83ea 100644
--- a/org.adempiere.payment.processor/copyjars.xml
+++ b/org.adempiere.payment.processor/copyjars.xml
@@ -3,8 +3,8 @@
 	<target name="copy">
 		<!-- seem payment sdk is change without use verisign.jar, i can find out this lib. maybe have to update this plug-in 
 		  http://paypal.github.io/sdk/#ppo-payflow-->
-		<get src="${url.file.srv}/jarfile/5.1/jpayment.jar" dest="lib/jpayment.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.srv}/jarfile/5.1/Verisign.jar" dest="lib/Verisign.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.srv}/jarfile/5.1/payflow.jar" dest="lib/payflow.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/6.1/jpayment.jar" dest="lib/jpayment.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/6.1/Verisign.jar" dest="lib/Verisign.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/6.1/payflow.jar" dest="lib/payflow.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>
diff --git a/org.adempiere.payment.processor/pom.xml b/org.adempiere.payment.processor/pom.xml
index 4f496e39ba..4922742ad8 100644
--- a/org.adempiere.payment.processor/pom.xml
+++ b/org.adempiere.payment.processor/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.payment.processor</artifactId>
@@ -22,7 +22,7 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>${url.file.srv}/jarfile/5.1/jpayment.jar</url>
+							<url>${url.file.srv}/jarfile/6.1/jpayment.jar</url>
 							<unpack>false</unpack>
 							<outputDirectory>lib</outputDirectory>
 							<retries>5</retries>
@@ -35,7 +35,7 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>${url.file.srv}/jarfile/5.1/Verisign.jar</url>
+							<url>${url.file.srv}/jarfile/6.1/Verisign.jar</url>
 							<unpack>false</unpack>
 							<outputDirectory>lib</outputDirectory>
 							<retries>5</retries>
@@ -48,7 +48,7 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>${url.file.srv}/jarfile/5.1/payflow.jar</url>
+							<url>${url.file.srv}/jarfile/6.1/payflow.jar</url>
 							<unpack>false</unpack>
 							<outputDirectory>lib</outputDirectory>
 							<retries>5</retries>
diff --git a/org.adempiere.pipo-feature/feature.xml b/org.adempiere.pipo-feature/feature.xml
index 3ab39bbf12..72353f6d00 100644
--- a/org.adempiere.pipo-feature/feature.xml
+++ b/org.adempiere.pipo-feature/feature.xml
@@ -2,7 +2,8 @@
 <feature
       id="org.adempiere.pipo.feature"
       label="Pipo-feature"
-      version="5.1.0.qualifier">
+      version="6.1.0.qualifier"
+      provider-name="iDempiere Community">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
diff --git a/org.adempiere.pipo-feature/pom.xml b/org.adempiere.pipo-feature/pom.xml
index e4533f8a6b..cd4791ae58 100644
--- a/org.adempiere.pipo-feature/pom.xml
+++ b/org.adempiere.pipo-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.pipo.feature</artifactId>
diff --git a/org.adempiere.pipo.handlers/.classpath b/org.adempiere.pipo.handlers/.classpath
index cf36b56119..423c974870 100644
--- a/org.adempiere.pipo.handlers/.classpath
+++ b/org.adempiere.pipo.handlers/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.adempiere.pipo.handlers/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.pipo.handlers/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.adempiere.pipo.handlers/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.pipo.handlers/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF b/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF
index aaaf7e804a..956cdd22e7 100644
--- a/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF
+++ b/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF
@@ -2,9 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere 2Pack Handlers
 Bundle-SymbolicName: org.adempiere.pipo.handlers;singleton:=true
-Bundle-Version: 5.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Version: 6.1.0.qualifier
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Require-Bundle: org.adempiere.pipo;bundle-version="0.0.0",
  org.adempiere.base;bundle-version="0.0.0"
 Bundle-ClassPath: .
 Automatic-Module-Name: org.adempiere.pipo.handlers
+Bundle-Vendor: iDempiere Community
diff --git a/org.adempiere.pipo.handlers/pom.xml b/org.adempiere.pipo.handlers/pom.xml
index 5feced804e..b08cd9b28c 100644
--- a/org.adempiere.pipo.handlers/pom.xml
+++ b/org.adempiere.pipo.handlers/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.pipo.handlers</artifactId>
diff --git a/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ColumnElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ColumnElementHandler.java
index 50bd809429..763e77c17b 100644
--- a/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ColumnElementHandler.java
+++ b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ColumnElementHandler.java
@@ -163,7 +163,7 @@ public class ColumnElementHandler extends AbstractElementHandler {
 				throw new POSaveFailedException("Failed to save column " + mColumn.getName());
 			}
 
-			if (recreateColumn || syncDatabase) {
+			if (mColumn.isActive() && (recreateColumn || syncDatabase)) {
 				deferFK(element, mColumn);
 				syncColumn(ctx, mColumn, action, recreateColumn);
 			}
diff --git a/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/SQLMandatoryElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/SQLMandatoryElementHandler.java
index 8de3d8e3f5..02cde5be95 100644
--- a/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/SQLMandatoryElementHandler.java
+++ b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/SQLMandatoryElementHandler.java
@@ -56,16 +56,17 @@ public class SQLMandatoryElementHandler extends AbstractElementHandler {
 		if (sql.endsWith(";") && !(sql.toLowerCase().endsWith("end;")))
 			sql = sql.substring(0, sql.length() - 1);
 		sql = Env.parseContext(Env.getCtx(), 0, sql, false);
+		int count = 0;
 		PreparedStatement pstmt = null;
 		X_AD_Package_Imp_Detail impDetail = createImportDetail(ctx, element.qName, "", 0);
 		try {
 			pstmt = DB.prepareStatement(sql, getTrxName(ctx));
 			if (DBType.equals("ALL")) {
-				int n = pstmt.executeUpdate();
-				if (log.isLoggable(Level.INFO)) log.info("Executed SQL Mandatory: "+ getStringValue(element, "statement") + " ReturnValue="+n);
+				count = pstmt.executeUpdate();
+				if (log.isLoggable(Level.INFO)) log.info("Executed SQL Mandatory: "+ getStringValue(element, "statement") + " ReturnValue="+count);
 			} else if (DB.isOracle() && DBType.equals("Oracle")) {
-				int n = pstmt.executeUpdate();
-				if (log.isLoggable(Level.INFO)) log.info("Executed SQL Mandatory for Oracle: "+ getStringValue(element, "statement") + " ReturnValue="+n);
+				count = pstmt.executeUpdate();
+				if (log.isLoggable(Level.INFO)) log.info("Executed SQL Mandatory for Oracle: "+ getStringValue(element, "statement") + " ReturnValue="+count);
 			} else if (DB.isPostgreSQL()
 					 && (   DBType.equals("Postgres")
 						 || DBType.equals("PostgreSQL")  // backward compatibility with old packages developed by hand
@@ -79,18 +80,18 @@ public class SQLMandatoryElementHandler extends AbstractElementHandler {
 				Statement stmt = null;
 				try {
 					stmt = pstmt.getConnection().createStatement();
-					int n = stmt.executeUpdate (sql);
-					if (log.isLoggable(Level.INFO)) log.info("Executed SQL Mandatory for PostgreSQL: "+ getStringValue(element,"statement") + " ReturnValue="+n);
+					count = stmt.executeUpdate (sql);
+					if (log.isLoggable(Level.INFO)) log.info("Executed SQL Mandatory for PostgreSQL: "+ getStringValue(element,"statement") + " ReturnValue="+count);
 				} finally {
 					DB.close(stmt);
 					stmt = null;
 				}
 			}
-			logImportDetail (ctx, impDetail, 1, "SQLMandatory",1,"Execute");
+			logImportDetail (ctx, impDetail, 1, "SQLMandatory",count,"Execute");
 			ctx.packIn.getNotifier().addSuccessLine("-> " + sql);
 		} catch (Exception e)	{
 			ctx.packIn.getNotifier().addFailureLine("SQL Mandatory failed, error (" + e.getLocalizedMessage() + "):");
-			logImportDetail (ctx, impDetail, 0, "SQLMandatory",1,"Execute");
+			logImportDetail (ctx, impDetail, 0, "SQLMandatory",-1,"Execute");
 			ctx.packIn.getNotifier().addFailureLine("-> " + sql);
 			log.log(Level.SEVERE,"SQLMandatory", e);
 			throw new AdempiereException(e);
diff --git a/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/SQLStatementElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/SQLStatementElementHandler.java
index fab99602f2..89372ff93a 100644
--- a/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/SQLStatementElementHandler.java
+++ b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/SQLStatementElementHandler.java
@@ -49,6 +49,7 @@ public class SQLStatementElementHandler extends AbstractElementHandler {
 			sql = sql.substring(0, sql.length() - 1);
 		sql=Env.parseContext(Env.getCtx(), 0, sql, false);  // tbayen IDEMPIERE-2140
 		Savepoint savepoint = null;
+		int count = 0;
 		PreparedStatement pstmt = null;
 		X_AD_Package_Imp_Detail impDetail = null;
 		impDetail = createImportDetail(ctx, element.qName, "", 0);
@@ -61,11 +62,11 @@ public class SQLStatementElementHandler extends AbstractElementHandler {
 
 			pstmt = DB.prepareStatement(sql, getTrxName(ctx));
 			if (DBType.equals("ALL")) {
-				int n = pstmt.executeUpdate();
-				if (log.isLoggable(Level.INFO)) log.info("Executed SQL Statement: "+ getStringValue(element, "statement") + " ReturnValue="+n);
+				count = pstmt.executeUpdate();
+				if (log.isLoggable(Level.INFO)) log.info("Executed SQL Statement: "+ getStringValue(element, "statement") + " ReturnValue="+count);
 			} else if (DB.isOracle() == true && DBType.equals("Oracle")) {
-				int n = pstmt.executeUpdate();
-				if (log.isLoggable(Level.INFO)) log.info("Executed SQL Statement for Oracle: "+ getStringValue(element, "statement") + " ReturnValue="+n);
+				count = pstmt.executeUpdate();
+				if (log.isLoggable(Level.INFO)) log.info("Executed SQL Statement for Oracle: "+ getStringValue(element, "statement") + " ReturnValue="+count);
 			} else if (DB.isPostgreSQL()
 					 && (   DBType.equals("Postgres")
 						 || DBType.equals("PostgreSQL")  // backward compatibility with old packages developed by hand
@@ -80,14 +81,14 @@ public class SQLStatementElementHandler extends AbstractElementHandler {
 				Statement stmt = null;
 				try {
 					stmt = pstmt.getConnection().createStatement();
-					int n = stmt.executeUpdate (sql);
-					if (log.isLoggable(Level.INFO)) log.info("Executed SQL Statement for PostgreSQL: "+ getStringValue(element,"statement") + " ReturnValue="+n);
+					count = stmt.executeUpdate (sql);
+					if (log.isLoggable(Level.INFO)) log.info("Executed SQL Statement for PostgreSQL: "+ getStringValue(element,"statement") + " ReturnValue="+count);
 				} finally {
 					DB.close(stmt);
 					stmt = null;
 				}
 			}						
-			logImportDetail (ctx, impDetail, 1, "SQLStatement",1,"Execute");
+			logImportDetail (ctx, impDetail, 1, "SQLStatement",count,"Execute");
 			ctx.packIn.getNotifier().addSuccessLine("-> " + sql);
 		} catch (Exception e)	{
 			// rollback immediately on exception to avoid a wrong SQL stop the whole process
@@ -105,7 +106,7 @@ public class SQLStatementElementHandler extends AbstractElementHandler {
 				savepoint = null;
 			}
 			ctx.packIn.getNotifier().addFailureLine("SQL statement failed but ignored, error (" + e.getLocalizedMessage() + "): ");
-			logImportDetail (ctx, impDetail, 0, "SQLStatement",1,"Execute");
+			logImportDetail (ctx, impDetail, 0, "SQLStatement",-1,"Execute");
 			ctx.packIn.getNotifier().addFailureLine("-> " + sql);
 			log.log(Level.SEVERE,"SQLStatement", e);
 		} finally {
diff --git a/org.adempiere.pipo/.classpath b/org.adempiere.pipo/.classpath
index cf36b56119..423c974870 100644
--- a/org.adempiere.pipo/.classpath
+++ b/org.adempiere.pipo/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.adempiere.pipo/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.pipo/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.adempiere.pipo/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.pipo/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.adempiere.pipo/META-INF/MANIFEST.MF b/org.adempiere.pipo/META-INF/MANIFEST.MF
index 1761107a4d..8762d0c76f 100644
--- a/org.adempiere.pipo/META-INF/MANIFEST.MF
+++ b/org.adempiere.pipo/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere 2Pack Core
 Bundle-SymbolicName: org.adempiere.pipo;singleton:=true
-Bundle-Version: 5.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Version: 6.1.0.qualifier
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Import-Package: org.apache.commons.codec,
  org.apache.commons.codec.binary,
  org.apache.tools.ant,
@@ -19,3 +19,4 @@ Service-Component: OSGI-INF/dictionaryservice.xml
 Bundle-Activator: org.adempiere.plugin.utils.PackInApplicationActivator
 Bundle-ClassPath: .
 Automatic-Module-Name: org.adempiere.pipo
+Bundle-Vendor: iDempiere Community
diff --git a/org.adempiere.pipo/pom.xml b/org.adempiere.pipo/pom.xml
index b396144595..27cf90b95c 100644
--- a/org.adempiere.pipo/pom.xml
+++ b/org.adempiere.pipo/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.pipo</artifactId>
diff --git a/org.adempiere.pipo/src/org/adempiere/pipo/srv/PipoDictionaryService.java b/org.adempiere.pipo/src/org/adempiere/pipo/srv/PipoDictionaryService.java
index 18f79c12d3..c1f4885a50 100644
--- a/org.adempiere.pipo/src/org/adempiere/pipo/srv/PipoDictionaryService.java
+++ b/org.adempiere.pipo/src/org/adempiere/pipo/srv/PipoDictionaryService.java
@@ -111,7 +111,8 @@ public class PipoDictionaryService implements IDictionaryService {
 			if (logger.isLoggable(Level.INFO)) logger.info("commit " + trxName);
 		} catch (Exception e) {
 			adPackageImp.setP_Msg(e.getLocalizedMessage());
-			packIn.getNotifier().addStatusLine(e.getLocalizedMessage());
+			packIn.getNotifier().addFailureLine(e.getLocalizedMessage());
+			packIn.setSuccess(false);
 			logger.log(Level.SEVERE, "importXML:", e);
 			throw e;
 		} finally {
diff --git a/org.adempiere.pipo/src/org/adempiere/pipo2/AbstractElementHandler.java b/org.adempiere.pipo/src/org/adempiere/pipo2/AbstractElementHandler.java
index adaba59b51..32b7089560 100644
--- a/org.adempiere.pipo/src/org/adempiere/pipo2/AbstractElementHandler.java
+++ b/org.adempiere.pipo/src/org/adempiere/pipo2/AbstractElementHandler.java
@@ -98,7 +98,8 @@ public abstract class AbstractElementHandler implements ElementHandler {
 		detail.setName(objectName);
 		detail.setAction(action);
 		detail.setSuccess(result);
-		detail.setRecord_ID(objectID);
+		if (objectID >= 0)
+			detail.setRecord_ID(objectID);
 		ctx.packIn.addImportDetail(detail);
 		StringBuilder msg = new StringBuilder(action).append(" ");
 		if (detail.getTableName() != null)
diff --git a/org.adempiere.pipo/src/org/adempiere/pipo2/PackInProcess.java b/org.adempiere.pipo/src/org/adempiere/pipo2/PackInProcess.java
index 8bcfd56027..250aae0b39 100644
--- a/org.adempiere.pipo/src/org/adempiere/pipo2/PackInProcess.java
+++ b/org.adempiere.pipo/src/org/adempiere/pipo2/PackInProcess.java
@@ -147,7 +147,8 @@ public class PackInProcess extends SvrProcess {
 			commitEx(); // we need to commit to capture HERE when the deferred validation of foreign keys can fail
 		} catch (Exception e) {
 			adPackageImp.setP_Msg(e.getLocalizedMessage());
-			packIn.getNotifier().addStatusLine(e.getLocalizedMessage());
+			packIn.getNotifier().addFailureLine(e.getLocalizedMessage());
+			packIn.setSuccess(false);
 			log.log(Level.SEVERE, "importXML:", e);
 			throw e;
 		} finally {
diff --git a/org.adempiere.pipo/src/org/adempiere/pipo2/PackOut.java b/org.adempiere.pipo/src/org/adempiere/pipo2/PackOut.java
index 1eaf2ee448..c6d3a59ca6 100644
--- a/org.adempiere.pipo/src/org/adempiere/pipo2/PackOut.java
+++ b/org.adempiere.pipo/src/org/adempiere/pipo2/PackOut.java
@@ -197,7 +197,7 @@ public class PackOut
 		SAXTransformerFactory packoutFactory = (SAXTransformerFactory) SAXTransformerFactory.newInstance();
 		//indent-number attribute support is not guarantee
 		try {
-			packoutFactory.setAttribute("indent-number", new Integer(4));
+			packoutFactory.setAttribute("indent-number", Integer.valueOf(4));
 		} catch (Exception e) {}
 		TransformerHandler packoutHandler = packoutFactory.newTransformerHandler();
 		Transformer packoutTransformer = packoutHandler.getTransformer();
@@ -247,7 +247,7 @@ public class PackOut
 		SAXTransformerFactory transformerFactory = (SAXTransformerFactory) SAXTransformerFactory.newInstance();
 		//indent-number attribute support is not guarantee
 		try {
-			transformerFactory.setAttribute("indent-number", new Integer(4));
+			transformerFactory.setAttribute("indent-number", Integer.valueOf(4));
 		} catch (Exception e) {}
 		TransformerHandler docHandler = transformerFactory.newTransformerHandler();
 		Transformer transformer = docHandler.getTransformer();
diff --git a/org.adempiere.pipo/src/org/adempiere/pipo2/PoFiller.java b/org.adempiere.pipo/src/org/adempiere/pipo2/PoFiller.java
index 25a1a6334c..8414308d7f 100644
--- a/org.adempiere.pipo/src/org/adempiere/pipo2/PoFiller.java
+++ b/org.adempiere.pipo/src/org/adempiere/pipo2/PoFiller.java
@@ -131,7 +131,7 @@ public class PoFiller{
 
 		if (value!=null && value.trim().length() == 0)
 			value = null;
-		Integer i = value != null ? new Integer(value) : null;
+		Integer i = value != null ? Integer.valueOf(value) : null;
 
 		Object oldValue = po.get_Value(qName);
 		if (oldValue == null && i == null)
@@ -267,7 +267,7 @@ public class PoFiller{
 				//only import official id
 				if (qName.equalsIgnoreCase(po.get_TableName()+"_ID")) {
 					String value = e != null ? e.contents.toString() : null;
-					Integer i = !Util.isEmpty(value) ? new Integer(value) : null;
+					Integer i = !Util.isEmpty(value) ? Integer.valueOf(value) : null;
 					if (i != null && i.intValue() > 0 && i.intValue() <= MTable.MAX_OFFICIAL_ID) {
 						if (po.get_ID() != i.intValue()) {
 							//make sure id have not been used by other client
diff --git a/org.adempiere.plugin.utils/.classpath b/org.adempiere.plugin.utils/.classpath
index cf36b56119..423c974870 100644
--- a/org.adempiere.plugin.utils/.classpath
+++ b/org.adempiere.plugin.utils/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.adempiere.plugin.utils/META-INF/MANIFEST.MF b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF
index d9f5971be5..3522d26f83 100644
--- a/org.adempiere.plugin.utils/META-INF/MANIFEST.MF
+++ b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Plugin Utils
 Bundle-SymbolicName: org.adempiere.plugin.utils
-Bundle-Version: 5.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Version: 6.1.0.qualifier
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Import-Package: org.adempiere.base,
  org.adempiere.util,
  org.apache.xerces.dom;version="2.9.0",
@@ -50,3 +50,4 @@ Import-Package: org.adempiere.base,
 Export-Package: org.adempiere.plugin.utils
 Bundle-ClassPath: .
 Automatic-Module-Name: org.adempiere.plugin.utils
+Bundle-Vendor: iDempiere Community
diff --git a/org.adempiere.plugin.utils/pom.xml b/org.adempiere.plugin.utils/pom.xml
index b9ee311736..24f1b2bdac 100644
--- a/org.adempiere.plugin.utils/pom.xml
+++ b/org.adempiere.plugin.utils/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.plugin.utils</artifactId>
diff --git a/org.adempiere.replication-feature/feature.xml b/org.adempiere.replication-feature/feature.xml
index 0a69014d61..d70fa518b1 100644
--- a/org.adempiere.replication-feature/feature.xml
+++ b/org.adempiere.replication-feature/feature.xml
@@ -2,7 +2,8 @@
 <feature
       id="org.adempiere.replication.feature"
       label="Replication-feature"
-      version="5.1.0.qualifier">
+      version="6.1.0.qualifier"
+      provider-name="iDempiere Community">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
diff --git a/org.adempiere.replication-feature/pom.xml b/org.adempiere.replication-feature/pom.xml
index 425b0645c4..efe53dad84 100644
--- a/org.adempiere.replication-feature/pom.xml
+++ b/org.adempiere.replication-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.replication.feature</artifactId>
diff --git a/org.adempiere.replication.server-feature/feature.xml b/org.adempiere.replication.server-feature/feature.xml
index 9a7390e9f9..b114ee5338 100644
--- a/org.adempiere.replication.server-feature/feature.xml
+++ b/org.adempiere.replication.server-feature/feature.xml
@@ -2,7 +2,8 @@
 <feature
       id="org.adempiere.replication.server.feature"
       label="Replication Server-feature"
-      version="5.1.0.qualifier">
+      version="6.1.0.qualifier"
+      provider-name="iDempiere Community">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
diff --git a/org.adempiere.replication.server-feature/pom.xml b/org.adempiere.replication.server-feature/pom.xml
index 25ad779449..00f9a37dd7 100644
--- a/org.adempiere.replication.server-feature/pom.xml
+++ b/org.adempiere.replication.server-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.replication.server.feature</artifactId>
diff --git a/org.adempiere.replication.server/.classpath b/org.adempiere.replication.server/.classpath
index cf36b56119..423c974870 100644
--- a/org.adempiere.replication.server/.classpath
+++ b/org.adempiere.replication.server/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.adempiere.replication.server/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.replication.server/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.adempiere.replication.server/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.replication.server/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.adempiere.replication.server/META-INF/MANIFEST.MF b/org.adempiere.replication.server/META-INF/MANIFEST.MF
index eb482f2009..19c2856322 100644
--- a/org.adempiere.replication.server/META-INF/MANIFEST.MF
+++ b/org.adempiere.replication.server/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Replication Server
 Bundle-SymbolicName: org.adempiere.replication.server;singleton:=true
-Bundle-Version: 5.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Version: 6.1.0.qualifier
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Require-Bundle: org.adempiere.server;bundle-version="0.0.0",
  org.adempiere.replication;bundle-version="0.0.0",
  org.adempiere.base;bundle-version="0.0.0"
@@ -13,3 +13,4 @@ Service-Component: OSGI-INF/serverfactory.xml
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
 Automatic-Module-Name: org.adempiere.replication.server
+Bundle-Vendor: iDempiere Community
diff --git a/org.adempiere.replication.server/pom.xml b/org.adempiere.replication.server/pom.xml
index 36c3e84db7..cc7bad7bb6 100644
--- a/org.adempiere.replication.server/pom.xml
+++ b/org.adempiere.replication.server/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.replication.server</artifactId>
diff --git a/org.adempiere.replication.server/src/org/compiere/server/ReplicationProcessor.java b/org.adempiere.replication.server/src/org/compiere/server/ReplicationProcessor.java
index 542d25058c..650bbee04b 100644
--- a/org.adempiere.replication.server/src/org/compiere/server/ReplicationProcessor.java
+++ b/org.adempiere.replication.server/src/org/compiere/server/ReplicationProcessor.java
@@ -127,7 +127,7 @@ public class ReplicationProcessor extends AdempiereServer {
 		    try 
 		    {
 			Class<?> clazz = Class.forName(javaClass);
-			importProcessor = (IImportProcessor)clazz.newInstance();				
+			importProcessor = (IImportProcessor)clazz.getDeclaredConstructor().newInstance();				
 			importProcessor.process(mImportProcessor.getCtx(), this, trxName );
 		    } 
 		    catch (Exception e) 
diff --git a/org.adempiere.replication/.classpath b/org.adempiere.replication/.classpath
index cf36b56119..423c974870 100644
--- a/org.adempiere.replication/.classpath
+++ b/org.adempiere.replication/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.adempiere.replication/META-INF/MANIFEST.MF b/org.adempiere.replication/META-INF/MANIFEST.MF
index 7e96e4a07b..6fa0d2eb06 100644
--- a/org.adempiere.replication/META-INF/MANIFEST.MF
+++ b/org.adempiere.replication/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Replication
 Bundle-SymbolicName: org.adempiere.replication;singleton:=true
-Bundle-Version: 5.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Version: 6.1.0.qualifier
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
 Export-Package: org.adempiere.process.rpl,
  org.adempiere.process.rpl.exp,
@@ -13,3 +13,4 @@ Import-Package: javax.jms;version="1.1.0",
 Eclipse-RegisterBuddy: org.adempiere.base
 Bundle-ClassPath: .
 Automatic-Module-Name: org.adempiere.replication
+Bundle-Vendor: iDempiere Community
diff --git a/org.adempiere.replication/pom.xml b/org.adempiere.replication/pom.xml
index a261febac1..319e73c7a9 100644
--- a/org.adempiere.replication/pom.xml
+++ b/org.adempiere.replication/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.replication</artifactId>
diff --git a/org.adempiere.replication/src/org/adempiere/process/rpl/exp/ExportHelper.java b/org.adempiere.replication/src/org/adempiere/process/rpl/exp/ExportHelper.java
index f5f81c3c6f..35e11b1bcc 100644
--- a/org.adempiere.replication/src/org/adempiere/process/rpl/exp/ExportHelper.java
+++ b/org.adempiere.replication/src/org/adempiere/process/rpl/exp/ExportHelper.java
@@ -170,7 +170,7 @@ public class ExportHelper {
 		String javaClass = expProcessor_Type.getJavaClass();
 		try {
 			Class<?> clazz = Class.forName(javaClass);
-			IExportProcessor exportProcessor = (IExportProcessor)clazz.newInstance();
+			IExportProcessor exportProcessor = (IExportProcessor)clazz.getDeclaredConstructor().newInstance();
 
 			exportProcessor.process(po.getCtx(), mExportProcessor, outDocument, Trx.get( po.get_TrxName(), false ));
 
@@ -473,11 +473,11 @@ public class ExportHelper {
 		if (variableName != null && !"".equals(variableName) ) {
 			Integer var = variableMap.get(variableName);
 			if (var == null) {
-				var = new Integer(0);
+				var = Integer.valueOf(0);
 			}
 			int intValue = var.intValue();
 			intValue++;
-			variableMap.put(variableName, new Integer(intValue));
+			variableMap.put(variableName, Integer.valueOf(intValue));
 		}
 	}
 
diff --git a/org.adempiere.replication/src/org/adempiere/process/rpl/imp/ImportHelper.java b/org.adempiere.replication/src/org/adempiere/process/rpl/imp/ImportHelper.java
index b439a68ae5..72a26f1a61 100755
--- a/org.adempiere.replication/src/org/adempiere/process/rpl/imp/ImportHelper.java
+++ b/org.adempiere.replication/src/org/adempiere/process/rpl/imp/ImportHelper.java
@@ -29,6 +29,7 @@
 package org.adempiere.process.rpl.imp;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.text.ParseException;
@@ -128,9 +129,9 @@ public class ImportHelper {
 			throw new Exception(Msg.getMsg(ctx, "XMLVersionAttributeMandatory"));
 		}
 		///Getting Attributes.
-		int ReplicationMode = new Integer(rootElement.getAttribute("ReplicationMode"));
+		int ReplicationMode = Integer.valueOf(rootElement.getAttribute("ReplicationMode"));
 		String ReplicationType = rootElement.getAttribute("ReplicationType");
-		int ReplicationEvent = new Integer(rootElement.getAttribute("ReplicationEvent"));
+		int ReplicationEvent = Integer.valueOf(rootElement.getAttribute("ReplicationEvent"));
 		
 		MClient client = null;
 		client = getAD_ClientByValue(ctx, AD_Client_Value, trxName);
@@ -354,7 +355,7 @@ public class ImportHelper {
 			{
 				refRecord_ID = getID(ctx, referencedExpFormat, referencedNode, line.getValue(), po.get_TrxName());
 				if (log.isLoggable(Level.INFO)) log.info("refRecord_ID = " + refRecord_ID);
-				value = new Integer(refRecord_ID);
+				value = Integer.valueOf(refRecord_ID);
 			}
 			else
 			{
@@ -485,7 +486,7 @@ public class ImportHelper {
 						if (! Util.isEmpty(value.toString()))
 						{
 							int intValue = Integer.parseInt(value.toString());
-							value = new Integer( intValue );
+							value = Integer.valueOf( intValue );
 						}else
 						{
 							value=null;
@@ -510,7 +511,7 @@ public class ImportHelper {
 						{
 							value=null;
 						}
-						//value = new Double( doubleValue );
+						//value = Double.valueOf( doubleValue );
 						
 						if (log.isLoggable(Level.INFO)) log.info("About to set BigDecimal value of column ["+column.getColumnName()+"]=["+value+"]");
 						
@@ -654,7 +655,7 @@ public class ImportHelper {
 
 				if (log.isLoggable(Level.INFO)) log.info("record_ID = " + record_ID);
 				
-				cols[col] = new Integer(record_ID);
+				cols[col] = Integer.valueOf(record_ID);
 			} 
 			else 
 			{
@@ -680,7 +681,7 @@ public class ImportHelper {
 				if (!Util.isEmpty(value.toString()))
 				{
 					//double doubleValue = Double.parseDouble(value.toString());
-					value = new Integer(value.toString());
+					value = Integer.valueOf(value.toString());
 					if (DisplayType.ID	==	column.getAD_Reference_ID())
 					{
 						replication_id = (Integer) value;
@@ -696,7 +697,7 @@ public class ImportHelper {
 			else if( DisplayType.isNumeric(column.getAD_Reference_ID()))
 			{
 				valuecol="Round("+valuecol+",2)";
-				params[col] = new BigDecimal((String)cols[col]).setScale(2, BigDecimal.ROUND_HALF_UP);
+				params[col] = new BigDecimal((String)cols[col]).setScale(2, RoundingMode.HALF_UP);
 			}
 			else
 			{	
diff --git a/org.adempiere.report.jasper-feature/feature.xml b/org.adempiere.report.jasper-feature/feature.xml
index e5155a3dd8..4cc90ecd00 100644
--- a/org.adempiere.report.jasper-feature/feature.xml
+++ b/org.adempiere.report.jasper-feature/feature.xml
@@ -2,7 +2,8 @@
 <feature
       id="org.adempiere.report.jasper.feature"
       label="JasperReport-feature"
-      version="5.1.0.qualifier">
+      version="6.1.0.qualifier"
+      provider-name="iDempiere Community">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -20,7 +21,7 @@
          id="org.adempiere.report.jasper"
          download-size="0"
          install-size="0"
-         version="5.1.0.qualifier"/>
+         version="6.1.0.qualifier"/>
 
    <plugin
          id="org.adempiere.report.jasper.library"
@@ -431,7 +432,7 @@
          id="stax2-api"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="3.1.4"
          unpack="false"/>
 
    <plugin
diff --git a/org.adempiere.report.jasper-feature/pom.xml b/org.adempiere.report.jasper-feature/pom.xml
index efc834e6ee..5c07173ab6 100644
--- a/org.adempiere.report.jasper-feature/pom.xml
+++ b/org.adempiere.report.jasper-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.report.jasper.feature</artifactId>
diff --git a/org.adempiere.report.jasper.library/.classpath b/org.adempiere.report.jasper.library/.classpath
index 75976faf99..aafa60f23e 100644
--- a/org.adempiere.report.jasper.library/.classpath
+++ b/org.adempiere.report.jasper.library/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path="lib/castor-core.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/castor-xml.jar"/>
@@ -9,8 +13,6 @@
 	<classpathentry exported="true" kind="lib" path="lib/jasperreports-fonts.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jasperreports-functions.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/olap4j.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/spring-beans.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/spring-core.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xmpcore.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
index ef2071b78b..f803626d84 100644
--- a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Library
 Bundle-SymbolicName: org.adempiere.report.jasper.library;singleton:=true
-Bundle-Version: 5.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Version: 6.1.0.qualifier
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Fragment-Host: net.sf.jasperreports.engine;bundle-version="6.3.1"
 Bundle-ClassPath: .,
  lib/castor-core.jar,
@@ -13,9 +13,8 @@ Bundle-ClassPath: .,
  lib/jasperreports-fonts.jar,
  lib/jasperreports-functions.jar,
  lib/olap4j.jar,
- lib/spring-beans.jar,
- lib/spring-core.jar,
  lib/xmpcore.jar
 DynamicImport-Package: *
 Import-Package: org.w3c.dom.events;version="[3.0.0,4.0.0)"
 Automatic-Module-Name: org.adempiere.report.jasper.library
+Bundle-Vendor: iDempiere Community
diff --git a/org.adempiere.report.jasper.library/build.properties b/org.adempiere.report.jasper.library/build.properties
index 08faa30823..171ad02aa4 100644
--- a/org.adempiere.report.jasper.library/build.properties
+++ b/org.adempiere.report.jasper.library/build.properties
@@ -7,6 +7,4 @@ bin.includes = META-INF/,\
                lib/jasperreports-fonts.jar,\
                lib/jasperreports-functions.jar,\
                lib/olap4j.jar,\
-               lib/spring-beans.jar,\
-               lib/spring-core.jar,\
                lib/xmpcore.jar
diff --git a/org.adempiere.report.jasper.library/pom.xml b/org.adempiere.report.jasper.library/pom.xml
index 096f719ed0..c37b210c63 100644
--- a/org.adempiere.report.jasper.library/pom.xml
+++ b/org.adempiere.report.jasper.library/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.report.jasper.library</artifactId>
@@ -53,16 +53,6 @@
 									<artifactId>olap4j</artifactId>
 									<version>0.9.7.309-JS-3</version>
 								</artifactItem>
-								<artifactItem>
-									<groupId>org.springframework</groupId>
-									<artifactId>spring-beans</artifactId>
-									<version>2.5</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.springframework</groupId>
-									<artifactId>spring-core</artifactId>
-									<version>2.5</version>
-								</artifactItem>
 								<artifactItem>
 									<groupId>com.adobe.xmp</groupId>
 									<artifactId>xmpcore</artifactId>
diff --git a/org.adempiere.report.jasper.swing/.classpath b/org.adempiere.report.jasper.swing/.classpath
index cf36b56119..423c974870 100644
--- a/org.adempiere.report.jasper.swing/.classpath
+++ b/org.adempiere.report.jasper.swing/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.adempiere.report.jasper.swing/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper.swing/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.adempiere.report.jasper.swing/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.report.jasper.swing/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
index 094d5661ab..f42c0fb532 100644
--- a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JasperReports Swing Client
 Bundle-SymbolicName: org.adempiere.report.jasper.swing;singleton:=true
-Bundle-Version: 5.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Version: 6.1.0.qualifier
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  org.adempiere.ui.swing;bundle-version="0.0.0",
  org.adempiere.report.jasper;bundle-version="0.0.0"
@@ -17,3 +17,4 @@ Service-Component: OSGI-INF/jrviewerprovider.xml
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
 Automatic-Module-Name: org.adempiere.report.jasper.swing
+Bundle-Vendor: iDempiere Community
diff --git a/org.adempiere.report.jasper.swing/pom.xml b/org.adempiere.report.jasper.swing/pom.xml
index bdbad9b653..bebda2ca4e 100644
--- a/org.adempiere.report.jasper.swing/pom.xml
+++ b/org.adempiere.report.jasper.swing/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.report.jasper.swing</artifactId>
diff --git a/org.adempiere.report.jasper.webapp/.classpath b/org.adempiere.report.jasper.webapp/.classpath
index cf36b56119..423c974870 100644
--- a/org.adempiere.report.jasper.webapp/.classpath
+++ b/org.adempiere.report.jasper.webapp/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.adempiere.report.jasper.webapp/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper.webapp/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.adempiere.report.jasper.webapp/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.report.jasper.webapp/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF
index 37bf088441..0ba0d584ab 100644
--- a/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere JasperReport Web App
 Bundle-SymbolicName: org.adempiere.report.jasper.webapp;singleton:=true
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.1.0.qualifier
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Web-ContextPath: JasperReportFiles
 Import-Package: javax.servlet;version="2.5.0",
  javax.servlet.http;version="2.5.0",
@@ -13,5 +13,6 @@ Import-Package: javax.servlet;version="2.5.0",
  org.apache.commons.codec.binary
 Bundle-ClassPath: .
 Automatic-Module-Name: org.adempiere.report.jasper.webapp
+Bundle-Vendor: iDempiere Community
 
 
diff --git a/org.adempiere.report.jasper.webapp/pom.xml b/org.adempiere.report.jasper.webapp/pom.xml
index ce70376c86..748c29c1ec 100644
--- a/org.adempiere.report.jasper.webapp/pom.xml
+++ b/org.adempiere.report.jasper.webapp/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.report.jasper.webapp</artifactId>
diff --git a/org.adempiere.report.jasper/.classpath b/org.adempiere.report.jasper/.classpath
index cf36b56119..423c974870 100644
--- a/org.adempiere.report.jasper/.classpath
+++ b/org.adempiere.report.jasper/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.adempiere.report.jasper/META-INF/MANIFEST.MF b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
index 55624d4410..3c40956870 100644
--- a/org.adempiere.report.jasper/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere JasperReport integration
 Bundle-SymbolicName: org.adempiere.report.jasper;singleton:=true
-Bundle-Version: 5.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Version: 6.1.0.qualifier
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Import-Package: net.sourceforge.barbecue,
  org.apache.commons.codec,
  org.apache.commons.codec.binary,
@@ -16,3 +16,4 @@ Export-Package: org.adempiere.report.jasper
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
 Automatic-Module-Name: org.adempiere.report.jasper
+Bundle-Vendor: iDempiere Community
diff --git a/org.adempiere.report.jasper/pom.xml b/org.adempiere.report.jasper/pom.xml
index 5f3fd03a88..105df8ef3c 100644
--- a/org.adempiere.report.jasper/pom.xml
+++ b/org.adempiere.report.jasper/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.report.jasper</artifactId>
diff --git a/org.adempiere.report.jasper/src/org/adempiere/report/jasper/ReportStarter.java b/org.adempiere.report.jasper/src/org/adempiere/report/jasper/ReportStarter.java
index d7c923e764..866794474c 100644
--- a/org.adempiere.report.jasper/src/org/adempiere/report/jasper/ReportStarter.java
+++ b/org.adempiere.report.jasper/src/org/adempiere/report/jasper/ReportStarter.java
@@ -84,6 +84,8 @@ import net.sf.jasperreports.engine.JRVariable;
 import net.sf.jasperreports.engine.JasperCompileManager;
 import net.sf.jasperreports.engine.JasperPrint;
 import net.sf.jasperreports.engine.JasperReport;
+import net.sf.jasperreports.engine.JasperReportsContext;
+import net.sf.jasperreports.engine.SimpleJasperReportsContext;
 import net.sf.jasperreports.engine.design.JRDesignQuery;
 import net.sf.jasperreports.engine.design.JasperDesign;
 import net.sf.jasperreports.engine.export.HtmlExporter;
@@ -98,7 +100,6 @@ import net.sf.jasperreports.engine.fill.JRFiller;
 import net.sf.jasperreports.engine.fill.JRSwapFileVirtualizer;
 import net.sf.jasperreports.engine.util.JRLoader;
 import net.sf.jasperreports.engine.util.JRSwapFile;
-import net.sf.jasperreports.engine.util.LocalJasperReportsContext;
 import net.sf.jasperreports.engine.xml.JRXmlLoader;
 import net.sf.jasperreports.engine.xml.JRXmlWriter;
 import net.sf.jasperreports.export.Exporter;
@@ -136,7 +137,8 @@ public class ReportStarter implements ProcessCall, ClientProcess
 	/** Logger */
 	private static CLogger log = CLogger.getCLogger(ReportStarter.class);
 	private static File REPORT_HOME = null;
-
+    public static final JasperReportsContext jasperReportStartContext;
+	
     static {
         String reportPath = System.getProperty("org.compiere.report.path");
         if (reportPath == null) {
@@ -144,6 +146,16 @@ public class ReportStarter implements ProcessCall, ClientProcess
         } else {
 			REPORT_HOME = new File(reportPath);
         }
+        
+        // SimpleJasperReportsContext just same like DefaultJasperReportsContext, but DefaultJasperReportsContext is singleton, 
+        // every thing setting for ReportStarter will effect to other "customize" jasper engine
+        jasperReportStartContext = new SimpleJasperReportsContext();
+         	
+        // http://jasperreports.sourceforge.net/sample.reference/groovy/index.html#javaCompilers
+        // http://jasperreports.sourceforge.net/api/net/sf/jasperreports/engine/JasperCompileManager.html
+        // default is 1.8 but jasper will don't understand and break autobox feature
+        // other value (org.eclipse.jdt.core.compiler.compliance, org.eclipse.jdt.core.compiler.codegen.targetPlatform) still keep 1.8
+        jasperReportStartContext.setProperty("org.eclipse.jdt.core.compiler.source", "1.5");
     }
 
 	private ProcessInfo processInfo;
@@ -492,9 +504,7 @@ public class ReportStarter implements ProcessCall, ClientProcess
                 			    newQuery.setText(newQueryText);
                 			    jasperDesign.setQuery(newQuery);
                 			    
-                			    LocalJasperReportsContext context = new LocalJasperReportsContext(DefaultJasperReportsContext.getInstance());
-                	        	context.setClassLoader(JasperReport.class.getClassLoader());
-                	        	JasperCompileManager manager = JasperCompileManager.getInstance(context);
+                	        	JasperCompileManager manager = JasperCompileManager.getInstance(jasperReportStartContext);
                 	        	JasperReport newJasperReport = manager.compile(jasperDesign);
                 			    if (newJasperReport != null)
                 			    {
@@ -550,16 +560,16 @@ public class ReportStarter implements ProcessCall, ClientProcess
             }
 
             if (Record_ID > 0)
-            	params.put("RECORD_ID", new Integer( Record_ID));
+            	params.put("RECORD_ID", Integer.valueOf( Record_ID));
 
         	// contribution from Ricardo (ralexsander)
             // in iReports you can 'SELECT' AD_Client_ID, AD_Org_ID and AD_User_ID using only AD_PINSTANCE_ID
-            params.put("AD_PINSTANCE_ID", new Integer( AD_PInstance_ID));
+            params.put("AD_PINSTANCE_ID", Integer.valueOf( AD_PInstance_ID));
 
             // FR [3123850] - Add continuosly needed parameters to Jasper Starter - Carlos Ruiz - GlobalQSS
-        	params.put("AD_CLIENT_ID", new Integer( Env.getAD_Client_ID(Env.getCtx())));
-        	params.put("AD_ROLE_ID", new Integer( Env.getAD_Role_ID(Env.getCtx())));
-        	params.put("AD_USER_ID", new Integer( Env.getAD_User_ID(Env.getCtx())));
+        	params.put("AD_CLIENT_ID", Integer.valueOf( Env.getAD_Client_ID(Env.getCtx())));
+        	params.put("AD_ROLE_ID", Integer.valueOf( Env.getAD_Role_ID(Env.getCtx())));
+        	params.put("AD_USER_ID", Integer.valueOf( Env.getAD_User_ID(Env.getCtx())));
 
         	params.put("AD_CLIENT_NAME", Env.getContext(Env.getCtx(), "#AD_Client_Name"));
         	params.put("AD_ROLE_NAME", Env.getContext(Env.getCtx(), "#AD_Role_Name"));
@@ -698,10 +708,8 @@ public class ReportStarter implements ProcessCall, ClientProcess
 	                    		} else {
 		                    		PDF = File.createTempFile(makePrefix(jasperPrint.getName()), ".pdf");
 	                    		}
-	                    		DefaultJasperReportsContext jrContext = DefaultJasperReportsContext.getInstance();
-	                    		LocalJasperReportsContext ljrContext = new LocalJasperReportsContext(jrContext);
-	                    		ljrContext.setClassLoader(this.getClass().getClassLoader());
-	                    		JRPdfExporter exporter = new JRPdfExporter(ljrContext);                    		
+	                    		
+	                    		JRPdfExporter exporter = new JRPdfExporter(jasperReportStartContext);                    		
 	                    		exporter.setExporterInput(new SimpleExporterInput(jasperPrint));
 	                    		exporter.setExporterOutput(new SimpleOutputStreamExporterOutput(PDF.getAbsolutePath()));
 	                    		exporter.exportReport();
@@ -738,9 +746,6 @@ public class ReportStarter implements ProcessCall, ClientProcess
                 			ext = "pdf";
                 		
                 		File file = File.createTempFile(makePrefix(jasperPrint.getName()), "." + ext);
-                		DefaultJasperReportsContext jrContext = DefaultJasperReportsContext.getInstance();
-                		LocalJasperReportsContext ljrContext = new LocalJasperReportsContext(jrContext);
-                		ljrContext.setClassLoader(this.getClass().getClassLoader());
 
                 		FileOutputStream strm = new FileOutputStream(file);
 
@@ -748,7 +753,7 @@ public class ReportStarter implements ProcessCall, ClientProcess
 
             			//JRExporter<?, ?, ?, ?> exporter = null;
                 		if (ext.equals("pdf")) {
-                			JRPdfExporter export = new JRPdfExporter(ljrContext);
+                			JRPdfExporter export = new JRPdfExporter(jasperReportStartContext);
                 			SimplePdfExporterConfiguration config = new SimplePdfExporterConfiguration();
             				export.setConfiguration(config);
             				export.setExporterOutput(new SimpleOutputStreamExporterOutput(strm));
@@ -795,7 +800,7 @@ public class ReportStarter implements ProcessCall, ClientProcess
             			}
                 		
                 		if (exporter == null)
-            				exporter = new JRPdfExporter(ljrContext);
+            				exporter = new JRPdfExporter(jasperReportStartContext);
                 		
             			exporter.setExporterInput(new SimpleExporterInput(jasperPrint));
 
@@ -827,9 +832,9 @@ public class ReportStarter implements ProcessCall, ClientProcess
         }
         reportResult( AD_PInstance_ID, null, trxName);
         return true;
-    }
-
-	private String makePrefix(String name) {
+    }	
+	
+    private String makePrefix(String name) {
 		StringBuilder prefix = new StringBuilder();
 		char[] nameArray = name.toCharArray();
 		for (char ch : nameArray) {
@@ -1344,11 +1349,9 @@ public class ReportStarter implements ProcessCall, ClientProcess
      */
     private JasperReport compileReport( File reportFile, File jasperFile)
     {
-        JasperReport compiledJasperReport = null;
+    	JasperReport compiledJasperReport = null;
         try {
-        	LocalJasperReportsContext context = new LocalJasperReportsContext(DefaultJasperReportsContext.getInstance());
-        	context.setClassLoader(JasperReport.class.getClassLoader());
-        	JasperCompileManager manager = JasperCompileManager.getInstance(context);
+        	JasperCompileManager manager = JasperCompileManager.getInstance(jasperReportStartContext);
         	manager.compileToFile(reportFile.getAbsolutePath(), jasperFile.getAbsolutePath() );
             jasperFile.setLastModified( reportFile.lastModified()); //Synchronize Dates
             compiledJasperReport =  (JasperReport)JRLoader.loadObject(jasperFile);
diff --git a/org.adempiere.sdk-feature/feature.xml b/org.adempiere.sdk-feature/feature.xml
index 0f43cac207..1b7c806b1f 100644
--- a/org.adempiere.sdk-feature/feature.xml
+++ b/org.adempiere.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.sdk.feature"
       label="Adempiere SDK"
-      version="5.1.0.qualifier"
+      version="6.1.0.qualifier"
       provider-name="Adempiere.org">
 
    <description url="http://www.example.com/description">
diff --git a/org.adempiere.sdk-feature/pom.xml b/org.adempiere.sdk-feature/pom.xml
index 8679ac7a05..25e5fbdd8a 100644
--- a/org.adempiere.sdk-feature/pom.xml
+++ b/org.adempiere.sdk-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.sdk.feature</artifactId>
diff --git a/org.adempiere.server-feature/copyjars.xml b/org.adempiere.server-feature/copyjars.xml
index b6336fa903..5d5f8f1516 100644
--- a/org.adempiere.server-feature/copyjars.xml
+++ b/org.adempiere.server-feature/copyjars.xml
@@ -1,8 +1,8 @@
 <project name="zklibrary" basedir="." default="copy">
 	<target name="copy">
         <mkdir dir="data/seed" />
-        <get src="${url.file.srv}/database/5.1/Adempiere_pg.jar" dest="data/seed/Adempiere_pg.jar" usetimestamp="true" verbose="true" retries="5" />
-        <get src="${url.file.srv}/database/5.1/Adempiere.jar" dest="data/seed/Adempiere.jar" usetimestamp="true" verbose="true" retries="5" />
+        <get src="${url.file.srv}/database/6.1/Adempiere_pg.jar" dest="data/seed/Adempiere_pg.jar" usetimestamp="true" verbose="true" retries="5" />
+        <get src="${url.file.srv}/database/6.1/Adempiere.jar" dest="data/seed/Adempiere.jar" usetimestamp="true" verbose="true" retries="5" />
     
         <mkdir dir="../db/ddlutils/lib" />
         <get src="${url.maven2}/ant-contrib/ant-contrib/1.0b2/ant-contrib-1.0b2.jar" dest="../db/ddlutils/lib/ant-contrib.jar" usetimestamp="true" verbose="true" retries="5" />
@@ -20,20 +20,20 @@
         <!-- it's fyracle db, not yet support on idempiere
         https://it.wikipedia.org/wiki/Fyracle
         http://www.biz-wise.nl/compiere_dl.html
-        <get src="${url.file.srv}/jarfile/5.1/fyracle.jar" dest="../db/ddlutils/lib/fyracle.jar" usetimestamp="true" verbose="true" retries="5" />
+        <get src="${url.file.srv}/jarfile/6.1/fyracle.jar" dest="../db/ddlutils/lib/fyracle.jar" usetimestamp="true" verbose="true" retries="5" />
         -->
         <get src="${url.maven2}/oro/oro/2.0.8/oro-2.0.8.jar" dest="../db/ddlutils/lib/jakarta-oro.jar" usetimestamp="true" verbose="true" retries="5" />
-        <get src="${url.file.srv}/jarfile/5.1/oracle.jar" dest="../db/ddlutils/lib/oracle.jar" usetimestamp="true" verbose="true" retries="5" />
-        <get src="${url.file.srv}/jarfile/5.1/postgresql.jar" dest="../db/ddlutils/lib/postgresql.jar" usetimestamp="true" verbose="true" retries="5" />
+        <get src="${url.file.srv}/jarfile/6.1/oracle.jar" dest="../db/ddlutils/lib/oracle.jar" usetimestamp="true" verbose="true" retries="5" />
+        <get src="${url.file.srv}/jarfile/6.1/postgresql.jar" dest="../db/ddlutils/lib/postgresql.jar" usetimestamp="true" verbose="true" retries="5" />
         <get src="${url.maven2}/stax/stax-api/1.0.1/stax-api-1.0.1.jar" dest="../db/ddlutils/lib/stax-api.jar" usetimestamp="true" verbose="true" retries="5" />
         <get src="${url.maven2}/woodstox/wstx-asl/3.0.2/wstx-asl-3.0.2.jar" dest="../db/ddlutils/lib/wstx-asl.jar" usetimestamp="true" verbose="true" retries="5" />
 
         <mkdir dir="../fitnesse/FitNesseRoot/FitLibraryWeb" />
-        <get src="${url.file.srv}/jarfile/5.1/101-20121212164242.zip" dest="../fitnesse/FitNesseRoot/FitLibraryWeb/101-20121212164242.zip" usetimestamp="true" verbose="true" retries="5" />
-        <get src="${url.file.srv}/jarfile/5.1/21-20121212154702.zip" dest="../fitnesse/FitNesseRoot/FitLibraryWeb/21-20121212154702.zip" usetimestamp="true" verbose="true" retries="5" />
-        <get src="${url.file.srv}/jarfile/5.1/6-20121212124109.zip" dest="../fitnesse/FitNesseRoot/FitLibraryWeb/6-20121212124109.zip" usetimestamp="true" verbose="true" retries="5" />
+        <get src="${url.file.srv}/jarfile/6.1/101-20121212164242.zip" dest="../fitnesse/FitNesseRoot/FitLibraryWeb/101-20121212164242.zip" usetimestamp="true" verbose="true" retries="5" />
+        <get src="${url.file.srv}/jarfile/6.1/21-20121212154702.zip" dest="../fitnesse/FitNesseRoot/FitLibraryWeb/21-20121212154702.zip" usetimestamp="true" verbose="true" retries="5" />
+        <get src="${url.file.srv}/jarfile/6.1/6-20121212124109.zip" dest="../fitnesse/FitNesseRoot/FitLibraryWeb/6-20121212124109.zip" usetimestamp="true" verbose="true" retries="5" />
         <!-- maybe it's same file in org.idempiere.fitnesse.server, just diference version-->
-        <get src="${url.file.srv}/jarfile/5.1/fitnesse2.jar" dest="../fitnesse/fitnesse.jar" usetimestamp="true" verbose="true" retries="5" />
+        <get src="${url.file.srv}/jarfile/6.1/fitnesse2.jar" dest="../fitnesse/fitnesse.jar" usetimestamp="true" verbose="true" retries="5" />
     
         <get src="${url.alpn.boot}" dest="../alpn-boot.jar" usetimestamp="true" verbose="true" retries="5" />
 		
diff --git a/org.adempiere.server-feature/feature.xml b/org.adempiere.server-feature/feature.xml
index 4e4581b15f..c216a69af3 100644
--- a/org.adempiere.server-feature/feature.xml
+++ b/org.adempiere.server-feature/feature.xml
@@ -2,7 +2,8 @@
 <feature
       id="org.adempiere.server.feature"
       label="iDempiere Server-feature"
-      version="5.1.0.qualifier">
+      version="6.1.0.qualifier"
+      provider-name="iDempiere Community">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -82,13 +83,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.jdt.core.compiler.batch"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.adempiere.report.jasper.webapp"
          download-size="0"
@@ -110,13 +104,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="javax.annotation-api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="javax.persistence"
          download-size="0"
@@ -165,13 +152,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.sun.mail.javax.mail"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.equinox.cm"
          download-size="0"
@@ -460,13 +440,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.jetty.xml"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.jetty.osgi.alpn.fragment"
          download-size="0"
@@ -518,4 +491,53 @@
          fragment="true"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.jdt.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.resources"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.expressions"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.filesystem"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.text"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.commands"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.continuation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/org.adempiere.server-feature/pom.xml b/org.adempiere.server-feature/pom.xml
index e554646e6f..312b721fdb 100644
--- a/org.adempiere.server-feature/pom.xml
+++ b/org.adempiere.server-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.server.feature</artifactId>
@@ -31,7 +31,7 @@
 								<artifactItem>
 									<groupId>commons-beanutils</groupId>
 									<artifactId>commons-beanutils</artifactId>
-									<version>1.7.0</version>
+									<version>1.9.3</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>commons-betwixt</groupId>
@@ -41,37 +41,37 @@
 								<artifactItem>
 									<groupId>commons-codec</groupId>
 									<artifactId>commons-codec</artifactId>
-									<version>1.3</version>
+									<version>1.11</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>commons-collections</groupId>
 									<artifactId>commons-collections</artifactId>
-									<version>3.1</version>
+									<version>3.2.2</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>commons-dbcp</groupId>
 									<artifactId>commons-dbcp</artifactId>
-									<version>1.2.1</version>
+									<version>1.4</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>commons-digester</groupId>
 									<artifactId>commons-digester</artifactId>
-									<version>1.7</version>
+									<version>2.1</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>commons-lang</groupId>
 									<artifactId>commons-lang</artifactId>
-									<version>2.1</version>
+									<version>2.6</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>commons-logging</groupId>
 									<artifactId>commons-logging</artifactId>
-									<version>1.0.4</version>
+									<version>1.2</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>commons-pool</groupId>
 									<artifactId>commons-pool</artifactId>
-									<version>1.2</version>
+									<version>1.6</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>org.apache.ddlutils</groupId>
@@ -81,7 +81,7 @@
 								<artifactItem>
 									<groupId>dom4j</groupId>
 									<artifactId>dom4j</artifactId>
-									<version>1.4</version>
+									<version>1.6.1</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>oro</groupId>
@@ -96,7 +96,7 @@
 								<artifactItem>
 									<groupId>woodstox</groupId>
 									<artifactId>wstx-asl</artifactId>
-									<version>3.0.2</version>
+									<version>3.2.7</version>
 								</artifactItem>
 							</artifactItems>
 							<outputDirectory>../db/ddlutils/lib</outputDirectory>
@@ -158,7 +158,7 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>${url.file.srv}/database/5.1/Adempiere_pg.jar</url>
+							<url>${url.file.srv}/database/6.1/Adempiere_pg.jar</url>
 							<unpack>false</unpack>
 							<outputDirectory>data/seed</outputDirectory>
 							<retries>5</retries>
@@ -171,7 +171,7 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>${url.file.srv}/database/5.1/Adempiere.jar</url>
+							<url>${url.file.srv}/database/6.1/Adempiere.jar</url>
 							<unpack>false</unpack>
 							<outputDirectory>data/seed</outputDirectory>
 							<retries>5</retries>
@@ -184,7 +184,7 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>${url.file.srv}/jarfile/5.1/101-20121212164242.zip</url>
+							<url>${url.file.srv}/jarfile/6.1/101-20121212164242.zip</url>
 							<unpack>false</unpack>
 							<outputDirectory>../fitnesse/FitNesseRoot/FitLibraryWeb</outputDirectory>
 							<retries>5</retries>
@@ -197,7 +197,7 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>${url.file.srv}/jarfile/5.1/21-20121212154702.zip</url>
+							<url>${url.file.srv}/jarfile/6.1/21-20121212154702.zip</url>
 							<unpack>false</unpack>
 							<outputDirectory>../fitnesse/FitNesseRoot/FitLibraryWeb</outputDirectory>
 							<retries>5</retries>
@@ -210,7 +210,7 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>${url.file.srv}/jarfile/5.1/6-20121212124109.zip</url>
+							<url>${url.file.srv}/jarfile/6.1/6-20121212124109.zip</url>
 							<unpack>false</unpack>
 							<outputDirectory>../fitnesse/FitNesseRoot/FitLibraryWeb</outputDirectory>
 							<retries>5</retries>
diff --git a/org.adempiere.server-feature/server.product b/org.adempiere.server-feature/server.product
index bb538b7049..489bdd6af2 100644
--- a/org.adempiere.server-feature/server.product
+++ b/org.adempiere.server-feature/server.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="iDempiere Server" uid="org.adempiere.server.product" id="org.adempiere.server.server_product" application="org.adempiere.server.application" version="5.1.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="iDempiere Server" uid="org.adempiere.server.product" id="org.adempiere.server.server_product" application="org.adempiere.server.application" version="6.1.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -9,7 +9,7 @@
    <launcherArgs>
       <programArgs>-console
       </programArgs>
-      <vmArgs>-Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.w3c.dom.events -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-alpn.xml,etc/jetty-http2.xml,etc/jetty-https.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.zkoss.zk.config.path=file://${workspace_loc}/zk.xml
+      <vmArgs>--add-exports java.desktop/sun.awt=ALL-UNNAMED --add-exports java.sql.rowset/com.sun.rowset=ALL-UNNAMED --add-exports java.naming/com.sun.jndi.ldap=ALL-UNNAMED -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.w3c.dom.events -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-alpn.xml,etc/jetty-http2.xml,etc/jetty-https.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.zkoss.zk.config.path=file://${workspace_loc}/zk.xml
       </vmArgs>
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
@@ -24,7 +24,7 @@
    </launcher>
 
    <vm>
-      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</linux>
+      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10</linux>
    </vm>
 
    <plugins>
@@ -41,7 +41,7 @@
       <plugin id="org.adempiere.pipo" autoStart="true" startLevel="0" />
       <plugin id="org.adempiere.server" autoStart="true" startLevel="0" />
       <plugin id="org.adempiere.ui.zk" autoStart="true" startLevel="0" />
-      <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="0" />
+      <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="1" />
       <plugin id="org.apache.felix.webconsole" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.equinox.cm" autoStart="true" startLevel="0" />
@@ -60,6 +60,10 @@
       <plugin id="org.eclipse.jetty.http2.server" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.jetty.osgi.boot" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.jetty.osgi.httpservice" autoStart="true" startLevel="10" />
+      <plugin id="org.eclipse.jetty.websocket.common" autoStart="true" startLevel="3" />
+      <plugin id="org.eclipse.jetty.websocket.javax.websocket" autoStart="true" startLevel="3" />
+      <plugin id="org.eclipse.jetty.websocket.javax.websocket.server" autoStart="true" startLevel="3" />
+      <plugin id="org.eclipse.jetty.websocket.server" autoStart="true" startLevel="3" />
       <plugin id="org.idempiere.felix.webconsole" autoStart="true" startLevel="0" />
       <plugin id="org.mortbay.jasper.apache-el" autoStart="true" startLevel="0" />
       <plugin id="org.mortbay.jasper.apache-jsp" autoStart="true" startLevel="0" />
diff --git a/org.adempiere.server-feature/server.product.eventtest.launch b/org.adempiere.server-feature/server.product.eventtest.launch
deleted file mode 100644
index 59c9aca21c..0000000000
--- a/org.adempiere.server-feature/server.product.eventtest.launch
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.adempiere.server.application"/>
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="true"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/server.product.eventtest"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-server.product.eventtest"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dosgi.compatibility.bootdelegation=true"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.adempiere.server.server_product"/>
-<stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
-<stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.annotation@default:default,javax.ejb@default:default,javax.inject@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.persistence@default:default,javax.transaction@default:false,javax.websocket-api@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.aries.spifly.dynamic.bundle@2:true,org.apache.aries.util@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.taglibs.standard-impl@default:default,org.apache.taglibs.standard-jstlel@default:default,org.apache.taglibs.taglibs-standard-spec@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime@4:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.annotations@default:default,org.eclipse.jetty.apache-jsp@3:true,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jaas@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.jndi@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.osgi.httpservice@default:default,org.eclipse.jetty.plus@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.servlets@default:default,org.eclipse.jetty.util.ajax@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.javax.websocket.server@default:default,org.eclipse.jetty.websocket.javax.websocket@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.mortbay.jasper.apache-el@default:default,org.mortbay.jasper.apache-jsp@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.restlet.ext.servlet@default:default,org.restlet@4:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:default,org.adempiere.pipo@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:default,org.adempiere.server@4:true,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:false,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:false"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-<booleanAttribute key="usefeatures" value="false"/>
-</launchConfiguration>
diff --git a/org.adempiere.server-feature/server.product.functionaltest.launch b/org.adempiere.server-feature/server.product.functionaltest.launch
index 7dfd74ef46..5c4ba9f3fa 100644
--- a/org.adempiere.server-feature/server.product.functionaltest.launch
+++ b/org.adempiere.server-feature/server.product.functionaltest.launch
@@ -1,34 +1,39 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.adempiere.server.application"/>
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/server.product.functionaltest"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-server.product"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.zkoss.zk.config.path=/WEB-INF/zk-selenium.xml -Dosgi.compatibility.bootdelegation=true"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.adempiere.server.server_product"/>
-<stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
-<stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.annotation@default:default,javax.ejb@default:default,javax.inject@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.persistence@default:default,javax.transaction@default:false,javax.websocket-api@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.aries.spifly.dynamic.bundle@2:true,org.apache.aries.util@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@2:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.felix.webconsole@default:true,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.taglibs.standard-impl@default:default,org.apache.taglibs.standard-jstlel@default:default,org.apache.taglibs.taglibs-standard-spec@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime@4:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@2:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:true,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.metatype@2:true,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.annotations@default:default,org.eclipse.jetty.apache-jsp@3:true,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jaas@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.jndi@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.osgi.httpservice@default:true,org.eclipse.jetty.plus@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.servlets@default:default,org.eclipse.jetty.util.ajax@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.javax.websocket.server@default:true,org.eclipse.jetty.websocket.javax.websocket@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.json@default:default,org.junit@default:default,org.mortbay.jasper.apache-el@default:default,org.mortbay.jasper.apache-jsp@default:default,org.objectweb.asm.commons@default:true,org.objectweb.asm.tree@default:true,org.objectweb.asm@default:true,org.restlet.ext.servlet@default:default,org.restlet@4:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:default,org.adempiere.pipo@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:default,org.adempiere.server@4:true,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:false,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.felix.webconsole@default:true,org.idempiere.fitnesse.fixture@default:true,org.idempiere.fitnesse.server@default:true,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.ui.zk.selenium@default:true,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:false"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-<booleanAttribute key="usefeatures" value="false"/>
+    <booleanAttribute key="append.args" value="true"/>
+    <stringAttribute key="application" value="org.adempiere.server.application"/>
+    <booleanAttribute key="askclear" value="false"/>
+    <booleanAttribute key="automaticAdd" value="false"/>
+    <booleanAttribute key="automaticValidate" value="true"/>
+    <stringAttribute key="bootstrap" value=""/>
+    <stringAttribute key="checked" value="[NONE]"/>
+    <booleanAttribute key="clearConfig" value="true"/>
+    <booleanAttribute key="clearws" value="true"/>
+    <booleanAttribute key="clearwslog" value="false"/>
+    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/server.product.functionaltest"/>
+    <booleanAttribute key="default" value="false"/>
+    <booleanAttribute key="includeOptional" value="false"/>
+    <stringAttribute key="location" value="${workspace_loc}/runtime-server.product"/>
+    <stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.pde.ui.launcher.PDESourceLookupDirector"/>
+    <stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;sourceLookupDirector&gt;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;classpathContainer path=&amp;quot;org.eclipse.jdt.launching.JRE_CONTAINER&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.classpathContainer&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;default/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#10;&lt;/sourceContainers&gt;&#10;&lt;/sourceLookupDirector&gt;&#10;"/>
+    <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+        <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+    </listAttribute>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="--add-exports java.desktop/sun.awt=ALL-UNNAMED --add-exports java.sql.rowset/com.sun.rowset=ALL-UNNAMED --add-exports java.naming/com.sun.jndi.ldap=ALL-UNNAMED -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.w3c.dom.events -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-alpn.xml,etc/jetty-http2.xml,etc/jetty-https.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.zkoss.zk.config.path=file://${workspace_loc}/org.adempiere.ui.zk/WEB-INF/zk-selenium.xml"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
+    <stringAttribute key="pde.version" value="3.3"/>
+    <stringAttribute key="product" value="org.adempiere.server.server_product"/>
+    <stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
+    <stringAttribute key="selected_target_plugins" value="bcmail@default:default,bcpkix@default:default,bcprov@default:default,bctsp@default:default,com.fasterxml.jackson.core.jackson-annotations*2.9.5@default:default,com.fasterxml.jackson.core.jackson-core*2.9.5@default:default,com.fasterxml.jackson.core.jackson-databind*2.9.5@default:default,com.fasterxml.jackson.dataformat.jackson-dataformat-xml@default:default,com.fasterxml.jackson.datatype.jackson-datatype-guava*2.9.5@default:default,com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default,com.fasterxml.jackson.datatype.jackson-datatype-json-org@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-base*2.9.5@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider*2.9.5@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-xml-provider@default:default,com.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default,com.fasterxml.jackson.module.jackson-module-jsonSchema@default:default,com.fasterxml.woodstox.woodstox-core@default:default,com.google.guava*21.0.0.v20170206-1425@default:default,com.google.zxing.core@default:default,com.ibm.icu*63.1.0@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,com.jaspersoft.studio.bundles.itext@default:default,com.sun.mail.javax.mail@default:default,groovy-console@default:false,groovy-datetime@default:false,groovy-json@default:false,groovy-jsr223@default:false,groovy-nio@default:false,groovy-swing@default:false,groovy-xml@default:false,groovy@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.enterprise.cdi-api@default:default,javax.inject@default:default,javax.interceptor-api@default:default,javax.jms@default:default,javax.jws-api@default:default,javax.jws@default:default,javax.persistence@default:default,javax.transaction-api@default:default,javax.transaction@default:false,javax.validation.api@default:default,javax.websocket-api@default:default,javax.ws.rs-api@default:default,javax.ws.rs@default:default,javax.wsdl@default:default,javax.xml.rpc@default:default,javax.xml.soap-api@default:default,javax.xml.soap@default:default,javax.xml.stream@default:default,javax.xml@default:default,jaxb-api@default:default,jaxws-api@default:default,joda-time@default:default,json@default:default,net.sf.jasperreports.engine@default:default,net.sf.supercsv.super-csv@default:default,org.antlr.runtime*4.5.1.v20160210-1233@default:default,org.aopalliance@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant*1.10.5.v20180808-0324@default:default,org.apache.aries.spifly.dynamic.bundle@default:true,org.apache.aries.util@default:default,org.apache.axis@default:default,org.apache.batik.anim@default:default,org.apache.batik.bridge@default:default,org.apache.batik.codec@default:default,org.apache.batik.constants*1.10.0.v20180703-1553@default:default,org.apache.batik.css*1.10.0.v20180703-1553@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.extension@default:default,org.apache.batik.gvt@default:default,org.apache.batik.i18n*1.10.0.v20180703-1553@default:default,org.apache.batik.parser@default:default,org.apache.batik.pdf@default:default,org.apache.batik.script@default:default,org.apache.batik.svggen@default:default,org.apache.batik.swing@default:default,org.apache.batik.transcoder@default:default,org.apache.batik.util*1.10.0.v20180703-1553@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.xml@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec*1.10.0.v20180409-1845@default:default,org.apache.commons.collections@default:default,org.apache.commons.commons-collections4@default:default,org.apache.commons.commons-configuration2@default:default,org.apache.commons.digester@default:default,org.apache.commons.discovery*0.5.0@default:default,org.apache.commons.fileupload*1.3.2.v20170320-2229@default:default,org.apache.commons.io@default:default,org.apache.commons.lang3@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,org.apache.commons.net@default:default,org.apache.cxf.cxf-core@default:default,org.apache.cxf.cxf-rt-bindings-soap@default:default,org.apache.cxf.cxf-rt-bindings-xml@default:default,org.apache.cxf.cxf-rt-databinding-jaxb@default:default,org.apache.cxf.cxf-rt-databinding-xmlbeans@default:default,org.apache.cxf.cxf-rt-frontend-jaxrs@default:default,org.apache.cxf.cxf-rt-frontend-jaxws@default:default,org.apache.cxf.cxf-rt-frontend-simple@default:default,org.apache.cxf.cxf-rt-rs-extension-providers@default:default,org.apache.cxf.cxf-rt-rs-service-description@default:default,org.apache.cxf.cxf-rt-transports-http-jetty@default:default,org.apache.cxf.cxf-rt-transports-http@default:default,org.apache.cxf.cxf-rt-ws-addr@default:default,org.apache.cxf.cxf-rt-ws-policy@default:default,org.apache.cxf.cxf-rt-wsdl@default:default,org.apache.felix.gogo.command*1.0.2.v20170914-1324@default:default,org.apache.felix.gogo.runtime*1.1.0.v20180713-1646@default:default,org.apache.felix.gogo.shell*1.1.0.v20180713-1646@default:default,org.apache.felix.scr@1:true,org.apache.felix.webconsole@default:true,org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default,org.apache.httpcomponents.httpclient*4.5.5.v20180409-1525@default:default,org.apache.httpcomponents.httpcore*4.4.9.v20180409-1525@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core*3.5.0.v20120725-1805@default:default,org.apache.neethi*3.1.1@default:default,org.apache.poi.poi-ooxml-schemas@default:default,org.apache.poi.poi-ooxml@default:default,org.apache.poi.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.servicemix.bundles.jaxen@default:default,org.apache.servicemix.bundles.rhino@default:default,org.apache.servicemix.bundles.spring-aop@default:default,org.apache.servicemix.bundles.spring-beans@default:default,org.apache.servicemix.bundles.spring-context-support@default:default,org.apache.servicemix.bundles.spring-context@default:default,org.apache.servicemix.bundles.spring-core@default:default,org.apache.servicemix.bundles.spring-expression@default:default,org.apache.servicemix.bundles.spring-web@default:default,org.apache.taglibs.standard-impl@default:default,org.apache.taglibs.standard-jstlel@default:default,org.apache.taglibs.taglibs-standard-spec@default:default,org.apache.ws.xmlschema.core@default:default,org.apache.xalan@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.apache.xmlbeans*3.0.1@default:default,org.apache.xmlgraphics*2.2.0.v20180809-1640@default:default,org.atmosphere.runtime@default:default,org.cryptacular@default:default,org.dom4j@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@default:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@2:true,org.eclipse.equinox.event@2:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:true,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.metatype@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jetty.alpn.api@default:true,org.eclipse.jetty.alpn.conscrypt.server@default:true,org.eclipse.jetty.alpn.server@default:true,org.eclipse.jetty.annotations@default:default,org.eclipse.jetty.apache-jsp@default:true,org.eclipse.jetty.client@default:default,org.eclipse.jetty.continuation*9.4.12.v20180830@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http*9.4.12.v20180830@default:true,org.eclipse.jetty.http2.common@default:true,org.eclipse.jetty.http2.hpack@default:true,org.eclipse.jetty.http2.server@default:true,org.eclipse.jetty.io*9.4.12.v20180830@default:default,org.eclipse.jetty.jaas@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.jndi@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.alpn.fragment@default:false,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.osgi.httpservice@10:true,org.eclipse.jetty.plus@default:default,org.eclipse.jetty.security*9.4.12.v20180830@default:default,org.eclipse.jetty.server*9.4.12.v20180830@default:default,org.eclipse.jetty.servlet*9.4.12.v20180830@default:default,org.eclipse.jetty.servlets@default:default,org.eclipse.jetty.util*9.4.12.v20180830@default:default,org.eclipse.jetty.util.ajax@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.javax.websocket.server@default:default,org.eclipse.jetty.websocket.javax.websocket@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi*3.13.100.v20180827-1536@-1:true,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services*3.7.100.v20180827-1536@default:default,org.eclipse.osgi.util*3.5.100.v20180827-1536@default:default,org.eclipse.text@default:default,org.glassfish.hk2.api@default:default,org.glassfish.hk2.locator@default:default,org.glassfish.hk2.osgi-resource-locator@default:default,org.glassfish.hk2.utils@default:default,org.glassfish.jersey.bundles.repackaged.jersey-guava@default:default,org.glassfish.jersey.core.jersey-common@default:default,org.hamcrest.core@default:default,org.idempiere.org.conscrypt.openjdk-uber@default:default,org.jfree.chart-osgi@default:default,org.jfree.jcommon-osgi@default:default,org.json@default:default,org.junit@default:default,org.krysalis.barcode4j@default:default,org.mortbay.jasper.apache-el@default:true,org.mortbay.jasper.apache-jsp@default:true,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.passay@default:default,org.restlet*2.3.2.v20150501-1520@default:true,org.restlet.ext.servlet*2.3.2.v20150501-1520@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.springframework.spring-jcl@default:default,org.tukaani.xz*1.8.0.v20180207-1613@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default,slf4j.api@default:default,slf4j.jcl@default:false,stax2-api*3.1.4@default:default,stax2-api*4.1.0@default:default,zcommon@default:default,zel@default:default,zhtml@default:default,zjavassist@default:default,zk@default:default,zkbind@default:default,zkplus@default:default,zul@default:default,zweb@default:default"/>
+    <stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@default:default,org.adempiere.eclipse.equinox.http.servlet@default:true,org.adempiere.eclipse.equinox.http.servletbridge@default:default,org.adempiere.eclipse.equinox.servletbridge@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:default,org.adempiere.pipo@default:true,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@default:default,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:false,org.adempiere.report.jasper.webapp@default:default,org.adempiere.report.jasper@default:default,org.adempiere.server@default:true,org.adempiere.ui.zk@default:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:false,org.adempiere.webstore@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.felix.webconsole@default:true,org.idempiere.fitnesse.fixture@default:true,org.idempiere.fitnesse.server@default:true,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:default,org.idempiere.ui.zk.selenium@default:true,org.idempiere.webservices@default:default,org.idempiere.zk.extra@default:default"/>
+    <booleanAttribute key="show_selected_only" value="false"/>
+    <booleanAttribute key="tracing" value="false"/>
+    <booleanAttribute key="useCustomFeatures" value="false"/>
+    <booleanAttribute key="useDefaultConfig" value="true"/>
+    <booleanAttribute key="useDefaultConfigArea" value="true"/>
+    <booleanAttribute key="useProduct" value="true"/>
+    <booleanAttribute key="usefeatures" value="false"/>
 </launchConfiguration>
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index 11e55d29d5..e35a28c593 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.adempiere.server.application"/>
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="true"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/server.product"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="includeOptional" value="false"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-server.product"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.pde.ui.launcher.PDESourceLookupDirector"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;sourceLookupDirector&gt;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;classpathContainer path=&amp;quot;org.eclipse.jdt.launching.JRE_CONTAINER&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.classpathContainer&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;default/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#10;&lt;/sourceContainers&gt;&#10;&lt;/sourceLookupDirector&gt;&#10;"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.w3c.dom.events -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-alpn.xml,etc/jetty-http2.xml,etc/jetty-https.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.zkoss.zk.config.path=file://${workspace_loc}/zk.xml"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.adempiere.server.server_product"/>
-<stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.jetty.deploy@default:default,org.apache.batik.swing@default:default,javax.xml.soap@default:default,com.fasterxml.jackson.datatype.jackson-datatype-guava*2.9.5@default:default,org.eclipse.equinox.cm@default:true,org.eclipse.equinox.p2.jarprocessor@default:default,org.apache.batik.dom@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,slf4j.jcl@default:default,org.apache.batik.i18n@default:default,org.sat4j.pb@default:default,com.fasterxml.jackson.core.jackson-databind*2.9.5@default:default,com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default,org.apache.batik.dom.svg@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.app@default:default,org.eclipse.jetty.plus@default:default,org.cryptacular@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.gvt@default:default,org.eclipse.jetty.util.ajax@default:default,org.restlet*2.3.2.v20150501-1520@default:true,javax.management.j2ee-api@default:default,org.apache.commons.io@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.apache.batik.pdf@default:default,org.eclipse.core.jobs@default:default,org.apache.taglibs.standard-jstlel@default:default,net.sf.jasperreports.engine@default:default,org.eclipse.jetty.websocket.server@default:default,org.apache.batik.extension@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.apache.commons.fileupload*1.3.2.v20170320-2229@default:default,org.w3c.dom.svg@default:default,org.eclipse.equinox.common@2:true,org.jfree.jcommon-osgi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.eclipse.core.variables@default:default,zjavassist@default:default,org.apache.aries.util@default:default,org.eclipse.jetty.alpn.conscrypt.server@default:true,org.hamcrest.core@default:default,org.krysalis.barcode4j@default:default,org.w3c.css.sac@default:default,org.apache.batik.svggen@default:default,org.eclipse.jetty.http2.hpack@default:true,org.apache.commons.codec*1.10.0.v20180409-1845@default:default,org.json@default:default,org.eclipse.jetty.osgi.httpservice@10:true,org.apache.batik.parser@default:default,org.eclipse.jetty.osgi.alpn.fragment@default:default,org.eclipse.jetty.alpn.api@default:true,stax2-api@default:default,org.apache.poi.poi@default:default,org.eclipse.jetty.apache-jsp@default:true,org.apache.commons.beanutils@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.apache.lucene.core*3.5.0.v20120725-1805@default:default,javax.ws.rs@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-xml-provider@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.apache.felix.gogo.runtime*1.0.6.v20170914-1324@default:default,org.eclipse.jetty.http2.server@default:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,javax.ejb@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:default,org.eclipse.equinox.frameworkadmin@default:default,slf4j.api@default:default,json@default:default,com.ibm.icu*60.2.0@default:default,org.eclipse.equinox.security@default:default,org.apache.batik.xml@default:default,org.eclipse.equinox.p2.repository@default:default,com.fasterxml.jackson.module.jackson-module-jsonSchema@default:default,org.eclipse.core.net@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.equinox.p2.core@default:default,com.jaspersoft.studio.bundles.itext@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.ds@2:true,org.eclipse.jetty.osgi.boot.jsp@default:default,zul@default:default,org.apache.batik.bridge@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.osgi.services@default:default,org.eclipse.jetty.websocket.api@default:default,org.apache.xml.resolver@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,javax.websocket-api@default:default,javax.annotation-api@default:default,org.eclipse.equinox.metatype@default:default,org.apache.batik.css@default:default,org.apache.poi@default:default,org.apache.commons.configuration@default:default,org.eclipse.jetty.security*9.4.11.v20180605@default:default,bcpkix@default:default,org.eclipse.equinox.util@default:default,org.apache.taglibs.taglibs-standard-spec@default:default,org.apache.felix.webconsole@default:true,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.eclipse.jetty.webapp@default:default,org.apache.xalan@default:default,zhtml@default:default,org.apache.felix.scr@default:default,org.apache.poi.poi-ooxml@default:default,zkplus@default:default,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.io*9.4.11.v20180605@default:default,org.restlet.ext.servlet*2.3.2.v20150501-1520@default:default,org.dom4j@default:default,org.mortbay.jasper.apache-el@default:true,org.eclipse.core.contenttype@default:default,org.apache.httpcomponents.httpclient*4.5.5.v20180409-1525@default:default,org.objectweb.asm.commons@default:default,org.apache.batik.anim@default:default,com.fasterxml.jackson.core.jackson-core*2.9.5@default:default,joda-time@default:default,zweb@default:default,bctsp@default:default,org.apache.poi.poi-ooxml-schemas@default:default,org.apache.felix.gogo.shell*1.0.0.v20170914-1324@default:default,org.eclipse.ant.core@default:default,org.jfree.chart-osgi@default:default,bcmail@default:default,org.w3c.dom.events@default:default,javax.xml@default:default,org.apache.lucene.analysis@default:default,org.eclipse.jdt.core.compiler.batch@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,org.apache.batik.util@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.javax.websocket.server@default:default,org.atmosphere.runtime@default:default,com.itextpdf@default:default,org.eclipse.ecf.ssl@default:default,org.objectweb.asm@default:default,zcommon@default:default,org.apache.commons.digester@default:default,org.apache.batik.codec@default:default,org.apache.commons.codec*1.9.0.v20170208-1614@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:default,org.apache.aries.spifly.dynamic.bundle@default:true,org.eclipse.jetty.jndi@default:default,groovy-all@default:default,javax.transaction@default:default,org.passay@default:default,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:default,org.junit@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,com.google.zxing.core@default:default,org.apache.xml.serializer@default:default,org.eclipse.ecf.filetransfer@default:default,javax.xml.stream@default:default,org.apache.servicemix.bundles.rhino@default:default,com.google.guava*21.0.0.v20170206-1425@default:default,org.eclipse.jetty.jaas@default:default,org.eclipse.equinox.p2.director.app@default:default,com.sun.mail.javax.mail@default:default,org.eclipse.jetty.http2.common@default:true,org.eclipse.equinox.p2.console@default:default,org.eclipse.jetty.servlets@default:default,javax.validation.api@default:default,zkbind@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.equinox.event@2:true,org.eclipse.jetty.websocket.servlet@default:default,org.w3c.dom.smil@default:default,org.eclipse.equinox.http.registry@default:true,org.apache.batik.util.gui@default:default,org.apache.commons.lang@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider*2.9.5@default:default,com.fasterxml.jackson.core.jackson-annotations*2.9.5@default:default,org.eclipse.equinox.preferences@default:default,org.apache.commons.commons-collections4@default:default,org.idempiere.org.conscrypt.openjdk-uber@default:default,com.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default,org.eclipse.equinox.concurrent@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-base*2.9.5@default:default,org.eclipse.jetty.util*9.4.11.v20180605@default:default,org.eclipse.jetty.websocket.javax.websocket@default:default,org.apache.ant*1.10.3.v20180417-1627@default:default,org.eclipse.osgi.compatibility.state@default:default,org.objectweb.asm.tree@default:default,org.eclipse.osgi@default:default,org.apache.httpcomponents.httpcore*4.4.9.v20180409-1525@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,com.fasterxml.jackson.datatype.jackson-datatype-json-org@default:default,javax.xml.ws@default:default,org.apache.xmlgraphics*2.2.0.v20180410-1551@default:default,org.tukaani.xz*1.8.0.v20180207-1613@default:default,org.eclipse.jetty.alpn.server@default:true,org.apache.felix.gogo.command*1.0.2.v20170914-1324@default:default,com.fasterxml.woodstox.woodstox-core@default:default,javax.xml.rpc@default:default,org.apache.batik.script@default:default,org.apache.commons.net@default:default,org.eclipse.jetty.server*9.4.11.v20180605@default:default,org.apache.activemq.kahadb@default:default,javax.xml.bind@default:default,javax.persistence@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,com.fasterxml.jackson.dataformat.jackson-dataformat-xml@default:default,bcprov@default:default,zk@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.equinox.simpleconfigurator@1:true,zel@default:default,javax.jms@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.eclipse.jetty.http*9.4.11.v20180605@default:true,org.mortbay.jasper.apache-jsp@default:true,org.eclipse.equinox.p2.director@default:default,org.apache.servicemix.bundles.jaxen@default:default,org.eclipse.jetty.servlet*9.4.11.v20180605@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.p2.publisher@default:default,org.apache.taglibs.standard-impl@default:default,org.sat4j.core@default:default,org.apache.commons.collections@default:default,org.eclipse.ecf@default:default,org.apache.commons.lang3@default:default,org.eclipse.jetty.annotations@default:default,org.antlr.runtime*4.5.1.v20160210-1233@default:default,org.apache.batik.transcoder@default:default,javax.activation@default:default,org.apache.xerces@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,com.fasterxml.jackson.module.jackson-module-jsonSchema.source@default:default,org.eclipse.jetty.client@default:default,org.eclipse.osgi.util@default:default,org.apache.batik.constants@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.p2.engine@default:default,"/>
-<stringAttribute key="selected_workspace_plugins" value="org.apache.ecs@default:default,org.adempiere.extend@default:default,org.adempiere.replication@default:default,org.adempiere.server@default:true,org.compiere.db.postgresql.provider@default:default,org.adempiere.eclipse.equinox.http.servletbridge@default:default,org.adempiere.base.process@default:default,org.idempiere.zk.extra@default:default,org.adempiere.report.jasper.webapp@default:default,org.adempiere.pipo.handlers@default:default,org.idempiere.felix.webconsole@default:true,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@default:default,org.adempiere.webstore.resource@default:default,org.adempiere.ui.zk@default:true,org.adempiere.ui@default:default,org.idempiere.hazelcast.service@default:default,org.adempiere.webstore.servlet@default:default,org.adempiere.payment.processor@default:default,org.idempiere.hazelcast.service.config@default:default,org.adempiere.report.jasper@default:default,org.adempiere.base.callout@default:default,org.idempiere.webservices@default:default,org.adempiere.install@default:default,org.compiere.db.oracle.provider@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.eclipse.equinox.http.servlet@default:true,org.adempiere.eclipse.equinox.servletbridge@default:default,org.adempiere.pipo@default:true,org.adempiere.base@default:default,org.adempiere.webstore@default:default,"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-<booleanAttribute key="usefeatures" value="false"/>
+    <booleanAttribute key="append.args" value="true"/>
+    <stringAttribute key="application" value="org.adempiere.server.application"/>
+    <booleanAttribute key="askclear" value="false"/>
+    <booleanAttribute key="automaticAdd" value="false"/>
+    <booleanAttribute key="automaticValidate" value="true"/>
+    <stringAttribute key="bootstrap" value=""/>
+    <stringAttribute key="checked" value="[NONE]"/>
+    <booleanAttribute key="clearConfig" value="true"/>
+    <booleanAttribute key="clearws" value="true"/>
+    <booleanAttribute key="clearwslog" value="false"/>
+    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/server.product"/>
+    <booleanAttribute key="default" value="false"/>
+    <booleanAttribute key="includeOptional" value="false"/>
+    <stringAttribute key="location" value="${workspace_loc}/runtime-server.product"/>
+    <stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.pde.ui.launcher.PDESourceLookupDirector"/>
+    <stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;sourceLookupDirector&gt;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;classpathContainer path=&amp;quot;org.eclipse.jdt.launching.JRE_CONTAINER&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.classpathContainer&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;default/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#10;&lt;/sourceContainers&gt;&#10;&lt;/sourceLookupDirector&gt;&#10;"/>
+    <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+        <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+    </listAttribute>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="--add-exports java.desktop/sun.awt=ALL-UNNAMED --add-exports java.sql.rowset/com.sun.rowset=ALL-UNNAMED --add-exports java.naming/com.sun.jndi.ldap=ALL-UNNAMED -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.w3c.dom.events -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-alpn.xml,etc/jetty-http2.xml,etc/jetty-https.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.zkoss.zk.config.path=file://${workspace_loc}/zk.xml"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
+    <stringAttribute key="pde.version" value="3.3"/>
+    <stringAttribute key="product" value="org.adempiere.server.server_product"/>
+    <stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
+    <stringAttribute key="selected_target_plugins" value="org.apache.cxf.cxf-rt-wsdl@default:default,org.eclipse.jetty.plus@default:default,javax.ws.rs@default:default,bcmail@default:default,net.sf.supercsv.super-csv@default:default,jaxws-api@default:default,org.passay@default:default,javax.transaction-api@default:default,org.glassfish.hk2.locator@default:default,org.apache.batik.pdf@default:default,groovy-console@default:default,org.eclipse.jetty.server*9.4.12.v20180830@default:default,org.apache.xalan@default:default,org.eclipse.core.jobs@default:default,org.eclipse.text@default:default,org.apache.servicemix.bundles.spring-expression@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.jetty.jmx@default:default,org.apache.felix.scr@default:default,org.eclipse.jetty.http2.server@default:true,org.eclipse.core.contenttype@default:default,org.eclipse.jetty.apache-jsp@default:true,org.eclipse.jetty.util.ajax@default:default,org.apache.commons.fileupload*1.3.2.v20170320-2229@default:default,org.apache.batik.transcoder@default:default,org.apache.commons.commons-collections4@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:default,org.apache.aries.spifly.dynamic.bundle@1:true,org.apache.axis@default:default,com.fasterxml.jackson.core.jackson-core*2.9.5@default:default,org.apache.batik.extension@default:default,slf4j.jcl@default:default,org.apache.cxf.cxf-rt-frontend-simple@default:default,com.jaspersoft.studio.bundles.itext@default:default,org.eclipse.ecf.ssl@default:default,org.apache.servicemix.bundles.spring-beans@default:default,bcprov@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.concurrent@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.poi.poi-ooxml-schemas@default:default,org.apache.batik.css*1.10.0.v20180703-1553@default:default,org.eclipse.equinox.p2.publisher@default:default,org.apache.commons.codec*1.10.0.v20180409-1845@default:default,groovy-swing@default:default,org.eclipse.equinox.console@default:default,org.jfree.jcommon-osgi@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.launcher@default:default,zel@default:default,org.apache.poi.poi-ooxml@default:default,org.glassfish.jersey.core.jersey-common@default:default,org.apache.commons.discovery*0.5.0@default:default,javax.ws.rs-api@default:default,zk@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,javax.xml.rpc@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:default,org.apache.commons.lang@default:default,org.apache.poi.poi@default:default,org.apache.ant*1.10.5.v20180808-0324@default:default,org.apache.batik.util*1.10.0.v20180703-1553@default:default,org.eclipse.jetty.osgi.boot.jsp@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,javax.annotation-api@default:default,groovy@default:default,org.eclipse.equinox.cm@default:true,org.apache.servicemix.bundles.jaxen@default:default,com.sun.mail.javax.mail@default:default,org.objectweb.asm.tree@default:default,org.eclipse.equinox.frameworkadmin@default:default,zcommon@default:default,org.eclipse.osgi*3.13.100.v20180827-1536@default:default,org.mortbay.jasper.apache-jsp@default:true,groovy-nio@default:default,org.w3c.dom.events@default:default,org.eclipse.jetty.servlets@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.util@default:default,org.eclipse.equinox.registry@default:default,org.jfree.chart-osgi@default:default,org.apache.xerces@default:default,zjavassist@default:default,javax.websocket-api@default:default,org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,org.eclipse.osgi.util*3.5.100.v20180827-1536@default:default,com.fasterxml.jackson.datatype.jackson-datatype-json-org@default:default,org.apache.batik.i18n*1.10.0.v20180703-1553@default:default,bcpkix@default:default,org.apache.cxf.cxf-rt-rs-service-description@default:default,javax.transaction@default:default,org.glassfish.hk2.api@default:default,slf4j.api@default:default,org.apache.commons.collections@default:default,groovy-xml@default:default,org.eclipse.equinox.security@default:default,org.sat4j.pb@default:default,org.eclipse.jetty.servlet*9.4.12.v20180830@default:default,org.eclipse.jetty.websocket.common@3:true,org.apache.batik.anim@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.jetty.osgi.httpservice@10:true,org.eclipse.jetty.websocket.servlet@default:default,javax.enterprise.cdi-api@default:default,joda-time@default:default,groovy-jsr223@default:default,org.eclipse.core.net@default:default,org.eclipse.jetty.jaas@default:default,zhtml@default:default,org.apache.commons.beanutils@default:default,org.eclipse.ecf@default:default,net.sf.jasperreports.engine@default:default,javax.interceptor-api@default:default,org.apache.batik.gvt@default:default,bctsp@default:default,org.apache.activemq.kahadb@default:default,org.glassfish.jersey.bundles.repackaged.jersey-guava@default:default,zkplus@default:default,org.apache.cxf.cxf-rt-ws-policy@default:default,org.objectweb.asm.commons@default:default,org.dom4j@default:default,org.json@default:default,javax.jms@default:default,org.eclipse.jetty.alpn.server@default:true,org.apache.batik.swing@default:default,javax.validation.api@default:default,org.eclipse.equinox.metatype@default:default,org.eclipse.jetty.annotations@default:default,org.eclipse.equinox.event@2:true,org.apache.aries.util@default:default,com.fasterxml.jackson.core.jackson-databind*2.9.5@default:default,org.eclipse.equinox.p2.engine@default:default,org.apache.batik.parser@default:default,javax.persistence@default:default,org.eclipse.equinox.http.registry@default:true,org.apache.xml.resolver@default:default,org.eclipse.jetty.client@default:default,org.apache.taglibs.standard-jstlel@default:default,org.apache.commons.net@default:default,org.apache.batik.ext.awt@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.jetty.jndi@default:default,org.apache.batik.dom@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:default,org.eclipse.jdt.core@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-base*2.9.5@default:default,com.ibm.icu*63.1.0@default:default,org.hamcrest.core@default:default,com.fasterxml.jackson.dataformat.jackson-dataformat-xml@default:default,org.apache.ws.xmlschema.core@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.javax.websocket@3:true,org.antlr.runtime*4.5.1.v20160210-1233@default:default,javax.xml.soap-api@default:default,org.eclipse.jetty.webapp@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider*2.9.5@default:default,org.eclipse.ant.core@default:default,json@default:default,org.objectweb.asm@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.jetty.websocket.client@default:default,org.apache.cxf.cxf-rt-bindings-xml@default:default,org.eclipse.jetty.http*9.4.12.v20180830@default:true,org.eclipse.jetty.http2.common@default:true,org.apache.cxf.cxf-core@default:default,org.w3c.dom.smil@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,stax2-api*4.1.0@default:default,stax2-api*3.1.4@default:default,org.eclipse.jetty.io*9.4.12.v20180830@default:default,org.eclipse.jetty.osgi.alpn.fragment@default:default,org.apache.batik.dom.svg@default:default,org.apache.cxf.cxf-rt-ws-addr@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.apache.activemq.activemq-core@default:default,org.apache.cxf.cxf-rt-databinding-xmlbeans@default:default,org.junit@default:default,org.apache.commons.commons-configuration2@default:default,org.apache.commons.lang3@default:default,org.apache.cxf.cxf-rt-frontend-jaxrs@default:default,org.apache.felix.webconsole@default:true,org.apache.cxf.cxf-rt-rs-extension-providers@default:default,org.apache.servicemix.bundles.spring-context@default:default,javax.xml@default:default,org.eclipse.jetty.deploy@default:default,org.apache.servicemix.bundles.rhino@default:default,org.eclipse.core.resources@default:default,org.restlet*2.3.2.v20150501-1520@default:true,org.apache.commons.io@default:default,org.apache.cxf.cxf-rt-databinding-jaxb@default:default,org.eclipse.core.expressions@default:default,org.apache.cxf.cxf-rt-bindings-soap@default:default,org.springframework.spring-jcl@default:default,org.eclipse.osgi.services*3.7.100.v20180827-1536@default:default,javax.activation@default:default,org.apache.batik.xml@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.jetty.util*9.4.12.v20180830@default:default,org.eclipse.jetty.osgi.boot@default:true,org.apache.taglibs.taglibs-standard-spec@default:default,org.aopalliance@default:default,org.apache.httpcomponents.httpcore*4.4.9.v20180409-1525@default:default,com.fasterxml.jackson.module.jackson-module-jsonSchema.source@default:default,org.eclipse.jetty.xml@default:default,org.apache.commons.digester@default:default,org.apache.batik.bridge@default:default,org.apache.batik.constants*1.10.0.v20180703-1553@default:default,com.fasterxml.woodstox.woodstox-core@default:default,groovy-json@default:default,zweb@default:default,org.apache.lucene.analysis@default:default,org.apache.servicemix.bundles.spring-core@default:default,org.tukaani.xz*1.8.0.v20180207-1613@default:default,org.apache.xmlbeans*3.0.1@default:default,com.fasterxml.jackson.core.jackson-annotations*2.9.5@default:default,org.eclipse.osgi.compatibility.state@default:default,org.apache.httpcomponents.httpclient*4.5.5.v20180409-1525@default:default,org.eclipse.jetty.security*9.4.12.v20180830@default:default,org.apache.servicemix.bundles.spring-aop@default:default,javax.xml.soap@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-xml-provider@default:default,org.apache.servicemix.bundles.spring-context-support@default:default,org.apache.cxf.cxf-rt-transports-http@default:default,org.apache.cxf.cxf-rt-transports-http-jetty@default:default,org.eclipse.core.runtime@default:true,zul@default:default,org.apache.batik.svggen@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.apache.taglibs.standard-impl@default:default,org.apache.felix.gogo.command*1.0.2.v20170914-1324@default:default,org.eclipse.jetty.alpn.api@default:true,com.fasterxml.jackson.module.jackson-module-jsonSchema@default:default,javax.jws-api@default:default,org.krysalis.barcode4j@default:default,org.eclipse.jetty.alpn.conscrypt.server@default:true,javax.wsdl@default:default,org.idempiere.org.conscrypt.openjdk-uber@default:default,org.sat4j.core@default:default,jaxb-api@default:default,org.apache.cxf.cxf-rt-frontend-jaxws@default:default,org.eclipse.jetty.websocket.javax.websocket.server@3:true,zkbind@default:default,org.glassfish.hk2.osgi-resource-locator@default:default,com.fasterxml.jackson.datatype.jackson-datatype-guava*2.9.5@default:default,com.google.guava*21.0.0.v20170206-1425@default:default,org.restlet.ext.servlet*2.3.2.v20150501-1520@default:default,javax.inject@default:default,org.eclipse.jetty.websocket.server@3:true,org.apache.lucene.core*3.5.0.v20120725-1805@default:default,com.itextpdf@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.script@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.continuation*9.4.12.v20180830@default:default,org.apache.batik.codec@default:default,org.eclipse.jetty.http2.hpack@default:true,org.cryptacular@default:default,org.w3c.css.sac@default:default,org.eclipse.equinox.common@2:true,groovy-datetime@default:default,org.apache.felix.gogo.runtime*1.1.0.v20180713-1646@default:default,org.apache.servicemix.bundles.spring-web@default:default,javax.xml.stream@default:default,org.w3c.dom.svg@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.ds@2:true,org.apache.xml.serializer@default:default,javax.jws@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.mortbay.jasper.apache-el@default:true,org.apache.felix.gogo.shell*1.1.0.v20180713-1646@default:default,org.apache.neethi*3.1.1@default:default,org.atmosphere.runtime@default:default,com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default,org.eclipse.equinox.app@default:default,org.apache.xmlgraphics*2.2.0.v20180809-1640@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.glassfish.hk2.utils@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,com.google.zxing.core@default:default,com.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default,"/>
+    <stringAttribute key="selected_workspace_plugins" value="org.adempiere.server@default:true,org.adempiere.payment.processor@default:default,org.idempiere.hazelcast.service@default:default,org.adempiere.replication.server@default:default,org.adempiere.webstore.servlet@default:default,org.adempiere.base.callout@default:default,org.adempiere.ui@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.ui.zk@default:true,org.idempiere.webservices@default:default,org.adempiere.eclipse.equinox.servletbridge@default:default,org.adempiere.replication@default:default,org.compiere.db.postgresql.provider@default:default,org.adempiere.report.jasper@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.base@default:default,org.adempiere.webstore@default:default,org.adempiere.eclipse.equinox.http.servlet@default:true,org.adempiere.base.process@default:default,org.compiere.db.oracle.provider@default:default,org.adempiere.report.jasper.webapp@default:default,org.adempiere.pipo@default:true,org.adempiere.eclipse.equinox.http.servletbridge@default:default,org.adempiere.pipo.handlers@default:default,org.apache.ecs@default:default,org.adempiere.extend@default:default,org.idempiere.hazelcast.service.config@default:default,org.adempiere.install@default:default,org.idempiere.zk.extra@default:default,org.adempiere.webstore.resource@default:default,org.idempiere.felix.webconsole@default:true,"/>
+    <booleanAttribute key="show_selected_only" value="false"/>
+    <booleanAttribute key="tracing" value="false"/>
+    <booleanAttribute key="useCustomFeatures" value="false"/>
+    <booleanAttribute key="useDefaultConfig" value="true"/>
+    <booleanAttribute key="useDefaultConfigArea" value="true"/>
+    <booleanAttribute key="useProduct" value="true"/>
+    <booleanAttribute key="usefeatures" value="false"/>
 </launchConfiguration>
diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini
index 000a8a39d3..7d76a2653b 100644
--- a/org.adempiere.server-feature/setup/configuration/config.ini
+++ b/org.adempiere.server-feature/setup/configuration/config.ini
@@ -1,4 +1,4 @@
-osgi.framework=file\:../plugins/org.eclipse.osgi_3.13.0.v20180409-1500.jar
+osgi.framework=file\:../plugins/org.eclipse.osgi_3.13.100.v20180827-1536.jar
 osgi.install.area=setup
 osgi.bundles=org.eclipse.equinox.ds@1:start,\
  org.eclipse.equinox.util,\
@@ -14,6 +14,7 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\
  org.restlet,\
  org.apache.servicemix.bundles.cglib,\
  com.sun.mail.javax.mail,\
+ javax.activation,\
  org.apache.commons.collections,\
  org.apache.ant,\
  javax.jms,\
@@ -25,19 +26,15 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\
  org.eclipse.osgi.util,\
  org.apache.felix.scr,\
  org.eclipse.core.contenttype,\
- org.apache.poi,\
+ org.apache.poi.poi,\
+ org.apache.poi.poi-ooxml,\
  org.eclipse.core.jobs,\
  org.eclipse.equinox.preferences,\
  org.eclipse.equinox.event,\
  org.apache.commons.logging,\
- javax.management.j2ee-api,\
  org.eclipse.osgi,\
  org.eclipse.osgi.services,\
- javax.ejb,\
- javax.xml.rpc,\
- javax.xml.soap,\
  javax.xml,\
- javax.activation,\
  org.apache.activemq.activemq-core,\
  org.apache.activemq.kahadb,\
  javax.transaction,\
@@ -47,7 +44,6 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\
  slf4j.jcl,\
  org.apache.commons.codec,\
  org.eclipse.osgi.compatibility.state,\
- org.eclipse.osgi.compatibility.plugins,\
  org.cryptacular,\
  net.sf.supercsv.super-csv,\
  com.itextpdf,\
@@ -59,7 +55,9 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\
  bcpkix,\
  org.eclipse.equinox.common,\
  org.passay,\
- groovy-all,\
+ groovy,\
+ org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec,\
+ jaxb-api,\
  org.eclipse.osgi@start
 osgi.framework.extensions=
 osgi.bundles.defaultStartLevel=4
diff --git a/org.adempiere.server-feature/utils.unix/oracle/SyncDB.sh b/org.adempiere.server-feature/utils.unix/oracle/SyncDB.sh
index ea6bff708a..ed6a40b4ac 100644
--- a/org.adempiere.server-feature/utils.unix/oracle/SyncDB.sh
+++ b/org.adempiere.server-feature/utils.unix/oracle/SyncDB.sh
@@ -28,7 +28,7 @@ ADEMPIERE_DB_USER=$1
 ADEMPIERE_DB_PASSWORD=$2
 ADEMPIERE_DB_PATH=$3
 CMD="sqlplus $ADEMPIERE_DB_USER/$ADEMPIERE_DB_PASSWORD@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME"
-SILENTCMD="$CMD -S"
+SILENTCMD="sqlplus -S $ADEMPIERE_DB_USER/$ADEMPIERE_DB_PASSWORD@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME"
 ERROR_STRINGS="^(ORA-[0-9]+:|TNS-|PLS-)"
 
 cd $IDEMPIERE_HOME/migration
diff --git a/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control b/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control
index bbb0067c5f..a2303567b1 100644
--- a/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control
+++ b/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control
@@ -1,9 +1,9 @@
 Package: idempiere
-Version: 5.1
+Version: 6.1
 Section: web
 Priority: extra
 Architecture: all
-Pre-Depends: openjdk-8-jdk|oracle-java8-installer, postgresql-10|postgresql-9.6|postgresql-9.5|postgresql-9.4|postgresql-9.3|postgresql-9.2|postgresql-9.1, postgresql-contrib, adduser
+Pre-Depends: openjdk-10-jdk|openjdk-11-jdk|openjdk-12-jdk, postgresql-11|postgresql-10|postgresql-9.6, postgresql-contrib, adduser
 Suggests: firefox
 Installed-Size: 968668
 Maintainer: Carlos Ruiz  <carg67@gmail.com>
diff --git a/org.adempiere.server/.classpath b/org.adempiere.server/.classpath
index f2e5467c7f..581de6dd1b 100644
--- a/org.adempiere.server/.classpath
+++ b/org.adempiere.server/.classpath
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+			<attribute name="add-exports" value="java.naming/com.sun.jndi.ldap=ALL-UNNAMED"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/main/server/"/>
 	<classpathentry kind="src" path="src/main/servlet/"/>
diff --git a/org.adempiere.server/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.server/.settings/org.eclipse.jdt.core.prefs
index f6fb89ba37..182138f43f 100644
--- a/org.adempiere.server/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.server/.settings/org.eclipse.jdt.core.prefs
@@ -10,15 +10,12 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.APILeak=warning
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
 org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
 org.eclipse.jdt.core.compiler.problem.deadCode=warning
@@ -27,7 +24,6 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
@@ -108,4 +104,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.adempiere.server/META-INF/MANIFEST.MF b/org.adempiere.server/META-INF/MANIFEST.MF
index 8b905ddfb9..8d5f09ee21 100644
--- a/org.adempiere.server/META-INF/MANIFEST.MF
+++ b/org.adempiere.server/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Server
 Bundle-SymbolicName: org.adempiere.server;singleton:=true
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.1.0.qualifier
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  org.eclipse.equinox.app;bundle-version="0.0.0",
  org.eclipse.jetty.apache-jsp;bundle-version="0.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Web-ContextPath: /
 Bundle-ClassPath: .,
  WEB-INF/lib/jnlp-jardiff.jar,
@@ -41,3 +41,4 @@ Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/acctprocessorfactory.xml, OSGI-INF/alertprocessorfactory.xml, OSGI-INF/ldapprocessorfactory.xml, OSGI-INF/requestprocessorfactory.xml, OSGI-INF/schedulerfactory.xml, OSGI-INF/workflowprocessorfactory.xml
 Bundle-Activator: org.adempiere.server.AdempiereServerActivator
 Automatic-Module-Name: org.adempiere.server
+Bundle-Vendor: iDempiere Community
diff --git a/org.adempiere.server/idempiere.html b/org.adempiere.server/idempiere.html
index 502511333d..416a0278ce 100644
--- a/org.adempiere.server/idempiere.html
+++ b/org.adempiere.server/idempiere.html
@@ -96,7 +96,7 @@ End If
         <tbody>
           <tr>
 
-            <td align="left" valign="middle"><font color="#ffffff" face="Arial, Helvetica, sans-serif" size="4">Welcome to the iDempiere (OSGi+ADempiere) 5.1 Page!<br>
+            <td align="left" valign="middle"><font color="#ffffff" face="Arial, Helvetica, sans-serif" size="4">Welcome to the iDempiere (OSGi+ADempiere) 6.1 Page!<br>
 
             </font></td>
 
diff --git a/org.adempiere.server/pom.xml b/org.adempiere.server/pom.xml
index d627bc0fa7..3b2e107733 100644
--- a/org.adempiere.server/pom.xml
+++ b/org.adempiere.server/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.server</artifactId>
@@ -16,8 +16,12 @@
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-compiler-plugin</artifactId>
 				<configuration>
-					<!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=367431 -->
-					<compilerArgument>-warn:+forbidden</compilerArgument>
+					<compilerArgs>
+						<!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=367431 -->
+						<arg>-warn:+forbidden</arg>
+		      			<arg>--add-exports</arg>
+		      			<arg>java.naming/com.sun.jndi.ldap=ALL-UNNAMED</arg>
+					</compilerArgs>
 				</configuration>
 			</plugin>
 			<plugin>
diff --git a/org.adempiere.server/src/main/home/org/bmlaurus/home/home.properties b/org.adempiere.server/src/main/home/org/bmlaurus/home/home.properties
index 19ad90888e..e470128395 100644
--- a/org.adempiere.server/src/main/home/org/bmlaurus/home/home.properties
+++ b/org.adempiere.server/src/main/home/org/bmlaurus/home/home.properties
@@ -41,7 +41,7 @@ Social7				=	NONE
 Title				=	iDempiere Application Home
 
 #Custom TemplateName (white or black)
-TemplateName		=	white
+TemplateName		=	black
 
 #file:///Linux/&Mac/resources/templates/ --- file://Windows/resources/templates/
 TemplatePath		=	resources/templates/
@@ -52,7 +52,7 @@ CustomImagePath		=	NONE
 ClientName 			=	iDempiere Server
 
 #Custom Credits & Copyright tail
-Credits				=	Welcome to the iDempiere (OSGi+ADempiere) 5.1 Page!
+Credits				=	Welcome to the iDempiere (OSGi+ADempiere) 6.1 Page!
 Copyriright			=	|| by <a href="http://www.idempiere.org" target="blank">iDempiere Community</a>
 
 #Custom RSS (rss1 to rss5)
diff --git a/org.adempiere.server/src/main/server/org/compiere/server/Scheduler.java b/org.adempiere.server/src/main/server/org/compiere/server/Scheduler.java
index 1230844383..97022d89d0 100644
--- a/org.adempiere.server/src/main/server/org/compiere/server/Scheduler.java
+++ b/org.adempiere.server/src/main/server/org/compiere/server/Scheduler.java
@@ -586,7 +586,7 @@ public class Scheduler extends AdempiereServer
 	 */
 	protected static MScheduler get(Properties ctx, int AD_Scheduler_ID)
 	{
-		Integer key = new Integer(AD_Scheduler_ID);
+		Integer key = Integer.valueOf(AD_Scheduler_ID);
 		MScheduler retValue = (MScheduler)s_cache.get(key);
 		if (retValue == null)
 		{
diff --git a/org.adempiere.server/src/main/server/org/compiere/server/WorkflowProcessor.java b/org.adempiere.server/src/main/server/org/compiere/server/WorkflowProcessor.java
index bcab69ed55..6e9f20c596 100644
--- a/org.adempiere.server/src/main/server/org/compiere/server/WorkflowProcessor.java
+++ b/org.adempiere.server/src/main/server/org/compiere/server/WorkflowProcessor.java
@@ -381,7 +381,7 @@ public class WorkflowProcessor extends AdempiereServer
 		//	To Activity Owner
 		if (m_client.sendEMail(activity.getAD_User_ID(), subject, message, pdf))
 			counter++;
-		list.add (new Integer(activity.getAD_User_ID()));
+		list.add (Integer.valueOf(activity.getAD_User_ID()));
 
 		//	To Process Owner
 		if (toProcess
@@ -389,7 +389,7 @@ public class WorkflowProcessor extends AdempiereServer
 		{
 			if (m_client.sendEMail(process.getAD_User_ID(), subject, message, pdf))
 				counter++;
-			list.add (new Integer(process.getAD_User_ID()));
+			list.add (Integer.valueOf(process.getAD_User_ID()));
 		}
 		
 		//	To Activity Responsible
@@ -409,11 +409,11 @@ public class WorkflowProcessor extends AdempiereServer
 		//	Processor SuperVisor
 		if (toSupervisor 
 			&& m_model.getSupervisor_ID() != 0
-			&& !list.contains(new Integer(m_model.getSupervisor_ID())))
+			&& !list.contains(Integer.valueOf(m_model.getSupervisor_ID())))
 		{
 			if (m_client.sendEMail(m_model.getSupervisor_ID(), subject, message, pdf))
 				counter++;
-			list.add (new Integer(m_model.getSupervisor_ID()));
+			list.add (Integer.valueOf(m_model.getSupervisor_ID()));
 		}
 
 		return counter;
@@ -439,11 +439,11 @@ public class WorkflowProcessor extends AdempiereServer
 		//	Human
 		else if (MWFResponsible.RESPONSIBLETYPE_Human.equals(responsible.getResponsibleType())
 			&& responsible.getAD_User_ID() != 0
-			&& !list.contains(new Integer(responsible.getAD_User_ID())))
+			&& !list.contains(Integer.valueOf(responsible.getAD_User_ID())))
 		{
 			if (m_client.sendEMail(responsible.getAD_User_ID(), subject, message, pdf))
 				counter++;
-			list.add (new Integer(responsible.getAD_User_ID()));
+			list.add (Integer.valueOf(responsible.getAD_User_ID()));
 		}
 		//	Org of the Document
 		else if (MWFResponsible.RESPONSIBLETYPE_Organization.equals(responsible.getResponsibleType()))
@@ -453,11 +453,11 @@ public class WorkflowProcessor extends AdempiereServer
 			{
 				MOrgInfo org = MOrgInfo.get (getCtx(), document.getAD_Org_ID(), null);
 				if (org.getSupervisor_ID() != 0
-					&& !list.contains(new Integer(org.getSupervisor_ID())))
+					&& !list.contains(Integer.valueOf(org.getSupervisor_ID())))
 				{
 					if (m_client.sendEMail(org.getSupervisor_ID(), subject, message, pdf))
 						counter++;
-					list.add (new Integer(org.getSupervisor_ID()));
+					list.add (Integer.valueOf(org.getSupervisor_ID()));
 				}
 			}
 		}
@@ -472,11 +472,11 @@ public class WorkflowProcessor extends AdempiereServer
 				if (!roles.isActive())
 					continue;
 				int AD_User_ID = roles.getAD_User_ID();
-				if (!list.contains(new Integer(AD_User_ID)))
+				if (!list.contains(Integer.valueOf(AD_User_ID)))
 				{
 					if (m_client.sendEMail(AD_User_ID, subject, message, pdf))
 						counter++;
-					list.add (new Integer(AD_User_ID));
+					list.add (Integer.valueOf(AD_User_ID));
 				}
 			}
 		}
diff --git a/org.adempiere.server/src/main/servlet/org/compiere/web/AdempiereMonitorFilter.java b/org.adempiere.server/src/main/servlet/org/compiere/web/AdempiereMonitorFilter.java
index 2880118a50..348c413e4e 100644
--- a/org.adempiere.server/src/main/servlet/org/compiere/web/AdempiereMonitorFilter.java
+++ b/org.adempiere.server/src/main/servlet/org/compiere/web/AdempiereMonitorFilter.java
@@ -51,7 +51,7 @@ public class AdempiereMonitorFilter implements Filter
 	public AdempiereMonitorFilter ()
 	{
 		super ();
-		m_authorization = new Long (System.currentTimeMillis());
+		m_authorization = Long.valueOf(System.currentTimeMillis());
 	}	//	AdempiereMonitorFilter
 
 	/**	Logger			*/
diff --git a/org.adempiere.site-feature/feature.xml b/org.adempiere.site-feature/feature.xml
index 296a06abc8..80a331fbb0 100644
--- a/org.adempiere.site-feature/feature.xml
+++ b/org.adempiere.site-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.site"
       label="Update Site-feature"
-      version="5.1.0.qualifier"
+      version="6.1.0.qualifier"
       provider-name="Adempiere.org">
 
    <description url="http://www.example.com/description">
diff --git a/org.adempiere.target.platform-feature/feature.xml b/org.adempiere.target.platform-feature/feature.xml
index 0323e0a73a..437704be16 100644
--- a/org.adempiere.target.platform-feature/feature.xml
+++ b/org.adempiere.target.platform-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.target.platform.feature"
       label="Adempiere Target Platform"
-      version="5.1.0.qualifier"
+      version="6.1.0.qualifier"
       provider-name="Adempiere.org">
 
    <description url="http://www.example.com/description">
@@ -155,4 +155,309 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="stax2-api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.commons.discovery"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.cxf.cxf-rt-frontend-jaxws"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.ws.xmlschema.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.neethi"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.cxf.cxf-core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.cxf.cxf-rt-frontend-jaxrs"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.cxf.cxf-rt-bindings-soap"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javax.wsdl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.cxf.cxf-rt-wsdl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.cxf.cxf-rt-bindings-xml"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.cxf.cxf-rt-databinding-jaxb"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.cxf.cxf-rt-frontend-simple"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.cxf.cxf-rt-transports-http"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.aopalliance"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.cxf.cxf-rt-transports-http-jetty"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.cxf.cxf-rt-ws-addr"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.cxf.cxf-rt-ws-policy"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.axis"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="javax.xml.rpc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.apache.xmlbeans"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.cxf.cxf-rt-databinding-xmlbeans"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.cxf.cxf-rt-rs-extension-providers"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javax.ws.rs-api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.servicemix.bundles.spring-beans"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.servicemix.bundles.spring-context"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.servicemix.bundles.spring-context-support"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.servicemix.bundles.spring-core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.servicemix.bundles.spring-expression"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.servicemix.bundles.spring-web"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.springframework.spring-jcl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.servicemix.bundles.spring-aop"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="jaxb-api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javax.jws-api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javax.xml.soap-api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javax.xml.soap"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="jaxws-api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.glassfish.hk2.api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.glassfish.hk2.locator"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.glassfish.hk2.osgi-resource-locator"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.glassfish.hk2.utils"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.glassfish.jersey.bundles.repackaged.jersey-guava"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.glassfish.jersey.core.jersey-common"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.cxf.cxf-rt-rs-service-description"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/org.adempiere.target.platform-feature/pom.xml b/org.adempiere.target.platform-feature/pom.xml
index c3a1de3f03..96a5f448f1 100644
--- a/org.adempiere.target.platform-feature/pom.xml
+++ b/org.adempiere.target.platform-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.target.platform.feature</artifactId>
diff --git a/org.adempiere.ui.swing-feature/feature.xml b/org.adempiere.ui.swing-feature/feature.xml
index 77e7066257..05597c4c34 100644
--- a/org.adempiere.ui.swing-feature/feature.xml
+++ b/org.adempiere.ui.swing-feature/feature.xml
@@ -2,7 +2,8 @@
 <feature
       id="org.adempiere.ui.swing.feature"
       label="Swing Client-feature"
-      version="5.1.0.qualifier">
+      version="6.1.0.qualifier"
+      provider-name="iDempiere Community">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -41,7 +42,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.jdt.core.compiler.batch"
+         id="org.eclipse.jdt.core"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/org.adempiere.ui.swing-feature/pom.xml b/org.adempiere.ui.swing-feature/pom.xml
index 8321278454..74ad5767af 100644
--- a/org.adempiere.ui.swing-feature/pom.xml
+++ b/org.adempiere.ui.swing-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.ui.swing.feature</artifactId>
diff --git a/org.adempiere.ui.swing-feature/swingclient.product b/org.adempiere.ui.swing-feature/swingclient.product
index 769cdc5b33..f34dbee42b 100644
--- a/org.adempiere.ui.swing-feature/swingclient.product
+++ b/org.adempiere.ui.swing-feature/swingclient.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Adempiere Swing Client" uid="org.adempiere.ui.swing.product" id="org.adempiere.ui.swing.client_product" application="org.adempiere.ui.swing.client" version="5.1.0" useFeatures="true" includeLaunchers="true">
+<product name="Adempiere Swing Client" uid="org.adempiere.ui.swing.product" id="org.adempiere.ui.swing.client_product" application="org.adempiere.ui.swing.client" version="6.1.0" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -28,10 +28,10 @@
    </plugins>
 
    <features>
-      <feature id="org.adempiere.base.feature" version="5.1.0.qualifier"/>
-      <feature id="org.adempiere.pipo.feature" version="5.1.0.qualifier"/>
-      <feature id="org.adempiere.ui.swing.feature" version="5.1.0.qualifier"/>
-      <feature id="org.idempiere.hazelcast.service.feature" version="5.1.0.qualifier"/>
+      <feature id="org.adempiere.base.feature" version="6.1.0.qualifier"/>
+      <feature id="org.adempiere.pipo.feature" version="6.1.0.qualifier"/>
+      <feature id="org.adempiere.ui.swing.feature" version="6.1.0.qualifier"/>
+      <feature id="org.idempiere.hazelcast.service.feature" version="6.1.0.qualifier"/>
    </features>
 
    <configurations>
diff --git a/org.adempiere.ui.swing-feature/swingclient.product.launch b/org.adempiere.ui.swing-feature/swingclient.product.launch
index cbe72f64bc..29a6652993 100644
--- a/org.adempiere.ui.swing-feature/swingclient.product.launch
+++ b/org.adempiere.ui.swing-feature/swingclient.product.launch
@@ -1,34 +1,39 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.adempiere.ui.swing.client"/>
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="true"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/swingclient.product"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="includeOptional" value="false"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-swingclient.product"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal&#10;-Dsun.awt.disablegrab=true -Dosgi.compatibility.bootdelegation=true"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.adempiere.ui.swing.client_product"/>
-<stringAttribute key="productFile" value="/org.adempiere.ui.swing-feature/swingclient.product"/>
-<stringAttribute key="selected_target_plugins" value="bcprov@default:default,com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,com.jaspersoft.studio.bundles.poi@default:default,com.sun.mail.javax.mail@default:default,groovy-all@default:default,javax.activation@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml.stream@default:default,javax.xml@default:default,joda-time@default:default,net.sf.jasperreports.engine@default:default,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.scr@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.servicemix.bundles.xmlbeans@default:default,org.apache.xalan@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.cryptacular@default:default,org.dom4j@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.alpn.fragment@default:false,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@3:true,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.jfree.chart-osgi@default:default,org.jfree.jcommon-osgi@default:default,org.junit@default:default,org.krysalis.barcode4j@default:default,org.passay@default:default,org.restlet.ext.servlet@default:default,org.restlet@default:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,org.tukaani.xz@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:default,org.adempiere.pipo@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:false,org.adempiere.report.jasper.swing@default:default,org.adempiere.report.jasper@default:default,org.adempiere.ui.swing@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:false"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-<booleanAttribute key="usefeatures" value="false"/>
+    <booleanAttribute key="append.args" value="true"/>
+    <stringAttribute key="application" value="org.adempiere.server.application"/>
+    <booleanAttribute key="askclear" value="true"/>
+    <booleanAttribute key="automaticAdd" value="false"/>
+    <booleanAttribute key="automaticValidate" value="true"/>
+    <stringAttribute key="bootstrap" value=""/>
+    <stringAttribute key="checked" value="[NONE]"/>
+    <booleanAttribute key="clearConfig" value="true"/>
+    <booleanAttribute key="clearws" value="false"/>
+    <booleanAttribute key="clearwslog" value="false"/>
+    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/swingclient.product"/>
+    <booleanAttribute key="default" value="false"/>
+    <booleanAttribute key="includeOptional" value="false"/>
+    <stringAttribute key="location" value="${workspace_loc}/../runtime-swingclient.product"/>
+    <mapAttribute key="org.eclipse.debug.core.environmentVariables">
+        <mapEntry key="J2D_UISCALE" value="1"/>
+    </mapAttribute>
+    <stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.pde.ui.launcher.PDESourceLookupDirector"/>
+    <stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;sourceLookupDirector&gt;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;classpathContainer path=&amp;quot;org.eclipse.jdt.launching.JRE_CONTAINER&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.classpathContainer&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;default/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#10;&lt;/sourceContainers&gt;&#10;&lt;/sourceLookupDirector&gt;&#10;"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal&#10;-Dsun.awt.disablegrab=true -Dosgi.compatibility.bootdelegation=true"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
+    <stringAttribute key="pde.version" value="3.3"/>
+    <stringAttribute key="product" value="org.adempiere.ui.swing.client_product"/>
+    <stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
+    <stringAttribute key="selected_target_plugins" value="bcmail@default:default,bcpkix@default:default,bcprov@default:default,bctsp@default:default,com.fasterxml.jackson.core.jackson-annotations*2.9.5@default:default,com.fasterxml.jackson.core.jackson-core*2.9.5@default:default,com.fasterxml.jackson.core.jackson-databind*2.9.5@default:default,com.fasterxml.jackson.dataformat.jackson-dataformat-xml@default:default,com.fasterxml.jackson.datatype.jackson-datatype-guava*2.9.5@default:default,com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default,com.fasterxml.jackson.datatype.jackson-datatype-json-org@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-base*2.9.5@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider*2.9.5@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-xml-provider@default:default,com.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default,com.fasterxml.jackson.module.jackson-module-jsonSchema@default:default,com.fasterxml.woodstox.woodstox-core@default:default,com.google.guava*21.0.0.v20170206-1425@default:default,com.google.zxing.core@default:default,com.ibm.icu*63.1.0@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,com.jaspersoft.studio.bundles.itext@default:default,com.sun.mail.javax.mail@default:default,groovy-console@default:false,groovy-datetime@default:false,groovy-jmx@default:false,groovy-json@default:false,groovy-jsr223@default:false,groovy-nio@default:false,groovy-servlet@default:false,groovy-sql@default:false,groovy-swing@default:false,groovy-xml@default:false,groovy@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.enterprise.cdi-api@default:default,javax.inject@default:default,javax.interceptor-api@default:default,javax.jms@default:default,javax.jws-api@default:default,javax.jws@default:default,javax.persistence@default:default,javax.transaction-api@default:default,javax.transaction@default:false,javax.validation.api@default:default,javax.websocket-api@default:default,javax.ws.rs-api@default:default,javax.ws.rs@default:default,javax.wsdl@default:default,javax.xml.rpc@default:default,javax.xml.soap-api@default:default,javax.xml.soap@default:default,javax.xml.stream@default:default,javax.xml@default:default,jaxb-api@default:default,jaxws-api@default:default,joda-time@default:default,json@default:default,net.sf.jasperreports.engine@default:default,net.sf.supercsv.super-csv@default:default,org.antlr.runtime*4.5.1.v20160210-1233@default:default,org.aopalliance@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant*1.10.5.v20180808-0324@default:default,org.apache.aries.spifly.dynamic.bundle@default:true,org.apache.aries.util@default:default,org.apache.axis@default:default,org.apache.batik.anim@default:default,org.apache.batik.bridge@default:default,org.apache.batik.codec@default:default,org.apache.batik.constants*1.10.0.v20180703-1553@default:default,org.apache.batik.css*1.10.0.v20180703-1553@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.extension@default:default,org.apache.batik.gvt@default:default,org.apache.batik.i18n*1.10.0.v20180703-1553@default:default,org.apache.batik.parser@default:default,org.apache.batik.pdf@default:default,org.apache.batik.script@default:default,org.apache.batik.svggen@default:default,org.apache.batik.swing@default:default,org.apache.batik.transcoder@default:default,org.apache.batik.util*1.10.0.v20180703-1553@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.xml@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec*1.10.0.v20180409-1845@default:default,org.apache.commons.collections@default:default,org.apache.commons.commons-collections4@default:default,org.apache.commons.commons-configuration2@default:default,org.apache.commons.digester@default:default,org.apache.commons.discovery*0.5.0@default:default,org.apache.commons.fileupload*1.3.2.v20170320-2229@default:default,org.apache.commons.io@default:default,org.apache.commons.lang3@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,org.apache.commons.net@default:default,org.apache.cxf.cxf-core@default:default,org.apache.cxf.cxf-rt-bindings-soap@default:default,org.apache.cxf.cxf-rt-bindings-xml@default:default,org.apache.cxf.cxf-rt-databinding-jaxb@default:default,org.apache.cxf.cxf-rt-databinding-xmlbeans@default:default,org.apache.cxf.cxf-rt-frontend-jaxrs@default:default,org.apache.cxf.cxf-rt-frontend-jaxws@default:default,org.apache.cxf.cxf-rt-frontend-simple@default:default,org.apache.cxf.cxf-rt-rs-extension-providers@default:default,org.apache.cxf.cxf-rt-rs-service-description@default:default,org.apache.cxf.cxf-rt-transports-http-jetty@default:default,org.apache.cxf.cxf-rt-transports-http@default:default,org.apache.cxf.cxf-rt-ws-addr@default:default,org.apache.cxf.cxf-rt-ws-policy@default:default,org.apache.cxf.cxf-rt-wsdl@default:default,org.apache.felix.gogo.command*1.0.2.v20170914-1324@default:default,org.apache.felix.gogo.runtime*1.1.0.v20180713-1646@default:default,org.apache.felix.gogo.shell*1.1.0.v20180713-1646@default:default,org.apache.felix.scr@1:true,org.apache.felix.webconsole@default:true,org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default,org.apache.httpcomponents.httpclient*4.5.5.v20180409-1525@default:default,org.apache.httpcomponents.httpcore*4.4.9.v20180409-1525@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core*3.5.0.v20120725-1805@default:default,org.apache.neethi*3.1.1@default:default,org.apache.poi.poi-ooxml-schemas@default:default,org.apache.poi.poi-ooxml@default:default,org.apache.poi.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.servicemix.bundles.jaxen@default:default,org.apache.servicemix.bundles.rhino@default:default,org.apache.servicemix.bundles.spring-aop@default:default,org.apache.servicemix.bundles.spring-beans@default:default,org.apache.servicemix.bundles.spring-context-support@default:default,org.apache.servicemix.bundles.spring-context@default:default,org.apache.servicemix.bundles.spring-core@default:default,org.apache.servicemix.bundles.spring-expression@default:default,org.apache.servicemix.bundles.spring-web@default:default,org.apache.taglibs.standard-impl@default:default,org.apache.taglibs.standard-jstlel@default:default,org.apache.taglibs.taglibs-standard-spec@default:default,org.apache.ws.xmlschema.core@default:default,org.apache.xalan@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.apache.xmlbeans*3.0.1@default:default,org.apache.xmlgraphics*2.2.0.v20180809-1640@default:default,org.atmosphere.runtime@default:default,org.cryptacular@default:default,org.dom4j@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@default:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@2:true,org.eclipse.equinox.event@2:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:true,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.metatype@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jetty.alpn.api@default:true,org.eclipse.jetty.alpn.conscrypt.server@default:true,org.eclipse.jetty.alpn.server@default:true,org.eclipse.jetty.annotations@default:default,org.eclipse.jetty.apache-jsp@default:true,org.eclipse.jetty.client@default:default,org.eclipse.jetty.continuation*9.4.12.v20180830@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http*9.4.12.v20180830@default:true,org.eclipse.jetty.http2.common@default:true,org.eclipse.jetty.http2.hpack@default:true,org.eclipse.jetty.http2.server@default:true,org.eclipse.jetty.io*9.4.12.v20180830@default:default,org.eclipse.jetty.jaas@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.jndi@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.alpn.fragment@default:false,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.plus@default:default,org.eclipse.jetty.security*9.4.12.v20180830@default:default,org.eclipse.jetty.server*9.4.12.v20180830@default:default,org.eclipse.jetty.servlet*9.4.12.v20180830@default:default,org.eclipse.jetty.servlets@default:default,org.eclipse.jetty.util*9.4.12.v20180830@default:default,org.eclipse.jetty.util.ajax@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.javax.websocket.server@default:default,org.eclipse.jetty.websocket.javax.websocket@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi*3.13.100.v20180827-1536@-1:true,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services*3.7.100.v20180827-1536@default:default,org.eclipse.osgi.util*3.5.100.v20180827-1536@default:default,org.eclipse.text@default:default,org.glassfish.hk2.api@default:default,org.glassfish.hk2.locator@default:default,org.glassfish.hk2.osgi-resource-locator@default:default,org.glassfish.hk2.utils@default:default,org.glassfish.jersey.bundles.repackaged.jersey-guava@default:default,org.glassfish.jersey.core.jersey-common@default:default,org.hamcrest.core@default:default,org.idempiere.org.conscrypt.openjdk-uber@default:default,org.jfree.chart-osgi@default:default,org.jfree.jcommon-osgi@default:default,org.json@default:default,org.junit@default:default,org.krysalis.barcode4j@default:default,org.mortbay.jasper.apache-el@default:true,org.mortbay.jasper.apache-jsp@default:true,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.passay@default:default,org.restlet*2.3.2.v20150501-1520@default:true,org.restlet.ext.servlet*2.3.2.v20150501-1520@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.springframework.spring-jcl@default:default,org.tukaani.xz*1.8.0.v20180207-1613@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default,slf4j.api@default:default,slf4j.jcl@default:false,stax2-api*3.1.4@default:default,stax2-api*4.1.0@default:default,zcommon@default:default,zel@default:default,zhtml@default:default,zjavassist@default:default,zk@default:default,zkbind@default:default,zkplus@default:default,zul@default:default,zweb@default:default"/>
+    <stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:default,org.adempiere.pipo@default:true,org.adempiere.plugin.utils@default:default,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:false,org.adempiere.report.jasper.swing@default:default,org.adempiere.report.jasper@default:default,org.adempiere.ui.swing@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:default,org.idempiere.webservices@default:default"/>
+    <booleanAttribute key="show_selected_only" value="false"/>
+    <booleanAttribute key="tracing" value="false"/>
+    <booleanAttribute key="useCustomFeatures" value="false"/>
+    <booleanAttribute key="useDefaultConfig" value="true"/>
+    <booleanAttribute key="useDefaultConfigArea" value="true"/>
+    <booleanAttribute key="useProduct" value="true"/>
+    <booleanAttribute key="usefeatures" value="false"/>
 </launchConfiguration>
diff --git a/org.adempiere.ui.swing/.classpath b/org.adempiere.ui.swing/.classpath
index 7d89b418e8..83e1df1e99 100644
--- a/org.adempiere.ui.swing/.classpath
+++ b/org.adempiere.ui.swing/.classpath
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+			<attribute name="add-exports" value="java.desktop/sun.awt=ALL-UNNAMED"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry exported="true" kind="lib" path="lib/jpedal.jar"/>
diff --git a/org.adempiere.ui.swing/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.ui.swing/.settings/org.eclipse.jdt.core.prefs
index a8ab4a708b..05b5a63067 100644
--- a/org.adempiere.ui.swing/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.ui.swing/.settings/org.eclipse.jdt.core.prefs
@@ -9,11 +9,8 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.APILeak=warning
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
 org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
 org.eclipse.jdt.core.compiler.problem.deadCode=warning
@@ -22,7 +19,6 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
@@ -103,4 +99,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.adempiere.ui.swing/META-INF/MANIFEST.MF b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
index b5b3a0ffa0..542cf8fec6 100644
--- a/org.adempiere.ui.swing/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Swing Client
 Bundle-SymbolicName: org.adempiere.ui.swing;singleton:=true
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.1.0.qualifier
 Bundle-ClassPath: .,
  lib/jpedal.jar,
  lib/looks.jar,
@@ -72,12 +72,44 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  org.adempiere.ui;bundle-version="0.0.0",
  org.restlet;bundle-version="0.0.0",
  org.restlet.ext.servlet;bundle-version="0.0.0",
- groovy-all;bundle-version="0.0.0",
  org.jfree.chart-osgi;bundle-version="1.0.19"
 Eclipse-ExtensibleAPI: true
 Eclipse-RegisterBuddy: org.adempiere.base
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: javax.net.ssl,
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
+Import-Package: groovy.beans;version="2.5.3",
+ groovy.cli;version="2.5.3",
+ groovy.grape;version="2.5.3",
+ groovy.inspect;version="2.5.3",
+ groovy.inspect.swingui;version="2.5.3",
+ groovy.io;version="2.5.3",
+ groovy.jmx.builder;version="2.5.3",
+ groovy.json;version="2.5.3",
+ groovy.lang;version="2.5.3",
+ groovy.model;version="2.5.3",
+ groovy.security;version="2.5.3",
+ groovy.servlet;version="2.5.3",
+ groovy.sql;version="2.5.3",
+ groovy.swing;version="2.5.3",
+ groovy.swing.binding;version="2.5.3",
+ groovy.swing.factory;version="2.5.3",
+ groovy.swing.impl;version="2.5.3",
+ groovy.time;version="2.5.3",
+ groovy.transform;version="2.5.3",
+ groovy.transform.builder;version="2.5.3",
+ groovy.transform.options;version="2.5.3",
+ groovy.transform.stc;version="2.5.3",
+ groovy.ui;version="2.5.3",
+ groovy.ui.icons;version="2.5.3",
+ groovy.ui.text;version="2.5.3",
+ groovy.ui.view;version="2.5.3",
+ groovy.util;version="2.5.3",
+ groovy.util.logging;version="2.5.3",
+ groovy.util.slurpersupport;version="2.5.3",
+ groovy.xml;version="2.5.3",
+ groovy.xml.dom;version="2.5.3",
+ groovy.xml.jaxb;version="2.5.3",
+ groovy.xml.streamingmarkupsupport;version="2.5.3",
+ javax.net.ssl,
  net.sf.jasperreports.engine,
  org.apache.ecs,
  org.apache.ecs.xhtml,
@@ -90,3 +122,4 @@ Import-Package: javax.net.ssl,
 Service-Component: OSGI-INF/*.xml
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.adempiere.ui.swing
+Bundle-Vendor: iDempiere Community
diff --git a/org.adempiere.ui.swing/copyjars.xml b/org.adempiere.ui.swing/copyjars.xml
index 6dc511a3a5..f1072cf5be 100644
--- a/org.adempiere.ui.swing/copyjars.xml
+++ b/org.adempiere.ui.swing/copyjars.xml
@@ -5,6 +5,6 @@
         <get src="${url.maven2}/com/jgoodies/looks/2.0.4/looks-2.0.4.jar" dest="lib/looks.jar" usetimestamp="true" verbose="true" retries="5" />
         <!-- old version is only for swing, but can't find out old version, so use jar for Swing, SWT and JavaFX to keep same version -->
         <get src="${url.maven2}/com/miglayout/miglayout/3.7.1/miglayout-3.7.1.jar" dest="lib/miglayout.jar" usetimestamp="true" verbose="true" retries="5" />
-        <get src="${url.file.srv}/jarfile/5.1/jpedal.jar" dest="lib/jpedal.jar" usetimestamp="true" verbose="true" retries="5" />
+        <get src="${url.file.srv}/jarfile/6.1/jpedal.jar" dest="lib/jpedal.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>
diff --git a/org.adempiere.ui.swing/pom.xml b/org.adempiere.ui.swing/pom.xml
index e67a3516d3..179214d205 100644
--- a/org.adempiere.ui.swing/pom.xml
+++ b/org.adempiere.ui.swing/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.ui.swing</artifactId>
@@ -16,8 +16,12 @@
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-compiler-plugin</artifactId>
 				<configuration>
-					<!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=367431 -->
-					<compilerArgument>-warn:+forbidden</compilerArgument>
+					<compilerArgs>
+						<!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=367431 -->
+						<arg>-warn:+forbidden</arg>
+		      			<arg>--add-exports</arg>
+		      			<arg>java.desktop/sun.awt=ALL-UNNAMED</arg>
+					</compilerArgs>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -65,7 +69,7 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>${url.file.srv}/jarfile/5.1/jpedal.jar</url>
+							<url>${url.file.srv}/jarfile/6.1/jpedal.jar</url>
 							<unpack>false</unpack>
 							<outputDirectory>lib</outputDirectory>
 							<retries>5</retries>
diff --git a/org.adempiere.ui.swing/src/org/adempiere/apps/graph/PerformanceIndicator.java b/org.adempiere.ui.swing/src/org/adempiere/apps/graph/PerformanceIndicator.java
index 8760be95f7..eb7d8b2161 100644
--- a/org.adempiere.ui.swing/src/org/adempiere/apps/graph/PerformanceIndicator.java
+++ b/org.adempiere.ui.swing/src/org/adempiere/apps/graph/PerformanceIndicator.java
@@ -301,7 +301,7 @@ public class PerformanceIndicator extends JPanel
         	//	Lazily create the event:
         	if (e == null) 
         		e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED,
-        			"pi", event.getWhen(), event.getModifiers());
+        			"pi", event.getWhen(), event.getModifiersEx());
         	listeners[i].actionPerformed(e);
         }
     }	//	fireActionPerformed
diff --git a/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereButtonListener.java b/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereButtonListener.java
index c025962544..edee8a5f21 100644
--- a/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereButtonListener.java
+++ b/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereButtonListener.java
@@ -13,7 +13,7 @@
  *****************************************************************************/
 package org.adempiere.plaf;
 
-import java.awt.event.InputEvent;
+import java.awt.event.ActionEvent;
 import java.beans.PropertyChangeEvent;
 
 import javax.swing.AbstractButton;
@@ -83,10 +83,10 @@ public class AdempiereButtonListener extends BasicButtonListener
     	    }
     	    map.clear();
     	    String className = b.getClass().getName();
-    	    int mask = InputEvent.ALT_MASK;		//	Default Buttons
+    	    int mask = ActionEvent.ALT_MASK;		//	Default Buttons
     	    if (b instanceof JCheckBox 			//	In Tab
     	    	|| className.indexOf("VButton") != -1)
-    	    	mask = InputEvent.SHIFT_MASK + InputEvent.CTRL_MASK;
+    	    	mask = ActionEvent.SHIFT_MASK + ActionEvent.CTRL_MASK;
     	    map.put(KeyStroke.getKeyStroke(m, mask, false), "pressed");
     	    map.put(KeyStroke.getKeyStroke(m, mask, true), "released");
     	    map.put(KeyStroke.getKeyStroke(m, 0, true), "released");
diff --git a/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereComboPopup.java b/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereComboPopup.java
index 5e0cb7a7eb..c9f6e18802 100644
--- a/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereComboPopup.java
+++ b/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereComboPopup.java
@@ -40,7 +40,7 @@ public class AdempiereComboPopup extends BasicComboPopup
 	 *  Constructor
 	 *  @param combo
 	 */
-	public AdempiereComboPopup(JComboBox<?> combo)
+	public AdempiereComboPopup(JComboBox<Object> combo)
 	{
 		super(combo);
 	}   //  AdempiereComboPopup
diff --git a/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereTheme.java b/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereTheme.java
index 69fa7b41bb..d6135f0e71 100644
--- a/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereTheme.java
+++ b/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereTheme.java
@@ -405,8 +405,8 @@ public class AdempiereTheme extends com.jgoodies.looks.plastic.PlasticTheme {
                 "ScrollBar.thumbHighlight",
                 getPrimaryControlHighlight(),
                 PlasticScrollBarUI.MAX_BUMPS_WIDTH_KEY,
-                new Integer(22),
-                PlasticScrollBarUI.MAX_BUMPS_WIDTH_KEY, new Integer(30),
+                Integer.valueOf(22),
+                PlasticScrollBarUI.MAX_BUMPS_WIDTH_KEY, Integer.valueOf(30),
                 //"TabbedPane.selected", getWhite(),
                 "TabbedPane.selectHighlight",  new ColorUIResource(231, 218, 188),
                 ExtendedTheme.ERROR_BG_KEY,
diff --git a/org.adempiere.ui.swing/src/org/compiere/acct/AcctViewerData.java b/org.adempiere.ui.swing/src/org/compiere/acct/AcctViewerData.java
index 07fc957ff0..0d7826e0aa 100644
--- a/org.adempiere.ui.swing/src/org/compiere/acct/AcctViewerData.java
+++ b/org.adempiere.ui.swing/src/org/compiere/acct/AcctViewerData.java
@@ -209,7 +209,7 @@ class AcctViewerData
 				//
 				ValueNamePair pp = new ValueNamePair(tableName, name);
 				cb.addItem(pp);
-				tableInfo.put (tableName, new Integer(id));
+				tableInfo.put (tableName, Integer.valueOf(id));
 				if (id == AD_Table_ID)
 					select = pp;
 			}
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/ADialogDialog.java b/org.adempiere.ui.swing/src/org/compiere/apps/ADialogDialog.java
index 45e4f64844..0900121fc7 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/ADialogDialog.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/ADialogDialog.java
@@ -19,7 +19,6 @@ package org.compiere.apps;
 import java.awt.BorderLayout;
 import java.awt.Dialog;
 import java.awt.Dimension;
-import java.awt.Event;
 import java.awt.Frame;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -173,14 +172,14 @@ public final class ADialogDialog extends CDialog implements ActionListener
 		mPrintScreen.addActionListener(this);
 		mScreenShot.setIcon(Env.getImageIcon("ScreenShot16.gif"));
 		mScreenShot.setText(Msg.getMsg(Env.getCtx(), "ScreenShot"));
-		mScreenShot.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_PRINTSCREEN, Event.SHIFT_MASK));
+		mScreenShot.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_PRINTSCREEN, ActionEvent.SHIFT_MASK));
 		mScreenShot.addActionListener(this);
 		mPreference.setIcon(Env.getImageIcon("Preference16.gif"));
 		mPreference.setText(Msg.getMsg(Env.getCtx(), "Preference"));
 		mPreference.addActionListener(this);
 		mEnd.setIcon(Env.getImageIcon("End16.gif"));
 		mEnd.setText(Msg.getMsg(Env.getCtx(), "End"));
-		mEnd.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, Event.ALT_MASK));
+		mEnd.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, ActionEvent.ALT_MASK));
 		mEnd.addActionListener(this);
 		//
 		westPanel.setLayout(westLayout);
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/AMenu.java b/org.adempiere.ui.swing/src/org/compiere/apps/AMenu.java
index f34b624254..62934fb15a 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/AMenu.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/AMenu.java
@@ -19,7 +19,6 @@ package org.compiere.apps;
 import java.awt.BorderLayout;
 import java.awt.Cursor;
 import java.awt.Dimension;
-import java.awt.Event;
 import java.awt.Frame;
 import java.awt.GridLayout;
 import java.awt.Insets;
@@ -427,10 +426,10 @@ public final class AMenu extends CFrame
 		JMenu mFile = AEnv.getMenu("File");
 		menuBar.add(mFile);
 		AEnv.addMenuItem("PrintScreen", null, KeyStroke.getKeyStroke(KeyEvent.VK_PRINTSCREEN, 0), mFile, this);
-		AEnv.addMenuItem("ScreenShot", null, KeyStroke.getKeyStroke(KeyEvent.VK_PRINTSCREEN, KeyEvent.SHIFT_MASK), mFile, this);
+		AEnv.addMenuItem("ScreenShot", null, KeyStroke.getKeyStroke(KeyEvent.VK_PRINTSCREEN, ActionEvent.SHIFT_MASK), mFile, this);
 		mFile.addSeparator();
-		AEnv.addMenuItem("Logout", null, KeyStroke.getKeyStroke(KeyEvent.VK_L, Event.SHIFT_MASK+Event.ALT_MASK), mFile, this);
-		AEnv.addMenuItem("Exit", null, KeyStroke.getKeyStroke(KeyEvent.VK_X, Event.SHIFT_MASK+Event.ALT_MASK), mFile, this);
+		AEnv.addMenuItem("Logout", null, KeyStroke.getKeyStroke(KeyEvent.VK_L, ActionEvent.SHIFT_MASK + ActionEvent.ALT_MASK), mFile, this);
+		AEnv.addMenuItem("Exit", null, KeyStroke.getKeyStroke(KeyEvent.VK_X, ActionEvent.SHIFT_MASK+ActionEvent.ALT_MASK), mFile, this);
 
 		//      View
 		JMenu mView = AEnv.getMenu("View");
@@ -438,15 +437,15 @@ public final class AMenu extends CFrame
 		
 		if (MRole.getDefault().isAllow_Info_Product())
 		{
-			AEnv.addMenuItem("InfoProduct", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, Event.ALT_MASK), mView, this);			
+			AEnv.addMenuItem("InfoProduct", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, ActionEvent.ALT_MASK), mView, this);			
 		}
 		if (MRole.getDefault().isAllow_Info_BPartner())
 		{
-			AEnv.addMenuItem("InfoBPartner", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, Event.ALT_MASK+Event.CTRL_MASK), mView, this);
+			AEnv.addMenuItem("InfoBPartner", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, ActionEvent.ALT_MASK+ActionEvent.CTRL_MASK), mView, this);
 		}
 		if (MRole.getDefault().isShowAcct() && MRole.getDefault().isAllow_Info_Account())
 		{
-			AEnv.addMenuItem("InfoAccount", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, Event.ALT_MASK+Event.CTRL_MASK), mView, this);
+			AEnv.addMenuItem("InfoAccount", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, ActionEvent.ALT_MASK+ActionEvent.CTRL_MASK), mView, this);
 		}
 		if (MRole.getDefault().isAllow_Info_Schedule())
 		{
@@ -511,7 +510,7 @@ public final class AMenu extends CFrame
 		//Window Menu
 		m_WindowMenu = new WindowMenu(windowManager, this);
 		menuBar.add(m_WindowMenu);
-		KeyStroke ks = KeyStroke.getKeyStroke(KeyEvent.VK_W, KeyEvent.CTRL_MASK);
+		KeyStroke ks = KeyStroke.getKeyStroke(KeyEvent.VK_W, ActionEvent.CTRL_MASK);
 		this.getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(ks, "ShowAllWindow");
 		AppsAction action = new AppsAction("ShowAllWindow", ks, false);
 		this.getRootPane().getActionMap().put("ShowAllWindow", action);
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/APanel.java b/org.adempiere.ui.swing/src/org/compiere/apps/APanel.java
index 81517a24c0..a73a42c411 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/APanel.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/APanel.java
@@ -28,13 +28,11 @@ import java.awt.Color;
 import java.awt.Component;
 import java.awt.Cursor;
 import java.awt.Dimension;
-import java.awt.Event;
 import java.awt.FlowLayout;
 import java.awt.Image;
 import java.awt.Point;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.io.File;
 import java.sql.PreparedStatement;
@@ -44,6 +42,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.TreeMap;
@@ -357,28 +356,28 @@ public final class APanel extends CPanel
 		JMenu mFile = AEnv.getMenu("File");
 		menuBar.add(mFile);
 		aPrintScr =	addAction("PrintScreen",	mFile,	KeyStroke.getKeyStroke(KeyEvent.VK_PRINTSCREEN, 0), 	false);
-		aScrShot =	addAction("ScreenShot",		mFile,	KeyStroke.getKeyStroke(KeyEvent.VK_PRINTSCREEN, Event.SHIFT_MASK), 	false);
+		aScrShot =	addAction("ScreenShot",		mFile,	KeyStroke.getKeyStroke(KeyEvent.VK_PRINTSCREEN, ActionEvent.SHIFT_MASK), 	false);
 		aReport = 	addAction("Report",			mFile, 	KeyStroke.getKeyStroke(KeyEvent.VK_F11, 0),	false);
 		aPrint = 	addAction("Print",			mFile, 	KeyStroke.getKeyStroke(KeyEvent.VK_F12, 0),	false);
-		aPrintPreview = addAction("PrintPreview",	mFile, KeyStroke.getKeyStroke(KeyEvent.VK_P, Event.SHIFT_MASK+Event.ALT_MASK), false);
+		aPrintPreview = addAction("PrintPreview",	mFile, KeyStroke.getKeyStroke(KeyEvent.VK_P, ActionEvent.SHIFT_MASK+ActionEvent.ALT_MASK), false);
 		if (MRole.getDefault().isCanExport())
 		{
 			aExport = addAction("Export", mFile, null, false);
 		}
 		mFile.addSeparator();
-		aEnd =	 	addAction("End",			mFile, 	KeyStroke.getKeyStroke(KeyEvent.VK_X, Event.ALT_MASK),	false);
-		aLogout = 	addAction("Logout", 		mFile, 	KeyStroke.getKeyStroke(KeyEvent.VK_L, Event.SHIFT_MASK+Event.ALT_MASK), false);
-		aExit =		addAction("Exit",			mFile, 	KeyStroke.getKeyStroke(KeyEvent.VK_X, Event.SHIFT_MASK+Event.ALT_MASK),	false);
+		aEnd =	 	addAction("End",			mFile, 	KeyStroke.getKeyStroke(KeyEvent.VK_X, ActionEvent.ALT_MASK),	false);
+		aLogout = 	addAction("Logout", 		mFile, 	KeyStroke.getKeyStroke(KeyEvent.VK_L, ActionEvent.SHIFT_MASK+ActionEvent.ALT_MASK), false);
+		aExit =		addAction("Exit",			mFile, 	KeyStroke.getKeyStroke(KeyEvent.VK_X, ActionEvent.SHIFT_MASK+ActionEvent.ALT_MASK),	false);
 		//								Edit
 		JMenu mEdit = AEnv.getMenu("Edit");
 		menuBar.add(mEdit);
 		aNew = 		addAction("New", 			mEdit, 	KeyStroke.getKeyStroke(KeyEvent.VK_F2, 0), false);
 		aSave = 	addAction("Save",			mEdit, 	KeyStroke.getKeyStroke(KeyEvent.VK_F4, 0),	false);
-		aSaveAndCreate = addAction("SaveCreate", mEdit, KeyStroke.getKeyStroke(KeyEvent.VK_Q, KeyEvent.CTRL_MASK), false);
+		aSaveAndCreate = addAction("SaveCreate", mEdit, KeyStroke.getKeyStroke(KeyEvent.VK_Q, ActionEvent.CTRL_MASK), false);
 		mEdit.addSeparator();
-		aCopy =		addAction("Copy", 			mEdit, 	KeyStroke.getKeyStroke(KeyEvent.VK_F2, Event.SHIFT_MASK),	false);
+		aCopy =		addAction("Copy", 			mEdit, 	KeyStroke.getKeyStroke(KeyEvent.VK_F2, ActionEvent.SHIFT_MASK),	false);
 		aDelete = 	addAction("Delete",			mEdit, 	KeyStroke.getKeyStroke(KeyEvent.VK_F3, 0),	false);
-		aDeleteSelection = addAction("DeleteSelection", mEdit, KeyStroke.getKeyStroke(KeyEvent.VK_D, Event.CTRL_MASK), false);
+		aDeleteSelection = addAction("DeleteSelection", mEdit, KeyStroke.getKeyStroke(KeyEvent.VK_D, ActionEvent.CTRL_MASK), false);
 		aIgnore = 	addAction("Ignore",			mEdit, 	KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0),	false);
 		aRefresh = 	addAction("Refresh",		mEdit, 	KeyStroke.getKeyStroke(KeyEvent.VK_F5, 0),	false);
 		mEdit.addSeparator();
@@ -390,15 +389,15 @@ public final class APanel extends CPanel
 		menuBar.add(mView);
 		if (MRole.getDefault().isAllow_Info_Product())
 		{
-			aProduct =	addAction("InfoProduct",	mView, 	KeyStroke.getKeyStroke(KeyEvent.VK_I, Event.ALT_MASK),	false);
+			aProduct =	addAction("InfoProduct",	mView, 	KeyStroke.getKeyStroke(KeyEvent.VK_I, ActionEvent.ALT_MASK),	false);
 		}
 		if (MRole.getDefault().isAllow_Info_BPartner())
 		{
-			aBPartner =	addAction("InfoBPartner",	mView, 	KeyStroke.getKeyStroke(KeyEvent.VK_I, Event.SHIFT_MASK+Event.ALT_MASK),	false);
+			aBPartner =	addAction("InfoBPartner",	mView, 	KeyStroke.getKeyStroke(KeyEvent.VK_I, ActionEvent.SHIFT_MASK+ActionEvent.ALT_MASK),	false);
 		}
 		if (MRole.getDefault().isShowAcct() && MRole.getDefault().isAllow_Info_Account())
 		{
-			aAccount =  addAction("InfoAccount",mView, 	KeyStroke.getKeyStroke(KeyEvent.VK_I, Event.ALT_MASK+Event.CTRL_MASK),	false);
+			aAccount =  addAction("InfoAccount",mView, 	KeyStroke.getKeyStroke(KeyEvent.VK_I, ActionEvent.ALT_MASK+ActionEvent.CTRL_MASK),	false);
 		}
 		if (MRole.getDefault().isAllow_Info_Schedule())
 		{
@@ -455,13 +454,13 @@ public final class APanel extends CPanel
 		//								Go
 		JMenu mGo = AEnv.getMenu("Go");
 		menuBar.add(mGo);
-		aFirst =	addAction("First", 			mGo, 	KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, Event.ALT_MASK),	false);
-		aPrevious = addAction("Previous", 		mGo, 	KeyStroke.getKeyStroke(KeyEvent.VK_UP, Event.ALT_MASK),	false);
-		aNext = 	addAction("Next", 			mGo, 	KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, Event.ALT_MASK),	false);
-		aLast =		addAction("Last",	 		mGo, 	KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_DOWN, Event.ALT_MASK),	false);
+		aFirst =	addAction("First", 			mGo, 	KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, ActionEvent.ALT_MASK),	false);
+		aPrevious = addAction("Previous", 		mGo, 	KeyStroke.getKeyStroke(KeyEvent.VK_UP, ActionEvent.ALT_MASK),	false);
+		aNext = 	addAction("Next", 			mGo, 	KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, ActionEvent.ALT_MASK),	false);
+		aLast =		addAction("Last",	 		mGo, 	KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_DOWN, ActionEvent.ALT_MASK),	false);
 		mGo.addSeparator();
-		aParent =	addAction("Parent", 		mGo, 	KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, Event.ALT_MASK),	false);
-		aDetail =	addAction("Detail", 		mGo,	KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, Event.ALT_MASK),	false);
+		aParent =	addAction("Parent", 		mGo, 	KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, ActionEvent.ALT_MASK),	false);
+		aDetail =	addAction("Detail", 		mGo,	KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, ActionEvent.ALT_MASK),	false);
 		mGo.addSeparator();
 		aZoomAcross = addAction("ZoomAcross",	mGo, 	null,	false);
 		aRequest =  addAction("Request",		mGo, 	null,	false);
@@ -490,7 +489,7 @@ public final class APanel extends CPanel
 		AMenu aMenu = (AMenu)AEnv.getWindow(0);
 		m_WindowMenu = new WindowMenu(aMenu.getWindowManager(), m_window);
 		menuBar.add(m_WindowMenu);
-		aShowAllWindow = addAction("ShowAllWindow", null, KeyStroke.getKeyStroke(KeyEvent.VK_W, KeyEvent.CTRL_MASK),	false);
+		aShowAllWindow = addAction("ShowAllWindow", null, KeyStroke.getKeyStroke(KeyEvent.VK_W, ActionEvent.CTRL_MASK),	false);
 
 		//								Help
 		JMenu mHelp = AEnv.getMenu("Help");
@@ -856,7 +855,7 @@ public final class APanel extends CPanel
 						//	Is this tab included?
 						if (includedMap.size() > 0)
 						{
-							GridController parent = (GridController)includedMap.get(new Integer(gTab.getAD_Tab_ID()));
+							GridController parent = (GridController)includedMap.get(Integer.valueOf(gTab.getAD_Tab_ID()));
 							if (parent != null)
 							{
 								// FR [ 1757088 ]
@@ -2042,10 +2041,10 @@ public final class APanel extends CPanel
 		if(okCancel != null && okCancel == JOptionPane.OK_OPTION)
 		{
 			log.fine("ok");
-			Object[] selectedValues = list.getSelectedValues();
-			for (int i = 0; i < selectedValues.length; i++)
+			List<Object> selectedValues = list.getSelectedValuesList();
+			for (int i = 0; i < selectedValues.size(); i++)
 			{
-				if (log.isLoggable(Level.FINE)) log.fine(selectedValues[i].toString());
+				if (log.isLoggable(Level.FINE)) log.fine(selectedValues.get(i).toString());
 			}
 			int[] indices = list.getSelectedIndices();
 			Arrays.sort(indices);
@@ -2333,7 +2332,7 @@ public final class APanel extends CPanel
 		{
 			if (queryColumn.endsWith("_ID"))
 				query.addRestriction(queryColumn, MQuery.EQUAL,
-					new Integer(Env.getContextAsInt(m_ctx, m_curWindowNo, queryColumn)),
+					Integer.valueOf(Env.getContextAsInt(m_ctx, m_curWindowNo, queryColumn)),
 					infoName, infoDisplay);
 			else
 				query.addRestriction(queryColumn, MQuery.EQUAL,
@@ -2366,7 +2365,7 @@ public final class APanel extends CPanel
 		{
 			if (link.endsWith("_ID"))
 				query.addRestriction(link, MQuery.EQUAL,
-					new Integer(Env.getContextAsInt(m_ctx, m_curWindowNo, link)));
+					Integer.valueOf(Env.getContextAsInt(m_ctx, m_curWindowNo, link)));
 			else
 				query.addRestriction(link, MQuery.EQUAL,
 					Env.getContext(m_ctx, m_curWindowNo, link));
@@ -2540,7 +2539,7 @@ public final class APanel extends CPanel
 		if (record_ID == -1)	//	No Key
 			return;
 		//	Control Pressed
-		if ((m_lastModifiers & InputEvent.CTRL_MASK) != 0)
+		if ((m_lastModifiers & ActionEvent.CTRL_MASK) != 0)
 		{
 			new RecordAccessDialog(AEnv.getFrame(this), m_curTab.getAD_Table_ID(), record_ID);
 		}
@@ -3072,26 +3071,26 @@ public final class APanel extends CPanel
 	 */
 	private void initSwitchLineAction() {
 		aSwitchLinesDownAction = new SwitchAction("switchLinesDown", KeyStroke.getKeyStroke(
-				KeyEvent.VK_DOWN, Event.SHIFT_MASK), this);
+				KeyEvent.VK_DOWN, ActionEvent.SHIFT_MASK), this);
 		aSwitchLinesUpAction = new SwitchAction("switchLinesUp", KeyStroke.getKeyStroke(
-				KeyEvent.VK_UP, Event.SHIFT_MASK), this);
+				KeyEvent.VK_UP, ActionEvent.SHIFT_MASK), this);
 
 		JTable table = m_curGC.getTable();
 		table.getInputMap(CPanel.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
-				KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, Event.SHIFT_MASK), "none");
+				KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, ActionEvent.SHIFT_MASK), "none");
 		table.getInputMap(CPanel.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
-				KeyStroke.getKeyStroke(KeyEvent.VK_UP, Event.SHIFT_MASK), "none");
+				KeyStroke.getKeyStroke(KeyEvent.VK_UP, ActionEvent.SHIFT_MASK), "none");
 		table.getInputMap(CPanel.WHEN_FOCUSED).put(
-				KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, Event.SHIFT_MASK), "none");
+				KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, ActionEvent.SHIFT_MASK), "none");
 		table.getInputMap(CPanel.WHEN_FOCUSED).put(
-				KeyStroke.getKeyStroke(KeyEvent.VK_UP, Event.SHIFT_MASK), "none");
+				KeyStroke.getKeyStroke(KeyEvent.VK_UP, ActionEvent.SHIFT_MASK), "none");
 
 		getInputMap(CPanel.WHEN_IN_FOCUSED_WINDOW).put(
-				KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, Event.SHIFT_MASK),
+				KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, ActionEvent.SHIFT_MASK),
 				aSwitchLinesDownAction.getName());
 		getActionMap().put(aSwitchLinesDownAction.getName(), aSwitchLinesDownAction);
 		getInputMap(CPanel.WHEN_IN_FOCUSED_WINDOW).put(
-				KeyStroke.getKeyStroke(KeyEvent.VK_UP, Event.SHIFT_MASK),
+				KeyStroke.getKeyStroke(KeyEvent.VK_UP, ActionEvent.SHIFT_MASK),
 				aSwitchLinesUpAction.getName());
 		getActionMap().put(aSwitchLinesUpAction.getName(), aSwitchLinesUpAction);
 	}
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/ARequest.java b/org.adempiere.ui.swing/src/org/compiere/apps/ARequest.java
index a19a232bee..65a1c01faf 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/ARequest.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/ARequest.java
@@ -220,47 +220,47 @@ public class ARequest implements ActionListener
 		{
 			GridTab tab = frame.getAPanel().getCurrentTab();
 			tab.dataNew (false);
-			tab.setValue("AD_Table_ID", new Integer(m_AD_Table_ID));
-			tab.setValue("Record_ID", new Integer(m_Record_ID));
+			tab.setValue("AD_Table_ID", Integer.valueOf(m_AD_Table_ID));
+			tab.setValue("Record_ID", Integer.valueOf(m_Record_ID));
 			//
 			if (m_C_BPartner_ID != 0)
-				tab.setValue("C_BPartner_ID", new Integer(m_C_BPartner_ID));
+				tab.setValue("C_BPartner_ID", Integer.valueOf(m_C_BPartner_ID));
 			//
 			if (m_AD_Table_ID == MBPartner.Table_ID)
-				tab.setValue("C_BPartner_ID", new Integer(m_Record_ID));
+				tab.setValue("C_BPartner_ID", Integer.valueOf(m_Record_ID));
 			else if (m_AD_Table_ID == MUser.Table_ID)
-				tab.setValue("AD_User_ID", new Integer(m_Record_ID));
+				tab.setValue("AD_User_ID", Integer.valueOf(m_Record_ID));
 			//
 			else if (m_AD_Table_ID == MProject.Table_ID)
-				tab.setValue("C_Project_ID", new Integer(m_Record_ID));
+				tab.setValue("C_Project_ID", Integer.valueOf(m_Record_ID));
 			else if (m_AD_Table_ID == MAsset.Table_ID)
-				tab.setValue("A_Asset_ID", new Integer(m_Record_ID));
+				tab.setValue("A_Asset_ID", Integer.valueOf(m_Record_ID));
 			//
 			else if (m_AD_Table_ID == MOrder.Table_ID)
-				tab.setValue("C_Order_ID", new Integer(m_Record_ID));
+				tab.setValue("C_Order_ID", Integer.valueOf(m_Record_ID));
 			else if (m_AD_Table_ID == MInvoice.Table_ID)
-				tab.setValue("C_Invoice_ID", new Integer(m_Record_ID));
+				tab.setValue("C_Invoice_ID", Integer.valueOf(m_Record_ID));
 			//
 			else if (m_AD_Table_ID == MProduct.Table_ID)
-				tab.setValue("M_Product_ID", new Integer(m_Record_ID));
+				tab.setValue("M_Product_ID", Integer.valueOf(m_Record_ID));
 			else if (m_AD_Table_ID == MPayment.Table_ID)
-				tab.setValue("C_Payment_ID", new Integer(m_Record_ID));
+				tab.setValue("C_Payment_ID", Integer.valueOf(m_Record_ID));
 			//
 			else if (m_AD_Table_ID == MInOut.Table_ID)
-				tab.setValue("M_InOut_ID", new Integer(m_Record_ID));
+				tab.setValue("M_InOut_ID", Integer.valueOf(m_Record_ID));
 			else if (m_AD_Table_ID == MRMA.Table_ID)
-				tab.setValue("M_RMA_ID", new Integer(m_Record_ID));
+				tab.setValue("M_RMA_ID", Integer.valueOf(m_Record_ID));
 			//
 			else if (m_AD_Table_ID == MCampaign.Table_ID)
-				tab.setValue("C_Campaign_ID", new Integer(m_Record_ID));
+				tab.setValue("C_Campaign_ID", Integer.valueOf(m_Record_ID));
 			//
 			else if (m_AD_Table_ID == MRequest.Table_ID)
-				tab.setValue(MRequest.COLUMNNAME_R_RequestRelated_ID, new Integer(m_Record_ID));
+				tab.setValue(MRequest.COLUMNNAME_R_RequestRelated_ID, Integer.valueOf(m_Record_ID));
 			// FR [2842165] - Order Ref link from SO line creating new request
 			else if (m_AD_Table_ID == MOrderLine.Table_ID) {
 				MOrderLine oLine = new MOrderLine(Env.getCtx(), m_Record_ID, null);
 				if (oLine != null) {
-					tab.setValue(MOrderLine.COLUMNNAME_C_Order_ID, new Integer(oLine.getC_Order_ID()));
+					tab.setValue(MOrderLine.COLUMNNAME_C_Order_ID, Integer.valueOf(oLine.getC_Order_ID()));
 				}
 			}
 		}
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/AppsAction.java b/org.adempiere.ui.swing/src/org/compiere/apps/AppsAction.java
index 3cb2fb48d8..935aae5aaf 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/AppsAction.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/AppsAction.java
@@ -97,11 +97,11 @@ public final class AppsAction extends AbstractAction
 		int pos = toolTipText.indexOf('&');
 		if (pos != -1  && toolTipText.length() > pos)	//	We have a nemonic - creates ALT-_
 		{
-			Character ch = new Character(toolTipText.toUpperCase().charAt(pos+1));
+			Character ch = Character.valueOf(toolTipText.toUpperCase().charAt(pos+1));
 			if (ch != ' ')
 			{
 				toolTipText = toolTipText.substring(0, pos) + toolTipText.substring(pos+1);
-				putValue(Action.MNEMONIC_KEY, new Integer(ch.hashCode()));
+				putValue(Action.MNEMONIC_KEY, Integer.valueOf(ch.hashCode()));
 			}
 		}
 		//
@@ -126,7 +126,7 @@ public final class AppsAction extends AbstractAction
 		putValue(Action.SHORT_DESCRIPTION, toolTipText);	//	Tooltip
 		putValue(Action.ACTION_COMMAND_KEY, m_action);      //  ActionCammand
 		putValue(Action.ACCELERATOR_KEY, accelerator);      //  KeyStroke
-	//	putValue(Action.MNEMONIC_KEY, new Integer(0));      //  Mnemonic
+	//	putValue(Action.MNEMONIC_KEY, Integer.valueOf(0));      //  Mnemonic
 	//	putValue(Action.DEFAULT, text);						//	Not Used
 
 		//	Create Button
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/ConfirmPanel.java b/org.adempiere.ui.swing/src/org/compiere/apps/ConfirmPanel.java
index 0d36c9fcb5..d46a86b3b3 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/ConfirmPanel.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/ConfirmPanel.java
@@ -20,6 +20,7 @@ import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.FlowLayout;
 import java.awt.Insets;
+import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 
@@ -242,7 +243,7 @@ public final class ConfirmPanel extends CPanel
 	public static final CButton createProcessButton (String text)
 	{
 		AppsAction aa = new AppsAction (A_PROCESS, 
-			KeyStroke.getKeyStroke(KeyEvent.VK_F4, KeyEvent.SHIFT_MASK), text);
+			KeyStroke.getKeyStroke(KeyEvent.VK_F4, ActionEvent.SHIFT_MASK), text);
 		CButton button = (CButton)aa.getButton();
 		button.setMargin(s_insets);
 		return button;
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/FieldRecordInfo.java b/org.adempiere.ui.swing/src/org/compiere/apps/FieldRecordInfo.java
index fb88a8dc26..d5723d555b 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/FieldRecordInfo.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/FieldRecordInfo.java
@@ -258,9 +258,9 @@ public class FieldRecordInfo extends CDialog
 			else if (column.getAD_Reference_ID() == DisplayType.Integer)
 			{
 				if (OldValue != null)
-					showOldValue = m_intFormat.format (new Integer (OldValue));
+					showOldValue = m_intFormat.format (Integer.valueOf(OldValue));
 				if (NewValue != null)
-					showNewValue = m_intFormat.format (new Integer (NewValue));
+					showNewValue = m_intFormat.format (Integer.valueOf(NewValue));
 			}
 			else if (DisplayType.isNumeric (column.getAD_Reference_ID ()))
 			{
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/OnlineHelp.java b/org.adempiere.ui.swing/src/org/compiere/apps/OnlineHelp.java
index 5bb445c93f..7d25c265c7 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/OnlineHelp.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/OnlineHelp.java
@@ -268,7 +268,7 @@ class Worker extends Thread
 			InputStream is = conn.getInputStream();
 			HTMLEditorKit kit = new HTMLEditorKit();
 			HTMLDocument doc = (HTMLDocument)kit.createDefaultDocument();
-			doc.putProperty("IgnoreCharsetDirective", new Boolean(true));
+			doc.putProperty("IgnoreCharsetDirective", Boolean.TRUE);
 			kit.read (new InputStreamReader(is), doc, 0);
 
 			//  Get The Links to the Help Pages
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/RecordInfo.java b/org.adempiere.ui.swing/src/org/compiere/apps/RecordInfo.java
index 2c9dab5aa5..1c8fbe26be 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/RecordInfo.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/RecordInfo.java
@@ -325,9 +325,9 @@ public class RecordInfo extends CDialog
 			else if (column.getAD_Reference_ID() == DisplayType.Integer)
 			{
 				if (OldValue != null)
-					showOldValue = m_intFormat.format (new Integer (OldValue));
+					showOldValue = m_intFormat.format (Integer.valueOf(OldValue));
 				if (NewValue != null)
-					showNewValue = m_intFormat.format (new Integer (NewValue));
+					showNewValue = m_intFormat.format (Integer.valueOf(NewValue));
 			}
 			else if (DisplayType.isNumeric (column.getAD_Reference_ID ()))
 			{
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/WindowMenu.java b/org.adempiere.ui.swing/src/org/compiere/apps/WindowMenu.java
index 9ec024000a..2134a701a7 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/WindowMenu.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/WindowMenu.java
@@ -134,7 +134,7 @@ public class WindowMenu extends JMenu {
             }
         });
         setEnvText(expose, "ShowAllWindow");
-        expose.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_W, KeyEvent.CTRL_MASK));
+        expose.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_W, ActionEvent.CTRL_MASK));
         setEnvText(closeOthers, "CloseOtherWindows");
         addMenuListener(new MenuListener() {
             public void menuCanceled (MenuEvent e) {}
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/form/FormFrame.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/FormFrame.java
index e575e7af81..c02715d626 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/form/FormFrame.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/form/FormFrame.java
@@ -17,7 +17,6 @@
 package org.compiere.apps.form;
 
 import java.awt.Cursor;
-import java.awt.Event;
 import java.awt.GraphicsConfiguration;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -148,11 +147,11 @@ public class FormFrame extends CFrame
 		JMenu mFile = AEnv.getMenu("File");
 		menuBar.add(mFile);
 		AEnv.addMenuItem("PrintScreen", null, KeyStroke.getKeyStroke(KeyEvent.VK_PRINTSCREEN, 0), mFile, this);
-		AEnv.addMenuItem("ScreenShot", null, KeyStroke.getKeyStroke(KeyEvent.VK_PRINTSCREEN, Event.SHIFT_MASK), mFile, this);
-		AEnv.addMenuItem("Report", null, KeyStroke.getKeyStroke(KeyEvent.VK_P, Event.ALT_MASK), mFile, this);
+		AEnv.addMenuItem("ScreenShot", null, KeyStroke.getKeyStroke(KeyEvent.VK_PRINTSCREEN, ActionEvent.SHIFT_MASK), mFile, this);
+		AEnv.addMenuItem("Report", null, KeyStroke.getKeyStroke(KeyEvent.VK_P, ActionEvent.ALT_MASK), mFile, this);
 		mFile.addSeparator();
-		AEnv.addMenuItem("End", null, KeyStroke.getKeyStroke(KeyEvent.VK_X, Event.ALT_MASK), mFile, this);
-		AEnv.addMenuItem("Exit", null, KeyStroke.getKeyStroke(KeyEvent.VK_X, Event.SHIFT_MASK+Event.ALT_MASK), mFile, this);
+		AEnv.addMenuItem("End", null, KeyStroke.getKeyStroke(KeyEvent.VK_X, ActionEvent.ALT_MASK), mFile, this);
+		AEnv.addMenuItem("Exit", null, KeyStroke.getKeyStroke(KeyEvent.VK_X, ActionEvent.SHIFT_MASK+ActionEvent.ALT_MASK), mFile, this);
 
 		//      View
 		JMenu mView = AEnv.getMenu("View");
@@ -160,15 +159,15 @@ public class FormFrame extends CFrame
 
 		if (MRole.getDefault().isAllow_Info_Product())
 		{
-			AEnv.addMenuItem("InfoProduct", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, Event.ALT_MASK), mView, this);
+			AEnv.addMenuItem("InfoProduct", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, ActionEvent.ALT_MASK), mView, this);
 		}
 		if (MRole.getDefault().isAllow_Info_BPartner())
 		{
-			AEnv.addMenuItem("InfoBPartner", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, Event.ALT_MASK+Event.CTRL_MASK), mView, this);
+			AEnv.addMenuItem("InfoBPartner", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, ActionEvent.ALT_MASK+ActionEvent.CTRL_MASK), mView, this);
 		}
 		if (MRole.getDefault().isShowAcct() && MRole.getDefault().isAllow_Info_Account())
 		{
-			AEnv.addMenuItem("InfoAccount", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, Event.ALT_MASK+Event.CTRL_MASK), mView, this);
+			AEnv.addMenuItem("InfoAccount", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, ActionEvent.ALT_MASK+ActionEvent.CTRL_MASK), mView, this);
 		}
 		if (MRole.getDefault().isAllow_Info_Schedule())
 		{
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/form/VAllocation.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VAllocation.java
index cead1dfac2..514b1cfe41 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/form/VAllocation.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/form/VAllocation.java
@@ -255,7 +255,7 @@ public class VAllocation extends Allocation
 		int AD_Column_ID = COLUMN_C_INVOICE_C_CURRENCY_ID;    //  C_Invoice.C_Currency_ID
 		MLookup lookupCur = MLookupFactory.get (Env.getCtx(), m_WindowNo, 0, AD_Column_ID, DisplayType.TableDir);
 		currencyPick = new VLookup("C_Currency_ID", true, false, true, lookupCur);
-		currencyPick.setValue(new Integer(m_C_Currency_ID));
+		currencyPick.setValue(Integer.valueOf(m_C_Currency_ID));
 		currencyPick.addVetoableChangeListener(this);
 
 		// Organization filter selection
@@ -283,7 +283,7 @@ public class VAllocation extends Allocation
 		AD_Column_ID = 61804;    //  C_AllocationLine.C_Charge_ID
 		MLookup lookupCharge = MLookupFactory.get (Env.getCtx(), m_WindowNo, 0, AD_Column_ID, DisplayType.TableDir);
 		chargePick = new VLookup("C_Charge_ID", false, false, true, lookupCharge);
-		chargePick.setValue(new Integer(m_C_Charge_ID));
+		chargePick.setValue(Integer.valueOf(m_C_Charge_ID));
 		chargePick.addVetoableChangeListener(this);
 	}   //  dynInit
 	
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/form/VBOMDrop.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VBOMDrop.java
index 358c973afc..7da35141d1 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/form/VBOMDrop.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/form/VBOMDrop.java
@@ -422,7 +422,7 @@ public class VBOMDrop extends CPanel
 			this.add(b, new ALayoutConstraint(m_bomLine++, 0));
 		}
 		//	Add to List & display
-		m_productList.add (new Integer(M_Product_ID));
+		m_productList.add (Integer.valueOf(M_Product_ID));
 		VNumber qty = new VNumber ("Qty", true, false, true, DisplayType.Quantity, name);
 		qty.setValue(lineQty);
 		qty.setReadWrite(selected);
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/form/VPayPrint.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VPayPrint.java
index 1b506efcd2..8c3535ceb5 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/form/VPayPrint.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/form/VPayPrint.java
@@ -245,7 +245,7 @@ public class VPayPrint extends PayPrint implements FormPanel, ActionListener, Ve
 			return;
 
 		m_C_PaySelection_ID = C_PaySelection_ID;
-		paySelectSearch.setValue(new Integer(m_C_PaySelection_ID));
+		paySelectSearch.setValue(Integer.valueOf(m_C_PaySelection_ID));
 		loadPaySelectInfo();
 	}	//	setsetPaySelection
 
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/form/VStatementCreateFromBatch.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VStatementCreateFromBatch.java
index d2090577be..5eb8579999 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/form/VStatementCreateFromBatch.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/form/VStatementCreateFromBatch.java
@@ -149,7 +149,7 @@ public class VStatementCreateFromBatch extends StatementCreateFromBatch implemen
 		bankAccountField = new VLookup ("C_BankAccount_ID", true, true, true, lookup);
 		//  Set Default
 		int C_BankAccount_ID = Env.getContextAsInt(Env.getCtx(), p_WindowNo, "C_BankAccount_ID");
-		bankAccountField.setValue(new Integer(C_BankAccount_ID));
+		bankAccountField.setValue(Integer.valueOf(C_BankAccount_ID));
 		bankAccountField.addActionListener(this);
 		//  initial Loading
 		authorizationField = new VString ("authorization", false, false, true, 10, 30, null, null);
@@ -302,7 +302,7 @@ public class VStatementCreateFromBatch extends StatementCreateFromBatch implemen
 				m_frame.getGridTab()));
 	}
 	
-	protected void loadTableOIS (Vector<?> data)
+	protected void loadTableOIS (Vector<? extends Vector> data)
 	{
 		//  Remove previous listeners
 		form.getMiniTable().getModel().removeTableModelListener(form);
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/form/VTreeBOM.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VTreeBOM.java
index b6ca42300c..e361690041 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/form/VTreeBOM.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/form/VTreeBOM.java
@@ -28,6 +28,7 @@ import java.awt.event.KeyListener;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Properties;
@@ -477,8 +478,8 @@ public class VTreeBOM extends CPanel implements FormPanel, ActionListener, TreeS
 		treeInfo.setText ("Selected Product: "+M_Product.getValue());
 		
 		Vector<Object> line = new Vector<Object>(10);
-		line.add( new Boolean(M_Product.isActive()));   //  0 IsActive
-		line.add( new Integer(0).toString()); // 1 Line
+		line.add( Boolean.valueOf(M_Product.isActive()));   //  0 IsActive
+		line.add( Integer.valueOf(0).toString()); // 1 Line
 		KeyNamePair pp = new KeyNamePair(M_Product.getM_Product_ID(),M_Product.getValue().concat("_").concat(M_Product.getName()));
 		line.add(pp); //  2 M_Product_ID
 		MUOM u = new MUOM(M_Product.getCtx(), M_Product.getC_UOM_ID(), M_Product.get_TrxName());
@@ -560,8 +561,8 @@ public class VTreeBOM extends CPanel implements FormPanel, ActionListener, TreeS
 		MProduct M_Product = MProduct.get(getCtx(), bomline.getM_ProductBOM_ID());
 
 		Vector<Object> line = new Vector<Object>(10);
-		line.add( new Boolean(bomline.isActive()));   //  0 IsActive
-		line.add( new Integer(bomline.getLine()).toString()); // 1 Line
+		line.add( Boolean.valueOf(bomline.isActive()));   //  0 IsActive
+		line.add( Integer.valueOf(bomline.getLine()).toString()); // 1 Line
 		KeyNamePair pp = new KeyNamePair(M_Product.getM_Product_ID(),M_Product.getValue().concat("_").concat(M_Product.getName()));
 		line.add(pp); //  2 M_Product_ID
 		MUOM u = new MUOM(M_Product.getCtx(), M_Product.getC_UOM_ID(), M_Product.get_TrxName());
@@ -588,8 +589,8 @@ public class VTreeBOM extends CPanel implements FormPanel, ActionListener, TreeS
 		MProduct M_Product = MProduct.get(getCtx(), bom.getM_Product_ID());
 
 		Vector<Object> line = new Vector<Object>(10);
-		line.add( new Boolean(M_Product.isActive()));   //  0 IsActive
-		line.add( new Integer(bom.getLine()).toString()); // 1 Line
+		line.add( Boolean.valueOf(M_Product.isActive()));   //  0 IsActive
+		line.add( Integer.valueOf(bom.getLine()).toString()); // 1 Line
 		KeyNamePair pp = new KeyNamePair(M_Product.getM_Product_ID(),M_Product.getValue().concat("_").concat(M_Product.getName()));
 		line.add(pp); //  2 M_Product_ID
 		MUOM u = new MUOM(M_Product.getCtx(), M_Product.getC_UOM_ID(), M_Product.get_TrxName());
@@ -718,7 +719,7 @@ class myJTree extends JTree
 		sb.append(" ["+((KeyNamePair) userObject.elementAt(3)).getName().trim()+"]");
 		//BOMQty
 		BigDecimal BOMQty = (BigDecimal)(userObject.elementAt(4));
-		sb.append("x"+BOMQty.setScale(2, BigDecimal.ROUND_HALF_UP).stripTrailingZeros());		
+		sb.append("x"+BOMQty.setScale(2, RoundingMode.HALF_UP).stripTrailingZeros());		
 		
 		return sb.toString();
 	}
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/search/Find.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/Find.java
index 212f02edc6..9677d7b428 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/search/Find.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/search/Find.java
@@ -25,7 +25,6 @@ import java.awt.GridBagLayout;
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
@@ -531,7 +530,7 @@ public final class Find extends CDialog
 			/**/
 
 			//  TargetFields
-			m_targetFields.put (new Integer(mField.getAD_Column_ID()), mField);
+			m_targetFields.put (Integer.valueOf(mField.getAD_Column_ID()), mField);
 		}   //  for all target tab fields
 
 		//	Disable simple query fields
@@ -646,7 +645,7 @@ public final class Find extends CDialog
             }
         };
         advancedTable.getActionMap().put(im.get(tab), tabActionWrapper);
-        KeyStroke shiftTab = KeyStroke.getKeyStroke(KeyEvent.VK_TAB, InputEvent.SHIFT_MASK);
+        KeyStroke shiftTab = KeyStroke.getKeyStroke(KeyEvent.VK_TAB, ActionEvent.SHIFT_MASK);
         final Action shiftTabAction = advancedTable.getActionMap().get(im.get(shiftTab));
 		Action shiftTabActionWrapper = new AbstractAction()
         {
@@ -1444,7 +1443,7 @@ public final class Find extends CDialog
 				if (in instanceof Integer)
 					return in;
 				int i = Integer.parseInt(in.toString());
-				return new Integer(i);
+				return Integer.valueOf(i);
 			}
 			//	Return BigDecimal
 			else if (DisplayType.isNumeric(dt))
@@ -1512,7 +1511,7 @@ public final class Find extends CDialog
 				|| (DisplayType.isID(dt) && field.getColumnName().endsWith("_ID")))
 			{
 				int i = Integer.parseInt(in);
-				return new Integer(i);
+				return Integer.valueOf(i);
 			}
 			//	Return BigDecimal
 			else if (DisplayType.isNumeric(dt))
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/search/Info.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/Info.java
index 4c3016b143..96d01c2d5f 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/search/Info.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/search/Info.java
@@ -1215,15 +1215,15 @@ public abstract class Info extends CDialog
 								((IDColumn)data).setSelected(isDefaultSelected());
 						}
 						else if (c == Boolean.class)
-							data = new Boolean("Y".equals(m_rs.getString(colIndex)));
+							data = Boolean.valueOf("Y".equals(m_rs.getString(colIndex)));
 						else if (c == Timestamp.class)
 							data = m_rs.getTimestamp(colIndex);
 						else if (c == BigDecimal.class)
 							data = m_rs.getBigDecimal(colIndex);
 						else if (c == Double.class)
-							data = new Double(m_rs.getDouble(colIndex));
+							data = Double.valueOf(m_rs.getDouble(colIndex));
 						else if (c == Integer.class)
-							data = new Integer(m_rs.getInt(colIndex));
+							data = Integer.valueOf(m_rs.getInt(colIndex));
 						else if (c == KeyNamePair.class)
 						{
 							String display = m_rs.getString(colIndex);
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoInOut.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoInOut.java
index ce9965462c..a8acede1c1 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoInOut.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoInOut.java
@@ -212,7 +212,7 @@ public class InfoInOut extends Info
 		//  Set Defaults
 		String bp = Env.getContext(Env.getCtx(), p_WindowNo, "C_BPartner_ID");
 		if (bp != null && bp.length() != 0)
-			fBPartner_ID.setValue(new Integer(bp));
+			fBPartner_ID.setValue(Integer.valueOf(bp));
 
 		//  prepare table
 		StringBuilder where = new StringBuilder("i.IsActive='Y'");
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoInvoice.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoInvoice.java
index 84b563a2ac..9e052da1a2 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoInvoice.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoInvoice.java
@@ -252,7 +252,7 @@ public class InfoInvoice extends Info
 		//  Set Defaults
 		String bp = Env.getContext(Env.getCtx(), p_WindowNo, "C_BPartner_ID");
 		if (bp != null && bp.length() != 0)
-			fBPartner_ID.setValue(new Integer(bp));
+			fBPartner_ID.setValue(Integer.valueOf(bp));
 
 		//  prepare table
 		StringBuilder where = new StringBuilder("i.IsActive='Y'");
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoOrder.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoOrder.java
index 91b4e1a87a..fb000407aa 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoOrder.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoOrder.java
@@ -230,7 +230,7 @@ public class InfoOrder extends Info
 		//  Set Defaults
 		String bp = Env.getContext(Env.getCtx(), p_WindowNo, "C_BPartner_ID");
 		if (bp != null && bp.length() != 0)
-			fBPartner_ID.setValue(new Integer(bp));
+			fBPartner_ID.setValue(Integer.valueOf(bp));
 
 		//  prepare table
 		StringBuilder where = new StringBuilder("o.IsActive='Y'");
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoPayment.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoPayment.java
index 86553081d7..87afc3e650 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoPayment.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoPayment.java
@@ -229,7 +229,7 @@ public class InfoPayment extends Info
 		//  Set Defaults
 		String bp = Env.getContext(Env.getCtx(), p_WindowNo, "C_BPartner_ID");
 		if (bp != null && bp.length() != 0)
-			fBPartner_ID.setValue(new Integer(bp));
+			fBPartner_ID.setValue(Integer.valueOf(bp));
 
 		//  prepare table
 		StringBuilder where = new StringBuilder("p.IsActive='Y'");
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoProduct.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoProduct.java
index 1fba267726..d9d600e5bd 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoProduct.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoProduct.java
@@ -1272,10 +1272,10 @@ public class InfoProduct extends Info implements ActionListener, ChangeListener
 				line.add(null);							//  Date
 				double qtyOnHand = rs.getDouble(1);
 				qty += qtyOnHand;
-				line.add(new Double(qtyOnHand));  		//  Qty
+				line.add(Double.valueOf(qtyOnHand));  		//  Qty
 				line.add(null);							//  BPartner
-				line.add(new Double(rs.getDouble(3)));  //  QtyOrdered
-				line.add(new Double(rs.getDouble(2)));  //  QtyReserved
+				line.add(Double.valueOf(rs.getDouble(3)));  //  QtyOrdered
+				line.add(Double.valueOf(rs.getDouble(2)));  //  QtyReserved
 				line.add(rs.getString(7));      		//  Locator
 				String asi = rs.getString(4);
 				if (showDetail && (asi == null || asi.length() == 0))
@@ -1331,15 +1331,15 @@ public class InfoProduct extends Info implements ActionListener, ChangeListener
 				Double qtyOrdered = null;
 				if (MDocType.DOCBASETYPE_PurchaseOrder.equals(DocBaseType))
 				{
-					qtyOrdered = new Double(oq);
+					qtyOrdered = Double.valueOf(oq);
 					qty += oq;
 				}
 				else
 				{
-					qtyReserved = new Double(oq);
+					qtyReserved = Double.valueOf(oq);
 					qty -= oq;
 				}
-				line.add(new Double(qty)); 		 		//  Qty
+				line.add(Double.valueOf(qty)); 		 		//  Qty
 				line.add(rs.getString(6));				//  BPartner
 				line.add(qtyOrdered);					//  QtyOrdered
 				line.add(qtyReserved);					//  QtyReserved
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/search/InvoiceHistory.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/InvoiceHistory.java
index e4410396fd..7fdba6ab75 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/search/InvoiceHistory.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/search/InvoiceHistory.java
@@ -276,7 +276,7 @@ public class InvoiceHistory extends CDialog
 				//	0-Name, 1-PriceActual, 2-QtyInvoiced, 3-Discount, 4-DocumentNo, 5-DateInvoiced
 				line.add(rs.getString(1));      //  Name
 				line.add(rs.getBigDecimal(2));  //	Price
-				line.add(new Double(rs.getDouble(4)));      //  Qty
+				line.add(Double.valueOf(rs.getDouble(4)));      //  Qty
 				BigDecimal discountBD = rs.getBigDecimal(8);
 				if (discountBD == null) {
 					double priceList = rs.getDouble(3);
@@ -505,9 +505,9 @@ public class InvoiceHistory extends CDialog
 				Vector<Object> line = new Vector<Object>(6);
 				//	1-Name, 2-MovementQty, 3-MovementDate, 4-IsSOTrx, 5-DocumentNo
 				line.add(rs.getString(1));      		//  Name
-				line.add(new Double(rs.getDouble(2)));  //  Qty
+				line.add(Double.valueOf(rs.getDouble(2)));  //  Qty
 				line.add(rs.getTimestamp(3));   		//  Date
-				line.add(new Boolean("Y".equals(rs.getString(4))));	//  IsSOTrx
+				line.add(Boolean.valueOf("Y".equals(rs.getString(4))));	//  IsSOTrx
 				line.add(rs.getString(5));				//  DocNo
 				line.add(rs.getString(6));				//  Warehouse
 				data.add(line);
@@ -598,10 +598,10 @@ public class InvoiceHistory extends CDialog
 				line.add(null);							//  Date
 				double qtyOnHand = rs.getDouble(1);
 				qty += qtyOnHand;
-				line.add(new Double(qtyOnHand));  		//  Qty
+				line.add(Double.valueOf(qtyOnHand));  		//  Qty
 				line.add(null);							//  BPartner
-				line.add(new Double(rs.getDouble(3)));  //  QtyOrdered
-				line.add(new Double(rs.getDouble(2)));  //  QtyReserved
+				line.add(Double.valueOf(rs.getDouble(3)));  //  QtyOrdered
+				line.add(Double.valueOf(rs.getDouble(2)));  //  QtyReserved
 				line.add(rs.getString(7));      		//  Locator
 				String asi = rs.getString(4);
 				if (showDetail && (asi == null || asi.length() == 0))
@@ -657,15 +657,15 @@ public class InvoiceHistory extends CDialog
 				Double qtyOrdered = null;
 				if (MDocType.DOCBASETYPE_PurchaseOrder.equals(DocBaseType))
 				{
-					qtyOrdered = new Double(oq);
+					qtyOrdered = Double.valueOf(oq);
 					qty += oq;
 				}
 				else
 				{
-					qtyReserved = new Double(oq);
+					qtyReserved = Double.valueOf(oq);
 					qty -= oq;
 				}
-				line.add(new Double(qty)); 		 		//  Qty
+				line.add(Double.valueOf(qty)); 		 		//  Qty
 				line.add(rs.getString(6));				//  BPartner
 				line.add(qtyOrdered);					//  QtyOrdered
 				line.add(qtyReserved);					//  QtyReserved
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromDepositBatchUI.java b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromDepositBatchUI.java
index 4846481808..8f07f32ab6 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromDepositBatchUI.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromDepositBatchUI.java
@@ -152,7 +152,7 @@ public class VCreateFromDepositBatchUI extends CreateFromDepositBatch implements
 		bankAccountField = new VLookup ("C_BankAccount_ID", true, true, true, lookup);
 		//  Set Default
 		int C_BankAccount_ID = Env.getContextAsInt(Env.getCtx(), p_WindowNo, "C_BankAccount_ID");
-		bankAccountField.setValue(new Integer(C_BankAccount_ID));
+		bankAccountField.setValue(Integer.valueOf(C_BankAccount_ID));
 		bankAccountField.addActionListener(this);
 		//  initial Loading
 		authorizationField = new VString ("authorization", false, false, true, 10, 30, null, null);
@@ -161,7 +161,7 @@ public class VCreateFromDepositBatchUI extends CreateFromDepositBatch implements
 		MLookup lookupDocument = MLookupFactory.get (Env.getCtx(), p_WindowNo, 0, MColumn.getColumn_ID(MPayment.Table_Name, MPayment.COLUMNNAME_C_DocType_ID), DisplayType.TableDir);
 		documentTypeField = new VLookup (MPayment.COLUMNNAME_C_DocType_ID,false,false,true,lookupDocument);
 		int C_DocType_ID = Env.getContextAsInt(Env.getCtx(), p_WindowNo, "C_DocType_ID");
-		documentTypeField.setValue(new Integer(C_DocType_ID));
+		documentTypeField.setValue(Integer.valueOf(C_DocType_ID));
 		documentTypeField.addActionListener(this);
 		
 		MLookup lookupTender = MLookupFactory.get (Env.getCtx(), p_WindowNo, 0, MColumn.getColumn_ID(MPayment.Table_Name, MPayment.COLUMNNAME_TenderType), DisplayType.List);
@@ -306,7 +306,7 @@ public class VCreateFromDepositBatchUI extends CreateFromDepositBatch implements
 				documentTypeField.getValue(), tenderTypeField.getValue(), authorizationField.getText()));
 	}
 	
-	protected void loadTableOIS (Vector<?> data)
+	protected void loadTableOIS (Vector<? extends Vector> data)
 	{
 		//  Remove previous listeners
 		dialog.getMiniTable().getModel().removeTableModelListener(dialog);
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromInvoiceUI.java b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromInvoiceUI.java
index 7206955c04..194b7f98ed 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromInvoiceUI.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromInvoiceUI.java
@@ -256,7 +256,7 @@ public class VCreateFromInvoiceUI extends CreateFromInvoice implements ActionLis
 		bPartnerField = new VLookup ("C_BPartner_ID", true, false, true, lookup);
 		//
 		int C_BPartner_ID = Env.getContextAsInt(Env.getCtx(), p_WindowNo, "C_BPartner_ID");
-		bPartnerField.setValue(new Integer(C_BPartner_ID));
+		bPartnerField.setValue(Integer.valueOf(C_BPartner_ID));
 
 		//  initial loading
 		initBPOrderDetails(C_BPartner_ID, forInvoice);
@@ -360,7 +360,7 @@ public class VCreateFromInvoiceUI extends CreateFromInvoice implements ActionLis
 	 *  Load Order/Invoice/Shipment data into Table
 	 *  @param data data
 	 */
-	protected void loadTableOIS (Vector<?> data)
+	protected void loadTableOIS (Vector<? extends Vector> data)
 	{
 		//  Remove previous listeners
 		dialog.getMiniTable().getModel().removeTableModelListener(dialog);
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromPackageShipmentUI.java b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromPackageShipmentUI.java
index 44ede962c2..277aa3e9ca 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromPackageShipmentUI.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromPackageShipmentUI.java
@@ -80,7 +80,7 @@ public class VCreateFromPackageShipmentUI extends CreateFromPackageShipment
 		return true;
 	}
 	
-	protected void loadTableOIS (Vector<?> data)
+	protected void loadTableOIS (Vector<? extends Vector> data)
 	{
 		//  Remove previous listeners
 		dialog.getMiniTable().getModel().removeTableModelListener(dialog);
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromRMAUI.java b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromRMAUI.java
index b41b3b642c..e489214b3d 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromRMAUI.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromRMAUI.java
@@ -160,7 +160,7 @@ public class VCreateFromRMAUI extends CreateFromRMA implements VetoableChangeLis
 		bPartnerField = new VLookup ("C_BPartner_ID", true, false, true, lookup);
 		//
 		int C_BPartner_ID = Env.getContextAsInt(Env.getCtx(), p_WindowNo, "C_BPartner_ID");
-		bPartnerField.setValue(new Integer(C_BPartner_ID));
+		bPartnerField.setValue(Integer.valueOf(C_BPartner_ID));
 	}   //  initBPartner
 	
 	protected void loadRMA()
@@ -172,7 +172,7 @@ public class VCreateFromRMAUI extends CreateFromRMA implements VetoableChangeLis
 	 *  Load Order/Invoice/Shipment data into Table
 	 *  @param data data
 	 */
-	protected void loadTableOIS (Vector<?> data)
+	protected void loadTableOIS (Vector<? extends Vector> data)
 	{
 		//  Remove previous listeners
 		dialog.getMiniTable().getModel().removeTableModelListener(dialog);
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromShipmentUI.java b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromShipmentUI.java
index 842ba9bb96..a5993a16d1 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromShipmentUI.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromShipmentUI.java
@@ -307,7 +307,7 @@ public class VCreateFromShipmentUI extends CreateFromShipment implements ActionL
 		bPartnerField = new VLookup ("C_BPartner_ID", true, false, true, lookup);
 		//
 		int C_BPartner_ID = Env.getContextAsInt(Env.getCtx(), p_WindowNo, "C_BPartner_ID");
-		bPartnerField.setValue(new Integer(C_BPartner_ID));
+		bPartnerField.setValue(Integer.valueOf(C_BPartner_ID));
 
 		//  initial loading
 		initBPOrderDetails(C_BPartner_ID, forInvoice);
@@ -423,7 +423,7 @@ public class VCreateFromShipmentUI extends CreateFromShipment implements ActionL
 	 *  Load Order/Invoice/Shipment data into Table
 	 *  @param data data
 	 */
-	protected void loadTableOIS (Vector<?> data)
+	protected void loadTableOIS (Vector<? extends Vector> data)
 	{
 		//  Remove previous listeners
 		dialog.getMiniTable().getModel().removeTableModelListener(dialog);
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromStatementUI.java b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromStatementUI.java
index 252df438b0..1c0ed1cb78 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromStatementUI.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromStatementUI.java
@@ -152,7 +152,7 @@ public class VCreateFromStatementUI extends CreateFromStatement implements Actio
 		bankAccountField = new VLookup ("C_BankAccount_ID", true, true, true, lookup);
 		//  Set Default
 		int C_BankAccount_ID = Env.getContextAsInt(Env.getCtx(), p_WindowNo, "C_BankAccount_ID");
-		bankAccountField.setValue(new Integer(C_BankAccount_ID));
+		bankAccountField.setValue(Integer.valueOf(C_BankAccount_ID));
 		bankAccountField.addActionListener(this);
 		//  initial Loading
 		authorizationField = new VString ("authorization", false, false, true, 10, 30, null, null);
@@ -304,7 +304,7 @@ public class VCreateFromStatementUI extends CreateFromStatement implements Actio
 				documentTypeField.getValue(), tenderTypeField.getValue(), authorizationField.getText()));
 	}
 	
-	protected void loadTableOIS (Vector<?> data)
+	protected void loadTableOIS (Vector<? extends Vector> data)
 	{
 		//  Remove previous listeners
 		dialog.getMiniTable().getModel().removeTableModelListener(dialog);
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VPaymentFormCash.java b/org.adempiere.ui.swing/src/org/compiere/grid/VPaymentFormCash.java
index 5ccc4e6d68..8c7c75db74 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/VPaymentFormCash.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/VPaymentFormCash.java
@@ -130,7 +130,7 @@ public class VPaymentFormCash extends PaymentFormCash implements ActionListener
 		bDateField.setValue(m_DateAcct);
 		
 		// Is the currency an EMU currency?
-		Integer C_Currency_ID = new Integer(m_C_Currency_ID);
+		Integer C_Currency_ID = Integer.valueOf(m_C_Currency_ID);
 		if (s_Currencies.containsKey(C_Currency_ID)) {
 			Enumeration<Integer> en = s_Currencies.keys();
 			while (en.hasMoreElements()) {
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VPaymentFormCheck.java b/org.adempiere.ui.swing/src/org/compiere/grid/VPaymentFormCheck.java
index 7bb15f412b..ed7400b1ea 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/VPaymentFormCheck.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/VPaymentFormCheck.java
@@ -132,7 +132,7 @@ public class VPaymentFormCheck extends PaymentFormCheck implements ActionListene
 		}
 		
 		//	Is the currency an EMU currency?
-		Integer C_Currency_ID = new Integer(m_C_Currency_ID);
+		Integer C_Currency_ID = Integer.valueOf(m_C_Currency_ID);
 		if (s_Currencies.containsKey(C_Currency_ID))
 		{
 			Enumeration<Integer> en = s_Currencies.keys();
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VSortTab.java b/org.adempiere.ui.swing/src/org/compiere/grid/VSortTab.java
index 5c69e7de99..b5702475b6 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/VSortTab.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/VSortTab.java
@@ -39,6 +39,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Arrays;
+import java.util.List;
 import java.util.logging.Level;
 
 import javax.swing.DefaultListCellRenderer;
@@ -525,11 +526,11 @@ public class VSortTab extends CPanel implements APanelTab
 	void migrateValueAcrossLists (AWTEvent event)
 	{
 		Object source = event.getSource();
-		Object[] selObjects = (source == bAdd || source == noList) ?
-				noList.getSelectedValues() : yesList.getSelectedValues();
-		for (int i = 0; i < selObjects.length; i++)
+		List<Object> selObjects = (source == bAdd || source == noList) ?
+				noList.getSelectedValuesList() : yesList.getSelectedValuesList();
+		for (int i = 0; i < selObjects.size(); i++)
 		{
-			ListItem selObject = (ListItem)selObjects[i];
+			ListItem selObject = (ListItem)selObjects.get(i);
 			if (selObject == null || !selObject.isUpdateable())
 				continue;
 
@@ -554,10 +555,10 @@ public class VSortTab extends CPanel implements APanelTab
 	 */
 	void migrateValueWithinYesList (AWTEvent event)
 	{
-		Object[] selObjects = yesList.getSelectedValues();
+		List<Object> selObjects = yesList.getSelectedValuesList();
 		if (selObjects == null)
 			return;
-		int length = selObjects.length;
+		int length = selObjects.size();
 		if (length == 0)
 			return;
 //		Object selObject = selObjects[0];
@@ -572,7 +573,7 @@ public class VSortTab extends CPanel implements APanelTab
 		if (source == bUp)
 		{
 			for (int i = 0; i < length; i++) {
-				ListItem selObject = (ListItem)selObjects[i];
+				ListItem selObject = (ListItem)selObjects.get(i);
 				int index = indices[i];
 				if (index == 0)
 					break;
@@ -589,7 +590,7 @@ public class VSortTab extends CPanel implements APanelTab
 		else if (source == bDown)
 		{
 			for (int i = length - 1; i >= 0; i--) {
-				ListItem selObject = (ListItem)selObjects[i];
+				ListItem selObject = (ListItem)selObjects.get(i);
 				int index = indices[i];
 				if (index  >= yesModel.size () - 1)
 					break;
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/Calculator.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/Calculator.java
index 96484105c3..24f70113ea 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/Calculator.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/Calculator.java
@@ -28,6 +28,7 @@ import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
@@ -485,7 +486,7 @@ public final class Calculator extends CDialog
 		char op = token.charAt(0);
 
 		if (op == '%') {
-			firstNo = firstNo.divide(Env.ONEHUNDRED, m_format.getMaximumFractionDigits(), BigDecimal.ROUND_HALF_UP);
+			firstNo = firstNo.divide(Env.ONEHUNDRED, m_format.getMaximumFractionDigits(), RoundingMode.HALF_UP);
 			m_number = firstNo;
 		}
 		
@@ -523,13 +524,13 @@ public final class Calculator extends CDialog
 
 		//	Percent operation
 		if (op2 == '%')
-			secondNo = secondNo.divide(Env.ONEHUNDRED, m_format.getMaximumFractionDigits(), BigDecimal.ROUND_HALF_UP);
+			secondNo = secondNo.divide(Env.ONEHUNDRED, m_format.getMaximumFractionDigits(), RoundingMode.HALF_UP);
 
 		switch (op)
 		{
 			case '/':
 				m_number = firstNo
-					.divide(secondNo, m_format.getMaximumFractionDigits(), BigDecimal.ROUND_HALF_UP);
+					.divide(secondNo, m_format.getMaximumFractionDigits(), RoundingMode.HALF_UP);
 				break;
 			case '*':
 				m_number = firstNo.multiply(secondNo);
@@ -543,7 +544,7 @@ public final class Calculator extends CDialog
 			default:
 				break;
 		}
-		return m_number.setScale(m_format.getMaximumFractionDigits(), BigDecimal.ROUND_HALF_UP);
+		return m_number.setScale(m_format.getMaximumFractionDigits(), RoundingMode.HALF_UP);
 	}	//	evaluate
 
 
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/Calendar.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/Calendar.java
index 5e6ca43ebe..6b07cfcf67 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/Calendar.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/Calendar.java
@@ -300,7 +300,7 @@ public class Calendar extends CDialog
 		//	Years
 		m_currentYear = m_calendar.get(java.util.Calendar.YEAR);
 		cYear.setEditor(new JSpinner.NumberEditor(cYear, "0000"));
-		cYear.setValue(new Integer(m_currentYear));
+		cYear.setValue(Integer.valueOf(m_currentYear));
 
 		//	Months		-> 0=Jan 12=_
 		String[] months = formatDate.getDateFormatSymbols().getMonths();
@@ -443,7 +443,7 @@ public class Calendar extends CDialog
 		//  --- Set Month & Year
 		m_setting = true;
 		cMonth.setSelectedIndex(m_currentMonth-1);
-		cYear.setValue(new Integer(m_currentYear));
+		cYear.setValue(Integer.valueOf(m_currentYear));
 		m_setting = false;
 
 		//  --- Set Day
@@ -503,7 +503,7 @@ public class Calendar extends CDialog
 		fHour.setSelectedIndex(index);
 		//	Set Minute
 		int m = m_currentMinute;
-		fMinute.setValue(new Integer(m));
+		fMinute.setValue(Integer.valueOf(m));
 		//	Set PM
 		cbPM.setSelected(pm);
 		//	Set TZ
@@ -880,7 +880,7 @@ class MinuteModel extends SpinnerNumberModel
 			minutes -= 60;
 		//
 		int steps = minutes / m_snapSize;
-		return new Integer(steps * m_snapSize);
+		return Integer.valueOf(steps * m_snapSize);
 	}	//	getNextValue
 
 
@@ -900,7 +900,7 @@ class MinuteModel extends SpinnerNumberModel
 			steps++;
 		if (steps * m_snapSize > 59)
 			steps = 0;
-		return new Integer(steps * m_snapSize);
+		return Integer.valueOf(steps * m_snapSize);
 	}	//	getNextValue
 
 }	//	MinuteModel
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/MDocNumber.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/MDocNumber.java
index d3c567beb6..4416b9afac 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/MDocNumber.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/MDocNumber.java
@@ -17,6 +17,7 @@
 package org.compiere.grid.ed;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.text.ParseException;
@@ -228,7 +229,7 @@ public final class MDocNumber extends PlainDocument
 							{
 								Number number = m_format.parse(value);
 								percentValue = new BigDecimal (number.toString());
-								percentValue = percentValue.divide(Env.ONEHUNDRED, m_format.getMaximumFractionDigits(), BigDecimal.ROUND_HALF_UP);
+								percentValue = percentValue.divide(Env.ONEHUNDRED, m_format.getMaximumFractionDigits(), RoundingMode.HALF_UP);
 								m_tc.setText(m_format.format(percentValue));
 							}
 						}
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccount.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccount.java
index 85ea4c6678..23c1725e2f 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccount.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccount.java
@@ -298,7 +298,7 @@ public final class VAccount extends JComponent
 	 */
 	public Object getValue()
 	{
-		return new Integer (m_mAccount.C_ValidCombination_ID);
+		return Integer.valueOf(m_mAccount.C_ValidCombination_ID);
 	}	//	getValue
 
 	/**
@@ -420,7 +420,7 @@ public final class VAccount extends JComponent
 		//	We have a Value
 		if (C_ValidCombination_ID > 0)
 		{
-			Integer newValue = new Integer(C_ValidCombination_ID);
+			Integer newValue = Integer.valueOf(C_ValidCombination_ID);
 
 			//	set & redisplay
 			setValue(newValue);
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccountDialog.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccountDialog.java
index 3b8c83c908..15607409f2 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccountDialog.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccountDialog.java
@@ -579,7 +579,7 @@ public final class VAccountDialog extends CDialog
 		if (rs.wasNull())
 			editor.setValue(null);
 		else
-			editor.setValue(new Integer (intValue));
+			editor.setValue(Integer.valueOf(intValue));
 	}	//	loadInfoOf
 
 
@@ -1126,7 +1126,7 @@ public final class VAccountDialog extends CDialog
 		if (log.isLoggable(Level.CONFIG)) log.config("C_ValidCombination_ID=" + m_C_ValidCombination_ID + ", Changed=" + m_changed);
 		if (!m_changed || m_C_ValidCombination_ID == 0)
 			return null;
-		return new Integer(m_C_ValidCombination_ID);
+		return Integer.valueOf(m_C_ValidCombination_ID);
 	}
 
 	/**
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAssignment.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAssignment.java
index 4c925c1140..f5479221c1 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAssignment.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAssignment.java
@@ -435,7 +435,7 @@ public class VAssignment extends JComponent
 		//	Set Value
 		if (ma != null && ma.getS_ResourceAssignment_ID() != 0)
 		{
-			setValue(new Integer(ma.getS_ResourceAssignment_ID()));
+			setValue(Integer.valueOf(ma.getS_ResourceAssignment_ID()));
 			try
 			{
 				fireVetoableChange(this.getName(), new Object(), getValue());
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VBPartner.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VBPartner.java
index bf42718e98..669d72b9c7 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VBPartner.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VBPartner.java
@@ -316,7 +316,7 @@ public final class VBPartner extends CDialog implements ActionListener
 		if (m_pLocation != null)
 		{
 			int location = m_pLocation.getC_Location_ID();
-			fAddress.setValue (new Integer(location));
+			fAddress.setValue (Integer.valueOf(location));
 			//
 			fPhone.setText(m_pLocation.getPhone());
 			fPhone2.setText(m_pLocation.getPhone2());
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VCheckBox.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VCheckBox.java
index 611fbd7bdd..6ee336b465 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VCheckBox.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VCheckBox.java
@@ -190,7 +190,7 @@ public class VCheckBox extends CCheckBox
 	 */
 	public Object getValue()
 	{
-		return new Boolean (isSelected());
+		return Boolean.valueOf(isSelected());
 	}	//	getValue
 
 	/**
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VComboBox.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VComboBox.java
index 75996b4d3d..94c1bc6fb5 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VComboBox.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VComboBox.java
@@ -145,7 +145,7 @@ public class VComboBox extends CComboBox<Object>
 		{
 			if (p.getID() == null)	//	-1 return null
 				return null;
-			return new Integer(((KeyNamePair)p).getID());
+			return Integer.valueOf(((KeyNamePair)p).getID());
 		}
 		return p.getID();
 	}	//	getValue
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VImage.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VImage.java
index 8d13ec2e29..35c3ee6673 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VImage.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VImage.java
@@ -136,7 +136,7 @@ public class VImage extends JButton
 	{
 		if (m_mImage == null || m_mImage.get_ID() == 0)
 			return null;
-		return new Integer(m_mImage.get_ID());
+		return Integer.valueOf(m_mImage.get_ID());
 	}   //  getValue
 
 	/**
@@ -229,7 +229,7 @@ public class VImage extends JButton
 		int AD_Image_ID = vid.getAD_Image_ID();
 		Integer newValue = null;
 		if (AD_Image_ID != 0)
-			newValue = new Integer (AD_Image_ID);
+			newValue = Integer.valueOf(AD_Image_ID);
 		//
 		m_mImage = null;	//	force reload
 		setValue(newValue);	//	set explicitly
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocation.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocation.java
index 6ae6998909..7d085750b9 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocation.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocation.java
@@ -333,7 +333,7 @@ public class VLocation extends JComponent
 	{
 		if (m_value == null)
 			return null;
-		return new Integer(m_value.getC_Location_ID());
+		return Integer.valueOf(m_value.getC_Location_ID());
 	}	//	getValue
 
 	/**
@@ -389,7 +389,7 @@ public class VLocation extends JComponent
 			int C_Location_ID = 0;
 			if (m_value != null)
 				C_Location_ID = m_value.getC_Location_ID();
-			Integer ii = new Integer(C_Location_ID);
+			Integer ii = Integer.valueOf(C_Location_ID);
 			
 			if (C_Location_ID != 0)
 				fireVetoableChange(m_columnName, oldValue, ii);
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocator.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocator.java
index 055eac9123..06e3870a31 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocator.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocator.java
@@ -516,7 +516,7 @@ public class VLocator extends JComponent
 		if (M_Locator_ID == 0)
 			return false;
 
-		setValue (new Integer(M_Locator_ID), true);
+		setValue (Integer.valueOf(M_Locator_ID), true);
 		return true;
 	}	//	actionText
 
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocatorDialog.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocatorDialog.java
index 32df02ba03..e3431e730e 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocatorDialog.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocatorDialog.java
@@ -486,7 +486,7 @@ public class VLocatorDialog extends CDialog
 	{
 		MLocator l = (MLocator) fLocator.getSelectedItem();
 		if (l != null && l.getM_Locator_ID() != 0)
-			return new Integer (l.getM_Locator_ID());
+			return Integer.valueOf(l.getM_Locator_ID());
 		return null;
 	}	//	getValue
 
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLookup.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLookup.java
index 1d1bb470cf..79abb36910 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLookup.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLookup.java
@@ -165,7 +165,7 @@ public class VLookup extends JComponent
             Action action = (binding==null) ? null : am.get(binding);
             if(action!=null){
                 return SwingUtilities.notifyAction(action, ks, e, editorComp,
-                        e.getModifiers());
+                        e.getModifiersEx());
             }
         }
         return false;
@@ -1145,7 +1145,7 @@ public class VLookup extends JComponent
 		if (log.isLoggable(Level.FINE)) log.fine(m_columnName + " - Unique ID=" + id);
 		m_value = null;     //  forces re-display if value is unchanged but text updated and still unique
 		resetTabInfo();
-		actionCombo (new Integer(id));          //  data binding
+		actionCombo (Integer.valueOf(id));          //  data binding
 		//
 		// Don't request focus if value was solved - teo_sarca [ 2552901 ]
 		if (id <= 0)
@@ -1369,9 +1369,9 @@ public class VLookup extends JComponent
 			&& result == BPartner_ID)	//	the same
 			return;
 		//  Maybe new BPartner - put in cache
-		m_lookup.getDirect(new Integer(result), false, true);
+		m_lookup.getDirect(Integer.valueOf(result), false, true);
 
-		actionCombo (new Integer(result));      //  data binding
+		actionCombo (Integer.valueOf(result));      //  data binding
 	}	//	actionBPartner
 
 	private void actionLocation ()
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VNumber.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VNumber.java
index 8a96a17e8a..713871d31d 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VNumber.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VNumber.java
@@ -37,6 +37,7 @@ import java.awt.event.MouseEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyVetoException;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.util.logging.Level;
@@ -443,7 +444,7 @@ public final class VNumber extends JComponent
 			if (!m_modified)
 				return null;
 			if (m_displayType == DisplayType.Integer)
-				return new Integer(0);
+				return Integer.valueOf(0);
 			return Env.ZERO;
 		}
 		if (value.equals(".") || value.equals(",") || value.equals("-"))
@@ -459,10 +460,10 @@ public final class VNumber extends JComponent
 			value = number.toString();      //	converts it to US w/o thousands
 			BigDecimal bd = new BigDecimal(value);
 			if (m_displayType == DisplayType.Integer)
-				return new Integer(bd.intValue());
+				return Integer.valueOf(bd.intValue());
 			if (bd.signum() == 0)
 				return bd;
-			return bd.setScale(m_format.getMaximumFractionDigits(), BigDecimal.ROUND_HALF_UP);
+			return bd.setScale(m_format.getMaximumFractionDigits(), RoundingMode.HALF_UP);
 		}
 		catch (Exception e)
 		{
@@ -470,7 +471,7 @@ public final class VNumber extends JComponent
 		}
 		m_text.setText(m_format.format(0));
 		if (m_displayType == DisplayType.Integer)
-			return new Integer(0);
+			return Integer.valueOf(0);
 		return Env.ZERO;
 	}	//	getValue
 
@@ -503,7 +504,7 @@ public final class VNumber extends JComponent
 		if (value == null)
 		{
 			if (m_displayType == DisplayType.Integer)
-				value = new Integer(0);
+				value = Integer.valueOf(0);
 			else
 				value = Env.ZERO;
 		}
@@ -511,7 +512,7 @@ public final class VNumber extends JComponent
 		if (value instanceof BigDecimal)
 			value = ((BigDecimal)value).add(Env.ONE);
 		else
-			value = new Integer(((Integer)value).intValue() + 1);
+			value = Integer.valueOf(((Integer)value).intValue() + 1);
 		//
 		setValue(value);
 		return value;
@@ -529,7 +530,7 @@ public final class VNumber extends JComponent
 		if (value == null)
 		{
 			if (m_displayType == DisplayType.Integer)
-				value = new Integer(minimum);
+				value = Integer.valueOf(minimum);
 			else
 				value = new BigDecimal(minimum);
 			setValue(value);
@@ -552,7 +553,7 @@ public final class VNumber extends JComponent
 			i--;
 			if (i < minimum)
 				i = minimum;
-			value = new Integer(i);
+			value = Integer.valueOf(i);
 		}
 		//
 		setValue(value);
@@ -672,12 +673,12 @@ public final class VNumber extends JComponent
 				if (ii  < m_minValue)
 				{
 					error = oo + " < " + m_minValue;
-					oo = new Integer(m_minValue.intValue());
+					oo = Integer.valueOf(m_minValue.intValue());
 				}
 				else if (ii > m_maxValue)
 				{
 					error = oo + " > " + m_maxValue;
-					oo = new Integer(m_maxValue.intValue());
+					oo = Integer.valueOf(m_maxValue.intValue());
 				}
 			}
 			else if (oo instanceof BigDecimal)
@@ -824,7 +825,7 @@ public final class VNumber extends JComponent
 		int modifiers = 0;
 		AWTEvent currentEvent = EventQueue.getCurrentEvent();
 		if (currentEvent instanceof InputEvent)
-			modifiers = ((InputEvent)currentEvent).getModifiers();
+			modifiers = ((InputEvent)currentEvent).getModifiersEx();
 		else if (currentEvent instanceof ActionEvent)
 			modifiers = ((ActionEvent)currentEvent).getModifiers();
 		ActionEvent ae = new ActionEvent (this, ActionEvent.ACTION_PERFORMED,
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPAttribute.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPAttribute.java
index 51cf3c35bb..60bd77cb7c 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPAttribute.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPAttribute.java
@@ -204,7 +204,7 @@ public class VPAttribute extends JComponent
 	private int					m_AD_Column_ID = 0;
 	private GridField m_mField;
 	/**	No Instance Key					*/
-	private static Integer		NO_INSTANCE = new Integer(0);
+	private static Integer		NO_INSTANCE = Integer.valueOf(0);
 	/**	Logger			*/
 	private static CLogger log = CLogger.getCLogger(VPAttribute.class);
 		
@@ -452,7 +452,7 @@ public class VPAttribute extends JComponent
 			if (M_AttributeSetInstance_ID == 0)
 				setValue(null);
 			else
-				setValue(new Integer(M_AttributeSetInstance_ID));
+				setValue(Integer.valueOf(M_AttributeSetInstance_ID));
 			// Change Locator
 			if (m_GridTab != null && M_Locator_ID > 0)
 			{
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VRowIDEditor.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VRowIDEditor.java
index 8846ba3cde..ab294f3f57 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VRowIDEditor.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VRowIDEditor.java
@@ -117,7 +117,7 @@ public class VRowIDEditor extends AbstractCellEditor implements TableCellEditor
 		if (log.isLoggable(Level.FINE)) log.fine("" + m_cb.isSelected());
 		if (m_rid == null)
 			return null;
-		m_rid[1] = new Boolean (m_cb.isSelected());
+		m_rid[1] = Boolean.valueOf(m_cb.isSelected());
 		return m_rid;
 	}	//	getCellEditorValue
 
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/tree/VTreePanel.java b/org.adempiere.ui.swing/src/org/compiere/grid/tree/VTreePanel.java
index 75e3119fb3..d671fc4ca9 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/tree/VTreePanel.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/tree/VTreePanel.java
@@ -514,7 +514,7 @@ public final class VTreePanel extends CPanel
 
 		//  *** Tree ***
 		if (e.getSource() instanceof JTree
-			|| (e.getSource() == treeSearch && e.getModifiers() != 0))	//	InputEvent.CTRL_MASK
+			|| (e.getSource() == treeSearch && e.getModifiersEx() != 0))	//	InputEvent.CTRL_MASK
 		{
 			TreePath tp = tree.getSelectionPath();
 			if (tp == null)
diff --git a/org.adempiere.ui.swing/src/org/compiere/minigrid/MiniTable.java b/org.adempiere.ui.swing/src/org/compiere/minigrid/MiniTable.java
index 744a5ae830..1025d02cc9 100644
--- a/org.adempiere.ui.swing/src/org/compiere/minigrid/MiniTable.java
+++ b/org.adempiere.ui.swing/src/org/compiere/minigrid/MiniTable.java
@@ -211,7 +211,7 @@ public class MiniTable extends CTable implements IMiniTable
 			return false;
 
 		//  is the column RW?
-		if (m_readWriteColumn.contains(new Integer(column)))
+		if (m_readWriteColumn.contains(Integer.valueOf(column)))
 			return true;
 		return false;
 	}   //  isCellEditable
@@ -224,7 +224,7 @@ public class MiniTable extends CTable implements IMiniTable
 	public void setColumnReadOnly (int column, boolean readOnly)
 	{
 		//  Column is ReadWrite
-		if (m_readWriteColumn.contains(new Integer(column)))
+		if (m_readWriteColumn.contains(Integer.valueOf(column)))
 		{
 			//  Remove from list
 			if (readOnly)
@@ -242,7 +242,7 @@ public class MiniTable extends CTable implements IMiniTable
 		}
 		//  current column is R/O - ReadWrite - add to list
 		else if (!readOnly)
-			m_readWriteColumn.add(new Integer(column));
+			m_readWriteColumn.add(Integer.valueOf(column));
 	}   //  setColumnReadOnly
 
 	
@@ -367,7 +367,7 @@ public class MiniTable extends CTable implements IMiniTable
 			{
 				tc.setCellEditor(new ROCellEditor());
 			}
-			m_minWidth.add(new Integer(10));
+			m_minWidth.add(Integer.valueOf(10));
 			tc.setMaxWidth(20);
 			tc.setPreferredWidth(20);
 			tc.setResizable(false);
@@ -387,7 +387,7 @@ public class MiniTable extends CTable implements IMiniTable
 				check.setHorizontalAlignment(SwingConstants.CENTER);
 				tc.setCellEditor(new DefaultCellEditor(check));
 			}
-			m_minWidth.add(new Integer(30));
+			m_minWidth.add(Integer.valueOf(30));
 			
 			tc.setHeaderRenderer(new VHeaderRenderer(DisplayType.YesNo));
 		}
@@ -399,7 +399,7 @@ public class MiniTable extends CTable implements IMiniTable
 				tc.setCellEditor(new ROCellEditor());
 			else
 				tc.setCellEditor(new MiniCellEditor(c));
-			m_minWidth.add(new Integer(30));
+			m_minWidth.add(Integer.valueOf(30));
 			
 			tc.setHeaderRenderer(new VHeaderRenderer(DisplayType.DateTime));
 		}
@@ -410,12 +410,12 @@ public class MiniTable extends CTable implements IMiniTable
 			if (readOnly)
 			{
 				tc.setCellEditor(new ROCellEditor());
-				m_minWidth.add(new Integer(70));
+				m_minWidth.add(Integer.valueOf(70));
 			}
 			else
 			{
 				tc.setCellEditor(new MiniCellEditor(c));
-				m_minWidth.add(new Integer(80));
+				m_minWidth.add(Integer.valueOf(80));
 			}
 			
 			tc.setHeaderRenderer(new VHeaderRenderer(DisplayType.Number));
@@ -427,12 +427,12 @@ public class MiniTable extends CTable implements IMiniTable
 			if (readOnly)
 			{
 				tc.setCellEditor(new ROCellEditor());
-				m_minWidth.add(new Integer(70));
+				m_minWidth.add(Integer.valueOf(70));
 			}
 			else
 			{
 				tc.setCellEditor(new MiniCellEditor(c));
-				m_minWidth.add(new Integer(80));
+				m_minWidth.add(Integer.valueOf(80));
 			}
 			
 			tc.setHeaderRenderer(new VHeaderRenderer(DisplayType.Number));
@@ -445,7 +445,7 @@ public class MiniTable extends CTable implements IMiniTable
 				tc.setCellEditor(new ROCellEditor());
 			else
 				tc.setCellEditor(new MiniCellEditor(c));
-			m_minWidth.add(new Integer(30));
+			m_minWidth.add(Integer.valueOf(30));
 			
 			tc.setHeaderRenderer(new VHeaderRenderer(DisplayType.Number));
 		}
@@ -457,7 +457,7 @@ public class MiniTable extends CTable implements IMiniTable
 				tc.setCellEditor(new ROCellEditor());
 			else
 				tc.setCellEditor(new MiniCellEditor(String.class));
-			m_minWidth.add(new Integer(30));
+			m_minWidth.add(Integer.valueOf(30));
 			
 			tc.setHeaderRenderer(new VHeaderRenderer(DisplayType.String));
 		}
@@ -509,7 +509,7 @@ public class MiniTable extends CTable implements IMiniTable
 					if (c == IDColumn.class)
 						data = new IDColumn(rs.getInt(colIndex));
 					else if (c == Boolean.class)
-						data = new Boolean("Y".equals(rs.getString(colIndex)));
+						data = Boolean.valueOf("Y".equals(rs.getString(colIndex)));
 					else if (c == Timestamp.class)
 						data = rs.getTimestamp(colIndex);
 					else if (c == BigDecimal.class)
@@ -580,7 +580,7 @@ public class MiniTable extends CTable implements IMiniTable
 					if (c == IDColumn.class)
 						data = new IDColumn(((Integer)data).intValue());
 					else if (c == Double.class)
-						data = new Double(((BigDecimal)data).doubleValue());
+						data = Double.valueOf(((BigDecimal)data).doubleValue());
 				}
 				//  store
 				setValueAt(data, row, col);
@@ -790,15 +790,15 @@ public class MiniTable extends CTable implements IMiniTable
 					}
 					else if (c == Double.class)
 					{
-						Double subtotal = new Double(0);
+						Double subtotal = Double.valueOf(0);
 						if(total[col] != null)
 							subtotal = (Double)(total[col]);
 						
 						Double amt =  (Double) data;
 						if(subtotal == null)
-							subtotal = new Double(0);
+							subtotal = Double.valueOf(0);
 						if(amt == null )
-							amt = new Double(0);
+							amt = Double.valueOf(0);
 						total[col] = subtotal + amt;
 						
 					}		
@@ -865,15 +865,15 @@ public class MiniTable extends CTable implements IMiniTable
 					}
 					else if (c == Double.class)
 					{
-						Double subtotal = new Double(0);
+						Double subtotal = Double.valueOf(0);
 						if(total[col] != null)
 							subtotal = (Double)(total[col]);
 						
 						Double amt =  (Double) data;
 						if(subtotal == null)
-							subtotal = new Double(0);
+							subtotal = Double.valueOf(0);
 						if(amt == null )
-							amt = new Double(0);
+							amt = Double.valueOf(0);
 						total[col] = subtotal + amt;
 						
 					}		
diff --git a/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereButtonListener.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereButtonListener.java
index 89ecb6fbc0..252fa8afc1 100644
--- a/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereButtonListener.java
+++ b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereButtonListener.java
@@ -16,7 +16,7 @@
  *****************************************************************************/
 package org.compiere.plaf;
 
-import java.awt.event.InputEvent;
+import java.awt.event.ActionEvent;
 import java.beans.PropertyChangeEvent;
 
 import javax.swing.AbstractButton;
@@ -86,10 +86,10 @@ public class CompiereButtonListener extends BasicButtonListener
     	    }
     	    map.clear();
     	    String className = b.getClass().getName();
-    	    int mask = InputEvent.ALT_MASK;		//	Default Buttons
+    	    int mask = ActionEvent.ALT_MASK;		//	Default Buttons
     	    if (b instanceof JCheckBox 			//	In Tab
     	    	|| className.indexOf("VButton") != -1)
-    	    	mask = InputEvent.SHIFT_MASK + InputEvent.CTRL_MASK;
+    	    	mask = ActionEvent.SHIFT_MASK + ActionEvent.CTRL_MASK;
     	    map.put(KeyStroke.getKeyStroke(m, mask, false), "pressed");
     	    map.put(KeyStroke.getKeyStroke(m, mask, true), "released");
     	    map.put(KeyStroke.getKeyStroke(m, 0, true), "released");
diff --git a/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereComboPopup.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereComboPopup.java
index a73c2abfd6..e30a6816bd 100644
--- a/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereComboPopup.java
+++ b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereComboPopup.java
@@ -39,7 +39,7 @@ public class CompiereComboPopup extends BasicComboPopup
 	 *  Constructor
 	 *  @param combo
 	 */
-	public CompiereComboPopup(JComboBox<?> combo)
+	public CompiereComboPopup(JComboBox<Object> combo)
 	{
 		super(combo);
 	}   //  AdempiereComboPopup
diff --git a/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereTextAreaUI.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereTextAreaUI.java
index 1cbe08af9b..e3649cd9d8 100644
--- a/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereTextAreaUI.java
+++ b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereTextAreaUI.java
@@ -18,7 +18,7 @@ package org.compiere.plaf;
 
 import java.awt.AWTKeyStroke;
 import java.awt.KeyboardFocusManager;
-import java.awt.event.InputEvent;
+import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 import java.beans.PropertyChangeEvent;
 import java.util.HashSet;
@@ -63,7 +63,7 @@ public class CompiereTextAreaUI extends BasicTextAreaUI
     /**	The Editor				*/
     private JTextComponent 		m_editor = null;
     /** Tab Stroke				*/
-    private static KeyStroke	s_stroke = KeyStroke.getKeyStroke (KeyEvent.VK_TAB, InputEvent.CTRL_MASK);
+    private static KeyStroke	s_stroke = KeyStroke.getKeyStroke (KeyEvent.VK_TAB, ActionEvent.CTRL_MASK);
     /** Tab Action				*/
     private static Action		s_action = new DefaultEditorKit.InsertTabAction();
     
@@ -109,7 +109,7 @@ public class CompiereTextAreaUI extends BasicTextAreaUI
 			//
 			forwardTraversalKeys.add (KeyStroke.getKeyStroke (KeyEvent.VK_TAB, 0));
 			forwardTraversalKeys.remove(s_stroke);
-			backwardTraversalKeys.add (KeyStroke.getKeyStroke (KeyEvent.VK_TAB, InputEvent.SHIFT_MASK));
+			backwardTraversalKeys.add (KeyStroke.getKeyStroke (KeyEvent.VK_TAB, ActionEvent.SHIFT_MASK));
 			//
 			LookAndFeel.installProperty (m_editor, "focusTraversalKeysForward",	forwardTraversalKeys);
 			LookAndFeel.installProperty (m_editor, "focusTraversalKeysBackward", backwardTraversalKeys);
diff --git a/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereToolTipUI.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereToolTipUI.java
index 66f900cedb..a8bb4d214a 100644
--- a/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereToolTipUI.java
+++ b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereToolTipUI.java
@@ -79,7 +79,7 @@ public class CompiereToolTipUI extends MetalToolTipUI
 			int condition = comp.getConditionForKeyStroke (keys[i]);
 			if (condition == JComponent.WHEN_IN_FOCUSED_WINDOW)
 			{
-				String prefix = KeyEvent.getKeyModifiersText (mod);
+				String prefix = KeyEvent.getModifiersExText (mod);
 				if (prefix.length() > 1)
 				{
 					if (controlKeyStr.length() > 0)
diff --git a/org.adempiere.ui.swing/src/org/compiere/pos/SubCurrentLine.java b/org.adempiere.ui.swing/src/org/compiere/pos/SubCurrentLine.java
index c1264376cd..7605ddb62f 100644
--- a/org.adempiere.ui.swing/src/org/compiere/pos/SubCurrentLine.java
+++ b/org.adempiere.ui.swing/src/org/compiere/pos/SubCurrentLine.java
@@ -14,7 +14,6 @@
 
 package org.compiere.pos;
 
-import java.awt.Event;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.FocusEvent;
@@ -131,7 +130,7 @@ public class SubCurrentLine extends PosSubPanel implements ActionListener, Focus
 		
 		String buttonSize = "w 50!, h 50!,";
 		//
-		f_bSearch = createButtonAction ("Product", KeyStroke.getKeyStroke(KeyEvent.VK_I, Event.CTRL_MASK));
+		f_bSearch = createButtonAction ("Product", KeyStroke.getKeyStroke(KeyEvent.VK_I, ActionEvent.CTRL_MASK));
 		f_bSearch.setName("ProductSearch");
 		add (f_bSearch, buttonSize );
 		
@@ -179,7 +178,7 @@ public class SubCurrentLine extends PosSubPanel implements ActionListener, Focus
 		add (f_down, buttonSize);
 
 		
-		f_delete = createButtonAction("Cancel", KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, Event.SHIFT_MASK));
+		f_delete = createButtonAction("Cancel", KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, ActionEvent.SHIFT_MASK));
 		add (f_delete, buttonSize);
 		
 		//
diff --git a/org.adempiere.ui.swing/src/org/compiere/print/Viewer.java b/org.adempiere.ui.swing/src/org/compiere/print/Viewer.java
index 3e7362b07b..40ee7f5b6d 100644
--- a/org.adempiere.ui.swing/src/org/compiere/print/Viewer.java
+++ b/org.adempiere.ui.swing/src/org/compiere/print/Viewer.java
@@ -22,7 +22,6 @@ import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Cursor;
 import java.awt.Dimension;
-import java.awt.Event;
 import java.awt.GraphicsConfiguration;
 import java.awt.Point;
 import java.awt.Rectangle;
@@ -339,7 +338,7 @@ public class Viewer extends CFrame
 		summary.addActionListener(this);
 		//	Max Page
 		m_pageMax = m_viewPanel.getPageCount();
-		spinnerModel.setMaximum(new Integer(m_pageMax));
+		spinnerModel.setMaximum(Integer.valueOf(m_pageMax));
 		spinner.addChangeListener(this);
 
 		fillComboReport(m_reportEngine.getPrintFormat().get_ID());
@@ -490,7 +489,7 @@ public class Viewer extends CFrame
 	public void revalidate()
 	{
 		m_pageMax = m_viewPanel.getPageCount();
-		spinnerModel.setMaximum(new Integer(m_pageMax));
+		spinnerModel.setMaximum(Integer.valueOf(m_pageMax));
 
 		//	scroll area (page size dependent)
 		centerScrollPane.setPreferredSize(new Dimension
@@ -522,21 +521,21 @@ public class Viewer extends CFrame
 		JMenu mFile = AEnv.getMenu("File");
 		menuBar.add(mFile);
 		AEnv.addMenuItem("PrintScreen", null, KeyStroke.getKeyStroke(KeyEvent.VK_PRINTSCREEN, 0), mFile, this);
-		AEnv.addMenuItem("ScreenShot", null, KeyStroke.getKeyStroke(KeyEvent.VK_PRINTSCREEN, Event.SHIFT_MASK), mFile, this);
-		AEnv.addMenuItem("Report", null, KeyStroke.getKeyStroke(KeyEvent.VK_P, Event.ALT_MASK), mFile, this);
+		AEnv.addMenuItem("ScreenShot", null, KeyStroke.getKeyStroke(KeyEvent.VK_PRINTSCREEN, ActionEvent.SHIFT_MASK), mFile, this);
+		AEnv.addMenuItem("Report", null, KeyStroke.getKeyStroke(KeyEvent.VK_P, ActionEvent.ALT_MASK), mFile, this);
 		mFile.addSeparator();
 		AEnv.addMenuItem("PrintCustomize", "Preference", null, mFile, this);
 		AEnv.addMenuItem("Translate", null, null, mFile, this);
-		AEnv.addMenuItem("Find", null, KeyStroke.getKeyStroke(KeyEvent.VK_F, Event.CTRL_MASK), mFile, this);
+		AEnv.addMenuItem("Find", null, KeyStroke.getKeyStroke(KeyEvent.VK_F, ActionEvent.CTRL_MASK), mFile, this);
 		mFile.addSeparator();
 		AEnv.addMenuItem("PageSetup", null, null, mFile, this);
-		AEnv.addMenuItem("Print", null, KeyStroke.getKeyStroke(KeyEvent.VK_P, Event.CTRL_MASK), mFile, this);
+		AEnv.addMenuItem("Print", null, KeyStroke.getKeyStroke(KeyEvent.VK_P, ActionEvent.CTRL_MASK), mFile, this);
 		if (m_isCanExport)
 			AEnv.addMenuItem("Export", null, null, mFile, this);
 		mFile.addSeparator();
-		AEnv.addMenuItem("End", null, KeyStroke.getKeyStroke(KeyEvent.VK_X, Event.ALT_MASK), mFile, this);
-		AEnv.addMenuItem("Logout", null, KeyStroke.getKeyStroke(KeyEvent.VK_L, Event.SHIFT_MASK+Event.ALT_MASK), mFile, this);
-		AEnv.addMenuItem("Exit", null, KeyStroke.getKeyStroke(KeyEvent.VK_X, Event.SHIFT_MASK+Event.ALT_MASK), mFile, this);
+		AEnv.addMenuItem("End", null, KeyStroke.getKeyStroke(KeyEvent.VK_X, ActionEvent.ALT_MASK), mFile, this);
+		AEnv.addMenuItem("Logout", null, KeyStroke.getKeyStroke(KeyEvent.VK_L, ActionEvent.SHIFT_MASK+ActionEvent.ALT_MASK), mFile, this);
+		AEnv.addMenuItem("Exit", null, KeyStroke.getKeyStroke(KeyEvent.VK_X, ActionEvent.SHIFT_MASK+ActionEvent.ALT_MASK), mFile, this);
 
 		//      View
 		JMenu mView = AEnv.getMenu("View");
@@ -544,15 +543,15 @@ public class Viewer extends CFrame
 
 		if (MRole.getDefault().isAllow_Info_Product())
 		{
-			AEnv.addMenuItem("InfoProduct", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, Event.ALT_MASK), mView, this);			
+			AEnv.addMenuItem("InfoProduct", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, ActionEvent.ALT_MASK), mView, this);			
 		}
 		if (MRole.getDefault().isAllow_Info_BPartner())
 		{
-			AEnv.addMenuItem("InfoBPartner", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, Event.ALT_MASK+Event.CTRL_MASK), mView, this);
+			AEnv.addMenuItem("InfoBPartner", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, ActionEvent.ALT_MASK+ActionEvent.CTRL_MASK), mView, this);
 		}
 		if (MRole.getDefault().isShowAcct() && MRole.getDefault().isAllow_Info_Account())
 		{
-			AEnv.addMenuItem("InfoAccount", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, Event.ALT_MASK+Event.CTRL_MASK), mView, this);
+			AEnv.addMenuItem("InfoAccount", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, ActionEvent.ALT_MASK+ActionEvent.CTRL_MASK), mView, this);
 		}
 		if (MRole.getDefault().isAllow_Info_Schedule())
 		{
@@ -601,10 +600,10 @@ public class Viewer extends CFrame
 		//		Go
 		JMenu mGo = AEnv.getMenu("Go");
 		menuBar.add(mGo);
-		AEnv.addMenuItem("First", "First", KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, Event.ALT_MASK),	mGo, this);
-		AEnv.addMenuItem("PreviousPage", "Previous", KeyStroke.getKeyStroke(KeyEvent.VK_UP, Event.ALT_MASK), mGo, this);
-		AEnv.addMenuItem("NextPage", "Next", KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, Event.ALT_MASK), mGo, this);
-		AEnv.addMenuItem("Last", "Last", KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_DOWN, Event.ALT_MASK), mGo, this);
+		AEnv.addMenuItem("First", "First", KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, ActionEvent.ALT_MASK),	mGo, this);
+		AEnv.addMenuItem("PreviousPage", "Previous", KeyStroke.getKeyStroke(KeyEvent.VK_UP, ActionEvent.ALT_MASK), mGo, this);
+		AEnv.addMenuItem("NextPage", "Next", KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, ActionEvent.ALT_MASK), mGo, this);
+		AEnv.addMenuItem("Last", "Last", KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_DOWN, ActionEvent.ALT_MASK), mGo, this);
 
 		//      Tools
 		JMenu mTools = AEnv.getMenu("Tools");
@@ -791,7 +790,7 @@ public class Viewer extends CFrame
 	//	System.out.println("scrollTo " + pageRectangle);
 
 		//	Set Page
-		spinnerModel.setValue(new Integer(m_pageNo));
+		spinnerModel.setValue(Integer.valueOf(m_pageNo));
 		StringBuffer sb = new StringBuffer (Msg.getMsg(m_ctx, "Page"))
 			.append(" ").append(m_pageNo)
 			.append(m_viewPanel.getPageInfo(m_pageNo))
@@ -1359,7 +1358,7 @@ public class Viewer extends CFrame
 		Login.initTest(true);
 
 		MQuery q = new MQuery("C_Invoice");
-		q.addRestriction("C_Invoice_ID", MQuery.EQUAL, new Integer(103));
+		q.addRestriction("C_Invoice_ID", MQuery.EQUAL, Integer.valueOf(103));
 
 		//	102 = Invoice - 100 = Order
 		PrintInfo i = new PrintInfo("test", X_C_Invoice.Table_ID, 102, 0);
diff --git a/org.adempiere.ui.swing/src/org/compiere/swing/CButton.java b/org.adempiere.ui.swing/src/org/compiere/swing/CButton.java
index e1c807717f..9b15112726 100644
--- a/org.adempiere.ui.swing/src/org/compiere/swing/CButton.java
+++ b/org.adempiere.ui.swing/src/org/compiere/swing/CButton.java
@@ -26,7 +26,7 @@
 package org.compiere.swing;
 
 import java.awt.Color;
-import java.awt.event.InputEvent;
+import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 
 import javax.swing.Action;
@@ -331,7 +331,7 @@ public class CButton extends JButton implements CEditor {
 					JComponent.WHEN_IN_FOCUSED_WINDOW, map);
 		}
 		map.clear();
-		int mask = InputEvent.ALT_MASK + InputEvent.CTRL_MASK; // Default
+		int mask = ActionEvent.ALT_MASK + ActionEvent.CTRL_MASK; // Default
 																// Buttons
 		map.put(KeyStroke.getKeyStroke(mnemonic, mask, false), "pressed");
 		map.put(KeyStroke.getKeyStroke(mnemonic, mask, true), "released");
diff --git a/org.adempiere.ui.swing/src/org/compiere/swing/CCheckBox.java b/org.adempiere.ui.swing/src/org/compiere/swing/CCheckBox.java
index f2133c80b4..5a385503c1 100644
--- a/org.adempiere.ui.swing/src/org/compiere/swing/CCheckBox.java
+++ b/org.adempiere.ui.swing/src/org/compiere/swing/CCheckBox.java
@@ -26,7 +26,7 @@
 package org.compiere.swing;
 
 import java.awt.Color;
-import java.awt.event.InputEvent;
+import java.awt.event.ActionEvent;
 
 import javax.swing.Action;
 import javax.swing.Icon;
@@ -266,7 +266,7 @@ public class CCheckBox extends JCheckBox implements CEditor {
 	public Object getValue() {
 		if (m_value instanceof String)
 			return super.isSelected() ? "Y" : "N";
-		return new Boolean(isSelected());
+		return Boolean.valueOf(isSelected());
 	} // getValue
 
 	/**
@@ -334,10 +334,10 @@ public class CCheckBox extends JCheckBox implements CEditor {
 		}
 		map.clear();
 		String className = this.getClass().getName();
-		int mask = InputEvent.ALT_MASK; // Default Buttons
+		int mask = ActionEvent.ALT_MASK; // Default Buttons
 		if (this instanceof JCheckBox // In Tab
 				|| className.indexOf("VButton") != -1)
-			mask = InputEvent.SHIFT_MASK + InputEvent.CTRL_MASK;
+			mask = ActionEvent.SHIFT_MASK + ActionEvent.CTRL_MASK;
 		map.put(KeyStroke.getKeyStroke(mnemonic, mask, false), "pressed");
 		map.put(KeyStroke.getKeyStroke(mnemonic, mask, true), "released");
 		map.put(KeyStroke.getKeyStroke(mnemonic, 0, true), "released");
diff --git a/org.adempiere.ui.swing/src/org/compiere/swing/CDialog.java b/org.adempiere.ui.swing/src/org/compiere/swing/CDialog.java
index 39d43360cd..9dec64fdd4 100644
--- a/org.adempiere.ui.swing/src/org/compiere/swing/CDialog.java
+++ b/org.adempiere.ui.swing/src/org/compiere/swing/CDialog.java
@@ -24,7 +24,6 @@ import java.awt.HeadlessException;
 import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
@@ -255,7 +254,7 @@ public class CDialog extends JDialog
 	protected static DialogAction	s_dialogAction = new DialogAction(ACTION_DISPOSE);
 	/** ALT-EXCAPE						*/
 	protected static KeyStroke		s_disposeKeyStroke = 
-		KeyStroke.getKeyStroke(KeyEvent.VK_PAUSE, InputEvent.ALT_MASK);
+		KeyStroke.getKeyStroke(KeyEvent.VK_PAUSE, ActionEvent.ALT_MASK);
 	
 	/**
 	 * 	Adempiere Dialog Action
diff --git a/org.adempiere.ui.swing/src/org/compiere/swing/CField.java b/org.adempiere.ui.swing/src/org/compiere/swing/CField.java
index 7ec5ec8fbe..249c9551da 100644
--- a/org.adempiere.ui.swing/src/org/compiere/swing/CField.java
+++ b/org.adempiere.ui.swing/src/org/compiere/swing/CField.java
@@ -178,14 +178,14 @@ public class CField extends JComboBox<Object>
 				Constructor<?> constructor = m_popupClass.getConstructor
 					(new Class<?>[] {Dialog.class, String.class, Boolean.class});
 				popup = (CFieldPopup)constructor.newInstance(new Object[]
-					{(Dialog)win, m_title, new Boolean(true)});
+					{(Dialog)win, m_title, Boolean.TRUE});
 			}
 			else if (win instanceof Frame)
 			{
 				Constructor<?> constructor = m_popupClass.getConstructor
 					(new Class[] {Frame.class, String.class, Boolean.class});
 				popup = (CFieldPopup)constructor.newInstance(new Object[]
-					{(Frame)win, m_title, new Boolean(true)});
+					{(Frame)win, m_title, Boolean.TRUE});
 			}
 			if (popup == null)
 				return false;
diff --git a/org.adempiere.ui.swing/src/org/compiere/swing/CPanel.java b/org.adempiere.ui.swing/src/org/compiere/swing/CPanel.java
index abb81ef0b2..e72be47ad2 100644
--- a/org.adempiere.ui.swing/src/org/compiere/swing/CPanel.java
+++ b/org.adempiere.ui.swing/src/org/compiere/swing/CPanel.java
@@ -165,7 +165,7 @@ public class CPanel extends JPanel
 		if (level == 0)
 			putClientProperty(AdempiereLookAndFeel.TABLEVEL, null);
 		else
-			putClientProperty(AdempiereLookAndFeel.TABLEVEL, new Integer(level));
+			putClientProperty(AdempiereLookAndFeel.TABLEVEL, Integer.valueOf(level));
 	}   //  setTabLevel
 
 	/**
diff --git a/org.adempiere.ui.swing/src/org/compiere/swing/CTabbedPane.java b/org.adempiere.ui.swing/src/org/compiere/swing/CTabbedPane.java
index 2e365b6151..661c9f5240 100644
--- a/org.adempiere.ui.swing/src/org/compiere/swing/CTabbedPane.java
+++ b/org.adempiere.ui.swing/src/org/compiere/swing/CTabbedPane.java
@@ -18,7 +18,6 @@ package org.compiere.swing;
 
 import java.awt.Color;
 import java.awt.Component;
-import java.awt.Event;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 import java.util.ArrayList;
@@ -221,10 +220,10 @@ public class CTabbedPane extends JTabbedPane
 		{
 			if (index < 9)
 				getInputMap(WHEN_IN_FOCUSED_WINDOW)
-					.put(KeyStroke.getKeyStroke(KeyEvent.VK_1+index, Event.ALT_MASK), ACTION_SELECT);
+					.put(KeyStroke.getKeyStroke(KeyEvent.VK_1+index, ActionEvent.ALT_MASK), ACTION_SELECT);
 			else if (index == 9)
 				getInputMap(WHEN_IN_FOCUSED_WINDOW)
-					.put(KeyStroke.getKeyStroke(KeyEvent.VK_0, Event.ALT_MASK), ACTION_SELECT);
+					.put(KeyStroke.getKeyStroke(KeyEvent.VK_0, ActionEvent.ALT_MASK), ACTION_SELECT);
 		}
 		//
 	}   //  insertTab
@@ -261,7 +260,7 @@ public class CTabbedPane extends JTabbedPane
 		char keyCode = m_mnemonic.get(index);
 		if (keyCode != 0)
 			getInputMap(WHEN_IN_FOCUSED_WINDOW)
-				.remove(KeyStroke.getKeyStroke(keyCode, Event.ALT_MASK));
+				.remove(KeyStroke.getKeyStroke(keyCode, ActionEvent.ALT_MASK));
 		m_mnemonic.set(index, (char)0);
 		//
 		if (!text.startsWith("<html>"))
diff --git a/org.adempiere.ui.zk-feature/feature.xml b/org.adempiere.ui.zk-feature/feature.xml
index eec2ae972d..d5ecf77c29 100644
--- a/org.adempiere.ui.zk-feature/feature.xml
+++ b/org.adempiere.ui.zk-feature/feature.xml
@@ -2,7 +2,8 @@
 <feature
       id="org.adempiere.ui.zk.feature"
       label="Zk Client-feature"
-      version="5.1.0.qualifier">
+      version="6.1.0.qualifier"
+      provider-name="iDempiere Community">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -24,7 +25,7 @@
          id="org.adempiere.ui.zk"
          download-size="0"
          install-size="0"
-         version="5.1.0.qualifier"/>
+         version="6.1.0.qualifier"/>
 
    <plugin
          id="org.atmosphere.runtime"
diff --git a/org.adempiere.ui.zk-feature/pom.xml b/org.adempiere.ui.zk-feature/pom.xml
index 677d00f2f4..a6fb4a62ca 100644
--- a/org.adempiere.ui.zk-feature/pom.xml
+++ b/org.adempiere.ui.zk-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.ui.zk.feature</artifactId>
diff --git a/org.adempiere.ui.zk/.classpath b/org.adempiere.ui.zk/.classpath
index 62a255bbe7..6a9ce5244c 100644
--- a/org.adempiere.ui.zk/.classpath
+++ b/org.adempiere.ui.zk/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="WEB-INF/src/"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/ckez.jar"/>
diff --git a/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
index 933f0e738f..b6a27d5fe0 100644
--- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Web Client
 Bundle-SymbolicName: org.adempiere.ui.zk;singleton:=true
-Bundle-Version: 5.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Version: 6.1.0.qualifier
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Import-Package: groovy.transform.stc;version="2.4.7",
- javax.activation,
- javax.annotation;version="1.2.0",
+ javax.annotation,
  javax.annotation.processing,
- javax.annotation.security;version="1.2.0",
- javax.annotation.sql;version="1.2.0",
+ javax.annotation.security,
+ javax.annotation.sql,
  javax.servlet,
  javax.servlet.annotation;version="3.1.0",
  javax.servlet.http,
  javax.servlet.jsp.resources;version="2.3.0",
  javax.servlet.resources;version="3.1.0",
+ javax.xml.bind;version="2.3.0",
  net.sf.jasperreports.engine,
  net.sf.jasperreports.engine.export,
  net.sf.jasperreports.engine.util,
@@ -31,6 +31,7 @@ Import-Package: groovy.transform.stc;version="2.4.7",
  org.apache.tools.ant,
  org.apache.tools.ant.taskdefs,
  org.compiere.css,
+ org.eclipse.core.runtime;version="3.4.0",
  org.jfree.chart,
  org.jfree.chart.encoders,
  org.jfree.chart.entity,
@@ -39,7 +40,6 @@ Import-Package: groovy.transform.stc;version="2.4.7",
  org.jfree.data.general,
  org.jfree.data.time,
  org.jfree.util,
- org.eclipse.core.runtime;version="3.4.0",
  org.osgi.framework;version="1.7.0",
  org.osgi.service.event;version="1.3.0",
  org.osgi.util.tracker;version="1.5.0",
@@ -153,10 +153,12 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  org.junit;bundle-version="0.0.0",
  org.apache.commons.io;bundle-version="0.0.0",
  com.itextpdf;bundle-version="0.0.0",
- org.atmosphere.runtime;bundle-version="0.0.0"
+ org.atmosphere.runtime;bundle-version="0.0.0",
+ javax.activation;bundle-version="1.1.0"
 Bundle-Activator: org.adempiere.webui.WebUIActivator
 Eclipse-ExtensibleAPI: true
 Web-ContextPath: webui
 Service-Component: OSGI-INF/reportviewerprovider.xml, OSGI-INF/defaultinfofactory.xml, OSGI-INF/defaulteditorfactory.xml, OSGI-INF/jrviewerprovider.xml, OSGI-INF/resourcefinder.xml, OSGI-INF/defaultpaymentformfactory.xml, OSGI-INF/processfactory.xml, OSGI-INF/defaultprintshippinglabel.xml, OSGI-INF/defaultcreatefromfactory.xml, OSGI-INF/defaultformfactory.xml, OSGI-INF/feedbackservice.xml, OSGI-INF/zulgadgetfactory.xml, OSGI-INF/jfgchartrenderer.xml
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.adempiere.ui.zk
+Bundle-Vendor: iDempiere Community
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
index 90519902d4..133e677705 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
@@ -350,7 +350,7 @@ public class AdempiereWebUI extends Window implements EventListener<Event>, IWeb
 			try
 			{
 				Class<?> clazz = this.getClass().getClassLoader().loadClass(className);
-				appDesktop = (IDesktop) clazz.newInstance();
+				appDesktop = (IDesktop) clazz.getDeclaredConstructor().newInstance();
 			}
 			catch (Throwable t)
 			{
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ShowMaskWrapper.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ShowMaskWrapper.java
index 870ee87d7a..da3e325a5f 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ShowMaskWrapper.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ShowMaskWrapper.java
@@ -103,7 +103,7 @@ public class ShowMaskWrapper implements ISupportMask {
 	 * @param comp
 	 */
 	public static void setFlagShowMask (Component comp){
-		comp.setAttribute(ISupportMask.READY_SHOW_MASK_FLAG, new Integer(1), Component.REQUEST_SCOPE);
+		comp.setAttribute(ISupportMask.READY_SHOW_MASK_FLAG, Integer.valueOf(1), Component.REQUEST_SCOPE);
 	}
 	
 	/**
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WRequest.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WRequest.java
index ccb5a1a0c0..69258c35c4 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WRequest.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WRequest.java
@@ -230,47 +230,47 @@ public class WRequest implements EventListener<Event>
 		{
 			GridTab tab = frame.getADWindowContent().getActiveGridTab();
 			tab.dataNew (false);
-			tab.setValue("AD_Table_ID", new Integer(m_AD_Table_ID));
-			tab.setValue("Record_ID", new Integer(m_Record_ID));
+			tab.setValue("AD_Table_ID", Integer.valueOf(m_AD_Table_ID));
+			tab.setValue("Record_ID", Integer.valueOf(m_Record_ID));
 			//
 			if (m_C_BPartner_ID != 0)
-				tab.setValue("C_BPartner_ID", new Integer(m_C_BPartner_ID));
+				tab.setValue("C_BPartner_ID", Integer.valueOf(m_C_BPartner_ID));
 			//
 			if (m_AD_Table_ID == MBPartner.Table_ID)
-				tab.setValue("C_BPartner_ID", new Integer(m_Record_ID));
+				tab.setValue("C_BPartner_ID", Integer.valueOf(m_Record_ID));
 			else if (m_AD_Table_ID == MUser.Table_ID)
-				tab.setValue("AD_User_ID", new Integer(m_Record_ID));
+				tab.setValue("AD_User_ID", Integer.valueOf(m_Record_ID));
 			//
 			else if (m_AD_Table_ID == MProject.Table_ID)
-				tab.setValue("C_Project_ID", new Integer(m_Record_ID));
+				tab.setValue("C_Project_ID", Integer.valueOf(m_Record_ID));
 			else if (m_AD_Table_ID == MAsset.Table_ID)
-				tab.setValue("A_Asset_ID", new Integer(m_Record_ID));
+				tab.setValue("A_Asset_ID", Integer.valueOf(m_Record_ID));
 			//
 			else if (m_AD_Table_ID == MOrder.Table_ID)
-				tab.setValue("C_Order_ID", new Integer(m_Record_ID));
+				tab.setValue("C_Order_ID", Integer.valueOf(m_Record_ID));
 			else if (m_AD_Table_ID == MInvoice.Table_ID)
-				tab.setValue("C_Invoice_ID", new Integer(m_Record_ID));
+				tab.setValue("C_Invoice_ID", Integer.valueOf(m_Record_ID));
 			//
 			else if (m_AD_Table_ID == MProduct.Table_ID)
-				tab.setValue("M_Product_ID", new Integer(m_Record_ID));
+				tab.setValue("M_Product_ID", Integer.valueOf(m_Record_ID));
 			else if (m_AD_Table_ID == MPayment.Table_ID)
-				tab.setValue("C_Payment_ID", new Integer(m_Record_ID));
+				tab.setValue("C_Payment_ID", Integer.valueOf(m_Record_ID));
 			//
 			else if (m_AD_Table_ID == MInOut.Table_ID)
-				tab.setValue("M_InOut_ID", new Integer(m_Record_ID));
+				tab.setValue("M_InOut_ID", Integer.valueOf(m_Record_ID));
 			else if (m_AD_Table_ID == MRMA.Table_ID)
-				tab.setValue("M_RMA_ID", new Integer(m_Record_ID));
+				tab.setValue("M_RMA_ID", Integer.valueOf(m_Record_ID));
 			//
 			else if (m_AD_Table_ID == MCampaign.Table_ID)
-				tab.setValue("C_Campaign_ID", new Integer(m_Record_ID));
+				tab.setValue("C_Campaign_ID", Integer.valueOf(m_Record_ID));
 			//
 			else if (m_AD_Table_ID == MRequest.Table_ID)
-				tab.setValue(MRequest.COLUMNNAME_R_RequestRelated_ID, new Integer(m_Record_ID));
+				tab.setValue(MRequest.COLUMNNAME_R_RequestRelated_ID, Integer.valueOf(m_Record_ID));
 			// FR [2842165] - Order Ref link from SO line creating new request
 			else if (m_AD_Table_ID == MOrderLine.Table_ID) {
 				MOrderLine oLine = new MOrderLine(Env.getCtx(), m_Record_ID, null);
 				if (oLine != null) {
-					tab.setValue(MOrderLine.COLUMNNAME_C_Order_ID, new Integer(oLine.getC_Order_ID()));
+					tab.setValue(MOrderLine.COLUMNNAME_C_Order_ID, Integer.valueOf(oLine.getC_Order_ID()));
 				}
 			}
 		}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewerData.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewerData.java
index 6ba01d5a99..6a4385a0dd 100755
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewerData.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewerData.java
@@ -241,7 +241,7 @@ public class WAcctViewerData
 
 				ValueNamePair pp = new ValueNamePair(tableName, name);
 				cb.appendItem(pp.getName(),pp);
-				tableInfo.put (tableName, new Integer(id));
+				tableInfo.put (tableName, Integer.valueOf(id));
 				
 				if (id == AD_Table_ID)
 					select = pp;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
index 6c76294bd3..4f8a4e9993 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
@@ -2609,7 +2609,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
 			{
 				if (link.endsWith("_ID"))
 					query.addRestriction(link, MQuery.EQUAL,
-						new Integer(Env.getContextAsInt(ctx, curWindowNo, link)));
+						Integer.valueOf(Env.getContextAsInt(ctx, curWindowNo, link)));
 				else
 					query.addRestriction(link, MQuery.EQUAL,
 						Env.getContext(ctx, curWindowNo, link));
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AbstractProcessDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AbstractProcessDialog.java
index 0b636cff00..f584ec7e13 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AbstractProcessDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AbstractProcessDialog.java
@@ -378,6 +378,17 @@ public abstract class AbstractProcessDialog extends Window implements IProcessUI
 			
 			row.appendChild(notificationTypeField.getComponent());
 			runAsJobField.setChecked(MSysConfig.getBooleanValue(MSysConfig.BACKGROUND_JOB_BY_DEFAULT, false));
+			
+			//Check force background
+			MProcess process = MProcess.get(Env.getCtx(), m_AD_Process_ID);
+			if (process.isForceBackground()) {
+				runAsJobField.setChecked(true);
+				runAsJobField.setEnabled(false);
+			} else if (process.isForceForeground()) {
+				runAsJobField.setChecked(false);
+				runAsJobField.setEnabled(false);
+				runAsJobField.setVisible(false);
+			}
 			notificationTypeField.getComponent().getParent().setVisible(runAsJobField.isChecked());
 			notificationTypeField.fillHorizontal();
 		}
@@ -769,6 +780,12 @@ public abstract class AbstractProcessDialog extends Window implements IProcessUI
 	
 	protected void startProcess()
 	{
+		if (m_pi.isProcessRunning(parameterPanel.getParameters())) {
+			FDialog.error(getWindowNo(), "ProcessAlreadyRunning");
+			log.log(Level.WARNING, "Abort process " + m_AD_Process_ID + " because it is already running");
+			return;
+		}
+
 		if (!parameterPanel.validateParameters())
 			return;
 		
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java
index ae6aa3f3c9..7adcedeca7 100755
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java
@@ -436,7 +436,7 @@ public class WAllocation extends Allocation
 		int AD_Column_ID = COLUMN_C_INVOICE_C_CURRENCY_ID;    //  C_Invoice.C_Currency_ID
 		MLookup lookupCur = MLookupFactory.get (Env.getCtx(), form.getWindowNo(), 0, AD_Column_ID, DisplayType.TableDir);
 		currencyPick = new WTableDirEditor("C_Currency_ID", true, false, true, lookupCur);
-		currencyPick.setValue(new Integer(m_C_Currency_ID));
+		currencyPick.setValue(Integer.valueOf(m_C_Currency_ID));
 		currencyPick.addValueChangeListener(this);
 
 		// Organization filter selection
@@ -471,14 +471,14 @@ public class WAllocation extends Allocation
 		AD_Column_ID = 61804;    //  C_AllocationLine.C_Charge_ID
 		MLookup lookupCharge = MLookupFactory.get (Env.getCtx(), form.getWindowNo(), 0, AD_Column_ID, DisplayType.TableDir);
 		chargePick = new WTableDirEditor("C_Charge_ID", false, false, true, lookupCharge);
-		chargePick.setValue(new Integer(m_C_Charge_ID));
+		chargePick.setValue(Integer.valueOf(m_C_Charge_ID));
 		chargePick.addValueChangeListener(this);
 		
 	//  Charge
 			AD_Column_ID = 212213;    //  C_AllocationLine.C_Charge_ID
 			MLookup lookupDocType = MLookupFactory.get (Env.getCtx(), form.getWindowNo(), 0, AD_Column_ID, DisplayType.TableDir);
 			DocTypePick = new WTableDirEditor("C_DocType_ID", false, false, true, lookupDocType);
-			DocTypePick.setValue(new Integer(m_C_DocType_ID));
+			DocTypePick.setValue(Integer.valueOf(m_C_DocType_ID));
 			DocTypePick.addValueChangeListener(this);
 			
 	}   //  dynInit
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WBOMDrop.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WBOMDrop.java
index a8c64247b5..c878505a5c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WBOMDrop.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WBOMDrop.java
@@ -573,7 +573,7 @@ public class WBOMDrop extends ADForm implements EventListener<Event>
 		productPanel.appendChild(rightInden);
 
 		//	Add to List
-		m_productList.add (new Integer(M_Product_ID));
+		m_productList.add (Integer.valueOf(M_Product_ID));
 
 		// add product name
 		selectPanel = createDivPanel(200);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromDepositBatchUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromDepositBatchUI.java
index 530b0b2e1a..f89f0d667f 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromDepositBatchUI.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromDepositBatchUI.java
@@ -154,7 +154,7 @@ public class WCreateFromDepositBatchUI extends CreateFromDepositBatch implements
 		bankAccountField = new WTableDirEditor ("C_BankAccount_ID", true, false, true, lookup);
 		//  Set Default
 		int C_BankAccount_ID = Env.getContextAsInt(Env.getCtx(), p_WindowNo, "C_BankAccount_ID");
-		bankAccountField.setValue(new Integer(C_BankAccount_ID));
+		bankAccountField.setValue(Integer.valueOf(C_BankAccount_ID));
 		//  initial Loading
 		authorizationField = new WStringEditor ("authorization", false, false, true, 10, 30, null, null);
 //		authorizationField.getComponent().addEventListener(Events.ON_CHANGE, this);
@@ -162,7 +162,7 @@ public class WCreateFromDepositBatchUI extends CreateFromDepositBatch implements
 		lookup = MLookupFactory.get (Env.getCtx(), p_WindowNo, 0, MColumn.getColumn_ID(MPayment.Table_Name, MPayment.COLUMNNAME_C_DocType_ID), DisplayType.TableDir);
 		documentTypeField = new WTableDirEditor (MPayment.COLUMNNAME_C_DocType_ID,false,false,true,lookup);
 		int C_DocType_ID = Env.getContextAsInt(Env.getCtx(), p_WindowNo, "C_DocType_ID");
-		documentTypeField.setValue(new Integer(C_DocType_ID));
+		documentTypeField.setValue(Integer.valueOf(C_DocType_ID));
 //		documentTypeField.getComponent().addEventListener(Events.ON_CHANGE, this);
 		
 		lookup = MLookupFactory.get (Env.getCtx(), p_WindowNo, 0, MColumn.getColumn_ID(MPayment.Table_Name, MPayment.COLUMNNAME_TenderType), DisplayType.List);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromForm.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromForm.java
index acc5c79908..95d4603f9f 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromForm.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromForm.java
@@ -178,7 +178,7 @@ public class WCreateFromForm extends ADForm implements EventListener<Event>, WTa
 			int rows = model.getSize();
 			for (int i = 0; i < rows; i++)
 			{
-				model.setValueAt(new Boolean(true), i, 0);
+				model.setValueAt(Boolean.TRUE, i, 0);
 			}
 			//refresh
 			dataTable.setModel(model);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromInvoiceUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromInvoiceUI.java
index e0f7f91ada..962cb9d92e 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromInvoiceUI.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromInvoiceUI.java
@@ -295,7 +295,7 @@ public class WCreateFromInvoiceUI extends CreateFromInvoice implements EventList
 		bPartnerField = new WSearchEditor ("C_BPartner_ID", true, false, true, lookup);
 		//
 		int C_BPartner_ID = Env.getContextAsInt(Env.getCtx(), p_WindowNo, "C_BPartner_ID");
-		bPartnerField.setValue(new Integer(C_BPartner_ID));
+		bPartnerField.setValue(Integer.valueOf(C_BPartner_ID));
 
 		//  initial loading
 		initBPOrderDetails(C_BPartner_ID, forInvoice);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromRMAUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromRMAUI.java
index c8ddb471fe..47ac42af45 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromRMAUI.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromRMAUI.java
@@ -153,7 +153,7 @@ public class WCreateFromRMAUI extends CreateFromRMA implements ValueChangeListen
 		bPartnerField = new WSearchEditor ("C_BPartner_ID", true, false, true, lookup);
 		//
 		int C_BPartner_ID = Env.getContextAsInt(Env.getCtx(), p_WindowNo, "C_BPartner_ID");
-		bPartnerField.setValue(new Integer(C_BPartner_ID));
+		bPartnerField.setValue(Integer.valueOf(C_BPartner_ID));
 	}   //  initBPartner
 	
 	protected void loadRMA()
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java
index 8e9f4fc7c4..3e7b265b51 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java
@@ -412,7 +412,7 @@ public class WCreateFromShipmentUI extends CreateFromShipment implements EventLi
 		bPartnerField = new WSearchEditor ("C_BPartner_ID", true, false, true, lookup);
 		//
 		int C_BPartner_ID = Env.getContextAsInt(Env.getCtx(), p_WindowNo, "C_BPartner_ID");
-		bPartnerField.setValue(new Integer(C_BPartner_ID));
+		bPartnerField.setValue(Integer.valueOf(C_BPartner_ID));
 
 		//  initial loading
 		initBPOrderDetails(C_BPartner_ID, forInvoice);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromStatementUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromStatementUI.java
index 637127696e..e9253c63d1 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromStatementUI.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromStatementUI.java
@@ -155,7 +155,7 @@ public class WCreateFromStatementUI extends CreateFromStatement implements Event
 		bankAccountField = new WTableDirEditor ("C_BankAccount_ID", true, false, true, lookup);
 		//  Set Default
 		int C_BankAccount_ID = Env.getContextAsInt(Env.getCtx(), p_WindowNo, "C_BankAccount_ID");
-		bankAccountField.setValue(new Integer(C_BankAccount_ID));
+		bankAccountField.setValue(Integer.valueOf(C_BankAccount_ID));
 		//  initial Loading
 		authorizationField = new WStringEditor ("authorization", false, false, true, 10, 30, null, null);
 		authorizationField.getComponent().addEventListener(Events.ON_CHANGE, this);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java
index c67c55cb63..84f7018ac9 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java
@@ -267,7 +267,7 @@ public class WPayPrint extends PayPrint implements IFormController, EventListene
 			return;
 		//
 		m_C_PaySelection_ID = C_PaySelection_ID;
-		paySelectSearch.setValue(new Integer(m_C_PaySelection_ID));
+		paySelectSearch.setValue(Integer.valueOf(m_C_PaySelection_ID));
 		loadPaySelectInfo();
 	}	//	setsetPaySelection
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaymentFormCash.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaymentFormCash.java
index 828cd6ad32..8782052149 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaymentFormCash.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaymentFormCash.java
@@ -134,7 +134,7 @@ public class WPaymentFormCash extends PaymentFormCash implements EventListener<E
 		bDateField.setValue(m_DateAcct);
 		
 		// Is the currency an EMU currency?
-		Integer C_Currency_ID = new Integer(m_C_Currency_ID);
+		Integer C_Currency_ID = Integer.valueOf(m_C_Currency_ID);
 		if (s_Currencies.containsKey(C_Currency_ID)) {
 			Enumeration<Integer> en = s_Currencies.keys();
 			while (en.hasMoreElements()) {
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaymentFormCheck.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaymentFormCheck.java
index 5d89ace766..1b4638158e 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaymentFormCheck.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaymentFormCheck.java
@@ -160,7 +160,7 @@ public class WPaymentFormCheck extends PaymentFormCheck implements EventListener
 		}
 		
 		//	Is the currency an EMU currency?
-		Integer C_Currency_ID = new Integer(m_C_Currency_ID);
+		Integer C_Currency_ID = Integer.valueOf(m_C_Currency_ID);
 		if (s_Currencies.containsKey(C_Currency_ID))
 		{
 			Enumeration<Integer> en = s_Currencies.keys();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WStatementCreateFromBatch.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WStatementCreateFromBatch.java
index 31e3d67ba1..d7ff610192 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WStatementCreateFromBatch.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WStatementCreateFromBatch.java
@@ -155,7 +155,7 @@ public class WStatementCreateFromBatch extends StatementCreateFromBatch implemen
 		bankAccountField = new WTableDirEditor ("C_BankAccount_ID", true, false, true, lookup);
 		//  Set Default
 		int C_BankAccount_ID = Env.getContextAsInt(Env.getCtx(), p_WindowNo, "C_BankAccount_ID");
-		bankAccountField.setValue(new Integer(C_BankAccount_ID));
+		bankAccountField.setValue(Integer.valueOf(C_BankAccount_ID));
 		//  initial Loading
 		authorizationField = new WStringEditor ("authorization", false, false, true, 10, 30, null, null);
 		authorizationField.getComponent().addEventListener(Events.ON_CHANGE, this);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeBOM.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeBOM.java
index 6d97119c78..433ae654a0 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeBOM.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeBOM.java
@@ -16,6 +16,7 @@
 package org.adempiere.webui.apps.form;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
@@ -320,14 +321,14 @@ public class WTreeBOM extends TreeBOM implements IFormController, EventListener<
 		treeInfo.setText (Msg.getElement(Env.getCtx(), "Sel_Product_ID")+": "+product.getValue());
 
 		Vector<Object> line = new Vector<Object>(10);
-		line.add( new Boolean(product.isActive()));   //  0 IsActive
-		line.add( new Integer(0).toString()); // 1 Line
+		line.add( Boolean.valueOf(product.isActive()));   //  0 IsActive
+		line.add( Integer.valueOf(0).toString()); // 1 Line
 		KeyNamePair pp = new KeyNamePair(product.getM_Product_ID(),product.getValue().concat("_").concat(product.getName()));
 		line.add(pp); //  2 M_Product_ID
 		MUOM u = new MUOM(product.getCtx(), product.getC_UOM_ID(), product.get_TrxName());
 		KeyNamePair uom = new KeyNamePair(u.get_ID(),u.getUOMSymbol());
 		line.add(uom); //  3 C_UOM_ID
-		line.add((BigDecimal) (Env.ONE).setScale(4, BigDecimal.ROUND_HALF_UP).stripTrailingZeros());  //  4 QtyBOM
+		line.add((BigDecimal) (Env.ONE).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros());  //  4 QtyBOM
 
 		// dummy root node, as first node is not displayed in tree  
 		mySimpleTreeNode parent = new mySimpleTreeNode("Root",new ArrayList<TreeNode<Object>>());
@@ -442,14 +443,14 @@ public class WTreeBOM extends TreeBOM implements IFormController, EventListener<
 		MProduct M_Product = MProduct.get(getCtx(), bomline.getM_ProductBOM_ID());
 
 		Vector<Object> line = new Vector<Object>(10);
-		line.add( new Boolean(bomline.isActive()));   //  0 IsActive
-		line.add( new Integer(bomline.getLine()).toString()); // 1 Line
+		line.add( Boolean.valueOf(bomline.isActive()));   //  0 IsActive
+		line.add( Integer.valueOf(bomline.getLine()).toString()); // 1 Line
 		KeyNamePair pp = new KeyNamePair(M_Product.getM_Product_ID(),M_Product.getValue().concat("_").concat(M_Product.getName()));
 		line.add(pp); //  2 M_Product_ID
 		MUOM u = new MUOM(M_Product.getCtx(), M_Product.getC_UOM_ID(), M_Product.get_TrxName());
 		KeyNamePair uom = new KeyNamePair(u.get_ID(),u.getUOMSymbol());
 		line.add(uom); //  3 C_UOM_ID
-		line.add((BigDecimal) ((bomline.getBOMQty()!=null) ? bomline.getBOMQty() : Env.ZERO).setScale(4, BigDecimal.ROUND_HALF_UP).stripTrailingZeros());  //  4 QtyBOM
+		line.add((BigDecimal) ((bomline.getBOMQty()!=null) ? bomline.getBOMQty() : Env.ZERO).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros());  //  4 QtyBOM
 
 		mySimpleTreeNode child = new mySimpleTreeNode(line,new ArrayList<TreeNode<Object>>());
 		if (!reload)
@@ -471,14 +472,14 @@ public class WTreeBOM extends TreeBOM implements IFormController, EventListener<
 		MProduct M_Product = MProduct.get(getCtx(), bom.getM_Product_ID());
 
 		Vector<Object> line = new Vector<Object>(10);
-		line.add( new Boolean(M_Product.isActive()));   //  0 IsActive
-		line.add( new Integer(bom.getLine()).toString()); // 1 Line
+		line.add( Boolean.valueOf(M_Product.isActive()));   //  0 IsActive
+		line.add( Integer.valueOf(bom.getLine()).toString()); // 1 Line
 		KeyNamePair pp = new KeyNamePair(M_Product.getM_Product_ID(),M_Product.getValue().concat("_").concat(M_Product.getName()));
 		line.add(pp); //  2 M_Product_ID
 		MUOM u = new MUOM(M_Product.getCtx(), M_Product.getC_UOM_ID(), M_Product.get_TrxName());
 		KeyNamePair uom = new KeyNamePair(u.get_ID(),u.getUOMSymbol());
 		line.add(uom); //  3 C_UOM_ID
-		line.add((BigDecimal) ((bom.getBOMQty()!=null) ? bom.getBOMQty() : Env.ZERO).setScale(4, BigDecimal.ROUND_HALF_UP).stripTrailingZeros());  //  4 QtyBOM
+		line.add((BigDecimal) ((bom.getBOMQty()!=null) ? bom.getBOMQty() : Env.ZERO).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros());  //  4 QtyBOM
 
 		if(m_selected_id == bom.getM_ProductBOM_ID() || getM_Product_ID() == bom.getM_ProductBOM_ID())		
 			dataBOM.add(line);
@@ -563,7 +564,7 @@ class mySimpleTreeNode extends DefaultTreeNode<Object>
 		sb.append(" ["+((KeyNamePair) userObject.elementAt(3)).getName().trim()+"]");
 		// BOMQty
 		BigDecimal BOMQty = (BigDecimal)(userObject.elementAt(4));
-		sb.append("x"+BOMQty.setScale(2, BigDecimal.ROUND_HALF_UP).stripTrailingZeros());
+		sb.append("x"+BOMQty.setScale(2, RoundingMode.HALF_UP).stripTrailingZeros());
 		
 		return sb.toString();
 	}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WGraph.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WGraph.java
index 7006a6000a..28f0b8d3b4 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WGraph.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WGraph.java
@@ -15,6 +15,7 @@ package org.adempiere.webui.apps.graph;
 
 import java.awt.Point;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -417,7 +418,7 @@ public class WGraph extends Div implements IdSpace {
 		td.setSclass("pa-tdcontent");
 		tr.appendChild(td);
 		text = new Text(format.format(m_goal.getMeasureTarget().setScale(2,
-				BigDecimal.ROUND_HALF_UP)));
+				RoundingMode.HALF_UP)));
 		td.appendChild(text);
 
 		tr = new Tr();
@@ -432,7 +433,7 @@ public class WGraph extends Div implements IdSpace {
 		td.setSclass("pa-tdcontent");
 		tr.appendChild(td);
 		text = new Text(format.format(m_goal.getMeasureActual().setScale(2,
-				BigDecimal.ROUND_HALF_UP)));
+				RoundingMode.HALF_UP)));
 		td.appendChild(text);
 
 		GraphColumn[] bList = getGraphColumnList();
@@ -483,11 +484,11 @@ public class WGraph extends Div implements IdSpace {
 
 				});
 				a.setDynamicProperty("href", "javascript:;");
-				text = new Text(format.format(value.setScale(2, BigDecimal.ROUND_HALF_UP)));
+				text = new Text(format.format(value.setScale(2, RoundingMode.HALF_UP)));
 				a.appendChild(text);
 
 			} else {
-				text = new Text(format.format(value.setScale(2, BigDecimal.ROUND_HALF_UP)));
+				text = new Text(format.format(value.setScale(2, RoundingMode.HALF_UP)));
 			}
 		}
 		tr = new Tr();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WAppsAction.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WAppsAction.java
index 4e58a77893..1790361444 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WAppsAction.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WAppsAction.java
@@ -78,7 +78,7 @@ public class WAppsAction
        int pos = newToolTipText.indexOf('&');
        if (pos != -1  && newToolTipText.length() > pos)   //  We have a nemonic - creates ALT-_
        {
-           Character ch = new Character(newToolTipText.toLowerCase().charAt(pos + 1));
+           Character ch = Character.valueOf(newToolTipText.toLowerCase().charAt(pos + 1));
            if (ch != ' ')
            {
                // remove ampersand
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WInfoWindowListItemRenderer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WInfoWindowListItemRenderer.java
index 94121d2159..799344fe50 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WInfoWindowListItemRenderer.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WInfoWindowListItemRenderer.java
@@ -28,6 +28,7 @@ import org.adempiere.webui.editor.WebEditorFactory;
 import org.adempiere.webui.event.ValueChangeEvent;
 import org.adempiere.webui.event.ValueChangeListener;
 import org.adempiere.webui.info.InfoWindow;
+import org.compiere.minigrid.ColumnInfo;
 import org.compiere.minigrid.IDColumn;
 import org.compiere.model.GridField;
 import org.compiere.model.MInfoColumn;
@@ -36,58 +37,50 @@ import org.zkoss.zul.Listcell;
 
 public class WInfoWindowListItemRenderer extends WListItemRenderer
 {
-	private MInfoColumn[]	infoColumns;
-	private GridField[]	gridFields;
-	private int	gridFieldsOffset = -1; // There are added columns in front of the first real gridField, instead of a fixed +1 we use an offset
-	private InfoWindow infoWindow;
+	private MInfoColumn[]	gridDisplayedInfoColumns = null;
+	private ColumnInfo[]	gridDisplayedColumnInfos = null;
+	private InfoWindow infoWindow = null;
 
-	public WInfoWindowListItemRenderer(InfoWindow infoWindow, MInfoColumn[] infoColumns, List<GridField> gridFields)
+	public WInfoWindowListItemRenderer(InfoWindow infoWindow)
 	{
-		this.infoColumns = infoColumns;
-		this.gridFields = gridFields.toArray(new GridField[infoColumns.length]);
 		this.infoWindow = infoWindow;
 	}
 
-	public WInfoWindowListItemRenderer(InfoWindow infoWindow, MInfoColumn[] infoColumns, List<GridField> gridFields, List<? extends String> columnNames)
+	public WInfoWindowListItemRenderer(InfoWindow infoWindow, List<? extends String> columnNames)
 	{
 		super(columnNames);
-		this.infoColumns = infoColumns;
-		this.gridFields = gridFields.toArray(new GridField[infoColumns.length]);
 		this.infoWindow = infoWindow;
 	}
 	
-	private void calculateFieldOffest()
+	public void setGridDisplaydInfoColumns(MInfoColumn[] infoColumns, ColumnInfo[] columnInfos)
 	{
-		int colCount = getTableColumns().size();
+		this.gridDisplayedInfoColumns = infoColumns;
+		this.gridDisplayedColumnInfos = columnInfos;
+	}		
 		
-		if(colCount > infoColumns.length) // Added columns: selecetion
-			gridFieldsOffset = colCount - infoColumns.length;		
-	}
-	
 	@Override
 	protected Listcell getCellComponent(WListbox table, Object field,
 			final int rowIndex, final int columnIndex)
 	{
-		if(gridFieldsOffset < 0) // Just do it once, this assumes this rendered is not shared between grids
-			calculateFieldOffest();
-		
+		if(gridDisplayedInfoColumns == null || gridDisplayedColumnInfos == null)
+		{
+			return super.getCellComponent(table, field, rowIndex, columnIndex);
+		}
+				
 		Listcell listcell = null;
 		ListModelTable model = table.getModel();
 		Object obj = model.get(rowIndex);
 		
-		int effectiveFieldIndex = columnIndex - gridFieldsOffset;
-		 				
-		if(effectiveFieldIndex >= 0
-				&& model.isSelected(obj) )
+		MInfoColumn infoColumn = gridDisplayedInfoColumns[columnIndex];
+		
+		if(model.isSelected(obj) && infoColumn != null) // First index may be null
 		{
-			MInfoColumn infoColumn = infoColumns[effectiveFieldIndex];
-			
 			if(infoColumn.isReadOnly() == false 
 					&& columnIndex > 0)
 			{
 				ListCell listCell = new ListCell();
 
-				final GridField gridField = gridFields[effectiveFieldIndex];
+				final GridField gridField = gridDisplayedColumnInfos[columnIndex].getGridField();
 				final WEditor editor = WebEditorFactory.getEditor(gridField, false);
 				
 				// Set editor value
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListbox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListbox.java
index f442ceb2a2..59ffdce261 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListbox.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListbox.java
@@ -198,29 +198,28 @@ public class WListbox extends Listbox implements IMiniTable, TableValueChangeLis
 	{
 		//  if the first column holds a boolean and it is false, it is not editable
 		
-		// F3P: If allowed, use idcolumn as a switch for read/write
-		
-		if (column != 0)
-			return false;
-		
 		Object val = getValueAt(row, 0); 
 		
-		if ((val instanceof Boolean)
+		//  if the first column holds a boolean and it is false, it is not editable
+		if (column != 0
+			&& (val instanceof Boolean)
 			&& !((Boolean)val).booleanValue())
 		{
 			return false;
 		}
 		
-		if(val instanceof IDColumn)
+		// F3P: If allowed, use idcolumn as a switch for read/write (Some logic as boolean)
+		
+		if(allowIDColumnForReadWrite 
+			&& column != 0
+			&& val instanceof IDColumn 
+			&& ((IDColumn)val).isSelected() == false)
 		{
-			IDColumn idc = (IDColumn)val;
-			
-			if(!idc.isSelected())
-				return false;
+			return false;
 		}
 
 		//  is the column read/write?
-		if (m_readWriteColumn.contains(new Integer(column)))
+		if (m_readWriteColumn.contains(Integer.valueOf(column)))
 		{
 			return true;
 		}
@@ -303,7 +302,7 @@ public class WListbox extends Listbox implements IMiniTable, TableValueChangeLis
 	 */
 	public void setColumnReadOnly (int index, boolean readOnly)
 	{
-		Integer indexObject = new Integer(index);
+		Integer indexObject = Integer.valueOf(index);
 
 		//  Column is ReadWrite
 		if (m_readWriteColumn.contains(indexObject))
@@ -612,7 +611,7 @@ public class WListbox extends Listbox implements IMiniTable, TableValueChangeLis
 					}
 					else if (columnClass == Boolean.class)
 					{
-						data = new Boolean(rs.getString(rsColIndex).equals("Y"));
+						data = Boolean.valueOf(rs.getString(rsColIndex).equals("Y"));
 					}
 					else if (columnClass == Timestamp.class)
 					{
@@ -624,11 +623,11 @@ public class WListbox extends Listbox implements IMiniTable, TableValueChangeLis
 					}
 					else if (columnClass == Double.class)
 					{
-						data = new Double(rs.getDouble(rsColIndex));
+						data = Double.valueOf(rs.getDouble(rsColIndex));
 					}
 					else if (columnClass == Integer.class)
 					{
-						data = new Integer(rs.getInt(rsColIndex));
+						data = Integer.valueOf(rs.getInt(rsColIndex));
 					}
 					else if (columnClass == KeyNamePair.class)
 					{
@@ -732,7 +731,7 @@ public class WListbox extends Listbox implements IMiniTable, TableValueChangeLis
 					}
 					else if (columnClass == Double.class)
 					{
-						data = new Double(((BigDecimal)data).doubleValue());
+						data = Double.valueOf(((BigDecimal)data).doubleValue());
 					}
 				}
 				//  store
@@ -1203,15 +1202,15 @@ public class WListbox extends Listbox implements IMiniTable, TableValueChangeLis
 					}
 					else if (c == Double.class)
 					{
-						Double subtotal = new Double(0);
+						Double subtotal = Double.valueOf(0);
 						if(total[col] != null)
 							subtotal = (Double)(total[col]);
 						
 						Double amt =  (Double) data;
 						if(subtotal == null)
-							subtotal = new Double(0);
+							subtotal = Double.valueOf(0);
 						if(amt == null )
-							amt = new Double(0);
+							amt = Double.valueOf(0);
 						total[col] = subtotal + amt;
 						
 					}		
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java
index a632c2e1dd..79c64da72f 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java
@@ -359,7 +359,7 @@ public class CalendarWindow extends Window implements EventListener<Event>, ITab
 			String key = (String) keys.nextElement();
 			BigDecimal value = ht.get(key);
 			String name = (String) htTypes.get(key);
-			pieDataset.setValue(name == null ? "" : name, new Double(size > 0 ? value.doubleValue()/size*100 : 0));
+			pieDataset.setValue(name == null ? "" : name, Double.valueOf(size > 0 ? value.doubleValue()/size*100 : 0));
 		}
 		
 		JFreeChart chart = ChartFactory.createPieChart3D(Msg.getMsg(Env.getCtx(),"EventsAnalysis"), pieDataset, true, true, true);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java
index 2796cd1889..8b55c20837 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java
@@ -87,7 +87,7 @@ public class WAccountEditor extends WEditor implements ContextMenuListener
 	{
 		if (m_mAccount.C_ValidCombination_ID == 0)
 			return null;
-		return new Integer (m_mAccount.C_ValidCombination_ID);
+		return Integer.valueOf(m_mAccount.C_ValidCombination_ID);
 	}
 
 	@Override
@@ -201,7 +201,7 @@ public class WAccountEditor extends WEditor implements ContextMenuListener
 		//	We have a Value
 		if (C_ValidCombination_ID > 0)
 		{
-			Integer newValue = new Integer(C_ValidCombination_ID);
+			Integer newValue = Integer.valueOf(C_ValidCombination_ID);
 			Object oldValue = m_value;
 			m_value = newValue;
 			ValueChangeEvent changeEvent = new ValueChangeEvent(this, this.getColumnName(), oldValue, newValue);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAssignmentEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAssignmentEditor.java
index 05d1485a7d..515d99824a 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAssignmentEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAssignmentEditor.java
@@ -221,7 +221,7 @@ public class WAssignmentEditor extends WEditor implements ContextMenuListener {
 		// Set Value
 		if (ma != null && ma.getS_ResourceAssignment_ID() != 0)
 		{
-			setValue(new Integer(ma.getS_ResourceAssignment_ID()));
+			setValue(Integer.valueOf(ma.getS_ResourceAssignment_ID()));
 			ValueChangeEvent vce = new ValueChangeEvent(WAssignmentEditor.this, gridField.getColumnName(), oldValue, getValue());
 			fireValueChange(vce);
 		}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WImageEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WImageEditor.java
index cf0d2108e1..697e1afcc4 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WImageEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WImageEditor.java
@@ -80,7 +80,7 @@ public class WImageEditor extends WEditor
     {
     	if (m_mImage == null || m_mImage.get_ID() == 0)
 			return null;
-		return new Integer(m_mImage.get_ID());
+		return Integer.valueOf(m_mImage.get_ID());
     }
 
     @Override
@@ -171,7 +171,7 @@ public class WImageEditor extends WEditor
 						Object oldValue = getValue();
 						Integer newValue = null;
 						if (AD_Image_ID != 0)
-							newValue = new Integer (AD_Image_ID);
+							newValue = Integer.valueOf(AD_Image_ID);
 						//
 						m_mImage = null;	//	force reload
 						setValue(newValue);	//	set explicitly
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocationEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocationEditor.java
index 358e2247b8..36d513c307 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocationEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocationEditor.java
@@ -111,7 +111,7 @@ public class WLocationEditor extends WEditor implements EventListener<Event>, Pr
     {
         if (m_value == null)
             return null;
-        return new Integer(m_value.getC_Location_ID());
+        return Integer.valueOf(m_value.getC_Location_ID());
     }
 
     @Override
@@ -194,7 +194,7 @@ public class WLocationEditor extends WEditor implements EventListener<Event>, Pr
 		            int C_Location_ID = 0;
 		            if (m_value != null)
 		                C_Location_ID = m_value.getC_Location_ID();
-		            Integer ii = new Integer(C_Location_ID);
+		            Integer ii = Integer.valueOf(C_Location_ID);
 
 		            if (C_Location_ID != 0 && oldValue == 0)
 		            {
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java
index 35f4531da9..0eefaebfee 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java
@@ -427,7 +427,7 @@ public class WLocatorEditor extends WEditor implements EventListener<Event>, Pro
 		if (M_Locator_ID == 0)
 			return false;
 
-		setValue (new Integer(M_Locator_ID), true);
+		setValue (Integer.valueOf(M_Locator_ID), true);
 		return true;
 	} // actionText
 	
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WNumberEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WNumberEditor.java
index d42c7901b7..6a68e7e154 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WNumberEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WNumberEditor.java
@@ -18,6 +18,7 @@
 package org.adempiere.webui.editor;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.DecimalFormat;
 
 import org.adempiere.webui.ClientInfo;
@@ -176,10 +177,10 @@ public class WNumberEditor extends WEditor implements ContextMenuListener
 	        
 	        if (displayType == DisplayType.Integer) {
 		        if (newValue != null && newValue instanceof BigDecimal) {
-		        	newValue = new Integer(((BigDecimal)newValue).intValue());
+		        	newValue = Integer.valueOf(((BigDecimal)newValue).intValue());
 		        }
 		        if (oldValue != null && oldValue instanceof BigDecimal) {
-		        	oldValue = new Integer(((BigDecimal)oldValue).intValue());
+		        	oldValue = Integer.valueOf(((BigDecimal)oldValue).intValue());
 		        }
 	        }
 	        
@@ -221,7 +222,7 @@ public class WNumberEditor extends WEditor implements ContextMenuListener
     		divisor = BigDecimal.TEN;
     	else
     		divisor = BigDecimal.TEN.pow(decimalPlaces);
-    	BigDecimal newValue = oldValue.divide(divisor, decimalPlaces, BigDecimal.ROUND_HALF_UP);
+    	BigDecimal newValue = oldValue.divide(divisor, decimalPlaces, RoundingMode.HALF_UP);
     	return newValue;
     } //getAddDecimalPlaces
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java
index 0ae327287e..319095c56e 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java
@@ -59,7 +59,7 @@ public class WPAttributeEditor extends WEditor implements ContextMenuListener
 	private GridTab m_GridTab;
 
 	/**	No Instance Key					*/
-	private static Integer		NO_INSTANCE = new Integer(0);
+	private static Integer		NO_INSTANCE = Integer.valueOf(0);
 
 	public WPAttributeEditor(GridTab gridTab, GridField gridField)
 	{
@@ -275,7 +275,7 @@ public class WPAttributeEditor extends WEditor implements ContextMenuListener
 		if (M_AttributeSetInstance_ID == 0)
 			setValue(null);
 		else
-			setValue(new Integer(M_AttributeSetInstance_ID));
+			setValue(Integer.valueOf(M_AttributeSetInstance_ID));
 
 		ValueChangeEvent vce = new ValueChangeEvent(this, gridField.getColumnName(), new Object(), getValue());
 		fireValueChange(vce);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java
index 09fc87c0bf..682fa7e213 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java
@@ -392,7 +392,7 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value
 		if (log.isLoggable(Level.FINE))
 			log.fine(getColumnName() + " - Unique ID=" + id);
 
-		actionCombo(new Integer(id));          //  data binding
+		actionCombo(Integer.valueOf(id));          //  data binding
 		
 		Searchbox comp = getComponent();
 		Component parent = comp.getParent();
@@ -507,9 +507,9 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value
 					return;
 
 				//  Maybe new Record - put in cache
-				lookup.getDirect(new Integer(result), false, true);
-				setValue(new Integer(result));
-				actionCombo (new Integer(result));      //  data binding
+				lookup.getDirect(Integer.valueOf(result), false, true);
+				setValue(Integer.valueOf(result));
+				actionCombo (Integer.valueOf(result));      //  data binding
 				lookup.refresh();
 
 				//setValue(getValue());				
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java
index 1639834671..ae46c5d9f1 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java
@@ -565,9 +565,9 @@ ContextMenuListener, IZoomableEditor
 					return;
 
 				//  Maybe new Record - put in cache
-				Object newValue = new Integer(result);
+				Object newValue = Integer.valueOf(result);
 				lookup.getDirect(newValue, false, true);
-				setValue(new Integer(result));
+				setValue(Integer.valueOf(result));
 		        ValueChangeEvent changeEvent = new ValueChangeEvent(this, getColumnName(), oldValue, newValue);
 		        fireValueChange(changeEvent);
 		        oldValue = newValue;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WYesNoEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WYesNoEditor.java
index 667424fabb..ad135b7ab8 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WYesNoEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WYesNoEditor.java
@@ -107,7 +107,7 @@ public class WYesNoEditor extends WEditor implements ContextMenuListener
     @Override
     public Object getValue()
     {
-        return new Boolean(getComponent().isChecked());
+        return Boolean.valueOf(getComponent().isChecked());
     }
 
     @Override
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultFormFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultFormFactory.java
index b444cc18f8..f87f87b1b1 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultFormFactory.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultFormFactory.java
@@ -86,7 +86,7 @@ public class DefaultFormFactory implements IFormFactory {
     			if (clazz != null) {
     				try
 		    		{
-		    			form = clazz.newInstance();
+		    			form = clazz.getDeclaredConstructor().newInstance();
 		    		}
 		    		catch (Exception e)
 		    		{
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/WBPartner.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/WBPartner.java
index b3107baf55..9e571de890 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/WBPartner.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/WBPartner.java
@@ -343,7 +343,7 @@ public class WBPartner extends Window implements EventListener<Event>, ValueChan
 		if (m_pLocation != null)
 		{
 			int location = m_pLocation.getC_Location_ID();
-			fAddress.setValue (new Integer(location));
+			fAddress.setValue (Integer.valueOf(location));
 			
 			fPhone.setText(m_pLocation.getPhone());
 			fPhone2.setText(m_pLocation.getPhone2());
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoProductWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoProductWindow.java
index b6c92bb009..7d7cb30700 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoProductWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoProductWindow.java
@@ -706,10 +706,10 @@ public class InfoProductWindow extends InfoWindow {
 				line.add(null);							//  Date
 				double qtyOnHand = rs.getDouble(1);
 				qty += qtyOnHand;
-				line.add(new Double(qtyOnHand));  		//  Qty
+				line.add(Double.valueOf(qtyOnHand));  		//  Qty
 				line.add(null);							//  BPartner
-				line.add(new Double(rs.getDouble(3)));  //  QtyOrdered
-				line.add(new Double(rs.getDouble(2)));  //  QtyReserved
+				line.add(Double.valueOf(rs.getDouble(3)));  //  QtyOrdered
+				line.add(Double.valueOf(rs.getDouble(2)));  //  QtyReserved
 				line.add(rs.getString(7));      		//  Locator
 				String asi = rs.getString(4);
 				if (showDetail && (asi == null || asi.length() == 0))
@@ -765,15 +765,15 @@ public class InfoProductWindow extends InfoWindow {
 				Double qtyOrdered = null;
 				if (MDocType.DOCBASETYPE_PurchaseOrder.equals(DocBaseType))
 				{
-					qtyOrdered = new Double(oq);
+					qtyOrdered = Double.valueOf(oq);
 					qty += oq;
 				}
 				else
 				{
-					qtyReserved = new Double(oq);
+					qtyReserved = Double.valueOf(oq);
 					qty -= oq;
 				}
-				line.add(new Double(qty)); 		 		//  Qty
+				line.add(Double.valueOf(qty)); 		 		//  Qty
 				line.add(rs.getString(6));				//  BPartner
 				line.add(qtyOrdered);					//  QtyOrdered
 				line.add(qtyReserved);					//  QtyReserved
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java
index ff8afc7823..11751005b4 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java
@@ -157,7 +157,8 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 		
 	private boolean hasEditable = false;
 	private Map<Integer, List<Object>> cacheOriginalValues = new HashMap<>();
-	private Map<Integer, List<Object>> temporarySelectedData = new HashMap<>(); 
+	private Map<Integer, List<Object>> temporarySelectedData = new HashMap<>(); 	
+	private WInfoWindowListItemRenderer infoWindowListItemRenderer = null;
 	
 	// F3P: export 
 	
@@ -336,7 +337,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
    			}
    			
    			// save process_id, handle event will use
-   			btProcess.setAttribute(PROCESS_ID_KEY, new Integer(infoProcess.getAD_Process_ID()));
+   			btProcess.setAttribute(PROCESS_ID_KEY, Integer.valueOf(infoProcess.getAD_Process_ID()));
    			btProcess.addEventListener(Events.ON_CLICK, this);
    			// save info process to use in handle event
    			btProcess.setAttribute(ATT_INFO_PROCESS_KEY, process);
@@ -630,10 +631,10 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 				
 				if(hasEditable)
 				{
-					WInfoWindowListItemRenderer renderer = new WInfoWindowListItemRenderer(this, infoColumns, gridFields);
-					contentPanel.setItemRenderer(renderer);
+					infoWindowListItemRenderer = new WInfoWindowListItemRenderer(this);
+					contentPanel.setItemRenderer(infoWindowListItemRenderer);
 					contentPanel.setAllowIDColumnForReadWrite(true);
-					renderer.addTableValueChangeListener(contentPanel); // Replicated from WListbox constructor
+					infoWindowListItemRenderer.addTableValueChangeListener(contentPanel); // Replicated from WListbox constructor
 				}					
 			}			
 			
@@ -766,6 +767,9 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 		String keySelectClause = keyTableAlias+"."+p_keyColumn;
 		list.add(new ColumnInfo(" ", keySelectClause, IDColumn.class, true, false, null, p_keyColumn));
 		
+		List<MInfoColumn> gridDisplayedIC = new ArrayList<>();				
+		gridDisplayedIC.add(null); // First column does not have any matching info column		
+		
 		boolean haveNotProcess = !haveProcess; // A field is editabile only if is not readonly and theres a process
 				
 		int i = 0;
@@ -809,6 +813,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 				columnInfo.setGridField(gridFields.get(i));
 				columnInfo.setColumnName(infoColumn.getColumnName());
 				list.add(columnInfo);
+				gridDisplayedIC.add(infoColumn);
 				
 				if (keyColumnOfView == infoColumn){
 					if (columnInfo.getColClass().equals(IDColumn.class)) 
@@ -824,6 +829,10 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 		}
 		
 		columnInfos = list.toArray(new ColumnInfo[0]);
+		MInfoColumn gridDisplayedInfoColumns[] = gridDisplayedIC.toArray(new MInfoColumn[gridDisplayedIC.size()]);
+		
+		if(infoWindowListItemRenderer != null)
+			infoWindowListItemRenderer.setGridDisplaydInfoColumns(gridDisplayedInfoColumns,columnInfos);
 		
 		prepareTable(columnInfos, infoWindow.getFromClause(), p_whereClause, infoWindow.getOrderByClause());		
 	}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/RelatedInfoWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/RelatedInfoWindow.java
index 8cdd578352..ea38cd7714 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/RelatedInfoWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/RelatedInfoWindow.java
@@ -426,15 +426,15 @@ public class RelatedInfoWindow implements EventListener<Event>, Sortable<Object>
 				value = new IDColumn(rs.getInt(colIndex));
 			}
 			else if (c == Boolean.class)
-				value = new Boolean("Y".equals(rs.getString(colIndex)));
+				value = Boolean.valueOf("Y".equals(rs.getString(colIndex)));
 			else if (c == Timestamp.class)
 				value = rs.getTimestamp(colIndex);
 			else if (c == BigDecimal.class)
 				value = rs.getBigDecimal(colIndex);
 			else if (c == Double.class)
-				value = new Double(rs.getDouble(colIndex));
+				value = Double.valueOf(rs.getDouble(colIndex));
 			else if (c == Integer.class)
-				value = new Integer(rs.getInt(colIndex));
+				value = Integer.valueOf(rs.getInt(colIndex));
 			else if (c == KeyNamePair.class)
 			{
 				if (columnsLayout[col].isKeyPairCol())
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInOutPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInOutPanel.java
index f67bb7bb20..c2f551c128 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInOutPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInOutPanel.java
@@ -272,7 +272,7 @@ public class InfoInOutPanel extends InfoPanel implements ValueChangeListener, Ev
 		String bp = Env.getContext(Env.getCtx(), p_WindowNo, "C_BPartner_ID");
 
 		if (bp != null && bp.length() != 0)
-			fBPartner_ID.setValue(new Integer(bp));
+			fBPartner_ID.setValue(Integer.valueOf(bp));
 
 		// Prepare table
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java
index 3665f1dc03..dbae3c33d5 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java
@@ -305,7 +305,7 @@ public class InfoInvoicePanel extends InfoPanel implements ValueChangeListener
         //  Set Defaults
         String bp = Env.getContext(Env.getCtx(), p_WindowNo, "C_BPartner_ID");
         if (bp != null && bp.length() != 0)
-            editorBPartner.setValue(new Integer(bp));
+            editorBPartner.setValue(Integer.valueOf(bp));
 
         //  prepare table
         StringBuilder where = new StringBuilder("i.IsActive='Y'");
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java
index 111bc79c8f..c8f6766095 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java
@@ -282,7 +282,7 @@ public class InfoOrderPanel extends InfoPanel implements ValueChangeListener
         //  Set Defaults
         String bp = Env.getContext(Env.getCtx(), p_WindowNo, "C_BPartner_ID");
         if (bp != null && bp.length() != 0)
-            editorBPartner.setValue(new Integer(bp));
+            editorBPartner.setValue(Integer.valueOf(bp));
 
         //  prepare table
         StringBuilder where = new StringBuilder("o.IsActive='Y'");
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java
index ee414959aa..e71a68e8f0 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java
@@ -591,15 +591,15 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 
 			}
 			else if (c == Boolean.class)
-		        value = new Boolean("Y".equals(rs.getString(colIndex)));
+		        value = Boolean.valueOf("Y".equals(rs.getString(colIndex)));
 			else if (c == Timestamp.class)
 		        value = rs.getTimestamp(colIndex);
 			else if (c == BigDecimal.class)
 		        value = rs.getBigDecimal(colIndex);
 			else if (c == Double.class)
-		        value = new Double(rs.getDouble(colIndex));
+		        value = Double.valueOf(rs.getDouble(colIndex));
 			else if (c == Integer.class)
-		        value = new Integer(rs.getInt(colIndex));
+		        value = Integer.valueOf(rs.getInt(colIndex));
 			else if (c == KeyNamePair.class)
 			{				
 				if (p_layout[col].isKeyPairCol())
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java
index 7347500add..eed2d4e6cd 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java
@@ -281,7 +281,7 @@ public class InfoPaymentPanel extends InfoPanel implements ValueChangeListener,
 		String bp = Env.getContext(Env.getCtx(), p_WindowNo, "C_BPartner_ID");
 
 		if (bp != null && bp.length() != 0)
-			fBPartner_ID.setValue(new Integer(bp));
+			fBPartner_ID.setValue(Integer.valueOf(bp));
 
 		// Prepare table
 		StringBuilder where = new StringBuilder("p.IsActive='Y'");
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java
index 32ba5bf78a..3423be95f5 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java
@@ -810,12 +810,12 @@ public class InfoProductPanel extends InfoPanel implements EventListener<Event>
 		ResultSet rs = null;
 		try
 		{
-			pickPriceList.appendItem("",new Integer(0));
+			pickPriceList.appendItem("",Integer.valueOf(0));
 			pstmt = DB.prepareStatement(SQL, null);
 			rs = pstmt.executeQuery();
 			while (rs.next())
 			{
-				pickPriceList.appendItem(rs.getString(2),new Integer(rs.getInt(1)));
+				pickPriceList.appendItem(rs.getString(2),Integer.valueOf(rs.getInt(1)));
 			}
 			DB.close(rs, pstmt);
 			rs = null; pstmt = null;
@@ -827,12 +827,12 @@ public class InfoProductPanel extends InfoPanel implements EventListener<Event>
 				+ "WHERE IsActive='Y'",
 					"M_Warehouse", MRole.SQL_NOTQUALIFIED, MRole.SQL_RO)
 				+ " ORDER BY Value";
-			pickWarehouse.appendItem("", new Integer(0));
+			pickWarehouse.appendItem("", Integer.valueOf(0));
 			pstmt = DB.prepareStatement(SQL, null);
 			rs = pstmt.executeQuery();
 			while (rs.next())
 			{
-				pickWarehouse.appendItem(rs.getString("ValueName"), new Integer(rs.getInt("M_Warehouse_ID")));
+				pickWarehouse.appendItem(rs.getString("ValueName"), Integer.valueOf(rs.getInt("M_Warehouse_ID")));
 			}
 			DB.close(rs, pstmt);
 			rs = null; pstmt = null;
@@ -1506,10 +1506,10 @@ public class InfoProductPanel extends InfoPanel implements EventListener<Event>
 				line.add(null);							//  Date
 				double qtyOnHand = rs.getDouble(1);
 				qty += qtyOnHand;
-				line.add(new Double(qtyOnHand));  		//  Qty
+				line.add(Double.valueOf(qtyOnHand));  		//  Qty
 				line.add(null);							//  BPartner
-				line.add(new Double(rs.getDouble(3)));  //  QtyOrdered
-				line.add(new Double(rs.getDouble(2)));  //  QtyReserved
+				line.add(Double.valueOf(rs.getDouble(3)));  //  QtyOrdered
+				line.add(Double.valueOf(rs.getDouble(2)));  //  QtyReserved
 				line.add(rs.getString(7));      		//  Locator
 				String asi = rs.getString(4);
 				if (showDetail && (asi == null || asi.length() == 0))
@@ -1565,15 +1565,15 @@ public class InfoProductPanel extends InfoPanel implements EventListener<Event>
 				Double qtyOrdered = null;
 				if (MDocType.DOCBASETYPE_PurchaseOrder.equals(DocBaseType))
 				{
-					qtyOrdered = new Double(oq);
+					qtyOrdered = Double.valueOf(oq);
 					qty += oq;
 				}
 				else
 				{
-					qtyReserved = new Double(oq);
+					qtyReserved = Double.valueOf(oq);
 					qty -= oq;
 				}
-				line.add(new Double(qty)); 		 		//  Qty
+				line.add(Double.valueOf(qty)); 		 		//  Qty
 				line.add(rs.getString(6));				//  BPartner
 				line.add(qtyOrdered);					//  QtyOrdered
 				line.add(qtyReserved);					//  QtyReserved
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InvoiceHistory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InvoiceHistory.java
index 5aeffebed6..d1266da85c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InvoiceHistory.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InvoiceHistory.java
@@ -337,7 +337,7 @@ public class InvoiceHistory extends Window implements EventListener<Event>
 				line.add(rs.getString(1));      //  Name
 				line.add(rs.getBigDecimal(2));  //	Price
 				line.add(rs.getString(3));  //	Currency
-				line.add(new Double(rs.getDouble(5)));      //  Qty
+				line.add(Double.valueOf(rs.getDouble(5)));      //  Qty
 				BigDecimal discountBD = rs.getBigDecimal(9);
 				if (discountBD == null) {
 					double priceList = rs.getDouble(4);
@@ -571,9 +571,9 @@ public class InvoiceHistory extends Window implements EventListener<Event>
 				Vector<Object> line = new Vector<Object>(6);
 				//	1-Name, 2-MovementQty, 3-MovementDate, 4-IsSOTrx, 5-DocumentNo
 				line.add(rs.getString(1));      		//  Name
-				line.add(new Double(rs.getDouble(2)));  //  Qty
+				line.add(Double.valueOf(rs.getDouble(2)));  //  Qty
 				line.add(rs.getTimestamp(3));   		//  Date
-				line.add(new Boolean("Y".equals(rs.getString(4))));	//  IsSOTrx
+				line.add(Boolean.valueOf("Y".equals(rs.getString(4))));	//  IsSOTrx
 				line.add(rs.getString(5));				//  DocNo
 				line.add(rs.getString(6));				//  Warehouse
 				data.add(line);
@@ -664,10 +664,10 @@ public class InvoiceHistory extends Window implements EventListener<Event>
 				line.add(null);							//  Date
 				double qtyOnHand = rs.getDouble(1);
 				qty += qtyOnHand;
-				line.add(new Double(qtyOnHand));  		//  Qty
+				line.add(Double.valueOf(qtyOnHand));  		//  Qty
 				line.add(null);							//  BPartner
-				line.add(new Double(rs.getDouble(3)));  //  QtyOrdered
-				line.add(new Double(rs.getDouble(2)));  //  QtyReserved
+				line.add(Double.valueOf(rs.getDouble(3)));  //  QtyOrdered
+				line.add(Double.valueOf(rs.getDouble(2)));  //  QtyReserved
 				line.add(rs.getString(7));      		//  Locator
 				String asi = rs.getString(4);
 				if (showDetailATP && (asi == null || asi.length() == 0))
@@ -723,15 +723,15 @@ public class InvoiceHistory extends Window implements EventListener<Event>
 				Double qtyOrdered = null;
 				if (MDocType.DOCBASETYPE_PurchaseOrder.equals(DocBaseType))
 				{
-					qtyOrdered = new Double(oq);
+					qtyOrdered = Double.valueOf(oq);
 					qty += oq;
 				}
 				else
 				{
-					qtyReserved = new Double(oq);
+					qtyReserved = Double.valueOf(oq);
 					qty -= oq;
 				}
-				line.add(new Double(qty)); 		 		//  Qty
+				line.add(Double.valueOf(qty)); 		 		//  Qty
 				line.add(rs.getString(6));				//  BPartner
 				line.add(qtyOrdered);					//  QtyOrdered
 				line.add(qtyReserved);					//  QtyReserved
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java
index b92ef2e7d8..739cf32c04 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java
@@ -402,7 +402,7 @@ public class RolePanel extends Window implements EventListener<Event>, Deferrabl
 			{
 				initDefault=m_userpreference.getProperty( UserPreference.P_ROLE );
 			}
-            KeyNamePair clientKNPair = new KeyNamePair(new Integer((String)lstItemClient.getValue()), lstItemClient.getLabel());
+            KeyNamePair clientKNPair = new KeyNamePair(Integer.valueOf((String)lstItemClient.getValue()), lstItemClient.getLabel());
             KeyNamePair roleKNPairs[] = login.getRoles(m_userName, clientKNPair);
             if (roleKNPairs != null && roleKNPairs.length > 0)
             {
@@ -457,7 +457,7 @@ public class RolePanel extends Window implements EventListener<Event>, Deferrabl
 			{
 				initDefault=m_userpreference.getProperty( UserPreference.P_ORG );
 			}
-            KeyNamePair RoleKNPair = new KeyNamePair(new Integer((String)lstItemRole.getValue()), lstItemRole.getLabel());
+            KeyNamePair RoleKNPair = new KeyNamePair(Integer.valueOf((String)lstItemRole.getValue()), lstItemRole.getLabel());
             KeyNamePair orgKNPairs[] = login.getOrgs(RoleKNPair);
             if(orgKNPairs != null && orgKNPairs.length > 0)
             {
@@ -496,7 +496,7 @@ public class RolePanel extends Window implements EventListener<Event>, Deferrabl
 			{
 				initDefault=m_userpreference.getProperty( UserPreference.P_WAREHOUSE );
 			}
-            KeyNamePair organisationKNPair = new KeyNamePair(new Integer((String)lstItemOrganisation.getValue()), lstItemOrganisation.getLabel());
+            KeyNamePair organisationKNPair = new KeyNamePair(Integer.valueOf((String)lstItemOrganisation.getValue()), lstItemOrganisation.getLabel());
             KeyNamePair warehouseKNPairs[] = login.getWarehouses(organisationKNPair);
             if(warehouseKNPairs != null && warehouseKNPairs.length > 0)
             {
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java
index 0c38b31066..21595d04ed 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java
@@ -20,6 +20,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
@@ -416,7 +417,7 @@ public class WAttachment extends Window implements EventListener<Event>
 				size = size.divide(new BigDecimal("1024"));
 				unit = " MB";
 			}
-			size = size.setScale(2, BigDecimal.ROUND_HALF_EVEN);
+			size = size.setScale(2, RoundingMode.HALF_EVEN);
 			sizeLabel.setText(size.toPlainString() + unit);
 
 			bSave.setEnabled(true);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/CSVImportAction.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/CSVImportAction.java
index c2f72d2113..4aeb7723bd 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/CSVImportAction.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/CSVImportAction.java
@@ -24,14 +24,8 @@
  **********************************************************************/
 package org.adempiere.webui.panel.action;
 
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileWriter;
-import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -63,6 +57,8 @@ import org.adempiere.webui.util.ReaderInputStream;
 import org.adempiere.webui.util.ZKUpdateUtil;
 import org.compiere.model.GridTab;
 import org.compiere.model.MImportTemplate;
+import org.compiere.model.MQuery;
+import org.compiere.model.MRole;
 import org.compiere.util.DB;
 import org.compiere.util.Env;
 import org.compiere.util.Msg;
@@ -295,6 +291,13 @@ public class CSVImportAction implements EventListener<Event>
 
 	private void importFile() {
 		try {
+			MQuery query = panel.getActiveGridTab().getQuery();
+			MQuery detailQuery = null;
+			if (panel.getADTab() != null && panel.getADTab().getSelectedDetailADTabpanel() != null
+					&& panel.getADTab().getSelectedDetailADTabpanel().getGridTab() != null)
+				detailQuery = panel.getADTab().getSelectedDetailADTabpanel().getGridTab().getQuery();
+
+
 			IADTabbox adTab = panel.getADTab();
 			int selected = adTab.getSelectedIndex();
 			int tabLevel = panel.getActiveGridTab().getTabLevel();
@@ -330,7 +333,7 @@ public class CSVImportAction implements EventListener<Event>
 				return;
 
 			String iMode = (String)importItem.getValue();
-			m_file_istream = validateFile(m_file_istream, theTemplate);
+			m_file_istream = theTemplate.validateFile(m_file_istream);
 			File outFile = theCSVImporter.fileImport(panel.getActiveGridTab(), childs, m_file_istream, charset,iMode);
 			winImportFile.onClose();
 			winImportFile = null;
@@ -339,6 +342,19 @@ public class CSVImportAction implements EventListener<Event>
 			media = new AMedia(theCSVImporter.getSuggestedFileName(panel.getActiveGridTab()), null, theCSVImporter.getContentType(), outFile, true);
 			Filedownload.save(media);
 
+			if (query != null) {
+	        	query.addRestriction("1=1");
+	        	panel.getActiveGridTab().setQuery(query);
+	        	panel.getADTab().getSelectedTabpanel().query(false, 0, MRole.getDefault().getMaxQueryRecords());
+	        }
+	        panel.getActiveGridTab().dataRefresh(false);
+	        
+	        if (detailQuery != null){
+	        	detailQuery.addRestriction("1=1");
+	        	panel.getADTab().getSelectedDetailADTabpanel().getGridTab().setQuery(detailQuery);	        	
+	        	panel.getADTab().getSelectedDetailADTabpanel().query(false, 0, MRole.getDefault().getMaxQueryRecords());
+		        panel.getADTab().getSelectedDetailADTabpanel().getGridTab().dataRefresh(false);
+	        }
 		} catch (Exception e) {
 			throw new AdempiereException(e);
 		} finally {
@@ -347,57 +363,4 @@ public class CSVImportAction implements EventListener<Event>
 		}
 	}
 
-	private InputStream validateFile(InputStream in, MImportTemplate template) {
-		// because the input stream cannot be reset we need to copy here the file to a new one (replacing the header if it's the alias)
-		Charset charset = Charset.forName(template.getCharacterSet());
-		BufferedReader reader = new BufferedReader(new InputStreamReader(in, charset));
-		File tmpfile = null;
-		InputStream is = null;
-		BufferedWriter bw = null;
-		try {
-			tmpfile = File.createTempFile("CSVImportAction", "csv");
-			bw = new BufferedWriter(new FileWriter(tmpfile));
-			String firstLine = null;
-			String line = null;
-			while ((line = reader.readLine()) != null) {
-				if (firstLine == null) {
-					firstLine = line;
-					/* Validate that m_file_istream header is CSVHeader or AliasCSVHeader */
-					if (   firstLine.equals(template.getCSVHeader())
-						|| firstLine.equals(template.getCSVAliasHeader())) {
-						bw.write(template.getCSVHeader());
-					} else {
-						reader.close();
-						throw new AdempiereException(Msg.getMsg(Env.getCtx(), "WrongCSVHeader"));
-					}
-				} else {
-					bw.write(line);
-				}
-				bw.write('\n');
-			}
-			is = new FileInputStream(tmpfile);
-		} catch (IOException e) {
-			throw new AdempiereException(e);
-		} finally {
-			if (in != null)
-				try {
-					in.close();
-				} catch (IOException e) {
-				}
-			
-			if (bw != null)
-				try {
-					bw.close();
-				} catch (IOException e) {
-				}
-			
-			if (reader != null)
-				try {
-					reader.close();
-				} catch (IOException e) {
-				}
-		}
-		return is;
-	}
-
 }
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/DunningPrint.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/DunningPrint.java
index 21f1567fb5..a56528f1ba 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/DunningPrint.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/DunningPrint.java
@@ -170,7 +170,7 @@ public class DunningPrint extends SvrProcess
 			//	query
 			MQuery query = new MQuery("C_Dunning_Header_v");
 			query.addRestriction("C_DunningRunEntry_ID", MQuery.EQUAL, 
-				new Integer(entry.getC_DunningRunEntry_ID()));
+				Integer.valueOf(entry.getC_DunningRunEntry_ID()));
 
 			//	Engine
 			PrintInfo info = new PrintInfo(
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/InvoicePrint.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/InvoicePrint.java
index 60116946a2..1b3fde0133 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/InvoicePrint.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/InvoicePrint.java
@@ -241,7 +241,7 @@ public class InvoicePrint extends SvrProcess
 				format.setTranslationLanguage(language);
 				//	query
 				MQuery query = new MQuery("C_Invoice_Header_v");
-				query.addRestriction("C_Invoice_ID", MQuery.EQUAL, new Integer(C_Invoice_ID));
+				query.addRestriction("C_Invoice_ID", MQuery.EQUAL, Integer.valueOf(C_Invoice_ID));
 
 				//	Engine
 				PrintInfo info = new PrintInfo(
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/OSTask.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/OSTask.java
index 4489dc3fb1..9b21ed6aa8 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/OSTask.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/OSTask.java
@@ -127,7 +127,7 @@ public class OSTask extends Thread
 					if (checkInterrupted())
 						return;
 					int i = m_child.exitValue();
-					exitValue = new Integer(i);
+					exitValue = Integer.valueOf(i);
 				}
 				catch (Exception ie)
 				{
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ProcessFactoryImpl.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ProcessFactoryImpl.java
index 9a553df352..171e0734f9 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ProcessFactoryImpl.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ProcessFactoryImpl.java
@@ -36,7 +36,7 @@ public class ProcessFactoryImpl implements IProcessFactory {
 		ProcessCall process = null;
 		try {
 			Class<?> clazz = getClass().getClassLoader().loadClass(className);
-			process =  (ProcessCall) clazz.newInstance();
+			process =  (ProcessCall) clazz.getDeclaredConstructor().newInstance();
 		} catch (Exception e) {
 		}
 		return process;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java
index d3ef8419dc..120cd03d23 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java
@@ -502,7 +502,7 @@ public class AboutWindow extends Window implements EventListener<Event> {
 		BundleContext bundleCtx = WebUIActivator.getBundleContext();
 		for (Bundle bundle : bundleCtx.getBundles()) {
 			Vector<Object> line = new Vector<Object>();
-			Integer bundl = new Long(bundle.getBundleId()).intValue(); // potential problem converting Long to Integer, but WListBox cannot order Long
+			Integer bundl = Long.valueOf(bundle.getBundleId()).intValue(); // potential problem converting Long to Integer, but WListBox cannot order Long
 			line.add(new IDColumn(bundl));
 			line.add(bundl);
 			line.add(state(bundle.getState()));
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
index f5f558cf30..6087295f32 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
@@ -134,7 +134,7 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -4461202150492732658L;
+	private static final long serialVersionUID = -2476692172080549315L;
 
 	// values and label for history combo
 	private static final String HISTORY_DAY_ALL = "All";
@@ -1516,7 +1516,7 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
 				|| (DisplayType.isID(dt) && field.getColumnName().endsWith("_ID")))
 			{
 				int i = Integer.parseInt(in);
-		        editor.setValue(new Integer(i));
+		        editor.setValue(Integer.valueOf(i));
 			}
 			//	Return BigDecimal
 			else if (DisplayType.isNumeric(dt))
@@ -1757,7 +1757,7 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
 						uq = new MUserQuery (Env.getCtx(), 0, null);
 						uq.setName (name);
 						uq.setAD_Tab_ID(m_AD_Tab_ID); //red1 UserQuery [ 1798539 ] taking in new field from Compiere
-						uq.setAD_User_ID(Env.getAD_User_ID(Env.getCtx())); //red1 - [ 1798539 ] missing in Compiere delayed source :-)
+						uq.set_ValueOfColumn("AD_User_ID", Env.getAD_User_ID(Env.getCtx())); // required set_Value for System=0 user
 					}
 					
 				} else	if (code.length() <= 0){ // Delete the query
@@ -2427,7 +2427,7 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
                 if (in instanceof Integer)
                     return in;
                 int i = Integer.parseInt(in.toString());
-                return new Integer(i);
+                return Integer.valueOf(i);
             }
             //  Return BigDecimal
             else if (DisplayType.isNumeric(dt))
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java
index 3ba2df914d..ed559bc40f 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java
@@ -673,7 +673,7 @@ public final class WAccountDialog extends Window
 		if (rs.wasNull())
 			editor.setValue(null);
 		else
-			editor.setValue(new Integer (intValue));
+			editor.setValue(Integer.valueOf(intValue));
 	}	//	loadInfoOf
 
 
@@ -1290,7 +1290,7 @@ public final class WAccountDialog extends Window
 		if (log.isLoggable(Level.CONFIG)) log.config("C_ValidCombination_ID=" + m_C_ValidCombination_ID + ", Changed=" + m_changed);
 		if (!m_changed || m_C_ValidCombination_ID == 0)
 			return null;
-		return new Integer(m_C_ValidCombination_ID);
+		return Integer.valueOf(m_C_ValidCombination_ID);
 	}
 
 	/**
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldRecordInfo.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldRecordInfo.java
index 92c7ff6c10..73e826fd54 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldRecordInfo.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldRecordInfo.java
@@ -292,9 +292,9 @@ public class WFieldRecordInfo extends Window implements EventListener<Event>
 			else if (column.getAD_Reference_ID() == DisplayType.Integer)
 			{
 				if (OldValue != null)
-					showOldValue = m_intFormat.format (new Integer (OldValue));
+					showOldValue = m_intFormat.format (Integer.valueOf(OldValue));
 				if (NewValue != null)
-					showNewValue = m_intFormat.format (new Integer (NewValue));
+					showNewValue = m_intFormat.format (Integer.valueOf(NewValue));
 			}
 			else if (DisplayType.isNumeric (column.getAD_Reference_ID ()))
 			{
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java
index dfb732b49f..43034f1339 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java
@@ -659,7 +659,7 @@ public class WLocatorDialog extends Window implements EventListener<Event>
 		MLocator l = (MLocator) listitem.getValue();
 		
 		if (l != null && l.getM_Locator_ID() != 0)
-			return new Integer (l.getM_Locator_ID());
+			return Integer.valueOf(l.getM_Locator_ID());
 		
 		return null;
 	} // getValue
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java
index 534f80532d..85e3c6fc14 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java
@@ -261,7 +261,7 @@ public class WMediaDialog extends Window implements EventListener<Event>
 		{
 			Clob clob = (Clob)m_data;
 			long length = clob.length() > 100 ? 100 : clob.length();
-			String data = ((Clob)m_data).getSubString(1, new Long(length).intValue());
+			String data = ((Clob)m_data).getSubString(1, Long.valueOf(length).intValue());
 			if (data.toUpperCase().indexOf("<html>") >= 0)
 			{
 				contentType = "text/html";
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java
index eeb220be64..f63a84c353 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java
@@ -19,6 +19,7 @@ package org.adempiere.webui.window;
 import static org.compiere.model.SystemIDs.COLUMN_M_MOVEMENTLINE_M_ATTRIBUTESETINSTANCE_ID;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
@@ -1061,7 +1062,7 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 					mandatory += " - " + attributes[i].getName();
 				//setMAttributeInstance doesn't work without decimal point
 				if (value != null && value.scale() == 0)
-					value = value.setScale(1, BigDecimal.ROUND_HALF_UP);
+					value = value.setScale(1, RoundingMode.HALF_UP);
 				attributes[i].setMAttributeInstance(m_M_AttributeSetInstance_ID, value);
 			}
 			else if (MAttribute.ATTRIBUTEVALUETYPE_Date.equals(attributes[i].getAttributeValueType()))
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordInfo.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordInfo.java
index 89c9fc55ec..b4e0ca569e 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordInfo.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordInfo.java
@@ -423,9 +423,9 @@ public class WRecordInfo extends Window implements EventListener<Event>
 			else if (column.getAD_Reference_ID() == DisplayType.Integer)
 			{
 				if (OldValue != null)
-					showOldValue = m_intFormat.format (new Integer (OldValue));
+					showOldValue = m_intFormat.format (Integer.valueOf(OldValue));
 				if (NewValue != null)
-					showNewValue = m_intFormat.format (new Integer (NewValue));
+					showNewValue = m_intFormat.format (Integer.valueOf(NewValue));
 			}
 			else if (DisplayType.isNumeric (column.getAD_Reference_ID ()))
 			{
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java
index 376cf2614c..ac0f4e675f 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java
@@ -53,11 +53,12 @@ import net.sf.jasperreports.engine.DefaultJasperReportsContext;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JasperPrint;
 import net.sf.jasperreports.engine.JasperReport;
+import net.sf.jasperreports.engine.JasperReportsContext;
+import net.sf.jasperreports.engine.SimpleJasperReportsContext;
 import net.sf.jasperreports.engine.export.HtmlExporter;
 import net.sf.jasperreports.engine.export.JRCsvExporter;
 import net.sf.jasperreports.engine.export.JRPdfExporter;
 import net.sf.jasperreports.engine.export.JRXlsExporter;
-import net.sf.jasperreports.engine.util.LocalJasperReportsContext;
 import net.sf.jasperreports.export.SimpleCsvExporterConfiguration;
 import net.sf.jasperreports.export.SimpleExporterInput;
 import net.sf.jasperreports.export.SimpleHtmlExporterOutput;
@@ -454,8 +455,7 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
 			log.log(Level.FINE, "Path="+path + " Prefix="+prefix);
 		}
 		File file = new File(FileUtil.getTempMailName(prefix, ".pdf"));
-		LocalJasperReportsContext context = new LocalJasperReportsContext(DefaultJasperReportsContext.getInstance());
-		context.setClassLoader(JRPdfExporter.class.getClassLoader());
+		JasperReportsContext context = new SimpleJasperReportsContext(DefaultJasperReportsContext.getInstance());
 		JRPdfExporter exporter = new JRPdfExporter(context);
 		if (!isList){
 			jasperPrintList = new ArrayList<>();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/zkforge/keylistener/Keylistener.java b/org.adempiere.ui.zk/WEB-INF/src/org/zkforge/keylistener/Keylistener.java
index 5e41b16698..3c9f1b07c8 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/zkforge/keylistener/Keylistener.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/zkforge/keylistener/Keylistener.java
@@ -112,7 +112,7 @@ public class Keylistener extends HtmlBasedComponent {
 				}
 				if (k == j + 1)
 					throw new WrongValueException(MCommon.UNEXPECTED_CHARACTER,
-							new Object[] { new Character(cc), keys });
+							new Object[] { Character.valueOf(cc), keys });
 
 				final String s = keys.substring(j + 1, k).toLowerCase();
 				if ("pgup".equals(s))
@@ -166,7 +166,7 @@ public class Keylistener extends HtmlBasedComponent {
 				if (sbcur == null
 						|| ((cc > 'Z' || cc < 'A') && (cc > 'z' || cc < 'a') && (cc > '9' || cc < '0')))
 					throw new WrongValueException(MCommon.UNEXPECTED_CHARACTER,
-							new Object[] { new Character(cc), keys });
+							new Object[] { Character.valueOf(cc), keys });
 				if (sbcur == sbsft)
 					throw new WrongValueException("$" + cc + " not supported: "
 							+ keys);
diff --git a/org.adempiere.ui.zk/copyjars.xml b/org.adempiere.ui.zk/copyjars.xml
index af600f051f..07db85875b 100644
--- a/org.adempiere.ui.zk/copyjars.xml
+++ b/org.adempiere.ui.zk/copyjars.xml
@@ -3,7 +3,7 @@
 <project name="zklibrary" basedir="." default="copy">
 	<target name="copy"> 
 		<mkdir dir="WEB-INF/lib" />
-        <get src="${url.file.srv}/jarfile/5.1/labelapplet.jar" dest="labelapplet.jar" usetimestamp="true" verbose="true" retries="5" />
+        <get src="${url.file.srv}/jarfile/6.1/labelapplet.jar" dest="labelapplet.jar" usetimestamp="true" verbose="true" retries="5" />
         <get src="${url.maven2.atlassian.3rdparty}/org/outerj/daisy/daisydiff/1.1.14-atlassian-hosted/daisydiff-1.1.14-atlassian-hosted.jar" dest="WEB-INF/lib/daisydiff.jar" usetimestamp="true" verbose="true" retries="5" />
         <get src="${url.maven.zkoss}/org/zkoss/zkforge/ckez/4.7.0.0/ckez-4.7.0.0.jar" dest="WEB-INF/lib/ckez.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
diff --git a/org.adempiere.ui.zk/pom.xml b/org.adempiere.ui.zk/pom.xml
index 2c978eddd9..14bdd8f936 100644
--- a/org.adempiere.ui.zk/pom.xml
+++ b/org.adempiere.ui.zk/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.ui.zk</artifactId>
@@ -51,7 +51,7 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>${url.file.srv}/jarfile/5.1/labelapplet.jar</url>
+							<url>${url.file.srv}/jarfile/6.1/labelapplet.jar</url>
 							<unpack>false</unpack>
 							<outputDirectory>./</outputDirectory>
 							<retries>5</retries>
diff --git a/org.adempiere.ui/.classpath b/org.adempiere.ui/.classpath
index be02a70081..3e551e9bf2 100644
--- a/org.adempiere.ui/.classpath
+++ b/org.adempiere.ui/.classpath
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry exported="true" kind="lib" path="lib/org-netbeans-api-visual.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/org-openide-util.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/org-openide-util-lookup.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.adempiere.ui/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.ui/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.adempiere.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.adempiere.ui/META-INF/MANIFEST.MF b/org.adempiere.ui/META-INF/MANIFEST.MF
index 46c74f8c94..30502ed98e 100644
--- a/org.adempiere.ui/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere UI base
 Bundle-SymbolicName: org.adempiere.ui;singleton:=true
-Bundle-Version: 5.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Version: 6.1.0.qualifier
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  org.apache.xerces;bundle-version="0.0.0",
  org.eclipse.equinox.app;bundle-version="0.0.0"
@@ -27,5 +27,7 @@ Export-Package: org.compiere.apps,
  org.netbeans.api.visual.widget
 Bundle-ClassPath: .,
  lib/org-netbeans-api-visual.jar,
- lib/org-openide-util.jar
+ lib/org-openide-util.jar,
+ lib/org-openide-util-lookup.jar
 Automatic-Module-Name: org.adempiere.ui
+Bundle-Vendor: iDempiere Community
diff --git a/org.adempiere.ui/build.properties b/org.adempiere.ui/build.properties
index 92fa867dd9..47a81e85e6 100644
--- a/org.adempiere.ui/build.properties
+++ b/org.adempiere.ui/build.properties
@@ -1,6 +1,7 @@
 bin.includes = META-INF/,\
                .,\
                lib/org-netbeans-api-visual.jar,\
-               lib/org-openide-util.jar
+               lib/org-openide-util.jar,\
+               lib/org-openide-util-lookup.jar
 source.. = src/
 output.. = target/classes/
diff --git a/org.adempiere.ui/pom.xml b/org.adempiere.ui/pom.xml
index b77b7ee42c..1c8d479580 100644
--- a/org.adempiere.ui/pom.xml
+++ b/org.adempiere.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.ui</artifactId>
@@ -34,12 +34,17 @@
 								<artifactItem>
 									<groupId>org.netbeans.api</groupId>
 									<artifactId>org-netbeans-api-visual</artifactId>
-									<version>RELEASE65</version>
+									<version>${netbeans.lib.version}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>org.netbeans.api</groupId>
 									<artifactId>org-openide-util</artifactId>
-									<version>RELEASE65</version>
+									<version>${netbeans.lib.version}</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.netbeans.api</groupId>
+									<artifactId>org-openide-util-lookup</artifactId>
+									<version>${netbeans.lib.version}</version>
 								</artifactItem>
 							</artifactItems>
 							<outputDirectory>lib</outputDirectory>
diff --git a/org.adempiere.ui/src/org/compiere/apps/form/Allocation.java b/org.adempiere.ui/src/org/compiere/apps/form/Allocation.java
index 46f989b93e..12c4d70920 100644
--- a/org.adempiere.ui/src/org/compiere/apps/form/Allocation.java
+++ b/org.adempiere.ui/src/org/compiere/apps/form/Allocation.java
@@ -101,7 +101,7 @@ public class Allocation
 			return;
 
 		//	Async BPartner Test
-		Integer key = new Integer(m_C_BPartner_ID);
+		Integer key = Integer.valueOf(m_C_BPartner_ID);
 		if (!m_bpartnerCheck.contains(key))
 		{
 			new Thread()
@@ -160,7 +160,7 @@ public class Allocation
 			while (rs.next())
 			{
 				Vector<Object> line = new Vector<Object>();
-				line.add(new Boolean(false));       //  0-Selection
+				line.add(Boolean.FALSE);       //  0-Selection
 				line.add(rs.getTimestamp(1));       //  1-TrxDate
 				KeyNamePair pp = new KeyNamePair(rs.getInt(3), rs.getString(2));
 				line.add(pp);                       //  2-DocumentNo
@@ -294,7 +294,7 @@ public class Allocation
 			while (rs.next())
 			{
 				Vector<Object> line = new Vector<Object>();
-				line.add(new Boolean(false));       //  0-Selection
+				line.add(Boolean.FALSE);       //  0-Selection
 				line.add(rs.getTimestamp(1));       //  1-TrxDate
 				KeyNamePair pp = new KeyNamePair(rs.getInt(3), rs.getString(2));
 				line.add(pp);                       //  2-Value
@@ -639,7 +639,7 @@ public class Allocation
 				KeyNamePair pp = (KeyNamePair)payment.getValueAt(i, 2);   //  Value
 				//  Payment variables
 				int C_Payment_ID = pp.getKey();
-				paymentList.add(new Integer(C_Payment_ID));
+				paymentList.add(Integer.valueOf(C_Payment_ID));
 				//
 				BigDecimal PaymentAmt = (BigDecimal)payment.getValueAt(i, i_payment);  //  Applied Payment
 				amountList.add(PaymentAmt);
diff --git a/org.adempiere.ui/src/org/compiere/apps/form/Charge.java b/org.adempiere.ui/src/org/compiere/apps/form/Charge.java
index f124b26435..8f74cd4243 100644
--- a/org.adempiere.ui/src/org/compiere/apps/form/Charge.java
+++ b/org.adempiere.ui/src/org/compiere/apps/form/Charge.java
@@ -81,12 +81,12 @@ public class Charge
 			while (rs.next())
 			{
 				Vector<Object> line = new Vector<Object>(4);
-				line.add(new Boolean(false));       //  0-Selection
+				line.add(Boolean.FALSE);       //  0-Selection
 				KeyNamePair pp = new KeyNamePair(rs.getInt(1), rs.getString(2));
 				line.add(pp);                       //  1-Value
 				line.add(rs.getString(3));          //  2-Name
 				boolean isExpenseType = rs.getString(4).equals("E");
-				line.add(new Boolean(isExpenseType));   //  3-Expense
+				line.add(Boolean.valueOf(isExpenseType));   //  3-Expense
 				data.add(line);
 			}
 		}
@@ -400,7 +400,7 @@ public class Charge
 					listCreated.append(name);
 				}
 				//  reset selection
-				dataTable.setValueAt(new Boolean(false), i, 0);
+				dataTable.setValueAt(Boolean.FALSE, i, 0);
 			}
 		}
 	}   //  createAccount
diff --git a/org.adempiere.ui/src/org/compiere/apps/form/FactReconcile.java b/org.adempiere.ui/src/org/compiere/apps/form/FactReconcile.java
index 05b68014b2..553d554dcf 100644
--- a/org.adempiere.ui/src/org/compiere/apps/form/FactReconcile.java
+++ b/org.adempiere.ui/src/org/compiere/apps/form/FactReconcile.java
@@ -162,7 +162,7 @@ public class FactReconcile {
 				//line.add(rs.getBigDecimal(1));	// 1-Amt
 				line.add(rs.getBigDecimal(2));	// 2-AmtAcct
 				line.add(rs.getString(3));		// 3-DR/CR
-				line.add(new Boolean(false));	// 4-Fact_Acct_ID
+				line.add(Boolean.FALSE);	// 4-Fact_Acct_ID
 				line.add(rs.getString(5));		// 5-BP
 				line.add(rs.getTimestamp(6));	// 6-DateAcct
 				line.add(rs.getString(7));		// 7-GL Category
diff --git a/org.adempiere.ui/src/org/compiere/apps/form/PayPrint.java b/org.adempiere.ui/src/org/compiere/apps/form/PayPrint.java
index 7dd2c792eb..4de2d1afb6 100644
--- a/org.adempiere.ui/src/org/compiere/apps/form/PayPrint.java
+++ b/org.adempiere.ui/src/org/compiere/apps/form/PayPrint.java
@@ -219,8 +219,8 @@ public class PayPrint {
 			//
 			if (rs.next())
 			{
-				documentNo = new Integer(rs.getInt(1));
-				printFormatId = new Integer(rs.getInt(2));
+				documentNo = Integer.valueOf(rs.getInt(1));
+				printFormatId = Integer.valueOf(rs.getInt(2));
 			}
 			else
 			{
@@ -264,7 +264,7 @@ public class PayPrint {
 			if (m_PaymentExport == null)
 			{
 				Class<?> clazz = Class.forName (m_PaymentExportClass);
-				m_PaymentExport = (PaymentExport)clazz.newInstance();
+				m_PaymentExport = (PaymentExport)clazz.getDeclaredConstructor().newInstance();
 			}
 			
 		}
diff --git a/org.adempiere.ui/src/org/compiere/apps/form/StatementCreateFromBatch.java b/org.adempiere.ui/src/org/compiere/apps/form/StatementCreateFromBatch.java
index b518e7b54f..55f338e20e 100644
--- a/org.adempiere.ui/src/org/compiere/apps/form/StatementCreateFromBatch.java
+++ b/org.adempiere.ui/src/org/compiere/apps/form/StatementCreateFromBatch.java
@@ -200,7 +200,7 @@ public abstract class StatementCreateFromBatch extends CreateFromForm
 			while(rs.next())
 			{
 				Vector<Object> line = new Vector<Object>(5);
-				line.add(new Boolean(false));       //  0-Selection
+				line.add(Boolean.FALSE);       //  0-Selection
 				line.add(rs.getTimestamp(3));       //  1-DateDeposit
 				KeyNamePair pp = new KeyNamePair(rs.getInt(1), rs.getString(2));
 				line.add(pp);                       //  2-C_DepositBatch  
diff --git a/org.adempiere.ui/src/org/compiere/grid/CreateFrom.java b/org.adempiere.ui/src/org/compiere/grid/CreateFrom.java
index 0b951fe694..fe6547c314 100644
--- a/org.adempiere.ui/src/org/compiere/grid/CreateFrom.java
+++ b/org.adempiere.ui/src/org/compiere/grid/CreateFrom.java
@@ -206,7 +206,7 @@ public abstract class CreateFrom implements ICreateFrom
 			while (rs.next())
 			{
 				Vector<Object> line = new Vector<Object>();
-				line.add(new Boolean(false));           //  0-Selection
+				line.add(Boolean.FALSE);           //  0-Selection
 				BigDecimal qtyOrdered = rs.getBigDecimal(1);
 				BigDecimal multiplier = rs.getBigDecimal(2);
 				BigDecimal qtyEntered = qtyOrdered.multiply(multiplier);
diff --git a/org.adempiere.ui/src/org/compiere/grid/CreateFromDepositBatch.java b/org.adempiere.ui/src/org/compiere/grid/CreateFromDepositBatch.java
index bbb292277e..2e9be672f7 100644
--- a/org.adempiere.ui/src/org/compiere/grid/CreateFromDepositBatch.java
+++ b/org.adempiere.ui/src/org/compiere/grid/CreateFromDepositBatch.java
@@ -83,7 +83,7 @@ public abstract class CreateFromDepositBatch extends CreateFromBatch
 			while(rs.next())
 			{
 				Vector<Object> line = new Vector<Object>(6);
-				line.add(new Boolean(false));       //  0-Selection
+				line.add(Boolean.FALSE);       //  0-Selection
 				line.add(rs.getTimestamp(1));       //  1-DateTrx
 				KeyNamePair pp = new KeyNamePair(rs.getInt(2), rs.getString(3));
 				line.add(pp);                       //  2-C_Payment_ID
diff --git a/org.adempiere.ui/src/org/compiere/grid/CreateFromInvoice.java b/org.adempiere.ui/src/org/compiere/grid/CreateFromInvoice.java
index 13c96ac176..3bb315cc9a 100644
--- a/org.adempiere.ui/src/org/compiere/grid/CreateFromInvoice.java
+++ b/org.adempiere.ui/src/org/compiere/grid/CreateFromInvoice.java
@@ -14,6 +14,7 @@
 package org.compiere.grid;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -235,7 +236,7 @@ public abstract class CreateFromInvoice extends CreateFrom
 			while (rs.next())
 			{
 				Vector<Object> line = new Vector<Object>(7);
-				line.add(new Boolean(false));           //  0-Selection
+				line.add(Boolean.FALSE);           //  0-Selection
 				BigDecimal qtyMovement = rs.getBigDecimal(1);
 				BigDecimal multiplier = rs.getBigDecimal(2);
 				BigDecimal qtyEntered = qtyMovement.multiply(multiplier);
@@ -326,7 +327,7 @@ public abstract class CreateFromInvoice extends CreateFrom
 	        while (rs.next())
             {
 	            Vector<Object> line = new Vector<Object>(7);
-	            line.add(new Boolean(false));   // 0-Selection
+	            line.add(Boolean.FALSE);   // 0-Selection
 	            line.add(rs.getBigDecimal(3));  // 1-Qty
 	            KeyNamePair pp = new KeyNamePair(rs.getInt(6), rs.getString(7));
 	            line.add(pp); // 2-UOM
@@ -448,7 +449,7 @@ public abstract class CreateFromInvoice extends CreateFrom
 					product = MProduct.get(Env.getCtx(), M_Product_ID);
 					precision = product.getUOMPrecision();
 				}
-				QtyEntered = QtyEntered.setScale(precision, BigDecimal.ROUND_HALF_DOWN);
+				QtyEntered = QtyEntered.setScale(precision, RoundingMode.HALF_DOWN);
 				//
 				if (log.isLoggable(Level.FINE)) log.fine("Line QtyEntered=" + QtyEntered
 					+ ", Product_ID=" + M_Product_ID
@@ -586,7 +587,7 @@ public abstract class CreateFromInvoice extends CreateFrom
 				BigDecimal igt = invoice.getGrandTotal();
 				BigDecimal percent = Env.ONE;
 				if (ogt.compareTo(igt) != 0)
-					percent = igt.divide(ogt, 10, BigDecimal.ROUND_HALF_UP);
+					percent = igt.divide(ogt, 10, RoundingMode.HALF_UP);
 				MCurrency cur = MCurrency.get(p_order.getCtx(), p_order.getC_Currency_ID());
 				int scale = cur.getStdPrecision();
 			
@@ -596,7 +597,7 @@ public abstract class CreateFromInvoice extends CreateFrom
 					if (percent != Env.ONE) {
 						BigDecimal propDueAmt = ops.getDueAmt().multiply(percent);
 						if (propDueAmt.scale() > scale)
-							propDueAmt = propDueAmt.setScale(scale, BigDecimal.ROUND_HALF_UP);
+							propDueAmt = propDueAmt.setScale(scale, RoundingMode.HALF_UP);
 						ips.setDueAmt(propDueAmt);
 					}
 					ips.setC_Invoice_ID(invoice.getC_Invoice_ID());
diff --git a/org.adempiere.ui/src/org/compiere/grid/CreateFromPackageShipment.java b/org.adempiere.ui/src/org/compiere/grid/CreateFromPackageShipment.java
index 69d821a8b7..6f968a0ccd 100644
--- a/org.adempiere.ui/src/org/compiere/grid/CreateFromPackageShipment.java
+++ b/org.adempiere.ui/src/org/compiere/grid/CreateFromPackageShipment.java
@@ -75,7 +75,7 @@ public abstract class CreateFromPackageShipment extends CreateFrom
             while (rs.next())
             {
             	Vector<Object> line = new Vector<Object>(6);
-                line.add(new Boolean(false));           //  0-Selection
+                line.add(Boolean.FALSE);           //  0-Selection
                 KeyNamePair lineKNPair = new KeyNamePair(rs.getInt(1), rs.getString(2)); // M_InOutLine_ID, Line
                 line.add(lineKNPair);
                 line.add(rs.getBigDecimal(3));	   				//Qty
diff --git a/org.adempiere.ui/src/org/compiere/grid/CreateFromRMA.java b/org.adempiere.ui/src/org/compiere/grid/CreateFromRMA.java
index 1462ae3be9..cbd7f490be 100644
--- a/org.adempiere.ui/src/org/compiere/grid/CreateFromRMA.java
+++ b/org.adempiere.ui/src/org/compiere/grid/CreateFromRMA.java
@@ -94,7 +94,7 @@ public abstract class CreateFromRMA extends CreateFrom {
             while (rs.next())
             {
                 Vector<Object> line = new Vector<Object>(8);
-                line.add(new Boolean(false));           //  0-Selection
+                line.add(Boolean.FALSE);           //  0-Selection
                 
                 KeyNamePair lineKNPair = new KeyNamePair(rs.getInt(1), rs.getString(2)); // 1-Line
                 line.add(lineKNPair);
diff --git a/org.adempiere.ui/src/org/compiere/grid/CreateFromShipment.java b/org.adempiere.ui/src/org/compiere/grid/CreateFromShipment.java
index f359325e89..5a11dc9e6a 100644
--- a/org.adempiere.ui/src/org/compiere/grid/CreateFromShipment.java
+++ b/org.adempiere.ui/src/org/compiere/grid/CreateFromShipment.java
@@ -15,6 +15,7 @@
 package org.compiere.grid;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -232,7 +233,7 @@ public abstract class CreateFromShipment extends CreateFrom
 			while (rs.next())
 			{
 				Vector<Object> line = new Vector<Object>();
-				line.add(new Boolean(false));           //  0-Selection
+				line.add(Boolean.FALSE);           //  0-Selection
 				BigDecimal qtyOrdered = rs.getBigDecimal(1);
 				BigDecimal multiplier = rs.getBigDecimal(2);
 				BigDecimal qtyEntered = qtyOrdered.multiply(multiplier);
@@ -340,7 +341,7 @@ public abstract class CreateFromShipment extends CreateFrom
 	        while (rs.next())
             {
 	            Vector<Object> line = new Vector<Object>(7);
-	            line.add(new Boolean(false));   // 0-Selection
+	            line.add(Boolean.FALSE);   // 0-Selection
 	            line.add(rs.getBigDecimal(3));  // 1-Qty
 	            KeyNamePair pp = new KeyNamePair(rs.getInt(6), rs.getString(7));
 	            line.add(pp); // 2-UOM
@@ -414,7 +415,7 @@ public abstract class CreateFromShipment extends CreateFrom
 			while (rs.next())
 			{
 				Vector<Object> line = new Vector<Object>(7);
-				line.add(new Boolean(false)); // 0-Selection
+				line.add(Boolean.FALSE); // 0-Selection
 				BigDecimal qtyInvoiced = rs.getBigDecimal(1);
 				BigDecimal multiplier = rs.getBigDecimal(2);
 				BigDecimal qtyEntered = qtyInvoiced.multiply(multiplier);
@@ -595,7 +596,7 @@ public abstract class CreateFromShipment extends CreateFrom
 					MProduct product = MProduct.get(Env.getCtx(), M_Product_ID);
 					precision = product.getUOMPrecision();
 				}
-				QtyEntered = QtyEntered.setScale(precision, BigDecimal.ROUND_HALF_DOWN);
+				QtyEntered = QtyEntered.setScale(precision, RoundingMode.HALF_DOWN);
 				//
 				if (log.isLoggable(Level.FINE)) log.fine("Line QtyEntered=" + QtyEntered
 						+ ", Product=" + M_Product_ID 
@@ -620,7 +621,7 @@ public abstract class CreateFromShipment extends CreateFrom
 					{
 						iol.setMovementQty(QtyEntered
 								.multiply(ol.getQtyOrdered())
-								.divide(ol.getQtyEntered(), 12, BigDecimal.ROUND_HALF_UP));
+								.divide(ol.getQtyEntered(), 12, RoundingMode.HALF_UP));
 						iol.setC_UOM_ID(ol.getC_UOM_ID());
 					}
 					iol.setM_AttributeSetInstance_ID(ol.getM_AttributeSetInstance_ID());
@@ -641,7 +642,7 @@ public abstract class CreateFromShipment extends CreateFrom
 					{
 						iol.setQtyEntered(QtyEntered
 								.multiply(il.getQtyInvoiced())
-								.divide(il.getQtyEntered(), 12, BigDecimal.ROUND_HALF_UP));
+								.divide(il.getQtyEntered(), 12, RoundingMode.HALF_UP));
 						iol.setC_UOM_ID(il.getC_UOM_ID());
 					}
 					iol.setDescription(il.getDescription());
diff --git a/org.adempiere.ui/src/org/compiere/grid/CreateFromStatement.java b/org.adempiere.ui/src/org/compiere/grid/CreateFromStatement.java
index 081b8b2759..73fd39c0ad 100644
--- a/org.adempiere.ui/src/org/compiere/grid/CreateFromStatement.java
+++ b/org.adempiere.ui/src/org/compiere/grid/CreateFromStatement.java
@@ -77,7 +77,7 @@ public abstract class CreateFromStatement extends CreateFromBatch
 			while(rs.next())
 			{
 				Vector<Object> line = new Vector<Object>(6);
-				line.add(new Boolean(false));       //  0-Selection
+				line.add(Boolean.FALSE);       //  0-Selection
 				line.add(rs.getTimestamp(1));       //  1-DateTrx
 				KeyNamePair pp = new KeyNamePair(rs.getInt(2), rs.getString(3));
 				line.add(pp);                       //  2-C_Payment_ID
diff --git a/org.adempiere.ui/src/org/compiere/grid/PaymentForm.java b/org.adempiere.ui/src/org/compiere/grid/PaymentForm.java
index ffd2718012..a8eccd7d10 100644
--- a/org.adempiere.ui/src/org/compiere/grid/PaymentForm.java
+++ b/org.adempiere.ui/src/org/compiere/grid/PaymentForm.java
@@ -186,7 +186,7 @@ public abstract class PaymentForm implements IPaymentForm {
 			{
 				int id = rs.getInt(1);
 				String name = rs.getString(2);
-				s_Currencies.put(new Integer(id), new KeyNamePair(id, name));
+				s_Currencies.put(Integer.valueOf(id), new KeyNamePair(id, name));
 			}
 		}
 		catch (SQLException e)
diff --git a/org.adempiere.ui/src/org/compiere/grid/PaymentFormCash.java b/org.adempiere.ui/src/org/compiere/grid/PaymentFormCash.java
index c5caba8dbc..767c8309ac 100644
--- a/org.adempiere.ui/src/org/compiere/grid/PaymentFormCash.java
+++ b/org.adempiere.ui/src/org/compiere/grid/PaymentFormCash.java
@@ -404,7 +404,7 @@ public abstract class PaymentFormCash extends PaymentForm {
 			if (m_mPayment.getC_Payment_ID() == 0)
 				getGridTab().setValue("C_Payment_ID", null);
 			else
-				getGridTab().setValue("C_Payment_ID", new Integer(m_mPayment.getC_Payment_ID()));
+				getGridTab().setValue("C_Payment_ID", Integer.valueOf(m_mPayment.getC_Payment_ID()));
 		}
 		//	Set Cash
 		if (newC_CashLine_ID != m_C_CashLine_ID)
@@ -412,7 +412,7 @@ public abstract class PaymentFormCash extends PaymentForm {
 			if (newC_CashLine_ID == 0)
 				getGridTab().setValue("C_CashLine_ID", null);
 			else
-				getGridTab().setValue("C_CashLine_ID", new Integer(newC_CashLine_ID));
+				getGridTab().setValue("C_CashLine_ID", Integer.valueOf(newC_CashLine_ID));
 		}
 		return true;
 	}
diff --git a/org.adempiere.ui/src/org/compiere/grid/PaymentFormCheck.java b/org.adempiere.ui/src/org/compiere/grid/PaymentFormCheck.java
index 187ec31009..ec33a788c3 100644
--- a/org.adempiere.ui/src/org/compiere/grid/PaymentFormCheck.java
+++ b/org.adempiere.ui/src/org/compiere/grid/PaymentFormCheck.java
@@ -262,7 +262,7 @@ public abstract class PaymentFormCheck extends PaymentForm {
 			if (m_mPayment.getC_Payment_ID() == 0)
 				getGridTab().setValue("C_Payment_ID", null);
 			else
-				getGridTab().setValue("C_Payment_ID", new Integer(m_mPayment.getC_Payment_ID()));
+				getGridTab().setValue("C_Payment_ID", Integer.valueOf(m_mPayment.getC_Payment_ID()));
 		}
 		return true;
 	}
diff --git a/org.adempiere.ui/src/org/compiere/grid/PaymentFormCreditCard.java b/org.adempiere.ui/src/org/compiere/grid/PaymentFormCreditCard.java
index d748e8d9df..321e72f74d 100644
--- a/org.adempiere.ui/src/org/compiere/grid/PaymentFormCreditCard.java
+++ b/org.adempiere.ui/src/org/compiere/grid/PaymentFormCreditCard.java
@@ -387,7 +387,7 @@ public abstract class PaymentFormCreditCard extends PaymentForm {
 			if (m_mPayment.getC_Payment_ID() == 0)
 				getGridTab().setValue("C_Payment_ID", null);
 			else
-				getGridTab().setValue("C_Payment_ID", new Integer(m_mPayment.getC_Payment_ID()));
+				getGridTab().setValue("C_Payment_ID", Integer.valueOf(m_mPayment.getC_Payment_ID()));
 		}
 		
 		return true;
diff --git a/org.adempiere.ui/src/org/compiere/grid/PaymentFormDirect.java b/org.adempiere.ui/src/org/compiere/grid/PaymentFormDirect.java
index 209b96670e..7d5b6efff8 100644
--- a/org.adempiere.ui/src/org/compiere/grid/PaymentFormDirect.java
+++ b/org.adempiere.ui/src/org/compiere/grid/PaymentFormDirect.java
@@ -250,7 +250,7 @@ public abstract class PaymentFormDirect extends PaymentForm {
 			if (m_mPayment.getC_Payment_ID() == 0)
 				getGridTab().setValue("C_Payment_ID", null);
 			else
-				getGridTab().setValue("C_Payment_ID", new Integer(m_mPayment.getC_Payment_ID()));
+				getGridTab().setValue("C_Payment_ID", Integer.valueOf(m_mPayment.getC_Payment_ID()));
 		}
 		
 		return true;
diff --git a/org.adempiere.ui/src/org/compiere/grid/PaymentFormOnCredit.java b/org.adempiere.ui/src/org/compiere/grid/PaymentFormOnCredit.java
index eb31219957..9bcd98a42b 100644
--- a/org.adempiere.ui/src/org/compiere/grid/PaymentFormOnCredit.java
+++ b/org.adempiere.ui/src/org/compiere/grid/PaymentFormOnCredit.java
@@ -101,7 +101,7 @@ public abstract class PaymentFormOnCredit extends PaymentForm {
 	public boolean save(int newC_PaymentTerm_ID)
 	{
 		if (newC_PaymentTerm_ID != m_C_PaymentTerm_ID)
-			getGridTab().setValue("C_PaymentTerm_ID", new Integer(newC_PaymentTerm_ID));
+			getGridTab().setValue("C_PaymentTerm_ID", Integer.valueOf(newC_PaymentTerm_ID));
 		return true;
 	}
 }
diff --git a/org.adempiere.ui/src/org/compiere/minigrid/IDColumn.java b/org.adempiere.ui/src/org/compiere/minigrid/IDColumn.java
index 18dccefe67..d0b569adb6 100644
--- a/org.adempiere.ui/src/org/compiere/minigrid/IDColumn.java
+++ b/org.adempiere.ui/src/org/compiere/minigrid/IDColumn.java
@@ -30,7 +30,7 @@ public class IDColumn
 	 */
 	public IDColumn (int record_ID)
 	{
-		this(new Integer(record_ID));
+		this(Integer.valueOf(record_ID));
 	}   //  IDColumn
 
 	/**
diff --git a/org.adempiere.webstore-feature/feature.xml b/org.adempiere.webstore-feature/feature.xml
index 0364643ffa..53a55442ff 100644
--- a/org.adempiere.webstore-feature/feature.xml
+++ b/org.adempiere.webstore-feature/feature.xml
@@ -2,7 +2,8 @@
 <feature
       id="org.adempiere.webstore.feature"
       label="Webstore-feature"
-      version="5.1.0.qualifier">
+      version="6.1.0.qualifier"
+      provider-name="iDempiere Community">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
diff --git a/org.adempiere.webstore-feature/pom.xml b/org.adempiere.webstore-feature/pom.xml
index 540321dea6..3bdca1cb57 100644
--- a/org.adempiere.webstore-feature/pom.xml
+++ b/org.adempiere.webstore-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.webstore.feature</artifactId>
diff --git a/org.adempiere.webstore.resource/.classpath b/org.adempiere.webstore.resource/.classpath
index cf36b56119..423c974870 100644
--- a/org.adempiere.webstore.resource/.classpath
+++ b/org.adempiere.webstore.resource/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.adempiere.webstore.resource/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.webstore.resource/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.adempiere.webstore.resource/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.webstore.resource/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.adempiere.webstore.resource/META-INF/MANIFEST.MF b/org.adempiere.webstore.resource/META-INF/MANIFEST.MF
index 29b5295dd8..49e4f27af3 100644
--- a/org.adempiere.webstore.resource/META-INF/MANIFEST.MF
+++ b/org.adempiere.webstore.resource/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Web Store Resources
 Bundle-SymbolicName: org.adempiere.webstore.resource
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.1.0.qualifier
 Bundle-Vendor: Adempiere.org
 Fragment-Host: org.adempiere.webstore;bundle-version="0.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Import-Package: org.compiere.wstore
 Jetty-WarPatchFragmentFolderPath: /
 Bundle-ClassPath: .
diff --git a/org.adempiere.webstore.resource/pom.xml b/org.adempiere.webstore.resource/pom.xml
index 7cbb3b58c8..a539554069 100644
--- a/org.adempiere.webstore.resource/pom.xml
+++ b/org.adempiere.webstore.resource/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.webstore.resource</artifactId>
diff --git a/org.adempiere.webstore.servlet/.classpath b/org.adempiere.webstore.servlet/.classpath
index cf36b56119..423c974870 100644
--- a/org.adempiere.webstore.servlet/.classpath
+++ b/org.adempiere.webstore.servlet/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.adempiere.webstore.servlet/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.webstore.servlet/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.adempiere.webstore.servlet/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.webstore.servlet/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF b/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF
index a3787fbb50..3a075f6d3f 100644
--- a/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF
+++ b/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Web Store Servlets
 Bundle-SymbolicName: org.adempiere.webstore.servlet
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.1.0.qualifier
 Bundle-Vendor: Adempiere.org
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Export-Package: org.compiere.wstore
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
 Import-Package: javax.servlet,
diff --git a/org.adempiere.webstore.servlet/pom.xml b/org.adempiere.webstore.servlet/pom.xml
index 1bb325f7e8..ffa2f0bc2d 100644
--- a/org.adempiere.webstore.servlet/pom.xml
+++ b/org.adempiere.webstore.servlet/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.webstore.servlet</artifactId>
diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/ProductCategoryListTag.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/ProductCategoryListTag.java
index 7f38e83579..e611d518fb 100644
--- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/ProductCategoryListTag.java
+++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/ProductCategoryListTag.java
@@ -99,7 +99,7 @@ public class ProductCategoryListTag extends TagSupport
 	 */
 	private option[] getCategories (int AD_Client_ID)
 	{
-		option[] options = (option[])s_categories.get(new Integer(AD_Client_ID));
+		option[] options = (option[])s_categories.get(Integer.valueOf(AD_Client_ID));
 		if (options != null)
 			return options;
 		
@@ -125,7 +125,7 @@ public class ProductCategoryListTag extends TagSupport
 			}
 		}
 		//
-		s_categories.put(new Integer(AD_Client_ID), options);
+		s_categories.put(Integer.valueOf(AD_Client_ID), options);
 		return options;
 	}	//	getCountries
 
diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/SearchServlet.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/SearchServlet.java
index 45c82300c5..31c57634c9 100644
--- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/SearchServlet.java
+++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/SearchServlet.java
@@ -445,7 +445,7 @@ public class SearchServlet extends HttpServlet
 			while (rs.next ())
 			{
 				MBPartner partner = new MBPartner (ctx, rs, null);
-				//s_cache.put (new Integer (partner.getAD_Client_ID()), partner);
+				//s_cache.put (Integer.valueOf(partner.getAD_Client_ID()), partner);
 				list.add (partner);
 			}
 		}
diff --git a/org.adempiere.webstore/.classpath b/org.adempiere.webstore/.classpath
index cf36b56119..423c974870 100644
--- a/org.adempiere.webstore/.classpath
+++ b/org.adempiere.webstore/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.adempiere.webstore/META-INF/MANIFEST.MF b/org.adempiere.webstore/META-INF/MANIFEST.MF
index d04f4101a1..36dbf2dfbd 100644
--- a/org.adempiere.webstore/META-INF/MANIFEST.MF
+++ b/org.adempiere.webstore/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Web Store
 Bundle-SymbolicName: org.adempiere.webstore;singleton:=true
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.1.0.qualifier
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  org.adempiere.report.jasper.webapp;bundle-version="0.0.0",
- org.eclipse.jdt.core.compiler.batch;bundle-version="0.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+ org.eclipse.jdt.core;bundle-version="3.15.0"
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Web-ContextPath: wstore
 Import-Package: javax.servlet;version="3.0.0",
  javax.servlet.http;version="3.0.0",
@@ -83,6 +83,7 @@ Import-Package: javax.servlet;version="3.0.0",
 Bundle-Activator: org.adempiere.webstore.Activator
 Bundle-ClassPath: .
 Automatic-Module-Name: org.adempiere.webstore
+Bundle-Vendor: iDempiere Community
 
 
 
diff --git a/org.adempiere.webstore/pom.xml b/org.adempiere.webstore/pom.xml
index f7f3398417..f8316c7b93 100644
--- a/org.adempiere.webstore/pom.xml
+++ b/org.adempiere.webstore/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.webstore</artifactId>
diff --git a/org.apache.ecs/.classpath b/org.apache.ecs/.classpath
index cf36b56119..423c974870 100644
--- a/org.apache.ecs/.classpath
+++ b/org.apache.ecs/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs b/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs
+++ b/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.apache.ecs/META-INF/MANIFEST.MF b/org.apache.ecs/META-INF/MANIFEST.MF
index 1881c4239d..4ff32ccf97 100644
--- a/org.apache.ecs/META-INF/MANIFEST.MF
+++ b/org.apache.ecs/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Apache ECS Library
 Bundle-SymbolicName: org.apache.ecs
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.1.0.qualifier
 Bundle-Activator: org.apache.ecs.Activator
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Import-Package: org.osgi.framework;version="1.3.0"
 Export-Package: org.apache.ecs;uses:="org.apache.ecs.xhtml",
  org.apache.ecs.filter;uses:="org.apache.ecs",
@@ -14,3 +14,4 @@ Export-Package: org.apache.ecs;uses:="org.apache.ecs.xhtml",
  org.apache.ecs.xml;uses:="org.apache.ecs"
 Bundle-ClassPath: .
 Automatic-Module-Name: org.apache.ecs
+Bundle-Vendor: iDempiere Community
diff --git a/org.apache.ecs/pom.xml b/org.apache.ecs/pom.xml
index 552bd40e99..db2eee45bf 100644
--- a/org.apache.ecs/pom.xml
+++ b/org.apache.ecs/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.apache.ecs</artifactId>
diff --git a/org.apache.ecs/src/org/apache/ecs/ECSDefaults.java b/org.apache.ecs/src/org/apache/ecs/ECSDefaults.java
index 544819064b..0dfb95b9c5 100644
--- a/org.apache.ecs/src/org/apache/ecs/ECSDefaults.java
+++ b/org.apache.ecs/src/org/apache/ecs/ECSDefaults.java
@@ -42,9 +42,9 @@ public class ECSDefaults
 		}
 	}
 
-	private static boolean filter_state = new Boolean(resource.getString("filter_state")).booleanValue();
+	private static boolean filter_state = Boolean.valueOf(resource.getString("filter_state")).booleanValue();
 
-    private static boolean filter_attribute_state = new Boolean(resource.getString("filter_attribute_state")).booleanValue();
+    private static boolean filter_attribute_state = Boolean.valueOf(resource.getString("filter_attribute_state")).booleanValue();
 
     private static char attribute_equality_sign = resource.getString("attribute_equality_sign").charAt(1);
 
@@ -58,9 +58,9 @@ public class ECSDefaults
 
     private static char attribute_quote_char = resource.getString("attribute_quote_char").charAt(0);
 
-    private static boolean attribute_quote = new Boolean(resource.getString("attribute_quote")).booleanValue();
+    private static boolean attribute_quote = Boolean.valueOf(resource.getString("attribute_quote")).booleanValue();
 
-	private static boolean end_element = new Boolean(resource.getString("end_element")).booleanValue();
+	private static boolean end_element = Boolean.valueOf(resource.getString("end_element")).booleanValue();
 
 	private static String codeset = resource.getString("codeset");
 
@@ -72,7 +72,7 @@ public class ECSDefaults
 
 	private static char end_tag = resource.getString("end_tag").charAt(0);
 
-	private static boolean pretty_print = new Boolean(resource.getString("pretty_print")).booleanValue();
+	private static boolean pretty_print = Boolean.valueOf(resource.getString("pretty_print")).booleanValue();
 
 
 	/**
diff --git a/org.apache.ecs/src/org/apache/ecs/ElementAttributes.java b/org.apache.ecs/src/org/apache/ecs/ElementAttributes.java
index 927a9ae9ae..7cb2a59577 100644
--- a/org.apache.ecs/src/org/apache/ecs/ElementAttributes.java
+++ b/org.apache.ecs/src/org/apache/ecs/ElementAttributes.java
@@ -234,7 +234,7 @@ public abstract class ElementAttributes extends GenericElement implements Attrib
     /** Add an attribute to the element. */
     public Element addAttribute(String attribute_name, int attribute_value)
     {
-        getElementHashEntry().put(attribute_name, new Integer(attribute_value));
+        getElementHashEntry().put(attribute_name, Integer.valueOf(attribute_value));
         return(this);
     }
 
diff --git a/org.apache.ecs/src/org/apache/ecs/xhtml/var.java b/org.apache.ecs/src/org/apache/ecs/xhtml/Var.java
similarity index 89%
rename from org.apache.ecs/src/org/apache/ecs/xhtml/var.java
rename to org.apache.ecs/src/org/apache/ecs/xhtml/Var.java
index 73f6d46987..33c9e31bb5 100644
--- a/org.apache.ecs/src/org/apache/ecs/xhtml/var.java
+++ b/org.apache.ecs/src/org/apache/ecs/xhtml/Var.java
@@ -42,7 +42,7 @@ import org.apache.ecs.Printable;
 
 */
 
-public class var extends MultiPartElement implements Printable, MouseEvents, KeyEvents
+public class Var extends MultiPartElement implements Printable, MouseEvents, KeyEvents
 
 {
 
@@ -75,7 +75,7 @@ public class var extends MultiPartElement implements Printable, MouseEvents, Key
 
     */
 
-    public var()
+    public Var()
 
     {
 
@@ -91,7 +91,7 @@ public class var extends MultiPartElement implements Printable, MouseEvents, Key
 
     */
 
-    public var(Element element)
+    public Var(Element element)
 
     {
 
@@ -109,7 +109,7 @@ public class var extends MultiPartElement implements Printable, MouseEvents, Key
 
     */
 
-    public var(String element)
+    public Var(String element)
 
     {
 
@@ -151,7 +151,7 @@ public class var extends MultiPartElement implements Printable, MouseEvents, Key
 
      */
 
-    public var addElement(String hashcode,Element element)
+    public Var addElement(String hashcode,Element element)
 
     {
 
@@ -173,7 +173,7 @@ public class var extends MultiPartElement implements Printable, MouseEvents, Key
 
      */
 
-    public var addElement(String hashcode,String element)
+    public Var addElement(String hashcode,String element)
 
     {
 
@@ -193,7 +193,7 @@ public class var extends MultiPartElement implements Printable, MouseEvents, Key
 
      */
 
-    public var addElement(Element element)
+    public Var addElement(Element element)
 
     {
 
@@ -213,7 +213,7 @@ public class var extends MultiPartElement implements Printable, MouseEvents, Key
 
      */
 
-    public var addElement(String element)
+    public Var addElement(String element)
 
     {
 
@@ -231,7 +231,7 @@ public class var extends MultiPartElement implements Printable, MouseEvents, Key
 
     */
 
-    public var removeElement(String hashcode)
+    public Var removeElement(String hashcode)
 
     {
 
diff --git a/org.compiere.db.oracle.provider/.classpath b/org.compiere.db.oracle.provider/.classpath
index 7832374cd1..68b6058e5e 100644
--- a/org.compiere.db.oracle.provider/.classpath
+++ b/org.compiere.db.oracle.provider/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry exported="true" kind="lib" path="lib/c3p0-oracle-thin-extras.jar"/>
diff --git a/org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs b/org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs
+++ b/org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
index 2c5117642f..2da91f3c12 100644
--- a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
+++ b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Oracle Provider
 Bundle-SymbolicName: org.compiere.db.oracle.provider;singleton:=true
-Bundle-Version: 5.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Version: 6.1.0.qualifier
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  org.adempiere.install;bundle-version="0.0.0"
 Bundle-ClassPath: .,
@@ -18,4 +18,5 @@ Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.adempiere.db.oracle.OracleBundleActivator
 Service-Component: OSGI-INF/oracleprovider.xml
 Automatic-Module-Name: org.compiere.db.oracle.provider
+Bundle-Vendor: iDempiere Community
 
diff --git a/org.compiere.db.oracle.provider/copyjars.xml b/org.compiere.db.oracle.provider/copyjars.xml
index 026f8fbc66..d10f9c61f7 100644
--- a/org.compiere.db.oracle.provider/copyjars.xml
+++ b/org.compiere.db.oracle.provider/copyjars.xml
@@ -4,6 +4,6 @@
         <get src="${url.maven2}/com/mchange/c3p0/0.9.5/c3p0-0.9.5.jar" dest="lib/c3p0.jar" usetimestamp="true" verbose="true" retries="5" />
         <get src="${url.maven2}/com/mchange/mchange-commons-java/0.2.9/mchange-commons-java-0.2.9.jar" dest="lib/mchange-commons-java.jar" usetimestamp="true" verbose="true" retries="5" />
         <get src="${url.maven2}/com/google/code/maven-play-plugin/com/mchange/c3p0-oracle-thin-extras/0.9.5/c3p0-oracle-thin-extras-0.9.5.jar" dest="lib/c3p0-oracle-thin-extras.jar" usetimestamp="true" verbose="true" retries="5" />
-        <get src="${url.file.srv}/jarfile/5.1/ojdbc7.jar" dest="lib/ojdbc7.jar" usetimestamp="true" verbose="true" retries="5" />
+        <get src="${url.file.srv}/jarfile/6.1/ojdbc7.jar" dest="lib/ojdbc7.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>
diff --git a/org.compiere.db.oracle.provider/pom.xml b/org.compiere.db.oracle.provider/pom.xml
index 2b4bdab2e6..f8a67adca3 100644
--- a/org.compiere.db.oracle.provider/pom.xml
+++ b/org.compiere.db.oracle.provider/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.compiere.db.oracle.provider</artifactId>
@@ -26,12 +26,12 @@
 								<artifactItem>
 									<groupId>com.mchange</groupId>
 									<artifactId>c3p0</artifactId>
-									<version>0.9.5</version>
+									<version>0.9.5.2</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>com.mchange</groupId>
 									<artifactId>mchange-commons-java</artifactId>
-									<version>0.2.9</version>
+									<version>0.2.15</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>com.google.code.maven-play-plugin.com.mchange</groupId>
@@ -58,7 +58,7 @@
 						</goals>
 						<configuration>
 							<!-- to complicate to get from official repository https://blogs.oracle.com/dev2dev/get-oracle-jdbc-drivers-from-the-oracle-maven-repo-netbeans-eclipse-intellij -->
-							<url>${url.file.srv}/jarfile/5.1/ojdbc7.jar</url>
+							<url>${url.file.srv}/jarfile/6.1/ojdbc7.jar</url>
 							<unpack>false</unpack>
 							<outputDirectory>lib</outputDirectory>
 							<retries>5</retries>
diff --git a/org.compiere.db.oracle.provider/src/org/adempiere/db/oracle/config/ConfigOracle.java b/org.compiere.db.oracle.provider/src/org/adempiere/db/oracle/config/ConfigOracle.java
index 8f0ae3a057..2e4ad68249 100644
--- a/org.compiere.db.oracle.provider/src/org/adempiere/db/oracle/config/ConfigOracle.java
+++ b/org.compiere.db.oracle.provider/src/org/adempiere/db/oracle/config/ConfigOracle.java
@@ -30,6 +30,7 @@ import java.util.regex.Pattern;
 import org.adempiere.install.DBConfigStatus;
 import org.adempiere.install.IDBConfigMonitor;
 import org.adempiere.install.IDatabaseConfig;
+import org.compiere.db.AdempiereDatabase;
 import org.compiere.db.Database;
 import org.compiere.install.ConfigurationData;
 import org.compiere.util.CLogger;
@@ -60,6 +61,8 @@ public class ConfigOracle implements IDatabaseConfig
 	/** Express Edition			*/
 	private boolean 			m_XE = false;
 
+	private AdempiereDatabase p_db = Database.getDatabase(Database.DB_ORACLE);
+
 	/**
 	 * 	Init
 	 */
@@ -356,14 +359,19 @@ public class ConfigOracle implements IDatabaseConfig
 		String url = "jdbc:oracle:thin:@//" + databaseServer.getHostName()
 			+ ":" + databasePort
 			+ "/" + databaseName;
-		pass = testJDBC(url, "system", systemPassword);
+		pass = testJDBC(url, p_db.getSystemUser(), systemPassword);
 		error = "Error connecting: " + url
-			+ " - as system/" + systemPassword;
+			+ " - as "+ p_db.getSystemUser() + "/" + systemPassword;
 		if (monitor != null)
 			monitor.update(new DBConfigStatus(DBConfigStatus.DATABASE_SYSTEM_PASSWORD, "ErrorJDBC",
 				pass, true, error));
-		if (!pass)
-			return error;
+		if (!pass) {
+			if (isDBExists) {
+				log.warning(error);
+			} else {
+				return error;
+			}
+		}
 		if (log.isLoggable(Level.INFO)) log.info("OK: Connection = " + url);
 		data.setProperty(ConfigurationData.ADEMPIERE_DB_URL, url);
 		if (log.isLoggable(Level.INFO)) log.info("OK: Database System User " + databaseName);
@@ -421,7 +429,7 @@ public class ConfigOracle implements IDatabaseConfig
 		}
 		if (testFile != null) {
 			//	TNS Name Info via sqlplus
-			String sqlplus = "sqlplus system/" + systemPassword + "@"
+			String sqlplus = "sqlplus " + p_db.getSystemUser() + "/" + systemPassword + "@"
 				+ "//" + databaseServer.getHostName()
 				+ ":" + databasePort
 				+ "/" + databaseName
@@ -444,7 +452,7 @@ public class ConfigOracle implements IDatabaseConfig
 		if (System.getProperty("TestOCI", "N").equals("Y"))
 		{
 			url = "jdbc:oracle:oci8:@" + databaseName;
-			pass = testJDBC(url, "system", systemPassword);
+			pass = testJDBC(url, p_db.getSystemUser(), systemPassword);
 			if (pass) {
 				if (log.isLoggable(Level.INFO)) log.info("OK: Connection = " + url);
 			} else {
diff --git a/org.compiere.db.oracle.provider/src/org/compiere/db/DB_Oracle.java b/org.compiere.db.oracle.provider/src/org/compiere/db/DB_Oracle.java
index b589e1ebb0..0daa0418e1 100644
--- a/org.compiere.db.oracle.provider/src/org/compiere/db/DB_Oracle.java
+++ b/org.compiere.db.oracle.provider/src/org/compiere/db/DB_Oracle.java
@@ -23,6 +23,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.net.URL;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -410,7 +411,10 @@ public class DB_Oracle implements AdempiereDatabase
      */
     public String getSystemUser()
     {
-        return "system";
+    	String systemUser = System.getProperty("ADEMPIERE_DB_SYSTEM_USER");
+    	if (systemUser == null)
+    		systemUser = "system";
+        return systemUser;
     }   //  getSystemUser
 
     /**
@@ -514,7 +518,7 @@ public class DB_Oracle implements AdempiereDatabase
         {
             try
             {
-                result = number.setScale(scale, BigDecimal.ROUND_HALF_UP);
+                result = number.setScale(scale, RoundingMode.HALF_UP);
             }
             catch (Exception e)
             {
diff --git a/org.compiere.db.postgresql.provider/.classpath b/org.compiere.db.postgresql.provider/.classpath
index e87f919210..838d301005 100644
--- a/org.compiere.db.postgresql.provider/.classpath
+++ b/org.compiere.db.postgresql.provider/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry exported="true" kind="lib" path="lib/c3p0.jar"/>
diff --git a/org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs b/org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs
+++ b/org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
index 40ff7440da..a1ee23449d 100644
--- a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
+++ b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Postgresql Provider
 Bundle-SymbolicName: org.compiere.db.postgresql.provider;singleton:=true
-Bundle-Version: 5.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Version: 6.1.0.qualifier
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Bundle-ClassPath: .,
  lib/c3p0.jar,
  lib/mchange-commons-java.jar,
@@ -19,3 +19,4 @@ Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.adempiere.db.postgresql.PostgreSQLBundleActivator
 Service-Component: OSGI-INF/pgprovider.xml
 Automatic-Module-Name: org.compiere.db.postgresql.provider
+Bundle-Vendor: iDempiere Community
diff --git a/org.compiere.db.postgresql.provider/pom.xml b/org.compiere.db.postgresql.provider/pom.xml
index d3f989960b..b3650c46bc 100644
--- a/org.compiere.db.postgresql.provider/pom.xml
+++ b/org.compiere.db.postgresql.provider/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.compiere.db.postgresql.provider</artifactId>
@@ -31,12 +31,12 @@
 								<artifactItem>
 									<groupId>com.mchange</groupId>
 									<artifactId>mchange-commons-java</artifactId>
-									<version>0.2.12</version>
+									<version>0.2.15</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>org.postgresql</groupId>
 									<artifactId>postgresql</artifactId>
-									<version>42.1.4</version>
+									<version>42.2.5</version>
 								</artifactItem>
 							</artifactItems>
 							<outputDirectory>lib</outputDirectory>
diff --git a/org.compiere.db.postgresql.provider/src/org/compiere/db/DB_PostgreSQL.java b/org.compiere.db.postgresql.provider/src/org/compiere/db/DB_PostgreSQL.java
index f4194b8527..30db4bfec3 100755
--- a/org.compiere.db.postgresql.provider/src/org/compiere/db/DB_PostgreSQL.java
+++ b/org.compiere.db.postgresql.provider/src/org/compiere/db/DB_PostgreSQL.java
@@ -25,6 +25,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.net.URL;
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -382,7 +383,10 @@ public class DB_PostgreSQL implements AdempiereDatabase
 	 */
 	public String getSystemUser()
 	{
-		return "postgres";
+    	String systemUser = System.getProperty("ADEMPIERE_DB_SYSTEM_USER");
+    	if (systemUser == null)
+    		systemUser = "postgres";
+        return systemUser;
 	}	//	getSystemUser
 
 	/**
@@ -495,7 +499,7 @@ public class DB_PostgreSQL implements AdempiereDatabase
 		{
 			try
 			{
-				result = number.setScale(scale, BigDecimal.ROUND_HALF_UP);
+				result = number.setScale(scale, RoundingMode.HALF_UP);
 			}
 			catch (Exception e)
 			{
diff --git a/org.compiere.db.provider-feature/feature.xml b/org.compiere.db.provider-feature/feature.xml
index df98b1f91e..0ea8112af3 100644
--- a/org.compiere.db.provider-feature/feature.xml
+++ b/org.compiere.db.provider-feature/feature.xml
@@ -2,7 +2,8 @@
 <feature
       id="org.compiere.db.provider.feature"
       label="Database Provider-feature"
-      version="5.1.0.qualifier">
+      version="6.1.0.qualifier"
+      provider-name="iDempiere Community">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
diff --git a/org.compiere.db.provider-feature/pom.xml b/org.compiere.db.provider-feature/pom.xml
index 8196607e2e..7fb86a2189 100644
--- a/org.compiere.db.provider-feature/pom.xml
+++ b/org.compiere.db.provider-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.compiere.db.provider.feature</artifactId>
diff --git a/org.idempiere.eclipse.platform-feature/feature.xml b/org.idempiere.eclipse.platform-feature/feature.xml
index 98967a6e35..96f175531f 100644
--- a/org.idempiere.eclipse.platform-feature/feature.xml
+++ b/org.idempiere.eclipse.platform-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.idempiere.eclipse.platform.feature"
       label="Eclipse Platform for iDempiere"
-      version="5.1.0.qualifier"
+      version="6.1.0.qualifier"
       provider-name="www.idempiere.org">
 
    <description url="http://www.example.com/description">
diff --git a/org.idempiere.eclipse.platform-feature/pom.xml b/org.idempiere.eclipse.platform-feature/pom.xml
index 74a171028f..d6adc7f9e2 100644
--- a/org.idempiere.eclipse.platform-feature/pom.xml
+++ b/org.idempiere.eclipse.platform-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.idempiere.eclipse.platform.feature</artifactId>
diff --git a/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini b/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini
index c73f3a781b..9813d97456 100644
--- a/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini
+++ b/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini
@@ -1,4 +1,4 @@
-osgi.framework=file\:../plugins/org.eclipse.osgi_3.13.0.v20180409-1500.jar
+osgi.framework=file\:../plugins/org.eclipse.osgi_3.13.100.v20180827-1536.jar
 osgi.install.area=director
 equinox.use.ds=true
 osgi.bundles=org.eclipse.core.net@start,\
@@ -37,6 +37,7 @@ osgi.bundles=org.eclipse.core.net@start,\
  org.eclipse.equinox.p2.touchpoint.natives,\
  org.eclipse.equinox.p2.transport.ecf,\
  org.eclipse.ecf,\
+ org.eclipse.equinox.concurrent,\
  org.eclipse.ecf.filetransfer,\
  org.eclipse.ecf.identity,\
  org.eclipse.ecf.provider.filetransfer,\
diff --git a/org.idempiere.equinox.p2.director-feature/feature.xml b/org.idempiere.equinox.p2.director-feature/feature.xml
index 837b249a34..ec0f32c1f1 100644
--- a/org.idempiere.equinox.p2.director-feature/feature.xml
+++ b/org.idempiere.equinox.p2.director-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.idempiere.equinox.p2.director.feature"
       label="Idempiere P2 Director"
-      version="5.1.0.qualifier"
+      version="6.1.0.qualifier"
       provider-name="www.idempiere.org">
 
    <description url="http://www.example.com/description">
diff --git a/org.idempiere.equinox.p2.director-feature/pom.xml b/org.idempiere.equinox.p2.director-feature/pom.xml
index ac1520a7f7..f26c1e5559 100644
--- a/org.idempiere.equinox.p2.director-feature/pom.xml
+++ b/org.idempiere.equinox.p2.director-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.idempiere.equinox.p2.director.feature</artifactId>
diff --git a/org.idempiere.felix.webconsole-feature/feature.xml b/org.idempiere.felix.webconsole-feature/feature.xml
index 1bf97d6515..8916b1d548 100644
--- a/org.idempiere.felix.webconsole-feature/feature.xml
+++ b/org.idempiere.felix.webconsole-feature/feature.xml
@@ -2,7 +2,8 @@
 <feature
       id="org.idempiere.felix.webconsole.feature"
       label="Felix Web Console Feature"
-      version="5.1.0.qualifier">
+      version="6.1.0.qualifier"
+      provider-name="iDempiere Community">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
diff --git a/org.idempiere.felix.webconsole-feature/pom.xml b/org.idempiere.felix.webconsole-feature/pom.xml
index 293562e261..37c629eab3 100644
--- a/org.idempiere.felix.webconsole-feature/pom.xml
+++ b/org.idempiere.felix.webconsole-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.idempiere.felix.webconsole.feature</artifactId>
diff --git a/org.idempiere.felix.webconsole/.classpath b/org.idempiere.felix.webconsole/.classpath
index cf36b56119..423c974870 100644
--- a/org.idempiere.felix.webconsole/.classpath
+++ b/org.idempiere.felix.webconsole/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs
+++ b/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF b/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF
index 58a6970ce3..4039c9f6b1 100644
--- a/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF
+++ b/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Felix Web Console
 Bundle-SymbolicName: org.idempiere.felix.webconsole
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.1.0.qualifier
 Bundle-Activator: org.idempiere.felix.webconsole.Activator
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Import-Package: javax.servlet;version="2.5.0",
  javax.servlet.http;version="2.5.0",
  javax.servlet.jsp;version="2.1.0",
@@ -29,3 +29,4 @@ Web-ContextPath: osgi
 Service-Component: OSGI-INF/securityprovider.xml
 Bundle-ClassPath: .
 Automatic-Module-Name: org.idempiere.felix.webconsole
+Bundle-Vendor: iDempiere Community
diff --git a/org.idempiere.felix.webconsole/pom.xml b/org.idempiere.felix.webconsole/pom.xml
index 4fb4f3ef1d..79f7815706 100644
--- a/org.idempiere.felix.webconsole/pom.xml
+++ b/org.idempiere.felix.webconsole/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.idempiere.felix.webconsole</artifactId>
diff --git a/org.idempiere.fitnesse-feature/feature.xml b/org.idempiere.fitnesse-feature/feature.xml
index 3b1d1950de..4800c60150 100644
--- a/org.idempiere.fitnesse-feature/feature.xml
+++ b/org.idempiere.fitnesse-feature/feature.xml
@@ -2,7 +2,8 @@
 <feature
       id="org.idempiere.fitnesse.feature"
       label="Fitnesse Feature"
-      version="5.1.0.qualifier">
+      version="6.1.0.qualifier"
+      provider-name="iDempiere Community">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
diff --git a/org.idempiere.fitnesse-feature/pom.xml b/org.idempiere.fitnesse-feature/pom.xml
index 4b94bffa62..ccfc6d6cf3 100644
--- a/org.idempiere.fitnesse-feature/pom.xml
+++ b/org.idempiere.fitnesse-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.idempiere.fitnesse.feature</artifactId>
diff --git a/org.idempiere.fitnesse.fixture/.classpath b/org.idempiere.fitnesse.fixture/.classpath
index cf36b56119..423c974870 100644
--- a/org.idempiere.fitnesse.fixture/.classpath
+++ b/org.idempiere.fitnesse.fixture/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.idempiere.fitnesse.fixture/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.fitnesse.fixture/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.idempiere.fitnesse.fixture/.settings/org.eclipse.jdt.core.prefs
+++ b/org.idempiere.fitnesse.fixture/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF b/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF
index b0875e246a..b638f9d41a 100644
--- a/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF
+++ b/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Fitnesse Fixture
 Bundle-SymbolicName: org.idempiere.fitnesse.fixture
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.1.0.qualifier
 Bundle-Activator: org.idempiere.fitnesse.fixture.Activator
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Import-Package: fit,
  fit.decorator,
  fit.decorator.exceptions,
@@ -65,3 +65,4 @@ Service-Component: OSGI-INF/fitfixturefactory.xml, OSGI-INF/slimfixturefactory.x
 Export-Package: org.idempiere.fitnesse.fixture
 Bundle-ClassPath: .
 Automatic-Module-Name: org.idempiere.fitnesse.fixture
+Bundle-Vendor: iDempiere Community
diff --git a/org.idempiere.fitnesse.fixture/pom.xml b/org.idempiere.fitnesse.fixture/pom.xml
index fb8927f8bd..f5071079e8 100644
--- a/org.idempiere.fitnesse.fixture/pom.xml
+++ b/org.idempiere.fitnesse.fixture/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.idempiere.fitnesse.fixture</artifactId>
diff --git a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/CreateRecord.java b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/CreateRecord.java
index ebed4bd806..1822868eab 100644
--- a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/CreateRecord.java
+++ b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/CreateRecord.java
@@ -169,9 +169,9 @@ public class CreateRecord extends TableFixture {
 							continue;
 						} else if (columnClass == Boolean.class) {
 							if ("Y".equalsIgnoreCase(value_evaluated) || "true".equalsIgnoreCase(value_evaluated))
-								value = new Boolean(true);
+								value = Boolean.TRUE;
 							else if ("N".equalsIgnoreCase(value_evaluated) || "false".equalsIgnoreCase(value_evaluated))
-								value = new Boolean(false);
+								value = Boolean.FALSE;
 							else {
 								exception(getCell(i, 1), new Exception("Wrong value for boolean, allowed Y/N/true/false"));
 								continue;
diff --git a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/FitFixtureFactory.java b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/FitFixtureFactory.java
index 7c6c11d1e6..4c74faa11d 100644
--- a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/FitFixtureFactory.java
+++ b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/FitFixtureFactory.java
@@ -13,6 +13,8 @@
  *****************************************************************************/
 package org.idempiere.fitnesse.fixture;
 
+import java.lang.reflect.InvocationTargetException;
+
 import org.idempiere.fitnesse.server.fit.IFitFixtureFactory;
 
 import fit.FixtureName;
@@ -40,20 +42,20 @@ public class FitFixtureFactory implements IFitFixtureFactory {
 		String className = fixtureName.toString();
 		try {
 			Class<?> clazz = getClass().getClassLoader().loadClass(className);
-			return clazz.newInstance();
+			return clazz.getDeclaredConstructor().newInstance();
 		} catch (ClassNotFoundException e) {
 		} catch (InstantiationException e) {
-		} catch (IllegalAccessException e) {
+		} catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
 		}
 		
 		if (!fixtureName.isFullyQualified()) {
 			className = DEFAULT_PACKAGE + "." + fixtureName.toString();
 			try {
 				Class<?> clazz = getClass().getClassLoader().loadClass(className);
-				return clazz.newInstance();
+				return clazz.getDeclaredConstructor().newInstance();
 			} catch (ClassNotFoundException e) {
 			} catch (InstantiationException e) {
-			} catch (IllegalAccessException e) {
+			} catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
 			}
 		}
 		return null;
diff --git a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/UpdateRecord.java b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/UpdateRecord.java
index 0f318fd28c..035c1aa73d 100644
--- a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/UpdateRecord.java
+++ b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/UpdateRecord.java
@@ -200,9 +200,9 @@ public class UpdateRecord extends TableFixture {
 									continue;
 								} else if (columnClass == Boolean.class) {
 									if ("Y".equalsIgnoreCase(value_evaluated) || "true".equalsIgnoreCase(value_evaluated))
-										value = new Boolean(true);
+										value = Boolean.TRUE;
 									else if ("N".equalsIgnoreCase(value_evaluated) || "false".equalsIgnoreCase(value_evaluated))
-										value = new Boolean(false);
+										value = Boolean.FALSE;
 									else {
 										exception(getCell(i, 1), new Exception("Wrong value for boolean, allowed Y/N/true/false"));
 										continue;
diff --git a/org.idempiere.fitnesse.server/.classpath b/org.idempiere.fitnesse.server/.classpath
index b4669936c8..02877fa41d 100644
--- a/org.idempiere.fitnesse.server/.classpath
+++ b/org.idempiere.fitnesse.server/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry exported="true" kind="lib" path="lib/fitlibrary.jar"/>
diff --git a/org.idempiere.fitnesse.server/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.fitnesse.server/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.idempiere.fitnesse.server/.settings/org.eclipse.jdt.core.prefs
+++ b/org.idempiere.fitnesse.server/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF b/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF
index 639c1fcc19..0656cce1e5 100644
--- a/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF
+++ b/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Fitnesse Server
 Bundle-SymbolicName: org.idempiere.fitnesse.server
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.1.0.qualifier
 Bundle-Activator: org.idempiere.fitnesse.server.Activator
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Import-Package: javax.servlet;version="3.0.0",
  javax.servlet.http;version="3.0.0",
  org.adempiere.base,
@@ -329,3 +329,4 @@ Export-Package: fit,
  org.openqa.selenium.support.pagefactory.internal,
  org.openqa.selenium.support.ui
 Automatic-Module-Name: org.idempiere.fitnesse.server
+Bundle-Vendor: iDempiere Community
diff --git a/org.idempiere.fitnesse.server/copyjars.xml b/org.idempiere.fitnesse.server/copyjars.xml
index 43441085d8..042bdc2e6b 100644
--- a/org.idempiere.fitnesse.server/copyjars.xml
+++ b/org.idempiere.fitnesse.server/copyjars.xml
@@ -3,9 +3,9 @@
 <project name="zklibrary" basedir="." default="copy">
 	<mkdir dir="lib" />
 	<target name="copy">
-        <get src="${url.file.srv}/jarfile/5.1/fitlibrary-2.0.jar" dest="lib/fitlibrary.jar" usetimestamp="true" verbose="true" retries="5" />
+        <get src="${url.file.srv}/jarfile/6.1/fitlibrary-2.0.jar" dest="lib/fitlibrary.jar" usetimestamp="true" verbose="true" retries="5" />
         <get src="${url.maven2}/org/fitnesse/fitnesse/20111025/fitnesse-20111025.jar" dest="lib/fitnesse.jar" usetimestamp="true" verbose="true" retries="5" />
-        <get src="${url.file.srv}/jarfile/5.1/fitlibraryweb-2.0.jar" dest="lib/fitlibraryweb.jar" usetimestamp="true" verbose="true" retries="5" />
+        <get src="${url.file.srv}/jarfile/6.1/fitlibraryweb-2.0.jar" dest="lib/fitlibraryweb.jar" usetimestamp="true" verbose="true" retries="5" />
         <!--old version is 2.35, can't find out in maven also homepage.
         when host old version (2.35) to bitbucket.org can't donwload by ant, maybe big file (even it's download normal with browse). 
         
diff --git a/org.idempiere.fitnesse.server/pom.xml b/org.idempiere.fitnesse.server/pom.xml
index a644273f6c..4eb108a452 100644
--- a/org.idempiere.fitnesse.server/pom.xml
+++ b/org.idempiere.fitnesse.server/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.idempiere.fitnesse.server</artifactId>
@@ -63,7 +63,7 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>${url.file.srv}/jarfile/5.1/fitlibrary-2.0.jar</url>
+							<url>${url.file.srv}/jarfile/6.1/fitlibrary-2.0.jar</url>
 							<unpack>false</unpack>
 							<outputDirectory>lib</outputDirectory>
 							<retries>5</retries>
@@ -77,7 +77,7 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>${url.file.srv}/jarfile/5.1/fitlibraryweb-2.0.jar</url>
+							<url>${url.file.srv}/jarfile/6.1/fitlibraryweb-2.0.jar</url>
 							<unpack>false</unpack>
 							<outputDirectory>lib</outputDirectory>
 							<retries>5</retries>
diff --git a/org.idempiere.fitrecorder/.classpath b/org.idempiere.fitrecorder/.classpath
index cf36b56119..423c974870 100644
--- a/org.idempiere.fitrecorder/.classpath
+++ b/org.idempiere.fitrecorder/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.idempiere.fitrecorder/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.fitrecorder/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.idempiere.fitrecorder/.settings/org.eclipse.jdt.core.prefs
+++ b/org.idempiere.fitrecorder/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.idempiere.fitrecorder/META-INF/MANIFEST.MF b/org.idempiere.fitrecorder/META-INF/MANIFEST.MF
index 9ea2bdb0f4..a633563d50 100644
--- a/org.idempiere.fitrecorder/META-INF/MANIFEST.MF
+++ b/org.idempiere.fitrecorder/META-INF/MANIFEST.MF
@@ -2,15 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Fitnesse Recorder
 Bundle-SymbolicName: org.idempiere.fitrecorder;singleton:=true
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.1.0.qualifier
 Bundle-Activator: org.adempiere.plugin.utils.AdempiereActivator
 Import-Package: org.adempiere.base,
  org.adempiere.plugin.utils,
  org.compiere.model,
  org.osgi.framework;version="1.3.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Service-Component: plugin.xml
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
 Automatic-Module-Name: org.idempiere.fitrecorder
+Bundle-Vendor: iDempiere Community
diff --git a/org.idempiere.fitrecorder/pom.xml b/org.idempiere.fitrecorder/pom.xml
index cae6ebe40d..03d4abf6a1 100644
--- a/org.idempiere.fitrecorder/pom.xml
+++ b/org.idempiere.fitrecorder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.idempiere.fitrecorder</artifactId>
diff --git a/org.idempiere.hazelcast.service-feature/feature.xml b/org.idempiere.hazelcast.service-feature/feature.xml
index 3dd8644621..4458dc9b58 100644
--- a/org.idempiere.hazelcast.service-feature/feature.xml
+++ b/org.idempiere.hazelcast.service-feature/feature.xml
@@ -2,7 +2,8 @@
 <feature
       id="org.idempiere.hazelcast.service.feature"
       label="Hazelcast Service Feature"
-      version="5.1.0.qualifier">
+      version="6.1.0.qualifier"
+      provider-name="iDempiere Community">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
diff --git a/org.idempiere.hazelcast.service-feature/pom.xml b/org.idempiere.hazelcast.service-feature/pom.xml
index c2d98f4126..6737371031 100644
--- a/org.idempiere.hazelcast.service-feature/pom.xml
+++ b/org.idempiere.hazelcast.service-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.idempiere.hazelcast.service.feature</artifactId>
diff --git a/org.idempiere.hazelcast.service.config/.classpath b/org.idempiere.hazelcast.service.config/.classpath
index cf36b56119..423c974870 100644
--- a/org.idempiere.hazelcast.service.config/.classpath
+++ b/org.idempiere.hazelcast.service.config/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.idempiere.hazelcast.service.config/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.hazelcast.service.config/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.idempiere.hazelcast.service.config/.settings/org.eclipse.jdt.core.prefs
+++ b/org.idempiere.hazelcast.service.config/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF b/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF
index 2a7d510d45..5344672484 100644
--- a/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF
+++ b/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF
@@ -2,8 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Hazelcast Service Configuration
 Bundle-SymbolicName: org.idempiere.hazelcast.service.config
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.1.0.qualifier
 Fragment-Host: org.idempiere.hazelcast.service;bundle-version="0.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Bundle-ClassPath: .
 Automatic-Module-Name: org.idempiere.hazelcast.service.config
+Bundle-Vendor: iDempiere Community
diff --git a/org.idempiere.hazelcast.service.config/pom.xml b/org.idempiere.hazelcast.service.config/pom.xml
index 98350653b0..f57fa17b24 100644
--- a/org.idempiere.hazelcast.service.config/pom.xml
+++ b/org.idempiere.hazelcast.service.config/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.idempiere.hazelcast.service.config</artifactId>
diff --git a/org.idempiere.hazelcast.service/.classpath b/org.idempiere.hazelcast.service/.classpath
index bcaca9cc37..cf47451aff 100644
--- a/org.idempiere.hazelcast.service/.classpath
+++ b/org.idempiere.hazelcast.service/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry exported="true" kind="lib" path="lib/hazelcast-aws.jar"/>
diff --git a/org.idempiere.hazelcast.service/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.hazelcast.service/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.idempiere.hazelcast.service/.settings/org.eclipse.jdt.core.prefs
+++ b/org.idempiere.hazelcast.service/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
index 0d6391318e..1a82fdacd7 100644
--- a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
+++ b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Hazelcast Service
 Bundle-SymbolicName: org.idempiere.hazelcast.service
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.1.0.qualifier
 Bundle-Activator: org.idempiere.hazelcast.service.Activator
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.crypto,
@@ -30,6 +30,7 @@ Bundle-ClassPath: .,
  lib/hazelcast-aws.jar,
  lib/hazelcast.jar
 Service-Component: OSGI-INF/clusterservice.xml, OSGI-INF/cacheservice.xml, OSGI-INF/messageservice.xml
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Require-Bundle: org.eclipse.osgi
 Automatic-Module-Name: org.idempiere.hazelcast.service
+Bundle-Vendor: iDempiere Community
diff --git a/org.idempiere.hazelcast.service/pom.xml b/org.idempiere.hazelcast.service/pom.xml
index acf9aa286a..f609fa56b9 100644
--- a/org.idempiere.hazelcast.service/pom.xml
+++ b/org.idempiere.hazelcast.service/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.idempiere.hazelcast.service</artifactId>
@@ -26,12 +26,12 @@
 								<artifactItem>
 									<groupId>com.hazelcast</groupId>
 									<artifactId>hazelcast</artifactId>
-									<version>3.9.3</version>
+									<version>3.10.6</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>com.hazelcast</groupId>
 									<artifactId>hazelcast-aws</artifactId>
-									<version>2.1.0</version>
+									<version>2.3</version>
 								</artifactItem>
 							</artifactItems>
 							<outputDirectory>lib</outputDirectory>
diff --git a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
index 0788e165b3..b231173ea6 100644
--- a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
+++ b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
@@ -3,26 +3,35 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.idempiere.maven.to.p2</artifactId>
 	<packaging>pom</packaging>
 	<properties>
-		<zk-osgi-zip-file>https://www.zkoss.org/zkdownload/downloadEvalFile?id=1245081552</zk-osgi-zip-file>
+		<zk-osgi-zip-file>https://sourceforge.net/projects/zk1/files/ZK/zk-8.5.0/zk-bin-osgi-8.5.0.zip</zk-osgi-zip-file>
 		<!-- https://github.com/eclipse/jetty.project/blob/jetty-9.4.9.v20180320/pom.xml up to verison of jetty -->
 		<jetty.alpn.api.version>1.1.3.v20160715</jetty.alpn.api.version>
-		<jetty.jsp.version>8.5.24.2</jetty.jsp.version>
+		<jetty.jsp.version>8.5.33</jetty.jsp.version>
 		<jetty.conscrypt.version>8.1.12.v20180117</jetty.conscrypt.version>
 		<jetty.osgi.servlet.api.version>3.1.0.M3</jetty.osgi.servlet.api.version>
-		<jetty.conscrypt.openjdk.uber.version>1.1.0</jetty.conscrypt.openjdk.uber.version>
+		<org.apache.taglibs.version>1.2.5</org.apache.taglibs.version>
+		<groovy.version>2.5.3</groovy.version>
+		<org.bouncycastle.version>1.60</org.bouncycastle.version>
+		<jetty.conscrypt.openjdk.uber.version>1.4.0</jetty.conscrypt.openjdk.uber.version>
         <jackson.version>2.9.5</jackson.version> <!--it up to version of jasperreport engine-->
         <stax2.api.version>3.1.4</stax2.api.version> <!--it up to version of jasperreport engine-->
         <validation.api.version>1.1.0.Final</validation.api.version> <!--it up to version of jasperreport engine-->
         <woodstox.core.version>5.0.3</woodstox.core.version> <!--it up to version of jasperreport engine-->
         <json.version>20171018</json.version> <!--it up to version of jackson-datatype-json-org-->
         <slf4j.version>1.7.25</slf4j.version>
+		<xml.ws.version>2.3.1</xml.ws.version>
+		<xml.ws.export.version>2.4</xml.ws.export.version>
+		<apache.cxf.version>3.2.6</apache.cxf.version>
+		<apache.cxf.databinding.version>3.1.17</apache.cxf.databinding.version>
+		<activation.version>1.2.0</activation.version>
+		<annotation.version>1.3.2</annotation.version>
 	</properties>
 	
     <repositories>
@@ -70,7 +79,7 @@
 									<generateSourceFeature>true</generateSourceFeature>
 									<artifacts>
 										<artifact>
-											<id>org.passay:passay:jar:1.3.0</id>
+											<id>org.passay:passay:jar:1.3.1</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
@@ -91,7 +100,13 @@
 											<transitive>false</transitive>
 										</artifact>
 										<artifact>
-											<id>org.eclipse.jetty.orbit:org.eclipse.jdt.core:jar:3.8.2.v20130121</id>
+											<id>org.eclipse.jetty:jetty-continuation:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+										    <!-- it's maintain and up to date than org.eclipse.jdt.core.compiler.batch -->
+											<id>org.eclipse.jdt:org.eclipse.jdt.core:jar:${jdtVersion}</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
@@ -101,17 +116,13 @@
 											<transitive>false</transitive>
 										</artifact>
 										<artifact>
-											<id>javax.annotation:javax.annotation-api:jar:1.3.1</id>
+											<id>javax.annotation:javax.annotation-api:jar:${annotation.version}</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
 										<artifact>
-											<id>javax.management.j2ee:javax.management.j2ee-api:jar:1.1.1</id>
-											<source>true</source>
-											<transitive>false</transitive>
-										</artifact>
-										<artifact>
-											<id>com.sun.mail:javax.mail:jar:1.6.0</id>
+<!--consider to move to javax.mail:javax.mail-api:jar less dependency, but not sure full function-->
+											<id>com.sun.mail:javax.mail:jar:1.6.2</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
@@ -121,22 +132,22 @@
 											<id>org.ow2.asm:asm:jar:6.0</id> <source>true</source> <transitive>false</transitive> 
 											</artifact> -->
 										<artifact>
-											<id>org.apache.taglibs:taglibs-standard-impl:jar:1.2.5</id>
+											<id>org.apache.taglibs:taglibs-standard-impl:jar:${org.apache.taglibs.version}</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
 										<artifact>
-											<id>org.apache.taglibs:taglibs-standard-spec:jar:1.2.5</id>
+											<id>org.apache.taglibs:taglibs-standard-spec:jar:${org.apache.taglibs.version}</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
 										<artifact>
-											<id>org.apache.taglibs:taglibs-standard-jstlel:jar:1.2.5</id>
+											<id>org.apache.taglibs:taglibs-standard-jstlel:jar:${org.apache.taglibs.version}</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
 										<artifact>
-											<id>org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:jar:1.0.10</id>
+											<id>org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:jar:1.0.14</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
@@ -146,7 +157,7 @@
 											<transitive>false</transitive>
 										</artifact>
 										<artifact>
-											<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib:jar:3.2.5_1</id>
+											<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib:jar:3.2.6_1</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
@@ -161,17 +172,17 @@
 											<transitive>false</transitive>
 										</artifact>
 										<artifact>
-											<id>org.apache.felix:org.apache.felix.webconsole:jar:4.3.4</id>
+											<id>org.apache.felix:org.apache.felix.webconsole:jar:4.3.8</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
 										<artifact>
-											<id>org.apache.felix:org.apache.felix.webconsole.plugins.ds:jar:2.0.8</id>
+											<id>org.apache.felix:org.apache.felix.webconsole.plugins.ds:jar:2.1.0</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
 										<artifact>
-											<id>org.apache.felix:org.apache.felix.webconsole.plugins.memoryusage:jar:1.0.6</id>
+											<id>org.apache.felix:org.apache.felix.webconsole.plugins.memoryusage:jar:1.0.8</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
@@ -186,22 +197,22 @@
 											<transitive>false</transitive>
 										</artifact>
 										<artifact>
-											<id>com.itextpdf:itextpdf:jar:5.5.12</id>
+											<id>com.itextpdf:itextpdf:jar:5.5.13</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
 										<artifact>
-											<id>org.bouncycastle:bcpkix-jdk15on:jar:1.58</id>
+											<id>org.bouncycastle:bcpkix-jdk15on:jar:${org.bouncycastle.version}</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
 										<artifact>
-											<id>org.bouncycastle:bcprov-jdk15on:jar:1.58</id>
+											<id>org.bouncycastle:bcprov-jdk15on:jar:${org.bouncycastle.version}</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
 										<artifact>
-											<id>org.bouncycastle:bcmail-jdk15on:jar:1.58</id>
+											<id>org.bouncycastle:bcmail-jdk15on:jar:${org.bouncycastle.version}</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
@@ -226,7 +237,7 @@
 											<transitive>false</transitive>
 										</artifact>
 										<artifact>
-											<id>org.cryptacular:cryptacular:jar:1.2.1</id>
+											<id>org.cryptacular:cryptacular:jar:1.2.2</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
@@ -236,7 +247,7 @@
 											<transitive>false</transitive>
 										</artifact>
 										<artifact>
-											<id>org.atmosphere:atmosphere-runtime:jar:2.4.16</id>
+											<id>org.atmosphere:atmosphere-runtime:jar:2.5.0</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
@@ -246,22 +257,107 @@
 											<transitive>false</transitive>
 										</artifact>
 										<artifact>
-											<id>org.codehaus.groovy:groovy-all:jar:2.4.13</id>
+											<id>org.codehaus.groovy:groovy:jar:${groovy.version}</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
 										<artifact>
-											<id>com.ibm.icu:icu4j:jar:60.2</id>
+											<id>org.codehaus.groovy:groovy-ant:jar:${groovy.version}</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
 										<artifact>
-											<id>joda-time:joda-time:jar:2.9.9</id>
+											<id>org.codehaus.groovy:groovy-cli-commons:jar:${groovy.version}</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
 										<artifact>
-											<id>org.apache.commons:commons-configuration2:jar:2.2</id>
+											<id>org.codehaus.groovy:groovy-cli-picocli:jar:${groovy.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.codehaus.groovy:groovy-console:jar:${groovy.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.codehaus.groovy:groovy-datetime:jar:${groovy.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.codehaus.groovy:groovy-docgenerator:jar:${groovy.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.codehaus.groovy:groovy-groovydoc:jar:${groovy.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.codehaus.groovy:groovy-groovysh:jar:${groovy.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.codehaus.groovy:groovy-jmx:jar:${groovy.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.codehaus.groovy:groovy-json:jar:${groovy.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.codehaus.groovy:groovy-jsr223:jar:${groovy.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.codehaus.groovy:groovy-macro:jar:${groovy.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.codehaus.groovy:groovy-nio:jar:${groovy.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.codehaus.groovy:groovy-servlet:jar:${groovy.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.codehaus.groovy:groovy-sql:jar:${groovy.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.codehaus.groovy:groovy-swing:jar:${groovy.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.codehaus.groovy:groovy-xml:jar:${groovy.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>com.ibm.icu:icu4j:jar:63.1</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>joda-time:joda-time:jar:2.10</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.commons:commons-configuration2:jar:2.3</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
@@ -305,6 +401,703 @@
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
+										<artifact>
+											<id>javax.transaction:javax.transaction-api:jar:1.3</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<!-- better javax.activation:javax.activation-api because include extra package -->
+											<id>com.sun.activation:javax.activation:jar:${activation.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>javax.xml.bind:jaxb-api:jar:${xml.ws.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>com.sun.xml.bind:jaxb-core:jar:2.3.0.1</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>com.sun.xml.bind:jaxb-impl:jar:${xml.ws.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>com.sun.xml.ws:jaxws-rt:jar:${xml.ws.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>javax.xml.ws:jaxws-api:jar:${xml.ws.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+											<override>true</override>
+											<instructions>
+												<Bundle-SymbolicName>jaxws-api</Bundle-SymbolicName>
+												<Bundle-Version>${xml.ws.version}</Bundle-Version>
+<!--Export-Package keep same original, copy here because tool will remake it-->
+												<Export-Package>javax.xml.ws;version="${xml.ws.export.version}";uses:="javax.xml.bind,javax.xml.bind.anno
+ tation,javax.xml.namespace,javax.xml.transform,javax.xml.ws.handler,j
+ avax.xml.ws.spi,javax.xml.ws.spi.http,org.w3c.dom",javax.xml.ws.handl
+ er;version="${xml.ws.export.version}";uses:="javax.xml.namespace,javax.xml.ws",javax.xml.ws.handler.soap
+ ;version="${xml.ws.export.version}";uses:="javax.xml.bind,javax.xml.namespace,javax.xml.soap,javax.xml.w
+ s.handler",javax.xml.ws.http;version="${xml.ws.export.version}";uses:="javax.xml.ws",javax.xml.ws.soap;version="${xml.ws.export.version}";u
+ ses:="javax.xml.soap,javax.xml.ws,javax.xml.ws.spi",javax.xml.ws.spi;version="${xml.ws.export.version}";
+ uses:="javax.xml.bind,javax.xml.namespace,javax.xml.transform,javax.x
+ ml.ws,javax.xml.ws.handler,javax.xml.ws.wsaddressing,org.w3c.dom",jav
+ ax.xml.ws.spi.http;version="${xml.ws.export.version}",javax.xml.ws.wsaddressing;version="${xml.ws.export.version}";uses:="javax.xml.bind.an
+ notation,javax.xml.namespace,javax.xml.transform,javax.xml.ws,org.w3c
+ .dom"</Export-Package>
+<!--keep same original, copy here because tool will remake it-->
+												<DynamicImport-Package>org.glassfish.hk2.osgiresourcelocator</DynamicImport-Package>
+<!--refe:note 1-->
+												<Import-Package>javax.xml.bind;version="[2.3,3)",javax.xml.bind.annota
+ tion;version="[2.3,3)",javax.xml.namespace,javax.xml.soap;version="[1
+ .4,2)",javax.xml.transform,javax.xml.transform.stream,org.w3c.dom</Import-Package>
+											    <Require-Capability>osgi.ee;filter:="(&amp;(osgi.ee=JavaSE)(version=9.0))"</Require-Capability>
+											</instructions>
+										</artifact>
+										<artifact>
+											<id>javax.interceptor:javax.interceptor-api:jar:1.2.2</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>javax.enterprise:cdi-api:jar:2.0.SP1</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<!-- from https://mvnrepository.com/artifact/org.apache.activemq/activemq-core/5.7.0
+                                            this one correct than javax.management.j2ee, it let ejb is option import -->
+											<id>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec:jar:1.0.1</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<!-- move from service plugin, it help get latest version -->
+										<artifact>
+											<id>org.apache.cxf:cxf-core:jar:${apache.cxf.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-rt-frontend-jaxws:jar:${apache.cxf.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-rt-frontend-jaxrs:jar:${apache.cxf.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-rt-transports-http:jar:${apache.cxf.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-rt-transports-http-jetty:${apache.cxf.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-rt-bindings-soap:jar:${apache.cxf.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-rt-bindings-xml:jar:${apache.cxf.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-rt-frontend-simple:jar:${apache.cxf.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-rt-wsdl:jar:${apache.cxf.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-spring-boot-autoconfigure:jar:${apache.cxf.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-rt-rs-http-sci:jar:${apache.cxf.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-rt-databinding-jaxb:jar:${apache.cxf.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-rt-ws-addr:jar:${apache.cxf.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-rt-ws-policy:jar:${apache.cxf.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-rt-rs-service-description:jar:${apache.cxf.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-rt-management:jar:${apache.cxf.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-rt-ws-transfer:jar:${apache.cxf.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-rt-rs-extension-providers:jar:${apache.cxf.databinding.version}</id>
+											<!-- the latest is ${apache.cxf.version} (3.2.6) but hasn't XMLBeansElementProvider so use ${apache.cxf.databinding.version} 3.1.17
+											maybe it's on transite progress-->
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-rt-databinding-xmlbeans:jar:${apache.cxf.databinding.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-rt-bindings-object:jar:${apache.cxf.databinding.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.xmlbeans:xmlbeans:jar:3.0.1</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.wsdl4j:jar:1.6.3_1</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.neethi:neethi:jar:3.1.1</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.ws.xmlschema:xmlschema-core:jar:2.2.3</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>commons-discovery:commons-discovery:jar:0.5</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>javax.ws.rs:jsr311-api:jar:1.1.1</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>javax.ws.rs:javax.ws.rs-api:jar:2.1.1</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>javax.jws:javax.jws-api:jar:1.1</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>javax.xml.soap:javax.xml.soap-api:jar:1.4.0</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>javax.xml.rpc:javax.xml.rpc-api:jar:1.1.1</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.codehaus.woodstox:stax2-api:jar:4.1</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-beans:jar:${springframework.version}</id>
+											<source>false</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-beans:jar:sources:${springframework.version}</id>
+											<source>false</source>
+											<transitive>false</transitive>
+                                            <override>true</override>
+											    <!-- source bundle also export package, so zk.ui detect wrong
+											    sometime it bind with source package, sometime it bind with binary but get import from source, so see package but don't see class
+											    -->
+											<instructions>
+											    <Export-Package/>
+											    <Private-Package/>
+											    <Private-Package/>
+											    <Bundle-SymbolicName>org.apache.servicemix.bundles.spring-beans.source</Bundle-SymbolicName>
+											    <Bundle-Name>spring-expression.source</Bundle-Name>
+												<Eclipse-SourceBundle>org.apache.servicemix.bundles.spring-beans;version="${springframework.version}";roots:="."</Eclipse-SourceBundle>
+											</instructions>
+										</artifact>
+										<artifact>
+											<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-core:jar:${springframework.version}</id>
+											<source>false</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-core:jar:sources:${springframework.version}</id>
+											<source>false</source>
+											<transitive>false</transitive>
+                                            <override>true</override>
+											    <!-- source bundle also export package, so zk.ui detect wrong
+											    sometime it bind with source package, sometime it bind with binary but get import from source, so see package but don't see class
+											    -->
+											<instructions>
+											    <Export-Package/>
+											    <Private-Package/>
+											    <Private-Package/>
+											    <Bundle-SymbolicName>org.apache.servicemix.bundles.spring-core.source</Bundle-SymbolicName>
+											    <Bundle-Name>spring-expression.source</Bundle-Name>
+												<Eclipse-SourceBundle>org.apache.servicemix.bundles.spring-core;version="${springframework.version}";roots:="."</Eclipse-SourceBundle>
+											</instructions>
+										</artifact>
+<!--										<artifact>
+											<id>org.springframework:spring-jcl:jar:${springframework.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+-->
+										<artifact>
+											<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-context:jar:${springframework.version}</id>
+											<source>false</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-context:jar:sources:${springframework.version}</id>
+											<source>false</source>
+											<transitive>false</transitive>
+                                            <override>true</override>
+											    <!-- source bundle also export package, so zk.ui detect wrong
+											    sometime it bind with source package, sometime it bind with binary but get import from source, so see package but don't see class
+											    -->
+											<instructions>
+											    <Export-Package/>
+											    <Private-Package/>
+											    <Private-Package/>
+											    <Bundle-SymbolicName>org.apache.servicemix.bundles.spring-context.source</Bundle-SymbolicName>
+											    <Bundle-Name>spring-expression.source</Bundle-Name>
+												<Eclipse-SourceBundle>org.apache.servicemix.bundles.spring-context;version="${springframework.version}";roots:="."</Eclipse-SourceBundle>
+											</instructions>
+										</artifact>
+										<artifact>
+											<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-expression:jar:${springframework.version}</id>
+											<source>false</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-expression:jar:sources:${springframework.version}</id>
+											<source>false</source>
+											<transitive>false</transitive>
+                                            <override>true</override>
+											    <!-- source bundle also export package, so zk.ui detect wrong
+											    sometime it bind with source package, sometime it bind with binary but get import from source, so see package but don't see class
+											    -->
+											<instructions>
+											    <Export-Package/>
+											    <Private-Package/>
+											    <Private-Package/>
+											    <Bundle-SymbolicName>org.apache.servicemix.bundles.spring-expression.source</Bundle-SymbolicName>
+											    <Bundle-Name>spring-expression.source</Bundle-Name>
+												<Eclipse-SourceBundle>org.apache.servicemix.bundles.spring-expression;version="${springframework.version}";roots:="."</Eclipse-SourceBundle>
+											</instructions>
+										</artifact>
+										<artifact>
+											<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-aop:jar:sources:${springframework.version}</id>
+											<source>false</source>
+											<transitive>false</transitive>
+                                            <override>true</override>
+											    <!-- source bundle also export package, so zk.ui detect wrong
+											    sometime it bind with source package, sometime it bind with binary but get import from source, so see package but don't see class
+											    -->
+											<instructions>
+											    <Export-Package/>
+											    <Private-Package/>
+											    <Private-Package/>
+											    <Bundle-SymbolicName>org.apache.servicemix.bundles.spring-aop.source</Bundle-SymbolicName>
+											    <Bundle-Name>spring-aop.source</Bundle-Name>
+												<Eclipse-SourceBundle>org.apache.servicemix.bundles.spring-aop;version="${springframework.version}";roots:="."</Eclipse-SourceBundle>
+											</instructions>
+										</artifact>
+										<artifact>
+											<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-aop:jar:${springframework.version}</id>
+											<source>false</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-web:jar:sources:${springframework.version}</id>
+											<source>false</source>
+											<transitive>false</transitive>
+                                            <override>true</override>
+											    <!-- source bundle also export package, so zk.ui detect wrong
+											    sometime it bind with source package, sometime it bind with binary but get import from source, so see package but don't see class
+											    -->
+											<instructions>
+											    <Export-Package/>
+											    <Private-Package/>
+											    <Private-Package/>
+											    <Bundle-SymbolicName>org.apache.servicemix.bundles.spring-web.source</Bundle-SymbolicName>
+											    <Bundle-Name>spring-web.source</Bundle-Name>
+												<Eclipse-SourceBundle>org.apache.servicemix.bundles.spring-web;version="${springframework.version}";roots:="."</Eclipse-SourceBundle>
+											</instructions>
+										</artifact>
+										<artifact>
+											<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-web:jar:${springframework.version}</id>
+											<source>false</source>
+											<transitive>false</transitive>
+											<override>true</override>
+											<instructions>
+<!--export keep same original, copy here because tool will remake it-->
+											    <Export-Package>org.springframework.http;version="4.3.19.RELEASE";uses
+ :="org.springframework.core.io,org.springframework.core.io.support,or
+ g.springframework.util",org.springframework.http.client;version="4.3.
+ 19.RELEASE";uses:="com.squareup.okhttp,io.netty.channel,io.netty.chan
+ nel.socket,io.netty.handler.ssl,okhttp3,org.apache.http.client,org.ap
+ ache.http.client.config,org.apache.http.client.methods,org.apache.htt
+ p.impl.client,org.apache.http.impl.nio.client,org.apache.http.nio.cli
+ ent,org.apache.http.protocol,org.springframework.beans.factory,org.sp
+ ringframework.core.task,org.springframework.http,org.springframework.
+ util.concurrent",org.springframework.http.client.support;version="4.3
+ .19.RELEASE";uses:="org.apache.commons.logging,org.springframework.be
+ ans.factory,org.springframework.http,org.springframework.http.client"
+ ,org.springframework.http.converter;version="4.3.19.RELEASE";uses:="j
+ avax.imageio,org.apache.commons.logging,org.springframework.core,org.
+ springframework.core.convert,org.springframework.core.io,org.springfr
+ amework.core.io.support,org.springframework.http,org.springframework.
+ util",org.springframework.http.converter.feed;version="4.3.19.RELEASE
+ ";uses:="com.rometools.rome.feed,com.rometools.rome.feed.atom,com.rom
+ etools.rome.feed.rss,org.springframework.http,org.springframework.htt
+ p.converter",org.springframework.http.converter.json;version="4.3.19.
+ RELEASE";uses:="com.fasterxml.jackson.annotation,com.fasterxml.jackso
+ n.core,com.fasterxml.jackson.databind,com.fasterxml.jackson.databind.
+ cfg,com.fasterxml.jackson.databind.deser,com.fasterxml.jackson.databi
+ nd.introspect,com.fasterxml.jackson.databind.jsontype,com.fasterxml.j
+ ackson.databind.ser,com.fasterxml.jackson.databind.util,com.google.gs
+ on,com.google.gson.reflect,org.springframework.beans.factory,org.spri
+ ngframework.beans.factory.config,org.springframework.context,org.spri
+ ngframework.http,org.springframework.http.converter",org.springframew
+ ork.http.converter.protobuf;version="4.3.19.RELEASE";uses:="com.googl
+ e.protobuf,org.springframework.http,org.springframework.http.converte
+ r",org.springframework.http.converter.support;version="4.3.19.RELEASE
+ ";uses:="org.springframework.http.converter",org.springframework.http
+ .converter.xml;version="4.3.19.RELEASE";uses:="com.fasterxml.jackson.
+ databind,javax.xml.bind,javax.xml.stream,javax.xml.transform,org.spri
+ ngframework.http,org.springframework.http.converter,org.springframewo
+ rk.http.converter.json,org.springframework.oxm",org.springframework.h
+ ttp.server;version="4.3.19.RELEASE";uses:="javax.servlet,javax.servle
+ t.http,org.springframework.http",org.springframework.remoting.caucho;
+ version="4.3.19.RELEASE";uses:="com.caucho.burlap.client,com.caucho.h
+ essian.client,com.caucho.hessian.io,com.caucho.hessian.server,com.sun
+ .net.httpserver,javax.servlet,javax.servlet.http,org.aopalliance.inte
+ rcept,org.springframework.beans.factory,org.springframework.remoting,
+ org.springframework.remoting.support,org.springframework.web",org.spr
+ ingframework.remoting.httpinvoker;version="4.3.19.RELEASE";uses:="com
+ .sun.net.httpserver,javax.servlet,javax.servlet.http,org.aopalliance.
+ intercept,org.apache.commons.logging,org.apache.http,org.apache.http.
+ client,org.apache.http.client.config,org.apache.http.client.methods,o
+ rg.springframework.beans.factory,org.springframework.remoting,org.spr
+ ingframework.remoting.rmi,org.springframework.remoting.support,org.sp
+ ringframework.web",org.springframework.remoting.jaxws;version="4.3.19
+ .RELEASE";uses:="com.sun.net.httpserver,javax.jws,javax.xml.namespace
+ ,javax.xml.soap,javax.xml.ws,javax.xml.ws.handler,javax.xml.ws.soap,o
+ rg.aopalliance.intercept,org.apache.commons.logging,org.springframewo
+ rk.beans.factory,org.springframework.core.io,org.springframework.remo
+ ting.soap",org.springframework.web;version="4.3.19.RELEASE";uses:="ja
+ vax.servlet,javax.servlet.annotation,javax.servlet.http,org.springfra
+ mework.http",org.springframework.web.accept;version="4.3.19.RELEASE";
+ uses:="javax.servlet,org.springframework.beans.factory,org.springfram
+ ework.core.io,org.springframework.http,org.springframework.web,org.sp
+ ringframework.web.context,org.springframework.web.context.request,org
+ .springframework.web.util",org.springframework.web.bind;version="4.3.
+ 19.RELEASE";uses:="javax.servlet,org.springframework.beans,org.spring
+ framework.core,org.springframework.validation,org.springframework.web
+ .multipart,org.springframework.web.util",org.springframework.web.bind
+ .annotation;version="4.3.19.RELEASE";uses:="org.springframework.core.
+ annotation,org.springframework.http,org.springframework.stereotype",o
+ rg.springframework.web.bind.annotation.support;version="4.3.19.RELEAS
+ E";uses:="org.springframework.core,org.springframework.http,org.sprin
+ gframework.http.converter,org.springframework.ui,org.springframework.
+ web.bind,org.springframework.web.bind.annotation,org.springframework.
+ web.bind.support,org.springframework.web.context.request",org.springf
+ ramework.web.bind.support;version="4.3.19.RELEASE";uses:="javax.valid
+ ation,org.springframework.beans,org.springframework.core,org.springfr
+ amework.core.convert,org.springframework.validation,org.springframewo
+ rk.web.bind,org.springframework.web.context,org.springframework.web.c
+ ontext.request",org.springframework.web.client;version="4.3.19.RELEAS
+ E";uses:="org.springframework.core,org.springframework.core.task,org.
+ springframework.http,org.springframework.http.client,org.springframew
+ ork.http.client.support,org.springframework.http.converter,org.spring
+ framework.util.concurrent,org.springframework.web.util",org.springfra
+ mework.web.client.support;version="4.3.19.RELEASE";uses:="org.apache.
+ commons.logging,org.springframework.http.client,org.springframework.w
+ eb.client",org.springframework.web.context;version="4.3.19.RELEASE";u
+ ses:="javax.servlet,org.apache.commons.logging,org.springframework.be
+ ans.factory,org.springframework.context,org.springframework.core.env,
+ org.springframework.web",org.springframework.web.context.annotation;v
+ ersion="4.3.19.RELEASE";uses:="org.springframework.context.annotation
+ ,org.springframework.core.annotation",org.springframework.web.context
+ .request;version="4.3.19.RELEASE";uses:="javax.faces.context,javax.se
+ rvlet,javax.servlet.http,org.apache.log4j,org.springframework.beans.f
+ actory,org.springframework.beans.factory.config,org.springframework.h
+ ttp,org.springframework.ui",org.springframework.web.context.request.a
+ sync;version="4.3.19.RELEASE";uses:="javax.servlet,javax.servlet.http
+ ,org.springframework.beans.factory,org.springframework.core.task,org.
+ springframework.web.context.request",org.springframework.web.context.
+ support;version="4.3.19.RELEASE";uses:="groovy.lang,javax.servlet,jav
+ ax.servlet.http,org.apache.commons.logging,org.springframework.beans,
+ org.springframework.beans.factory,org.springframework.beans.factory.c
+ onfig,org.springframework.beans.factory.groovy,org.springframework.be
+ ans.factory.support,org.springframework.beans.factory.xml,org.springf
+ ramework.context,org.springframework.context.annotation,org.springfra
+ mework.context.support,org.springframework.core.env,org.springframewo
+ rk.core.io,org.springframework.core.io.support,org.springframework.ui
+ .context,org.springframework.web.context",org.springframework.web.cor
+ s;version="4.3.19.RELEASE";uses:="javax.servlet.http,org.springframew
+ ork.http,org.springframework.http.server,org.springframework.util,org
+ .springframework.web.util",org.springframework.web.filter;version="4.
+ 3.19.RELEASE";uses:="javax.servlet,javax.servlet.http,org.apache.comm
+ ons.logging,org.apache.log4j,org.springframework.beans,org.springfram
+ ework.beans.factory,org.springframework.context,org.springframework.c
+ ore.env,org.springframework.http,org.springframework.http.converter,o
+ rg.springframework.web.context,org.springframework.web.cors",org.spri
+ ngframework.web.jsf;version="4.3.19.RELEASE";uses:="javax.faces.appli
+ cation,javax.faces.context,javax.faces.event,org.springframework.bean
+ s.factory,org.springframework.web.context",org.springframework.web.js
+ f.el;version="4.3.19.RELEASE";uses:="javax.el,org.apache.commons.logg
+ ing,org.springframework.beans.factory,org.springframework.beans.facto
+ ry.access.el,org.springframework.web.context",org.springframework.web
+ .method;version="4.3.19.RELEASE";uses:="org.apache.commons.logging,or
+ g.springframework.beans.factory,org.springframework.context,org.sprin
+ gframework.core,org.springframework.core.annotation,org.springframewo
+ rk.http,org.springframework.util",org.springframework.web.method.anno
+ tation;version="4.3.19.RELEASE";uses:="javax.servlet,org.apache.commo
+ ns.logging,org.springframework.beans,org.springframework.beans.factor
+ y.config,org.springframework.core,org.springframework.core.convert,or
+ g.springframework.util,org.springframework.web.bind,org.springframewo
+ rk.web.bind.support,org.springframework.web.context.request,org.sprin
+ gframework.web.method,org.springframework.web.method.support,org.spri
+ ngframework.web.util",org.springframework.web.method.support;version=
+ "4.3.19.RELEASE";uses:="org.apache.commons.logging,org.springframewor
+ k.core,org.springframework.core.convert,org.springframework.http,org.
+ springframework.ui,org.springframework.web.bind.support,org.springfra
+ mework.web.context.request,org.springframework.web.method,org.springf
+ ramework.web.util",org.springframework.web.multipart;version="4.3.19.
+ RELEASE";uses:="javax.servlet.http,org.springframework.core,org.sprin
+ gframework.core.io,org.springframework.http,org.springframework.util"
+ ,org.springframework.web.multipart.commons;version="4.3.19.RELEASE";u
+ ses:="javax.servlet,javax.servlet.http,org.apache.commons.fileupload,
+ org.apache.commons.fileupload.disk,org.apache.commons.logging,org.spr
+ ingframework.core.io,org.springframework.util,org.springframework.web
+ .context,org.springframework.web.multipart",org.springframework.web.m
+ ultipart.support;version="4.3.19.RELEASE";uses:="javax.servlet,javax.
+ servlet.http,org.springframework.beans.propertyeditors,org.springfram
+ ework.core,org.springframework.http,org.springframework.http.server,o
+ rg.springframework.util,org.springframework.web.filter,org.springfram
+ ework.web.multipart",org.springframework.web.util;version="4.3.19.REL
+ EASE";uses:="javax.servlet,javax.servlet.http,javax.servlet.jsp.tagex
+ t,org.apache.commons.logging,org.springframework.http,org.springframe
+ work.util"</Export-Package>
+<!--refe: note 1-->
+											    <Import-Package>com.squareup.okhttp.internal.http;resolution:=optional
+ ,javax.net.ssl,okhttp3.internal.http;resolution:=optional,com.caucho.
+ burlap.client;version="[4,5)";resolution:=optional,com.caucho.burlap.
+ io;version="[4,5)";resolution:=optional,com.caucho.burlap.server;vers
+ ion="[4,5)";resolution:=optional,com.caucho.hessian;version="[4,5)";r
+ esolution:=optional,com.caucho.hessian.client;version="[4,5)";resolut
+ ion:=optional,com.caucho.hessian.io;version="[4,5)";resolution:=optio
+ nal,com.caucho.hessian.server;version="[4,5)";resolution:=optional,co
+ m.fasterxml.jackson.annotation;version="[2,3)";resolution:=optional,c
+ om.fasterxml.jackson.core;version="[2,3)";resolution:=optional,com.fa
+ sterxml.jackson.core.util;version="[2,3)";resolution:=optional,com.fa
+ sterxml.jackson.databind;version="[2,3)";resolution:=optional,com.fas
+ terxml.jackson.databind.cfg;version="[2,3)";resolution:=optional,com.
+ fasterxml.jackson.databind.deser;version="[2,3)";resolution:=optional
+ ,com.fasterxml.jackson.databind.introspect;version="[2,3)";resolution
+ :=optional,com.fasterxml.jackson.databind.jsontype;version="[2,3)";re
+ solution:=optional,com.fasterxml.jackson.databind.module;version="[2,
+ 3)";resolution:=optional,com.fasterxml.jackson.databind.ser;version="
+ [2,3)";resolution:=optional,com.fasterxml.jackson.databind.type;versi
+ on="[2,3)";resolution:=optional,com.fasterxml.jackson.databind.util;v
+ ersion="[2,3)";resolution:=optional,com.fasterxml.jackson.dataformat.
+ xml;version="[2,3)";resolution:=optional,com.google.gson;version="[2.
+ 3,3)";resolution:=optional,com.google.gson.reflect;version="[2.3,3)";
+ resolution:=optional,com.google.protobuf;version="[2.6,3)";resolution
+ :=optional,com.googlecode.protobuf.format;resolution:=optional,com.sq
+ uareup.okhttp;version="[2.4,3)";resolution:=optional,com.rometools.ro
+ me.feed;version="[1.5,2)";resolution:=optional,com.rometools.rome.fee
+ d.atom;version="[1.5,2)";resolution:=optional,com.rometools.rome.feed
+ .rss;version="[1.5,2)";resolution:=optional,com.rometools.rome.io;ver
+ sion="[1.5,2)";resolution:=optional,com.sun.net.httpserver;resolution
+ :=optional,groovy.lang;version="[2.4,3)";resolution:=optional,io.nett
+ y.bootstrap;resolution:=optional,io.netty.buffer;resolution:=optional
+ ,io.netty.channel;resolution:=optional,io.netty.channel.nio;resolutio
+ n:=optional,io.netty.channel.socket;resolution:=optional,io.netty.cha
+ nnel.socket.nio;resolution:=optional,io.netty.handler.codec.http;reso
+ lution:=optional,io.netty.handler.ssl;resolution:=optional,io.netty.h
+ andler.timeout;resolution:=optional,io.netty.util.concurrent;resoluti
+ on:=optional,javax.activation;resolution:=optional,javax.el;resolutio
+ n:=optional,javax.faces.application;resolution:=optional,javax.faces.
+ component;resolution:=optional,javax.faces.context;resolution:=option
+ al,javax.faces.event;resolution:=optional,javax.imageio;resolution:=o
+ ptional,javax.imageio.metadata;resolution:=optional,javax.imageio.str
+ eam;resolution:=optional,javax.jws;resolution:=optional,javax.mail.in
+ ternet;resolution:=optional,javax.portlet;resolution:=optional,javax.
+ servlet,javax.servlet.http,javax.servlet.annotation;resolution:=optio
+ nal,javax.servlet.jsp.tagext;resolution:=optional,javax.validation;re
+ solution:=optional,javax.xml.bind;resolution:=optional,javax.xml.bind
+ .annotation;resolution:=optional,javax.xml.namespace;resolution:=opti
+ onal,javax.xml.parsers;resolution:=optional,javax.xml.soap;resolution
+ :=optional,javax.xml.stream;resolution:=optional,javax.xml.transform;
+ resolution:=optional,javax.xml.transform.dom;resolution:=optional,jav
+ ax.xml.transform.sax;resolution:=optional,javax.xml.transform.stax;re
+ solution:=optional,javax.xml.transform.stream;resolution:=optional,ja
+ vax.xml.ws;resolution:=optional,javax.xml.ws.handler;resolution:=opti
+ onal,javax.xml.ws.soap;resolution:=optional,okhttp3;resolution:=optio
+ nal,org.aopalliance.aop;version="[1,2)",org.aopalliance.intercept;ver
+ sion="[1,2)",org.apache.commons.fileupload;version="[1.3,2)";resoluti
+ on:=optional,org.apache.commons.fileupload.disk;version="[1.3,2)";res
+ olution:=optional,org.apache.commons.fileupload.servlet;version="[1.3
+ ,2)";resolution:=optional,org.apache.commons.logging;version="[1.1.1,
+ 2)",org.apache.http;version="[4,5)";resolution:=optional,org.apache.h
+ ttp.client;version="[4,5)";resolution:=optional,org.apache.http.clien
+ t.config;version="[4,5)";resolution:=optional,org.apache.http.client.
+ methods;version="[4,5)";resolution:=optional,org.apache.http.client.p
+ rotocol;version="[4,5)";resolution:=optional,org.apache.http.concurre
+ nt;version="[4,5)";resolution:=optional,org.apache.http.config;versio
+ n="[4,5)";resolution:=optional,org.apache.http.conn;version="[4,5)";r
+ esolution:=optional,org.apache.http.conn.socket;version="[4,5)";resol
+ ution:=optional,org.apache.http.conn.ssl;version="[4,5)";resolution:=
+ optional,org.apache.http.entity;version="[4,5)";resolution:=optional,
+ org.apache.http.impl.client;version="[4,5)";resolution:=optional,org.
+ apache.http.impl.conn;version="[4,5)";resolution:=optional,org.apache
+ .http.impl.nio.client;version="[4,5)";resolution:=optional,org.apache
+ .http.message;version="[4,5)";resolution:=optional,org.apache.http.ni
+ o.client;version="[4,5)";resolution:=optional,org.apache.http.nio.ent
+ ity;version="[4,5)";resolution:=optional,org.apache.http.params;versi
+ on="[4,5)";resolution:=optional,org.apache.http.protocol;version="[4,
+ 5)";resolution:=optional,org.apache.http.util;version="[4,5)";resolut
+ ion:=optional,org.apache.log4j;version="[1.2,2)";resolution:=optional
+ ,org.springframework.aop.framework;version="[4.3.19.RELEASE,4.4)",org
+ .springframework.aop.support;version="[4.3.19.RELEASE,4.4)",org.sprin
+ gframework.beans;version="[4.3.19.RELEASE,4.4)",org.springframework.b
+ eans.factory;version="[4.3.19.RELEASE,4.4)",org.springframework.beans
+ .factory.access;version="[4.3.19.RELEASE,4.4)",org.springframework.be
+ ans.factory.access.el;version="[4.3.19.RELEASE,4.4)",org.springframew
+ ork.beans.factory.annotation;version="[4.3.19.RELEASE,4.4)",org.sprin
+ gframework.beans.factory.config;version="[4.3.19.RELEASE,4.4)",org.sp
+ ringframework.beans.factory.groovy;version="[4.3.19.RELEASE,4.4)",org
+ .springframework.beans.factory.support;version="[4.3.19.RELEASE,4.4)"
+ ,org.springframework.beans.factory.xml;version="[4.3.19.RELEASE,4.4)"
+ ,org.springframework.beans.propertyeditors;version="[4.3.19.RELEASE,4
+ .4)",org.springframework.context;version="[4.3.19.RELEASE,4.4)",org.s
+ pringframework.context.access;version="[4.3.19.RELEASE,4.4)",org.spri
+ ngframework.context.annotation;version="[4.3.19.RELEASE,4.4)",org.spr
+ ingframework.context.i18n;version="[4.3.19.RELEASE,4.4)",org.springfr
+ amework.context.support;version="[4.3.19.RELEASE,4.4)",org.springfram
+ ework.core;version="[4.3.19.RELEASE,4.4)",org.springframework.core.an
+ notation;version="[4.3.19.RELEASE,4.4)",org.springframework.core.conv
+ ert;version="[4.3.19.RELEASE,4.4)",org.springframework.core.env;versi
+ on="[4.3.19.RELEASE,4.4)",org.springframework.core.io;version="[4.3.1
+ 9.RELEASE,4.4)",org.springframework.core.io.support;version="[4.3.19.
+ RELEASE,4.4)",org.springframework.core.task;version="[4.3.19.RELEASE,
+ 4.4)",org.springframework.format.support;version="[4.3.19.RELEASE,4.4
+ )";resolution:=optional,org.springframework.jndi;version="[4.3.19.REL
+ EASE,4.4)";resolution:=optional,org.springframework.oxm;version="[4.3
+ .19.RELEASE,4.4)";resolution:=optional,org.springframework.remoting;v
+ ersion="[4.3.19.RELEASE,4.4)";resolution:=optional,org.springframewor
+ k.remoting.rmi;version="[4.3.19.RELEASE,4.4)";resolution:=optional,or
+ g.springframework.remoting.soap;version="[4.3.19.RELEASE,4.4)";resolu
+ tion:=optional,org.springframework.remoting.support;version="[4.3.19.
+ RELEASE,4.4)";resolution:=optional,org.springframework.stereotype;ver
+ sion="[4.3.19.RELEASE,4.4)";resolution:=optional,org.springframework.
+ ui;version="[4.3.19.RELEASE,4.4)",org.springframework.ui.context;vers
+ ion="[4.3.19.RELEASE,4.4)",org.springframework.ui.context.support;ver
+ sion="[4.3.19.RELEASE,4.4)",org.springframework.util;version="[4.3.19
+ .RELEASE,4.4)",org.springframework.util.comparator;version="[4.3.19.R
+ ELEASE,4.4)",org.springframework.util.concurrent;version="[4.3.19.REL
+ EASE,4.4)",org.springframework.validation;version="[4.3.19.RELEASE,4.
+ 4)",org.springframework.validation.annotation;version="[4.3.19.RELEAS
+ E,4.4)",org.springframework.validation.support;version="[4.3.19.RELEA
+ SE,4.4)",org.xml.sax;resolution:=optional,org.xml.sax.helpers;resolut
+ ion:=optional,org.w3c.dom;resolution:=optional,org.joda.time;version=
+ "[2,3)";resolution:=optional,org.joda.time.format;version="[2,3)";res
+ olution:=optional
+											    </Import-Package>
+<!-- 
+note 1: about javax.activity,javax.jws and javax.xml.ws
+javax.jws is depricate package, so need replace with javax.jws-api
+but eclipse auto add \-\-add-modules=ALL-SYSTEM to command line, jdk-10 still have this package so mean jdk have it.
+spring-web import javax.jws at option, so when it see javax.jws from jdk it will bind to jdk version
+
+idempiere webservice need to use javax.jws-api to build with tycho and run without add-modules=ALL-SYSTEM
+so it make two dependency chains when resolve dependency
+
+solution add version to import javax.jws;version="1.1.0"
+to force priority from javax.jws-api
+
+same for javax.xml.ws.*
+
+it also resolve issue confilic between eclipse runtime and tycho build
+
+-->
+											</instructions>
+										</artifact>
+										<artifact>
+											<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-context-support:jar:sources:${springframework.version}</id>
+											<source>false</source>
+											<transitive>false</transitive>
+                                            <override>true</override>
+											    <!-- source bundle also export package, so zk.ui detect wrong
+											    sometime it bind with source package, sometime it bind with binary but get import from source, so see package but don't see class
+											    -->
+											<instructions>
+											    <Export-Package/>
+											    <Private-Package/>
+											    <Private-Package/>
+											    <Bundle-SymbolicName>org.apache.servicemix.bundles.spring-context-support.source</Bundle-SymbolicName>
+											    <Bundle-Name>spring-context-support.source</Bundle-Name>
+												<Eclipse-SourceBundle>org.apache.servicemix.bundles.spring-context-support;version="${springframework.version}";roots:="."</Eclipse-SourceBundle>
+											</instructions>
+										</artifact>
+										<artifact>
+											<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-context-support:jar:${springframework.version}</id>
+											<source>false</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.springframework:spring-jcl:jar:5.1.1.RELEASE</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
 									</artifacts>
 								</feature>
 								<!-- zk public zk osgi on zip format download from sourceforge, so 
@@ -767,7 +1560,7 @@
 				<artifactId>download-maven-plugin</artifactId>
 				<executions>
 					<execution>
-						<id>download-db-seed-pg</id>
+						<id>download-zk-package</id>
 						<phase>package</phase>
 						<goals>
 							<goal>wget</goal>
diff --git a/org.idempiere.maven.to.p2/pom.xml b/org.idempiere.maven.to.p2/pom.xml
index fd606c7334..79f9befe41 100644
--- a/org.idempiere.maven.to.p2/pom.xml
+++ b/org.idempiere.maven.to.p2/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<modules>
diff --git a/org.idempiere.p2.targetplatform/.classpath b/org.idempiere.p2.targetplatform/.classpath
index 781c46d4ce..47c9e6237b 100644
--- a/org.idempiere.p2.targetplatform/.classpath
+++ b/org.idempiere.p2.targetplatform/.classpath
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.idempiere.p2.targetplatform/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.p2.targetplatform/.settings/org.eclipse.jdt.core.prefs
index 3a21537071..a54bb93cad 100644
--- a/org.idempiere.p2.targetplatform/.settings/org.eclipse.jdt.core.prefs
+++ b/org.idempiere.p2.targetplatform/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,12 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=10
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=10
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=10
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
index 9b6ad9cb8c..b7e6cd38bd 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="idempiere-180911" sequenceNumber="107">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="idempiere-181032" sequenceNumber="107">
 <locations>
 <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.restlet.example.feature.group" version="2.3.2.v20150501-1520"/>
@@ -47,30 +47,27 @@
 <unit id="org.restlet.ext.xstream.feature.group" version="2.3.2.v20150501-1520"/>
 <unit id="org.restlet.feature.group" version="2.3.2.v20150501-1520"/>
 <repository location="http://p2.restlet.com/2.3"/>
-</location>
-<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jetty.bundles.f.feature.group" version="9.4.11.v20180605"/>
-<unit id="org.eclipse.jetty.bundles.f.source.feature.group" version="9.4.11.v20180605"/>
-<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.11.v20180605"/>
 </location>
 	<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-		<unit id="org.eclipse.e4.core.tools.feature.source.feature.group" version="4.8.0.v20180512-1132"/>
-		<unit id="org.eclipse.pde.api.tools.ee.feature.feature.group" version="1.0.300.v20180221-1224"/>
-		<unit id="org.eclipse.releng.tools.feature.group" version="3.10.0.v20180512-1134"/>
-		<unit id="org.eclipse.swt.tools.feature.feature.group" version="3.107.0.v20180516-2110"/>
-		<unit id="org.eclipse.test.feature.group" version="3.7.300.v20180524-2246"/>
-		<unit id="org.eclipse.pde.feature.group" version="3.13.100.v20180611-0826"/>
-		<unit id="org.eclipse.pde.source.feature.group" version="3.13.100.v20180611-0826"/>
-		<unit id="org.eclipse.platform.ide" version="4.8.0.I20180611-0500"/>
-		<unit id="org.eclipse.sdk.ide" version="4.8.0.I20180611-0500"/>
-		<unit id="org.eclipse.equinox.sdk.feature.group" version="3.14.0.v20180518-2029"/>
-		<unit id="org.eclipse.ecf.core.feature.feature.group" version="1.5.0.v20180426-1936"/>
+		<unit id="org.eclipse.e4.core.tools.feature.source.feature.group" version="4.9.0.v20180823-1503"/>
+		<unit id="org.eclipse.equinox.sdk.feature.group" version="3.15.0.v20180904-1442"/>
+		<unit id="org.eclipse.pde.api.tools.ee.feature.feature.group" version="1.0.400.v20180829-0709"/>
+		<unit id="org.eclipse.pde.feature.group" version="3.13.200.v20180906-0745"/>
+		<unit id="org.eclipse.pde.source.feature.group" version="3.13.200.v20180906-0745"/>
+		<unit id="org.eclipse.platform.ide" version="4.9.0.I20180906-0745"/>
+		<unit id="org.eclipse.releng.tools.feature.group" version="3.10.100.v20180822-0818"/>
+		<unit id="org.eclipse.sdk.examples.source.feature.group" version="3.6.200.v20180906-0745"/>
+		<unit id="org.eclipse.sdk.ide" version="4.9.0.I20180906-0745"/>
+		<unit id="org.eclipse.sdk.tests.feature.group" version="4.9.0.v20180906-0745"/>
+		<unit id="org.eclipse.swt.tools.feature.feature.group" version="3.107.100.v20180821-0933"/>
+		<unit id="org.eclipse.test.feature.group" version="3.7.400.v20180822-0818"/>
+		<repository location="http://download.eclipse.org/eclipse/updates/4.9"/>
+		<unit id="org.eclipse.ecf.core.feature.feature.group" version="1.5.1.v20180810-0833"/>
 		<unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.1.100.v20180301-0201"/>
-		<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.14.0.v20180306-0429"/>
-		<unit id="org.eclipse.ecf.filetransfer.httpclient4.feature.feature.group" version="3.14.0.v20180301-0132"/>
+		<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.14.2.v20180801-2237"/>
+		<unit id="org.eclipse.ecf.filetransfer.httpclient4.feature.feature.group" version="3.14.2.v20180801-2237"/>
 		<unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.feature.group" version="1.1.100.v20180301-0132"/>
 		<unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.100.v20180301-0132"/>
-		<repository location="http://download.eclipse.org/eclipse/updates/4.8"/>
 	</location>
 	<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 		<unit id="ca.odell.glazedlists" version="1.9.0.v201303080712"/>
@@ -157,14 +154,6 @@
 		<unit id="com.google.javascript.source" version="0.0.20160315.v20161124-1903"/>
 		<unit id="com.google.protobuf" version="2.4.0.v201105131100"/>
 		<unit id="com.google.protobuf.source" version="2.4.0.v201105131100"/>
-		<unit id="com.ibm.icu" version="56.1.0.v201601250100"/>
-		<unit id="com.ibm.icu" version="58.2.0.v20170418-1837"/>
-		<unit id="com.ibm.icu.base" version="56.1.0.v201601250100"/>
-		<unit id="com.ibm.icu.base" version="58.2.0.v20170418-1837"/>
-		<unit id="com.ibm.icu.base.source" version="56.1.0.v201601250100"/>
-		<unit id="com.ibm.icu.base.source" version="58.2.0.v20170418-1837"/>
-		<unit id="com.ibm.icu.source" version="56.1.0.v201601250100"/>
-		<unit id="com.ibm.icu.source" version="58.2.0.v20170418-1837"/>
 		<unit id="com.jcraft.jsch" version="0.1.54.v20170116-1932"/>
 		<unit id="com.jcraft.jsch.source" version="0.1.54.v20170116-1932"/>
 		<unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
@@ -173,8 +162,6 @@
 		<unit id="com.lowagie.text" version="2.1.7.v201004222200"/>
 		<unit id="com.lowagie.text.source" version="2.1.7.v201004222200"/>
 		<unit id="com.novell.ldap" version="2.3.30.v201112011400"/>
-		<unit id="com.spotify.docker.client" version="8.9.2.v20180207-1730"/>
-		<unit id="com.spotify.docker.client.source" version="8.9.2.v20180207-1730"/>
 		<unit id="com.sun.el" version="2.2.0.v201303151357"/>
 		<unit id="com.sun.el.source" version="2.2.0.v201303151357"/>
 		<unit id="com.sun.grid.drmaa" version="1.0.0.v20170818-1553"/>
@@ -289,18 +276,8 @@
 		<unit id="org.antlr.runtime.source" version="4.5.1.v20160210-1233"/>
 		<unit id="org.aopalliance" version="1.0.0.v201105210816"/>
 		<unit id="org.apache.ant" version="1.9.6.v201510161327"/>
-		<unit id="org.apache.ant" version="1.10.3.v20180417-1627"/>
 		<unit id="org.apache.ant.source" version="1.9.6.v201510161327"/>
-		<unit id="org.apache.ant.source" version="1.10.3.v20180417-1627"/>
 		<unit id="org.apache.axis" version="1.4.0.v201411182030"/>
-		<unit id="org.apache.batik.constants" version="1.9.1.v20180227-1645"/>
-		<unit id="org.apache.batik.constants.source" version="1.9.1.v20180227-1645"/>
-		<unit id="org.apache.batik.css" version="1.9.1.v20180313-1559"/>
-		<unit id="org.apache.batik.css.source" version="1.9.1.v20180313-1559"/>
-		<unit id="org.apache.batik.i18n" version="1.9.1.v20180227-1645"/>
-		<unit id="org.apache.batik.i18n.source" version="1.9.1.v20180227-1645"/>
-		<unit id="org.apache.batik.util" version="1.9.1.v20180227-1645"/>
-		<unit id="org.apache.batik.util.source" version="1.9.1.v20180227-1645"/>
 		<unit id="org.apache.bcel" version="5.2.0.v201005080400"/>
 		<unit id="org.apache.bcel.source" version="5.2.0.v201005080400"/>
 		<unit id="org.apache.bsf" version="2.4.0.v201103030230"/>
@@ -373,15 +350,9 @@
 		<unit id="org.apache.felix.gogo.command.source" version="0.10.0.v201209301215"/>
 		<unit id="org.apache.felix.gogo.command.source" version="1.0.2.v20170914-1324"/>
 		<unit id="org.apache.felix.gogo.runtime" version="0.10.0.v201209301036"/>
-		<unit id="org.apache.felix.gogo.runtime" version="1.0.6.v20170914-1324"/>
 		<unit id="org.apache.felix.gogo.runtime.source" version="0.10.0.v201209301036"/>
-		<unit id="org.apache.felix.gogo.runtime.source" version="1.0.6.v20170914-1324"/>
 		<unit id="org.apache.felix.gogo.shell" version="0.10.0.v201212101605"/>
-		<unit id="org.apache.felix.gogo.shell" version="1.0.0.v20170914-1324"/>
 		<unit id="org.apache.felix.gogo.shell.source" version="0.10.0.v201212101605"/>
-		<unit id="org.apache.felix.gogo.shell.source" version="1.0.0.v20170914-1324"/>
-		<unit id="org.apache.felix.scr" version="2.0.14.v20180117-1452"/>
-		<unit id="org.apache.felix.scr.source" version="2.0.14.v20180117-1452"/>
 		<unit id="org.apache.geronimo.components.connector" version="3.1.1.v201205170953"/>
 		<unit id="org.apache.geronimo.components.connector.source" version="3.1.1.v201205170953"/>
 		<unit id="org.apache.geronimo.components.transaction" version="3.1.1.v201205170710"/>
@@ -467,8 +438,6 @@
 		<unit id="org.apache.lucene.queries" version="5.2.1.v20160926-1534"/>
 		<unit id="org.apache.lucene.queries.source" version="3.5.0.v20120725-1805"/>
 		<unit id="org.apache.lucene.queries.source" version="5.2.1.v20160926-1534"/>
-		<unit id="org.apache.lucene.queryparser" version="6.1.0.v20161115-1612"/>
-		<unit id="org.apache.lucene.queryparser.source" version="6.1.0.v20161115-1612"/>
 		<unit id="org.apache.lucene.source" version="3.5.0.v20120725-1805"/>
 		<unit id="org.apache.lucene.spatial" version="3.5.0.v20120725-1805"/>
 		<unit id="org.apache.lucene.spatial.source" version="3.5.0.v20120725-1805"/>
@@ -570,8 +539,6 @@
 		<unit id="org.apache.xmlbeans" version="2.3.0.v201605172150"/>
 		<unit id="org.apache.xmlbeans.source" version="2.3.0.v201605172150"/>
 		<unit id="org.apache.xmlgraphics" version="1.4.0.v201301251218"/>
-		<unit id="org.apache.xmlgraphics" version="2.2.0.v20180410-1551"/>
-		<unit id="org.apache.xmlgraphics.source" version="2.2.0.v20180410-1551"/>
 		<unit id="org.apache.xmlrpc" version="3.0.0.v20100427-1100"/>
 		<unit id="org.apache.xmlrpc.client" version="3.1.3.v20160817-1930"/>
 		<unit id="org.apache.xmlrpc.client.source" version="3.1.3.v20160817-1930"/>
@@ -662,12 +629,6 @@
 		<unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
 		<unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
 		<unit id="org.hamcrest.text.source" version="1.1.0.v20090501071000"/>
-		<unit id="org.jacoco.agent" version="0.8.1.v20180328-1646"/>
-		<unit id="org.jacoco.agent.source" version="0.8.1.v20180328-1646"/>
-		<unit id="org.jacoco.core" version="0.8.1.v20180328-1646"/>
-		<unit id="org.jacoco.core.source" version="0.8.1.v20180328-1646"/>
-		<unit id="org.jacoco.report" version="0.8.1.v20180328-1646"/>
-		<unit id="org.jacoco.report.source" version="0.8.1.v20180328-1646"/>
 		<unit id="org.jcodings" version="1.0.18.v20170306-1742"/>
 		<unit id="org.jcodings.source" version="1.0.18.v20170306-1742"/>
 		<unit id="org.jdom" version="1.1.1.v201101151400"/>
@@ -710,18 +671,6 @@
 		<unit id="org.mockito.source" version="2.13.0.v20180426-1843"/>
 		<unit id="org.mozilla.javascript" version="1.7.5.v201504281450"/>
 		<unit id="org.mozilla.javascript.source" version="1.7.5.v201504281450"/>
-		<unit id="org.objectweb.asm" version="6.1.1.v20180414-0329"/>
-		<unit id="org.objectweb.asm.analysis" version="6.1.1.v20180414-0329"/>
-		<unit id="org.objectweb.asm.analysis.source" version="6.1.1.v20180414-0329"/>
-		<unit id="org.objectweb.asm.commons" version="6.1.1.v20180414-0329"/>
-		<unit id="org.objectweb.asm.commons.source" version="6.1.1.v20180414-0329"/>
-		<unit id="org.objectweb.asm.source" version="6.1.1.v20180414-0329"/>
-		<unit id="org.objectweb.asm.tree" version="6.1.1.v20180414-0329"/>
-		<unit id="org.objectweb.asm.tree.source" version="6.1.1.v20180414-0329"/>
-		<unit id="org.objectweb.asm.util" version="6.1.1.v20180414-0329"/>
-		<unit id="org.objectweb.asm.util.source" version="6.1.1.v20180414-0329"/>
-		<unit id="org.objectweb.asm.xml" version="6.1.1.v20180414-0329"/>
-		<unit id="org.objectweb.asm.xml.source" version="6.1.1.v20180414-0329"/>
 		<unit id="org.objenesis" version="1.0.0.v201505121915"/>
 		<unit id="org.objenesis" version="2.6.0.v20180420-1519"/>
 		<unit id="org.objenesis.source" version="1.0.0.v201505121915"/>
@@ -795,17 +744,26 @@
 		<unit id="osgi.enterprise.source" version="4.2.0.v201108120515"/>
 		<unit id="scannotation" version="1.0.2.v201205170710"/>
 		<unit id="scannotation.source" version="1.0.2.v201205170710"/>
-		<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository"/>
+		<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20180905201904/repository"/>
+		<unit id="org.objectweb.asm" version="6.2.1.v20180823-1831"/>
+		<unit id="org.objectweb.asm.analysis" version="6.2.1.v20180823-1831"/>
+		<unit id="org.objectweb.asm.analysis.source" version="6.2.1.v20180823-1831"/>
+		<unit id="org.objectweb.asm.commons" version="6.2.1.v20180823-1831"/>
+		<unit id="org.objectweb.asm.commons.source" version="6.2.1.v20180823-1831"/>
+		<unit id="org.objectweb.asm.source" version="6.2.1.v20180823-1831"/>
+		<unit id="org.objectweb.asm.tree" version="6.2.1.v20180823-1831"/>
+		<unit id="org.objectweb.asm.tree.source" version="6.2.1.v20180823-1831"/>
+		<unit id="org.objectweb.asm.util" version="6.2.1.v20180823-1831"/>
+		<unit id="org.objectweb.asm.util.source" version="6.2.1.v20180823-1831"/>
+		<unit id="org.objectweb.asm.xml" version="6.2.1.v20180823-1831"/>
+		<unit id="org.objectweb.asm.xml.source" version="6.2.1.v20180823-1831"/>
+	</location>
+	<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+		<unit id="org.eclipse.jetty.bundles.f.feature.group" version="9.4.12.v20180830"/>
+		<unit id="org.eclipse.jetty.bundles.f.source.feature.group" version="9.4.12.v20180830"/>
+		<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.12.v20180830"/>
 	</location>
 	<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-		<unit id="bcmail" version="1.58.0"/>
-		<unit id="bcmail.source" version="1.58.0"/>
-		<unit id="bcpkix" version="1.58.0"/>
-		<unit id="bcpkix.source" version="1.58.0"/>
-		<unit id="bcprov" version="1.58.0"/>
-		<unit id="bcprov.source" version="1.58.0"/>
-		<unit id="bctsp" version="1.46.0"/>
-		<unit id="bctsp.source" version="1.46.0"/>
 		<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.9.5"/>
 		<unit id="com.fasterxml.jackson.core.jackson-annotations.source" version="2.9.5"/>
 		<unit id="com.fasterxml.jackson.core.jackson-core" version="2.9.5"/>
@@ -834,40 +792,14 @@
 		<unit id="com.fasterxml.woodstox.woodstox-core.source" version="5.0.3"/>
 		<unit id="com.google.zxing.core" version="3.2.1"/>
 		<unit id="com.google.zxing.core.source" version="3.2.1"/>
-		<unit id="com.ibm.icu" version="60.2.0"/>
-		<unit id="com.ibm.icu.source" version="60.2.0"/>
-		<unit id="com.itextpdf" version="5.5.12"/>
-		<unit id="com.itextpdf.source" version="5.5.12"/>
 		<unit id="com.jaspersoft.studio.bundles.barbecue" version="1.5.0.beta1_b02"/>
 		<unit id="com.jaspersoft.studio.bundles.itext" version="2.1.7.js6_b02"/>
-		<unit id="com.sun.mail.javax.mail" version="1.6.0"/>
-		<unit id="com.sun.mail.javax.mail.source" version="1.6.0"/>
-		<unit id="groovy-all" version="2.4.13"/>
-		<unit id="groovy-all.source" version="2.4.13"/>
-		<unit id="javax.annotation-api" version="1.3.1"/>
-		<unit id="javax.annotation-api.source" version="1.3.1"/>
-		<unit id="javax.management.j2ee-api" version="1.1.1"/>
-		<unit id="javax.management.j2ee-api.source" version="1.1.1"/>
 		<unit id="javax.validation.api" version="1.1.0.Final"/>
 		<unit id="javax.validation.api.source" version="1.1.0.Final"/>
-		<unit id="javax.websocket-api" version="1.1.0"/>
-		<unit id="javax.websocket-api.source" version="1.1.0"/>
-		<unit id="joda-time" version="2.9.9"/>
-		<unit id="joda-time.source" version="2.9.9"/>
 		<unit id="json" version="20171018.0.0"/>
 		<unit id="json.source" version="20171018.0.0"/>
 		<unit id="net.sf.jasperreports.engine" version="6.6.0"/>
 		<unit id="net.sf.jasperreports.engine.source" version="6.6.0"/>
-		<unit id="net.sf.supercsv.super-csv" version="2.4.0"/>
-		<unit id="net.sf.supercsv.super-csv.source" version="2.4.0"/>
-		<unit id="org.apache.activemq.activemq-core" version="5.7.0"/>
-		<unit id="org.apache.activemq.activemq-core.source" version="5.7.0"/>
-		<unit id="org.apache.activemq.kahadb" version="5.7.0"/>
-		<unit id="org.apache.activemq.kahadb.source" version="5.7.0"/>
-		<unit id="org.apache.aries.spifly.dynamic.bundle" version="1.0.10"/>
-		<unit id="org.apache.aries.spifly.dynamic.bundle.source" version="1.0.10"/>
-		<unit id="org.apache.aries.util" version="1.1.3"/>
-		<unit id="org.apache.aries.util.source" version="1.1.3"/>
 		<unit id="org.apache.batik.anim" version="1.9.1.v20180528-1434"/>
 		<unit id="org.apache.batik.bridge" version="1.9.1.v20180313-1559"/>
 		<unit id="org.apache.batik.codec" version="1.9.1.v20180313-1559"/>
@@ -888,67 +820,20 @@
 		<unit id="org.apache.batik.util" version="1.9.1.v20180227-1645"/>
 		<unit id="org.apache.batik.util.gui" version="1.9.1.v20180227-1645"/>
 		<unit id="org.apache.batik.xml" version="1.9.1.v20180227-1645"/>
-		<unit id="org.apache.commons.commons-collections4" version="4.2.0"/>
-		<unit id="org.apache.commons.commons-collections4.source" version="4.2.0"/>
-		<unit id="org.apache.commons.configuration" version="2.2.0"/>
-		<unit id="org.apache.commons.configuration.source" version="2.2.0"/>
 		<unit id="org.apache.commons.digester" version="2.1.0"/>
 		<unit id="org.apache.commons.digester.source" version="2.1.0"/>
-		<unit id="org.apache.commons.javaflow" version="1590792.0.0"/>
-		<unit id="org.apache.commons.javaflow.source" version="1590792.0.0"/>
-		<unit id="org.apache.felix.inventory" version="1.0.6"/>
-		<unit id="org.apache.felix.inventory.source" version="1.0.6"/>
-		<unit id="org.apache.felix.webconsole" version="4.3.4"/>
-		<unit id="org.apache.felix.webconsole.plugins.ds" version="2.0.8"/>
-		<unit id="org.apache.felix.webconsole.plugins.ds.source" version="2.0.8"/>
-		<unit id="org.apache.felix.webconsole.plugins.memoryusage" version="1.0.6"/>
-		<unit id="org.apache.felix.webconsole.plugins.memoryusage.source" version="1.0.6"/>
-		<unit id="org.apache.felix.webconsole.plugins.packageadmin" version="1.0.4"/>
-		<unit id="org.apache.felix.webconsole.plugins.packageadmin.source" version="1.0.4"/>
-		<unit id="org.apache.felix.webconsole.source" version="4.3.4"/>
 		<unit id="org.apache.poi.poi" version="3.15.0"/>
 		<unit id="org.apache.poi.poi-ooxml" version="3.15.0"/>
 		<unit id="org.apache.poi.poi-ooxml-schemas" version="3.15.0"/>
 		<unit id="org.apache.poi.poi-ooxml.source" version="3.15.0"/>
 		<unit id="org.apache.poi.poi.source" version="3.15.0"/>
-		<unit id="org.apache.servicemix.bundles.cglib" version="3.2.5.1"/>
-		<unit id="org.apache.servicemix.bundles.cglib.source" version="3.2.5.1"/>
 		<unit id="org.apache.servicemix.bundles.jaxen" version="1.1.1.2"/>
 		<unit id="org.apache.servicemix.bundles.rhino" version="1.7.6.1"/>
 		<unit id="org.apache.servicemix.bundles.rhino.source" version="1.7.6.1"/>
-		<unit id="org.apache.taglibs.standard-impl" version="1.2.5"/>
-		<unit id="org.apache.taglibs.standard-impl.source" version="1.2.5"/>
-		<unit id="org.apache.taglibs.standard-jstlel" version="1.2.5"/>
-		<unit id="org.apache.taglibs.standard-jstlel.source" version="1.2.5"/>
-		<unit id="org.apache.taglibs.taglibs-standard-spec" version="1.2.5"/>
-		<unit id="org.apache.taglibs.taglibs-standard-spec.source" version="1.2.5"/>
-		<unit id="org.apache.velocity" version="1.7.0"/>
-		<unit id="org.apache.velocity.source" version="1.7.0"/>
 		<unit id="org.apache.xmlgraphics" version="2.2.0.v20180410-1551"/>
-		<unit id="org.atmosphere.runtime" version="2.4.16"/>
-		<unit id="org.atmosphere.runtime.source" version="2.4.16"/>
-		<unit id="org.cryptacular" version="1.2.1"/>
-		<unit id="org.cryptacular.source" version="1.2.1"/>
-		<unit id="org.eclipse.jdt.core.compiler.batch" version="3.8.2.v20130121-145325"/>
-		<unit id="org.eclipse.jdt.core.compiler.batch.source" version="3.8.2.v20130121-145325"/>
-		<unit id="org.eclipse.jetty.alpn.api" version="1.1.3.v20160715"/>
-		<unit id="org.eclipse.jetty.alpn.api.source" version="1.1.3.v20160715"/>
-		<unit id="org.eclipse.jetty.alpn.conscrypt.server" version="9.4.11.v20180605"/>
-		<unit id="org.eclipse.jetty.alpn.conscrypt.server.source" version="9.4.11.v20180605"/>
-		<unit id="org.eclipse.jetty.alpn.openjdk8.server" version="9.4.11.v20180605"/>
-		<unit id="org.eclipse.jetty.alpn.openjdk8.server.source" version="9.4.11.v20180605"/>
-		<unit id="org.eclipse.jetty.osgi-servlet-api" version="3.1.0.M3"/>
-		<unit id="org.eclipse.jetty.osgi-servlet-api.source" version="3.1.0.M3"/>
-		<unit id="org.idempiere.org.conscrypt.openjdk-uber" version="1.1.0"/>
-		<unit id="org.idempiere.org.conscrypt.openjdk-uber.source" version="1.1.0"/>
 		<unit id="org.jfree.chart-osgi" version="1.0.19"/>
 		<unit id="org.jfree.jcommon-osgi" version="1.0.23"/>
 		<unit id="org.krysalis.barcode4j" version="2.1.0"/>
-		<unit id="org.mortbay.jasper.apache-el" version="8.5.24"/>
-		<unit id="org.mortbay.jasper.apache-el.source" version="8.5.24"/>
-		<unit id="org.mortbay.jasper.apache-jsp" version="8.5.24"/>
-		<unit id="org.passay" version="1.3.0"/>
-		<unit id="org.passay.source" version="1.3.0"/>
 		<unit id="org.w3c.dom.svg.patch" version="1.1.0.b02"/>
 		<unit id="stax2-api" version="3.1.4"/>
 		<unit id="stax2-api.source" version="3.1.4"/>
@@ -970,14 +855,226 @@
 		<unit id="zul.sources" version="8.5.0"/>
 		<unit id="zweb" version="8.5.0"/>
 		<unit id="zweb.sources" version="8.5.0"/>
-		<repository location="https://sourceforge.net/projects/idempiere/files/binary.file/jarfile/maven-p2-R20180911"/>
+		<repository location="https://sourceforge.net/projects/idempiere/files/binary.file/jarfile/maven-p2-R20181031"/>
+		<unit id="bcmail" version="1.60.0"/>
+		<unit id="bcmail.source" version="1.60.0"/>
+		<unit id="bcpkix" version="1.60.0"/>
+		<unit id="bcpkix.source" version="1.60.0"/>
+		<unit id="bcprov" version="1.60.0"/>
+		<unit id="bcprov.source" version="1.60.0"/>
+		<unit id="bctsp" version="1.46.0"/>
+		<unit id="bctsp.source" version="1.46.0"/>
+		<unit id="com.ibm.icu" version="63.1.0"/>
+		<unit id="com.ibm.icu.source" version="63.1.0"/>
+		<unit id="com.itextpdf" version="5.5.13"/>
+		<unit id="com.itextpdf.source" version="5.5.13"/>
+		<unit id="com.sun.activation.javax.activation" version="1.2.0"/>
+		<unit id="com.sun.activation.javax.activation.source" version="1.2.0"/>
+		<unit id="com.sun.mail.javax.mail" version="1.6.2"/>
+		<unit id="com.sun.mail.javax.mail.source" version="1.6.2"/>
+		<unit id="com.sun.xml.bind.jaxb-core" version="2.3.0.1"/>
+		<unit id="com.sun.xml.bind.jaxb-core.source" version="2.3.0.1"/>
+		<unit id="com.sun.xml.bind.jaxb-impl" version="2.3.1"/>
+		<unit id="com.sun.xml.bind.jaxb-impl.source" version="2.3.1"/>
+		<unit id="com.sun.xml.ws.jaxws-rt" version="2.3.1"/>
+		<unit id="com.sun.xml.ws.jaxws-rt.source" version="2.3.1"/>
+		<unit id="groovy" version="2.5.3"/>
+		<unit id="groovy-ant" version="2.5.3"/>
+		<unit id="groovy-ant.source" version="2.5.3"/>
+		<unit id="groovy-cli-commons" version="2.5.3"/>
+		<unit id="groovy-cli-commons.source" version="2.5.3"/>
+		<unit id="groovy-cli-picocli" version="2.5.3"/>
+		<unit id="groovy-cli-picocli.source" version="2.5.3"/>
+		<unit id="groovy-console" version="2.5.3"/>
+		<unit id="groovy-console.source" version="2.5.3"/>
+		<unit id="groovy-datetime" version="2.5.3"/>
+		<unit id="groovy-datetime.source" version="2.5.3"/>
+		<unit id="groovy-docgenerator" version="2.5.3"/>
+		<unit id="groovy-docgenerator.source" version="2.5.3"/>
+		<unit id="groovy-groovydoc" version="2.5.3"/>
+		<unit id="groovy-groovydoc.source" version="2.5.3"/>
+		<unit id="groovy-groovysh" version="2.5.3"/>
+		<unit id="groovy-groovysh.source" version="2.5.3"/>
+		<unit id="groovy-jmx" version="2.5.3"/>
+		<unit id="groovy-jmx.source" version="2.5.3"/>
+		<unit id="groovy-json" version="2.5.3"/>
+		<unit id="groovy-json.source" version="2.5.3"/>
+		<unit id="groovy-jsr223" version="2.5.3"/>
+		<unit id="groovy-jsr223.source" version="2.5.3"/>
+		<unit id="groovy-macro" version="2.5.3"/>
+		<unit id="groovy-macro.source" version="2.5.3"/>
+		<unit id="groovy-nio" version="2.5.3"/>
+		<unit id="groovy-nio.source" version="2.5.3"/>
+		<unit id="groovy-servlet" version="2.5.3"/>
+		<unit id="groovy-servlet.source" version="2.5.3"/>
+		<unit id="groovy-sql" version="2.5.3"/>
+		<unit id="groovy-sql.source" version="2.5.3"/>
+		<unit id="groovy-swing" version="2.5.3"/>
+		<unit id="groovy-swing.source" version="2.5.3"/>
+		<unit id="groovy-xml" version="2.5.3"/>
+		<unit id="groovy-xml.source" version="2.5.3"/>
+		<unit id="groovy.source" version="2.5.3"/>
+		<unit id="javax.annotation-api" version="1.3.2"/>
+		<unit id="javax.annotation-api.source" version="1.3.2"/>
+		<unit id="javax.enterprise.cdi-api" version="2.0.0.SP1"/>
+		<unit id="javax.enterprise.cdi-api.source" version="2.0.0.SP1"/>
+		<unit id="javax.interceptor-api" version="1.2.2"/>
+		<unit id="javax.interceptor-api.source" version="1.2.2"/>
+		<unit id="javax.jws-api" version="1.1.0"/>
+		<unit id="javax.jws-api.source" version="1.1.0"/>
+		<unit id="javax.transaction-api" version="1.3.0"/>
+		<unit id="javax.transaction-api.source" version="1.3.0"/>
+		<unit id="javax.websocket-api" version="1.1.0"/>
+		<unit id="javax.websocket-api.source" version="1.1.0"/>
+		<unit id="javax.ws.rs-api" version="2.1.99.b01"/>
+		<unit id="javax.ws.rs-api.source" version="2.1.99.b01"/>
+		<unit id="javax.ws.rs.jsr311-api" version="1.1.1"/>
+		<unit id="javax.ws.rs.jsr311-api.source" version="1.1.1"/>
+		<unit id="javax.xml.rpc-api" version="1.1.1"/>
+		<unit id="javax.xml.rpc-api.source" version="1.1.1"/>
+		<unit id="javax.xml.soap-api" version="1.4.0"/>
+		<unit id="javax.xml.soap-api.source" version="1.4.0"/>
+		<unit id="jaxb-api" version="2.3.1"/>
+		<unit id="jaxb-api.source" version="2.3.1"/>
+		<unit id="jaxws-api" version="2.3.1"/>
+		<unit id="jaxws-api.source" version="2.3.1"/>
+		<unit id="joda-time" version="2.10.0"/>
+		<unit id="joda-time.source" version="2.10.0"/>
+		<unit id="net.sf.supercsv.super-csv" version="2.4.0"/>
+		<unit id="net.sf.supercsv.super-csv.source" version="2.4.0"/>
+		<unit id="org.apache.activemq.activemq-core" version="5.7.0"/>
+		<unit id="org.apache.activemq.activemq-core.source" version="5.7.0"/>
+		<unit id="org.apache.activemq.kahadb" version="5.7.0"/>
+		<unit id="org.apache.activemq.kahadb.source" version="5.7.0"/>
+		<unit id="org.apache.aries.spifly.dynamic.bundle" version="1.0.14"/>
+		<unit id="org.apache.aries.spifly.dynamic.bundle.source" version="1.0.14"/>
+		<unit id="org.apache.aries.util" version="1.1.3"/>
+		<unit id="org.apache.aries.util.source" version="1.1.3"/>
+		<unit id="org.apache.commons.commons-collections4" version="4.2.0"/>
+		<unit id="org.apache.commons.commons-collections4.source" version="4.2.0"/>
+		<unit id="org.apache.commons.commons-configuration2" version="2.3.0"/>
+		<unit id="org.apache.commons.commons-configuration2.source" version="2.3.0"/>
+		<unit id="org.apache.commons.discovery" version="0.5.0"/>
+		<unit id="org.apache.commons.discovery.source" version="0.5.0"/>
+		<unit id="org.apache.commons.javaflow" version="1590792.0.0"/>
+		<unit id="org.apache.commons.javaflow.source" version="1590792.0.0"/>
+		<unit id="org.apache.cxf.cxf-core" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-core.source" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-bindings-object" version="3.1.17"/>
+		<unit id="org.apache.cxf.cxf-rt-bindings-object.source" version="3.1.17"/>
+		<unit id="org.apache.cxf.cxf-rt-bindings-soap" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-bindings-soap.source" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-bindings-xml" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-bindings-xml.source" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-databinding-jaxb" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-databinding-jaxb.source" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-databinding-xmlbeans" version="3.1.17"/>
+		<unit id="org.apache.cxf.cxf-rt-databinding-xmlbeans.source" version="3.1.17"/>
+		<unit id="org.apache.cxf.cxf-rt-frontend-jaxrs" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-frontend-jaxrs.source" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-frontend-jaxws" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-frontend-jaxws.source" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-frontend-simple" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-frontend-simple.source" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-management" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-management.source" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-rs-extension-providers" version="3.1.17"/>
+		<unit id="org.apache.cxf.cxf-rt-rs-extension-providers.source" version="3.1.17"/>
+		<unit id="org.apache.cxf.cxf-rt-rs-http-sci" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-rs-http-sci.source" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-rs-service-description" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-rs-service-description.source" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-transports-http" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-transports-http-jetty" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-transports-http-jetty.source" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-transports-http.source" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-ws-addr" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-ws-addr.source" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-ws-policy" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-ws-policy.source" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-wsdl" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-wsdl.source" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-spring-boot-autoconfigure" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-spring-boot-autoconfigure.source" version="3.2.6"/>
+		<unit id="org.apache.cxf.rt-ws-transfer" version="3.2.6"/>
+		<unit id="org.apache.cxf.rt-ws-transfer.source" version="3.2.6"/>
+		<unit id="org.apache.felix.inventory" version="1.0.6"/>
+		<unit id="org.apache.felix.inventory.source" version="1.0.6"/>
+		<unit id="org.apache.felix.webconsole" version="4.3.8"/>
+		<unit id="org.apache.felix.webconsole.plugins.ds" version="2.1.0"/>
+		<unit id="org.apache.felix.webconsole.plugins.ds.source" version="2.1.0"/>
+		<unit id="org.apache.felix.webconsole.plugins.memoryusage" version="1.0.8"/>
+		<unit id="org.apache.felix.webconsole.plugins.memoryusage.source" version="1.0.8"/>
+		<unit id="org.apache.felix.webconsole.plugins.packageadmin" version="1.0.4"/>
+		<unit id="org.apache.felix.webconsole.plugins.packageadmin.source" version="1.0.4"/>
+		<unit id="org.apache.felix.webconsole.source" version="4.3.8"/>
+		<unit id="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec" version="1.0.1"/>
+		<unit id="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec.source" version="1.0.1"/>
+		<unit id="org.apache.neethi" version="3.1.1"/>
+		<unit id="org.apache.neethi.source" version="3.1.1"/>
+		<unit id="org.apache.servicemix.bundles.cglib" version="3.2.6.1"/>
+		<unit id="org.apache.servicemix.bundles.cglib.source" version="3.2.6.1"/>
+		<unit id="org.apache.servicemix.bundles.wsdl4j" version="1.6.3.1"/>
+		<unit id="org.apache.servicemix.bundles.wsdl4j.source" version="1.6.3.1"/>
+		<unit id="org.apache.taglibs.standard-impl" version="1.2.5"/>
+		<unit id="org.apache.taglibs.standard-impl.source" version="1.2.5"/>
+		<unit id="org.apache.taglibs.standard-jstlel" version="1.2.5"/>
+		<unit id="org.apache.taglibs.standard-jstlel.source" version="1.2.5"/>
+		<unit id="org.apache.taglibs.taglibs-standard-spec" version="1.2.5"/>
+		<unit id="org.apache.taglibs.taglibs-standard-spec.source" version="1.2.5"/>
+		<unit id="org.apache.velocity" version="1.7.0"/>
+		<unit id="org.apache.velocity.source" version="1.7.0"/>
+		<unit id="org.apache.ws.xmlschema.core" version="2.2.3"/>
+		<unit id="org.apache.ws.xmlschema.core.source" version="2.2.3"/>
+		<unit id="org.apache.xmlbeans" version="3.0.1"/>
+		<unit id="org.atmosphere.runtime" version="2.5.0"/>
+		<unit id="org.atmosphere.runtime.source" version="2.5.0"/>
+		<unit id="org.cryptacular" version="1.2.2"/>
+		<unit id="org.cryptacular.source" version="1.2.2"/>
+		<unit id="org.eclipse.jdt.core" version="3.15.0.v20180905-0317"/>
+		<unit id="org.eclipse.jdt.core.source" version="3.15.0.v20180905-0317"/>
+		<unit id="org.eclipse.jetty.alpn.api" version="1.1.3.v20160715"/>
+		<unit id="org.eclipse.jetty.alpn.api.source" version="1.1.3.v20160715"/>
+		<unit id="org.eclipse.jetty.alpn.conscrypt.server" version="9.4.12.v20180830"/>
+		<unit id="org.eclipse.jetty.alpn.conscrypt.server.source" version="9.4.12.v20180830"/>
+		<unit id="org.eclipse.jetty.alpn.openjdk8.server" version="9.4.12.v20180830"/>
+		<unit id="org.eclipse.jetty.alpn.openjdk8.server.source" version="9.4.12.v20180830"/>
+		<unit id="org.eclipse.jetty.continuation" version="9.4.12.v20180830"/>
+		<unit id="org.eclipse.jetty.continuation.source" version="9.4.12.v20180830"/>
+		<unit id="org.eclipse.jetty.osgi-servlet-api" version="3.1.0.M3"/>
+		<unit id="org.eclipse.jetty.osgi-servlet-api.source" version="3.1.0.M3"/>
+		<unit id="org.idempiere.org.conscrypt.openjdk-uber" version="1.4.0"/>
+		<unit id="org.idempiere.org.conscrypt.openjdk-uber.source" version="1.4.0"/>
+		<unit id="org.mortbay.jasper.apache-el" version="8.5.33"/>
+		<unit id="org.mortbay.jasper.apache-el.source" version="8.5.33"/>
+		<unit id="org.mortbay.jasper.apache-jsp" version="8.5.33"/>
+		<unit id="org.passay" version="1.3.1"/>
+		<unit id="org.passay.source" version="1.3.1"/>
 		<unit id="slf4j.api" version="1.7.25"/>
 		<unit id="slf4j.api.source" version="1.7.25"/>
 		<unit id="slf4j.jcl" version="1.7.25"/>
 		<unit id="slf4j.jcl.source" version="1.7.25"/>
 		<unit id="slf4j.jdk14" version="1.7.25"/>
 		<unit id="slf4j.jdk14.source" version="1.7.25"/>
+		<unit id="org.apache.servicemix.bundles.spring-beans" version="4.3.19.RELEASE_1"/>
+		<unit id="org.apache.servicemix.bundles.spring-context" version="4.3.19.RELEASE_1"/>
+		<unit id="org.apache.servicemix.bundles.spring-core" version="4.3.19.RELEASE_1"/>
+		<unit id="stax2-api" version="4.1.0"/>
+		<unit id="stax2-api.source" version="4.1.0"/>
+		<unit id="org.apache.servicemix.bundles.spring-beans.source.sources" version="4.3.19.RELEASE_1"/>
+		<unit id="org.apache.servicemix.bundles.spring-context.source.sources" version="4.3.19.RELEASE_1"/>
+		<unit id="org.apache.servicemix.bundles.spring-core.source.sources" version="4.3.19.RELEASE_1"/>
+		<unit id="org.apache.servicemix.bundles.spring-aop" version="4.3.19.RELEASE_1"/>
+		<unit id="org.apache.servicemix.bundles.spring-aop.source.sources" version="4.3.19.RELEASE_1"/>
+		<unit id="org.apache.servicemix.bundles.spring-context-support" version="4.3.19.RELEASE_1"/>
+		<unit id="org.apache.servicemix.bundles.spring-context-support.source.sources" version="4.3.19.RELEASE_1"/>
+		<unit id="org.apache.servicemix.bundles.spring-expression" version="4.3.19.RELEASE_1"/>
+		<unit id="org.apache.servicemix.bundles.spring-expression.source.sources" version="4.3.19.RELEASE_1"/>
+		<unit id="org.apache.servicemix.bundles.spring-web" version="4.3.19.RELEASE_1"/>
+		<unit id="org.apache.servicemix.bundles.spring-web.source.sources" version="4.3.19.RELEASE_1"/>
+		<unit id="org.springframework.spring-jcl" version="5.1.1.RELEASE"/>
+		<unit id="org.springframework.spring-jcl.source" version="5.1.1.RELEASE"/>
 	</location>
 </locations>
-<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-</target>
\ No newline at end of file
+<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10"/>
+</target>
diff --git a/org.idempiere.p2.targetplatform/pom.xml b/org.idempiere.p2.targetplatform/pom.xml
index c23eda9002..45fa926bab 100644
--- a/org.idempiere.p2.targetplatform/pom.xml
+++ b/org.idempiere.p2.targetplatform/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.idempiere.p2.targetplatform</artifactId>
diff --git a/org.idempiere.p2/category.xml b/org.idempiere.p2/category.xml
index 3a8dd13886..f9db4be3fe 100644
--- a/org.idempiere.p2/category.xml
+++ b/org.idempiere.p2/category.xml
@@ -1,84 +1,84 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.adempiere.base.feature_5.1.0.qualifier.jar" id="org.adempiere.base.feature" version="5.1.0.qualifier">
+   <feature url="features/org.adempiere.base.feature_6.1.0.qualifier.jar" id="org.adempiere.base.feature" version="6.1.0.qualifier">
       <category name="idempiere.core"/>
    </feature>
-   <feature url="features/org.adempiere.bundles.external.feature_5.1.0.qualifier.jar" id="org.adempiere.bundles.external.feature" version="5.1.0.qualifier">
+   <feature url="features/org.adempiere.bundles.external.feature_6.1.0.qualifier.jar" id="org.adempiere.bundles.external.feature" version="6.1.0.qualifier">
       <category name="idempiere.core"/>
    </feature>
-   <feature url="features/org.adempiere.payment.processor.feature_5.1.0.qualifier.jar" id="org.adempiere.payment.processor.feature" version="5.1.0.qualifier">
+   <feature url="features/org.adempiere.payment.processor.feature_6.1.0.qualifier.jar" id="org.adempiere.payment.processor.feature" version="6.1.0.qualifier">
       <category name="idempiere.core"/>
    </feature>
-   <feature url="features/org.adempiere.pipo.feature_5.1.0.qualifier.jar" id="org.adempiere.pipo.feature" version="5.1.0.qualifier">
+   <feature url="features/org.adempiere.pipo.feature_6.1.0.qualifier.jar" id="org.adempiere.pipo.feature" version="6.1.0.qualifier">
       <category name="idempiere.core"/>
    </feature>
-   <feature url="features/org.adempiere.replication.feature_5.1.0.qualifier.jar" id="org.adempiere.replication.feature" version="5.1.0.qualifier">
+   <feature url="features/org.adempiere.replication.feature_6.1.0.qualifier.jar" id="org.adempiere.replication.feature" version="6.1.0.qualifier">
       <category name="idempiere.core"/>
    </feature>
-   <feature url="features/org.adempiere.replication.server.feature_5.1.0.qualifier.jar" id="org.adempiere.replication.server.feature" version="5.1.0.qualifier">
+   <feature url="features/org.adempiere.replication.server.feature_6.1.0.qualifier.jar" id="org.adempiere.replication.server.feature" version="6.1.0.qualifier">
       <category name="idempiere.core"/>
    </feature>
-   <feature url="features/org.adempiere.report.jasper.feature_5.1.0.qualifier.jar" id="org.adempiere.report.jasper.feature" version="5.1.0.qualifier">
+   <feature url="features/org.adempiere.report.jasper.feature_6.1.0.qualifier.jar" id="org.adempiere.report.jasper.feature" version="6.1.0.qualifier">
       <category name="idempiere.core"/>
    </feature>
-   <feature url="features/org.adempiere.server.feature_5.1.0.qualifier.jar" id="org.adempiere.server.feature" version="5.1.0.qualifier">
+   <feature url="features/org.adempiere.server.feature_6.1.0.qualifier.jar" id="org.adempiere.server.feature" version="6.1.0.qualifier">
       <category name="idempiere.core"/>
    </feature>
-   <feature url="features/org.adempiere.target.platform.feature_5.1.0.qualifier.jar" id="org.adempiere.target.platform.feature" version="5.1.0.qualifier">
+   <feature url="features/org.adempiere.target.platform.feature_6.1.0.qualifier.jar" id="org.adempiere.target.platform.feature" version="6.1.0.qualifier">
       <category name="idempiere.core"/>
    </feature>
-   <feature url="features/org.adempiere.ui.zk.feature_5.1.0.qualifier.jar" id="org.adempiere.ui.zk.feature" version="5.1.0.qualifier">
+   <feature url="features/org.adempiere.ui.zk.feature_6.1.0.qualifier.jar" id="org.adempiere.ui.zk.feature" version="6.1.0.qualifier">
       <category name="idempiere.core"/>
    </feature>
-   <feature url="features/org.adempiere.webstore.feature_5.1.0.qualifier.jar" id="org.adempiere.webstore.feature" version="5.1.0.qualifier">
+   <feature url="features/org.adempiere.webstore.feature_6.1.0.qualifier.jar" id="org.adempiere.webstore.feature" version="6.1.0.qualifier">
       <category name="idempiere.core"/>
    </feature>
-   <feature url="features/org.compiere.db.provider.feature_5.1.0.qualifier.jar" id="org.compiere.db.provider.feature" version="5.1.0.qualifier">
+   <feature url="features/org.compiere.db.provider.feature_6.1.0.qualifier.jar" id="org.compiere.db.provider.feature" version="6.1.0.qualifier">
       <category name="idempiere.core"/>
    </feature>
-   <feature url="features/org.idempiere.eclipse.platform.feature_5.1.0.qualifier.jar" id="org.idempiere.eclipse.platform.feature" version="5.1.0.qualifier">
+   <feature url="features/org.idempiere.eclipse.platform.feature_6.1.0.qualifier.jar" id="org.idempiere.eclipse.platform.feature" version="6.1.0.qualifier">
       <category name="idempiere.core"/>
    </feature>
-   <feature url="features/org.idempiere.equinox.p2.director.feature_5.1.0.qualifier.jar" id="org.idempiere.equinox.p2.director.feature" version="5.1.0.qualifier">
+   <feature url="features/org.idempiere.equinox.p2.director.feature_6.1.0.qualifier.jar" id="org.idempiere.equinox.p2.director.feature" version="6.1.0.qualifier">
       <category name="idempiere.core"/>
    </feature>
-   <feature url="features/org.idempiere.felix.webconsole.feature_5.1.0.qualifier.jar" id="org.idempiere.felix.webconsole.feature" version="5.1.0.qualifier">
+   <feature url="features/org.idempiere.felix.webconsole.feature_6.1.0.qualifier.jar" id="org.idempiere.felix.webconsole.feature" version="6.1.0.qualifier">
       <category name="idempiere.core"/>
    </feature>
-   <feature url="features/org.idempiere.fitnesse.feature_5.1.0.qualifier.jar" id="org.idempiere.fitnesse.feature" version="5.1.0.qualifier">
+   <feature url="features/org.idempiere.fitnesse.feature_6.1.0.qualifier.jar" id="org.idempiere.fitnesse.feature" version="6.1.0.qualifier">
       <category name="idempiere.core"/>
    </feature>
-   <feature url="features/org.idempiere.hazelcast.service.feature_5.1.0.qualifier.jar" id="org.idempiere.hazelcast.service.feature" version="5.1.0.qualifier">
+   <feature url="features/org.idempiere.hazelcast.service.feature_6.1.0.qualifier.jar" id="org.idempiere.hazelcast.service.feature" version="6.1.0.qualifier">
       <category name="idempiere.core"/>
    </feature>
-   <feature url="features/org.idempiere.zk.feature_5.1.0.qualifier.jar" id="org.idempiere.zk.feature" version="5.1.0.qualifier">
-      <category name="idempiere.core"/>
-   </feature>
-   <feature url="features/org.eclipse.ecf.core.feature_1.5.0.v20180426-1936.jar" id="org.eclipse.ecf.core.feature" version="1.5.0.v20180426-1936">
+   <feature url="features/org.idempiere.zk.feature_6.1.0.qualifier.jar" id="org.idempiere.zk.feature" version="6.1.0.qualifier">
       <category name="idempiere.core"/>
    </feature>
    <feature url="features/org.eclipse.ecf.core.ssl.feature_1.1.100.v20180301-0201.jar" id="org.eclipse.ecf.core.ssl.feature" version="1.1.100.v20180301-0201">
       <category name="idempiere.core"/>
    </feature>
-   <feature url="features/org.eclipse.ecf.filetransfer.feature_3.14.0.v20180306-0429.jar" id="org.eclipse.ecf.filetransfer.feature" version="3.14.0.v20180306-0429">
-      <category name="idempiere.core"/>
-   </feature>
-   <feature url="features/org.eclipse.ecf.filetransfer.httpclient4.feature_3.14.0.v20180301-0132.jar" id="org.eclipse.ecf.filetransfer.httpclient4.feature" version="3.14.0.v20180301-0132">
-      <category name="idempiere.core"/>
-   </feature>
    <feature url="features/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature_1.1.100.v20180301-0132.jar" id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature" version="1.1.100.v20180301-0132">
       <category name="idempiere.core"/>
    </feature>
    <feature url="features/org.eclipse.ecf.filetransfer.ssl.feature_1.1.100.v20180301-0132.jar" id="org.eclipse.ecf.filetransfer.ssl.feature" version="1.1.100.v20180301-0132">
       <category name="idempiere.core"/>
    </feature>
-   <feature url="features/org.eclipse.equinox.executable_3.8.0.v20180518-2029.jar" id="org.eclipse.equinox.executable" version="3.8.0.v20180518-2029">
+   <feature url="features/org.eclipse.ecf.core.feature_1.5.1.v20180810-0833.jar" id="org.eclipse.ecf.core.feature" version="1.5.1.v20180810-0833">
       <category name="idempiere.core"/>
    </feature>
-   <feature url="features/org.eclipse.equinox.server.core_1.6.0.v20180502-1828.jar" id="org.eclipse.equinox.server.core" version="1.6.0.v20180502-1828">
+   <feature url="features/org.eclipse.ecf.filetransfer.feature_3.14.2.v20180801-2237.jar" id="org.eclipse.ecf.filetransfer.feature" version="3.14.2.v20180801-2237">
       <category name="idempiere.core"/>
    </feature>
-   <feature url="features/org.eclipse.equinox.server.p2_1.4.0.v20180515-2149.jar" id="org.eclipse.equinox.server.p2" version="1.4.0.v20180515-2149">
+   <feature url="features/org.eclipse.ecf.filetransfer.httpclient4.feature_3.14.2.v20180801-2237.jar" id="org.eclipse.ecf.filetransfer.httpclient4.feature" version="3.14.2.v20180801-2237">
+      <category name="idempiere.core"/>
+   </feature>
+   <feature url="features/org.eclipse.equinox.executable_3.8.100.v20180827-1352.jar" id="org.eclipse.equinox.executable" version="3.8.100.v20180827-1352">
+      <category name="idempiere.core"/>
+   </feature>
+   <feature url="features/org.eclipse.equinox.server.core_1.7.0.v20180903-1546.jar" id="org.eclipse.equinox.server.core" version="1.7.0.v20180903-1546">
+      <category name="idempiere.core"/>
+   </feature>
+   <feature url="features/org.eclipse.equinox.server.p2_1.5.0.v20180827-1235.jar" id="org.eclipse.equinox.server.p2" version="1.5.0.v20180827-1235">
       <category name="idempiere.core"/>
    </feature>
    <category-def name="idempiere.core" label="idempiere core"/>
diff --git a/org.idempiere.p2/pom.xml b/org.idempiere.p2/pom.xml
index 2a0db0bb6d..8a527061ba 100644
--- a/org.idempiere.p2/pom.xml
+++ b/org.idempiere.p2/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.idempiere.p2</artifactId>
diff --git a/org.idempiere.p2/server.product b/org.idempiere.p2/server.product
index bb538b7049..33fd8328de 100644
--- a/org.idempiere.p2/server.product
+++ b/org.idempiere.p2/server.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="iDempiere Server" uid="org.adempiere.server.product" id="org.adempiere.server.server_product" application="org.adempiere.server.application" version="5.1.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="iDempiere Server" uid="org.adempiere.server.product" id="org.adempiere.server.server_product" application="org.adempiere.server.application" version="6.1.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -9,7 +9,7 @@
    <launcherArgs>
       <programArgs>-console
       </programArgs>
-      <vmArgs>-Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.w3c.dom.events -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-alpn.xml,etc/jetty-http2.xml,etc/jetty-https.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.zkoss.zk.config.path=file://${workspace_loc}/zk.xml
+      <vmArgs>--add-exports java.desktop/sun.awt=ALL-UNNAMED --add-exports java.sql.rowset/com.sun.rowset=ALL-UNNAMED --add-exports java.naming/com.sun.jndi.ldap=ALL-UNNAMED -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.w3c.dom.events -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-alpn.xml,etc/jetty-http2.xml,etc/jetty-https.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.zkoss.zk.config.path=file://${workspace_loc}/zk.xml
       </vmArgs>
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
@@ -17,6 +17,7 @@
 
    <windowImages/>
 
+
    <launcher name="idempiere">
       <win useIco="false">
          <bmp/>
@@ -24,7 +25,7 @@
    </launcher>
 
    <vm>
-      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</linux>
+      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10</linux>
    </vm>
 
    <plugins>
@@ -41,7 +42,7 @@
       <plugin id="org.adempiere.pipo" autoStart="true" startLevel="0" />
       <plugin id="org.adempiere.server" autoStart="true" startLevel="0" />
       <plugin id="org.adempiere.ui.zk" autoStart="true" startLevel="0" />
-      <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="0" />
+      <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="1" />
       <plugin id="org.apache.felix.webconsole" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.equinox.cm" autoStart="true" startLevel="0" />
@@ -60,6 +61,10 @@
       <plugin id="org.eclipse.jetty.http2.server" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.jetty.osgi.boot" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.jetty.osgi.httpservice" autoStart="true" startLevel="10" />
+      <plugin id="org.eclipse.jetty.websocket.common" autoStart="true" startLevel="3" />
+      <plugin id="org.eclipse.jetty.websocket.javax.websocket" autoStart="true" startLevel="3" />
+      <plugin id="org.eclipse.jetty.websocket.javax.websocket.server" autoStart="true" startLevel="3" />
+      <plugin id="org.eclipse.jetty.websocket.server" autoStart="true" startLevel="3" />
       <plugin id="org.idempiere.felix.webconsole" autoStart="true" startLevel="0" />
       <plugin id="org.mortbay.jasper.apache-el" autoStart="true" startLevel="0" />
       <plugin id="org.mortbay.jasper.apache-jsp" autoStart="true" startLevel="0" />
diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml
index 51bc17bd33..d59b3a8290 100644
--- a/org.idempiere.parent/pom.xml
+++ b/org.idempiere.parent/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.idempiere</groupId>
 	<artifactId>org.idempiere.parent</artifactId>
-	<version>5.1.0-SNAPSHOT</version>
+	<version>6.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Maven parent project for idempiere</name>
 
@@ -13,25 +13,30 @@
 		<tycho.version>1.2.0</tycho.version>
 		<tycho.extras.version>${tycho.version}</tycho.extras.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<jetty.version>9.4.11.v20180605</jetty.version>
+		<jetty.version>9.4.12.v20180830</jetty.version>
 		<jp.version>6.7.0</jp.version>
 		<zk.version>8.5.0</zk.version>
-		<zk.javassist.src.version>3.18.2-GA</zk.javassist.src.version>
-		<maven.dependency.version>3.0.2</maven.dependency.version>
-		<download.maven.version>1.4.0</download.maven.version>
+		<zk.javassist.src.version>3.23.1-GA</zk.javassist.src.version>
+		<maven.dependency.version>3.1.1</maven.dependency.version>
+		<download.maven.version>1.4.1</download.maven.version>
 		<lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
+		<springframework.version>4.3.19.RELEASE_1</springframework.version><!--cfx dependency on [3.1,5)-->
 		<!-- https://www.eclipse.org/jetty/documentation/9.3.x/alpn-chapter.html#alpn-versions -->
 		<jetty.alpn-boot.version>8.1.12.v20180117</jetty.alpn-boot.version>
-
+		<netbeans.lib.version>RELEASE731</netbeans.lib.version>
 		<!-- default value of properties, use when run without profile -->
 		<idempiere.target>org.idempiere.p2.targetplatform</idempiere.target>
-		<idempiere-equinox-url>http://download.eclipse.org/eclipse/updates/4.8</idempiere-equinox-url>
-		<idempiere-equinox-repository-id>eclipse-photon</idempiere-equinox-repository-id>
-		<idempiere-orbit-url>http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository</idempiere-orbit-url>
-		<idempiere-orbit-repository-id>orbit-photon-R20180606145124</idempiere-orbit-repository-id>
+		<idempiere-equinox-url>http://download.eclipse.org/eclipse/updates/4.9</idempiere-equinox-url>
+		<idempiere-equinox-repository-id>eclipse-photon-201809</idempiere-equinox-repository-id>
+		<idempiere-orbit-url>http://download.eclipse.org/tools/orbit/downloads/drops/R20180905201904/repository</idempiere-orbit-url>
+		<idempiere-orbit-repository-id>orbit-photon-R20180905201904</idempiere-orbit-repository-id>
 		<url.file.srv>http://downloads.sourceforge.net/project/idempiere/binary.file</url.file.srv>
 		<extra.ui.install>org.eclipse.equinox.p2.director, org.idempiere.equinox.p2.director.feature.feature.group, org.idempiere.fitnesse.feature.feature.group</extra.ui.install>
 		<idempiere.product.id>org.adempiere.server.product</idempiere.product.id>
+		<codehaus.plexus>2.8.5</codehaus.plexus>
+		<!-- override from tycho to get latest version of jdt -->
+		<jdtVersion>3.15.0</jdtVersion>
+		<jdtAptVersion>1.3.300</jdtAptVersion>
 	</properties>
 
 	<build>
@@ -315,6 +320,47 @@
 					<groupId>org.eclipse.tycho</groupId>
 					<artifactId>tycho-compiler-plugin</artifactId>
 					<version>${tycho.version}</version>
+                    <configuration>
+                        <verbose>true</verbose>
+                    </configuration>
+				        <dependencies>
+                            <!-- overrider tycho to get latest for compiler ~/.m2/repository/org/eclipse/tycho/tycho-compiler-jdt/1.2.0/tycho-compiler-jdt-1.2.0.pom-->
+		                    <dependency>
+			                    <groupId>org.codehaus.plexus</groupId>
+			                    <artifactId>plexus-utils</artifactId>
+					            <version>3.1.0</version>
+		                    </dependency>
+		                    <dependency>
+			                    <groupId>org.codehaus.plexus</groupId>
+			                    <artifactId>plexus-compiler-manager</artifactId>
+					            <version>${codehaus.plexus}</version>
+		                    </dependency>
+		                    <dependency>
+			                    <groupId>org.codehaus.plexus</groupId>
+			                    <artifactId>plexus-compiler-api</artifactId>
+					            <version>${codehaus.plexus}</version>
+		                    </dependency>
+		                    <dependency>
+		                        <groupId>org.apache.commons</groupId>
+		                        <artifactId>commons-exec</artifactId>
+					            <version>1.3</version>
+		                    </dependency>
+		                    <dependency>
+		                    	<groupId>org.eclipse.jdt</groupId>
+		                    	<artifactId>org.eclipse.jdt.compiler.tool</artifactId>
+		                    	<version>1.2.300</version>
+		                    </dependency>
+		                    <dependency>
+		                    	<groupId>org.eclipse.jdt</groupId>
+		                    	<artifactId>org.eclipse.jdt.core</artifactId>
+		                    	<version>${jdtVersion}</version>
+		                    </dependency>
+		                    <dependency>
+		                    	<groupId>org.eclipse.jdt</groupId>
+		                    	<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
+		                    	<version>${jdtAptVersion}</version>
+		                    </dependency>
+				        </dependencies>
 				</plugin>
 				<plugin>
 					<groupId>org.eclipse.tycho</groupId>
@@ -354,7 +400,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-shade-plugin</artifactId>
-					<version>3.1.0</version>
+					<version>3.2.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -454,7 +500,6 @@
 			            <version>${tycho.version}</version>
 			            <configuration>
 				            <targetDefinitionIncludeSource>honor</targetDefinitionIncludeSource>
-
 				            <!-- work-around for split package message error "Missing Constraint: 
 					            Bundle-RequiredExecutionEnvironment" track:https://bugs.eclipse.org/bugs/show_bug.cgi?id=403196 
 					            discuss:https://dev.eclipse.org/mhonarc/lists/tycho-user/msg03941.html -->
@@ -493,8 +538,8 @@
 						            <arch>x86_64</arch>
 					            </environment>
 				            </environments>
-                            <executionEnvironmentDefault>JavaSE-1.8</executionEnvironmentDefault>
-                            <executionEnvironment>JavaSE-1.8</executionEnvironment>
+                            <executionEnvironmentDefault>JavaSE-10</executionEnvironmentDefault>
+                            <executionEnvironment>JavaSE-10</executionEnvironment>
 			            </configuration>
 		            </plugin>
                 </plugins>
diff --git a/org.idempiere.ui.zk.selenium/.classpath b/org.idempiere.ui.zk.selenium/.classpath
index cf36b56119..423c974870 100644
--- a/org.idempiere.ui.zk.selenium/.classpath
+++ b/org.idempiere.ui.zk.selenium/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.idempiere.ui.zk.selenium/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.ui.zk.selenium/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.idempiere.ui.zk.selenium/.settings/org.eclipse.jdt.core.prefs
+++ b/org.idempiere.ui.zk.selenium/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF b/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF
index bb8e071428..dff492754f 100644
--- a/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF
+++ b/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Selenium Integration
 Bundle-SymbolicName: org.idempiere.ui.zk.selenium
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.1.0.qualifier
 Bundle-Activator: org.idempiere.ui.zk.selenium.fitnesse.Activator
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Import-Package: fit,
  fit.decorator,
  fit.decorator.exceptions,
@@ -343,3 +343,4 @@ Import-Package: fit,
 Service-Component: OSGI-INF/fitfixturefactory.xml
 Bundle-ClassPath: .
 Automatic-Module-Name: org.idempiere.ui.zk.selenium
+Bundle-Vendor: iDempiere Community
diff --git a/org.idempiere.ui.zk.selenium/pom.xml b/org.idempiere.ui.zk.selenium/pom.xml
index 525acf5e8b..467620bbc8 100644
--- a/org.idempiere.ui.zk.selenium/pom.xml
+++ b/org.idempiere.ui.zk.selenium/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.idempiere.ui.zk.selenium</artifactId>
diff --git a/org.idempiere.ui.zk.selenium/src/org/idempiere/ui/zk/selenium/fitnesse/FitFixtureFactory.java b/org.idempiere.ui.zk.selenium/src/org/idempiere/ui/zk/selenium/fitnesse/FitFixtureFactory.java
index 17a657fde8..e1839467a6 100644
--- a/org.idempiere.ui.zk.selenium/src/org/idempiere/ui/zk/selenium/fitnesse/FitFixtureFactory.java
+++ b/org.idempiere.ui.zk.selenium/src/org/idempiere/ui/zk/selenium/fitnesse/FitFixtureFactory.java
@@ -13,6 +13,8 @@
  *****************************************************************************/
 package org.idempiere.ui.zk.selenium.fitnesse;
 
+import java.lang.reflect.InvocationTargetException;
+
 import org.idempiere.fitnesse.server.fit.IFitFixtureFactory;
 
 import fit.FixtureName;
@@ -41,22 +43,23 @@ public class FitFixtureFactory implements IFitFixtureFactory {
 		Object obj = null;
 		try {
 			Class<?> clazz = getClass().getClassLoader().loadClass(className);
-			obj = clazz.newInstance();
+			obj = clazz.getDeclaredConstructor().newInstance();
 			return obj;
 		} catch (ClassNotFoundException e) {
 		} catch (InstantiationException e) {
-		} catch (IllegalAccessException e) {
+		} catch (IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
 		}
 		
 		if (!fixtureName.isFullyQualified()) {
 			className = DEFAULT_PACKAGE + "." + fixtureName.toString();
 			try {
 				Class<?> clazz = (Class<?>) getClass().getClassLoader().loadClass(className);
-				obj = clazz.newInstance();
+				obj = clazz.getDeclaredConstructor().newInstance();
 				return obj;
 			} catch (ClassNotFoundException e) {
 			} catch (InstantiationException e) {
 			} catch (IllegalAccessException e) {
+			} catch (InvocationTargetException | NoSuchMethodException ex) {
 			}
 		}
 		return null;
diff --git a/org.idempiere.webservices/.classpath b/org.idempiere.webservices/.classpath
index ec1bc64688..83a96b9803 100644
--- a/org.idempiere.webservices/.classpath
+++ b/org.idempiere.webservices/.classpath
@@ -1,27 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="WEB-INF/src/"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/aopalliance.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/axis.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/commons-discovery.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/cxf-bundle.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/cxf-rt-frontend-jaxws.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/idempiere-xmlbeans.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/jsr311-api.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/neethi.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-aop.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-asm.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-beans.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-context.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-core.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-expression.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-osgi-extender.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-web.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/stax2-api.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/wsdl4j.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/xmlbeans.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/xmlschema-core.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.idempiere.webservices/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.webservices/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.idempiere.webservices/.settings/org.eclipse.jdt.core.prefs
+++ b/org.idempiere.webservices/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF
index a17f70a8d1..4301d2754b 100644
--- a/org.idempiere.webservices/META-INF/MANIFEST.MF
+++ b/org.idempiere.webservices/META-INF/MANIFEST.MF
@@ -2,22 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Webservices
 Bundle-SymbolicName: org.idempiere.webservices;singleton:=true
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.1.0.qualifier
 Bundle-Activator: org.idempiere.webservices.Activator
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Service-Component: OSGI-INF/ws_modelfactory.xml
 Import-Package: javax.activation,
+ javax.jws;version="1.1.0",
+ javax.jws.soap;version="1.1.0",
+ javax.mail;version="1.4.1",
  javax.mail.internet;version="1.5",
  javax.servlet;version="3.0.0",
  javax.servlet.http;version="3.0.0",
- javax.xml.rpc,
- javax.xml.rpc.encoding,
- javax.xml.rpc.handler,
- javax.xml.rpc.handler.soap,
- javax.xml.rpc.holders,
- javax.xml.rpc.server,
- javax.xml.rpc.soap,
- javax.xml.soap;version="1.3.0",
+ javax.xml.bind;version="2.3.0",
  net.sf.jasperreports.engine,
  net.sf.jasperreports.engine.base,
  net.sf.jasperreports.engine.util,
@@ -61,161 +57,59 @@ Import-Package: javax.activation,
  org.osgi.framework;version="1.6.0"
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  org.adempiere.ui;bundle-version="0.0.0",
- org.apache.ecs;bundle-version="0.0.0"
+ org.apache.ecs;bundle-version="0.0.0",
+ org.apache.cxf.cxf-core;bundle-version="3.2.6",
+ org.apache.neethi;bundle-version="3.1.1",
+ org.apache.ws.xmlschema.core;bundle-version="2.2.3",
+ org.apache.commons.discovery;bundle-version="0.5.0",
+ stax2-api;bundle-version="4.1.0",
+ org.apache.cxf.cxf-rt-frontend-jaxrs;bundle-version="3.2.6",
+ org.apache.cxf.cxf-rt-frontend-jaxws;bundle-version="3.2.6",
+ org.apache.cxf.cxf-rt-bindings-soap;bundle-version="3.2.6",
+ org.apache.cxf.cxf-rt-bindings-xml;bundle-version="3.2.6",
+ org.apache.cxf.cxf-rt-databinding-jaxb;bundle-version="3.2.6",
+ org.apache.cxf.cxf-rt-frontend-simple;bundle-version="3.2.6",
+ org.apache.cxf.cxf-rt-transports-http;bundle-version="3.2.6",
+ org.apache.cxf.cxf-rt-wsdl;bundle-version="3.2.6",
+ org.aopalliance;bundle-version="1.0.0",
+ org.apache.xml.resolver;bundle-version="1.2.0",
+ org.apache.cxf.cxf-rt-transports-http-jetty;bundle-version="3.2.6",
+ org.apache.cxf.cxf-rt-ws-addr;bundle-version="3.2.6",
+ org.apache.cxf.cxf-rt-ws-policy;bundle-version="3.2.6",
+ org.apache.cxf.cxf-rt-databinding-xmlbeans;bundle-version="3.1.17",
+ org.apache.xmlbeans;bundle-version="3.0.1",
+ javax.ws.rs-api;bundle-version="2.1.99",
+ org.apache.servicemix.bundles.spring-aop,
+ org.apache.servicemix.bundles.spring-beans,
+ org.apache.servicemix.bundles.spring-context,
+ org.apache.servicemix.bundles.spring-context-support,
+ org.apache.servicemix.bundles.spring-core,
+ org.apache.servicemix.bundles.spring-expression,
+ org.springframework.spring-jcl;bundle-version="5.1.1",
+ org.apache.servicemix.bundles.spring-web,
+ org.apache.cxf.cxf-rt-rs-extension-providers;bundle-version="3.1.17",
+ javax.xml.soap-api;bundle-version="1.4.0",
+ org.apache.axis;bundle-version="1.4.0",
+ javax.xml.soap;bundle-version="1.3.0",
+ jaxws-api;bundle-version="2.3.1",
+ javax.annotation-api;bundle-version="1.3.2",
+ org.glassfish.jersey.core.jersey-common;bundle-version="2.22.1",
+ org.apache.cxf.cxf-rt-rs-service-description;bundle-version="3.2.6",
+ org.glassfish.hk2.osgi-resource-locator;bundle-version="2.5.0",
+ org.glassfish.hk2.api;bundle-version="2.5.0",
+ org.glassfish.hk2.locator;bundle-version="2.5.0",
+ org.glassfish.hk2.utils;bundle-version="2.5.0",
+ org.glassfish.jersey.bundles.repackaged.jersey-guava;bundle-version="2.22.1"
 Bundle-ClassPath: .,
- WEB-INF/lib/aopalliance.jar,
- WEB-INF/lib/axis.jar,
- WEB-INF/lib/commons-discovery.jar,
- WEB-INF/lib/cxf-bundle.jar,
- WEB-INF/lib/cxf-rt-frontend-jaxws.jar,
- WEB-INF/lib/idempiere-xmlbeans.jar,
- WEB-INF/lib/jsr311-api.jar,
- WEB-INF/lib/neethi.jar,
- WEB-INF/lib/spring-aop.jar,
- WEB-INF/lib/spring-asm.jar,
- WEB-INF/lib/spring-beans.jar,
- WEB-INF/lib/spring-context.jar,
- WEB-INF/lib/spring-core.jar,
- WEB-INF/lib/spring-expression.jar,
- WEB-INF/lib/spring-osgi-extender.jar,
- WEB-INF/lib/spring-web.jar,
- WEB-INF/lib/stax2-api.jar,
- WEB-INF/lib/wsdl4j.jar,
- WEB-INF/lib/xmlbeans.jar,
- WEB-INF/lib/xmlschema-core.jar
-Export-Package: javax.ws.rs,
- javax.ws.rs.core,
- javax.ws.rs.ext,
- javax.wsdl,
- javax.wsdl.extensions,
- javax.wsdl.extensions.http,
- javax.wsdl.extensions.mime,
- javax.wsdl.extensions.schema,
- javax.wsdl.extensions.soap,
- javax.wsdl.extensions.soap12,
- javax.wsdl.factory,
- javax.wsdl.xml,
- org.apache.axis,
- org.apache.axis.attachments,
- org.apache.axis.client,
- org.apache.axis.client.async,
- org.apache.axis.collections,
- org.apache.axis.components.compiler,
- org.apache.axis.components.encoding,
- org.apache.axis.components.image,
- org.apache.axis.components.jms,
- org.apache.axis.components.logger,
- org.apache.axis.components.net,
- org.apache.axis.components.script,
- org.apache.axis.components.threadpool,
- org.apache.axis.components.uuid,
- org.apache.axis.configuration,
- org.apache.axis.constants,
- org.apache.axis.deployment.wsdd,
- org.apache.axis.deployment.wsdd.providers,
- org.apache.axis.description,
- org.apache.axis.encoding,
- org.apache.axis.encoding.ser,
- org.apache.axis.encoding.ser.castor,
- org.apache.axis.handlers,
- org.apache.axis.handlers.http,
- org.apache.axis.handlers.soap,
- org.apache.axis.holders,
- org.apache.axis.i18n,
- org.apache.axis.management,
- org.apache.axis.management.jmx,
- org.apache.axis.message,
- org.apache.axis.monitor,
- org.apache.axis.providers,
- org.apache.axis.providers.java,
- org.apache.axis.schema,
- org.apache.axis.security,
- org.apache.axis.security.servlet,
- org.apache.axis.security.simple,
- org.apache.axis.server,
- org.apache.axis.session,
- org.apache.axis.soap,
- org.apache.axis.strategies,
- org.apache.axis.transport.http,
- org.apache.axis.transport.java,
- org.apache.axis.transport.jms,
- org.apache.axis.transport.local,
- org.apache.axis.transport.mail,
- org.apache.axis.types,
- org.apache.axis.utils,
- org.apache.axis.utils.bytecode,
- org.apache.axis.utils.cache,
- org.apache.axis.wsdl,
- org.apache.axis.wsdl.fromJava,
- org.apache.axis.wsdl.gen,
- org.apache.axis.wsdl.symbolTable,
- org.apache.axis.wsdl.toJava,
- org.apache.commons.discovery,
- org.apache.commons.discovery.ant,
- org.apache.commons.discovery.jdk,
- org.apache.commons.discovery.log,
- org.apache.commons.discovery.resource,
- org.apache.commons.discovery.resource.classes,
- org.apache.commons.discovery.resource.names,
- org.apache.commons.discovery.tools,
- org.apache.cxf,
- org.apache.cxf.jaxws,
- org.apache.cxf.jaxws.spring,
- org.apache.cxf.transport.servlet,
- org.apache.cxf.xmlbeans,
- org.apache.xmlbeans,
- org.apache.xmlbeans.impl.common,
- org.apache.xmlbeans.impl.config,
- org.apache.xmlbeans.impl.inst2xsd,
- org.apache.xmlbeans.impl.inst2xsd.util,
- org.apache.xmlbeans.impl.jam,
- org.apache.xmlbeans.impl.jam.annotation,
- org.apache.xmlbeans.impl.jam.internal,
- org.apache.xmlbeans.impl.jam.internal.classrefs,
- org.apache.xmlbeans.impl.jam.internal.elements,
- org.apache.xmlbeans.impl.jam.internal.javadoc,
- org.apache.xmlbeans.impl.jam.internal.parser,
- org.apache.xmlbeans.impl.jam.internal.reflect,
- org.apache.xmlbeans.impl.jam.mutable,
- org.apache.xmlbeans.impl.jam.provider,
- org.apache.xmlbeans.impl.jam.visitor,
- org.apache.xmlbeans.impl.jam.xml,
- org.apache.xmlbeans.impl.regex,
- org.apache.xmlbeans.impl.richParser,
- org.apache.xmlbeans.impl.schema,
- org.apache.xmlbeans.impl.soap,
- org.apache.xmlbeans.impl.store,
- org.apache.xmlbeans.impl.tool,
- org.apache.xmlbeans.impl.util,
- org.apache.xmlbeans.impl.validator,
- org.apache.xmlbeans.impl.values,
- org.apache.xmlbeans.impl.xb.ltgfmt,
- org.apache.xmlbeans.impl.xb.ltgfmt.impl,
- org.apache.xmlbeans.impl.xb.substwsdl,
- org.apache.xmlbeans.impl.xb.substwsdl.impl,
- org.apache.xmlbeans.impl.xb.xmlconfig,
- org.apache.xmlbeans.impl.xb.xmlconfig.impl,
- org.apache.xmlbeans.impl.xb.xmlschema,
- org.apache.xmlbeans.impl.xb.xmlschema.impl,
- org.apache.xmlbeans.impl.xb.xsdownload,
- org.apache.xmlbeans.impl.xb.xsdownload.impl,
- org.apache.xmlbeans.impl.xb.xsdschema,
- org.apache.xmlbeans.impl.xb.xsdschema.impl,
- org.apache.xmlbeans.impl.xpathgen,
- org.apache.xmlbeans.impl.xsd2inst,
- org.apache.xmlbeans.soap,
- org.apache.xmlbeans.xml.stream,
- org.apache.xmlbeans.xml.stream.events,
- org.apache.xmlbeans.xml.stream.utils,
- org.compiere.model,
+ WEB-INF/lib/idempiere-xmlbeans.jar
+Export-Package: org.compiere.model,
  org.idempiere.adInterface.x10,
  org.idempiere.adInterface.x10.impl,
  org.idempiere.adinterface,
  org.idempiere.webservices,
  org.idempiere.webservices.client,
- org.idempiere.webservices.fault,
- org.springframework.web.context,
- org.springframework.web.util
+ org.idempiere.webservices.fault
 Web-ContextPath: ADInterface
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.idempiere.webservices
+Bundle-Vendor: iDempiere Community
diff --git a/org.idempiere.webservices/META-INF/cxf/cxf-servlet.xml b/org.idempiere.webservices/META-INF/cxf/cxf-servlet.xml
new file mode 100644
index 0000000000..31cc1e4fd4
--- /dev/null
+++ b/org.idempiere.webservices/META-INF/cxf/cxf-servlet.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+ 
+  http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:foo="http://cxf.apache.org/configuration/foo" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+
+</beans>
diff --git a/org.idempiere.webservices/META-INF/spring.handlers b/org.idempiere.webservices/META-INF/spring.handlers
new file mode 100644
index 0000000000..1b110fa321
--- /dev/null
+++ b/org.idempiere.webservices/META-INF/spring.handlers
@@ -0,0 +1,22 @@
+#
+#
+#    Licensed to the Apache Software Foundation (ASF) under one
+#    or more contributor license agreements. See the NOTICE file
+#    distributed with this work for additional information
+#    regarding copyright ownership. The ASF licenses this file
+#    to you under the Apache License, Version 2.0 (the
+#    "License"); you may not use this file except in compliance
+#    with the License. You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing,
+#    software distributed under the License is distributed on an
+#    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#    KIND, either express or implied. See the License for the
+#    specific language governing permissions and limitations
+#    under the License.
+#
+#
+http\://cxf.apache.org/jaxws=org.apache.cxf.jaxws.spring.NamespaceHandler
+http\://cxf.apache.org/jaxrs=org.apache.cxf.jaxrs.spring.NamespaceHandler
\ No newline at end of file
diff --git a/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/data/DBDataSource.java b/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/data/DBDataSource.java
index 47d926d85d..8167c59840 100644
--- a/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/data/DBDataSource.java
+++ b/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/data/DBDataSource.java
@@ -108,7 +108,7 @@ public class DBDataSource extends compiereDataSource
 				}
 				else if (clazz.equals(java.lang.Byte.class))
 				{
-					objValue = new Byte(m_resultSet.getByte(field.getName()));
+					objValue = Byte.valueOf(m_resultSet.getByte(field.getName()));
 					if(m_resultSet.wasNull())
 					{
 						objValue = null;
@@ -140,7 +140,7 @@ public class DBDataSource extends compiereDataSource
 				}
 				else if (clazz.equals(java.lang.Double.class))
 				{
-					objValue = new Double(m_resultSet.getDouble(field.getName()));
+					objValue = Double.valueOf(m_resultSet.getDouble(field.getName()));
 					if(m_resultSet.wasNull())
 					{
 						objValue = null;
@@ -148,7 +148,7 @@ public class DBDataSource extends compiereDataSource
 				}
 				else if (clazz.equals(java.lang.Float.class))
 				{
-					objValue = new Float(m_resultSet.getFloat(field.getName()));
+					objValue = Float.valueOf(m_resultSet.getFloat(field.getName()));
 					if(m_resultSet.wasNull())
 					{
 						objValue = null;
@@ -156,7 +156,7 @@ public class DBDataSource extends compiereDataSource
 				}
 				else if (clazz.equals(java.lang.Integer.class))
 				{
-					objValue = new Integer(m_resultSet.getInt(field.getName()));
+					objValue = Integer.valueOf(m_resultSet.getInt(field.getName()));
 					if(m_resultSet.wasNull())
 					{
 						objValue = null;
@@ -164,7 +164,7 @@ public class DBDataSource extends compiereDataSource
 				}
 				else if (clazz.equals(java.lang.Long.class))
 				{
-					objValue = new Long(m_resultSet.getLong(field.getName()));
+					objValue = Long.valueOf(m_resultSet.getLong(field.getName()));
 					if(m_resultSet.wasNull())
 					{
 						objValue = null;
@@ -172,7 +172,7 @@ public class DBDataSource extends compiereDataSource
 				}
 				else if (clazz.equals(java.lang.Short.class))
 				{
-					objValue = new Short(m_resultSet.getShort(field.getName()));
+					objValue = Short.valueOf(m_resultSet.getShort(field.getName()));
 					if(m_resultSet.wasNull())
 					{
 						objValue = null;
diff --git a/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/report/ReportPool.java b/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/report/ReportPool.java
index ff52acdd99..f49fe7bc06 100644
--- a/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/report/ReportPool.java
+++ b/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/report/ReportPool.java
@@ -48,7 +48,7 @@ public class ReportPool
     
     public ReportInfo getReport (int AD_Process_ID )
     {
-/*        ReportInfo reportinfo = (ReportInfo) pool.get(new Integer(AD_Process_ID));
+/*        ReportInfo reportinfo = (ReportInfo) pool.get(Integer.valueOf(AD_Process_ID));
         if (reportinfo == null)
         {
             reportinfo = loadReport(AD_Process_ID);
@@ -78,7 +78,7 @@ public class ReportPool
     {
         if(refresh)
         {
-            pool.put(new Integer(AD_Process_ID), reportinfo);            
+            pool.put(Integer.valueOf(AD_Process_ID), reportinfo);            
         }
         else
         {
@@ -95,7 +95,7 @@ public class ReportPool
             	size--;
             }
             
-            pool.put(new Integer(AD_Process_ID), reportinfo);
+            pool.put(Integer.valueOf(AD_Process_ID), reportinfo);
             size++;            
         }
         if (log.isLoggable(Level.INFO)) log.info("Load " + reportinfo + " into Report Pool" + " Size=" + size);
diff --git a/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/report/ReportProcessor.java b/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/report/ReportProcessor.java
index 3dcc4121ba..22d1a57bb6 100644
--- a/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/report/ReportProcessor.java
+++ b/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/report/ReportProcessor.java
@@ -96,7 +96,7 @@ public class ReportProcessor
 			// add parameter
 			m_Param.putAll(reportInfo.getSubReport());
             addProcessParameters( m_AD_PInstance_ID, m_Param);
-            m_Param.put("RECORD_ID", new Integer( m_Record_ID));
+            m_Param.put("RECORD_ID", Integer.valueOf( m_Record_ID));
 	    // Marco LOMBARDO: REPORT_HOME used to express subreports path.
             m_Param.put("REPORT_HOME", REPORT_HOME);
         // End Marco LOMBARDO.
@@ -145,8 +145,8 @@ public class ReportProcessor
         MPInstancePara[] pinstancePara = pinstance.getParameters();
         
         m_Record_ID = pinstance.getRecord_ID();
-        params.put("AD_Client_ID",new Integer(pinstance.getAD_Client_ID()));
-        params.put("AD_Org_ID",new Integer(pinstance.getAD_Org_ID()));
+        params.put("AD_Client_ID",Integer.valueOf(pinstance.getAD_Client_ID()));
+        params.put("AD_Org_ID",Integer.valueOf(pinstance.getAD_Org_ID()));
         
         for(int i=0; i<pinstancePara.length; i++)
         {
diff --git a/org.idempiere.webservices/WEB-INF/src/org/compiere/model/MWebService.java b/org.idempiere.webservices/WEB-INF/src/org/compiere/model/MWebService.java
index f50feaa996..8c2384e64d 100644
--- a/org.idempiere.webservices/WEB-INF/src/org/compiere/model/MWebService.java
+++ b/org.idempiere.webservices/WEB-INF/src/org/compiere/model/MWebService.java
@@ -60,7 +60,7 @@ public class MWebService extends X_WS_WebService
 	 */
 	public static MWebService get (Properties ctx, int WS_WebService_ID)
 	{
-		Integer key = new Integer (WS_WebService_ID);
+		Integer key = Integer.valueOf(WS_WebService_ID);
 		MWebService retValue = (MWebService) s_cache.get (key);
 		if (retValue != null)
 			return retValue;
@@ -112,7 +112,7 @@ public class MWebService extends X_WS_WebService
 		}
 		if (retValue != null)
 		{
-			Integer key = new Integer (retValue.getWS_WebService_ID());
+			Integer key = Integer.valueOf(retValue.getWS_WebService_ID());
 			s_cache.put (key, retValue);
 		}
 		return retValue;
diff --git a/org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/ReportEngineEx.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/ReportEngineEx.java
index 5fc397c8c1..cf1e9db5ea 100644
--- a/org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/ReportEngineEx.java
+++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/ReportEngineEx.java
@@ -132,7 +132,7 @@ public class ReportEngineEx { //extends  ReportEngine  {
 						{
 							td td = new td();
 							tr.addElement(td);
-							Object obj = m_printData.getNode(new Integer(item.getAD_Column_ID()));
+							Object obj = m_printData.getNode(Integer.valueOf(item.getAD_Column_ID()));
 							if (obj == null)
 								td.addElement("&nbsp;");
 							else if (obj instanceof PrintDataElement)
diff --git a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java
index c4736a974b..df18e951fb 100644
--- a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java
+++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java
@@ -522,10 +522,10 @@ public class AbstractService {
 		if (columnClass == Boolean.class) {
 			if ("Y".equalsIgnoreCase(strValue)
 					|| "true".equalsIgnoreCase(strValue))
-				value = new Boolean(true);
+				value = Boolean.TRUE;
 			else if ("N".equalsIgnoreCase(strValue)
 					|| "false".equalsIgnoreCase(strValue))
-				value = new Boolean(false);
+				value = Boolean.FALSE;
 			else
 				throw new IdempiereServiceFault(" input column " + colName
 						+ " wrong value " + strValue, new QName(
diff --git a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/client/QueryDataLookup.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/client/QueryDataLookup.java
index f7cae99a59..42e73f915f 100644
--- a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/client/QueryDataLookup.java
+++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/client/QueryDataLookup.java
@@ -187,7 +187,7 @@ public class QueryDataLookup extends Lookup {
 					}
 					if (key != null && display != null)
 					{
-						Integer id = new Integer(key);
+						Integer id = Integer.valueOf(key);
 						dataMap.put(id, new KeyNamePair(id, display));
 					}
 				}
diff --git a/org.idempiere.webservices/build.properties b/org.idempiere.webservices/build.properties
index 1fd4677baa..9592fe3b39 100644
--- a/org.idempiere.webservices/build.properties
+++ b/org.idempiere.webservices/build.properties
@@ -6,26 +6,7 @@ bin.includes = META-INF/,\
                WEB-INF/xsd/,\
                plugin.xml,\
                OSGI-INF/,\
-               WEB-INF/lib/aopalliance.jar,\
-               WEB-INF/lib/axis.jar,\
-               WEB-INF/lib/commons-discovery.jar,\
-               WEB-INF/lib/cxf-bundle.jar,\
-               WEB-INF/lib/cxf-rt-frontend-jaxws.jar,\
-               WEB-INF/lib/idempiere-xmlbeans.jar,\
-               WEB-INF/lib/jsr311-api.jar,\
-               WEB-INF/lib/neethi.jar,\
-               WEB-INF/lib/spring-aop.jar,\
-               WEB-INF/lib/spring-asm.jar,\
-               WEB-INF/lib/spring-beans.jar,\
-               WEB-INF/lib/spring-context.jar,\
-               WEB-INF/lib/spring-core.jar,\
-               WEB-INF/lib/spring-expression.jar,\
-               WEB-INF/lib/spring-osgi-extender.jar,\
-               WEB-INF/lib/spring-web.jar,\
-               WEB-INF/lib/stax2-api.jar,\
-               WEB-INF/lib/wsdl4j.jar,\
-               WEB-INF/lib/xmlbeans.jar,\
-               WEB-INF/lib/xmlschema-core.jar
+               WEB-INF/lib/idempiere-xmlbeans.jar
 src.includes = WEB-INF/lib/,\
                WEB-INF/web.xml,\
                WEB-INF/xsd/
diff --git a/org.idempiere.webservices/copyjars.xml b/org.idempiere.webservices/copyjars.xml
index bde8ddd2a0..6dbd56fda9 100644
--- a/org.idempiere.webservices/copyjars.xml
+++ b/org.idempiere.webservices/copyjars.xml
@@ -17,7 +17,7 @@
         <get src="${url.maven2}/org/apache/cxf/cxf-rt-frontend-jaxws/2.6.1/cxf-rt-frontend-jaxws-2.6.1.jar" dest="WEB-INF/lib/cxf-rt-frontend-jaxws.jar" usetimestamp="true" verbose="true" retries="5" />
         <get src="${url.maven2}/org/apache/xmlbeans/xmlbeans/3.0.0/xmlbeans-3.0.0.jar" dest="WEB-INF/lib/xmlbeans.jar" usetimestamp="true" verbose="true" retries="5" />
         <get src="${url.maven2}/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" dest="WEB-INF/lib/aopalliance.jar" usetimestamp="true" verbose="true" retries="5" />
-        <get src="${url.file.srv}/jarfile/5.1/idempiere-xmlbeans-1.0.jar" dest="WEB-INF/lib/idempiere-xmlbeans.jar" usetimestamp="true" verbose="true" retries="5" />
+        <get src="${url.file.srv}/jarfile/6.1/idempiere-xmlbeans-1.0.jar" dest="WEB-INF/lib/idempiere-xmlbeans.jar" usetimestamp="true" verbose="true" retries="5" />
         <get src="${url.maven2}/org/apache/axis/axis/1.4/axis-1.4.jar" dest="WEB-INF/lib/axis.jar" usetimestamp="true" verbose="true" retries="5" />
         <get src="${url.maven2}/commons-discovery/commons-discovery/0.5/commons-discovery-0.5.jar" dest="WEB-INF/lib/commons-discovery.jar" usetimestamp="true" verbose="true" retries="5" />
         <get src="${url.maven2}/javax/ws/rs/jsr311-api/1.1/jsr311-api-1.1.jar" dest="WEB-INF/lib/jsr311-api.jar" usetimestamp="true" verbose="true" retries="5" />
diff --git a/org.idempiere.webservices/pom.xml b/org.idempiere.webservices/pom.xml
index 76502d4c97..7a032db849 100644
--- a/org.idempiere.webservices/pom.xml
+++ b/org.idempiere.webservices/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.idempiere.webservices</artifactId>
@@ -13,119 +13,14 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>validate</phase>
-						<goals>
-							<goal>copy</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>org.springframework.osgi</groupId>
-									<artifactId>spring-osgi-extender</artifactId>
-									<version>1.2.1</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.springframework</groupId>
-									<artifactId>spring-aop</artifactId>
-									<version>3.0.7.RELEASE</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.codehaus.woodstox</groupId>
-									<artifactId>stax2-api</artifactId>
-									<version>3.1.1</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.springframework</groupId>
-									<artifactId>spring-web</artifactId>
-									<version>3.0.7.RELEASE</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.springframework</groupId>
-									<artifactId>spring-context</artifactId>
-									<version>3.0.7.RELEASE</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.springframework</groupId>
-									<artifactId>spring-beans</artifactId>
-									<version>3.0.7.RELEASE</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.springframework</groupId>
-									<artifactId>spring-core</artifactId>
-									<version>3.0.7.RELEASE</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.springframework</groupId>
-									<artifactId>spring-asm</artifactId>
-									<version>3.0.7.RELEASE</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.springframework</groupId>
-									<artifactId>spring-expression</artifactId>
-									<version>3.0.7.RELEASE</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>wsdl4j</groupId>
-									<artifactId>wsdl4j</artifactId>
-									<version>1.6.2</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.apache.cxf</groupId>
-									<artifactId>cxf-bundle</artifactId>
-									<version>2.6.2</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.apache.neethi</groupId>
-									<artifactId>neethi</artifactId>
-									<version>3.0.2</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.apache.ws.xmlschema</groupId>
-									<artifactId>xmlschema-core</artifactId>
-									<version>2.0.3</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.apache.cxf</groupId>
-									<artifactId>cxf-rt-frontend-jaxws</artifactId>
-									<version>2.6.1</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.apache.xmlbeans</groupId>
-									<artifactId>xmlbeans</artifactId>
-									<version>3.0.0</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>aopalliance</groupId>
-									<artifactId>aopalliance</artifactId>
-									<version>1.0</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.apache.axis</groupId>
-									<artifactId>axis</artifactId>
-									<version>1.4</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>commons-discovery</groupId>
-									<artifactId>commons-discovery</artifactId>
-									<version>0.5</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>javax.ws.rs</groupId>
-									<artifactId>jsr311-api</artifactId>
-									<version>1.1</version>
-								</artifactItem>
-							</artifactItems>
-							<outputDirectory>WEB-INF/lib</outputDirectory>
-							<stripVersion>true</stripVersion>
-							<overWriteReleases>true</overWriteReleases>
-							<overWriteSnapshots>true</overWriteSnapshots>
-						</configuration>
-					</execution>
-				</executions>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-compiler-plugin</artifactId>
+				<configuration>
+					<!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=367431 -->
+					<compilerArgs>
+						<arg>-warn:+forbidden</arg>
+					</compilerArgs>
+				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>com.googlecode.maven-download-plugin</groupId>
@@ -137,7 +32,7 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>${url.file.srv}/jarfile/5.1/idempiere-xmlbeans-1.0.jar</url>
+							<url>${url.file.srv}/jarfile/6.1/idempiere-xmlbeans-1.0.jar</url>
 							<unpack>false</unpack>
 							<outputDirectory>WEB-INF/lib</outputDirectory>
 							<retries>5</retries>
diff --git a/org.idempiere.webservices/testScripts/GW_Sample_WebServices.zip b/org.idempiere.webservices/testScripts/GW_Sample_WebServices.zip
index 691eb49dac..e16f3ad801 100644
Binary files a/org.idempiere.webservices/testScripts/GW_Sample_WebServices.zip and b/org.idempiere.webservices/testScripts/GW_Sample_WebServices.zip differ
diff --git a/org.idempiere.zk-feature/feature.xml b/org.idempiere.zk-feature/feature.xml
index 0df8f9c0b6..4eb4cc381a 100644
--- a/org.idempiere.zk-feature/feature.xml
+++ b/org.idempiere.zk-feature/feature.xml
@@ -2,7 +2,8 @@
 <feature
       id="org.idempiere.zk.feature"
       label="Materialize zk osgi libary"
-      version="5.1.0.qualifier">
+      version="6.1.0.qualifier"
+      provider-name="iDempiere Community">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
diff --git a/org.idempiere.zk-feature/pom.xml b/org.idempiere.zk-feature/pom.xml
index faaa45d2bd..63ceef9a61 100644
--- a/org.idempiere.zk-feature/pom.xml
+++ b/org.idempiere.zk-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.idempiere.zk.feature</artifactId>
diff --git a/org.idempiere.zk.extra/.classpath b/org.idempiere.zk.extra/.classpath
index 6c3abab069..85036c7cc4 100644
--- a/org.idempiere.zk.extra/.classpath
+++ b/org.idempiere.zk.extra/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry exported="true" kind="lib" path="lib/breeze.jar"/>
diff --git a/org.idempiere.zk.extra/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.zk.extra/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..6783713ef0 100644
--- a/org.idempiere.zk.extra/.settings/org.eclipse.jdt.core.prefs
+++ b/org.idempiere.zk.extra/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
diff --git a/org.idempiere.zk.extra/META-INF/MANIFEST.MF b/org.idempiere.zk.extra/META-INF/MANIFEST.MF
index f89e8316e3..abb07d53ed 100644
--- a/org.idempiere.zk.extra/META-INF/MANIFEST.MF
+++ b/org.idempiere.zk.extra/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: extra zk library
 Bundle-SymbolicName: org.idempiere.zk.extra
-Bundle-Version: 5.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Version: 6.1.0.qualifier
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Bundle-ClassPath: .,
  lib/breeze.jar,
  lib/calendar.jar,
@@ -16,9 +16,11 @@ Export-Package: com.google.common.annotations,
  com.google.common.cache,
  com.google.common.collect,
  com.google.common.escape,
+ com.google.common.graph,
  com.google.common.hash,
  com.google.common.io,
  com.google.common.math,
+ com.google.common.net,
  com.google.common.primitives,
  com.google.common.reflect,
  com.google.common.util.concurrent,
@@ -33,11 +35,13 @@ Export-Package: com.google.common.annotations,
  com.google.gson.internal.bind.util,
  com.google.gson.reflect,
  com.google.gson.stream,
+ com.google.j2objc.annotations,
  com.google.javascript.jscomp,
  com.google.javascript.jscomp.ant,
  com.google.javascript.jscomp.bundle,
  com.google.javascript.jscomp.deps,
  com.google.javascript.jscomp.graph,
+ com.google.javascript.jscomp.ijs,
  com.google.javascript.jscomp.js,
  com.google.javascript.jscomp.js.es6,
  com.google.javascript.jscomp.js.es6.array,
@@ -49,7 +53,6 @@ Export-Package: com.google.common.annotations,
  com.google.javascript.jscomp.js.es6.util,
  com.google.javascript.jscomp.js.util,
  com.google.javascript.jscomp.lint,
- com.google.javascript.jscomp.newtypes,
  com.google.javascript.jscomp.parsing,
  com.google.javascript.jscomp.parsing.parser,
  com.google.javascript.jscomp.parsing.parser.trees,
@@ -66,10 +69,12 @@ Export-Package: com.google.common.annotations,
  google.protobuf,
  google.protobuf.compiler,
  javax.annotation,
- javax.annotation.concurrent,
  javax.annotation.meta,
  jsinterop.annotations,
  metainfo.zk,
+ org.checkerframework.checker.nullness.qual,
+ org.checkerframework.framework.qual,
+ org.codehaus.mojo.animal_sniffer,
  org.kohsuke.args4j,
  org.kohsuke.args4j.spi,
  org.zkforge.json.simple,
@@ -198,3 +203,4 @@ Import-Package: javax.servlet;version="3.1.0",
  javax.servlet.http;version="3.1.0",
  org.slf4j;version="1.7.2"
 Automatic-Module-Name: org.idempiere.zk.extra
+Bundle-Vendor: iDempiere Community
diff --git a/org.idempiere.zk.extra/pom.xml b/org.idempiere.zk.extra/pom.xml
index 83b4cb14fd..5ed5129c3f 100644
--- a/org.idempiere.zk.extra/pom.xml
+++ b/org.idempiere.zk.extra/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 
@@ -52,7 +52,7 @@
 								<artifactItem>
 									<groupId>com.google.javascript</groupId>
 									<artifactId>closure-compiler</artifactId>
-									<version>v20171112</version>
+									<version>v20181008</version>
 								</artifactItem>
 							</artifactItems>
 							<outputDirectory>lib</outputDirectory>
diff --git a/pom.xml b/pom.xml
index 03dfd1e482..f6e75e522a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.1.0-SNAPSHOT</version>
 		<relativePath>org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<modules>