diff --git a/accounting/static/accounting/js/account-form.js b/accounting/static/accounting/js/account-form.js index 77c0737..fe7e976 100644 --- a/accounting/static/accounting/js/account-form.js +++ b/accounting/static/accounting/js/account-form.js @@ -97,8 +97,8 @@ function updateParent(code) { */ function validateForm() { let isValid = true; - isValid = isValid && validateCode(); - isValid = isValid && validateTitle(); + isValid = validateCode() && isValid; + isValid = validateTitle() && isValid; return isValid; } diff --git a/accounting/static/accounting/js/transaction-form.js b/accounting/static/accounting/js/transaction-form.js index 90d141c..0e1b6d8 100644 --- a/accounting/static/accounting/js/transaction-form.js +++ b/accounting/static/accounting/js/transaction-form.js @@ -338,26 +338,26 @@ function resetRecordButtons() { */ function validateForm() { let isValid = true; - isValid = isValid && validateDate(); + isValid = validateDate() && isValid; $(".debit-record").each(function () { - isValid = isValid && validateRecord(this); + isValid = validateRecord(this) && isValid; }); $(".credit-account").each(function () { - isValid = isValid && validateRecord(this); + isValid = validateRecord(this) && isValid; }); $(".record-account").each(function () { - isValid = isValid && validateAccount(this); + isValid = validateAccount(this) && isValid; }); $(".record-summary").each(function () { - isValid = isValid && validateSummary(this); + isValid = validateSummary(this) && isValid; }); $(".record-amount").each(function () { - isValid = isValid && validateAmount(this); + isValid = validateAmount(this) && isValid; }); if (isTransfer()) { - isValid = isValid && validateBalance(); + isValid = validateBalance() && isValid; } - isValid = isValid && validateNote(); + isValid = validateNote() && isValid; return isValid; }