Merge pull request #10777 from firefly-iii/release-1755488100

🤖 Automatically merge the PR into the develop branch.

app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php

@@ -49,8 +49,6 @@ class TransactionTypeController extends Controller
             function ($request, $next) {
                 $this->validateUserGroup($request);
                 $this->repository = app(TransactionTypeRepositoryInterface::class);
-                $this->repository->setUser($this->user);
-                $this->repository->setUserGroup($this->userGroup);
 
                 return $next($request);
             }

app/Api/V1/Controllers/Chart/AccountController.php

@@ -130,6 +130,7 @@ class AccountController extends Controller
             'yAxisID'                 => 0,
             'period'                  => '1D',
             'entries'                 => [],
+            'pc_entries'              => [],
         ];
         if ($this->convertToPrimary) {
             $currentSet['pc_entries']                      = [];

app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php

@@ -47,6 +47,7 @@ class BudgetLimitEnrichment implements EnrichmentInterface
         $this->collectCurrencies();
         $this->collectNotes();
         $this->collectBudgets();
+        $this->stringifyIds();
         $this->appendCollectedData();
 
         return $this->collection;
@@ -155,4 +156,23 @@ class BudgetLimitEnrichment implements EnrichmentInterface
             $this->currencies[(int)$currency->id] = $currency;
         }
     }
+
+    private function stringifyIds(): void
+    {
+        $this->expenses   = array_map(function ($first) {
+            return array_map(function ($second) {
+                $second['currency_id'] = (string)($second['currency_id'] ?? 0);
+
+                return $second;
+            }, $first);
+        }, $this->expenses);
+
+        $this->pcExpenses = array_map(function ($first) {
+            return array_map(function ($second) {
+                $second['currency_id'] = (string)($second['currency_id'] ?? 0);
+
+                return $second;
+            }, $first);
+        }, $this->expenses);
+    }
 }

app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php

@@ -170,7 +170,7 @@ class PiggyBankEnrichment implements EnrichmentInterface
             // add object group if available
             if (array_key_exists($id, $this->mappedObjects)) {
                 $key                        = $this->mappedObjects[$id];
-                $meta['object_group_id']    = $this->objectGroups[$key]['id'];
+                $meta['object_group_id']    = (string) $this->objectGroups[$key]['id'];
                 $meta['object_group_title'] = $this->objectGroups[$key]['title'];
                 $meta['object_group_order'] = $this->objectGroups[$key]['order'];
             }

app/Transformers/BudgetLimitTransformer.php

@@ -28,6 +28,7 @@ use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\Steam;
+use FireflyIII\Support\JsonApi\Enrichments\BudgetEnrichment;
 use League\Fractal\Resource\Item;
 
 /**
@@ -55,7 +56,15 @@ class BudgetLimitTransformer extends AbstractTransformer
      */
     public function includeBudget(BudgetLimit $limit)
     {
-        return $this->item($limit->budget, new BudgetTransformer(), 'budgets');
+        // enrich budget
+        $budget     = $limit->budget;
+        $enrichment = new BudgetEnrichment();
+        $enrichment->setStart($this->parameters->get('start'));
+        $enrichment->setEnd($this->parameters->get('end'));
+        $enrichment->setUser($budget->user);
+        $budget     = $enrichment->enrichSingle($budget);
+
+        return $this->item($budget, new BudgetTransformer(), 'budgets');
     }
 
     /**
@@ -91,7 +100,7 @@ class BudgetLimitTransformer extends AbstractTransformer
             'currency_symbol'                 => $currency->symbol,
             'currency_decimal_places'         => $currency->decimal_places,
 
-            'primary_currency_id'             => (int)$this->primaryCurrency->id,
+            'primary_currency_id'             => (string) $this->primaryCurrency->id,
             'primary_currency_name'           => $this->primaryCurrency->name,
             'primary_currency_code'           => $this->primaryCurrency->code,
             'primary_currency_symbol'         => $this->primaryCurrency->symbol,

config/firefly.php

@@ -78,8 +78,8 @@ return [
         'running_balance_column' => env('USE_RUNNING_BALANCE', false),
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => 'develop/2025-08-17',
-    'build_time'                   => 1755421579,
+    'version'                      => 'develop/2025-08-18',
+    'build_time'                   => 1755488001,
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 26,
 

resources/assets/v1/src/locales/de.json

@@ -110,13 +110,13 @@
         "webhook_trigger_STORE_TRANSACTION": "Nach Erstellen einer Buchung",
         "webhook_trigger_UPDATE_TRANSACTION": "Nach Aktualisierung einer Buchung",
         "webhook_trigger_DESTROY_TRANSACTION": "Nach dem L\u00f6schen einer Buchung",
-        "webhook_trigger_STORE_BUDGET": "After budget creation",
-        "webhook_trigger_UPDATE_BUDGET": "After budget update",
-        "webhook_trigger_DESTROY_BUDGET": "After budget delete",
-        "webhook_trigger_STORE_UPDATE_BUDGET_LIMIT": "After budgeted amount change",
+        "webhook_trigger_STORE_BUDGET": "Nach der Erstellung des Budgets",
+        "webhook_trigger_UPDATE_BUDGET": "Nach der Aktualisierung des Budgets",
+        "webhook_trigger_DESTROY_BUDGET": "Nach dem L\u00f6schen des Budgets",
+        "webhook_trigger_STORE_UPDATE_BUDGET_LIMIT": "Nach dem \u00c4ndern des budgetierten Betrags",
         "webhook_response_TRANSACTIONS": "Buchungsdetails",
         "webhook_response_ACCOUNTS": "Kontodetails",
-        "webhook_response_NONE": "No details",
+        "webhook_response_NONE": "Keine Details",
         "webhook_delivery_JSON": "JSON",
         "actions": "Aktionen",
         "meta_data": "Metadaten",

resources/assets/v1/src/locales/fr.json

@@ -110,13 +110,13 @@
         "webhook_trigger_STORE_TRANSACTION": "Apr\u00e8s la cr\u00e9ation de l'op\u00e9ration",
         "webhook_trigger_UPDATE_TRANSACTION": "Apr\u00e8s la mise \u00e0 jour de l'op\u00e9ration",
         "webhook_trigger_DESTROY_TRANSACTION": "Apr\u00e8s la suppression de l'op\u00e9ration",
-        "webhook_trigger_STORE_BUDGET": "After budget creation",
-        "webhook_trigger_UPDATE_BUDGET": "After budget update",
-        "webhook_trigger_DESTROY_BUDGET": "After budget delete",
-        "webhook_trigger_STORE_UPDATE_BUDGET_LIMIT": "After budgeted amount change",
+        "webhook_trigger_STORE_BUDGET": "Apr\u00e8s la cr\u00e9ation du budget",
+        "webhook_trigger_UPDATE_BUDGET": "Apr\u00e8s la mise \u00e0 jour du budget",
+        "webhook_trigger_DESTROY_BUDGET": "Apr\u00e8s la suppression du budget",
+        "webhook_trigger_STORE_UPDATE_BUDGET_LIMIT": "Apr\u00e8s le changement du montant budg\u00e9tis\u00e9",
         "webhook_response_TRANSACTIONS": "D\u00e9tails de l'op\u00e9ration",
         "webhook_response_ACCOUNTS": "D\u00e9tails du compte",
-        "webhook_response_NONE": "No details",
+        "webhook_response_NONE": "Aucun d\u00e9tail",
         "webhook_delivery_JSON": "JSON",
         "actions": "Actions",
         "meta_data": "M\u00e9tadonn\u00e9es",