diff --git a/core/metamodel.class.php b/core/metamodel.class.php index 4db2c125d..6673bdbf4 100644 --- a/core/metamodel.class.php +++ b/core/metamodel.class.php @@ -333,7 +333,7 @@ abstract class MetaModel { self::_check_subclass($sClass); $sOql = self::$m_aClassParams[$sClass]['obsolescence_expression']; - $oRet = Expression::FromOQL($sOql); + $oRet = Expression::FromOQL("COALESCE($sOql, 0)"); return $oRet; } final static public function GetNameSpec($sClass) diff --git a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml index c4f47f89f..be0387a5d 100755 --- a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml +++ b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml @@ -30,7 +30,7 @@ - + @@ -137,7 +137,7 @@ - + @@ -897,7 +897,7 @@ - + @@ -1667,7 +1667,7 @@ - + @@ -2943,7 +2943,7 @@ - + @@ -3102,7 +3102,7 @@ - + @@ -3228,7 +3228,7 @@ - + diff --git a/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml b/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml index e439375bc..3d0aa51e7 100644 --- a/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml +++ b/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml @@ -26,7 +26,7 @@ - + @@ -283,7 +283,7 @@ - +