Merge branch 'develop' into feature/b931

# Conflicts:
#	application/applicationextension.inc.php
#	core/attributedef.class.inc.php
#	core/cmdbchangeop.class.inc.php
#	core/cmdbobject.class.inc.php
#	core/dbobjectsearch.class.php
#	core/oql/expression.class.inc.php
#	core/oql/oql-lexer.plex
#	core/oql/oql-parser.y
#	core/oql/oqlquery.class.inc.php
#	css/light-grey.scss
#	datamodels/2.x/itop-full-itil/datamodel.itop-full-itil.xml
#	datamodels/2.x/itop-portal/datamodel.itop-portal.xml
#	datamodels/2.x/itop-tickets/en.dict.itop-tickets.php
#	dictionaries/en.dictionary.itop.core.php
#	dictionaries/fr.dictionary.itop.core.php
#	setup/xmldataloader.class.inc.php
#	test/ItopDataTestCase.php

datamodels/2.x/itop-service-mgmt/main.itop-service-mgmt.php

@@ -1,20 +1,20 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop 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 Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop 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 Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+?>

datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php

@@ -1,94 +1,94 @@
-<?php
-
-
-SetupWebPage::AddModule(
-	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-service-mgmt/2.5.0',
-	array(
-		// Identification
-		//
-		'label' => 'Service Management',
-		'category' => 'business',
-
-		// Setup
-		//
-		'dependencies' => array(
-			'itop-config-mgmt/2.2.0',
-			'itop-tickets/2.0.0',
-		),
-		'mandatory' => false,
-		'visible' => true,
-		'installer' => 'ServiceMgmtInstaller',
-
-		// Components
-		//
-		'datamodel' => array(
-			'model.itop-service-mgmt.php',
-		),
-		'data.struct' => array(
-			//'data.struct.itop-service-mgmt.xml',
-		),
-		'data.sample' => array(
-			'data.sample.organizations.xml',
-			'data.sample.contracts.xml',
-			'data.sample.servicefamilies.xml',
-			'data.sample.services.xml',
-			'data.sample.serviceelements.xml',
-			'data.sample.sla.xml',
-			'data.sample.slt.xml',
-			'data.sample.sltsla.xml',
-	//		'data.sample.coveragewindows.xml',
-			'data.sample.contractservice.xml',
-	//		'data.sample.deliverymodel.xml',
-			'data.sample.deliverymodelcontact.xml',
-		),
-		
-		// Documentation
-		//
-		'doc.manual_setup' => '',
-		'doc.more_information' => '',
-
-		// Default settings
-		//
-		'settings' => array(
-		),
-	)
-);
-
-if (!class_exists('ServiceMgmtInstaller'))
-{
-	// Module installation handler
-	//
-	class ServiceMgmtInstaller extends ModuleInstallerAPI
-	{
-		public static function BeforeWritingConfig(Config $oConfiguration)
-		{
-			// If you want to override/force some configuration values, do it here
-			return $oConfiguration;
-		}
-
-		/**
-		 * Handler called before creating or upgrading the database schema
-		 * @param $oConfiguration Config The new configuration of the application
-		 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
-		 * @param $sCurrentVersion string Current version number of the module
-		 */
-		public static function BeforeDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
-		{
-			if (strlen($sPreviousVersion) > 0)
-			{
-				self::RenameEnumValueInDB('SLT', 'request_type', 'servicerequest', 'service_request');
-			}
-		}
-	
-		/**
-		 * Handler called after the creation/update of the database schema
-		 * @param $oConfiguration Config The new configuration of the application
-		 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
-		 * @param $sCurrentVersion string Current version number of the module
-		 */
-		public static function AfterDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
-		{
-		}
-	}
-}
+<?php
+
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'itop-service-mgmt/2.5.0',
+	array(
+		// Identification
+		//
+		'label' => 'Service Management',
+		'category' => 'business',
+
+		// Setup
+		//
+		'dependencies' => array(
+			'itop-config-mgmt/2.2.0',
+			'itop-tickets/2.0.0',
+		),
+		'mandatory' => false,
+		'visible' => true,
+		'installer' => 'ServiceMgmtInstaller',
+
+		// Components
+		//
+		'datamodel' => array(
+			'model.itop-service-mgmt.php',
+		),
+		'data.struct' => array(
+			//'data.struct.itop-service-mgmt.xml',
+		),
+		'data.sample' => array(
+			'data.sample.organizations.xml',
+			'data.sample.contracts.xml',
+			'data.sample.servicefamilies.xml',
+			'data.sample.services.xml',
+			'data.sample.serviceelements.xml',
+			'data.sample.sla.xml',
+			'data.sample.slt.xml',
+			'data.sample.sltsla.xml',
+	//		'data.sample.coveragewindows.xml',
+			'data.sample.contractservice.xml',
+	//		'data.sample.deliverymodel.xml',
+			'data.sample.deliverymodelcontact.xml',
+		),
+		
+		// Documentation
+		//
+		'doc.manual_setup' => '',
+		'doc.more_information' => '',
+
+		// Default settings
+		//
+		'settings' => array(
+		),
+	)
+);
+
+if (!class_exists('ServiceMgmtInstaller'))
+{
+	// Module installation handler
+	//
+	class ServiceMgmtInstaller extends ModuleInstallerAPI
+	{
+		public static function BeforeWritingConfig(Config $oConfiguration)
+		{
+			// If you want to override/force some configuration values, do it here
+			return $oConfiguration;
+		}
+
+		/**
+		 * Handler called before creating or upgrading the database schema
+		 * @param $oConfiguration Config The new configuration of the application
+		 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
+		 * @param $sCurrentVersion string Current version number of the module
+		 */
+		public static function BeforeDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
+		{
+			if (strlen($sPreviousVersion) > 0)
+			{
+				self::RenameEnumValueInDB('SLT', 'request_type', 'servicerequest', 'service_request');
+			}
+		}
+	
+		/**
+		 * Handler called after the creation/update of the database schema
+		 * @param $oConfiguration Config The new configuration of the application
+		 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
+		 * @param $sCurrentVersion string Current version number of the module
+		 */
+		public static function AfterDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
+		{
+		}
+	}
+}