diff --git a/include/Webservices/VtigerCRMObjectMeta.php b/include/Webservices/VtigerCRMObjectMeta.php
index b6bec1b2b9fa3b85494b7113a08a109a0fd1317d..9e05b4d19f9e8e021e92248092e0441283c29f12 100644
--- a/include/Webservices/VtigerCRMObjectMeta.php
+++ b/include/Webservices/VtigerCRMObjectMeta.php
@@ -390,7 +390,7 @@ class VtigerCRMObjectMeta extends EntityMeta {
 		
 		$heirarchyUsers = get_user_array(false,"ACTIVE",$this->user->id);
 		$groupUsers = vtws_getUsersInTheSameGroup($this->user->id);
-		$this->assignUsers = $heirarchyUsers+$groupUsers;
+		$this->assignUsers = array_merge($heirarchyUsers, $groupUsers);
 		$this->assign = true;
 	}
 	
@@ -568,4 +568,4 @@ class VtigerCRMObjectMeta extends EntityMeta {
 	}
 
 }
-?>
\ No newline at end of file
+?>
diff --git a/layouts/v7/modules/Settings/CronTasks/ListViewRecordActions.tpl b/layouts/v7/modules/Settings/CronTasks/ListViewRecordActions.tpl
index 13d02dca0a92309be96b41c5175507bf9bb20b7b..86393002514d862a8c1feed845de456502e8d022 100644
--- a/layouts/v7/modules/Settings/CronTasks/ListViewRecordActions.tpl
+++ b/layouts/v7/modules/Settings/CronTasks/ListViewRecordActions.tpl
@@ -20,10 +20,7 @@
                 <a {if stripos($RECORD_LINK_URL, 'javascript:')===0} onclick="{$RECORD_LINK_URL|substr:strlen("javascript:")};if(event.stopPropagation){ldelim}event.stopPropagation();{rdelim}else{ldelim}event.cancelBubble=true;{rdelim}" {else} href='{$RECORD_LINK_URL}' {/if}>
                     <i class="fa fa-pencil" title="{vtranslate($RECORD_LINK->getLabel(), $QUALIFIED_MODULE)}"></i>
                 </a>
-                {if !$RECORD_LINK@lastui-sortable}
-                    &nbsp;&nbsp;
-                {/if}
             {/foreach}
         </span>
     </div>
-{/strip}        
\ No newline at end of file
+{/strip}        
diff --git a/modules/Migration/schema/600_to_610.php b/modules/Migration/schema/600_to_610.php
index 796046d64a0e7a754ff3ea86b346b5c9ff4086db..5a4fb58baf4cdf16858badcbc20b4b5e8f7aaf20 100644
--- a/modules/Migration/schema/600_to_610.php
+++ b/modules/Migration/schema/600_to_610.php
@@ -1257,7 +1257,7 @@ if(!defined('INSTALLATION_MODE')) {
         $recordModel->set('gateway', $qualifiedModuleName);
 
         $connector = new PBXManager_PBXManager_Connector;
-        foreach ($connector->getSettingsParameters() as $field => $type) {
+        foreach (PBXManager_PBXManager_Connector::getSettingsParameters() as $field => $type) {
             $fieldValue = "";
             if ($field == "webappurl") {
                 $fieldValue = "http://" . $server . ":";
diff --git a/modules/Vtiger/models/RelationListView.php b/modules/Vtiger/models/RelationListView.php
index 582c2476a0b5c8b29a13a66db87b2465c11f64b6..6cf6eff3e19680bb216fc4d99324e3ea0b5f112f 100644
--- a/modules/Vtiger/models/RelationListView.php
+++ b/modules/Vtiger/models/RelationListView.php
@@ -596,7 +596,7 @@ class Vtiger_RelationListView_Model extends Vtiger_Base_Model {
 		return $updatedQuery;
 	}
 
-	public function getCurrencySymbol($recordId, $fieldModel) {
+	public static function getCurrencySymbol($recordId, $fieldModel) {
 		$db = PearDatabase::getInstance();
 		$moduleName = $fieldModel->getModuleName();
 		$fieldName = $fieldModel->get('name');
diff --git a/packages/vtiger/mandatory/PBXManager.zip b/packages/vtiger/mandatory/PBXManager.zip
index e1bee3f72f8cde122f669b93bf5edf512cda2bf6..8466fcf6b37f7916cc4c6101270deab9d233a5c5 100644
Binary files a/packages/vtiger/mandatory/PBXManager.zip and b/packages/vtiger/mandatory/PBXManager.zip differ
diff --git a/pkg/vtiger/modules/PBXManager/modules/PBXManager/connectors/PBXManager.php b/pkg/vtiger/modules/PBXManager/modules/PBXManager/connectors/PBXManager.php
index 7982710fb558a0200c314e1c747e822f21cef605..3484b385b00635dd171c30b84daedff28d64d025 100644
--- a/pkg/vtiger/modules/PBXManager/modules/PBXManager/connectors/PBXManager.php
+++ b/pkg/vtiger/modules/PBXManager/modules/PBXManager/connectors/PBXManager.php
@@ -85,7 +85,7 @@ class PBXManager_PBXManager_Connector {
      * Function to get Settings edit view params
      * returns <array>
      */
-    public function getSettingsParameters() {
+    public static function getSettingsParameters() {
         return self::$SETTINGS_REQUIRED_PARAMETERS;
     }
 
diff --git a/pkg/vtiger/modules/PBXManager/settings/actions/SaveAjax.php b/pkg/vtiger/modules/PBXManager/settings/actions/SaveAjax.php
index a514c5601ef29f1e0ef3dbd97ec8f075fef4d891..efdca0f17acc4d6b5805e054dab99d138ba8f410 100644
--- a/pkg/vtiger/modules/PBXManager/settings/actions/SaveAjax.php
+++ b/pkg/vtiger/modules/PBXManager/settings/actions/SaveAjax.php
@@ -23,7 +23,7 @@ class Settings_PBXManager_SaveAjax_Action extends Vtiger_SaveAjax_Action {
         }
         
         $connector = new PBXManager_PBXManager_Connector;
-        foreach ($connector->getSettingsParameters() as $field => $type) {
+        foreach (PBXManager_PBXManager_Connector::getSettingsParameters() as $field => $type) {
                 $recordModel->set($field, $request->get($field));
         }
         
diff --git a/pkg/vtiger/modules/PBXManager/settings/models/Record.php b/pkg/vtiger/modules/PBXManager/settings/models/Record.php
index 2520ff18b6ea6bd61a7e927fa4457bdbf37e3ffa..e5706e36eb62337d4544e9cff6cd7204f8542127 100644
--- a/pkg/vtiger/modules/PBXManager/settings/models/Record.php
+++ b/pkg/vtiger/modules/PBXManager/settings/models/Record.php
@@ -71,9 +71,7 @@ class Settings_PBXManager_Record_Model extends Settings_Vtiger_Record_Model {
 		$db = PearDatabase::getInstance();
 		$parameters = array();
 		$selectedGateway = $this->get('gateway');
-                $connector = new PBXManager_PBXManager_Connector;
-
-                foreach ($connector->getSettingsParameters() as $field => $type) {
+                foreach (PBXManager_PBXManager_Connector::getSettingsParameters() as $field => $type) {
                         $parameters[$field] = $this->get($field);
                 }
                 $this->set('parameters', Zend_Json::encode($parameters));