diff --git a/data/CRMEntity.php b/data/CRMEntity.php
index a11a3ea99b124215d382112b8c4c05fa34a96012..be109258929dfc0abbf8ce33fb9c93dedcd9a674 100644
--- a/data/CRMEntity.php
+++ b/data/CRMEntity.php
@@ -112,7 +112,7 @@ class CRMEntity {
 		}
 
 		// added to support files transformation for file upload fields like uitype 69, 
-		if(count($_FILES)) {
+		if(!empty($_FILES) && count($_FILES)) {
 			$_FILES = Vtiger_Util_Helper::transformUploadedFiles($_FILES, true);
 		}
 
diff --git a/layouts/v7/modules/Vtiger/DetailViewActions.tpl b/layouts/v7/modules/Vtiger/DetailViewActions.tpl
index 3a1c788d95ba0093c7a91abd477debcebfc4a6e1..b1b0c59422fc22d393e748565a85b9a7220842f2 100644
--- a/layouts/v7/modules/Vtiger/DetailViewActions.tpl
+++ b/layouts/v7/modules/Vtiger/DetailViewActions.tpl
@@ -42,7 +42,7 @@
                     {vtranslate($DETAIL_VIEW_BASIC_LINK->getLabel(), $MODULE_NAME)}
                 </button>
             {/foreach}
-            {if $DETAILVIEW_LINKS['DETAILVIEW']|@count gt 0}
+            {if !empty($DETAILVIEW_LINKS['DETAILVIEW']) && ($DETAILVIEW_LINKS['DETAILVIEW']|@count gt 0)}
                 <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="javascript:void(0);">
                    {vtranslate('LBL_MORE', $MODULE_NAME)}&nbsp;&nbsp;<i class="caret"></i>
                 </button>
diff --git a/layouts/v7/modules/Vtiger/uitypes/String.tpl b/layouts/v7/modules/Vtiger/uitypes/String.tpl
index d5446d56576dc3f0b6b7b2ff7f916f93006964d8..00ec549f4208b9fc32266f91d059df3358108c72 100644
--- a/layouts/v7/modules/Vtiger/uitypes/String.tpl
+++ b/layouts/v7/modules/Vtiger/uitypes/String.tpl
@@ -26,7 +26,7 @@
 		{/if}
 		{if !empty($SPECIAL_VALIDATOR)}data-validator="{Zend_Json::encode($SPECIAL_VALIDATOR)}"{/if}
 		{if $FIELD_INFO["mandatory"] eq true} data-rule-required="true" {/if}
-		{if count($FIELD_INFO['validator'])}
+		{if !empty($FIELD_INFO['validator']) && (count($FIELD_INFO['validator']))}
 			data-specific-rules='{ZEND_JSON::encode($FIELD_INFO["validator"])}'
 		{/if}
 		   />
diff --git a/modules/Inventory/views/Detail.php b/modules/Inventory/views/Detail.php
index e09bc755472cd62bb150bab5fba80649af309838..8c12acb09469bc093b60db7501902992feb9016e 100644
--- a/modules/Inventory/views/Detail.php
+++ b/modules/Inventory/views/Detail.php
@@ -9,7 +9,7 @@
  *************************************************************************************/
 
 class Inventory_Detail_View extends Vtiger_Detail_View {
-	function preProcess(Vtiger_Request $request) {
+	function preProcess(Vtiger_Request $request, $display=true) {
 		$viewer = $this->getViewer($request);
 		$viewer->assign('NO_SUMMARY', true);
 		parent::preProcess($request);
diff --git a/modules/Vtiger/views/BasicAjax.php b/modules/Vtiger/views/BasicAjax.php
index daaf1bafe84ee253fbbbb46b305c08da43be4577..5d72bca335f407387eeb5c70701355938d535969 100644
--- a/modules/Vtiger/views/BasicAjax.php
+++ b/modules/Vtiger/views/BasicAjax.php
@@ -23,7 +23,7 @@ class Vtiger_BasicAjax_View extends Vtiger_Basic_View {
 		return $permissions;
 	}
 
-	function preProcess(Vtiger_Request $request) {
+	function preProcess(Vtiger_Request $request, $display=true) {
 		return true;
 	}
 
diff --git a/modules/Vtiger/views/Detail.php b/modules/Vtiger/views/Detail.php
index d55d87d885e5730bbd689752810be8b943584dfb..5040b7e5897e702500f9e040bc9e544da65e06e8 100644
--- a/modules/Vtiger/views/Detail.php
+++ b/modules/Vtiger/views/Detail.php
@@ -283,7 +283,7 @@ class Vtiger_Detail_View extends Vtiger_Index_View {
 		return $headerScriptInstances;
 	}
 
-	function showDetailViewByMode($request) {
+	function showDetailViewByMode(Vtiger_Request $request) {
 		$requestMode = $request->get('requestMode');
 		if($requestMode == 'full') {
 			return $this->showModuleDetailView($request);
diff --git a/packages/vtiger/optional/Webforms.zip b/packages/vtiger/optional/Webforms.zip
index 8647799b0617afabb6b5a15e6371b06f37ffa462..39f4a30209ed1843ebea231c8da212d8b617b54a 100644
Binary files a/packages/vtiger/optional/Webforms.zip and b/packages/vtiger/optional/Webforms.zip differ
diff --git a/pkg/vtiger/modules/Webforms/settings/models/Field.php b/pkg/vtiger/modules/Webforms/settings/models/Field.php
index 1190f67709e6ac56d2dbef0fea212e429b3ede0d..7037cbf1dac3423f3e38b2bd2d3e3a293a26cc57 100644
--- a/pkg/vtiger/modules/Webforms/settings/models/Field.php
+++ b/pkg/vtiger/modules/Webforms/settings/models/Field.php
@@ -93,7 +93,7 @@ class Settings_Webforms_Field_Model extends Vtiger_Field_Model {
 		return parent::getDisplayValue($value);
 	}
     
-	public function getPermissions($accessmode = false) {
+	public function getPermissions($accessmode = 'readonly') {
 		return true;
 	}