diff --git a/austax/__init__.py b/austax/__init__.py index b42ecf7..7c41d5d 100644 --- a/austax/__init__.py +++ b/austax/__init__.py @@ -34,6 +34,7 @@ def plugin_init(): 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)')) + drcr.plugins.account_kinds.append(('austax.d9', 'Gifts or donations (D9)')) drcr.plugins.account_kinds.append(('austax.paygw', 'PAYG withheld amounts')) drcr.plugins.account_kinds.append(('austax.cgtasset', 'CGT asset')) drcr.plugins.account_kinds.append(('austax.rfb', 'Reportable fringe benefit')) diff --git a/austax/reports.py b/austax/reports.py index 8e0398a..fec3101 100644 --- a/austax/reports.py +++ b/austax/reports.py @@ -103,9 +103,14 @@ def tax_summary_report(): entries=entries_for_kind(account_configurations, accounts, 'austax.d5') + [Subtotal('Total item D5', id='d5', floor=100)] ), Spacer(), + Section( + title='Gifts or donations (D9)', + entries=entries_for_kind(account_configurations, accounts, 'austax.d9') + [Subtotal('Total item D9', id='d9', floor=100)] + ), + Spacer(), Calculated( 'Total deductions', - lambda r: r.by_id('d2').amount + r.by_id('d4').amount + r.by_id('d5').amount, + lambda r: r.by_id('d2').amount + r.by_id('d4').amount + r.by_id('d5').amount + r.by_id('d9').amount, id='deductions', heading=True, bordered=True @@ -133,11 +138,6 @@ def tax_summary_report(): ] ), Spacer(), - Section( - title='PAYG withheld amounts', - entries=entries_for_kind(account_configurations, accounts, 'austax.paygw') + [Subtotal('Total withheld amounts', id='paygw')] - ), - Spacer(), Section( entries=[ Calculated( @@ -159,6 +159,11 @@ def tax_summary_report(): ] ), Spacer(), + Section( + title='PAYG withheld amounts', + entries=entries_for_kind(account_configurations, accounts, 'austax.paygw') + [Subtotal('Total withheld amounts', id='paygw')] + ), + Spacer(), Calculated( 'ATO liability payable (refundable)', lambda _: report.by_id('total_tax').amount - report.by_id('paygw').amount + report.by_id('loan_repayment').amount,