mirror of
https://github.com/mayswind/ezbookkeeping.git
synced 2026-05-20 01:34:24 +08:00
fix liability account balance display
This commit is contained in:
@@ -607,7 +607,13 @@ export default {
|
||||
const account = accounts[i];
|
||||
|
||||
if (this.showAccountBalance) {
|
||||
account.displayBalance = this.$options.filters.currency(account.balance, account.currency);
|
||||
if (account.isAsset) {
|
||||
account.displayBalance = this.$options.filters.currency(account.balance, account.currency);
|
||||
} else if (account.isLiability) {
|
||||
account.displayBalance = this.$options.filters.currency(-account.balance, account.currency);
|
||||
} else {
|
||||
account.displayBalance = this.$options.filters.currency(account.balance, account.currency);
|
||||
}
|
||||
} else {
|
||||
account.displayBalance = '***';
|
||||
}
|
||||
@@ -628,7 +634,13 @@ export default {
|
||||
|
||||
for (let i = 0; i < accountsBalance.length; i++) {
|
||||
if (accountsBalance[i].currency === this.defaultCurrency) {
|
||||
totalBalance += accountsBalance[i].balance;
|
||||
if (accountsBalance[i].isAsset) {
|
||||
totalBalance += accountsBalance[i].balance;
|
||||
} else if (accountsBalance[i].isLiability) {
|
||||
totalBalance -= accountsBalance[i].balance;
|
||||
} else {
|
||||
totalBalance += accountsBalance[i].balance;
|
||||
}
|
||||
} else {
|
||||
const balance = this.$exchangeRates.getOtherCurrencyAmount(accountsBalance[i].balance, accountsBalance[i].currency, this.defaultCurrency);
|
||||
|
||||
@@ -637,7 +649,13 @@ export default {
|
||||
continue;
|
||||
}
|
||||
|
||||
totalBalance += Math.floor(balance);
|
||||
if (accountsBalance[i].isAsset) {
|
||||
totalBalance += Math.floor(balance);
|
||||
} else if (accountsBalance[i].isLiability) {
|
||||
totalBalance -= Math.floor(balance);
|
||||
} else {
|
||||
totalBalance += Math.floor(balance);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user