Remove extraneous balancing postings from account transactions report

This commit is contained in:
RunasSudo 2021-01-24 02:23:38 +11:00
parent 5eb7209b95
commit 4b8ae40f82
Signed by: RunasSudo
GPG Key ID: 7234E476BF21C61A
2 changed files with 37 additions and 1 deletions

View File

@ -295,7 +295,7 @@ def transactions():
else:
# Account Transactions
account = l.get_account(account)
transactions = [t for t in l.transactions if t.date <= date_end and t.date >= date_beg and any(p.account == account for p in t.postings)]
transactions = [t.perspective_of(account) for t in l.transactions if t.date <= date_end and t.date >= date_beg and any(p.account == account for p in t.postings)]
opening_balance = accounting.trial_balance_raw(l, date_beg - timedelta(days=1), date_beg).get_balance(account).exchange(report_commodity, True)
closing_balance = accounting.trial_balance_raw(l, date_end, date_beg).get_balance(account).exchange(report_commodity, True)

View File

@ -164,6 +164,34 @@ class Transaction:
return result
def perspective_of(self, account):
# Return a transaction from the "perspective" of this account only
if len(self.postings) <= 2:
# No need to modify if already simple
return self
acc_postings = [p for p in self.postings if p.account == account]
if len(acc_postings) == 0:
raise Exception('Attempted to view transaction from invalid account')
# Are all postings to that account of the same sign?
if not all(p.amount.sign == acc_postings[0].amount.sign for p in acc_postings[1:]):
# Unable to simplify complex transaction
return self
# Is there one posting only of the opposite sign?
opp_postings = [p for p in self.postings if p.amount.sign == -acc_postings[0].amount.sign]
if len(opp_postings) != 1:
# Unable to simplify complex transaction
return self
# Balance only acc_postings
new_opp_postings = [Posting(self, opp_postings[0].account, -p.amount, opp_postings[0].comment, opp_postings[0].state) for p in acc_postings]
result = Transaction(self.ledger, self.id, self.date, self.description, self.code, self.uuid, self.metadata)
result.postings = acc_postings + new_opp_postings
return result
class Posting:
class State(Enum):
UNCLEARED = 0
@ -363,6 +391,14 @@ class Amount:
return True
return False
@property
def sign(self):
if self.amount > 0:
return 1
if self.amount < 0:
return -1
return 0
class Balance:
def __init__(self, amounts=None):
self.amounts = amounts or []