diff --git a/layouts/v7/modules/Settings/Workflows/resources/Edit.js b/layouts/v7/modules/Settings/Workflows/resources/Edit.js
index d999bb4557f902468965f4a7cb76358586436d07..1a9aa44eded101ed7458d32472b0392a39d0e7f8 100644
--- a/layouts/v7/modules/Settings/Workflows/resources/Edit.js
+++ b/layouts/v7/modules/Settings/Workflows/resources/Edit.js
@@ -110,7 +110,7 @@ Settings_Vtiger_Edit_Js("Settings_Workflows_Edit_Js", {
     },
 	
 
-    getPopUp: function (container, flag) {
+    getPopUp: function (container) {
       var thisInstance = this;
       if (typeof container == 'undefined') {
          container = thisInstance.getContainer();
@@ -811,7 +811,7 @@ Settings_Vtiger_Edit_Js("Settings_Workflows_Edit_Js", {
       jQuery.each(fields, function (i, field) {
          thisInstance.loadFieldSpecificUi(jQuery(field));
       });
-      this.getPopUp(jQuery('#saveTask'), true);
+      this.getPopUp(jQuery('#saveTask'));
    },
    registerVTPushNotificationTaskEvents: function () {
       this.registerFillMailContentEvent();
diff --git a/modules/Settings/Picklist/models/Field.php b/modules/Settings/Picklist/models/Field.php
index 182d8054bfe09edca6b96f8949d0dd57260626a3..f7b64bd6b702fb1320bf7560e9b2737157b88028 100644
--- a/modules/Settings/Picklist/models/Field.php
+++ b/modules/Settings/Picklist/models/Field.php
@@ -102,7 +102,7 @@ class Settings_Picklist_Field_Model extends Vtiger_Field_Model {
      * @param type $fieldName -- string
      * @return type -- array of values
      */
-	public static function getEditablePicklistValues($fieldName){
+	public function getEditablePicklistValues($fieldName){
 		$cache = Vtiger_Cache::getInstance();
 		$EditablePicklistValues = $cache->get('EditablePicklistValues', $fieldName);
         if($EditablePicklistValues) {