diff --git a/org.compiere.db.oracle.provider/src/org/adempiere/db/oracle/partition/TablePartitionService.java b/org.compiere.db.oracle.provider/src/org/adempiere/db/oracle/partition/TablePartitionService.java
index 1668d370ec..b921524b11 100644
--- a/org.compiere.db.oracle.provider/src/org/adempiere/db/oracle/partition/TablePartitionService.java
+++ b/org.compiere.db.oracle.provider/src/org/adempiere/db/oracle/partition/TablePartitionService.java
@@ -552,7 +552,9 @@ public class TablePartitionService implements ITablePartitionService {
 					name.append(partitionNamePrefix).append("_");
 				String s = rs.getString(partitionKeyColumn.getColumnName());
 				name.append(s);
-				if (DisplayType.isText(partitionKeyColumn.getAD_Reference_ID()))
+				if (DisplayType.isText(partitionKeyColumn.getAD_Reference_ID()) || partitionKeyColumn.getAD_Reference_ID() == DisplayType.YesNo
+					|| "EntityType".equals(partitionKeyColumn.getColumnName())
+					|| "AD_Language".equals(partitionKeyColumn.getColumnName()))
 					expression.append(DB.TO_STRING(s));
 				else if (partitionKeyColumn.getAD_Reference_ID() == DisplayType.Date)
 					expression.append(DB.TO_DATE(rs.getTimestamp(partitionKeyColumn.getColumnName())));
diff --git a/org.compiere.db.postgresql.provider/src/org/adempiere/db/postgresql/partition/TablePartitionService.java b/org.compiere.db.postgresql.provider/src/org/adempiere/db/postgresql/partition/TablePartitionService.java
index 95a15afffa..6ac816a2ed 100644
--- a/org.compiere.db.postgresql.provider/src/org/adempiere/db/postgresql/partition/TablePartitionService.java
+++ b/org.compiere.db.postgresql.provider/src/org/adempiere/db/postgresql/partition/TablePartitionService.java
@@ -889,7 +889,9 @@ public class TablePartitionService implements ITablePartitionService {
 			
 		updateStmt.append(partitionKeyColumn.getColumnName()).append("=");						
 				
-		if (DisplayType.isText(partitionKeyColumn.getAD_Reference_ID()))
+		if (DisplayType.isText(partitionKeyColumn.getAD_Reference_ID()) || partitionKeyColumn.getAD_Reference_ID() == DisplayType.YesNo 
+			|| "EntityType".equals(partitionKeyColumn.getColumnName())
+			|| "AD_Language".equals(partitionKeyColumn.getColumnName()))
 			updateStmt.append("'").append(listValue).append("' ");
 		else
 			updateStmt.append(listValue).append(" ");
diff --git a/org.idempiere.tablepartition/src/org/idempiere/tablepartition/callout/ColumnCallout.java b/org.idempiere.tablepartition/src/org/idempiere/tablepartition/callout/ColumnCallout.java
index 4c7c7dac93..a62440a5cc 100644
--- a/org.idempiere.tablepartition/src/org/idempiere/tablepartition/callout/ColumnCallout.java
+++ b/org.idempiere.tablepartition/src/org/idempiere/tablepartition/callout/ColumnCallout.java
@@ -54,7 +54,7 @@ public class ColumnCallout implements IColumnCallout {
 				if (seqNo != null)
 					mTab.setValue("SeqNoPartition", null);
 			}
-		} else if ("RangePartitionInterval".equals(mField.getColumnName())) {
+		} else if ("RangePartitionInterval".equals(mField.getColumnName()) && value != null) {
 			MColumn column = MColumn.getCopy(Env.getCtx(), mTab.getRecord_ID(), null);
 			column.setRangePartitionInterval(value.toString());
 			String error = RangePartitionInterval.validateIntervalPattern(column);