diff --git a/austax/views.py b/austax/views.py index edb79ff..38feeba 100644 --- a/austax/views.py +++ b/austax/views.py @@ -29,7 +29,7 @@ from math import copysign @app.route('/tax/cgt-adjustments') def cgt_adjustments(): - adjustments = db.select(CGTCostAdjustment).order_by(CGTCostAdjustment.dt.desc(), CGTCostAdjustment.account) + adjustments = db.select(CGTCostAdjustment).order_by(CGTCostAdjustment.dt.desc(), CGTCostAdjustment.account, CGTCostAdjustment.id.desc()) if 'account' in request.args: adjustments = adjustments.where(CGTCostAdjustment.account == request.args['account']) if 'quantity' in request.args: diff --git a/drcr/journal/views.py b/drcr/journal/views.py index b855878..5364997 100644 --- a/drcr/journal/views.py +++ b/drcr/journal/views.py @@ -27,7 +27,7 @@ from datetime import datetime @app.route('/journal') def journal(): - transactions = db.session.scalars(db.select(Transaction).options(db.selectinload(Transaction.postings)).order_by(Transaction.dt.desc())).all() + transactions = db.session.scalars(db.select(Transaction).options(db.selectinload(Transaction.postings)).order_by(Transaction.dt.desc(), Transaction.id.desc())).all() return render_template( 'journal/journal.html', @@ -125,7 +125,7 @@ def journal_edit_transaction(): @app.route('/balance-assertions') def balance_assertions(): - assertions = db.session.scalars(db.select(BalanceAssertion).order_by(BalanceAssertion.dt.desc())).all() + assertions = db.session.scalars(db.select(BalanceAssertion).order_by(BalanceAssertion.dt.desc(), BalanceAssertion.id.desc())).all() # Check assertion status transactions = all_transactions() diff --git a/drcr/statements/views.py b/drcr/statements/views.py index 10e929c..4f0b5f8 100644 --- a/drcr/statements/views.py +++ b/drcr/statements/views.py @@ -29,7 +29,7 @@ def statement_lines(): # JOIN all associated postings (called in is_complex/charge_account) statement_lines = db.select(StatementLine).options( db.joinedload(StatementLine.reconciliation).joinedload(StatementLineReconciliation.posting).joinedload(Posting.transaction).joinedload(Transaction.postings) - ).order_by(StatementLine.dt.desc()) + ).order_by(StatementLine.dt.desc(), StatementLine.id.desc()) if 'account' in request.args: statement_lines = statement_lines.where(StatementLine.source_account == request.args['account']) diff --git a/drcr/views.py b/drcr/views.py index fcdea35..3e94685 100644 --- a/drcr/views.py +++ b/drcr/views.py @@ -87,14 +87,14 @@ def account_transactions(): 'transactions_commodity_detail.html', account=request.args['account'], running_total=Balance(), - transactions=sorted(transactions, key=lambda t: t.dt, reverse=True) + transactions=reversed(sorted(transactions, key=lambda t: t.dt)) ) else: return render_template( 'transactions.html', account=request.args['account'], running_total=Amount(0, '$'), - transactions=sorted(transactions, key=lambda t: t.dt, reverse=True) + transactions=reversed(sorted(transactions, key=lambda t: t.dt)) ) @app.route('/balance-sheet')