add profit loss description and moving average value

mierin12 · mierin12 · commit 4ed85165fddf · 2025-06-20T18:36:42.000+02:00
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
@@ -272,6 +272,7 @@ public class Messages extends NLS
     public static String ColumnPreviousClose;
     public static String ColumnPreviousPrice;
     public static String ColumnProfitLoss;
+    public static String ColumnProfitLoss_Description;
     public static String ColumnProfitLossBaseCurrency;
     public static String ColumnPurchasePrice;
     public static String ColumnPurchasePrice_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
@@ -598,6 +598,8 @@ ColumnProfitLoss = Profit / Loss
 
 ColumnProfitLossBaseCurrency = Profit / Loss (Base Currency)
 
+ColumnProfitLoss_Description = The purchase costs used to calculate the Profit/Loss include fees and taxes. It is therefore net of acquisition fees and taxes.
+
 ColumnPurchasePrice = Purchase Price
 
 ColumnPurchasePriceBaseCurrency = Purchase Price (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
@@ -594,6 +594,8 @@ ColumnProfitLoss = Zisk / ztr\u00E1ta
 
 ColumnProfitLossBaseCurrency = Zisk / ztr\u00E1ta (z\u00E1kladn\u00ED m\u011Bna)
 
+ColumnProfitLoss_Description = Po\u0159izovac\u00ED n\u00E1klady pou\u017Eit\u00E9 pro v\u00FDpo\u010Det zisku/ztr\u00E1ty zahrnuj\u00ED poplatky a dan\u011B. Je tedy uveden po ode\u010Dten\u00ED po\u0159izovac\u00EDch poplatk\u016F a dan\u00ED.
+
 ColumnPurchasePrice = N\u00E1kupn\u00ED cena
 
 ColumnPurchasePriceBaseCurrency = N\u00E1kupn\u00ED cena (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
@@ -591,6 +591,8 @@ ColumnProfitLoss = Fortjeneste / Tab
 
 ColumnProfitLossBaseCurrency = Gevinst / Tab (Basisvaluta)
 
+ColumnProfitLoss_Description = K\u00F8bsomkostningerne, der bruges til at beregne fortjeneste/tab, inkluderer gebyrer og skatter. Det er derfor netto efter k\u00F8bsgebyrer og skatter.
+
 ColumnPurchasePrice = K\u00F8bspris
 
 ColumnPurchasePriceBaseCurrency = K\u00F8bspris (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
@@ -591,6 +591,8 @@ ColumnProfitLoss = Gewinn / Verlust
 
 ColumnProfitLossBaseCurrency = Gewinn / Verlust in Basisw\u00E4hrung
 
+ColumnProfitLoss_Description = Die zur Berechnung des Gewinns/Verlusts herangezogenen Anschaffungskosten beinhalten Geb\u00FChren und Steuern. Es handelt sich also um einen Nettowert abz\u00FCglich der Erwerbsgeb\u00FChren und Steuern.
+
 ColumnPurchasePrice = Einstandskurs
 
 ColumnPurchasePriceBaseCurrency = Einstandskurs in 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
@@ -591,6 +591,8 @@ ColumnProfitLoss = Ganancia/P\u00E9rdida
 
 ColumnProfitLossBaseCurrency = Ganancia / P\u00E9rdida (moneda de la cuenta)
 
+ColumnProfitLoss_Description = Los costes de adquisici\u00F3n utilizados para calcular el Beneficio/P\u00E9rdida incluyen tasas e impuestos. Por tanto, es neto de comisiones e impuestos de adquisici\u00F3n.
+
 ColumnPurchasePrice = Precio de compra
 
 ColumnPurchasePriceBaseCurrency = Precio de compra (moneda de la cuenta)
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
@@ -592,6 +592,8 @@ ColumnProfitLoss = Profit / Perte
 
 ColumnProfitLossBaseCurrency = Profit / Perte (devise de base)
 
+ColumnProfitLoss_Description = Les co\u00FBts d'achat utilis\u00E9s pour calculer la plus-value incluent les frais et les taxes. Elle est donc nette de frais d'acquisition et de taxes.
+
 ColumnPurchasePrice = Prix d'achat
 
 ColumnPurchasePriceBaseCurrency = Prix d'achat (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
@@ -591,6 +591,8 @@ ColumnProfitLoss = Profitti/Perdite
 
 ColumnProfitLossBaseCurrency = Profitti/Perdite (valuta base)
 
+ColumnProfitLoss_Description = I costi di acquisto utilizzati per calcolare il profitto/perdita includono le spese e le imposte. Il risultato \u00E8 quindi al netto delle spese di acquisizione e delle imposte.
+
 ColumnPurchasePrice = Prezzo Acq.
 
 ColumnPurchasePriceBaseCurrency = Prezzo d'acquisto (valuta di 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
@@ -591,6 +591,8 @@ ColumnProfitLoss = Winst/Verlies
 
 ColumnProfitLossBaseCurrency = Winst/Verlies (basisvaluta)
 
+ColumnProfitLoss_Description = De aankoopkosten die worden gebruikt om de winst/het verlies te berekenen zijn inclusief vergoedingen en belastingen. De winst is dus na aftrek van acquisitiekosten en belastingen.
+
 ColumnPurchasePrice = GAK
 
 ColumnPurchasePriceBaseCurrency = Aankoopkoers (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
@@ -591,6 +591,8 @@ ColumnProfitLoss = Zysk/strata
 
 ColumnProfitLossBaseCurrency = Zysk/strata (waluta bazowa)
 
+ColumnProfitLoss_Description = Koszty zakupu wykorzystane do obliczenia zysku/straty obejmuj\u0105 op\u0142aty i podatki. Jest on zatem pomniejszony o op\u0142aty za nabycie i podatki.
+
 ColumnPurchasePrice = Cena zakupu
 
 ColumnPurchasePriceBaseCurrency = Cena zakupu (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
@@ -591,6 +591,8 @@ ColumnProfitLoss = Lucros / Perdas
 
 ColumnProfitLossBaseCurrency = Lucros / Perdas (Moeda Base)
 
+ColumnProfitLoss_Description = Os custos de aquisi\u00E7\u00E3o utilizados para calcular o lucro/perda incluem taxas e impostos. Por conseguinte, \u00E9 l\u00EDquido de taxas e impostos de aquisi\u00E7\u00E3o.
+
 ColumnPurchasePrice = Pre\u00E7o de compra
 
 ColumnPurchasePriceBaseCurrency = Pre\u00E7o de compra (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
@@ -591,6 +591,8 @@ ColumnProfitLoss = Lucros / Perdas
 
 ColumnProfitLossBaseCurrency = Lucros / Perdas (Moeda Base)
 
+ColumnProfitLoss_Description = Os custos de compra usados para calcular o Lucro/Preju\u00EDzo incluem taxas e impostos. Portanto, \u00E9 l\u00EDquido de taxas e impostos de aquisi\u00E7\u00E3o.
+
 ColumnPurchasePrice = Pre\u00E7o de compra
 
 ColumnPurchasePriceBaseCurrency = Pre\u00E7o de compra (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
@@ -591,6 +591,8 @@ ColumnProfitLoss = \u041F\u0440\u0438\u0431\u044B\u043B\u044C / \u0423\u0431\u04
 
 ColumnProfitLossBaseCurrency = \u041F\u0440\u0438\u0431\u044B\u043B\u044C / \u0443\u0431\u044B\u0442\u043E\u043A (\u0431\u0430\u0437\u043E\u0432\u0430\u044F \u0432\u0430\u043B\u044E\u0442\u0430)
 
+ColumnProfitLoss_Description = \u0417\u0430\u0442\u0440\u0430\u0442\u044B \u043D\u0430 \u043F\u0440\u0438\u043E\u0431\u0440\u0435\u0442\u0435\u043D\u0438\u0435, \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u043C\u044B\u0435 \u0434\u043B\u044F \u0440\u0430\u0441\u0447\u0435\u0442\u0430 \u043F\u043E\u043A\u0430\u0437\u0430\u0442\u0435\u043B\u044F \u00AB\u041F\u0440\u0438\u0431\u044B\u043B\u044C/\u0443\u0431\u044B\u0442\u043E\u043A\u00BB, \u0432\u043A\u043B\u044E\u0447\u0430\u044E\u0442 \u043A\u043E\u043C\u0438\u0441\u0441\u0438\u043E\u043D\u043D\u044B\u0435 \u0438 \u043D\u0430\u043B\u043E\u0433\u0438. \u0422\u0430\u043A\u0438\u043C \u043E\u0431\u0440\u0430\u0437\u043E\u043C, \u043E\u043D\u0430 \u0440\u0430\u0441\u0441\u0447\u0438\u0442\u044B\u0432\u0430\u0435\u0442\u0441\u044F \u0437\u0430 \u0432\u044B\u0447\u0435\u0442\u043E\u043C \u043A\u043E\u043C\u0438\u0441\u0441\u0438\u043E\u043D\u043D\u044B\u0445 \u0438 \u043D\u0430\u043B\u043E\u0433\u043E\u0432 \u043D\u0430 \u043F\u0440\u0438\u043E\u0431\u0440\u0435\u0442\u0435\u043D\u0438\u0435.
+
 ColumnPurchasePrice = \u0426\u0435\u043D\u0430 \u043F\u043E\u043A\u0443\u043F\u043A\u0438
 
 ColumnPurchasePriceBaseCurrency = \u0426\u0435\u043D\u0430 \u043F\u043E\u043A\u0443\u043F\u043A\u0438 (\u0431\u0430\u0437\u043E\u0432\u0430\u044F \u0432\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
@@ -591,6 +591,8 @@ ColumnProfitLoss = Zisk / strata
 
 ColumnProfitLossBaseCurrency = Zisk / strata (z\u00E1kladn\u00E1 mena)
 
+ColumnProfitLoss_Description = N\u00E1kupn\u00E9 n\u00E1klady pou\u017Eit\u00E9 na v\u00FDpo\u010Det zisku/straty zah\u0155\u0148aj\u00FA poplatky a dane. Je teda o\u010Disten\u00FD o poplatky a dane za obstaranie.
+
 ColumnPurchasePrice = N\u00E1kupn\u00E1 cena
 
 ColumnPurchasePriceBaseCurrency = N\u00E1kupn\u00E1 cena (z\u00E1kladn\u00E1 mena)
diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_tr.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_tr.properties
@@ -591,6 +591,8 @@ ColumnProfitLoss = Kar / Zarar
 
 ColumnProfitLossBaseCurrency = Kar / Zarar (Temel Para Birimi)
 
+ColumnProfitLoss_Description = K\u00E2r/Zarar\u0131 hesaplamak i\u00E7in kullan\u0131lan sat\u0131n alma maliyetlerine \u00FCcretler ve vergiler dahildir. Bu nedenle, sat\u0131n alma \u00FCcretleri ve vergiler net olarak g\u00F6sterilmi\u015Ftir.
+
 ColumnPurchasePrice = Sat\u0131n Alma Fiyat\u0131
 
 ColumnPurchasePriceBaseCurrency = Sat\u0131n Alma Fiyat\u0131 (Temel Para Birimi)
diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_vi.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_vi.properties
@@ -591,6 +591,8 @@ ColumnProfitLoss = L\u00E3i / L\u1ED7
 
 ColumnProfitLossBaseCurrency = L\u00E3i / L\u1ED7 (\u0110\u01A1n v\u1ECB ti\u1EC1n t\u1EC7 c\u01A1 s\u1EDF)
 
+ColumnProfitLoss_Description = Chi ph\u00ED mua h\u00E0ng \u0111\u01B0\u1EE3c s\u1EED d\u1EE5ng \u0111\u1EC3 t\u00EDnh to\u00E1n L\u00E3i/L\u1ED7 bao g\u1ED3m ph\u00ED v\u00E0 thu\u1EBF. Do \u0111\u00F3, \u0111\u00E2y l\u00E0 kho\u1EA3n r\u00F2ng sau khi tr\u1EEB ph\u00ED mua h\u00E0ng v\u00E0 thu\u1EBF.
+
 ColumnPurchasePrice = Gi\u00E1 mua
 
 ColumnPurchasePriceBaseCurrency = Gi\u00E1 mua (Ti\u1EC1n t\u1EC7 c\u01A1 s\u1EDF)
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
@@ -591,6 +591,8 @@ ColumnProfitLoss = \u76C8 / \u4E8F
 
 ColumnProfitLossBaseCurrency = \u76C8 / \u4E8F (\u57FA\u51C6\u8D27\u5E01)
 
+ColumnProfitLoss_Description = \u7528\u4E8E\u8BA1\u7B97\u5229\u6DA6/\u4E8F\u635F\u7684\u8D2D\u4E70\u6210\u672C\u5305\u62EC\u8D39\u7528\u548C\u7A0E\u8D39\u3002\u56E0\u6B64\uFF0C\u5B83\u662F\u6263\u9664\u4E86\u6536\u8D2D\u8D39\u7528\u548C\u7A0E\u8D39\u540E\u7684\u51C0\u503C\u3002
+
 ColumnPurchasePrice = \u4E70\u4EF7
 
 ColumnPurchasePriceBaseCurrency = \u4E70\u4EF7 (\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
@@ -591,6 +591,8 @@ ColumnProfitLoss = \u76C8\u5229/\u8667\u640D
 
 ColumnProfitLossBaseCurrency = \u76C8\u5229/\u8667\u640D\uFF08\u57FA\u790E\u8CA8\u5E63\uFF09
 
+ColumnProfitLoss_Description = \u7528\u65BC\u8A08\u7B97\u5229\u6F64/\u8667\u640D\u7684\u6536\u8CFC\u6210\u672C\u5305\u62EC\u8CBB\u7528\u548C\u7A05\u91D1\u3002\u56E0\u6B64\uFF0C\u5B83\u5DF2\u6263\u9664\u6536\u8CFC\u8CBB\u7528\u548C\u7A05\u91D1\u3002
+
 ColumnPurchasePrice = \u8CFC\u8CB7\u50F9\u683C
 
 ColumnPurchasePriceBaseCurrency = \u8CFC\u8CB7\u50F9\u683C\uFF08\u57FA\u672C\u8CA8\u5E63\uFF09
diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/views/StatementOfAssetsViewer.java b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/views/StatementOfAssetsViewer.java
@@ -565,6 +565,11 @@ public Font getFont(Object e)
         support.addColumn(column);
 
         column = new Column("9", Messages.ColumnProfitLoss, SWT.RIGHT, 80); //$NON-NLS-1$
+        column.setGroupLabel(Messages.ColumnProfitLoss);
+        column.setMenuLabel(Messages.ColumnProfitLoss + " (" + Messages.LabelCapitalGainsMethodFIFO + ")"); //$NON-NLS-1$ //$NON-NLS-2$
+        column.setDescription(Messages.ColumnUnrealizedCapitalGains_Description + TextUtil.PARAGRAPH_BREAK
+                        + Messages.ColumnProfitLoss_Description);
+
         labelProvider = new ReportingPeriodLabelProvider(
                         new ElementValueProvider(LazySecurityPerformanceRecord::getCapitalGainsOnHoldings, withSum()),
                         true);
@@ -573,6 +578,20 @@ public Font getFont(Object e)
         column.setVisible(false);
         support.addColumn(column);
 
+        column = new Column("pl-moving-avg", //$NON-NLS-1$
+                        Messages.ColumnProfitLoss + " (" + Messages.LabelCapitalGainsMethodMovingAverageAbbr + ")", //$NON-NLS-1$ //$NON-NLS-2$
+                        SWT.RIGHT, 80);
+        column.setGroupLabel(Messages.ColumnProfitLoss);
+        column.setMenuLabel(Messages.ColumnProfitLoss + " (" + Messages.LabelCapitalGainsMethodMovingAverage + ")"); //$NON-NLS-1$ //$NON-NLS-2$
+        column.setDescription(Messages.ColumnUnrealizedCapitalGainsMA_Description + TextUtil.PARAGRAPH_BREAK
+                        + Messages.ColumnProfitLoss_Description);
+        labelProvider = new ReportingPeriodLabelProvider(new ElementValueProvider(
+                        LazySecurityPerformanceRecord::getCapitalGainsOnHoldingsMovingAverage, withSum()), true);
+        column.setLabelProvider(labelProvider);
+        column.setSorter(ColumnViewerSorter.create(new ElementComparator(labelProvider)));
+        column.setVisible(false);
+        support.addColumn(column);
+
         column = new NoteColumn();
         column.getEditingSupport().addListener(new TouchClientListener(client));
         column.getSorter().wrap(ElementComparator::new);
