Skip to content

WIP: Matching dividends and theirreversals by orderID #91

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

Open
viktoraseev wants to merge 1 commit into
base: master
Choose a base branch
from
Open

WIP: Matching dividends and theirreversals by orderID #91

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
13 changes: 13 additions & 0 deletions jal/data_import/broker_statements/ibkr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ def __init__(self):
('reportDate', 'reported', datetime, None),
('amount', 'amount', float, None),
('tradeID', 'number', str, ''),
('actionID', 'actionid', str, ''),
('transactionID', 'tid', str, ''),
('description', 'description', str, None)],
'loader': self.load_cash_transactions},
Expand Down Expand Up @@ -979,6 +980,12 @@ def aggregate_dividends(self, dividends: list) -> list:
t_payment['description'] = t_payment['description'].replace(self.CancelPrefix, '')
t_payment['amount'] = -t_payment['amount']
if t_payment not in payments:
# IB, April 2022: ActionID field added to Activity Flex to allow simple mapping of corporate actions, dividends, dividend accruals, and withholding tax.
no_report_no_description = lambda x: {i: x[i] for i in x if i != 'reported' and i != 'description'}
m_payments = [x for x in payments if x['actionid'] != '' and no_report_no_description(x) == no_report_no_description(t_payment)]
if len(m_payments):
payments.remove(m_payments[0])
continue
no_description = lambda x: {i:x[i] for i in x if i != 'description'}
m_payments = [x for x in payments if no_description(x) == no_description(t_payment)]
if len(m_payments):
Expand Down Expand Up @@ -1011,6 +1018,12 @@ def aggregate_taxes(self, taxes: list) -> list:
t_payment['description'] = t_payment['description'].replace(self.CancelPrefix, '')
t_payment['amount'] = -t_payment['amount']
if t_payment not in payments:
# IB, April 2022: ActionID field added to Activity Flex to allow simple mapping of corporate actions, dividends, dividend accruals, and withholding tax.
no_report_no_description = lambda x: {i: x[i] for i in x if i != 'reported' and i != 'description'}
m_payments = [x for x in payments if x['actionid'] != '' and no_report_no_description(x) == no_report_no_description(t_payment)]
if len(m_payments):
payments.remove(m_payments[0])
continue
no_report = lambda x: {i: x[i] for i in x if i != 'reported'}
m_payments = [x for x in payments if no_report(x) == no_report(t_payment)]
if len(m_payments):
Expand Down