add purchase price including fees and taxes in Statement of Assets and

Security performance views

Closes #792

name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/Messages.java

@@ -206,6 +206,10 @@ public class Messages extends NLS
     public static String ColumnForeignCurrencies;
     public static String ColumnGrossDividend;
     public static String ColumnGrossProfitLoss;
+    public static String ColumnGrossPurchasePriceFIFO;
+    public static String ColumnGrossPurchasePriceFIFO_Description;
+    public static String ColumnGrossPurchasePriceMovingAverage;
+    public static String ColumnGrossPurchasePriceMovingAverage_Description;
     public static String ColumnGrossValue;
     public static String ColumnHeight;
     public static String ColumnHoldingPeriod;
@@ -266,12 +270,14 @@ public class Messages extends NLS
     public static String ColumnProfitLossBaseCurrency;
     public static String ColumnPurchasePrice;
     public static String ColumnPurchasePrice_Description;
+    public static String ColumnPurchasePrice_MenuLabel;
     public static String ColumnPurchasePriceBaseCurrency;
     public static String ColumnPurchasePriceMovingAverage;
     public static String ColumnPurchasePriceMovingAverage_Description;
     public static String ColumnPurchasePriceMovingAverage_MenuLabel;
     public static String ColumnPurchaseValue;
     public static String ColumnPurchaseValue_Description;
+    public static String ColumnPurchaseValue_MenuLabel;
     public static String ColumnPurchaseValueBaseCurrency;
     public static String ColumnPurchaseValueMovingAverage;
     public static String ColumnPurchaseValueMovingAverage_Description;
@@ -674,6 +680,8 @@ public class Messages extends NLS
     public static String LabelExport;
     public static String LabelFees;
     public static String LabelFeesAccumulated;
+    public static String LabelFeesAndTaxesIncluded;
+    public static String LabelFeesAndTaxesNotIncluded;
     public static String LabelFirstDayOfWeek;
     public static String LabelFontSize;
     public static String LabelFormatJSON;
@@ -786,6 +794,7 @@ public class Messages extends NLS
     public static String LabelPortfolioTimeMachine;
     public static String LabelPreTax;
     public static String LabelPreviousTradingDay;
+    public static String LabelPurchasePrice;
     public static String LabelPurchaseTransactionsOnly;
     public static String LabelQuandlCode;
     public static String LabelQuandlColumnNameQuote;

name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages.properties

@@ -462,6 +462,14 @@ ColumnGrossDividend = Gross dividend
 
 ColumnGrossProfitLoss = Gross Profit / Loss
 
+ColumnGrossPurchasePriceFIFO = Purchase Price (gross)
+
+ColumnGrossPurchasePriceFIFO_Description = Purchase price of held shares calculated using the FIFO method.\r\nThe price includes the transaction fees and taxes paid.
+
+ColumnGrossPurchasePriceMovingAverage = Purchase Price (MA) (gross)
+
+ColumnGrossPurchasePriceMovingAverage_Description = Purchase price of held shares calculated using the moving average method.\r\nThe price includes the transaction fees and taxes paid.
+
 ColumnGrossValue = Gross Value
 
 ColumnHeight = Height
@@ -590,6 +598,8 @@ ColumnPurchasePriceMovingAverage_MenuLabel = Purchase Price (moving average)
 
 ColumnPurchasePrice_Description = Purchase price of held shares calculated using the FIFO method.\nThe price does not include the transaction fees and taxes paid.
 
+ColumnPurchasePrice_MenuLabel = Purchase Price (FIFO)
+
 ColumnPurchaseValue = Purchase Value
 
 ColumnPurchaseValueBaseCurrency = Purchase Value (Base Currency)
@@ -602,6 +612,8 @@ ColumnPurchaseValueMovingAverage_MenuLabel = Purchase Value (moving average)
 
 ColumnPurchaseValue_Description = Purchase value of held shares calculated using the FIFO method.\nThe purchase value includes the transaction fees paid.
 
+ColumnPurchaseValue_MenuLabel = Purchase Value (FIFO)
+
 ColumnQuote = Quote
 
 ColumnQuoteChange = Change in Price
@@ -1340,6 +1352,10 @@ LabelFees = Fees
 
 LabelFeesAccumulated = Fees (accumulated)
 
