Merge branch '158227644' into 'master'

Fixes: The currency values are formatted as per user preference

See merge request !1032

modules/Settings/LayoutEditor/models/Field.php

@@ -439,7 +439,8 @@ class Settings_LayoutEditor_Field_Model extends Vtiger_Field_Model {
 
 		if ($defaultValue) {
 			if ($this->getFieldDataType() == 'currency') {
-				$defaultValue = $this->getCurrencyDisplayValue($defaultValue, true);
+				//The argument for $skipformatting parameter is passed false to get value with user preference.
+				$defaultValue = $this->getCurrencyDisplayValue($defaultValue, false);
 			} else {
 				$defaultValue = $this->getDisplayValue($defaultValue);
 			}

modules/Settings/LayoutEditor/models/Module.php

@@ -183,7 +183,8 @@ class Settings_LayoutEditor_Module_Model extends Vtiger_Module_Model {
 		} else if (strtolower($fieldType) == 'time') {
 			$defaultValue = Vtiger_Time_UIType::getTimeValueWithSeconds($defaultValue);
 		} else if (strtolower($fieldType) == 'currency') {
-			$defaultValue = CurrencyField::convertToDBFormat($defaultValue, null, true);
+			//The argument for $skipformatting parameter is passed false to get the value in DB format($).
+			$defaultValue = CurrencyField::convertToDBFormat($defaultValue, null, false);
 		} else if (strtolower($fieldType) == 'decimal') {
 			$defaultValue = CurrencyField::convertToDBFormat($defaultValue, null, true);
 		}