From 9555da387c89ca486f45092cfe39987c52a14252 Mon Sep 17 00:00:00 2001 From: RunasSudo Date: Sun, 10 Sep 2023 20:40:40 +1000 Subject: [PATCH] auxtax: Add more categories --- austax/__init__.py | 3 +++ austax/reports.py | 17 ++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/austax/__init__.py b/austax/__init__.py index 7c41d5d..14bd247 100644 --- a/austax/__init__.py +++ b/austax/__init__.py @@ -31,6 +31,9 @@ def plugin_init(): drcr.plugins.account_kinds.append(('austax.income1', 'Salary or wages (1)')) drcr.plugins.account_kinds.append(('austax.income5', 'Australian Government allowances and payments (5)')) drcr.plugins.account_kinds.append(('austax.income10', 'Gross interest (10)')) + drcr.plugins.account_kinds.append(('austax.income13', 'Partnerships and trusts (13)')) + #drcr.plugins.account_kinds.append(('austax.income18', 'Net capital gain (18)')) + drcr.plugins.account_kinds.append(('austax.income20', 'Foreign source income and foreign assets or property (20)')) drcr.plugins.account_kinds.append(('austax.d2', 'Work-related travel expenses (D2)')) drcr.plugins.account_kinds.append(('austax.d4', 'Work-related self-education expenses (D4)')) drcr.plugins.account_kinds.append(('austax.d5', 'Other work-related expenses (D5)')) diff --git a/austax/reports.py b/austax/reports.py index b74bd65..635a526 100644 --- a/austax/reports.py +++ b/austax/reports.py @@ -80,9 +80,24 @@ def tax_summary_report(): entries=entries_for_kind(account_configurations, accounts, 'austax.income10', neg=True) + [Subtotal('Total item 10', id='income10', floor=100)] ), Spacer(), + Section( + title='Partnerships and trusts (13)', + entries=entries_for_kind(account_configurations, accounts, 'austax.income13', neg=True, floor=100) + [Subtotal('Total item 13', id='income13', floor=100)] + ), + Spacer(), + #Section( + # title='Net capital gains (18)', + # entries=entries_for_kind(account_configurations, accounts, 'austax.income18', neg=True) + [Subtotal('Total item 18', id='income18', floor=100)] + #), + #Spacer(), + Section( + title='Foreign source income and foreign assets or property (20)', + entries=entries_for_kind(account_configurations, accounts, 'austax.income20', neg=True, floor=100) + [Subtotal('Total item 20', id='income20', floor=100)] + ), + Spacer(), Calculated( 'Total assessable income', - lambda r: r.by_id('income1').amount + r.by_id('income5').amount, + lambda r: r.by_id('income1').amount + r.by_id('income5').amount + r.by_id('income10').amount + r.by_id('income13').amount + r.by_id('income20').amount, id='assessable', heading=True, bordered=True