Merge branch 'release/v6.1.3'

v6.1.2

changelog.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 6.1.3 - 2024-01-03
+
+### Fixed
+
+- [Issue 8326](https://github.com/firefly-iii/firefly-iii/issues/8326) Asking for non-zero foreign amount despite not being used
+
 ## 6.1.2 - 2024-01-03
 
 ### Changed

config/firefly.php

@@ -114,7 +114,7 @@ return [
         'handle_debts' => true,
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => '6.1.2',
+    'version'                      => '6.1.3',
     'api_version'                  => '2.0.12',
     'db_version'                   => 22,
 

resources/assets/js/components/transactions/EditTransaction.vue

@@ -451,7 +451,7 @@ export default {
             if (typeof window.expectedSourceTypes === 'undefined') {
                 console.error('window.expectedSourceTypes is unexpectedly empty.')
             }
-            this.transactions.push({
+            let result = {
                 transaction_journal_id: transaction.transaction_journal_id,
                 description: transaction.description,
                 date: transaction.date.substring(0, 16),
@@ -521,7 +521,11 @@ export default {
                     currency_decimal_places: transaction.currency_decimal_places,
                     allowed_types: window.expectedSourceTypes.destination[this.ucFirst(transaction.type)]
                 }
-            });
+            };
+            if(null === transaction.foreign_amount) {
+                result.foreign_amount.amount = '';
+            }
+            this.transactions.push(result);
         },
         limitSourceType: function (type) {
             // let i;