diff --git a/austax/templates/cgt_assets.html b/austax/templates/cgt_assets.html
index 9e08fb8..16b0aa4 100644
--- a/austax/templates/cgt_assets.html
+++ b/austax/templates/cgt_assets.html
@@ -1,5 +1,5 @@
{# DrCr: Web-based double-entry bookkeeping framework
- Copyright (C) 2022–2023 Lee Yingtong Li (RunasSudo)
+ Copyright (C) 2022–2024 Lee Yingtong Li (RunasSudo)
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -15,52 +15,62 @@
along with this program. If not, see
- | - | - | Acquisition | -Adjustment | -- | Disposal | -+ | + | + | + | Acquisition | +Adjustment | ++ | Disposal | +|||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Account | -Asset | -Units | -Date | -Value | -b/f | -{{ eofy_date.year }} | -- | Date | -Value | -Gain | +Account | +Asset | +Units | +Date | +Value | +b/f | +{{ eofy_date.year }} | ++ | Date | +Value | +Gain |
{{ asset.account }} | -{{ asset.commodity_name() }} | -{{ asset.format('hide') }} | -{{ asset.acquisition_date.strftime('%Y-%m-%d') }} | -{{ asset.as_cost().format() }} | -{{ asset.cost_adjustment_brought_forward().format_accounting(link=url_for('cgt_adjustments', account=asset.account, commodity=asset.commodity, quantity=asset.quantity, acquisition_date=asset.acquisition_date.strftime('%Y-%m-%d'))) if asset.cost_adjustment_brought_forward().quantity != 0 }} | -{{ asset.cost_adjustment_current_period().format_accounting(link=url_for('cgt_adjustments', account=asset.account, commodity=asset.commodity, quantity=asset.quantity, acquisition_date=asset.acquisition_date.strftime('%Y-%m-%d'))) if asset.cost_adjustment_current_period().quantity != 0 }} | -- | {{ asset.disposal_date.strftime('%Y-%m-%d') if asset.disposal_date else '' }} | -{{ asset.disposal_value.format() if asset.disposal_value else '' }} | -{% if asset.disposal_date %}{{ asset.gain().format_accounting() }}{% endif %} | +|||||||||||
+ {{ asset.account }} + | +{{ asset.commodity_name() }} | +{{ asset.format('hide') }} | +{{ asset.acquisition_date.strftime('%Y-%m-%d') }} | +{{ asset.as_cost().format() }} | +{{ asset.cost_adjustment_brought_forward().format_accounting(link=url_for('cgt_adjustments', account=asset.account, commodity=asset.commodity, quantity=asset.quantity, acquisition_date=asset.acquisition_date.strftime('%Y-%m-%d'))) if asset.cost_adjustment_brought_forward().quantity != 0 }} | +{{ asset.cost_adjustment_current_period().format_accounting(link=url_for('cgt_adjustments', account=asset.account, commodity=asset.commodity, quantity=asset.quantity, acquisition_date=asset.acquisition_date.strftime('%Y-%m-%d'))) if asset.cost_adjustment_current_period().quantity != 0 }} | ++ + + + | +{{ asset.disposal_date.strftime('%Y-%m-%d') if asset.disposal_date else '' }} | +{{ asset.disposal_value.format() if asset.disposal_value else '' }} | +{% if asset.disposal_date %}{{ asset.gain().format_accounting() }}{% endif %} |