diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/Messages.java b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/Messages.java index a0d4539cd9..381604cae1 100644 --- a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/Messages.java +++ b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/Messages.java @@ -103,6 +103,7 @@ public class Messages extends NLS public static String ColumnAutoGenerate; public static String ColumnBalance; public static String ColumnBalance_Description; + public static String ColumnBalanceOfReferenceAccount; public static String ColumnBaseCurrency; public static String ColumnCapitalGains; public static String ColumnCapitalGains_Description; diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages.properties index 2212ce966e..8dac934a05 100644 --- a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages.properties +++ b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages.properties @@ -254,6 +254,8 @@ ColumnAutoGenerate = Auto-Generate ColumnBalance = Balance +ColumnBalanceOfReferenceAccount = Balance of reference account + ColumnBalance_Description = Balance of the account including all transactions up until and including the current day. Transactions with dates in the future are not included. ColumnBaseCurrency = Base Currency diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_cs.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_cs.properties index 9623c65776..9f45f6f8e2 100644 --- a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_cs.properties +++ b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_cs.properties @@ -250,6 +250,8 @@ ColumnAutoGenerate = Automatick\u00E9 Generov\u00E1n\u00ED ColumnBalance = Z\u016Fstatek +ColumnBalanceOfReferenceAccount = Z\u016Fstatek referen\u010Dn\u00EDho \u00FA\u010Dtu + ColumnBalance_Description = Z\u016Fstatek \u00FA\u010Dtu v\u010Detn\u011B v\u0161ech transakc\u00ED a\u017E do aktu\u00E1ln\u00EDho dne v\u010Detn\u011B. Transakce, jejich\u017E datum le\u017E\u00ED v budoucnosti, nejsou zahrnuty. ColumnBaseCurrency = Z\u00E1kladn\u00ED m\u011Bna diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_da.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_da.properties index 71d4fd5d67..def0cb7483 100644 --- a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_da.properties +++ b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_da.properties @@ -247,6 +247,8 @@ ColumnAutoGenerate = Auto-generer ColumnBalance = Kontosaldo +ColumnBalanceOfReferenceAccount = Saldo p\u00E5 referencekonto + ColumnBalance_Description = Kontosaldo inklusive alle transaktioner frem til og med den aktuelle dag. Transaktioner med datoer i fremtiden er ikke inkluderet. ColumnBaseCurrency = Basisvaluta diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_de.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_de.properties index 4610212fcf..ba419db3c4 100644 --- a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_de.properties +++ b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_de.properties @@ -247,6 +247,8 @@ ColumnAutoGenerate = Automatisch erstellen ColumnBalance = Kontostand +ColumnBalanceOfReferenceAccount = Saldo des Referenzkontos + ColumnBalance_Description = Kontostand aller Buchungen, einschlie\u00DFlich des aktuellen Tages. Buchungen, die in der Zukunft liegen, werden nicht eingerechnet. ColumnBaseCurrency = Basisw\u00E4hrung diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_es.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_es.properties index 8643a067cd..4fab245983 100644 --- a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_es.properties +++ b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_es.properties @@ -247,6 +247,8 @@ ColumnAutoGenerate = Generar autom\u00E1ticamente ColumnBalance = Balance +ColumnBalanceOfReferenceAccount = Saldo de la cuenta de referencia + ColumnBalance_Description = Saldo de la cuenta considerando todas las transacciones hasta el d\u00EDa de hoy incluido. Las transacciones futuras no se tienen en cuenta. ColumnBaseCurrency = Moneda base diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_fr.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_fr.properties index 5df2570a0c..71553de45d 100644 --- a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_fr.properties +++ b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_fr.properties @@ -248,6 +248,8 @@ ColumnAutoGenerate = Auto-G\u00E9n\u00E9rer ColumnBalance = Solde +ColumnBalanceOfReferenceAccount = Solde du compte de r\u00E9f\u00E9rence + ColumnBalance_Description = Solde du compte incluant toutes les op\u00E9rations, y compris du jour courant. Les op\u00E9rations futures ne sont pas incluses. ColumnBaseCurrency = Devise de base diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_it.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_it.properties index 934aa4d51e..b721e984b9 100644 --- a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_it.properties +++ b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_it.properties @@ -247,6 +247,8 @@ ColumnAutoGenerate = Auto-Generato ColumnBalance = Saldo +ColumnBalanceOfReferenceAccount = Saldo del conto di riferimento + ColumnBalance_Description = Saldo del conto incluse tutte le operazioni fino a oggi incluso. Le operazioni con data futura non sono incluse. ColumnBaseCurrency = Valuta base diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_nl.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_nl.properties index 213d8a45cf..89aaddc4bc 100644 --- a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_nl.properties +++ b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_nl.properties @@ -247,6 +247,8 @@ ColumnAutoGenerate = Automatisch aanmaken? ColumnBalance = Saldo +ColumnBalanceOfReferenceAccount = Saldo referentierekening + ColumnBalance_Description = Saldo van de rekening inclusief alle transacties tot en met vandaag. Transacties waarvan de datum in de toekomst ligt, worden niet meegenomen in het saldo. ColumnBaseCurrency = Basisvaluta diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_pl.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_pl.properties index 123b9db7d3..7c9fe15574 100644 --- a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_pl.properties +++ b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_pl.properties @@ -247,6 +247,8 @@ ColumnAutoGenerate = Generuj automatycznie ColumnBalance = Saldo +ColumnBalanceOfReferenceAccount = Saldo rachunku referencyjnego + ColumnBalance_Description = Saldo rachunku obejmuj\u0105ce wszystkie transakcje do dnia bie\u017C\u0105cego w\u0142\u0105cznie. Transakcje, kt\u00F3rych data przypada w przysz\u0142o\u015Bci, nie s\u0105 uwzgl\u0119dniane. ColumnBaseCurrency = Waluta bazowa diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_pt.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_pt.properties index 8d5ebe998c..ab1bd2f496 100644 --- a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_pt.properties +++ b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_pt.properties @@ -247,6 +247,8 @@ ColumnAutoGenerate = Gerar automaticamente ColumnBalance = Saldo +ColumnBalanceOfReferenceAccount = Saldo da conta de refer\u00EAncia + ColumnBalance_Description = Saldo da conta, incluindo todas as transa\u00E7\u00F5es at\u00E9 (e incluindo) o dia atual. As transa\u00E7\u00F5es com data futura n\u00E3o s\u00E3o inclu\u00EDdas. ColumnBaseCurrency = Moeda Base diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_pt_BR.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_pt_BR.properties index 95d9311389..bba3b928f2 100644 --- a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_pt_BR.properties +++ b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_pt_BR.properties @@ -247,6 +247,8 @@ ColumnAutoGenerate = Gerar automaticamente ColumnBalance = Saldo +ColumnBalanceOfReferenceAccount = Saldo da conta de refer\u00EAncia + ColumnBalance_Description = Saldo da conta, incluindo todas as transa\u00E7\u00F5es at\u00E9 (e incluindo) o dia atual. As transa\u00E7\u00F5es com data futura n\u00E3o s\u00E3o inclu\u00EDdas. ColumnBaseCurrency = Moeda Base diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_ru.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_ru.properties index 921eaece55..588364195f 100644 --- a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_ru.properties +++ b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_ru.properties @@ -247,6 +247,8 @@ ColumnAutoGenerate = \u0410\u0432\u0442\u043E-\u0413\u0435\u043D\u0435\u0440\u04 ColumnBalance = \u0411\u0430\u043B\u0430\u043D\u0441 +ColumnBalanceOfReferenceAccount = \u041E\u0441\u0442\u0430\u0442\u043E\u043A \u043D\u0430 \u0441\u043F\u0440\u0430\u0432\u043E\u0447\u043D\u043E\u043C \u0441\u0447\u0435\u0442\u0435 + ColumnBalance_Description = \u041E\u0441\u0442\u0430\u0442\u043E\u043A \u043D\u0430 \u0441\u0447\u0435\u0442\u0435, \u0432\u043A\u043B\u044E\u0447\u0430\u044F \u0432\u0441\u0435 \u0442\u0440\u0430\u043D\u0437\u0430\u043A\u0446\u0438\u0438 \u0434\u043E \u0442\u0435\u043A\u0443\u0449\u0435\u0433\u043E \u0434\u043D\u044F \u0432\u043A\u043B\u044E\u0447\u0438\u0442\u0435\u043B\u044C\u043D\u043E. \u0421\u0434\u0435\u043B\u043A\u0438, \u0434\u0430\u0442\u044B \u043A\u043E\u0442\u043E\u0440\u044B\u0445 \u043D\u0430\u0445\u043E\u0434\u044F\u0442\u0441\u044F \u0432 \u0431\u0443\u0434\u0443\u0449\u0435\u043C, \u043D\u0435 \u0432\u043A\u043B\u044E\u0447\u0430\u044E\u0442\u0441\u044F. ColumnBaseCurrency = \u0411\u0430\u0437\u043E\u0432\u0430\u044F \u0412\u0430\u043B\u044E\u0442\u0430 diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_sk.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_sk.properties index 15f7d70ed6..c2ab2ce220 100644 --- a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_sk.properties +++ b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_sk.properties @@ -247,6 +247,8 @@ ColumnAutoGenerate = Automatick\u00E9 generovanie ColumnBalance = Zostatok +ColumnBalanceOfReferenceAccount = Zostatok referen\u010Dn\u00E9ho \u00FA\u010Dtu + ColumnBalance_Description = Zostatok \u00FA\u010Dtu vr\u00E1tane v\u0161etk\u00FDch transakci\u00ED do aktu\u00E1lneho d\u0148a vr\u00E1tane. Transakcie s d\u00E1tumami v bud\u00FAcnosti nie s\u00FA zahrnut\u00E9. ColumnBaseCurrency = Z\u00E1kladn\u00E1 mena diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_zh.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_zh.properties index 46f2235587..7b76ce6ca3 100644 --- a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_zh.properties +++ b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_zh.properties @@ -247,6 +247,8 @@ ColumnAutoGenerate = \u81EA\u52A8\u751F\u6210 ColumnBalance = \u4F59\u989D +ColumnBalanceOfReferenceAccount = \u53C2\u8003\u8D26\u6237\u4F59\u989D + ColumnBalance_Description = \u622A\u81F3\u5F53\u65E5\u7684\u8D26\u6237\u4F59\u989D\uFF0C\u5305\u62EC\u6240\u6709\u8D26\u76EE\u3002\u4E0D\u5305\u62EC\u672A\u6765\u8D26\u76EE\u3002 ColumnBaseCurrency = \u57FA\u51C6\u8D27\u5E01 diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_zh_TW.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_zh_TW.properties index e0689e1abb..f1527b2bdb 100644 --- a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_zh_TW.properties +++ b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_zh_TW.properties @@ -247,6 +247,8 @@ ColumnAutoGenerate = \u81EA\u52D5\u751F\u6210 ColumnBalance = \u7D50\u9918 +ColumnBalanceOfReferenceAccount = \u53C3\u8003\u5E33\u6236\u7D50\u9918 + ColumnBalance_Description = \u5230\u76EE\u524D\u70BA\u6B62\u6240\u6709\u4EA4\u6613\u7684\u5E33\u6236\u9918\u984D\uFF0C\u5305\u62EC\u7576\u5929\u7684\u4EA4\u6613\u3002\u672A\u4F86\u65E5\u671F\u7684\u4EA4\u6613\u4E0D\u5305\u62EC\u5728\u5167\u3002 ColumnBaseCurrency = \u57FA\u790E\u8CA8\u5E63 diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/views/PortfolioListView.java b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/views/PortfolioListView.java index d57cf1ffd3..8750979f3b 100644 --- a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/views/PortfolioListView.java +++ b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/views/PortfolioListView.java @@ -2,6 +2,8 @@ import java.text.MessageFormat; import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; import java.util.List; import jakarta.annotation.PostConstruct; @@ -256,6 +258,21 @@ public String getText(Object element) })); portfolioColumns.addColumn(column); + column = new Column("ref_cash_bal", Messages.ColumnBalanceOfReferenceAccount, SWT.RIGHT, 100); //$NON-NLS-1$ + column.setLabelProvider(new ColumnLabelProvider() + { + @Override + public String getText(Object element) + { + Portfolio p = (Portfolio) element; + var refAcc = p.getReferenceAccount(); + return Values.Amount.format((refAcc.getCurrentAmount(LocalDateTime.now().with(LocalTime.MAX)))); + } + }); + ColumnViewerSorter.create(o -> ((Portfolio) o).getReferenceAccount() + .getCurrentAmount(LocalDateTime.now().with(LocalTime.MAX))).attachTo(column); + portfolioColumns.addColumn(column); + column = new NoteColumn(); column.getEditingSupport().addListener(this); portfolioColumns.addColumn(column);