diff --git a/migration/i5.1/oracle/201709131604_IDEMPIERE-3486.sql b/migration/i5.1/oracle/201709131604_IDEMPIERE-3486.sql
index 4bb54b8e7a..cc15c25b3d 100644
--- a/migration/i5.1/oracle/201709131604_IDEMPIERE-3486.sql
+++ b/migration/i5.1/oracle/201709131604_IDEMPIERE-3486.sql
@@ -3,12 +3,12 @@ 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='@SQL=SELECT ''@IsSOTrx:Y@'' AS DefaultValue FROM  DUAL',Updated=TO_DATE('2017-09-13 21:25:06','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_InfoColumn_ID=200036
+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:N@'' 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
+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
-;
\ No newline at end of file
+;
diff --git a/migration/i5.1/postgresql/201709131604_IDEMPIERE-3486.sql b/migration/i5.1/postgresql/201709131604_IDEMPIERE-3486.sql
index ff4b64d3f4..9b77018271 100644
--- a/migration/i5.1/postgresql/201709131604_IDEMPIERE-3486.sql
+++ b/migration/i5.1/postgresql/201709131604_IDEMPIERE-3486.sql
@@ -1,11 +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='@SQL=SELECT ''@IsSOTrx:Y@'' AS DefaultValue FROM  DUAL',Updated=TO_TIMESTAMP('2017-09-13 21:25:06','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_InfoColumn_ID=200036
+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:N@'' 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
+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
-;
\ No newline at end of file
+;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoBPartnerWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoBPartnerWindow.java
index 28fa3eaead..939eeeb3c7 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoBPartnerWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoBPartnerWindow.java
@@ -3,10 +3,8 @@
  */
 package org.adempiere.webui.info;
 
-import org.adempiere.webui.editor.WEditor;
 import org.adempiere.webui.panel.InvoiceHistory;
 import org.compiere.util.Env;
-import org.compiere.util.Util;
 
 /**
  * @author hengsin
@@ -16,7 +14,7 @@ public class InfoBPartnerWindow extends InfoWindow {
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -5291476382115985651L;
+	private static final long serialVersionUID = 240758053410996182L;
 
 	/**
 	 * @param WindowNo