diff --git a/ledger_pyreport/jinja2/transactions.html b/ledger_pyreport/jinja2/transactions.html index ce95561..dd6052b 100644 --- a/ledger_pyreport/jinja2/transactions.html +++ b/ledger_pyreport/jinja2/transactions.html @@ -47,7 +47,7 @@ {% set ns = namespace(balance=None) %} {% if account %} {% set prevlink = '/transactions?' + {'date_end': (date_beg - timedelta(days=1)).strftime('%Y-%m-%d'), 'date_beg': date_beg.replace(year=date_beg.year-1).strftime('%Y-%m-%d'), 'account': account.name, 'cash': 'on' if cash else ''}|urlencode %} - + {{ date_beg.strftime('%Y-%m-%d') }} Opening Balance @@ -70,7 +70,7 @@ {% for posting in transaction.postings if posting.account != account %} {% set amount = posting.exchange(report_commodity, transaction.date) %} {% set trn_url = '/transaction?' + {'tid': transaction.id, 'cash': 'on' if cash else ''}|urlencode %} - + {% if loop.first %}{% if transaction.id %}{% endif %}{{ transaction.date.strftime('%Y-%m-%d') }}{% if transaction.id %}{% endif %}{% endif %} {% if loop.first %}{% if transaction.id %}{% endif %}{{ transaction.description }}{% if transaction.id %}{% endif %}{% endif %} {{ (posting.account.name|e).__str__().replace(':', ':')|safe }} @@ -97,7 +97,7 @@ {% endfor %} {% if account %} - + {{ date_end.strftime('%Y-%m-%d') }} Closing Balance @@ -112,7 +112,7 @@ {% else %} - + {{ date_end.strftime('%Y-%m-%d') }} Total diff --git a/ledger_pyreport/jinja2/transactions_commodity.html b/ledger_pyreport/jinja2/transactions_commodity.html index bafd9aa..9e5c802 100644 --- a/ledger_pyreport/jinja2/transactions_commodity.html +++ b/ledger_pyreport/jinja2/transactions_commodity.html @@ -41,7 +41,7 @@ {% set ns = namespace(balance=None) %} {% set prevlink = '/transactions?' + {'date_end': (date_beg - timedelta(days=1)).strftime('%Y-%m-%d'), 'date_beg': date_beg.replace(year=date_beg.year-1).strftime('%Y-%m-%d'), 'account': account.name, 'cash': 'on' if cash else '', 'commodity': 'on'}|urlencode %} {% for amount in opening_balance.amounts %} - + {% if loop.first %}{{ date_beg.strftime('%Y-%m-%d') }}{% endif %} {% if loop.first %}Opening Balance{% endif %} @@ -51,7 +51,7 @@ {% if amount >= 0 %}Dr{% else %}Cr{% endif %} {% else %} - + {{ date_beg.strftime('%Y-%m-%d') }} Opening Balance @@ -72,7 +72,7 @@ {% endfor %} {% for amount in ns.balance.amounts %} {% set posting = matching_posting(transaction, amount) %} - + {% if loop.first %}{% if transaction.id %}{% endif %}{{ transaction.date.strftime('%Y-%m-%d') }}{% if transaction.id %}{% endif %}{% endif %} {% if loop.first %}{% if transaction.id %}{% endif %}{{ transaction.description }}{% if transaction.id %}{% endif %}{% endif %} {% if posting %} @@ -89,7 +89,7 @@ {% endfor %} {% for amount in closing_balance.amounts %} - + {% if loop.first %}{{ date_end.strftime('%Y-%m-%d') }}{% endif %} {% if loop.first %}Closing Balance{% endif %} @@ -100,7 +100,7 @@ {% endfor %} - + diff --git a/ledger_pyreport/static/main.css b/ledger_pyreport/static/main.css index e94b2ab..756d631 100644 --- a/ledger_pyreport/static/main.css +++ b/ledger_pyreport/static/main.css @@ -44,6 +44,7 @@ table.ledger { table.ledger td, table.ledger th { padding: 2px 2px 2px 2px; + vertical-align: top; } table.ledger th { @@ -66,6 +67,13 @@ table.ledger.onedesc tr td:not(:first-child), table.ledger.onedesc tr th:not(:fi width: 6em; } +table.ledger tr.trn-first td { + padding-top: 1.5mm; +} +table.ledger tr.trn-last td { + padding-bottom: 1.5mm; +} + table.ledger a { color: black; text-decoration: none;