From 9191ae5054a624756326d1a735dffafbaa087b85 Mon Sep 17 00:00:00 2001 From: Kuba Turek Date: Sat, 14 Jan 2023 16:42:37 +0100 Subject: [PATCH] Do not validate currency if account has no currency configured --- .../Api/Data/Bulk/ValidatesBulkTransactionQuery.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/Validation/Api/Data/Bulk/ValidatesBulkTransactionQuery.php b/app/Validation/Api/Data/Bulk/ValidatesBulkTransactionQuery.php index 35126c6359..85c823ea1e 100644 --- a/app/Validation/Api/Data/Bulk/ValidatesBulkTransactionQuery.php +++ b/app/Validation/Api/Data/Bulk/ValidatesBulkTransactionQuery.php @@ -67,8 +67,16 @@ trait ValidatesBulkTransactionQuery return; } + // must have same currency: - if ($repository->getAccountCurrency($source)->id !== $repository->getAccountCurrency($dest)->id) { + // some account types (like expenses) do not have currency, so they have to be omitted + $sourceCurrency = $repository->getAccountCurrency($source); + $destCurrency = $repository->getAccountCurrency($dest); + if ( + $sourceCurrency !== null + && $destCurrency !== null + && $sourceCurrency->id !== $destCurrency->id + ) { $validator->errors()->add('query', (string)trans('validation.invalid_query_currency')); } }