gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-10 05:11:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #11147

Browse Source
This commit is contained in:
James Cole
2025-11-01 18:07:54 +01:00
parent 8f4511b466
commit b43f0ca4a8
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
changelog.md
View File

@@ -3,6 +3,12 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/). This project adheres to [Semantic Versioning](http://semver.org/).
## 6.4.4 - 2025-11-02
### Fixed
- #11147
## 6.4.3 - 2025-11-01 ## 6.4.3 - 2025-11-01
### Added ### Added

9
public/v1/js/ff/accounts/reconcile.js
View File

@@ -89,9 +89,9 @@ function selectAllReconcile(e) {
console.log('in selectAllReconcile(' + journalId + ') with amount ' + amount + ' and selected amount ' + selectedAmount); console.log('in selectAllReconcile(' + journalId + ') with amount ' + amount + ' and selected amount ' + selectedAmount);
// do nothing if line is already in target state // do nothing if line is already in target state
if (check.prop('checked') === doCheck ) if (check.prop('checked') === doCheck)
return; return;
check.prop('checked', doCheck); check.prop('checked', doCheck);
// if checked, add to selected amount // if checked, add to selected amount
if (doCheck === true && check.data('younger') === false) { if (doCheck === true && check.data('younger') === false) {
@@ -201,6 +201,7 @@ function getTransactionsForRange() {
$.getJSON(url).done(placeTransactions).catch(exceptionHandling) $.getJSON(url).done(placeTransactions).catch(exceptionHandling)
} }
function exceptionHandling() { function exceptionHandling() {
$('#transactions_holder').empty().append($('<p>').addClass('text-center lead').html(selectRangeAndBalance)); $('#transactions_holder').empty().append($('<p>').addClass('text-center lead').html(selectRangeAndBalance));
$('.start_reconcile').show(); $('.start_reconcile').show();
@@ -254,8 +255,8 @@ function placeTransactions(data) {
selectedAmount = 0; selectedAmount = 0;
// update start + end balance when user has not touched them. // update start + end balance when user has not touched them.
if (!changedBalances) { if (!changedBalances) {
$('input[name="start_balance"]').val(data.startBalance); $('input[name="start_balance"]').val(data.startBalance.balance);
$('input[name="end_balance"]').val(data.endBalance); $('input[name="end_balance"]').val(data.endBalance.balance);
} }
// as long as the dates are equal, changing the balance does not matter. // as long as the dates are equal, changing the balance does not matter.