Merge branch '292505' into 'master'

Fixes :Fixed Typo which caused issue an Picklist Color Displaying

See merge request vtiger/vtigercrm!1187

modules/Settings/Picklist/models/Module.php

@@ -498,8 +498,8 @@ class Settings_Picklist_Module_Model extends Vtiger_Module_Model {
 	public static function getPicklistColorMap($fieldName, $key = false) {
 		$db = PearDatabase::getInstance();
 		$primaryKey = Vtiger_Util_Helper::getPickListId($fieldName);
-		$colums = $db->getColumnNames("vtiger_$fieldName");
-		if(is_array($columns) && in_array('color',$colums)) {
+		$columns = $db->getColumnNames("vtiger_$fieldName");
+		if(is_array($columns) && in_array('color',$columns)) {
 			$query = 'SELECT '.$primaryKey.',color,'.$fieldName.' FROM vtiger_'.$fieldName;
 			$result = $db->pquery($query, array());
 			$pickListColorMap = array();