Merge branch 'Assigned_to_Advance_Search' into 'master'

#1117 :: Uma ::Assigned to in Advance search not populating data

See merge request !420

layouts/v7/modules/Vtiger/resources/Field.js

@@ -469,7 +469,11 @@ Vtiger_Field_Js('Vtiger_Owner_Field_Js',{},{
 	 * Function to get the picklist values
 	 */
 	getPickListValues : function() {
-		return this.get('editablepicklistvalues');
+            var pickListValues = this.get('editablepicklistvalues');
+            if (pickListValues == ''){
+                pickListValues = this.get('picklistvalues');
+            }
+            return pickListValues;
 	},
 
 	getUi : function() {