+LabelFeesAndTaxesIncluded = Fees and taxes included
+
+LabelFeesAndTaxesNotIncluded = Fees and taxes not included
+
 LabelFirstDayOfWeek = First day of week
 
 LabelFontSize = Font size
@@ -1564,6 +1580,8 @@ LabelPreTax = Pre tax
 
 LabelPreviousTradingDay = Previous trading day
 
+LabelPurchasePrice = Purchase Price
+
 LabelPurchaseTransactionsOnly = Buys only
 
 LabelQuandlCode = Quandl Code

name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_cs.properties

@@ -458,6 +458,14 @@ ColumnGrossDividend = Hrub\u00E1 dividenda
 
 ColumnGrossProfitLoss = Hrub\u00FD zisk / ztr\u00E1ta
 
+ColumnGrossPurchasePriceFIFO = N\u00E1kupn\u00ED cena (Hrub\u00FD)
+
+ColumnGrossPurchasePriceFIFO_Description = N\u00E1kupn\u00ED cena dr\u017Een\u00FDch akci\u00ED vypo\u010Dten\u00E1 metodou FIFO.\r\nCena zahrnuje transak\u010Dn\u00ED poplatky a zaplacen\u00E9 dan\u011B.
+
+ColumnGrossPurchasePriceMovingAverage = N\u00E1kupn\u00ED cena (MA) (Hrub\u00FD)
+
+ColumnGrossPurchasePriceMovingAverage_Description = N\u00E1kupn\u00ED cena dr\u017Een\u00FDch akci\u00ED vypo\u010Dten\u00E1 metodou klouzav\u00E9ho pr\u016Fm\u011Bru.\r\nCena zahrnuje transak\u010Dn\u00ED poplatky a zaplacen\u00E9 dan\u011B.
+
 ColumnGrossValue = Hrub\u00E1 hodnota
 
 ColumnHeight = V\u00FD\u0161ka
