Merge branch 'develop' into feature/credit_calc

# Conflicts:
#	app/Repositories/Account/AccountRepository.php
This commit is contained in:
James Cole
2021-05-02 06:27:32 +02:00
99 changed files with 1254 additions and 555 deletions

View File

@@ -96,7 +96,7 @@ trait JournalServiceTrait
$search = null;
// first attempt, find by ID.
if (null !== $data['id']) {
$search = $this->accountRepository->findNull($data['id']);
$search = $this->accountRepository->findNull((int) $data['id']);
if (null !== $search && in_array($search->accountType->type, $types, true)) {
Log::debug(
sprintf('Found "account_id" object: #%d, "%s" of type %s', $search->id, $search->name, $search->accountType->type)