diff --git a/modules/Calendar/actions/Save.php b/modules/Calendar/actions/Save.php
index 0074aa18d452bb62a57b289d6f23fe8f36befd5c..f6b4cf19ff32dec68e476eeb92b2ff4f1b808d2c 100644
--- a/modules/Calendar/actions/Save.php
+++ b/modules/Calendar/actions/Save.php
@@ -159,6 +159,7 @@ class Calendar_Save_Action extends Vtiger_Save_Action {
 				if(!is_array($fieldValue)) {
 					$fieldValue = trim($fieldValue);
 				}
+                                $fieldValue = Vtiger_Util_Helper::validateFieldValue($fieldValue, $fieldModel);
 				$recordModel->set($fieldName, $fieldValue);
 			}
 		}
diff --git a/modules/SalesOrder/actions/SaveAjax.php b/modules/SalesOrder/actions/SaveAjax.php
index 92d2df700f9145cd73c988e4848b6d264451ca92..3a04b4049fcbf16a3c6e4839b35dad479ed97c86 100755
--- a/modules/SalesOrder/actions/SaveAjax.php
+++ b/modules/SalesOrder/actions/SaveAjax.php
@@ -66,6 +66,7 @@ class SalesOrder_SaveAjax_Action extends Inventory_SaveAjax_Action {
 					if (!is_array($fieldValue)) {
 						$fieldValue = trim($fieldValue);
 					}
+                                        $fieldValue = Vtiger_Util_Helper::validateFieldValue($fieldValue, $fieldModel);
 					$recordModel->set($fieldName, $fieldValue);
 				}
 				$recordModel->set($fieldName, $fieldValue);
@@ -84,9 +85,6 @@ class SalesOrder_SaveAjax_Action extends Inventory_SaveAjax_Action {
 					$fieldValue = $fieldModel->getDefaultFieldValue();
 				}
 				$fieldDataType = $fieldModel->getFieldDataType();
-                if($fieldValue){
-                    $fieldValue = Vtiger_Util_Helper::validateFieldValue($fieldValue,$fieldModel);
-                }
 				if ($fieldDataType == 'time' && $fieldValue !== null) {
 					$fieldValue = Vtiger_Time_UIType::getTimeValueWithSeconds($fieldValue);
 				}
@@ -94,6 +92,7 @@ class SalesOrder_SaveAjax_Action extends Inventory_SaveAjax_Action {
 					if (!is_array($fieldValue)) {
 						$fieldValue = trim($fieldValue);
 					}
+                                        $fieldValue = Vtiger_Util_Helper::validateFieldValue($fieldValue, $fieldModel);
 					$recordModel->set($fieldName, $fieldValue);
 				}
 			} 
diff --git a/modules/Vtiger/actions/Save.php b/modules/Vtiger/actions/Save.php
index 33a714782f31ccf9128589ab8e27c16aeaa4bde3..4a9c41dd78f172419a0cddda70f100df38b52c9c 100644
--- a/modules/Vtiger/actions/Save.php
+++ b/modules/Vtiger/actions/Save.php
@@ -170,6 +170,7 @@ class Vtiger_Save_Action extends Vtiger_Action_Controller {
 				if(!is_array($fieldValue) && $fieldDataType != 'currency') {
 					$fieldValue = trim($fieldValue);
 				}
+                                $fieldValue = Vtiger_Util_Helper::validateFieldValue($fieldValue, $fieldModel);
 				$recordModel->set($fieldName, $fieldValue);
 			}
 		}
diff --git a/modules/Vtiger/actions/SaveAjax.php b/modules/Vtiger/actions/SaveAjax.php
index e8a8618d8cd34ecfa804945a49f2ebea04d4fc8a..4ab555f85fd4b5cbd576bc06fbe89d5c47da84e4 100644
--- a/modules/Vtiger/actions/SaveAjax.php
+++ b/modules/Vtiger/actions/SaveAjax.php
@@ -111,6 +111,7 @@ class Vtiger_SaveAjax_Action extends Vtiger_Save_Action {
 					if (!is_array($fieldValue)) {
 						$fieldValue = trim($fieldValue);
 					}
+                                        $fieldValue = Vtiger_Util_Helper::validateFieldValue($fieldValue, $fieldModel);
 					$recordModel->set($fieldName, $fieldValue);
 				}
 				$recordModel->set($fieldName, $fieldValue);
@@ -132,9 +133,6 @@ class Vtiger_SaveAjax_Action extends Vtiger_Save_Action {
 				} else {
 					$fieldValue = $fieldModel->getDefaultFieldValue();
 				}
-                if($fieldValue){
-                    $fieldValue = Vtiger_Util_Helper::validateFieldValue($fieldValue,$fieldModel);
-                }
 				$fieldDataType = $fieldModel->getFieldDataType();
 				if ($fieldDataType == 'time' && $fieldValue !== null) {
 					$fieldValue = Vtiger_Time_UIType::getTimeValueWithSeconds($fieldValue);
@@ -144,6 +142,7 @@ class Vtiger_SaveAjax_Action extends Vtiger_Save_Action {
 					if (!is_array($fieldValue)) {
 						$fieldValue = trim($fieldValue);
 					}
+                                        $fieldValue = Vtiger_Util_Helper::validateFieldValue($fieldValue, $fieldModel);
 					$recordModel->set($fieldName, $fieldValue);
 				}
 			}