RunasSudo/DrCr
1
Fork 0
Code Issues 1 Pull Requests Releases Activity

Re-implement charging statement lines for consolidated Transaction model

Browse Source
This commit is contained in:
RunasSudo 2023-01-02 18:57:25 +11:00
parent 33cf00ecec
commit 3c661100e5
Signed by: RunasSudo
GPG Key ID: 7234E476BF21C61A
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drcr/statements/views.py
View File

@ -18,8 +18,9 @@ from flask import abort, redirect, render_template, request
from .. import AMOUNT_DPS from .. import AMOUNT_DPS
from ..database import db from ..database import db
from ..models import Posting, Transaction
from ..webapp import app from ..webapp import app
from .models import StatementLine from .models import StatementLine, StatementLineReconciliation
@app.route('/statement-lines') @app.route('/statement-lines')
def statement_lines(): def statement_lines():
@ -36,19 +37,26 @@ def statement_line_charge():
if not statement_line: if not statement_line:
abort(404) abort(404)
# Delete existing postings if statement_line.reconciliation:
statement_line.delete_postings() raise Exception('NYI')
transaction = StatementLineTransaction( # Create transaction
posting_source = Posting(account=statement_line.source_account, quantity=statement_line.quantity, commodity=statement_line.commodity)
posting_charge = Posting(account=request.form['charge-account'], quantity=-statement_line.quantity, commodity=statement_line.commodity)
transaction = Transaction(
dt=statement_line.dt, dt=statement_line.dt,
description=statement_line.description, description=statement_line.description,
postings=[ postings=[posting_source, posting_charge]
StatementLinePosting(statement_line=statement_line, account=statement_line.source_account, quantity=statement_line.quantity, commodity=statement_line.commodity),
StatementLinePosting(account=request.form['charge-account'], quantity=-statement_line.quantity, commodity=statement_line.commodity)
]
) )
db.session.add(transaction) db.session.add(transaction)
# Reconcile statement line
reconciliation = StatementLineReconciliation(
statement_line=statement_line,
posting=posting_source
)
db.session.add(reconciliation)
db.session.commit() db.session.commit()
return 'OK' return 'OK'

2
drcr/templates/statements/statement_lines.html
View File

@ -84,6 +84,8 @@
if (xhr.status === 200) { if (xhr.status === 200) {
document.querySelector('[data-line-id="' + lineId + '"] .charge-account a').innerText = chargeAccount; document.querySelector('[data-line-id="' + lineId + '"] .charge-account a').innerText = chargeAccount;
document.querySelector('[data-line-id="' + lineId + '"] .charge-account a').className = 'text-body'; document.querySelector('[data-line-id="' + lineId + '"] .charge-account a').className = 'text-body';
} else {
alert('Error when charging statement line');
} }
}); });
xhr.open('POST', '/statement-lines/charge'); xhr.open('POST', '/statement-lines/charge');