Merge with default

2018-01-24 23:21:06 +07:00 · 2018-01-24 23:21:06 +07:00 · 512cb52cd8
parent 4758bd00b8 16167a62cb
commit 512cb52cd8
1901 changed files with 12119 additions and 3590 deletions
--- a/event.test/META-INF/MANIFEST.MF
+++ b/event.test/META-INF/MANIFEST.MF
@ -6,7 +6,7 @@ Bundle-Version: 3.1.0.qualifier
 Bundle-Activator: event.test.Activator
 Require-Bundle: org.adempiere.base;bundle-version="3.1.0"
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.eclipse.equinox.events;version="1.0.0",
 org.osgi.framework,
 org.osgi.service.event;version="1.2.0"
--- a/fitnesse/.classpath
+++ b/fitnesse/.classpath
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="fitnesse.jar" sourcepath="lib/fitnesse-sources.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
--- a/fitnesse/.settings/org.eclipse.jdt.core.prefs
+++ b/fitnesse/.settings/org.eclipse.jdt.core.prefs
@ -1,11 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-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.6
--- a/fitnesse/copyjars.xml
+++ b/fitnesse/copyjars.xml
@ -1,6 +1,6 @@
 <project name="zklibrary" basedir="." default="copy">
 	<target name="copy">
 		<!-- maybe it's same file in org.idempiere.fitnesse.server, just diference version-->
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/4.1/fitnesse2.jar" dest="fitnesse2.jar" usetimestamp="true" verbose="true" retries="5"/>
+		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/5.1/fitnesse2.jar" dest="fitnesse2.jar" usetimestamp="true" verbose="true" retries="5"/>
 	</target>
 </project>
