Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use collected sale/tax transactions to merge taxes into sale #3578

Merged
merged 1 commit into from
Oct 7, 2023
Merged

Use collected sale/tax transactions to merge taxes into sale #3578

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 21 additions & 55 deletions ....abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/ComdirectPDFExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1809,14 +1809,6 @@ public List<Item> postProcessing(List<Item> items)
.equals((((AccountTransaction) i.getSubject()).getType()))) //
.collect(Collectors.toList());

// Group sale and taxes transactions together and group by date and security
Map<LocalDate, Map<Security, List<Item>>> saleTaxesTransactions;
if (!saleTransactionList.isEmpty())
saleTaxesTransactions = Stream.concat(saleTransactionList.stream(), taxesTransactionList.stream())
.collect(Collectors.groupingBy(item -> item.getDate().toLocalDate(), Collectors.groupingBy(Item::getSecurity)));
else
saleTaxesTransactions = Collections.emptyMap();

// Group dividend and taxes transactions together and group by date and security
Map<LocalDate, Map<Security, List<Item>>> dividendTaxesTransactions;
if (!dividendTransactionList.isEmpty())
Expand All @@ -1827,59 +1819,33 @@ public List<Item> postProcessing(List<Item> items)

var saleTaxPairs = matchSaleAndTaxTransactions(saleTransactionList, taxesTransactionList);
fixMissingCurrencyConversionForTaxesTransactions(saleTaxPairs);

for (SaleTaxPair pair : saleTaxPairs)
{
BuySellEntry saleTransaction = (BuySellEntry) pair.sale.getSubject();
AccountTransaction taxesTransaction = (AccountTransaction) pair.tax.getSubject();

saleTaxesTransactions.forEach((k, v) -> {
v.forEach((security, transactions) -> {
if (taxesTransaction.getType() != AccountTransaction.Type.TAXES)
continue;

if (transactions.size() == 2)
{
BuySellEntry saleTransaction = null;
AccountTransaction taxesTransaction = null;
// Subtract the tax from the taxes transaction from the total amount
saleTransaction.setMonetaryAmount(saleTransaction.getPortfolioTransaction().getMonetaryAmount()
.subtract(taxesTransaction.getMonetaryAmount()));

// Which transaction is the taxes and which the sale?
if (transactions.get(0).getSubject() instanceof BuySellEntry
&& transactions.get(1).getSubject() instanceof AccountTransaction)
{
saleTransaction = (BuySellEntry) transactions.get(0).getSubject();
taxesTransaction = (AccountTransaction) transactions.get(1).getSubject();
}
else if (transactions.get(1).getSubject() instanceof BuySellEntry
&& transactions.get(0).getSubject() instanceof AccountTransaction)
{
saleTransaction = (BuySellEntry) transactions.get(1).getSubject();
taxesTransaction = (AccountTransaction) transactions.get(0).getSubject();
}
// Add taxes as tax unit
saleTransaction.getPortfolioTransaction()
.addUnit(new Unit(Unit.Type.TAX, taxesTransaction.getMonetaryAmount()));

// Check if not null and there is a sale transaction and a taxes transaction
if (saleTransaction != null && taxesTransaction != null
&& AccountTransaction.Type.TAXES.equals(taxesTransaction.getType())
&& PortfolioTransaction.Type.SELL.equals(saleTransaction.getPortfolioTransaction().getType()))
{
// Subtract the tax from the taxes transaction from the total amount
saleTransaction.setMonetaryAmount(saleTransaction.getPortfolioTransaction().getMonetaryAmount()
.subtract(taxesTransaction.getMonetaryAmount()));
// Combine at sources file (One or two files?)
if (!saleTransaction.getSource().equals(taxesTransaction.getSource()))
saleTransaction.setSource(saleTransaction.getSource() + "; " + taxesTransaction.getSource());

// Add taxes as tax unit
saleTransaction.getPortfolioTransaction()
.addUnit(new Unit(Unit.Type.TAX, taxesTransaction.getMonetaryAmount()));
// Combine at notes
saleTransaction.setNote(concat(saleTransaction.getNote(), taxesTransaction.getNote()));

// Combine at sources file (One or two files?)
if (!saleTransaction.getSource().equals(taxesTransaction.getSource()))
saleTransaction.setSource(saleTransaction.getSource() + "; " + taxesTransaction.getSource());

// Combine at notes
saleTransaction.setNote(concat(saleTransaction.getNote(), taxesTransaction.getNote()));

// Add the taxes treatment to the hash table, which can be deleted
TaxesTransactionToBeDelete.add(taxesTransaction);
}
else
{
// do nothing because no taxes transaction is present
}
}
});
});
// delete the taxes treatment from the result list
items.remove(pair.tax());
}

dividendTaxesTransactions.forEach((k, v) -> {
v.forEach((security, transactions) -> {
Expand Down