EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
mass convert currency catch conflict
Yuri Kuznetsov252240f11b64
diff --git a/application/Espo/Core/MassAction/Actions/MassConvertCurrency.php b/application/Espo/Core/MassAction/Actions/MassConvertCurrency.phpindex 177cb9a4ab..40ef43614d 100644--- a/application/Espo/Core/MassAction/Actions/MassConvertCurrency.php+++ b/application/Espo/Core/MassAction/Actions/MassConvertCurrency.php@@ -34,6 +34,7 @@ use Espo\Core\Acl;use Espo\Core\Currency\ConfigDataProvider as CurrencyConfigDataProvider;use Espo\Core\Currency\Rates as CurrencyRates;use Espo\Core\Exceptions\BadRequest;+use Espo\Core\Exceptions\Conflict;use Espo\Core\Exceptions\Forbidden;use Espo\Core\MassAction\Data;use Espo\Core\MassAction\MassAction;@@ -124,7 +125,7 @@ class MassConvertCurrency implements MassActiontry {$converter->convert($entity, $targetCurrency, $rates);- } catch (Forbidden|BadRequest $e) {+ } catch (Forbidden|BadRequest|Conflict $e) {$this->log->info("Could not convert currency for {id}.", ['id' => $entity->getId(),'exception' => $e,diff --git a/application/Espo/Tools/Currency/Conversion/EntityConverter.php b/application/Espo/Tools/Currency/Conversion/EntityConverter.phpindex 3bd481622d..cc7f0c9749 100644--- a/application/Espo/Tools/Currency/Conversion/EntityConverter.php+++ b/application/Espo/Tools/Currency/Conversion/EntityConverter.php@@ -31,6 +31,7 @@ namespace Espo\Tools\Currency\Conversion;use Espo\Core\Currency\Rates;use Espo\Core\Exceptions\BadRequest;+use Espo\Core\Exceptions\Conflict;use Espo\Core\Exceptions\Forbidden;use Espo\ORM\Entity;@@ -45,6 +46,7 @@ interface EntityConverter* @param TEntity $entity* @throws Forbidden* @throws BadRequest+ * @throws Conflict*/public function convert(Entity $entity, string $targetCurrency, Rates $rates): void;}