--- a/migration/i4.1/oracle/201707041543_IDEMPIERE-3411.sql
+++ b/migration/i4.1/oracle/201707041543_IDEMPIERE-3411.sql
@ -0,0 +1,10 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-3411 : When lauching a report based on a report view, available print formats are not filtered
+-- Jul 4, 2017 3:42:50 PM CEST
+INSERT INTO AD_SysConfig (AD_SysConfig_ID,AD_Client_ID,AD_Org_ID,Created,Updated,CreatedBy,UpdatedBy,IsActive,Name,Value,Description,EntityType,ConfigurationLevel,AD_SysConfig_UU) VALUES (200104,0,0,TO_DATE('2017-07-04 15:42:49','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2017-07-04 15:42:49','YYYY-MM-DD HH24:MI:SS'),100,100,'Y','ZK_REPORT_ONLY_PRINTFORMAT_LINKEDTO_REPORTVIEW','N','If set to Yes, print formats will be filtered according to the current report view','U','C','18e6758b-db72-480e-b832-72080c8f2268')
+;
+
+SELECT register_migration_script('201707041543_IDEMPIERE-3411.sql') FROM dual
+;
--- a/migration/i4.1/oracle/201710201214_IDEMPIERE-3521.sql
+++ b/migration/i4.1/oracle/201710201214_IDEMPIERE-3521.sql
@ -0,0 +1,15 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-3521 InfoWindow problem on other SQL when make a register count
+-- Oct 20, 2017 12:13:41 PM CEST
+UPDATE AD_Field SET SeqNo=130, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2017-10-20 12:13:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201634
+;
+
+-- Oct 20, 2017 12:13:43 PM CEST
+UPDATE AD_Field SET SeqNo=120, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2017-10-20 12:13:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=13579
+;
+
+SELECT register_migration_script('201710201214_IDEMPIERE-3521.sql') FROM dual
+;
+
--- a/migration/i4.1/oracle/201710231841_IDEMPIERE-3338.sql
+++ b/migration/i4.1/oracle/201710231841_IDEMPIERE-3338.sql
@ -0,0 +1,11 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-3338 Document Status Indicator / fix wrong example on GW
+-- Oct 23, 2017 6:41:13 PM CEST
+UPDATE PA_DocumentStatus SET WhereClause='M_InOut.IsSOTrx=''Y'' AND M_InOut.Processed=''N'' AND M_InOut.MovementType IN (''C-'')',Updated=TO_DATE('2017-10-23 18:41:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE PA_DocumentStatus_ID=200001
+;
+
+SELECT register_migration_script('201710231841_IDEMPIERE-3338.sql') FROM dual
+;
+
--- a/migration/i4.1/oracle/201710231915_IDEMPIERE-3173.sql
+++ b/migration/i4.1/oracle/201710231915_IDEMPIERE-3173.sql
@ -0,0 +1,15 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-3173 Columns that must not be copied
+-- Oct 23, 2017 7:14:50 PM CEST
+UPDATE AD_Column SET IsAllowCopy='N',Updated=TO_DATE('2017-10-23 19:14:50','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200558
+;
+
+-- Oct 23, 2017 7:15:09 PM CEST
+UPDATE AD_Column SET IsAllowCopy='N',Updated=TO_DATE('2017-10-23 19:15:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200704
+;
+
+SELECT register_migration_script('201710231915_IDEMPIERE-3173.sql') FROM dual
+;
+
--- a/migration/i4.1/oracle/201710251241_IDEMPIERE-3529.sql
+++ b/migration/i4.1/oracle/201710251241_IDEMPIERE-3529.sql
@ -0,0 +1,14 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-3529 - Add parameters to InvoicePrint process
+-- Oct 25, 2017 12:09:30 PM CEST
+INSERT INTO AD_Process_Para (AD_Process_Para_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,Name,Description,Help,AD_Process_ID,SeqNo,AD_Reference_ID,AD_Reference_Value_ID,IsRange,AD_Val_Rule_ID,FieldLength,IsMandatory,ColumnName,IsCentrallyMaintained,EntityType,AD_Element_ID,AD_Process_Para_UU,IsEncrypted) VALUES (200219,0,0,'Y',TO_DATE('2017-10-25 12:09:30','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2017-10-25 12:09:30','YYYY-MM-DD HH24:MI:SS'),100,'Document Type','Document type or rules','The Document Type determines document sequence and processing rules',200,60,19,170,'N',124,0,'N','C_DocType_ID','Y','D',196,'554013bb-d6c0-4795-a9c6-aa2cb6dfc2bf','N')
+;
+
+-- Oct 25, 2017 12:16:28 PM CEST
+INSERT INTO AD_Process_Para (AD_Process_Para_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,Name,Description,AD_Process_ID,SeqNo,AD_Reference_ID,AD_Reference_Value_ID,IsRange,FieldLength,IsMandatory,ColumnName,IsCentrallyMaintained,EntityType,AD_Element_ID,AD_Process_Para_UU,IsEncrypted) VALUES (200220,0,0,'Y',TO_DATE('2017-10-25 12:16:28','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2017-10-25 12:16:28','YYYY-MM-DD HH24:MI:SS'),100,'Paid','The document is paid',200,70,17,319,'N',0,'N','IsPaid','Y','D',1402,'7d2f7567-fb4f-44b0-a098-ddaa81ca7a4f','N')
+;
+
+SELECT register_migration_script('201710251241_IDEMPIERE-3529.sql') FROM dual
+;
--- a/migration/i4.1/oracle/201710311719_IDEMPIERE-1052.sql
+++ b/migration/i4.1/oracle/201710311719_IDEMPIERE-1052.sql
@ -0,0 +1,11 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-1052 Improve Performance using Search instead of Table/Table Direct
+-- Oct 31, 2017 5:15:03 PM CET
+UPDATE AD_Column SET AD_Reference_ID=30, IsUpdateable='N', FKConstraintType=NULL,Updated=TO_DATE('2017-10-31 17:15:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=8814
+;
+
+SELECT register_migration_script('201710311719_IDEMPIERE-1052.sql') FROM dual
+;
+
--- a/migration/i4.1/postgresql/201707041543_IDEMPIERE-3411.sql
+++ b/migration/i4.1/postgresql/201707041543_IDEMPIERE-3411.sql
@ -0,0 +1,7 @@
+-- IDEMPIERE-3411 : When lauching a report based on a report view, available print formats are not filtered
+-- Jul 4, 2017 3:42:50 PM CEST
+INSERT INTO AD_SysConfig (AD_SysConfig_ID,AD_Client_ID,AD_Org_ID,Created,Updated,CreatedBy,UpdatedBy,IsActive,Name,Value,Description,EntityType,ConfigurationLevel,AD_SysConfig_UU) VALUES (200104,0,0,TO_TIMESTAMP('2017-07-04 15:42:49','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2017-07-04 15:42:49','YYYY-MM-DD HH24:MI:SS'),100,100,'Y','ZK_REPORT_ONLY_PRINTFORMAT_LINKEDTO_REPORTVIEW','N','If set to Yes, print formats will be filtered according to the current report view','U','C','18e6758b-db72-480e-b832-72080c8f2268')
+;
+
+SELECT register_migration_script('201707041543_IDEMPIERE-3411.sql') FROM dual
+;
--- a/migration/i4.1/postgresql/201710201214_IDEMPIERE-3521.sql
+++ b/migration/i4.1/postgresql/201710201214_IDEMPIERE-3521.sql
@ -0,0 +1,12 @@
+-- IDEMPIERE-3521 InfoWindow problem on other SQL when make a register count
+-- Oct 20, 2017 12:13:41 PM CEST
+UPDATE AD_Field SET SeqNo=130, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-10-20 12:13:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201634
+;
+
+-- Oct 20, 2017 12:13:43 PM CEST
+UPDATE AD_Field SET SeqNo=120, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-10-20 12:13:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=13579
+;
+
+SELECT register_migration_script('201710201214_IDEMPIERE-3521.sql') FROM dual
+;
+
--- a/migration/i4.1/postgresql/201710231841_IDEMPIERE-3338.sql
+++ b/migration/i4.1/postgresql/201710231841_IDEMPIERE-3338.sql
@ -0,0 +1,8 @@
+-- IDEMPIERE-3338 Document Status Indicator / fix wrong example on GW
+-- Oct 23, 2017 6:41:13 PM CEST
+UPDATE PA_DocumentStatus SET WhereClause='M_InOut.IsSOTrx=''Y'' AND M_InOut.Processed=''N'' AND M_InOut.MovementType IN (''C-'')',Updated=TO_TIMESTAMP('2017-10-23 18:41:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE PA_DocumentStatus_ID=200001
+;
+
+SELECT register_migration_script('201710231841_IDEMPIERE-3338.sql') FROM dual
+;
+
--- a/migration/i4.1/postgresql/201710231915_IDEMPIERE-3173.sql
+++ b/migration/i4.1/postgresql/201710231915_IDEMPIERE-3173.sql
@ -0,0 +1,12 @@
+-- IDEMPIERE-3173 Columns that must not be copied
+-- Oct 23, 2017 7:14:50 PM CEST
+UPDATE AD_Column SET IsAllowCopy='N',Updated=TO_TIMESTAMP('2017-10-23 19:14:50','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200558
+;
+
+-- Oct 23, 2017 7:15:09 PM CEST
+UPDATE AD_Column SET IsAllowCopy='N',Updated=TO_TIMESTAMP('2017-10-23 19:15:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200704
+;
+
+SELECT register_migration_script('201710231915_IDEMPIERE-3173.sql') FROM dual
+;
+
--- a/migration/i4.1/postgresql/201710251241_IDEMPIERE-3529.sql
+++ b/migration/i4.1/postgresql/201710251241_IDEMPIERE-3529.sql
@ -0,0 +1,11 @@
+-- IDEMPIERE-3529 - Add parameters to InvoicePrint process
+-- Oct 25, 2017 12:09:30 PM CEST
+INSERT INTO AD_Process_Para (AD_Process_Para_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,Name,Description,Help,AD_Process_ID,SeqNo,AD_Reference_ID,AD_Reference_Value_ID,IsRange,AD_Val_Rule_ID,FieldLength,IsMandatory,ColumnName,IsCentrallyMaintained,EntityType,AD_Element_ID,AD_Process_Para_UU,IsEncrypted) VALUES (200219,0,0,'Y',TO_TIMESTAMP('2017-10-25 12:09:30','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2017-10-25 12:09:30','YYYY-MM-DD HH24:MI:SS'),100,'Document Type','Document type or rules','The Document Type determines document sequence and processing rules',200,60,19,170,'N',124,0,'N','C_DocType_ID','Y','D',196,'554013bb-d6c0-4795-a9c6-aa2cb6dfc2bf','N')
+;
+
+-- Oct 25, 2017 12:16:28 PM CEST
+INSERT INTO AD_Process_Para (AD_Process_Para_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,Name,Description,AD_Process_ID,SeqNo,AD_Reference_ID,AD_Reference_Value_ID,IsRange,FieldLength,IsMandatory,ColumnName,IsCentrallyMaintained,EntityType,AD_Element_ID,AD_Process_Para_UU,IsEncrypted) VALUES (200220,0,0,'Y',TO_TIMESTAMP('2017-10-25 12:16:28','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2017-10-25 12:16:28','YYYY-MM-DD HH24:MI:SS'),100,'Paid','The document is paid',200,70,17,319,'N',0,'N','IsPaid','Y','D',1402,'7d2f7567-fb4f-44b0-a098-ddaa81ca7a4f','N')
+;
+
+SELECT register_migration_script('201710251241_IDEMPIERE-3529.sql') FROM dual
+;
--- a/migration/i4.1/postgresql/201710311719_IDEMPIERE-1052.sql
+++ b/migration/i4.1/postgresql/201710311719_IDEMPIERE-1052.sql
@ -0,0 +1,8 @@
+-- IDEMPIERE-1052 Improve Performance using Search instead of Table/Table Direct
+-- Oct 31, 2017 5:15:03 PM CET
+UPDATE AD_Column SET AD_Reference_ID=30, IsUpdateable='N', FKConstraintType=NULL,Updated=TO_TIMESTAMP('2017-10-31 17:15:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=8814
+;
+
+SELECT register_migration_script('201710311719_IDEMPIERE-1052.sql') FROM dual
+;
+
--- a/migration/i4.1z/oracle/201710312138_Generate2018GardenWorld.sql
+++ b/migration/i4.1z/oracle/201710312138_Generate2018GardenWorld.sql
--- a/migration/i4.1z/oracle/201710312152_IDEMPIERE-3438.sql
+++ b/migration/i4.1z/oracle/201710312152_IDEMPIERE-3438.sql
@ -0,0 +1,9 @@
+-- IDEMPIERE-3438
+update ad_field set isdisplayedgrid='N' where ad_field_id in (
+204231,
+204253
+);
+
+SELECT register_migration_script('201710312152_IDEMPIERE-3438.sql') FROM dual
+;
+
--- a/migration/i4.1z/oracle/201710312201_IDEMPIERE-3352.sql
+++ b/migration/i4.1z/oracle/201710312201_IDEMPIERE-3352.sql
@ -0,0 +1,8 @@
+-- IDEMPIERE-3352
+update ad_field set entitytype='D' where ad_field_id in (
+204438
+);
+
+SELECT register_migration_script('201710312201_IDEMPIERE-3352.sql') FROM dual
+;
+
--- a/migration/i4.1z/oracle/201710312204_IDEMPIERE-3411.sql
+++ b/migration/i4.1z/oracle/201710312204_IDEMPIERE-3411.sql
@ -0,0 +1,8 @@
+-- IDEMPIERE-3411
+update ad_sysconfig set entitytype='D' where ad_sysconfig_id in (
+200104
+);
+
+SELECT register_migration_script('201710312204_IDEMPIERE-3411.sql') FROM dual
+;
+
--- a/migration/i4.1z/oracle/201710312216_FillUUIDs.sql
+++ b/migration/i4.1z/oracle/201710312216_FillUUIDs.sql
@ -0,0 +1,12 @@
+-- fill UUIDs
+UPDATE ad_treenodemm SET ad_treenodemm_uu='222ca6e9-bb2a-4c2d-872e-2bbd08043288' WHERE ad_tree_id=10 AND node_id=200143;
+
+UPDATE ad_treenodemm SET ad_treenodemm_uu='0e8a37ce-6162-463c-a98c-2c140d92ff27' WHERE ad_tree_id=10 AND node_id=200144;
+
+UPDATE ad_treenodemm SET ad_treenodemm_uu='53a983a3-84a4-4899-ad6a-ee1452b9c610' WHERE ad_tree_id=10 AND node_id=200147;
+
+UPDATE ad_treenodemm SET ad_treenodemm_uu='1b3bc968-83ac-409c-956d-d6d945aa3812' WHERE ad_tree_id=10 AND node_id=200148;
+
+SELECT register_migration_script('201710312216_FillUUIDs.sql') FROM dual
+;
+
--- a/migration/i4.1z/oracle/201710312225_MissingForeignKeys.sql
+++ b/migration/i4.1z/oracle/201710312225_MissingForeignKeys.sql
@ -0,0 +1,8 @@
+-- missing foreign keys
+ALTER TABLE AD_Column ADD CONSTRAINT PADashboardContent_ADColumn FOREIGN KEY (PA_DashboardContent_ID) REFERENCES PA_DashboardContent DEFERRABLE INITIALLY DEFERRED;
+
+ALTER TABLE AD_WF_Node ADD CONSTRAINT ADInfoWindow_ADWFNode FOREIGN KEY (AD_InfoWindow_ID) REFERENCES AD_InfoWindow DEFERRABLE INITIALLY DEFERRED;
+
+SELECT register_migration_script('201710312225_MissingForeignKeys.sql') FROM dual
+;
+
--- a/migration/i4.1z/oracle/201710312359_Version.sql
+++ b/migration/i4.1z/oracle/201710312359_Version.sql
@ -0,0 +1,12 @@
+UPDATE AD_SYSTEM
+   SET releaseno = '5.1',
+       VERSION = '2017-10-31'
+ WHERE ad_system_id = 0 AND ad_client_id = 0
+;
+
+COMMIT
+;
+
+SELECT register_migration_script('201710312359_Version.sql') FROM dual
+;
+
--- a/migration/i4.1z/postgresql/201710312138_Generate2018GardenWorld.sql
+++ b/migration/i4.1z/postgresql/201710312138_Generate2018GardenWorld.sql
--- a/migration/i4.1z/postgresql/201710312152_IDEMPIERE-3438.sql
+++ b/migration/i4.1z/postgresql/201710312152_IDEMPIERE-3438.sql
@ -0,0 +1,9 @@
+-- IDEMPIERE-3438
+update ad_field set isdisplayedgrid='N' where ad_field_id in (
+204231,
+204253
+);
+
+SELECT register_migration_script('201710312152_IDEMPIERE-3438.sql') FROM dual
+;
+
--- a/migration/i4.1z/postgresql/201710312201_IDEMPIERE-3352.sql
+++ b/migration/i4.1z/postgresql/201710312201_IDEMPIERE-3352.sql
@ -0,0 +1,8 @@
+-- IDEMPIERE-3352
+update ad_field set entitytype='D' where ad_field_id in (
+204438
+);
+
+SELECT register_migration_script('201710312201_IDEMPIERE-3352.sql') FROM dual
+;
+
--- a/migration/i4.1z/postgresql/201710312204_IDEMPIERE-3411.sql
+++ b/migration/i4.1z/postgresql/201710312204_IDEMPIERE-3411.sql
@ -0,0 +1,8 @@
+-- IDEMPIERE-3411
+update ad_sysconfig set entitytype='D' where ad_sysconfig_id in (
+200104
+);
+
+SELECT register_migration_script('201710312204_IDEMPIERE-3411.sql') FROM dual
+;
+
--- a/migration/i4.1z/postgresql/201710312216_FillUUIDs.sql
+++ b/migration/i4.1z/postgresql/201710312216_FillUUIDs.sql
@ -0,0 +1,12 @@
+-- fill UUIDs
+UPDATE ad_treenodemm SET ad_treenodemm_uu='222ca6e9-bb2a-4c2d-872e-2bbd08043288' WHERE ad_tree_id=10 AND node_id=200143;
+
+UPDATE ad_treenodemm SET ad_treenodemm_uu='0e8a37ce-6162-463c-a98c-2c140d92ff27' WHERE ad_tree_id=10 AND node_id=200144;
+
+UPDATE ad_treenodemm SET ad_treenodemm_uu='53a983a3-84a4-4899-ad6a-ee1452b9c610' WHERE ad_tree_id=10 AND node_id=200147;
+
+UPDATE ad_treenodemm SET ad_treenodemm_uu='1b3bc968-83ac-409c-956d-d6d945aa3812' WHERE ad_tree_id=10 AND node_id=200148;
+
+SELECT register_migration_script('201710312216_FillUUIDs.sql') FROM dual
+;
+
--- a/migration/i4.1z/postgresql/201710312225_MissingForeignKeys.sql
+++ b/migration/i4.1z/postgresql/201710312225_MissingForeignKeys.sql
@ -0,0 +1,8 @@
+-- missing foreign keys
+ALTER TABLE AD_Column ADD CONSTRAINT PADashboardContent_ADColumn FOREIGN KEY (PA_DashboardContent_ID) REFERENCES PA_DashboardContent DEFERRABLE INITIALLY DEFERRED;
+
+ALTER TABLE AD_WF_Node ADD CONSTRAINT ADInfoWindow_ADWFNode FOREIGN KEY (AD_InfoWindow_ID) REFERENCES AD_InfoWindow DEFERRABLE INITIALLY DEFERRED;
+
+SELECT register_migration_script('201710312225_MissingForeignKeys.sql') FROM dual
+;
+
--- a/migration/i4.1z/postgresql/201710312359_Version.sql
+++ b/migration/i4.1z/postgresql/201710312359_Version.sql
@ -0,0 +1,9 @@
+UPDATE AD_SYSTEM
+   SET releaseno = '5.1',
+       VERSION = '2017-10-31'
+ WHERE ad_system_id = 0 AND ad_client_id = 0
+;
+
+SELECT register_migration_script('201710312359_Version.sql') FROM dual
+;
+
--- a/migration/i5.1/oracle/201512121402_IDEMPIERE-2970.sql
+++ b/migration/i5.1/oracle/201512121402_IDEMPIERE-2970.sql
@ -0,0 +1,15 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-2970 Display URL in the Record info panel
+-- Dec 12, 2015 2:00:57 PM COT
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','Permalink',0,0,'Y',TO_DATE('2015-12-12 14:00:57','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2015-12-12 14:00:57','YYYY-MM-DD HH24:MI:SS'),100,200369,'Permalink','D','df044d1d-59d8-4d56-85ef-66c459cf45ea')
+;
+
+-- Dec 12, 2015 2:02:04 PM COT
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','Right click and copy link for a permanent link to this record.',0,0,'Y',TO_DATE('2015-12-12 14:02:03','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2015-12-12 14:02:03','YYYY-MM-DD HH24:MI:SS'),100,200370,'Permalink_tooltip','D','cec80265-768c-495c-be62-1a321d356c3c')
+;
+
+SELECT register_migration_script('201512121402_IDEMPIERE-2970.sql') FROM dual
+;
+
--- a/migration/i5.1/oracle/201706221744_AutomaticExternalPackin.sql
+++ b/migration/i5.1/oracle/201706221744_AutomaticExternalPackin.sql
@ -0,0 +1,15 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- Jun 22, 2017 5:41:04 PM CEST
+-- Automatic Packin
+INSERT INTO AD_SysConfig (AD_SysConfig_ID,ConfigurationLevel,Updated,Value,Description,AD_SysConfig_UU,IsActive,Name,Created,AD_Org_ID,CreatedBy,UpdatedBy,AD_Client_ID,EntityType) VALUES (200101,'S',TO_DATE('2017-06-22 17:41:03','YYYY-MM-DD HH24:MI:SS'),'120','Delay in seconds to start applying the external automatic packin - see AUTOMATIC_PACKIN_FOLDERS','7db52ef2-ce9e-4989-b583-b64429fca5c8','Y','AUTOMATIC_PACKIN_INITIAL_DELAY',TO_DATE('2017-06-22 17:41:03','YYYY-MM-DD HH24:MI:SS'),0,100,100,0,'D')
+;
+
+-- Jun 22, 2017 5:44:09 PM CEST
+INSERT INTO AD_SysConfig (AD_SysConfig_ID,ConfigurationLevel,Updated,Value,Description,AD_SysConfig_UU,IsActive,Name,Created,AD_Org_ID,CreatedBy,UpdatedBy,AD_Client_ID,EntityType) VALUES (200102,'S',TO_DATE('2017-06-22 17:44:09','YYYY-MM-DD HH24:MI:SS'),' ','List of folders separated by semicolon (;) - allowed is .zip file or folder containing .zip files (recursive) - filename notation yyyymmddHHMM_ClientValue_InformationalDescription.zip','5468245a-0bb1-4357-b293-2ffb81c7cf2d','Y','AUTOMATIC_PACKIN_FOLDERS',TO_DATE('2017-06-22 17:44:09','YYYY-MM-DD HH24:MI:SS'),0,100,100,0,'D')
+;
+
+SELECT register_migration_script('201706221744_AutomaticExternalPackin.sql') FROM dual
+;
+
--- a/migration/i5.1/oracle/201709131604_IDEMPIERE-3486.sql
+++ b/migration/i5.1/oracle/201709131604_IDEMPIERE-3486.sql
@ -0,0 +1,14 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-3486 add default logic for customize and vendor parameter
+-- Sep 13, 2017 9:25:06 PM ICT
+UPDATE AD_InfoColumn SET DefaultValue='@IsSOTrx@',Updated=TO_DATE('2017-09-13 21:25:06','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_InfoColumn_ID=200036
+;
+
+-- Sep 13, 2017 9:25:14 PM ICT
+UPDATE AD_InfoColumn SET DefaultValue='@SQL=SELECT CASE ''@IsSOTrx@'' WHEN '''' THEN '''' WHEN ''N'' THEN ''Y'' ELSE ''N'' END AS DefaultValue FROM DUAL',Updated=TO_DATE('2017-09-13 21:25:14','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_InfoColumn_ID=200037
+;
+
+SELECT register_migration_script('201709131604_IDEMPIERE-3486.sql') FROM dual
+;
--- a/migration/i5.1/oracle/201709181100_Ticket_1008477.sql
+++ b/migration/i5.1/oracle/201709181100_Ticket_1008477.sql
@ -0,0 +1,11 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- Sep 18, 2017 12:37:19 PM GMT+08:00
+-- 1008477 List on Position field in Lead window is blank even if there are position options configured.
+UPDATE AD_Val_Rule SET Code='((C_Job.IsEmployee=(SELECT IsEmployee FROM C_BPartner WHERE C_BPartner_ID=@C_BPartner_ID:0@)) OR (C_Job.IsEmployee=''N'' AND @C_BPartner_ID:0@=0))',Updated=TO_DATE('2017-09-18 12:37:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Val_Rule_ID=243
+;
+
+SELECT register_migration_script('201709181100_Ticket_1008477.sql') FROM dual
+;
+
--- a/migration/i5.1/oracle/201710271720_IDEMPIERE-3532.sql
+++ b/migration/i5.1/oracle/201710271720_IDEMPIERE-3532.sql
@ -0,0 +1,34 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-3532 - Remove hardcoded values for InfoInvoiceWindow (BPartnerID / IsSOTrx) and InfoPaymentWindow (IsSOTrx)
+-- Oct 27, 2017 5:16:11 PM CEST
+UPDATE AD_InfoColumn SET DefaultValue='@C_BPartner_ID@',Updated=TO_DATE('2017-10-27 17:16:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_InfoColumn_ID=200052
+;
+
+-- Oct 27, 2017 5:16:25 PM CEST
+UPDATE AD_InfoColumn SET DefaultValue='@IsSOTrx:Y@',Updated=TO_DATE('2017-10-27 17:16:25','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_InfoColumn_ID=200066
+;
+
+-- Oct 27, 2017 5:17:29 PM CEST
+UPDATE AD_InfoColumn SET DefaultValue='@IsSOTrx:Y@',Updated=TO_DATE('2017-10-27 17:17:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_InfoColumn_ID=200085
+;
+
+-- Nov 8, 2017 11:04:30 AM CET
+UPDATE AD_InfoColumn SET DefaultValue='@C_BPartner_ID@',Updated=TO_DATE('2017-11-08 11:04:30','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_InfoColumn_ID=200039
+;
+
+-- Nov 8, 2017 11:04:58 AM CET
+UPDATE AD_InfoColumn SET DefaultValue='@IsSOTrx:Y@',Updated=TO_DATE('2017-11-08 11:04:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_InfoColumn_ID=200051
+;
+
+-- Nov 8, 2017 11:05:07 AM CET
+UPDATE AD_InfoColumn SET DefaultValue='@IsSOTrx:Y@',Updated=TO_DATE('2017-11-08 11:05:07','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_InfoColumn_ID=200078
+;
+
+-- Nov 8, 2017 11:07:22 AM CET
+UPDATE AD_InfoColumn SET DefaultValue='@SQL=SELECT CASE ''@BaseTable_ID:0@'' WHEN ''335'' THEN ''N'' ELSE '''' END AS DefaultValue FROM DUAL',Updated=TO_DATE('2017-11-08 11:07:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_InfoColumn_ID=200065
+;
+
+SELECT register_migration_script('201710271720_IDEMPIERE-3532.sql') FROM dual
+;
--- a/migration/i5.1/oracle/201711061600_IDEMPIERE-3546.sql
+++ b/migration/i5.1/oracle/201711061600_IDEMPIERE-3546.sql
@ -0,0 +1,26 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-3546 - Use specific messages for range process parameters placeholder
+-- Nov 6, 2017 4:07:29 PM CET
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','From',0,0,'Y',TO_DATE('2017-11-06 16:07:28','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2017-11-06 16:07:28','YYYY-MM-DD HH24:MI:SS'),0,200438,'ProcessParameterRangeFrom','D','44852250-153e-462a-b206-897d0c2cd1ab')
+;
+
+-- Nov 6, 2017 4:07:42 PM CET
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','To',0,0,'Y',TO_DATE('2017-11-06 16:07:42','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2017-11-06 16:07:42','YYYY-MM-DD HH24:MI:SS'),0,200439,'ProcessParameterRangeTo','D','07220887-ecb2-42e9-9665-260041080b52')
+;
+
+INSERT INTO ad_message_trl
+(ad_message_id, ad_language, ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby, msgtext, msgtip, istranslated, ad_message_trl_uu)
+SELECT 200438, ad_language, ad_client_id, ad_org_id, isactive, SysDate, 100, SysDate, 100, msgtext, msgtip, istranslated, generate_uuid()
+FROM ad_message_trl
+WHERE ad_message_id=280;
+
+INSERT INTO ad_message_trl
+(ad_message_id, ad_language, ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby, msgtext, msgtip, istranslated, ad_message_trl_uu)
+SELECT 200439, ad_language, ad_client_id, ad_org_id, isactive, SysDate, 100, SysDate, 100, msgtext, msgtip, istranslated, generate_uuid()
+FROM ad_message_trl
+WHERE ad_message_id=565;
+
+SELECT register_migration_script('201711061600_IDEMPIERE-3546.sql') FROM dual
+;
--- a/migration/i5.1/oracle/201711061621_IDEMPIERE-3547.sql
+++ b/migration/i5.1/oracle/201711061621_IDEMPIERE-3547.sql
@ -0,0 +1,31 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-3547 Mismatches in oracle foreign keys delete rule
+-- Nov 6, 2017 4:21:15 PM CET
+ALTER TABLE C_OrderLine DROP CONSTRAINT linkorderline_corderline
+;
+
+-- Nov 6, 2017 4:21:15 PM CET
+ALTER TABLE C_OrderLine ADD CONSTRAINT linkorderline_corderline FOREIGN KEY (Link_OrderLine_ID) REFERENCES c_orderline(c_orderline_id) DEFERRABLE INITIALLY DEFERRED
+;
+
+-- Nov 6, 2017 4:21:26 PM CET
+ALTER TABLE A_Asset_Acct DROP CONSTRAINT aasset_aassetacct
+;
+
+-- Nov 6, 2017 4:21:26 PM CET
+ALTER TABLE A_Asset_Acct ADD CONSTRAINT aasset_aassetacct FOREIGN KEY (A_Asset_ID) REFERENCES a_asset(a_asset_id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED
+;
+
+-- Nov 6, 2017 4:21:36 PM CET
+ALTER TABLE A_Asset_Group_Acct DROP CONSTRAINT aassetgroup_aassetgroupacct
+;
+
+-- Nov 6, 2017 4:21:36 PM CET
+ALTER TABLE A_Asset_Group_Acct ADD CONSTRAINT aassetgroup_aassetgroupacct FOREIGN KEY (A_Asset_Group_ID) REFERENCES a_asset_group(a_asset_group_id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED
+;
+
+SELECT register_migration_script('201711061621_IDEMPIERE-3547.sql') FROM dual
+;
+
--- a/migration/i5.1/oracle/201711071510_IDEMPIERE-905.sql
+++ b/migration/i5.1/oracle/201711071510_IDEMPIERE-905.sql
@ -0,0 +1,27 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-905 Post-it functionality
+-- Nov 7, 2017 3:09:53 PM CET
+UPDATE AD_Element SET ColumnName='AD_PostIt_ID',Updated=TO_DATE('2017-11-07 15:09:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=203056
+;
+
+-- Nov 7, 2017 3:09:53 PM CET
+UPDATE AD_Column SET ColumnName='AD_PostIt_ID', Name='Post-it', Description=NULL, Help=NULL WHERE AD_Element_ID=203056
+;
+
+-- Nov 7, 2017 3:09:53 PM CET
+UPDATE AD_Process_Para SET ColumnName='AD_PostIt_ID', Name='Post-it', Description=NULL, Help=NULL, AD_Element_ID=203056 WHERE UPPER(ColumnName)='AD_POSTIT_ID' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL
+;
+
+-- Nov 7, 2017 3:09:53 PM CET
+UPDATE AD_Process_Para SET ColumnName='AD_PostIt_ID', Name='Post-it', Description=NULL, Help=NULL WHERE AD_Element_ID=203056 AND IsCentrallyMaintained='Y'
+;
+
+-- Nov 7, 2017 3:09:53 PM CET
+UPDATE AD_InfoColumn SET ColumnName='AD_PostIt_ID', Name='Post-it', Description=NULL, Help=NULL WHERE AD_Element_ID=203056 AND IsCentrallyMaintained='Y'
+;
+
+SELECT register_migration_script('201711071510_IDEMPIERE-905.sql') FROM dual
+;
+
--- a/migration/i5.1/oracle/201711211700_IDEMPIERE-1052.sql
+++ b/migration/i5.1/oracle/201711211700_IDEMPIERE-1052.sql
@ -0,0 +1,18 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-1052
+-- Nov 23, 2017 3:40:33 PM CET
+UPDATE AD_Column SET AD_Reference_ID=30, IsUpdateable='N',Updated=TO_DATE('2017-11-23 15:40:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=1638
+;
+
+-- Nov 23, 2017 3:40:49 PM CET
+UPDATE AD_Column SET AD_Reference_ID=30, IsUpdateable='N',Updated=TO_DATE('2017-11-23 15:40:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=1667
+;
+
+-- Nov 23, 2017 3:41:06 PM CET
+UPDATE AD_Column SET AD_Reference_ID=30, IsUpdateable='N',Updated=TO_DATE('2017-11-23 15:41:06','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=4934
+;
+
+SELECT register_migration_script('201711211700_IDEMPIERE-1052.sql') FROM dual
+;
--- a/migration/i5.1/oracle/201712141459_IDEMPIERE-3388.sql
+++ b/migration/i5.1/oracle/201712141459_IDEMPIERE-3388.sql
@ -0,0 +1,15 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-3388
+-- Dec 14, 2017 2:58:05 PM CET
+UPDATE C_AcctSchema SET CostingMethod='A',Updated=TO_DATE('2017-12-14 14:58:05','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE C_AcctSchema_ID=101
+;
+
+-- Dec 14, 2017 2:58:14 PM CET
+UPDATE M_CostElement SET IsActive='N',Updated=TO_DATE('2017-12-14 14:58:14','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE M_CostElement_ID=104
+;
+
+SELECT register_migration_script('201712141459_IDEMPIERE-3388.sql') FROM dual
+;
+
--- a/migration/i5.1/oracle/201712151351_MinorHelpFix.sql
+++ b/migration/i5.1/oracle/201712151351_MinorHelpFix.sql
@ -0,0 +1,16 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- Fix help of form Merge Entities wrongly formatted breaking the wiki manual
+-- Dec 15, 2017 1:49:32 PM CET
+UPDATE AD_Form SET Help='<i>Dangerous - Please are aware of what you are doing!</i>
+All instances of the From entity (e.g. Customer A) are changed to the To entity (e.g. Customer B). 
+The From entity (e.g. Customer A) is deleted. 
+<p><b>There is NO undo nor trace !  Please do a backup first</b> Please be aware that you may be changing history records (e.g. invoices, etc.) ! </p>
+<p><b>Side effects:</b> Merging Products are likely to distort product costs; Merging Business Partners may result in incorrect open item balance. Check with support on remedies.</p>
+<p><b>Restrictions:</b> Accounting and Inventory conflicts are not resolved in this version.</p>',Updated=TO_DATE('2017-12-15 13:49:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Form_ID=112
+;
+
+SELECT register_migration_script('201712151351_MinorHelpFix.sql') FROM dual
+;
+
--- a/migration/i5.1/oracle/201712161006_IDEMPIERE-1721.sql
+++ b/migration/i5.1/oracle/201712161006_IDEMPIERE-1721.sql
@ -0,0 +1,15 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-1721 Window Position, tab Remuneration, refers to a disabled window
+-- Dec 16, 2017 10:04:11 AM CET
+UPDATE AD_Window SET IsActive='Y', IsBetaFunctionality='N',Updated=TO_DATE('2017-12-16 10:04:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Window_ID=353
+;
+
+-- Dec 16, 2017 10:04:11 AM CET
+UPDATE AD_Menu SET Name='Remuneration', Description='Maintain Remuneration', IsActive='Y',Updated=TO_DATE('2017-12-16 10:04:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=532
+;
+
+SELECT register_migration_script('201712161006_IDEMPIERE-1721.sql') FROM dual
+;
+
--- a/migration/i5.1/oracle/201712161023_IDEMPIERE-3358.sql
+++ b/migration/i5.1/oracle/201712161023_IDEMPIERE-3358.sql
@ -0,0 +1,15 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-3358 Dictionary fixes
+-- Dec 16, 2017 10:22:29 AM CET
+UPDATE AD_Field SET IsReadOnly='N', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2017-12-16 10:22:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202750
+;
+
+-- Dec 16, 2017 10:22:42 AM CET
+UPDATE AD_Field SET IsReadOnly='N', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2017-12-16 10:22:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202776
+;
+
+SELECT register_migration_script('201712161023_IDEMPIERE-3358.sql') FROM dual
+;
+
--- a/migration/i5.1/oracle/201712290930_IDEMPIERE-3589.sql
+++ b/migration/i5.1/oracle/201712290930_IDEMPIERE-3589.sql
@ -0,0 +1,10 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-3589 Add a 'Warning' Message
+-- Dec 29, 2017 9:22:30 AM CET
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','Warning',0,0,'Y',TO_DATE('2017-12-29 09:22:30','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2017-12-29 09:22:30','YYYY-MM-DD HH24:MI:SS'),0,200442,'Warning','D','ef025d76-6391-4a0c-88c0-64d12196b53e')
+;
+
+SELECT register_migration_script('201712290930_IDEMPIERE-3589.sql') FROM dual
+;
--- a/migration/i5.1/oracle/201801111909_IDEMPIERE-3529.sql
+++ b/migration/i5.1/oracle/201801111909_IDEMPIERE-3529.sql
@ -0,0 +1,22 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-3529 Add parameters to InvoicePrint process
+-- Jan 11, 2018 7:02:29 PM CET
+INSERT INTO AD_Process_Para (AD_Process_Para_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,Name,Description,Help,AD_Process_ID,SeqNo,AD_Reference_ID,AD_Reference_Value_ID,IsRange,FieldLength,IsMandatory,ColumnName,IsCentrallyMaintained,EntityType,AD_Element_ID,AD_Process_Para_UU,IsEncrypted) VALUES (200222,0,0,'Y',TO_DATE('2018-01-11 19:02:28','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-01-11 19:02:28','YYYY-MM-DD HH24:MI:SS'),100,'Printed','Indicates if this document / line is printed','The Printed checkbox indicates if this document or line will included when printing.',200,80,17,319,'N',0,'N','IsPrinted','Y','D',399,'24d72545-9015-4b87-921d-7de97eaa5079','N')
+;
+
+-- Jan 11, 2018 7:03:51 PM CET
+INSERT INTO AD_Process_Para (AD_Process_Para_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,Name,Description,Help,AD_Process_ID,SeqNo,AD_Reference_ID,IsRange,FieldLength,IsMandatory,ColumnName,IsCentrallyMaintained,EntityType,AD_Element_ID,AD_Process_Para_UU,IsEncrypted) VALUES (200223,0,0,'Y',TO_DATE('2018-01-11 19:03:50','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-01-11 19:03:50','YYYY-MM-DD HH24:MI:SS'),100,'Payment Rule','How you pay the invoice','The Payment Rule indicates the method of invoice payment.',200,90,200012,'N',1,'N','PaymentRule','Y','D',1143,'d7b2cef8-86cc-4a2d-91c2-ea452a71ffa3','N')
+;
+
+-- Jan 11, 2018 7:05:08 PM CET
+INSERT INTO AD_Process_Para (AD_Process_Para_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,Name,Description,Help,AD_Process_ID,SeqNo,AD_Reference_ID,IsRange,AD_Val_Rule_ID,FieldLength,IsMandatory,ColumnName,IsCentrallyMaintained,EntityType,AD_Element_ID,AD_Process_Para_UU,IsEncrypted) VALUES (200224,0,0,'Y',TO_DATE('2018-01-11 19:05:07','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-01-11 19:05:07','YYYY-MM-DD HH24:MI:SS'),100,'Payment Term','The terms of Payment (timing, discount)','Payment Terms identify the method and timing of payment.',200,100,19,'N',52098,22,'N','C_PaymentTerm_ID','Y','D',204,'77ec6576-ac60-48b8-a072-63af04afd7b5','N')
+;
+
+-- Jan 11, 2018 7:06:08 PM CET
+INSERT INTO AD_Process_Para (AD_Process_Para_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,Name,Description,Help,AD_Process_ID,SeqNo,AD_Reference_ID,AD_Reference_Value_ID,IsRange,FieldLength,IsMandatory,ColumnName,IsCentrallyMaintained,EntityType,AD_Element_ID,AD_Process_Para_UU,IsEncrypted) VALUES (200225,0,0,'Y',TO_DATE('2018-01-11 19:06:07','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-01-11 19:06:07','YYYY-MM-DD HH24:MI:SS'),100,'Document Status','The current status of the document','The Document Status indicates the status of a document at this time.  If you want to change the document status, use the Document Action field',200,110,17,131,'N',0,'N','DocStatus','Y','D',289,'409de69f-31b2-4742-8339-7a0a30272480','N')
+;
+
+SELECT register_migration_script('201801111909_IDEMPIERE-3529.sql') FROM dual
+;
--- a/migration/i5.1/oracle/201801191815_IDEMPIERE-3580.sql
+++ b/migration/i5.1/oracle/201801191815_IDEMPIERE-3580.sql
@ -0,0 +1,43 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-3580 Advanced Zoom Across
+-- Jan 19, 2018 6:08:19 PM CET
+INSERT INTO AD_SysConfig (AD_SysConfig_ID,AD_Client_ID,AD_Org_ID,Created,Updated,CreatedBy,UpdatedBy,IsActive,Name,Value,Description,EntityType,ConfigurationLevel,AD_SysConfig_UU) VALUES (200113,0,0,TO_DATE('2018-01-19 18:08:19','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2018-01-19 18:08:19','YYYY-MM-DD HH24:MI:SS'),100,100,'Y','ZOOM_ACROSS_QUERY_TIMEOUT','5','Timeout in seconds for the count queries ran when pushing the button Zoom Across','D','C','a1f85478-e2d8-4c78-98ab-283f74e090ec')
+;
+
+-- Jan 19, 2018 6:10:52 PM CET
+INSERT INTO AD_Element (AD_Element_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,ColumnName,Name,Description,Help,PrintName,EntityType,AD_Element_UU) VALUES (203157,0,0,'Y',TO_DATE('2018-01-19 18:09:06','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-01-19 18:09:06','YYYY-MM-DD HH24:MI:SS'),100,'IsDetailedZoomAcross','Detailed Zoom Across',NULL,'The toolbar button zoom across discover where the record on screen is used on first tabs of windows.  With detailed zoom across it goes deeper in the discovery of relationships within detailed tabs.','Detailed Zoom Across','D','58745104-ed8b-459c-aed8-6a9d9c4e33a1')
+;
+
+-- Jan 19, 2018 6:11:25 PM CET
+INSERT INTO AD_Column (AD_Column_ID,Version,Name,Help,AD_Table_ID,ColumnName,DefaultValue,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,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,SeqNoSelection,IsToolbarButton,IsSecure) VALUES (213339,0,'Detailed Zoom Across','The toolbar button zoom across discover where the record on screen is used on first tabs of windows.  With detailed zoom across it goes deeper in the discovery of relationships within detailed tabs.',200174,'IsDetailedZoomAcross','N',1,'N','N','N','N','N',0,'N',20,0,0,'Y',TO_DATE('2018-01-19 18:11:24','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-01-19 18:11:24','YYYY-MM-DD HH24:MI:SS'),100,203157,'Y','N','D','N','N','N','Y','c2e13243-17fa-45f4-9135-4fb4d1572664','Y',0,'N','N')
+;
+
+-- Jan 19, 2018 6:11:30 PM CET
+ALTER TABLE AD_UserPreference ADD IsDetailedZoomAcross CHAR(1) DEFAULT 'N' CHECK (IsDetailedZoomAcross IN ('Y','N'))
+;
+
+-- Jan 19, 2018 6:11:39 PM CET
+INSERT INTO AD_Field (AD_Field_ID,Name,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,XPosition,ColumnSpan) VALUES (205303,'Detailed Zoom Across','The toolbar button zoom across discover where the record on screen is used on first tabs of windows.  With detailed zoom across it goes deeper in the discovery of relationships within detailed tabs.',200189,213339,'Y',1,90,'N','N','N','N',0,0,'Y',TO_DATE('2018-01-19 18:11:39','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-01-19 18:11:39','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','D','6c0b384b-f05e-4843-8b0e-eb15e2ee81d2','Y',90,2,2)
+;
+
+-- Jan 19, 2018 6:13:19 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=50, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=5, ColumnSpan=1, IsToolbarButton=NULL,Updated=TO_DATE('2018-01-19 18:13:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=203797
+;
+
+-- Jan 19, 2018 6:13:19 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=70, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=5, ColumnSpan=1, IsToolbarButton=NULL,Updated=TO_DATE('2018-01-19 18:13:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205303
+;
+
+-- Jan 19, 2018 6:13:19 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=80, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=1, ColumnSpan=1, IsToolbarButton=NULL,Updated=TO_DATE('2018-01-19 18:13:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=203800
+;
+
+-- Jan 19, 2018 6:13:19 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=90, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=2, ColumnSpan=1, IsToolbarButton=NULL,Updated=TO_DATE('2018-01-19 18:13:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=203798
+;
+
+SELECT register_migration_script('201801191815_IDEMPIERE-3580.sql') FROM dual
+;
+
--- a/migration/i5.1/oracle/201801192257_IDEMPIERE-1906.sql
+++ b/migration/i5.1/oracle/201801192257_IDEMPIERE-1906.sql
@ -0,0 +1,35 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-1906 Use postgresql SIMILAR TO instead of LIKE
+-- Jan 19, 2018 10:55:51 PM CET
+INSERT INTO AD_Element (AD_Element_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,ColumnName,Name,Description,Help,PrintName,EntityType,AD_Element_UU) VALUES (203158,0,0,'Y',TO_DATE('2018-01-19 22:54:41','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-01-19 22:54:41','YYYY-MM-DD HH24:MI:SS'),100,'IsUseSimilarTo','Use Similar To',NULL,'In PostgreSQL database enable using the more powerful SIMILAR TO instead of LIKE for matching queries.','Use Similar To','D','6917772a-f465-411c-95ed-8a834249a578')
+;
+
+-- Jan 19, 2018 10:56:06 PM CET
+INSERT INTO AD_Column (AD_Column_ID,Version,Name,Help,AD_Table_ID,ColumnName,DefaultValue,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,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,SeqNoSelection,IsToolbarButton,IsSecure) VALUES (213340,0,'Use Similar To','In PostgreSQL database enable using the more powerful SIMILAR TO instead of LIKE for matching queries.',200174,'IsUseSimilarTo','N',1,'N','N','N','N','N',0,'N',20,0,0,'Y',TO_DATE('2018-01-19 22:56:06','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-01-19 22:56:06','YYYY-MM-DD HH24:MI:SS'),100,203158,'Y','N','D','N','N','N','Y','81564050-9da4-492f-b298-cf8aac897583','Y',0,'N','N')
+;
+
+-- Jan 19, 2018 10:56:07 PM CET
+ALTER TABLE AD_UserPreference ADD IsUseSimilarTo CHAR(1) DEFAULT 'N' CHECK (IsUseSimilarTo IN ('Y','N'))
+;
+
+-- Jan 19, 2018 10:56:20 PM CET
+INSERT INTO AD_Field (AD_Field_ID,Name,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,XPosition,ColumnSpan) VALUES (205304,'Use Similar To','In PostgreSQL database enable using the more powerful SIMILAR TO instead of LIKE for matching queries.',200189,213340,'Y',1,100,'N','N','N','N',0,0,'Y',TO_DATE('2018-01-19 22:56:20','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-01-19 22:56:20','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','D','92dd69a0-5640-41d9-b26f-2546a71eb75b','Y',100,2,2)
+;
+
+-- Jan 19, 2018 10:56:41 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=90, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=5, IsToolbarButton=NULL,Updated=TO_DATE('2018-01-19 22:56:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205304
+;
+
+-- Jan 19, 2018 10:56:41 PM CET
+UPDATE AD_Field SET SeqNo=100, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-01-19 22:56:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=203798
+;
+
+-- Jan 19, 2018 10:59:21 PM CET
+UPDATE AD_Field SET DisplayLogic='@#DBType@=PostgreSQL', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-01-19 22:59:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205304
+;
+
+SELECT register_migration_script('201801192257_IDEMPIERE-1906.sql') FROM dual
+;
+
--- a/migration/i5.1/oracle/build.xml
+++ b/migration/i5.1/oracle/build.xml
--- a/migration/i5.1/postgresql/201512121402_IDEMPIERE-2970.sql
+++ b/migration/i5.1/postgresql/201512121402_IDEMPIERE-2970.sql
@ -0,0 +1,12 @@
+-- IDEMPIERE-2970 Display URL in the Record info panel
+-- Dec 12, 2015 2:00:57 PM COT
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','Permalink',0,0,'Y',TO_TIMESTAMP('2015-12-12 14:00:57','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2015-12-12 14:00:57','YYYY-MM-DD HH24:MI:SS'),100,200369,'Permalink','D','df044d1d-59d8-4d56-85ef-66c459cf45ea')
+;
+
+-- Dec 12, 2015 2:02:04 PM COT
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','Right click and copy link for a permanent link to this record.',0,0,'Y',TO_TIMESTAMP('2015-12-12 14:02:03','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2015-12-12 14:02:03','YYYY-MM-DD HH24:MI:SS'),100,200370,'Permalink_tooltip','D','cec80265-768c-495c-be62-1a321d356c3c')
+;
+
+SELECT register_migration_script('201512121402_IDEMPIERE-2970.sql') FROM dual
+;
+
--- a/migration/i5.1/postgresql/201706221744_AutomaticExternalPackin.sql
+++ b/migration/i5.1/postgresql/201706221744_AutomaticExternalPackin.sql
@ -0,0 +1,12 @@
+-- Jun 22, 2017 5:41:04 PM CEST
+-- Automatic Packin
+INSERT INTO AD_SysConfig (AD_SysConfig_ID,ConfigurationLevel,Updated,Value,Description,AD_SysConfig_UU,IsActive,Name,Created,AD_Org_ID,CreatedBy,UpdatedBy,AD_Client_ID,EntityType) VALUES (200101,'S',TO_TIMESTAMP('2017-06-22 17:41:03','YYYY-MM-DD HH24:MI:SS'),'120','Delay in seconds to start applying the external automatic packin - see AUTOMATIC_PACKIN_FOLDERS','7db52ef2-ce9e-4989-b583-b64429fca5c8','Y','AUTOMATIC_PACKIN_INITIAL_DELAY',TO_TIMESTAMP('2017-06-22 17:41:03','YYYY-MM-DD HH24:MI:SS'),0,100,100,0,'D')
+;
+
+-- Jun 22, 2017 5:44:09 PM CEST
+INSERT INTO AD_SysConfig (AD_SysConfig_ID,ConfigurationLevel,Updated,Value,Description,AD_SysConfig_UU,IsActive,Name,Created,AD_Org_ID,CreatedBy,UpdatedBy,AD_Client_ID,EntityType) VALUES (200102,'S',TO_TIMESTAMP('2017-06-22 17:44:09','YYYY-MM-DD HH24:MI:SS'),' ','List of folders separated by semicolon (;) - allowed is .zip file or folder containing .zip files (recursive) - filename notation yyyymmddHHMM_ClientValue_InformationalDescription.zip','5468245a-0bb1-4357-b293-2ffb81c7cf2d','Y','AUTOMATIC_PACKIN_FOLDERS',TO_TIMESTAMP('2017-06-22 17:44:09','YYYY-MM-DD HH24:MI:SS'),0,100,100,0,'D')
+;
+
+SELECT register_migration_script('201706221744_AutomaticExternalPackin.sql') FROM dual
+;
+
--- a/migration/i5.1/postgresql/201709131604_IDEMPIERE-3486.sql
+++ b/migration/i5.1/postgresql/201709131604_IDEMPIERE-3486.sql
@ -0,0 +1,11 @@
+-- IDEMPIERE-3486 add default logic for customize and vendor parameter
+-- Sep 13, 2017 9:25:06 PM ICT
+UPDATE AD_InfoColumn SET DefaultValue='@IsSOTrx@',Updated=TO_TIMESTAMP('2017-09-13 21:25:06','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_InfoColumn_ID=200036
+;
+
+-- Sep 13, 2017 9:25:14 PM ICT
+UPDATE AD_InfoColumn SET DefaultValue='@SQL=SELECT CASE ''@IsSOTrx@'' WHEN '''' THEN '''' WHEN ''N'' THEN ''Y'' ELSE ''N'' END AS DefaultValue FROM DUAL',Updated=TO_TIMESTAMP('2017-09-13 21:25:14','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_InfoColumn_ID=200037
+;
+
+SELECT register_migration_script('201709131604_IDEMPIERE-3486.sql') FROM dual
+;
--- a/migration/i5.1/postgresql/201709181100_Ticket_1008477.sql
+++ b/migration/i5.1/postgresql/201709181100_Ticket_1008477.sql
@ -0,0 +1,8 @@
+-- Sep 18, 2017 12:37:19 PM GMT+08:00
+-- 1008477 List on Position field in Lead window is blank even if there are position options configured.
+UPDATE AD_Val_Rule SET Code='((C_Job.IsEmployee=(SELECT IsEmployee FROM C_BPartner WHERE C_BPartner_ID=@C_BPartner_ID:0@)) OR (C_Job.IsEmployee=''N'' AND @C_BPartner_ID:0@=0))',Updated=TO_TIMESTAMP('2017-09-18 12:37:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Val_Rule_ID=243
+;
+
+SELECT register_migration_script('201709181100_Ticket_1008477.sql') FROM dual
+;
+
--- a/migration/i5.1/postgresql/201710271720_IDEMPIERE-3532.sql
+++ b/migration/i5.1/postgresql/201710271720_IDEMPIERE-3532.sql
@ -0,0 +1,31 @@
+-- IDEMPIERE-3532 - Remove hardcoded values for InfoInvoiceWindow (BPartnerID / IsSOTrx) and InfoPaymentWindow (IsSOTrx)
+-- Oct 27, 2017 5:16:12 PM CEST
+UPDATE AD_InfoColumn SET DefaultValue='@C_BPartner_ID@',Updated=TO_TIMESTAMP('2017-10-27 17:16:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_InfoColumn_ID=200052
+;
+
+-- Oct 27, 2017 5:16:25 PM CEST
+UPDATE AD_InfoColumn SET DefaultValue='@IsSOTrx:Y@',Updated=TO_TIMESTAMP('2017-10-27 17:16:25','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_InfoColumn_ID=200066
+;
+
+-- Oct 27, 2017 5:17:29 PM CEST
+UPDATE AD_InfoColumn SET DefaultValue='@IsSOTrx:Y@',Updated=TO_TIMESTAMP('2017-10-27 17:17:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_InfoColumn_ID=200085
+;
+
+-- Nov 8, 2017 11:04:30 AM CET
+UPDATE AD_InfoColumn SET DefaultValue='@C_BPartner_ID@',Updated=TO_TIMESTAMP('2017-11-08 11:04:30','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_InfoColumn_ID=200039
+;
+
+-- Nov 8, 2017 11:04:58 AM CET
+UPDATE AD_InfoColumn SET DefaultValue='@IsSOTrx:Y@',Updated=TO_TIMESTAMP('2017-11-08 11:04:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_InfoColumn_ID=200051
+;
+
+-- Nov 8, 2017 11:05:07 AM CET
+UPDATE AD_InfoColumn SET DefaultValue='@IsSOTrx:Y@',Updated=TO_TIMESTAMP('2017-11-08 11:05:07','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_InfoColumn_ID=200078
+;
+
+-- Nov 8, 2017 11:07:22 AM CET
+UPDATE AD_InfoColumn SET DefaultValue='@SQL=SELECT CASE ''@BaseTable_ID:0@'' WHEN ''335'' THEN ''N'' ELSE '''' END AS DefaultValue FROM DUAL',Updated=TO_TIMESTAMP('2017-11-08 11:07:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_InfoColumn_ID=200065
+;
+
+SELECT register_migration_script('201710271720_IDEMPIERE-3532.sql') FROM dual
+;
--- a/migration/i5.1/postgresql/201711061600_IDEMPIERE-3546.sql
+++ b/migration/i5.1/postgresql/201711061600_IDEMPIERE-3546.sql
@ -0,0 +1,23 @@
+-- IDEMPIERE-3546 - Use specific messages for range process parameters placeholder
+-- Nov 6, 2017 4:07:29 PM CET
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','From',0,0,'Y',TO_TIMESTAMP('2017-11-06 16:07:28','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2017-11-06 16:07:28','YYYY-MM-DD HH24:MI:SS'),0,200438,'ProcessParameterRangeFrom','D','44852250-153e-462a-b206-897d0c2cd1ab')
+;
+
+-- Nov 6, 2017 4:07:42 PM CET
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','To',0,0,'Y',TO_TIMESTAMP('2017-11-06 16:07:42','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2017-11-06 16:07:42','YYYY-MM-DD HH24:MI:SS'),0,200439,'ProcessParameterRangeTo','D','07220887-ecb2-42e9-9665-260041080b52')
+;
+
+INSERT INTO ad_message_trl
+(ad_message_id, ad_language, ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby, msgtext, msgtip, istranslated, ad_message_trl_uu)
+SELECT 200438, ad_language, ad_client_id, ad_org_id, isactive, statement_timestamp(), 100, statement_timestamp(), 100, msgtext, msgtip, istranslated, generate_uuid()
+FROM ad_message_trl
+WHERE ad_message_id=280;
+
+INSERT INTO ad_message_trl
+(ad_message_id, ad_language, ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby, msgtext, msgtip, istranslated, ad_message_trl_uu)
+SELECT 200439, ad_language, ad_client_id, ad_org_id, isactive, statement_timestamp(), 100, statement_timestamp(), 100, msgtext, msgtip, istranslated, generate_uuid()
+FROM ad_message_trl
+WHERE ad_message_id=565;
+
+SELECT register_migration_script('201711061600_IDEMPIERE-3546.sql') FROM dual
+;
--- a/migration/i5.1/postgresql/201711061621_IDEMPIERE-3547.sql
+++ b/migration/i5.1/postgresql/201711061621_IDEMPIERE-3547.sql
@ -0,0 +1,6 @@
+-- IDEMPIERE-3547 Mismatches in oracle foreign keys delete rule
+-- Not necessary in postgresql, just for oracle
+
+SELECT register_migration_script('201711061621_IDEMPIERE-3547.sql') FROM dual
+;
+
--- a/migration/i5.1/postgresql/201711071510_IDEMPIERE-905.sql
+++ b/migration/i5.1/postgresql/201711071510_IDEMPIERE-905.sql
@ -0,0 +1,24 @@
+-- IDEMPIERE-905 Post-it functionality
+-- Nov 7, 2017 3:09:53 PM CET
+UPDATE AD_Element SET ColumnName='AD_PostIt_ID',Updated=TO_TIMESTAMP('2017-11-07 15:09:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=203056
+;
+
+-- Nov 7, 2017 3:09:53 PM CET
+UPDATE AD_Column SET ColumnName='AD_PostIt_ID', Name='Post-it', Description=NULL, Help=NULL WHERE AD_Element_ID=203056
+;
+
+-- Nov 7, 2017 3:09:53 PM CET
+UPDATE AD_Process_Para SET ColumnName='AD_PostIt_ID', Name='Post-it', Description=NULL, Help=NULL, AD_Element_ID=203056 WHERE UPPER(ColumnName)='AD_POSTIT_ID' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL
+;
+
+-- Nov 7, 2017 3:09:53 PM CET
+UPDATE AD_Process_Para SET ColumnName='AD_PostIt_ID', Name='Post-it', Description=NULL, Help=NULL WHERE AD_Element_ID=203056 AND IsCentrallyMaintained='Y'
+;
+
+-- Nov 7, 2017 3:09:53 PM CET
+UPDATE AD_InfoColumn SET ColumnName='AD_PostIt_ID', Name='Post-it', Description=NULL, Help=NULL WHERE AD_Element_ID=203056 AND IsCentrallyMaintained='Y'
+;
+
+SELECT register_migration_script('201711071510_IDEMPIERE-905.sql') FROM dual
+;
+
--- a/migration/i5.1/postgresql/201711211700_IDEMPIERE-1052.sql
+++ b/migration/i5.1/postgresql/201711211700_IDEMPIERE-1052.sql
@ -0,0 +1,15 @@
+-- IDEMPIERE-1052
+-- Nov 23, 2017 3:40:33 PM CET
+UPDATE AD_Column SET AD_Reference_ID=30, IsUpdateable='N',Updated=TO_TIMESTAMP('2017-11-23 15:40:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=1638
+;
+
+-- Nov 23, 2017 3:40:49 PM CET
+UPDATE AD_Column SET AD_Reference_ID=30, IsUpdateable='N',Updated=TO_TIMESTAMP('2017-11-23 15:40:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=1667
+;
+
+-- Nov 23, 2017 3:41:06 PM CET
+UPDATE AD_Column SET AD_Reference_ID=30, IsUpdateable='N',Updated=TO_TIMESTAMP('2017-11-23 15:41:06','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=4934
+;
+
+SELECT register_migration_script('201711211700_IDEMPIERE-1052.sql') FROM dual
+;
--- a/migration/i5.1/postgresql/201712141459_IDEMPIERE-3388.sql
+++ b/migration/i5.1/postgresql/201712141459_IDEMPIERE-3388.sql
@ -0,0 +1,12 @@
+-- IDEMPIERE-3388
+-- Dec 14, 2017 2:58:05 PM CET
+UPDATE C_AcctSchema SET CostingMethod='A',Updated=TO_TIMESTAMP('2017-12-14 14:58:05','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE C_AcctSchema_ID=101
+;
+
+-- Dec 14, 2017 2:58:14 PM CET
+UPDATE M_CostElement SET IsActive='N',Updated=TO_TIMESTAMP('2017-12-14 14:58:14','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE M_CostElement_ID=104
+;
+
+SELECT register_migration_script('201712141459_IDEMPIERE-3388.sql') FROM dual
+;
+
--- a/migration/i5.1/postgresql/201712151351_MinorHelpFix.sql
+++ b/migration/i5.1/postgresql/201712151351_MinorHelpFix.sql
@ -0,0 +1,13 @@
+-- Fix help of form Merge Entities wrongly formatted breaking the wiki manual
+-- Dec 15, 2017 1:49:32 PM CET
+UPDATE AD_Form SET Help='<i>Dangerous - Please are aware of what you are doing!</i>
+All instances of the From entity (e.g. Customer A) are changed to the To entity (e.g. Customer B). 
+The From entity (e.g. Customer A) is deleted. 
+<p><b>There is NO undo nor trace !  Please do a backup first</b> Please be aware that you may be changing history records (e.g. invoices, etc.) ! </p>
+<p><b>Side effects:</b> Merging Products are likely to distort product costs; Merging Business Partners may result in incorrect open item balance. Check with support on remedies.</p>
+<p><b>Restrictions:</b> Accounting and Inventory conflicts are not resolved in this version.</p>',Updated=TO_TIMESTAMP('2017-12-15 13:49:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Form_ID=112
+;
+
+SELECT register_migration_script('201712151351_MinorHelpFix.sql') FROM dual
+;
+
--- a/migration/i5.1/postgresql/201712161006_IDEMPIERE-1721.sql
+++ b/migration/i5.1/postgresql/201712161006_IDEMPIERE-1721.sql
@ -0,0 +1,12 @@
+-- IDEMPIERE-1721 Window Position, tab Remuneration, refers to a disabled window
+-- Dec 16, 2017 10:04:11 AM CET
+UPDATE AD_Window SET IsActive='Y', IsBetaFunctionality='N',Updated=TO_TIMESTAMP('2017-12-16 10:04:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Window_ID=353
+;
+
+-- Dec 16, 2017 10:04:11 AM CET
+UPDATE AD_Menu SET Name='Remuneration', Description='Maintain Remuneration', IsActive='Y',Updated=TO_TIMESTAMP('2017-12-16 10:04:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=532
+;
+
+SELECT register_migration_script('201712161006_IDEMPIERE-1721.sql') FROM dual
+;
+
--- a/migration/i5.1/postgresql/201712161023_IDEMPIERE-3358.sql
+++ b/migration/i5.1/postgresql/201712161023_IDEMPIERE-3358.sql
@ -0,0 +1,12 @@
+-- IDEMPIERE-3358 Dictionary fixes
+-- Dec 16, 2017 10:22:29 AM CET
+UPDATE AD_Field SET IsReadOnly='N', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-12-16 10:22:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202750
+;
+
+-- Dec 16, 2017 10:22:42 AM CET
+UPDATE AD_Field SET IsReadOnly='N', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-12-16 10:22:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202776
+;
+
+SELECT register_migration_script('201712161023_IDEMPIERE-3358.sql') FROM dual
+;
+
--- a/migration/i5.1/postgresql/201712290930_IDEMPIERE-3589.sql
+++ b/migration/i5.1/postgresql/201712290930_IDEMPIERE-3589.sql
@ -0,0 +1,7 @@
+-- IDEMPIERE-3589 Add a 'Warning' Message
+-- Dec 29, 2017 9:22:30 AM CET
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','Warning',0,0,'Y',TO_TIMESTAMP('2017-12-29 09:22:30','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2017-12-29 09:22:30','YYYY-MM-DD HH24:MI:SS'),0,200442,'Warning','D','ef025d76-6391-4a0c-88c0-64d12196b53e')
+;
+
+SELECT register_migration_script('201712290930_IDEMPIERE-3589.sql') FROM dual
+;
--- a/migration/i5.1/postgresql/201801111909_IDEMPIERE-3529.sql
+++ b/migration/i5.1/postgresql/201801111909_IDEMPIERE-3529.sql
@ -0,0 +1,19 @@
+-- IDEMPIERE-3529 Add parameters to InvoicePrint process
+-- Jan 11, 2018 7:02:29 PM CET
+INSERT INTO AD_Process_Para (AD_Process_Para_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,Name,Description,Help,AD_Process_ID,SeqNo,AD_Reference_ID,AD_Reference_Value_ID,IsRange,FieldLength,IsMandatory,ColumnName,IsCentrallyMaintained,EntityType,AD_Element_ID,AD_Process_Para_UU,IsEncrypted) VALUES (200222,0,0,'Y',TO_TIMESTAMP('2018-01-11 19:02:28','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-01-11 19:02:28','YYYY-MM-DD HH24:MI:SS'),100,'Printed','Indicates if this document / line is printed','The Printed checkbox indicates if this document or line will included when printing.',200,80,17,319,'N',0,'N','IsPrinted','Y','D',399,'24d72545-9015-4b87-921d-7de97eaa5079','N')
+;
+
+-- Jan 11, 2018 7:03:51 PM CET
+INSERT INTO AD_Process_Para (AD_Process_Para_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,Name,Description,Help,AD_Process_ID,SeqNo,AD_Reference_ID,IsRange,FieldLength,IsMandatory,ColumnName,IsCentrallyMaintained,EntityType,AD_Element_ID,AD_Process_Para_UU,IsEncrypted) VALUES (200223,0,0,'Y',TO_TIMESTAMP('2018-01-11 19:03:50','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-01-11 19:03:50','YYYY-MM-DD HH24:MI:SS'),100,'Payment Rule','How you pay the invoice','The Payment Rule indicates the method of invoice payment.',200,90,200012,'N',1,'N','PaymentRule','Y','D',1143,'d7b2cef8-86cc-4a2d-91c2-ea452a71ffa3','N')
+;
+
+-- Jan 11, 2018 7:05:08 PM CET
+INSERT INTO AD_Process_Para (AD_Process_Para_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,Name,Description,Help,AD_Process_ID,SeqNo,AD_Reference_ID,IsRange,AD_Val_Rule_ID,FieldLength,IsMandatory,ColumnName,IsCentrallyMaintained,EntityType,AD_Element_ID,AD_Process_Para_UU,IsEncrypted) VALUES (200224,0,0,'Y',TO_TIMESTAMP('2018-01-11 19:05:07','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-01-11 19:05:07','YYYY-MM-DD HH24:MI:SS'),100,'Payment Term','The terms of Payment (timing, discount)','Payment Terms identify the method and timing of payment.',200,100,19,'N',52098,22,'N','C_PaymentTerm_ID','Y','D',204,'77ec6576-ac60-48b8-a072-63af04afd7b5','N')
+;
+
+-- Jan 11, 2018 7:06:08 PM CET
+INSERT INTO AD_Process_Para (AD_Process_Para_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,Name,Description,Help,AD_Process_ID,SeqNo,AD_Reference_ID,AD_Reference_Value_ID,IsRange,FieldLength,IsMandatory,ColumnName,IsCentrallyMaintained,EntityType,AD_Element_ID,AD_Process_Para_UU,IsEncrypted) VALUES (200225,0,0,'Y',TO_TIMESTAMP('2018-01-11 19:06:07','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-01-11 19:06:07','YYYY-MM-DD HH24:MI:SS'),100,'Document Status','The current status of the document','The Document Status indicates the status of a document at this time.  If you want to change the document status, use the Document Action field',200,110,17,131,'N',0,'N','DocStatus','Y','D',289,'409de69f-31b2-4742-8339-7a0a30272480','N')
+;
+
+SELECT register_migration_script('201801111909_IDEMPIERE-3529.sql') FROM dual
+;
--- a/migration/i5.1/postgresql/201801191815_IDEMPIERE-3580.sql
+++ b/migration/i5.1/postgresql/201801191815_IDEMPIERE-3580.sql
@ -0,0 +1,40 @@
+-- IDEMPIERE-3580 Advanced Zoom Across
+-- Jan 19, 2018 6:08:19 PM CET
+INSERT INTO AD_SysConfig (AD_SysConfig_ID,AD_Client_ID,AD_Org_ID,Created,Updated,CreatedBy,UpdatedBy,IsActive,Name,Value,Description,EntityType,ConfigurationLevel,AD_SysConfig_UU) VALUES (200113,0,0,TO_TIMESTAMP('2018-01-19 18:08:19','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2018-01-19 18:08:19','YYYY-MM-DD HH24:MI:SS'),100,100,'Y','ZOOM_ACROSS_QUERY_TIMEOUT','5','Timeout in seconds for the count queries ran when pushing the button Zoom Across','D','C','a1f85478-e2d8-4c78-98ab-283f74e090ec')
+;
+
+-- Jan 19, 2018 6:10:52 PM CET
+INSERT INTO AD_Element (AD_Element_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,ColumnName,Name,Description,Help,PrintName,EntityType,AD_Element_UU) VALUES (203157,0,0,'Y',TO_TIMESTAMP('2018-01-19 18:09:06','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-01-19 18:09:06','YYYY-MM-DD HH24:MI:SS'),100,'IsDetailedZoomAcross','Detailed Zoom Across',NULL,'The toolbar button zoom across discover where the record on screen is used on first tabs of windows.  With detailed zoom across it goes deeper in the discovery of relationships within detailed tabs.','Detailed Zoom Across','D','58745104-ed8b-459c-aed8-6a9d9c4e33a1')
+;
+
+-- Jan 19, 2018 6:11:25 PM CET
+INSERT INTO AD_Column (AD_Column_ID,Version,Name,Help,AD_Table_ID,ColumnName,DefaultValue,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,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,SeqNoSelection,IsToolbarButton,IsSecure) VALUES (213339,0,'Detailed Zoom Across','The toolbar button zoom across discover where the record on screen is used on first tabs of windows.  With detailed zoom across it goes deeper in the discovery of relationships within detailed tabs.',200174,'IsDetailedZoomAcross','N',1,'N','N','N','N','N',0,'N',20,0,0,'Y',TO_TIMESTAMP('2018-01-19 18:11:24','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-01-19 18:11:24','YYYY-MM-DD HH24:MI:SS'),100,203157,'Y','N','D','N','N','N','Y','c2e13243-17fa-45f4-9135-4fb4d1572664','Y',0,'N','N')
+;
+
+-- Jan 19, 2018 6:11:30 PM CET
+ALTER TABLE AD_UserPreference ADD COLUMN IsDetailedZoomAcross CHAR(1) DEFAULT 'N' CHECK (IsDetailedZoomAcross IN ('Y','N'))
+;
+
+-- Jan 19, 2018 6:11:39 PM CET
+INSERT INTO AD_Field (AD_Field_ID,Name,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,XPosition,ColumnSpan) VALUES (205303,'Detailed Zoom Across','The toolbar button zoom across discover where the record on screen is used on first tabs of windows.  With detailed zoom across it goes deeper in the discovery of relationships within detailed tabs.',200189,213339,'Y',1,90,'N','N','N','N',0,0,'Y',TO_TIMESTAMP('2018-01-19 18:11:39','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-01-19 18:11:39','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','D','6c0b384b-f05e-4843-8b0e-eb15e2ee81d2','Y',90,2,2)
+;
+
+-- Jan 19, 2018 6:13:19 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=50, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=5, ColumnSpan=1, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-01-19 18:13:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=203797
+;
+
+-- Jan 19, 2018 6:13:19 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=70, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=5, ColumnSpan=1, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-01-19 18:13:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205303
+;
+
+-- Jan 19, 2018 6:13:19 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=80, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=1, ColumnSpan=1, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-01-19 18:13:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=203800
+;
+
+-- Jan 19, 2018 6:13:19 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=90, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=2, ColumnSpan=1, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-01-19 18:13:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=203798
+;
+
+SELECT register_migration_script('201801191815_IDEMPIERE-3580.sql') FROM dual
+;
+
--- a/migration/i5.1/postgresql/201801192257_IDEMPIERE-1906.sql
+++ b/migration/i5.1/postgresql/201801192257_IDEMPIERE-1906.sql
@ -0,0 +1,32 @@
+-- IDEMPIERE-1906 Use postgresql SIMILAR TO instead of LIKE
+-- Jan 19, 2018 10:55:51 PM CET
+INSERT INTO AD_Element (AD_Element_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,ColumnName,Name,Description,Help,PrintName,EntityType,AD_Element_UU) VALUES (203158,0,0,'Y',TO_TIMESTAMP('2018-01-19 22:54:41','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-01-19 22:54:41','YYYY-MM-DD HH24:MI:SS'),100,'IsUseSimilarTo','Use Similar To',NULL,'In PostgreSQL database enable using the more powerful SIMILAR TO instead of LIKE for matching queries.','Use Similar To','D','6917772a-f465-411c-95ed-8a834249a578')
+;
+
+-- Jan 19, 2018 10:56:06 PM CET
+INSERT INTO AD_Column (AD_Column_ID,Version,Name,Help,AD_Table_ID,ColumnName,DefaultValue,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,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,SeqNoSelection,IsToolbarButton,IsSecure) VALUES (213340,0,'Use Similar To','In PostgreSQL database enable using the more powerful SIMILAR TO instead of LIKE for matching queries.',200174,'IsUseSimilarTo','N',1,'N','N','N','N','N',0,'N',20,0,0,'Y',TO_TIMESTAMP('2018-01-19 22:56:06','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-01-19 22:56:06','YYYY-MM-DD HH24:MI:SS'),100,203158,'Y','N','D','N','N','N','Y','81564050-9da4-492f-b298-cf8aac897583','Y',0,'N','N')
+;
+
+-- Jan 19, 2018 10:56:07 PM CET
+ALTER TABLE AD_UserPreference ADD COLUMN IsUseSimilarTo CHAR(1) DEFAULT 'N' CHECK (IsUseSimilarTo IN ('Y','N'))
+;
+
+-- Jan 19, 2018 10:56:20 PM CET
+INSERT INTO AD_Field (AD_Field_ID,Name,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,XPosition,ColumnSpan) VALUES (205304,'Use Similar To','In PostgreSQL database enable using the more powerful SIMILAR TO instead of LIKE for matching queries.',200189,213340,'Y',1,100,'N','N','N','N',0,0,'Y',TO_TIMESTAMP('2018-01-19 22:56:20','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-01-19 22:56:20','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','D','92dd69a0-5640-41d9-b26f-2546a71eb75b','Y',100,2,2)
+;
+
+-- Jan 19, 2018 10:56:41 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=90, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=5, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-01-19 22:56:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205304
+;
+
+-- Jan 19, 2018 10:56:41 PM CET
+UPDATE AD_Field SET SeqNo=100, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-01-19 22:56:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=203798
+;
+
+-- Jan 19, 2018 10:59:21 PM CET
+UPDATE AD_Field SET DisplayLogic='@#DBType@=PostgreSQL', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-01-19 22:59:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205304
+;
+
+SELECT register_migration_script('201801192257_IDEMPIERE-1906.sql') FROM dual
+;
+
--- a/migration/i5.1/postgresql/build.xml
+++ b/migration/i5.1/postgresql/build.xml
--- a/migration/i5.1z/oracle/201711030900_IDEMPIERE-3535.sql
+++ b/migration/i5.1z/oracle/201711030900_IDEMPIERE-3535.sql
@ -0,0 +1,11 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-3535 Implement font icon theme
+-- Nov 2, 2017 3:27:27 PM GMT+08:00
+INSERT INTO AD_SysConfig (AD_SysConfig_ID,AD_Client_ID,AD_Org_ID,Created,Updated,CreatedBy,UpdatedBy,IsActive,Name,Value,Description,EntityType,ConfigurationLevel,AD_SysConfig_UU) VALUES (200111,0,0,TO_DATE('2017-11-02 15:27:26','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2017-11-02 15:27:26','YYYY-MM-DD HH24:MI:SS'),100,100,'Y','ZK_THEME_USE_FONT_ICON_FOR_IMAGE','N','Y - Use css font icon instead of image for button, toolbar button and menu, N - Use image','D','S','29a0d95d-af05-477a-a047-241c350dc8e3')
+;
+
+SELECT register_migration_script('201711030900_IDEMPIERE-3535.sql') FROM dual
+;
+
--- a/migration/i5.1z/oracle/201712110930_IDEMPIERE-3578.sql
+++ b/migration/i5.1z/oracle/201712110930_IDEMPIERE-3578.sql
@ -0,0 +1,34 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-3578 - BPartner Location name : Preserve custom name
+-- Dec 11, 2017 9:21:24 AM CET
+INSERT INTO AD_Element (AD_Element_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,ColumnName,Name,PrintName,EntityType,AD_Element_UU) VALUES (203147,0,0,'Y',TO_DATE('2017-12-11 09:21:23','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2017-12-11 09:21:23','YYYY-MM-DD HH24:MI:SS'),0,'IsPreserveCustomName','Preserve custom name','Preserve custom name','D','1f44e2a6-8a98-4a7f-9943-b206a882e20e')
+;
+
+-- Dec 11, 2017 9:22:24 AM CET
+INSERT INTO AD_Column (AD_Column_ID,Version,Name,AD_Table_ID,ColumnName,DefaultValue,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,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,SeqNoSelection,IsToolbarButton,IsSecure) VALUES (213303,0,'Preserve custom name',293,'IsPreserveCustomName','N',1,'N','N','Y','N','N',0,'N',20,0,0,'Y',TO_DATE('2017-12-11 09:22:23','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2017-12-11 09:22:23','YYYY-MM-DD HH24:MI:SS'),0,203147,'Y','N','D','N','N','N','Y','67391508-06ed-431b-9496-e24d0018b799','N',0,'N','N')
+;
+
+-- Dec 11, 2017 9:22:27 AM CET
+ALTER TABLE C_BPartner_Location ADD IsPreserveCustomName CHAR(1) DEFAULT 'N' CHECK (IsPreserveCustomName IN ('Y','N')) NOT NULL
+;
+
+-- Dec 11, 2017 9:22:52 AM CET
+INSERT INTO AD_Field (AD_Field_ID,Name,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,XPosition,ColumnSpan) VALUES (205277,'Preserve custom name',222,213303,'Y',1,170,'N','N','N','N',0,0,'Y',TO_DATE('2017-12-11 09:22:51','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2017-12-11 09:22:51','YYYY-MM-DD HH24:MI:SS'),0,'N','Y','D','5e9824ca-04a4-44a5-a1c9-24582e84336c','Y',170,2,2)
+;
+
+-- Dec 11, 2017 9:23:06 AM CET
+UPDATE AD_Field SET SeqNo=150,IsDisplayed='Y' WHERE AD_Field_ID=205277
+;
+
+-- Dec 11, 2017 9:23:06 AM CET
+UPDATE AD_Field SET SeqNo=160,IsDisplayed='Y' WHERE AD_Field_ID=2186
+;
+
+-- Dec 11, 2017 9:23:06 AM CET
+UPDATE AD_Field SET SeqNo=170,IsDisplayed='Y' WHERE AD_Field_ID=200619
+;
+
+SELECT register_migration_script('201712110930_IDEMPIERE-3578.sql') FROM dual
+;
--- a/migration/i5.1z/oracle/201712121919_IDEMPIERE-3578.sql
+++ b/migration/i5.1z/oracle/201712121919_IDEMPIERE-3578.sql
@ -0,0 +1,23 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-3578 BPartner Location name : Preserve custom name
+-- Dec 12, 2017 7:19:31 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=50, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=5, IsToolbarButton=NULL,Updated=TO_DATE('2017-12-12 19:19:31','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205277
+;
+
+-- Dec 12, 2017 7:19:31 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=150, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=1, IsToolbarButton=NULL,Updated=TO_DATE('2017-12-12 19:19:31','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2186
+;
+
+-- Dec 12, 2017 7:19:31 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=160, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=4, ColumnSpan=1, IsToolbarButton=NULL,Updated=TO_DATE('2017-12-12 19:19:31','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200619
+;
+
+-- Dec 12, 2017 7:19:31 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=170, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=6, ColumnSpan=1, IsToolbarButton=NULL,Updated=TO_DATE('2017-12-12 19:19:31','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2189
+;
+
+SELECT register_migration_script('201712121919_IDEMPIERE-3578.sql') FROM dual
+;
+
--- a/migration/i5.1z/oracle/201801191458_IDEMPIERE-3545.sql
+++ b/migration/i5.1z/oracle/201801191458_IDEMPIERE-3545.sql
@ -0,0 +1,35 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-3545 Add plugin information in About window
+-- Jan 19, 2018 2:56:10 PM CET
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','Stop',0,0,'Y',TO_DATE('2018-01-19 14:56:09','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-01-19 14:56:09','YYYY-MM-DD HH24:MI:SS'),100,200443,'Stop','D','e250a904-9b0d-49a5-bfb3-d96702f035d1')
+;
+
+-- Jan 19, 2018 2:56:44 PM CET
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','Uninstall',0,0,'Y',TO_DATE('2018-01-19 14:56:44','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-01-19 14:56:44','YYYY-MM-DD HH24:MI:SS'),100,200444,'Uninstall','D','0bbd28ab-67e4-4a61-95f9-10da8e2c875b')
+;
+
+-- Jan 19, 2018 2:56:52 PM CET
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','Install',0,0,'Y',TO_DATE('2018-01-19 14:56:52','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-01-19 14:56:52','YYYY-MM-DD HH24:MI:SS'),100,200445,'Install','D','f187b323-baa0-4207-9a98-8e931277f2ea')
+;
+
+-- Jan 19, 2018 2:57:00 PM CET
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','Id',0,0,'Y',TO_DATE('2018-01-19 14:57:00','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-01-19 14:57:00','YYYY-MM-DD HH24:MI:SS'),100,200446,'Id','D','14fd776d-47a6-4b4f-a6e0-7f8aae564339')
+;
+
+-- Jan 19, 2018 2:57:09 PM CET
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','State',0,0,'Y',TO_DATE('2018-01-19 14:57:08','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-01-19 14:57:08','YYYY-MM-DD HH24:MI:SS'),100,200447,'State','D','1109bf43-b855-4846-9cca-abe90fbf1ba7')
+;
+
+-- Jan 19, 2018 2:57:18 PM CET
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','Version',0,0,'Y',TO_DATE('2018-01-19 14:57:17','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-01-19 14:57:17','YYYY-MM-DD HH24:MI:SS'),100,200448,'Version','D','64e718bd-5195-4a0f-ae54-5d67af26f4e4')
+;
+
+-- Jan 19, 2018 2:57:26 PM CET
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','Plugins',0,0,'Y',TO_DATE('2018-01-19 14:57:25','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-01-19 14:57:25','YYYY-MM-DD HH24:MI:SS'),100,200449,'Plugins','D','712ab4af-73c4-4998-b1c0-a0664f334945')
+;
+
+SELECT register_migration_script('201801191458_IDEMPIERE-3545.sql') FROM dual
+;
+
--- a/migration/i5.1z/oracle/build.xml
+++ b/migration/i5.1z/oracle/build.xml
--- a/migration/i5.1z/postgresql/201711030900_IDEMPIERE-3535.sql
+++ b/migration/i5.1z/postgresql/201711030900_IDEMPIERE-3535.sql
@ -0,0 +1,8 @@
+-- IDEMPIERE-3535 Implement font icon theme
+-- Nov 2, 2017 3:27:27 PM GMT+08:00
+INSERT INTO AD_SysConfig (AD_SysConfig_ID,AD_Client_ID,AD_Org_ID,Created,Updated,CreatedBy,UpdatedBy,IsActive,Name,Value,Description,EntityType,ConfigurationLevel,AD_SysConfig_UU) VALUES (200111,0,0,TO_TIMESTAMP('2017-11-02 15:27:26','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2017-11-02 15:27:26','YYYY-MM-DD HH24:MI:SS'),100,100,'Y','ZK_THEME_USE_FONT_ICON_FOR_IMAGE','N','Y - Use css font icon instead of image for button, toolbar button and menu, N - Use image','D','S','29a0d95d-af05-477a-a047-241c350dc8e3')
+;
+
+SELECT register_migration_script('201711030900_IDEMPIERE-3535.sql') FROM dual
+;
+
--- a/migration/i5.1z/postgresql/201712110930_IDEMPIERE-3578.sql
+++ b/migration/i5.1z/postgresql/201712110930_IDEMPIERE-3578.sql
@ -0,0 +1,31 @@
+-- IDEMPIERE-3578 - BPartner Location name : Preserve custom name
+-- Dec 11, 2017 9:21:24 AM CET
+INSERT INTO AD_Element (AD_Element_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,ColumnName,Name,PrintName,EntityType,AD_Element_UU) VALUES (203147,0,0,'Y',TO_TIMESTAMP('2017-12-11 09:21:23','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2017-12-11 09:21:23','YYYY-MM-DD HH24:MI:SS'),0,'IsPreserveCustomName','Preserve custom name','Preserve custom name','D','1f44e2a6-8a98-4a7f-9943-b206a882e20e')
+;
+
+-- Dec 11, 2017 9:22:24 AM CET
+INSERT INTO AD_Column (AD_Column_ID,Version,Name,AD_Table_ID,ColumnName,DefaultValue,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,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,SeqNoSelection,IsToolbarButton,IsSecure) VALUES (213303,0,'Preserve custom name',293,'IsPreserveCustomName','N',1,'N','N','Y','N','N',0,'N',20,0,0,'Y',TO_TIMESTAMP('2017-12-11 09:22:23','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2017-12-11 09:22:23','YYYY-MM-DD HH24:MI:SS'),0,203147,'Y','N','D','N','N','N','Y','67391508-06ed-431b-9496-e24d0018b799','N',0,'N','N')
+;
+
+-- Dec 11, 2017 9:22:27 AM CET
+ALTER TABLE C_BPartner_Location ADD COLUMN IsPreserveCustomName CHAR(1) DEFAULT 'N' CHECK (IsPreserveCustomName IN ('Y','N')) NOT NULL
+;
+
+-- Dec 11, 2017 9:22:52 AM CET
+INSERT INTO AD_Field (AD_Field_ID,Name,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,XPosition,ColumnSpan) VALUES (205277,'Preserve custom name',222,213303,'Y',1,170,'N','N','N','N',0,0,'Y',TO_TIMESTAMP('2017-12-11 09:22:51','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2017-12-11 09:22:51','YYYY-MM-DD HH24:MI:SS'),0,'N','Y','D','5e9824ca-04a4-44a5-a1c9-24582e84336c','Y',170,2,2)
+;
+
+-- Dec 11, 2017 9:23:06 AM CET
+UPDATE AD_Field SET SeqNo=150,IsDisplayed='Y' WHERE AD_Field_ID=205277
+;
+
+-- Dec 11, 2017 9:23:06 AM CET
+UPDATE AD_Field SET SeqNo=160,IsDisplayed='Y' WHERE AD_Field_ID=2186
+;
+
+-- Dec 11, 2017 9:23:06 AM CET
+UPDATE AD_Field SET SeqNo=170,IsDisplayed='Y' WHERE AD_Field_ID=200619
+;
+
+SELECT register_migration_script('201712110930_IDEMPIERE-3578.sql') FROM dual
+;
--- a/migration/i5.1z/postgresql/201712121919_IDEMPIERE-3578.sql
+++ b/migration/i5.1z/postgresql/201712121919_IDEMPIERE-3578.sql
@ -0,0 +1,20 @@
+-- IDEMPIERE-3578 BPartner Location name : Preserve custom name
+-- Dec 12, 2017 7:19:31 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=50, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=5, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-12-12 19:19:31','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205277
+;
+
+-- Dec 12, 2017 7:19:31 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=150, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=1, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-12-12 19:19:31','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2186
+;
+
+-- Dec 12, 2017 7:19:31 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=160, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=4, ColumnSpan=1, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-12-12 19:19:31','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200619
+;
+
+-- Dec 12, 2017 7:19:31 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=170, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=6, ColumnSpan=1, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-12-12 19:19:31','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2189
+;
+
+SELECT register_migration_script('201712121919_IDEMPIERE-3578.sql') FROM dual
+;
+
--- a/migration/i5.1z/postgresql/201801191458_IDEMPIERE-3545.sql
+++ b/migration/i5.1z/postgresql/201801191458_IDEMPIERE-3545.sql
@ -0,0 +1,32 @@
+-- IDEMPIERE-3545 Add plugin information in About window
+-- Jan 19, 2018 2:56:10 PM CET
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','Stop',0,0,'Y',TO_TIMESTAMP('2018-01-19 14:56:09','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-01-19 14:56:09','YYYY-MM-DD HH24:MI:SS'),100,200443,'Stop','D','e250a904-9b0d-49a5-bfb3-d96702f035d1')
+;
+
+-- Jan 19, 2018 2:56:44 PM CET
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','Uninstall',0,0,'Y',TO_TIMESTAMP('2018-01-19 14:56:44','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-01-19 14:56:44','YYYY-MM-DD HH24:MI:SS'),100,200444,'Uninstall','D','0bbd28ab-67e4-4a61-95f9-10da8e2c875b')
+;
+
+-- Jan 19, 2018 2:56:52 PM CET
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','Install',0,0,'Y',TO_TIMESTAMP('2018-01-19 14:56:52','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-01-19 14:56:52','YYYY-MM-DD HH24:MI:SS'),100,200445,'Install','D','f187b323-baa0-4207-9a98-8e931277f2ea')
+;
+
+-- Jan 19, 2018 2:57:00 PM CET
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','Id',0,0,'Y',TO_TIMESTAMP('2018-01-19 14:57:00','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-01-19 14:57:00','YYYY-MM-DD HH24:MI:SS'),100,200446,'Id','D','14fd776d-47a6-4b4f-a6e0-7f8aae564339')
+;
+
+-- Jan 19, 2018 2:57:09 PM CET
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','State',0,0,'Y',TO_TIMESTAMP('2018-01-19 14:57:08','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-01-19 14:57:08','YYYY-MM-DD HH24:MI:SS'),100,200447,'State','D','1109bf43-b855-4846-9cca-abe90fbf1ba7')
+;
+
+-- Jan 19, 2018 2:57:18 PM CET
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','Version',0,0,'Y',TO_TIMESTAMP('2018-01-19 14:57:17','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-01-19 14:57:17','YYYY-MM-DD HH24:MI:SS'),100,200448,'Version','D','64e718bd-5195-4a0f-ae54-5d67af26f4e4')
+;
+
+-- Jan 19, 2018 2:57:26 PM CET
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','Plugins',0,0,'Y',TO_TIMESTAMP('2018-01-19 14:57:25','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-01-19 14:57:25','YYYY-MM-DD HH24:MI:SS'),100,200449,'Plugins','D','712ab4af-73c4-4998-b1c0-a0664f334945')
+;
+
+SELECT register_migration_script('201801191458_IDEMPIERE-3545.sql') FROM dual
+;
+
--- a/migration/i5.1z/postgresql/build.xml
+++ b/migration/i5.1z/postgresql/build.xml
--- a/org.adempiere.base-feature/feature.xml
+++ b/org.adempiere.base-feature/feature.xml
@ -2,7 +2,7 @@
 <feature
      id="org.adempiere.base"
      label="Adempiere Base"
-      version="4.1.0.qualifier">
+      version="5.1.0.qualifier">

   <description url="http://www.example.com/description">
      [Enter Feature Description here.]
--- a/org.adempiere.base-feature/sign.database.build.launch
+++ b/org.adempiere.base-feature/sign.database.build.launch
@ -20,8 +20,8 @@
 <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.56.0@default:default,bcprov*1.56.0@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*58.2.0@default:default,com.itextpdf@default:default,com.sun.mail.javax.mail@default:default,groovy-all*2.4.8@default:default,java_cup.runtime@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.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,joda-time*2.9.7@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.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@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.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.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.mortbay.jasper.apache-el*8.5.9@default:default,org.mortbay.jasper.apache-jsp*8.0.27@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: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.idempiere.webservices@default:default,org.slf4j.jdk14@default:false"/>
+<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.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="de.bxservice.report.fonts@default:default,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.fonts@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"/>
--- a/org.adempiere.base.callout/META-INF/MANIFEST.MF
+++ b/org.adempiere.base.callout/META-INF/MANIFEST.MF
@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Callout
 Bundle-SymbolicName: org.adempiere.base.callout
-Bundle-Version: 4.1.0.qualifier
+Bundle-Version: 5.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
 Eclipse-RegisterBuddy: org.adempiere.base
--- a/org.adempiere.base.callout/src/org/adempiere/model/CalloutRMA.java
+++ b/org.adempiere.base.callout/src/org/adempiere/model/CalloutRMA.java
@ -20,6 +20,8 @@ package org.adempiere.model;
 import java.math.BigDecimal;
 import java.util.Properties;

+import org.adempiere.base.Core;
+import org.adempiere.base.IProductPricing;
 import org.compiere.model.CalloutEngine;
 import org.compiere.model.GridField;
 import org.compiere.model.GridTab;
@ -30,7 +32,6 @@ import org.compiere.model.MInvoice;
 import org.compiere.model.MInvoiceLine;
 import org.compiere.model.MOrder;
 import org.compiere.model.MOrderLine;
-import org.compiere.model.MProductPricing;
 import org.compiere.model.MRMA;
 import org.compiere.model.MRMALine;
 import org.compiere.model.Query;
@ -146,7 +147,8 @@ public class CalloutRMA extends CalloutEngine {
 			return "";

 		MRMA rma = new MRMA(ctx, M_RMA_ID, null);
-		MProductPricing pp = new MProductPricing(M_Product_ID, rma.getC_BPartner_ID(), Env.ONE, rma.isSOTrx(), null);
+		IProductPricing pp = Core.getProductPricing();
+		pp.setInitialValues(M_Product_ID, rma.getC_BPartner_ID(), Env.ONE, rma.isSOTrx(), null);
 		int taxId = 0;
 		int precision = 0;

--- a/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoice.java
+++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoice.java
@ -24,6 +24,9 @@ import java.sql.Timestamp;
 import java.util.Properties;
 import java.util.logging.Level;

+import org.adempiere.base.Core;
+import org.adempiere.base.IProductPricing;
+import org.adempiere.model.GridTabWrapper;
 import org.compiere.util.CLogger;
 import org.compiere.util.DB;
 import org.compiere.util.DisplayType;
@ -87,9 +90,9 @@ public class CalloutInvoice extends CalloutEngine
 				Env.setContext(ctx, WindowNo, "DocBaseType", s);
 				//  AP Check & AR Credit Memo
 				if (s.startsWith("AP"))
-					mTab.setValue("PaymentRule", "S");    //  Check
+					mTab.setValue("PaymentRule", X_C_Invoice.PAYMENTRULE_Check);
 				else if (s.endsWith("C"))
-					mTab.setValue("PaymentRule", "P");    //  OnCredit
+					mTab.setValue("PaymentRule", X_C_Invoice.PAYMENTRULE_OnCredit);
 			}
 		}
 		catch (SQLException e)
@ -183,13 +186,9 @@ public class CalloutInvoice extends CalloutEngine
 				//	PaymentRule
 				String s = rs.getString(IsSOTrx ? "PaymentRule" : "PaymentRulePO");
 				if (s != null && s.length() != 0)
-				{
-					if (Env.getContext(ctx, WindowNo, "DocBaseType").endsWith("C"))	//	Credits are Payment Term
-						s = "P";
-					else if (IsSOTrx && (s.equals("S") || s.equals("U")))	//	No Check/Transfer for SO_Trx
-						s = "P";											//  Payment Term
 					mTab.setValue("PaymentRule", s);
-				}
+				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"));
 				if (!rs.wasNull())
@ -324,10 +323,9 @@ public class CalloutInvoice extends CalloutEngine
 			mTab.setValue("M_AttributeSetInstance_ID", null);

 		/*****	Price Calculation see also qty	****/
-		boolean IsSOTrx = Env.getContext(ctx, WindowNo, "IsSOTrx").equals("Y");
-		int C_BPartner_ID = Env.getContextAsInt(ctx, WindowNo, "C_BPartner_ID");
-		BigDecimal Qty = (BigDecimal)mTab.getValue("QtyInvoiced");
-		MProductPricing pp = new MProductPricing (M_Product_ID.intValue(), C_BPartner_ID, Qty, IsSOTrx, null);
+		I_C_InvoiceLine invoiceLine = GridTabWrapper.create(mTab, I_C_InvoiceLine.class);
+		IProductPricing pp = Core.getProductPricing();
+		pp.setInvoiceLine(invoiceLine, null);
 		//
 		int M_PriceList_ID = Env.getContextAsInt(ctx, WindowNo, "M_PriceList_ID");
 		pp.setM_PriceList_ID(M_PriceList_ID);
@ -350,8 +348,6 @@ public class CalloutInvoice extends CalloutEngine
 		}
 		
 		pp.setM_PriceList_Version_ID(M_PriceList_Version_ID);
-		Timestamp date = Env.getContextAsDate(ctx, WindowNo, "DateInvoiced");
-		pp.setPriceDate(date);
 		//		
 		mTab.setValue("PriceList", pp.getPriceList());
 		mTab.setValue("PriceLimit", pp.getPriceLimit());
@ -557,19 +553,18 @@ public class CalloutInvoice extends CalloutEngine
 			|| mField.getColumnName().equals("M_Product_ID")) 
 			&& !"N".equals(Env.getContext(ctx, WindowNo, "DiscountSchema")))
 		{
-			int C_BPartner_ID = Env.getContextAsInt(ctx, WindowNo, "C_BPartner_ID");
 			if (mField.getColumnName().equals("QtyEntered"))
 				QtyInvoiced = MUOMConversion.convertProductFrom (ctx, M_Product_ID, 
 					C_UOM_To_ID, QtyEntered);
 			if (QtyInvoiced == null)
 				QtyInvoiced = QtyEntered;
-			boolean IsSOTrx = Env.getContext(ctx, WindowNo, "IsSOTrx").equals("Y");
-			MProductPricing pp = new MProductPricing (M_Product_ID, C_BPartner_ID, QtyInvoiced, IsSOTrx, null);
+			I_C_InvoiceLine invoiceLine = GridTabWrapper.create(mTab, I_C_InvoiceLine.class);
+			IProductPricing pp = Core.getProductPricing();
+			pp.setInvoiceLine(invoiceLine, null);
 			pp.setM_PriceList_ID(M_PriceList_ID);
+			pp.setQty(QtyInvoiced);
 			int	M_PriceList_Version_ID = Env.getContextAsInt(ctx, WindowNo, "M_PriceList_Version_ID");
 			pp.setM_PriceList_Version_ID(M_PriceList_Version_ID);
-			Timestamp date = (Timestamp)mTab.getValue("DateInvoiced");
-			pp.setPriceDate(date);
 			//
 			PriceEntered = MUOMConversion.convertProductFrom (ctx, M_Product_ID, 
 				C_UOM_To_ID, pp.getPriceStd());
@ -842,10 +837,9 @@ public class CalloutInvoice extends CalloutEngine
 		}

 		/*****	Price Calculation see also qty	****/
-		int C_BPartner_ID = Env.getContextAsInt(ctx, WindowNo, "C_BPartner_ID");
-		BigDecimal Qty = (BigDecimal)mTab.getValue("QtyOrdered");
-		boolean IsSOTrx = Env.getContext(ctx, WindowNo, "IsSOTrx").equals("Y");
-		MProductPricing pp = new MProductPricing (M_Product_ID.intValue(), C_BPartner_ID, Qty, IsSOTrx, null);
+		I_C_InvoiceLine invoiceLine = GridTabWrapper.create(mTab, I_C_InvoiceLine.class);
+		IProductPricing pp = Core.getProductPricing();
+		pp.setInvoiceLine(invoiceLine, null);
 		//
 		int M_PriceList_ID = Env.getContextAsInt(ctx, WindowNo, "M_PriceList_ID");
 		pp.setM_PriceList_ID(M_PriceList_ID);
@ -866,7 +860,6 @@ public class CalloutInvoice extends CalloutEngine
 				Env.setContext(ctx, WindowNo, "M_PriceList_Version_ID", M_PriceList_Version_ID );
 		}
 		pp.setM_PriceList_Version_ID(M_PriceList_Version_ID);
-		pp.setPriceDate(orderDate);
 		//
 		Env.setContext(ctx, WindowNo, "EnforcePriceLimit", pp.isEnforcePriceLimit() ? "Y" : "N");
 		Env.setContext(ctx, WindowNo, "DiscountSchema", pp.isDiscountSchema() ? "Y" : "N");
--- a/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoiceBatch.java
+++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoiceBatch.java
@ -105,13 +105,9 @@ public class CalloutInvoiceBatch extends CalloutEngine
 				//	PaymentRule
 				String s = rs.getString(IsSOTrx ? "PaymentRule" : "PaymentRulePO");
 				if (s != null && s.length() != 0)
-				{
-					if (Env.getContext(ctx, WindowNo, "DocBaseType").endsWith("C"))	//	Credits are Payment Term
-						s = "P";
-					else if (IsSOTrx && (s.equals("S") || s.equals("U")))	//	No Check/Transfer for SO_Trx
-						s = "P";											//  Payment Term
-			//		mTab.setValue("PaymentRule", s);
-				}
+					mTab.setValue("PaymentRule", s);
+				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"));
 				if (!rs.wasNull())
--- a/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java
+++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java
@ -24,6 +24,9 @@ import java.sql.Timestamp;
 import java.util.Properties;
 import java.util.logging.Level;

+import org.adempiere.base.Core;
+import org.adempiere.base.IProductPricing;
+import org.adempiere.model.GridTabWrapper;
 import org.compiere.util.CLogger;
 import org.compiere.util.DB;
 import org.compiere.util.DisplayType;
@ -181,13 +184,7 @@ public class CalloutOrder extends CalloutEngine
 					//	PaymentRule
 					String s = rs.getString(IsSOTrx ? "PaymentRule" : "PaymentRulePO");
 					if (s != null && s.length() != 0)
-					{
-						if (IsSOTrx && (s.equals("B") || s.equals("S") || s.equals("U")))	//	No Cash/Check/Transfer for SO_Trx
-							s = "P";										//  Payment Term
-						if (!IsSOTrx && (s.equals("B")))					//	No Cash for PO_Trx
-							s = "P";										//  Payment Term
 						mTab.setValue("PaymentRule", s);
-					}
 					//	Payment Term
 					Integer ii =new Integer(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID"));
 					if (!rs.wasNull())
@ -401,13 +398,7 @@ public class CalloutOrder extends CalloutEngine
 					//	PaymentRule
 					s = rs.getString(IsSOTrx ? "PaymentRule" : "PaymentRulePO");
 					if (s != null && s.length() != 0)
-					{
-						if (s.equals("B"))				//	No Cache in Non POS
-							s = "P";
-						if (IsSOTrx && (s.equals("S") || s.equals("U")))	//	No Check/Transfer for SO_Trx
-							s = "P";										//  Payment Term
 						mTab.setValue("PaymentRule", s);
-					}
 					//	Payment Term
 					ii = new Integer(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID"));
 					if (!rs.wasNull())
@ -589,13 +580,7 @@ public class CalloutOrder extends CalloutEngine
 					//	PaymentRule
 					s = rs.getString(IsSOTrx ? "PaymentRule" : "PaymentRulePO");
 					if (s != null && s.length() != 0)
-					{
-						if (s.equals("B"))				//	No Cache in Non POS
-							s = "P";
-						if (IsSOTrx && (s.equals("S") || s.equals("U")))	//	No Check/Transfer for SO_Trx
-							s = "P";										//  Payment Term
 						mTab.setValue("PaymentRule", s);
-					}
 					//	Payment Term
 					ii = new Integer(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID"));
 					if (!rs.wasNull())
@ -797,10 +782,9 @@ public class CalloutOrder extends CalloutEngine
 			mTab.setValue("M_AttributeSetInstance_ID", null);

 		/*****	Price Calculation see also qty	****/
-		int C_BPartner_ID = Env.getContextAsInt(ctx, WindowNo, "C_BPartner_ID");
-		BigDecimal Qty = (BigDecimal)mTab.getValue("QtyOrdered");
-		boolean IsSOTrx = Env.getContext(ctx, WindowNo, "IsSOTrx").equals("Y");
-		MProductPricing pp = new MProductPricing (M_Product_ID.intValue(), C_BPartner_ID, Qty, IsSOTrx, null);
+		I_C_OrderLine orderLine = GridTabWrapper.create(mTab, I_C_OrderLine.class);
+		IProductPricing pp = Core.getProductPricing();
+		pp.setOrderLine(orderLine, null);
 		//
 		int M_PriceList_ID = Env.getContextAsInt(ctx, WindowNo, "M_PriceList_ID");
 		pp.setM_PriceList_ID(M_PriceList_ID);
@ -821,7 +805,6 @@ public class CalloutOrder extends CalloutEngine
 				Env.setContext(ctx, WindowNo, "M_PriceList_Version_ID", M_PriceList_Version_ID );
 		}
 		pp.setM_PriceList_Version_ID(M_PriceList_Version_ID);
-		pp.setPriceDate(orderDate);
 		//
 		mTab.setValue("PriceList", pp.getPriceList());
 		mTab.setValue("PriceLimit", pp.getPriceLimit());
@ -850,6 +833,8 @@ public class CalloutOrder extends CalloutEngine
 			if (product.isStocked() && Env.getContext(ctx, WindowNo, "IsDropShip").equals("N"))
 			{
 				BigDecimal QtyOrdered = (BigDecimal)mTab.getValue("QtyOrdered");
+				if (QtyOrdered == null)
+					QtyOrdered = Env.ZERO;
 				int M_Warehouse_ID = Env.getContextAsInt(ctx, WindowNo, "M_Warehouse_ID");
 				int M_AttributeSetInstance_ID = Env.getContextAsInt(ctx, WindowNo, mTab.getTabNo(), "M_AttributeSetInstance_ID");
 				BigDecimal available = MStorageReservation.getQtyAvailable
@ -1053,7 +1038,11 @@ public class CalloutOrder extends CalloutEngine
 		BigDecimal QtyEntered, QtyOrdered, PriceEntered, PriceActual, PriceLimit, Discount, PriceList;
 		//	get values
 		QtyEntered = (BigDecimal)mTab.getValue("QtyEntered");
+		if (QtyEntered == null)
+			QtyEntered = Env.ZERO;
 		QtyOrdered = (BigDecimal)mTab.getValue("QtyOrdered");
+		if (QtyOrdered == null)
+			QtyOrdered = Env.ZERO;
 		if (log.isLoggable(Level.FINE)) log.fine("QtyEntered=" + QtyEntered + ", Ordered=" + QtyOrdered + ", UOM=" + C_UOM_To_ID);
 		//
 		PriceEntered = (BigDecimal)mTab.getValue("PriceEntered");
@ -1089,19 +1078,18 @@ public class CalloutOrder extends CalloutEngine
 			|| mField.getColumnName().equals("M_Product_ID"))
 			&& !"N".equals(Env.getContext(ctx, WindowNo, "DiscountSchema")))
 		{
-			int C_BPartner_ID = Env.getContextAsInt(ctx, WindowNo, "C_BPartner_ID");
 			if (mField.getColumnName().equals("QtyEntered"))
 				QtyOrdered = MUOMConversion.convertProductFrom (ctx, M_Product_ID,
 					C_UOM_To_ID, QtyEntered);
 			if (QtyOrdered == null)
 				QtyOrdered = QtyEntered;
-			boolean IsSOTrx = Env.getContext(ctx, WindowNo, "IsSOTrx").equals("Y");
-			MProductPricing pp = new MProductPricing (M_Product_ID, C_BPartner_ID, QtyOrdered, IsSOTrx, null);
+			I_C_OrderLine orderLine = GridTabWrapper.create(mTab, I_C_OrderLine.class);
+			IProductPricing pp = Core.getProductPricing();
+			pp.setOrderLine(orderLine, null);
+			pp.setQty(QtyOrdered);
 			pp.setM_PriceList_ID(M_PriceList_ID);
 			int M_PriceList_Version_ID = Env.getContextAsInt(ctx, WindowNo, "M_PriceList_Version_ID");
 			pp.setM_PriceList_Version_ID(M_PriceList_Version_ID);
-			Timestamp date = (Timestamp)mTab.getValue("DateOrdered");
-			pp.setPriceDate(date);
 			//
 			PriceEntered = MUOMConversion.convertProductFrom (ctx, M_Product_ID,
 				C_UOM_To_ID, pp.getPriceStd());
@ -1422,10 +1410,9 @@ public class CalloutOrder extends CalloutEngine
 		}

 		/*****	Price Calculation see also qty	****/
-		int C_BPartner_ID = Env.getContextAsInt(ctx, WindowNo, "C_BPartner_ID");
-		BigDecimal Qty = (BigDecimal)mTab.getValue("QtyOrdered");
-		boolean IsSOTrx = Env.getContext(ctx, WindowNo, "IsSOTrx").equals("Y");
-		MProductPricing pp = new MProductPricing (M_Product_ID.intValue(), C_BPartner_ID, Qty, IsSOTrx, null);
+		I_C_OrderLine orderLine = GridTabWrapper.create(mTab, I_C_OrderLine.class);
+		IProductPricing pp = Core.getProductPricing();
+		pp.setOrderLine(orderLine, null);
 		//
 		int M_PriceList_ID = Env.getContextAsInt(ctx, WindowNo, "M_PriceList_ID");
 		pp.setM_PriceList_ID(M_PriceList_ID);
@ -1446,7 +1433,6 @@ public class CalloutOrder extends CalloutEngine
 				Env.setContext(ctx, WindowNo, "M_PriceList_Version_ID", M_PriceList_Version_ID );
 		}
 		pp.setM_PriceList_Version_ID(M_PriceList_Version_ID);
-		pp.setPriceDate(orderDate);
 		//
 		Env.setContext(ctx, WindowNo, "EnforcePriceLimit", pp.isEnforcePriceLimit() ? "Y" : "N");
 		Env.setContext(ctx, WindowNo, "DiscountSchema", pp.isDiscountSchema() ? "Y" : "N");
--- a/org.adempiere.base.callout/src/org/compiere/model/CalloutRequisition.java
+++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutRequisition.java
@ -21,12 +21,13 @@ import java.sql.Timestamp;
 import java.util.Properties;
 import java.util.logging.Level;

+import org.adempiere.base.Core;
+import org.adempiere.base.IProductPricing;
 import org.adempiere.model.GridTabWrapper;
 import org.compiere.util.Env;

 /**
 *	Requisition Callouts
- *	
 *  @author Jorg Janke
 *  @version $Id: CalloutRequisition.java,v 1.3 2006/07/30 00:51:05 jjanke Exp $
 */
@ -47,7 +48,7 @@ public class CalloutRequisition extends CalloutEngine
 		Integer M_Product_ID = (Integer)value;
 		if (M_Product_ID == null || M_Product_ID.intValue() == 0)
 			return "";
-		final I_M_Requisition req = GridTabWrapper.create(mTab, I_M_Requisition.class);
+		final I_M_Requisition req = GridTabWrapper.create(mTab.getParentTab(), I_M_Requisition.class);
 		final I_M_RequisitionLine line = GridTabWrapper.create(mTab, I_M_RequisitionLine.class);
 		setPrice(ctx, WindowNo, req, line);
 		MProduct product = MProduct.get(ctx, M_Product_ID);
@ -71,7 +72,7 @@ public class CalloutRequisition extends CalloutEngine
 		if (isCalloutActive() || value == null)
 			return "";
 		
-		final I_M_Requisition req = GridTabWrapper.create(mTab, I_M_Requisition.class);
+		final I_M_Requisition req = GridTabWrapper.create(mTab.getParentTab(), I_M_Requisition.class);
 		final I_M_RequisitionLine line = GridTabWrapper.create(mTab, I_M_RequisitionLine.class);
 		//	Qty changed - recalc price
 		if (mField.getColumnName().equals(I_M_RequisitionLine.COLUMNNAME_Qty) 
@ -100,7 +101,8 @@ public class CalloutRequisition extends CalloutEngine
 		int C_BPartner_ID = line.getC_BPartner_ID();
 		BigDecimal Qty = line.getQty();
 		boolean isSOTrx = false;
-		MProductPricing pp = new MProductPricing (line.getM_Product_ID(), C_BPartner_ID, Qty, isSOTrx, null);
+		IProductPricing pp = Core.getProductPricing();
+		pp.setInitialValues(line.getM_Product_ID(), C_BPartner_ID, Qty, isSOTrx, null);
 		//
 		int M_PriceList_ID = req.getM_PriceList_ID();
 		pp.setM_PriceList_ID(M_PriceList_ID);
--- a/org.adempiere.base.process/META-INF/MANIFEST.MF
+++ b/org.adempiere.base.process/META-INF/MANIFEST.MF
@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Processes
 Bundle-SymbolicName: org.adempiere.base.process
-Bundle-Version: 4.1.0.qualifier
+Bundle-Version: 5.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
 Export-Package: org.adempiere.process,
--- a/org.adempiere.base.process/src/org/adempiere/base/process/AcceptCtxHelpSuggestion.java
+++ b/org.adempiere.base.process/src/org/adempiere/base/process/AcceptCtxHelpSuggestion.java
@ -127,7 +127,7 @@ public class AcceptCtxHelpSuggestion extends SvrProcess {
 		} else {			
 			StringBuilder insert = new StringBuilder("Insert Into AD_CtxHelpMsg_Trl (AD_Client_ID, AD_Org_ID, AD_CtxHelpMsg_ID, IsActive, IsTranslated, AD_Language, MsgText,");
 			insert.append("Created, CreatedBy, Updated, UpdatedBy, AD_CtxHelpMsg_Trl_UU)")
-				.append(" Values (?, ?, ?, 'Y', 'N', ?, ?, now(), ?, now(), ?, generate_uuid()) ");
+				.append(" Values (?, ?, ?, 'Y', 'N', ?, ?, sysdate, ?, sysdate, ?, generate_uuid()) ");
 			List<Object> params = new ArrayList<Object>();
 			params.add(AD_Client_ID);
 			params.add(0);
--- a/org.adempiere.base.process/src/org/compiere/process/CopyRole.java
+++ b/org.adempiere.base.process/src/org/compiere/process/CopyRole.java
@ -26,7 +26,6 @@ import org.compiere.model.I_AD_Role_Included;
 import org.compiere.model.MRole;
 import org.compiere.util.DB;
 import org.compiere.util.Env;
-import org.compiere.util.Msg;


 /**
@ -76,7 +75,7 @@ public class CopyRole extends SvrProcess
 	protected String doIt() throws Exception
 	{	
 		if (! MRole.getDefault().isAccessAdvanced()) {
-			throw new AdempiereException(Msg.getMsg(getCtx(), "CannotAccessProcess", new Object[] {getProcessInfo().getAD_Process_ID(), MRole.getDefault().getName()}));
+			return "@Error@ @Advanced@ @Process@";
 		}

 		if (m_AD_Role_ID_From == m_AD_Role_ID_To)
--- a/org.adempiere.base.process/src/org/compiere/process/OrderBatchProcess.java
+++ b/org.adempiere.base.process/src/org/compiere/process/OrderBatchProcess.java
@ -105,7 +105,7 @@ public class OrderBatchProcess extends SvrProcess
 		StringBuilder sql = new StringBuilder("SELECT * FROM C_Order o ")
 			.append(" WHERE o.C_DocTypeTarget_ID=? AND o.DocStatus=? ");
 		if (p_IsSelfService != null && p_IsSelfService.length() == 1)
-			sql.append(" AND o.IsSelfService='").append(p_IsSelfService).append("'");
+			sql.append(" AND o.IsSelfService=").append(DB.TO_STRING(p_IsSelfService));
 		if (p_C_BPartner_ID != 0)
 			sql.append(" AND o.C_BPartner_ID=").append(p_C_BPartner_ID);
 		if (p_DateOrdered_From != null)
--- a/org.adempiere.base.process/src/org/compiere/process/ProjectLinePricing.java
+++ b/org.adempiere.base.process/src/org/compiere/process/ProjectLinePricing.java
@ -19,7 +19,8 @@ package org.compiere.process;

 import java.util.logging.Level;

-import org.compiere.model.MProductPricing;
+import org.adempiere.base.Core;
+import org.adempiere.base.IProductPricing;
 import org.compiere.model.MProject;
 import org.compiere.model.MProjectLine;
 import org.compiere.util.Msg;
@ -71,8 +72,9 @@ public class ProjectLinePricing extends SvrProcess
 			throw new IllegalArgumentException("No PriceList");
 		//
 		boolean isSOTrx = true;
-		MProductPricing pp = new MProductPricing (projectLine.getM_Product_ID(), 
-			project.getC_BPartner_ID(), projectLine.getPlannedQty(), isSOTrx, get_TrxName());
+		IProductPricing pp = Core.getProductPricing();
+		pp.setInitialValues(projectLine.getM_Product_ID(), project.getC_BPartner_ID(), 
+				projectLine.getPlannedQty(), isSOTrx, get_TrxName());
 		pp.setM_PriceList_ID(project.getM_PriceList_ID());
 		pp.setPriceDate(project.getDateContract());
 		//
--- a/org.adempiere.base.process/src/org/idempiere/process/ImportCSVProcess.java
+++ b/org.adempiere.base.process/src/org/idempiere/process/ImportCSVProcess.java
@ -43,6 +43,7 @@ import org.compiere.model.DataStatusEvent;
 import org.compiere.model.DataStatusListener;
 import org.compiere.model.GridField;
 import org.compiere.model.GridTab;
+import org.compiere.model.GridTable;
 import org.compiere.model.GridWindow;
 import org.compiere.model.MImportTemplate;
 import org.compiere.model.MLookup;
@ -75,6 +76,7 @@ public class ImportCSVProcess extends SvrProcess implements DataStatusListener {
 		}
 	}

+	GridWindow m_gridWindow = null;
 	GridTab m_gridTab = null;
 	List<GridTab> m_Childs = null;

@ -101,15 +103,15 @@ public class ImportCSVProcess extends SvrProcess implements DataStatusListener {
 		if (!m_importTemplate.isAllowed(p_ImportMode, Env.getAD_Role_ID(Env.getCtx())))
 			throw new AdempiereException("Template/Mode not allowed for this role");

-		GridWindow gWin = GridWindow.get(getCtx(), -1, l_AD_Window_ID);
-		Env.setContext(getCtx(), -1, "IsSOTrx", gWin.isSOTrx());
+		m_gridWindow = GridWindow.get(getCtx(), -1, l_AD_Window_ID);
+		Env.setContext(getCtx(), -1, "IsSOTrx", m_gridWindow.isSOTrx());
 		m_Childs = new ArrayList<GridTab>();
-		for (int i = 0; i < gWin.getTabCount(); i++) {
-			GridTab gridtab = gWin.getTab(i);
+		for (int i = 0; i < m_gridWindow.getTabCount(); i++) {
+			GridTab gridtab = m_gridWindow.getTab(i);
 			if (!gridtab.isLoadComplete())
-				gWin.initTab(i);
-			if (gWin.getTab(i).getAD_Tab_ID() == l_AD_Tab_ID) {
-				m_gridTab  = gWin.getTab(i);
+				m_gridWindow.initTab(i);
+			if (m_gridWindow.getTab(i).getAD_Tab_ID() == l_AD_Tab_ID) {
+				m_gridTab  = m_gridWindow.getTab(i);
 			} else {
 				if (m_gridTab != null && gridtab.getTabLevel() > m_gridTab.getTabLevel())
 					m_Childs.add(gridtab);
@ -119,6 +121,8 @@ public class ImportCSVProcess extends SvrProcess implements DataStatusListener {
 		if (m_gridTab == null)
 			throw new Exception("No Active Tab");
 		m_gridTab.addDataStatusListener(this);
+		for (GridTab childTab : m_Childs)
+			childTab.addDataStatusListener(this);
 	}

 	protected IGridTabImporter initImporter() throws Exception {
@ -161,23 +165,33 @@ public class ImportCSVProcess extends SvrProcess implements DataStatusListener {
 	public void dataStatusChanged(DataStatusEvent e)
    {
        int col = e.getChangedColumn();
-        if (log.isLoggable(Level.CONFIG)) log.config("(" + m_gridTab + ") Col=" + col + ": " + e.toString());
+        if (col < 0)
+        	return;
+
+        GridTab l_gridTab = null;
+        if (e.getSource() != null && e.getSource() instanceof GridTable) {
+        	GridTable gt = (GridTable) e.getSource();
+        	l_gridTab = m_gridWindow.getTab(gt.getTabNo());
+        	if (l_gridTab.getAD_Table_ID() != e.AD_Table_ID)
+        		throw new RuntimeException("Table doesn't match with updated tab");
+        }
+        if (log.isLoggable(Level.CONFIG)) log.config("(" + l_gridTab + ") Col=" + col + ": " + e.toString());

        //  Process Callout
-        GridField mField = m_gridTab.getField(col);
+        GridField mField = l_gridTab.getField(col);
        if (mField != null
            && (mField.getCallout().length() > 0
-            		|| (Core.findCallout(m_gridTab.getTableName(), mField.getColumnName())).size()>0
-            		|| m_gridTab.hasDependants(mField.getColumnName())))
+            		|| (Core.findCallout(l_gridTab.getTableName(), mField.getColumnName())).size()>0
+            		|| l_gridTab.hasDependants(mField.getColumnName())))
        {
-            String msg = m_gridTab.processFieldChange(mField);     //  Dependencies & Callout
+            String msg = l_gridTab.processFieldChange(mField);     //  Dependencies & Callout
            if (msg.length() > 0)
            {
            	log.warning(msg);
            }

            // Refresh the list on dependant fields
-    		for (GridField dependentField : m_gridTab.getDependantFields(mField.getColumnName()))
+    		for (GridField dependentField : l_gridTab.getDependantFields(mField.getColumnName()))
    		{
    			//  if the field has a lookup
    			if (dependentField != null && dependentField.getLookup() instanceof MLookup)
--- 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: 4.1.0.qualifier
+Bundle-Version: 5.1.0.qualifier
 Bundle-ClassPath: base.jar,
 jython-engine.jar,
 jython.jar,
@ -101,7 +101,10 @@ Import-Package: com.sun.mail.smtp;version="1.5",
 org.osgi.framework,
 org.osgi.service.cm;version="1.3.0",
 org.osgi.service.component;version="1.1.0",
+ org.osgi.service.component.runtime;version="1.3.0",
+ org.osgi.service.component.runtime.dto;version="1.3.0",
 org.osgi.service.event;version="1.2.0",
+ org.osgi.util.promise;version="1.0.0",
 org.osgi.util.tracker;version="1.5.0",
 org.restlet,
 org.restlet.data,
@ -118,4 +121,5 @@ 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="[2.4.7,2.5.0)"
+ groovy-all;bundle-version="[2.4.7,2.5.0)",
+ org.krysalis.barcode4j;bundle-version="2.1.0"
--- a/org.adempiere.base/OSGI-INF/defaultproductpricingfactory.xml
+++ b/org.adempiere.base/OSGI-INF/defaultproductpricingfactory.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.base.DefaultProductPricingFactory">
+   <implementation class="org.adempiere.base.DefaultProductPricingFactory"/>
+   <service>
+      <provide interface="org.adempiere.base.IProductPricingFactory"/>
+   </service>
+</scr:component>
--- a/org.adempiere.base/build.properties
+++ b/org.adempiere.base/build.properties
@ -22,6 +22,7 @@ bin.includes = META-INF/,\
               OSGI-INF/defaultaddressvalidationfactory.xml,\
               OSGI-INF/defaulttaxproviderfactory.xml,\
               OSGI-INF/addressvalidationeventhandler.xml,\
+               OSGI-INF/defaultproductpricingfactory.xml,\
               schema/,\
               bsh-2.0b6.jar,\
               commons-validator-1.6.jar
--- a/org.adempiere.base/copyjars.xml
+++ b/org.adempiere.base/copyjars.xml
@ -5,11 +5,11 @@
 	      http://mvnrepository.com/artifact/org.apache.bsf/bsf-all/3.0-beta3
                <get src="${url.maven2.lib}/maven2/org/apache/bsf/bsf-all/3.0-beta3/bsf-all-3.0-beta3.jar" dest="bsf-all-3.0-beta3.jar" usetimestamp="true" verbose="true" retries="5"/>
 		  -->
-		<get src="${url.file.srv}/jarfile/4.1/jython-engine.jar" dest="jython-engine.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/5.1/jython-engine.jar" dest="jython-engine.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven2.lib}/maven2/org/python/jython/2.2.1/jython-2.2.1.jar" dest="jython.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven2.lib}/maven2/it/sauronsoftware/cron4j/cron4j/2.2.5/cron4j-2.2.5.jar" dest="cron4j-2.2.5.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven2.lib}/maven2/commons-validator/commons-validator/1.6/commons-validator-1.6.jar" dest="commons-validator-1.6.jar" usetimestamp="true" verbose="true" retries="5" />
 		<!-- jnlp is not used in idempiere? -->
-		<get src="${url.file.srv}/jarfile/4.1/jnlp.jar" dest="jnlp.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/5.1/jnlp.jar" dest="jnlp.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>
--- a/org.adempiere.base/src/org/adempiere/base/AbstractProductPricing.java
+++ b/org.adempiere.base/src/org/adempiere/base/AbstractProductPricing.java
@ -0,0 +1,141 @@
+/******************************************************************************
+ * Copyright (C) 2017 Diego Ruiz                                              *
+ * Copyright (C) 2017 Bx Service GmbH                                         *
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. 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.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ *****************************************************************************/
+package org.adempiere.base;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+
+import org.compiere.model.I_C_InvoiceLine;
+import org.compiere.model.I_C_OrderLine;
+import org.compiere.model.I_C_ProjectLine;
+import org.compiere.model.I_M_RMALine;
+import org.compiere.model.I_M_RequisitionLine;
+import org.compiere.util.Env;
+
+public abstract class AbstractProductPricing implements IProductPricing {
+	
+	protected int 		  m_M_Product_ID;
+	protected int 		  m_C_BPartner_ID;
+	protected BigDecimal  m_Qty = Env.ONE;
+	protected boolean	  m_isSOTrx = true;
+	protected String      trxName   = null;
+	
+	protected int   	  m_M_PriceList_Version_ID = 0;
+	protected int		  m_M_PriceList_ID = 0;
+	protected Timestamp   m_PriceDate;	
+
+	public AbstractProductPricing() {}
+	
+	@Override
+	public void setInitialValues(int M_Product_ID, int C_BPartner_ID, BigDecimal qty, boolean isSOTrx, String trxName) {
+		this.trxName=trxName;
+		m_M_Product_ID = M_Product_ID;
+		m_C_BPartner_ID = C_BPartner_ID;
+		
+		if (qty != null && Env.ZERO.compareTo(qty) != 0)
+			m_Qty = qty;
+		m_isSOTrx = isSOTrx;
+	}
+
+	@Override
+	public int getM_Product_ID() {
+		return m_M_Product_ID;
+	}
+
+	@Override
+	public int getM_PriceList_ID() {
+		return m_M_PriceList_ID;
+	}
+
+	@Override
+	public void setM_PriceList_ID(int M_PriceList_ID) {
+		m_M_PriceList_ID = M_PriceList_ID;
+	}
+
+	@Override
+	public void setM_PriceList_Version_ID(int M_PriceList_Version_ID) {
+		m_M_PriceList_Version_ID = M_PriceList_Version_ID;
+	}
+	
+	@Override
+	public void setQty(BigDecimal qty) {
+		m_Qty = qty;
+	}
+
+	@Override
+	public Timestamp getPriceDate() {
+		return m_PriceDate;
+	}
+
+	@Override
+	public void setPriceDate(Timestamp priceDate) {
+		m_PriceDate = priceDate;
+	}
+	
+	@Override
+	public void setOrderLine(I_C_OrderLine orderLine, String trxName) {
+		m_M_Product_ID = orderLine.getM_Product_ID();
+		m_C_BPartner_ID = orderLine.getC_BPartner_ID();
+		BigDecimal qty = orderLine.getQtyOrdered();
+		if (qty != null && Env.ZERO.compareTo(qty) != 0)
+			m_Qty = qty;
+		m_isSOTrx = orderLine.getC_Order().isSOTrx();
+		m_PriceDate = orderLine.getDateOrdered();
+		this.trxName = trxName;
+	}
+	
+	@Override
+	public void setInvoiceLine(I_C_InvoiceLine invoiceLine, String trxName) {
+		m_M_Product_ID = invoiceLine.getM_Product_ID();
+		m_C_BPartner_ID = invoiceLine.getC_Invoice().getC_BPartner_ID();
+		BigDecimal qty = invoiceLine.getQtyInvoiced() != null ? 
+				invoiceLine.getQtyInvoiced() : invoiceLine.getQtyEntered();
+		if (qty != null && Env.ZERO.compareTo(qty) != 0)
+			m_Qty = qty;
+		m_isSOTrx = invoiceLine.getC_Invoice().isSOTrx();
+		m_PriceDate = invoiceLine.getC_Invoice().getDateInvoiced();
+		this.trxName = trxName;
+	}
+	
+	@Override
+	public void setProjectLine(I_C_ProjectLine projectLine, String trxName) {
+		m_M_Product_ID = projectLine.getM_Product_ID();
+		m_C_BPartner_ID = projectLine.getC_Project().getC_BPartner_ID();
+		BigDecimal qty = projectLine.getPlannedQty();
+		if (qty != null && Env.ZERO.compareTo(qty) != 0)
+			m_Qty = qty;
+		m_isSOTrx = true;
+		this.trxName = trxName;
+	}
+	
+	@Override
+	public void setRequisitionLine(I_M_RequisitionLine reqLine, String trxName) {
+		m_M_Product_ID = reqLine.getM_Product_ID();
+		m_C_BPartner_ID = reqLine.getC_BPartner_ID();
+		BigDecimal qty = reqLine.getQty();
+		if (qty != null && Env.ZERO.compareTo(qty) != 0)
+			m_Qty = qty;
+		m_isSOTrx = false;
+		this.trxName = trxName;
+	}
+	
+	@Override
+	public void setRMALine(I_M_RMALine rmaLine, String trxName) {
+		m_M_Product_ID = rmaLine.getM_Product_ID();
+		m_C_BPartner_ID = rmaLine.getM_RMA().getC_BPartner_ID();
+		m_Qty = Env.ONE;
+		m_isSOTrx = rmaLine.getM_RMA().isSOTrx();
+		this.trxName = trxName;
+	}
+}
--- a/org.adempiere.base/src/org/adempiere/base/ComponentBlackListService.java
+++ b/org.adempiere.base/src/org/adempiere/base/ComponentBlackListService.java
@ -19,10 +19,9 @@ import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;

-import org.apache.felix.scr.Component;
-import org.apache.felix.scr.ScrService;
 import org.compiere.util.Ini;
 import org.compiere.util.Util;
 import org.osgi.framework.BundleContext;
@ -30,6 +29,8 @@ import org.osgi.framework.ServiceEvent;
 import org.osgi.framework.ServiceListener;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.component.ComponentConstants;
+import org.osgi.service.component.runtime.ServiceComponentRuntime;
+import org.osgi.service.component.runtime.dto.ComponentDescriptionDTO;

 /**
 * @author hengsin
@ -37,11 +38,11 @@ import org.osgi.service.component.ComponentConstants;
 */
 public class ComponentBlackListService implements ServiceListener {

-	private ScrService scrService = null;
+	private ServiceComponentRuntime scrService = null;
 	private List<String> blackListComponentNames = null;
 	
 	protected ComponentBlackListService(BundleContext context) {
-		ServiceReference<ScrService> ref = context.getServiceReference(ScrService.class);
+		ServiceReference<ServiceComponentRuntime> ref = context.getServiceReference(ServiceComponentRuntime.class);
 		scrService = context.getService(ref);
 		blackListComponentNames = new ArrayList<String>();
 		retrieveBlacklistCandidates();
@ -89,20 +90,20 @@ public class ComponentBlackListService implements ServiceListener {

 	private void disableComponents()
 	{
-		Component[] comps = scrService.getComponents();
-		for (Component comp : comps) {
-			if (blackListComponentNames.contains(comp.getName())) {
-				comp.disable();
+		Collection<ComponentDescriptionDTO> comps = scrService.getComponentDescriptionDTOs();
+		for (ComponentDescriptionDTO comp : comps) {
+			if (blackListComponentNames.contains(comp.name)) {
+				scrService.disableComponent(comp);
 			}
 		}
 	}
 	
 	private void disableComponent(String componentName)
 	{
-		Component[] comps = scrService.getComponents();
-		for (Component comp : comps) {
-			if (comp.getName().equals(componentName)) {
-				comp.disable();
+		Collection<ComponentDescriptionDTO> comps = scrService.getComponentDescriptionDTOs();
+		for (ComponentDescriptionDTO comp : comps) {
+			if (comp.name.equals(componentName)) {
+				scrService.disableComponent(comp);
 				break;
 			}
 		}
--- a/org.adempiere.base/src/org/adempiere/base/Core.java
+++ b/org.adempiere.base/src/org/adempiere/base/Core.java
@ -450,4 +450,26 @@ public class Core {
 		
 		return myPaymentExporter;
 	}	
+
+	/**
+	 * get ProductPricing instance
+	 * 
+	 * @return instance of the IProductPricing or null
+	 */
+	public static IProductPricing getProductPricing() {
+
+		List<IProductPricingFactory> factoryList = 
+				Service.locator().list(IProductPricingFactory.class).getServices();
+		if (factoryList != null) {
+			for(IProductPricingFactory factory : factoryList) {
+				IProductPricing myProductPricing = factory.newProductPricingInstance();
+				if (myProductPricing != null) {
+					return myProductPricing;
+				}
+			}
+		}
+
+		return null;
+	}
+
 }
--- a/org.adempiere.base/src/org/adempiere/base/DefaultProductPricingFactory.java
+++ b/org.adempiere.base/src/org/adempiere/base/DefaultProductPricingFactory.java
@ -0,0 +1,18 @@
+package org.adempiere.base;
+
+import org.compiere.model.MProductPricing;
+
+public class DefaultProductPricingFactory implements IProductPricingFactory {
+	
+	/**
+	 * default constructor 
+	 */
+	public DefaultProductPricingFactory() {
+	}
+
+	@Override
+	public AbstractProductPricing newProductPricingInstance() {
+		return new MProductPricing();
+	}
+
+}
--- a/org.adempiere.base/src/org/adempiere/base/IProductPricing.java
+++ b/org.adempiere.base/src/org/adempiere/base/IProductPricing.java
@ -0,0 +1,159 @@
+/******************************************************************************
+ * Copyright (C) 2017 Diego Ruiz                                              *
+ * Copyright (C) 2017 Bx Service GmbH                                         *
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. 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.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ *****************************************************************************/
+package org.adempiere.base;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+
+import org.compiere.model.I_C_InvoiceLine;
+import org.compiere.model.I_C_OrderLine;
+import org.compiere.model.I_C_ProjectLine;
+import org.compiere.model.I_M_RMALine;
+import org.compiere.model.I_M_RequisitionLine;
+
+/**
+ * Product Price Calculations
+ */
+public interface IProductPricing {
+
+	/**
+	 * Set the initial values that the old MProductPricing uses
+	 * for backward compatibility
+	 * @param M_Product_ID
+	 * @param C_BPartner_ID
+	 * @param qty
+	 * @param isSOTrx
+	 * @param trxName
+	 */
+	void setInitialValues(int M_Product_ID, int C_BPartner_ID, 
+			BigDecimal qty, boolean isSOTrx, String trxName);
+	
+	/**
+	 * 	Calculate Price
+	 * 	@return true if calculated
+	 */
+	boolean calculatePrice();
+	
+	/**
+	 * 	Calculate Discount Percentage
+	 * 	@return Discount
+	 */
+	BigDecimal getDiscount();
+	
+	int getM_Product_ID();
+
+	int getM_PriceList_ID();
+	
+	void setM_PriceList_ID(int M_PriceList_ID);
+	
+	void setM_PriceList_Version_ID(int M_PriceList_Version_ID);
+	
+	void setQty(BigDecimal qty);
+	
+	/**
+	 * 	Get Price Date
+	 *	@return date
+	 */
+	Timestamp getPriceDate();
+	
+	/**
+	 * 	Set Price Date
+	 *	@param priceDate date
+	 */
+	void setPriceDate(Timestamp priceDate);
+
+	/**
+	 * 	Get C_UOM_ID
+	 *	@return uom
+	 */
+	int getC_UOM_ID();
+	
+	/**
+	 * 	Get Price List
+	 *	@return list
+	 */
+	BigDecimal getPriceList();
+	
+	/**
+	 * 	Get Price Std
+	 *	@return std
+	 */
+	BigDecimal getPriceStd();
+	
+	/**
+	 * 	Get Price Limit
+	 *	@return limit
+	 */
+	BigDecimal getPriceLimit();
+	
+	/**
+	 * 	Get Price List Currency
+	 *	@return currency
+	 */
+	int getC_Currency_ID();
+	
+	/**
+	 * 	Is Price List enforced?
+	 *	@return enforce limit
+	 */
+	boolean isEnforcePriceLimit();
+	
+	/**
+	 * 	Is a DiscountSchema active?
+	 *	@return active Discount Schema
+	 */
+	boolean isDiscountSchema();
+	
+	/**
+	 * 	Is the Price Calculated (i.e. found)?
+	 *	@return calculated
+	 */
+	boolean isCalculated();	
+	
+	/**
+	 * Set order line and calculate the parameters from it
+	 * @param orderLine
+	 * @param trxName
+	 */
+	void setOrderLine(I_C_OrderLine orderLine, String trxName);
+
+	/**
+	 * Set invoice line and calculate the parameters from it
+	 * @param invoiceLine
+	 * @param trxName
+	 */
+	void setInvoiceLine(I_C_InvoiceLine invoiceLine, String trxName);
+	
+	/**
+	 * Set project line and calculate the parameters from it
+	 * @param projectLine
+	 * @param trxName
+	 */
+	void setProjectLine(I_C_ProjectLine projectLine, String trxName);
+	
+	/**
+	 * Set requisition line and calculate the parameters from it
+	 * @param reqLine
+	 * @param trxName
+	 */
+	void setRequisitionLine(I_M_RequisitionLine reqLine, String trxName);
+
+	/**
+	 * Set rma line and calculate the parameters from it
+	 * @param rmaLine
+	 * @param trxName
+	 */
+	void setRMALine(I_M_RMALine rmaLine, String trxName);
+
+}
--- a/org.adempiere.base/src/org/adempiere/base/IProductPricingFactory.java
+++ b/org.adempiere.base/src/org/adempiere/base/IProductPricingFactory.java
@ -0,0 +1,20 @@
+/******************************************************************************
+ * Copyright (C) 2017 Diego Ruiz                                              *
+ * Copyright (C) 2017 Bx Service GmbH                                         *
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. 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.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ *****************************************************************************/
+package org.adempiere.base;
+
+public interface IProductPricingFactory {
+
+	public AbstractProductPricing newProductPricingInstance();
+
+}
--- a/Show More
+++ b/Show More