Skip to content

Firefly III: a personal finances manager

Expand changelog, add some debug.

James Cole075b0690264a
diff --git a/app/Http/Controllers/Recurring/EditController.php b/app/Http/Controllers/Recurring/EditController.php
index 15d3e1d5b1..d32f789295 100644
--- a/app/Http/Controllers/Recurring/EditController.php
+++ b/app/Http/Controllers/Recurring/EditController.php
@@ -106,7 +106,6 @@ class EditController extends Controller
/** @var RecurrenceTransformer $transformer */
$transformer = app(RecurrenceTransformer::class);
- $transformer->setParameters(new ParameterBag());
$array = $transformer->transform($recurrence);
$budgets = ExpandedForm::makeSelectListWithEmpty($this->budgetRepos->getActiveBudgets());
$bills = ExpandedForm::makeSelectListWithEmpty($this->billRepository->getActiveBills());
@@ -155,6 +154,10 @@ class EditController extends Controller
$array['first_date'] = substr((string) $array['first_date'], 0, 10);
$array['repeat_until'] = substr((string) $array['repeat_until'], 0, 10);
$array['transactions'][0]['tags'] = implode(',', $array['transactions'][0]['tags'] ?? []);
+ $array['transactions'][0]['amount'] = round((float) $array['transactions'][0]['amount'], $array['transactions'][0]['currency_decimal_places']);
+ if(null !== $array['transactions'][0]['foreign_amount']) {
+ $array['transactions'][0]['foreign_amount'] = round((float) $array['transactions'][0]['foreign_amount'], $array['transactions'][0]['foreign_currency_decimal_places']);
+ }
return view(
'recurring.edit',
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index 46506681d6..faf704fa10 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -155,16 +155,7 @@ class ReportController extends Controller
$start->endOfDay(); // end of day so the final balance is at the end of that day.
$end->endOfDay();
- app('view')->share(
- 'subTitle',
- trans(
- 'firefly.report_category',
- [
- 'start' => $start->isoFormat($this->monthAndDayFormat),
- 'end' => $end->isoFormat($this->monthAndDayFormat),
- ]
- )
- );
+ app('view')->share('subTitle', trans('firefly.report_category', ['start' => $start->isoFormat($this->monthAndDayFormat), 'end' => $end->isoFormat($this->monthAndDayFormat),]));
$generator = ReportGeneratorFactory::reportGenerator('Category', $start, $end);
$generator->setAccounts($accounts);
diff --git a/app/TransactionRules/Engine/SearchRuleEngine.php b/app/TransactionRules/Engine/SearchRuleEngine.php
index 5861cf888f..70f55f4d24 100644
--- a/app/TransactionRules/Engine/SearchRuleEngine.php
+++ b/app/TransactionRules/Engine/SearchRuleEngine.php
@@ -376,15 +376,14 @@ class SearchRuleEngine implements RuleEngineInterface
$collection = $this->findStrictRule($rule);
$this->processResults($rule, $collection);
- Log::debug(sprintf('SearchRuleEngine:: done processing strict rule #%d', $rule->id));
$result = $collection->count() > 0;
if (true === $result) {
- Log::debug(sprintf('SearchRuleEngine:: rule #%d was triggered (on %d transaction(s)).', $rule->id, $collection->count()));
+ Log::debug(sprintf('SearchRuleEngine:: Done. Rule #%d was triggered (on %d transaction(s)).', $rule->id, $collection->count()));
return true;
}
- Log::debug(sprintf('SearchRuleEngine:: rule #%d was not triggered (on %d transaction(s)).', $rule->id, $collection->count()));
+ Log::debug(sprintf('SearchRuleEngine:: Done. Rule #%d was not triggered (on %d transaction(s)).', $rule->id, $collection->count()));
return false;
}
@@ -496,7 +495,7 @@ class SearchRuleEngine implements RuleEngineInterface
$collection = $this->findNonStrictRule($rule);
$this->processResults($rule, $collection);
- Log::debug(sprintf('SearchRuleEngine:: done processing non-strict rule #%d', $rule->id));
+ Log::debug(sprintf('SearchRuleEngine:: Done processing non-strict rule #%d', $rule->id));
return $collection->count() > 0;
}
@@ -534,6 +533,7 @@ class SearchRuleEngine implements RuleEngineInterface
return;
}
}
+ Log::debug(sprintf('Done with rule group #%d.', $group->id));
}
/**
diff --git a/changelog.md b/changelog.md
index edd3a6e4dd..7f0edb50a2 100644
--- a/changelog.md
+++ b/changelog.md
@@ -8,8 +8,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Fixed
- [Issue 11157](https://github.com/firefly-iii/firefly-iii/issues/11157) (Redacted amounts misbehave with Reports) reported by @barreeeiroo
+- #11166
- #11185
+
+
## 6.4.4 - 2025-11-02
### Added