EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
ref
Yuri Kuznetsov4270a452a71a
diff --git a/application/Espo/Classes/FieldValidators/CurrencyType.php b/application/Espo/Classes/FieldValidators/CurrencyType.phpindex 19d21e2943..2c07da27b1 100644--- a/application/Espo/Classes/FieldValidators/CurrencyType.php+++ b/application/Espo/Classes/FieldValidators/CurrencyType.php@@ -32,6 +32,7 @@ namespace Espo\Classes\FieldValidators;use Espo\Core\Field\Currency;use Espo\Core\Utils\Config;use Espo\ORM\BaseEntity;+use Espo\ORM\Defs\Params\AttributeParam;use Espo\ORM\Entity;class CurrencyType extends FloatType@@ -83,7 +84,7 @@ class CurrencyType extends FloatType}/** @var int $precision */- $precision = $entity->getAttributeParam($field, 'precision') ?? self::DEFAULT_PRECISION;+ $precision = $entity->getAttributeParam($field, AttributeParam::PRECISION) ?? self::DEFAULT_PRECISION;$value = $entity->get($field);diff --git a/application/Espo/Core/Utils/Database/Orm/Converter.php b/application/Espo/Core/Utils/Database/Orm/Converter.phpindex e837378590..31b688bb57 100644--- a/application/Espo/Core/Utils/Database/Orm/Converter.php+++ b/application/Espo/Core/Utils/Database/Orm/Converter.php@@ -96,8 +96,8 @@ class Converter'storeArrayValues' => 'storeArrayValues','binary' => 'binary','dependeeAttributeList' => 'dependeeAttributeList',- 'precision' => 'precision',- 'scale' => 'scale',+ FieldParam::PRECISION => AttributeParam::PRECISION,+ FieldParam::SCALE => AttributeParam::SCALE,];/** @var array<string, mixed> */diff --git a/application/Espo/Core/Utils/Database/Orm/FieldConverters/Currency.php b/application/Espo/Core/Utils/Database/Orm/FieldConverters/Currency.phpindex d64d4a22c4..d3b5cdd79b 100644--- a/application/Espo/Core/Utils/Database/Orm/FieldConverters/Currency.php+++ b/application/Espo/Core/Utils/Database/Orm/FieldConverters/Currency.php@@ -72,16 +72,16 @@ class Currency implements FieldConverter$convertedDefs = null;- if ($fieldDefs->getParam('decimal')) {+ if ($fieldDefs->getParam(FieldParam::DECIMAL)) {$dbType = $fieldDefs->getParam(FieldParam::DB_TYPE) ?? Types::DECIMAL;- $precision = $fieldDefs->getParam('precision') ?? self::DEFAULT_PRECISION;- $scale = $fieldDefs->getParam('scale') ?? self::DEFAULT_SCALE;+ $precision = $fieldDefs->getParam(FieldParam::PRECISION) ?? self::DEFAULT_PRECISION;+ $scale = $fieldDefs->getParam(FieldParam::SCALE) ?? self::DEFAULT_SCALE;$amountDefs = $amountDefs->withType(AttributeType::VARCHAR)->withDbType($dbType)- ->withParam('precision', $precision)- ->withParam('scale', $scale);+ ->withParam(AttributeParam::PRECISION, $precision)+ ->withParam(AttributeParam::SCALE, $scale);}if ($fieldDefs->isNotStorable()) {diff --git a/application/Espo/ORM/Defs/Params/AttributeParam.php b/application/Espo/ORM/Defs/Params/AttributeParam.phpindex 76c07b1a87..3608a4d744 100644--- a/application/Espo/ORM/Defs/Params/AttributeParam.php+++ b/application/Espo/ORM/Defs/Params/AttributeParam.php@@ -78,4 +78,14 @@ class AttributeParam* A foreign attribute name. For foreign attributes.*/public const FOREIGN = 'foreign';++ /**+ * Precision.+ */+ public const PRECISION = 'precision';++ /**+ * Scale.+ */+ public const SCALE = 'scale';}diff --git a/application/Espo/ORM/Defs/Params/FieldParam.php b/application/Espo/ORM/Defs/Params/FieldParam.phpindex d3c27c89fe..17cda72741 100644--- a/application/Espo/ORM/Defs/Params/FieldParam.php+++ b/application/Espo/ORM/Defs/Params/FieldParam.php@@ -73,4 +73,19 @@ class FieldParam* Read-only.*/public const READ_ONLY = 'readOnly';++ /**+ * Decimal.+ */+ public const DECIMAL = 'decimal';++ /**+ * Precision.+ */+ public const PRECISION = 'precision';++ /**+ * Scale.+ */+ public const SCALE = 'scale';}diff --git a/application/Espo/Tools/Import/Import.php b/application/Espo/Tools/Import/Import.phpindex 0276453c7d..4f4f9bb539 100644--- a/application/Espo/Tools/Import/Import.php+++ b/application/Espo/Tools/Import/Import.php@@ -37,6 +37,7 @@ use Espo\Core\Job\JobSchedulerFactory;use Espo\Entities\Attachment;use Espo\Entities\ImportError;use Espo\ORM\Defs\Params\AttributeParam;+use Espo\ORM\Defs\Params\FieldParam;use Espo\ORM\Defs\Params\RelationParam;use Espo\ORM\Name\Attribute;use Espo\Tools\Import\Jobs\RunIdle;@@ -811,7 +812,7 @@ class Importif ($fieldType === FieldType::CURRENCY &&- $fieldDefs->getParam('decimal')+ $fieldDefs->getParam(FieldParam::DECIMAL)) {$value = $this->transformFloatString($decimalMark, $value);