Merge branch 'develop' into feature/credit_calc

# Conflicts: # app/Repositories/Account/AccountRepository.php
2025-09-24 22:48:18 +00:00 · 2021-05-02 06:27:32 +02:00
parent a83578d1ae 8f6655f85e
commit d0622dbcd3
99 changed files with 1254 additions and 555 deletions
--- a/app/Support/Http/Controllers/RuleManagement.php
+++ b/app/Support/Http/Controllers/RuleManagement.php
@@ -61,7 +61,7 @@ trait RuleManagement
                    ],
                    [
                        'type'            => 'from_account_is',
-                        'value'           => (string)trans('firefly.default_rule_trigger_from_account'),
+                        'value'           => (string)trans('firefly.default_rule_trigger_source_account'),
                        'stop_processing' => false,

                    ],