This commit is contained in:
James Cole 2017-08-12 06:55:46 +02:00
parent f51e48f282
commit 72b08384ad
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E

View File

@ -220,18 +220,24 @@ function resetDivSplits() {
function calculateSum() { function calculateSum() {
"use strict"; "use strict";
var left = originalSum * -1;
var sum = 0; var sum = 0;
var set = $('input[name$="][amount]"]'); var set = $('input[name$="][amount]"]');
for (var i = 0; i < set.length; i++) { for (var i = 0; i < set.length; i++) {
var current = $(set[i]); var current = $(set[i]);
sum += (current.val() === "" ? 0 : parseFloat(current.val())); sum += (current.val() === "" ? 0 : parseFloat(current.val()));
left += (current.val() === "" ? 0 : parseFloat(current.val()));
} }
sum = Math.round(sum * 100) / 100; sum = Math.round(sum * 100) / 100;
left = Math.round(left * 100) / 100;
$('.amount-warning').remove(); $('.amount-warning').remove();
if (sum !== originalSum) { if (sum !== originalSum) {
var holder = $('#journal_amount_holder'); var holder = $('#journal_amount_holder');
var par = holder.find('p.form-control-static'); var par = holder.find('p.form-control-static');
$('<span>').text(' (' + accounting.formatMoney(sum) + ')').addClass('text-danger amount-warning').appendTo(par); $('<span>').text(' (' + accounting.formatMoney(sum) + ')').addClass('text-danger amount-warning').appendTo(par);
// also add what's left to divide (or vice versa)
$('<span>').text(' (' + accounting.formatMoney(left) + ')').addClass('text-danger amount-warning').appendTo(par);
} }
} }