@@ -586,6 +594,8 @@ ColumnPurchasePriceMovingAverage_MenuLabel = N\u00E1kupn\u00ED cena (klouzav\u00
 
 ColumnPurchasePrice_Description = N\u00E1kupn\u00ED cena dr\u017Een\u00FDch akci\u00ED vypo\u010Dten\u00E1 metodou FIFO.\nCena nezahrnuje zaplacen\u00E9 transak\u010Dn\u00ED poplatky a dan\u011B.
 
+ColumnPurchasePrice_MenuLabel = N\u00E1kupn\u00ED cena (FIFO)
+
 ColumnPurchaseValue = N\u00E1kupn\u00ED hodnota
 
 ColumnPurchaseValueBaseCurrency = N\u00E1kupn\u00ED hodnota (z\u00E1kladn\u00ED m\u011Bna)
@@ -598,6 +608,8 @@ ColumnPurchaseValueMovingAverage_MenuLabel = N\u00E1kupn\u00ED hodnota (klouzav\
 
 ColumnPurchaseValue_Description = N\u00E1kupn\u00ED hodnota akci\u00ED vypo\u010Dten\u00E1 metodou FIFO.\nHodnota n\u00E1kupu zahrnuje zaplacen\u00E9 transak\u010Dn\u00ED poplatky.
 
+ColumnPurchaseValue_MenuLabel = N\u00E1kupn\u00ED hodnota (FIFO)
+
 ColumnQuote = Kurz
 
 ColumnQuoteChange = Zm\u011Bna v cen\u011B
@@ -1330,6 +1342,10 @@ LabelFees = Poplatky
 
 LabelFeesAccumulated = Poplatky (nahromad\u011Bn\u00E9)
 
+LabelFeesAndTaxesIncluded = V\u010Detn\u011B poplatk\u016F a dan\u00ED
+
+LabelFeesAndTaxesNotIncluded = Poplatky a dan\u011B nejsou zahrnuty
+
 LabelFirstDayOfWeek = Prvn\u00ED den v t\u00FDdnu
 
 LabelFontSize = Velikost p\u00EDsma
@@ -1552,6 +1568,8 @@ LabelPreTax = P\u0159ed zdan\u011Bn\u00EDm
 
 LabelPreviousTradingDay = P\u0159edchoz\u00ED obchodn\u00ED den
 
+LabelPurchasePrice = N\u00E1kupn\u00ED cena
+
 LabelPurchaseTransactionsOnly = Pouze n\u00E1kupy
 
 LabelQuandlCode = Quandl Code

name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_da.properties

@@ -455,6 +455,14 @@ ColumnGrossDividend = Bruttoudbytte
 
 ColumnGrossProfitLoss = Bruttofortjeneste / Tab
 
+ColumnGrossPurchasePriceFIFO = K\u00F8bspris (brutto)
+
+ColumnGrossPurchasePriceFIFO_Description = K\u00F8bsprisen for holdte aktier beregnet efter FIFO-metoden.\r\nPrisen inkluderer transaktionsgebyrer og betalte skatter.
+
+ColumnGrossPurchasePriceMovingAverage = K\u00F8bspris (MA) (brutto)
+
+ColumnGrossPurchasePriceMovingAverage_Description = K\u00F8bspris for holdte aktier beregnet efter den glidende gennemsnitsmetode.\r\nPrisen inkluderer transaktionsgebyrer og betalte skatter.
+
 ColumnGrossValue = Bruttov\u00E6rdi
 
 ColumnHeight = H\u00F8jde
@@ -583,6 +591,8 @@ ColumnPurchasePriceMovingAverage_MenuLabel = K\u00F8bspris (glidende gennemsnit)
 
 ColumnPurchasePrice_Description = K\u00F8bsprisen for holdte aktier beregnet efter FIFO-metoden.\nPrisen inkluderer ikke transaktionsgebyrer og betalte skatter.
 
+ColumnPurchasePrice_MenuLabel = K\u00F8bspris (FIFO)
+
 ColumnPurchaseValue = K\u00F8bsv\u00E6rdi
 
 ColumnPurchaseValueBaseCurrency = K\u00F8bsv\u00E6rdi (Basisvaluta)
@@ -595,6 +605,8 @@ ColumnPurchaseValueMovingAverage_MenuLabel = K\u00F8bsv\u00E6rdi (glidende genne
 
 ColumnPurchaseValue_Description = K\u00F8bsv\u00E6rdi af ejede aktier beregnet efter FIFO-metoden.\nK\u00F8bsv\u00E6rdien inkluderer de betalte transaktionsgebyrer.
 
+ColumnPurchaseValue_MenuLabel = K\u00F8bsv\u00E6rdi (FIFO)
+
 ColumnQuote = Kurs
 
 ColumnQuoteChange = \u00C6ndring i pris
@@ -1329,6 +1341,10 @@ LabelFees = Gebyrer
 
 LabelFeesAccumulated = Gebyrer (akkumuleret)
 
+LabelFeesAndTaxesIncluded = Gebyrer og skatter inkluderet
+
+LabelFeesAndTaxesNotIncluded = Gebyrer og skatter er ikke inkluderet
+
 LabelFirstDayOfWeek = F\u00F8rste ugedag
 
 LabelFontSize = Skriftst\u00F8rrelse
@@ -1553,6 +1569,8 @@ LabelPreTax = F\u00F8r skat
 
 LabelPreviousTradingDay = Foreg\u00E5ende handelsdag
 
+LabelPurchasePrice = K\u00F8bspris
+
 LabelPurchaseTransactionsOnly = Kun k\u00F8b
 
 LabelQuandlCode = Quandl Kode

name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_de.properties

@@ -455,6 +455,14 @@ ColumnGrossDividend = Bruttodividende
 
 ColumnGrossProfitLoss = Bruttoprofit / Bruttoverlust
 
+ColumnGrossPurchasePriceFIFO = Einstandskurs (Brutto)
+
+ColumnGrossPurchasePriceFIFO_Description = Einstandskurs der gehaltenen Wertpapiere, berechnet nach dem FIFO-Prinzip.\r\nIm Preis sind die gezahlten Transaktionsgeb\u00FChren und Steuern enthalten.
+
+ColumnGrossPurchasePriceMovingAverage = Einstandskurs (GLD) (brutto)
+
+ColumnGrossPurchasePriceMovingAverage_Description = Einstandskurs der gehaltenen Wertpapiere, berechnet nach dem Prinzip des gleitenden Durchschnitts.\r\nIm Preis sind die gezahlten Transaktionsgeb\u00FChren und Steuern enthalten.
+
 ColumnGrossValue = Bruttowert
 
 ColumnHeight = H\u00F6he
@@ -583,6 +591,8 @@ ColumnPurchasePriceMovingAverage_MenuLabel = Einstandskurs (gleitender Durchschn
 
 ColumnPurchasePrice_Description = Einstandskurs der gehaltenen Wertpapiere, berechnet nach dem FIFO-Prinzip.\nDer Kurs wird ohne die angefallenen Transaktionsgeb\u00FChren und Steuern errechnet.
 
+ColumnPurchasePrice_MenuLabel = Einstandskurs (FIFO)
+
 ColumnPurchaseValue = Einstandspreis
 
 ColumnPurchaseValueBaseCurrency = Einstandspreis in Basisw\u00E4hrung
@@ -595,6 +605,8 @@ ColumnPurchaseValueMovingAverage_MenuLabel = Einstandspreis (gleitender Durchsch
 
 ColumnPurchaseValue_Description = Einstandspreis der gehaltenen Wertpapiere, berechnet nach dem FIFO-Prinzip.\nDer Wert beinhaltet die angefallenen Transaktionsgeb\u00FChren.
 
+ColumnPurchaseValue_MenuLabel = Einstandspreis (FIFO)
+
 ColumnQuote = Kurs
 
 ColumnQuoteChange = Kurs\u00E4nderung
@@ -1333,6 +1345,10 @@ LabelFees = Geb\u00FChren
 
 LabelFeesAccumulated = Geb\u00FChren (akkumuliert)
 
+LabelFeesAndTaxesIncluded = Geb\u00FChren und Steuern inbegriffen
+
+LabelFeesAndTaxesNotIncluded = Geb\u00FChren und Steuern nicht inbegriffen
+
 LabelFirstDayOfWeek = Erster Tag der Woche
 
 LabelFontSize = Schriftgr\u00F6\u00DFe
@@ -1557,6 +1573,8 @@ LabelPreTax = Vor Steuern
 
 LabelPreviousTradingDay = Voriger Handelstag
 
+LabelPurchasePrice = Einstandskurs
+
 LabelPurchaseTransactionsOnly = Nur K\u00E4ufe
 
 LabelQuandlCode = Quandl-Code

name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_es.properties

@@ -455,6 +455,14 @@ ColumnGrossDividend = Dividendo bruto
 
 ColumnGrossProfitLoss = Beneficio/P\u00E9rdida bruto
 
+ColumnGrossPurchasePriceFIFO = Precio de compra (bruto)
+
+ColumnGrossPurchasePriceFIFO_Description = Pecio de compra de acciones calculadas utilizando el m\u00E9todo FIFO.\r\nEl precio incluye las comisiones de transacci\u00F3n y los impuestos pagados.
+
+ColumnGrossPurchasePriceMovingAverage = Precio de compra (MM) (bruto)
+
+ColumnGrossPurchasePriceMovingAverage_Description = Precio de compra de las acciones en posesi\u00F3n calculado seg\u00FAn el m\u00E9todo de la media m\u00F3vil.\r\nEl precio incluye las comisiones de transacci\u00F3n y los impuestos pagados.
+
 ColumnGrossValue = Valor bruto
 
 ColumnHeight = Altura
@@ -583,6 +591,8 @@ ColumnPurchasePriceMovingAverage_MenuLabel = Precio de compra (media m\u00F3vil)
 
 ColumnPurchasePrice_Description = Pecio de compra de acciones calculadas utilizando el m\u00E9todo FIFO.\nEl precio no incluye las comisiones e impuestos pagados.
 
+ColumnPurchasePrice_MenuLabel = Precio de compra (FIFO)
+
 ColumnPurchaseValue = Coste de compra
 
 ColumnPurchaseValueBaseCurrency = Coste de compra (en la moneda de la cuenta)
@@ -595,6 +605,8 @@ ColumnPurchaseValueMovingAverage_MenuLabel = Coste de compra (media m\u00F3vil)
 
 ColumnPurchaseValue_Description = Valor de compra de acciones calculadas utilizando el m\u00E9todo FIFO.\nEl valor de compra incluye las comisiones pagadas.
 
+ColumnPurchaseValue_MenuLabel = Coste de compra (FIFO)
+
 ColumnQuote = Precio
 
 ColumnQuoteChange = Cambio en el Precio
@@ -1329,6 +1341,10 @@ LabelFees = Comisiones
 
 LabelFeesAccumulated = Comisiones (acumuladas)
 
+LabelFeesAndTaxesIncluded = Tasas e impuestos incluidos
+
+LabelFeesAndTaxesNotIncluded = Tasas e impuestos no incluidos
+
 LabelFirstDayOfWeek = Primer dia de la semana
 
 LabelFontSize = Tama\u00F1o de la fuente
@@ -1553,6 +1569,8 @@ LabelPreTax = Antes de impuestos
 
 LabelPreviousTradingDay = \u00DAltimo d\u00EDa de mercado
 
+LabelPurchasePrice = Precio de compra
+
 LabelPurchaseTransactionsOnly = S\u00F3lo compras
 
 LabelQuandlCode = Quandl Code

name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_fr.properties

@@ -456,6 +456,14 @@ ColumnGrossDividend = Dividende brut
 
 ColumnGrossProfitLoss = Profit / Perte brute
 
+ColumnGrossPurchasePriceFIFO = Prix d'achat (brut)
+
+ColumnGrossPurchasePriceFIFO_Description = Prix d'achat des parts d\u00E9tenues calcul\u00E9 selon la m\u00E9thode FIFO (premier entr\u00E9 premier sorti).\r\nLe prix comprend les frais de transaction et les taxes pay\u00E9es.
+
+ColumnGrossPurchasePriceMovingAverage = Prix d'achat (MG) (brut)
+
+ColumnGrossPurchasePriceMovingAverage_Description = Prix d'achat des parts d\u00E9tenues calcul\u00E9 selon la m\u00E9thode de la moyenne glissante.\r\nLe prix comprend les frais de transaction et les taxes pay\u00E9es.
+
 ColumnGrossValue = Valeur brute
 
 ColumnHeight = Taille
@@ -584,6 +592,8 @@ ColumnPurchasePriceMovingAverage_MenuLabel = Prix d'achat (moyenne glissante)
 
 ColumnPurchasePrice_Description = Prix d'achat des parts d\u00E9tenues calcul\u00E9 selon la m\u00E9thode FIFO (premier entr\u00E9 premier sorti).\nLe prix ne comprend pas les frais de transaction ni les imp\u00F4ts / taxes pay\u00E9es.
 
+ColumnPurchasePrice_MenuLabel = Prix d'achat (FIFO)
+
 ColumnPurchaseValue = Valeur d'achat
 
 ColumnPurchaseValueBaseCurrency = Valeur d'achat (devise de base)
@@ -596,6 +606,8 @@ ColumnPurchaseValueMovingAverage_MenuLabel = Valeur d'achat (moyenne glissante)
 
 ColumnPurchaseValue_Description = Valeur d'achat des parts d\u00E9tenues calcul\u00E9e selon la m\u00E9thode FIFO (premier entr\u00E9 premier sorti).\nLa valeur comprend les frais des op\u00E9rations.
 
+ColumnPurchaseValue_MenuLabel = Valeur d'achat (FIFO)
+
 ColumnQuote = Cotation
 
 ColumnQuoteChange = Variation de prix
@@ -1330,6 +1342,10 @@ LabelFees = Frais
 
 LabelFeesAccumulated = Frais (cumul\u00E9s)
 
+LabelFeesAndTaxesIncluded = Frais et taxes inclus
+
+LabelFeesAndTaxesNotIncluded = Frais et taxes non inclus
+
 LabelFirstDayOfWeek = Premier jour de la semaine
 
 LabelFontSize = Taille de police
@@ -1554,6 +1570,8 @@ LabelPreTax = Avant taxes / imp\u00F4ts
 
 LabelPreviousTradingDay = Jour de bourse pr\u00E9c\u00E9dent
 
+LabelPurchasePrice = Prix d'achat
+
 LabelPurchaseTransactionsOnly = Achats uniquement
 
 LabelQuandlCode = Code Quandl