hg merge release-2.0 (merge release2 into development)

This commit is contained in:
Carlos Ruiz 2014-05-08 09:54:21 -05:00
commit 682ebf5955
1 changed files with 2 additions and 1 deletions

View File

@ -48,7 +48,7 @@ public class Callout_AD_Column extends CalloutEngine
column.setIsIdentifier(false); column.setIsIdentifier(false);
column.setIsUpdateable(false); column.setIsUpdateable(false);
column.setIsAlwaysUpdateable(false); column.setIsAlwaysUpdateable(false);
column.setIsKey(true); column.setIsKey(false);
} else if (column.getAD_Table().getTableName().concat("_ID").equals(column.getColumnName())) { } else if (column.getAD_Table().getTableName().concat("_ID").equals(column.getColumnName())) {
// ID key column // ID key column
column.setAD_Reference_ID(DisplayType.ID); column.setAD_Reference_ID(DisplayType.ID);
@ -61,6 +61,7 @@ public class Callout_AD_Column extends CalloutEngine
column.setIsIdentifier(false); column.setIsIdentifier(false);
column.setIsUpdateable(false); column.setIsUpdateable(false);
column.setIsAlwaysUpdateable(false); column.setIsAlwaysUpdateable(false);
column.setIsKey(true);
} else { } else {
// get defaults from most used case // get defaults from most used case
String sql = "" String sql = ""