account_sums[account][currency] += amount
-def add_taxes(lines):
- bookings, _ = parse_lines(lines)
- _, account_sums = bookings_to_account_tree(bookings)
- expenses_so_far = -1 * account_sums['Assets']['€']
- needed_income_before_krankenkasse = expenses_so_far
- ESt_this_month = 0
- left_over = needed_income_before_krankenkasse - ESt_this_month
- too_low = 0
- too_high = 2 * needed_income_before_krankenkasse
- E0 = decimal.Decimal(10908)
- E1 = decimal.Decimal(15999)
- E2 = decimal.Decimal(62809)
- E3 = decimal.Decimal(277825)
- while True:
- zvE = 12 * needed_income_before_krankenkasse
- if zvE < E0:
- ESt = decimal.Decimal(0)
- elif zvE < E1:
- y = (zvE - E0)/10000
- ESt = (decimal.Decimal(979.18) * y + 1400) * y
- elif zvE < E2:
- y = (zvE - E1)/10000
- ESt = (decimal.Decimal(192.59) * y + 2397) * y + decimal.Decimal(966.53)
- elif zvE < E3:
- ESt = decimal.Decimal(0.42) * (zvE - decimal.Decimal(62809)) + decimal.Decimal(16405.54)
- else:
- ESt = decimal.Decimal(0.45) * (zvE - decimal.Decimal(277825)) + decimal.Decimal(106713.52)
- ESt_this_month = ESt / 12
- left_over = needed_income_before_krankenkasse - ESt_this_month
- if abs(left_over - expenses_so_far) < 0.001:
- break
- elif left_over < expenses_so_far:
- too_low = needed_income_before_krankenkasse
- elif left_over > expenses_so_far:
- too_high = needed_income_before_krankenkasse
- needed_income_before_krankenkasse = too_low + (too_high - too_low)/2
- ESt_this_month = ESt_this_month.quantize(decimal.Decimal('0.00'))
- line_income_tax = f' Reserves:Einkommenssteuer {ESt_this_month}€ ; expenses so far: {expenses_so_far:.2f}€; zvE: {zvE:.2f}€; ESt total: {ESt:.2f}€; needed before Krankenkasse: {needed_income_before_krankenkasse:.2f}€'
- kk_minimum_income = decimal.Decimal(1096.67)
- kk_factor = decimal.Decimal(0.189)
- kk_minimum_tax = decimal.Decimal(207.27).quantize(decimal.Decimal('0.00'))
- # kk_minimum_income = 1131.67
- # kk_factor = decimal.Decimal(0.191)
- # kk_minimum_tax = decimal.Decimal(216.15)
- # kk_factor = decimal.Decimal(0.197)
- # kk_minimum_tax = decimal.Decimal(222.94)
- kk_add = max(0, kk_factor * needed_income_before_krankenkasse - kk_minimum_tax)
- kk_add = decimal.Decimal(kk_add).quantize(decimal.Decimal('0.00'))
- line_kk_minimum = f' Reserves:Month:Krankenkassendefaultbeitrag {kk_minimum_tax}€ ; assumed minimum income {kk_minimum_income:.2f}€ * {kk_factor:.3f}'
- line_kk_add = f' Reserves:Month:Krankenkassenbeitragswachstum {kk_add}€ ; max(0, {kk_factor:.3f} * {needed_income_before_krankenkasse:.2f}€ - {kk_minimum_tax}€)'
- final_minus = expenses_so_far + ESt_this_month + kk_minimum_tax + kk_add
- line_finish = f' Assets -{ESt_this_month + kk_minimum_tax + kk_add} € ; -{final_minus}€'
- return [line_income_tax, line_kk_minimum, line_kk_add, line_finish]
-
-
def bookings_to_account_tree(bookings):
account_sums = {}
for booking in bookings:
return account_tree, account_sums
-def parse_lines(lines):
+def parse_lines(lines, validate_bookings=True):
import datetime
inside_booking = False
date_string, description = None, None
# assume we finished a booking, finalize, and commit to DB
if len(booking_lines) < 2:
raise HandledException(f"{prefix} booking ends to early")
- booking = Booking(date_string, description, booking_lines, start_line)
+ booking = Booking(date_string, description, booking_lines, start_line, validate_bookings)
bookings += [booking]
# expect new booking to follow so re-zeroall booking data
inside_booking = False
class Booking:
- def __init__(self, date_string, description, booking_lines, start_line):
+ def __init__(self, date_string, description, booking_lines, start_line, process=True):
self.date_string = date_string
self.description = description
self.lines = booking_lines
self.start_line = start_line
- self.validate_booking_lines()
- self.sink = {}
- self.account_changes = self.parse_booking_lines_to_account_changes()
+ if process:
+ self.validate_booking_lines()
+ self.sink = {}
+ self.account_changes = self.parse_booking_lines_to_account_changes()
def validate_booking_lines(self):
prefix = f"booking at line {self.start_line}"
if empty_values == 0:
for k, v in sums.items():
if v != 0:
- raise HandledException(f"{prefix} does not add up to zero")
+ raise HandledException(f"{prefix} does not add up to zero / {k} {v}")
else:
sinkable = False
for k, v in sums.items():
f.write('\n\n' + '\n'.join(lines) + '\n\n');
os.remove(self.lock_file)
+ def add_taxes(self, lines, finish=False):
+ ret = []
+ bookings, _ = parse_lines(lines)
+ date = bookings[0].date_string
+ acc_kk_add = 'Reserves:KrankenkassenBeitragsWachstum'
+ acc_kk_minimum = 'Reserves:Month:KrankenkassenDefaultBeitrag'
+ acc_kk = 'Expenses:KrankenKasse'
+ acc_est = 'Reserves:Einkommenssteuer'
+ acc_assets = 'Assets'
+ acc_buffer = 'Reserves:NeuAnfangsPuffer:Ausgaben'
+ last_monthbreak_assets = 0
+ last_monthbreak_est = 0
+ last_monthbreak_kk_minimum = 0
+ last_monthbreak_kk_add = 0
+ buffer_expenses = 0
+ kk_expenses = 0
+ est_expenses = 0
+ for b in self.bookings:
+ if date == b.date_string:
+ break
+ acc_keys = b.account_changes.keys()
+ if acc_buffer in acc_keys:
+ buffer_expenses -= b.account_changes[acc_buffer]['€']
+ if acc_kk_add in acc_keys:
+ kk_expenses += b.account_changes[acc_kk_add]['€']
+ if acc_kk in acc_keys:
+ kk_expenses += b.account_changes[acc_kk]['€']
+ if acc_est in acc_keys:
+ est_expenses += b.account_changes[acc_est]['€']
+ if finish and acc_kk_add in acc_keys and acc_kk_minimum in acc_keys:
+ last_monthbreak_kk_add = b.account_changes[acc_kk_add]['€']
+ last_monthbreak_est = b.account_changes[acc_est]['€']
+ last_monthbreak_kk_minimum = b.account_changes[acc_kk_minimum]['€']
+ last_monthbreak_assets = b.account_changes[acc_buffer]['€']
+ old_needed_income = last_monthbreak_assets + last_monthbreak_kk_add + last_monthbreak_kk_minimum + last_monthbreak_est
+ if finish:
+ ret += [f' {acc_est} {-last_monthbreak_est}€ ; for old assumption of needed income: {old_needed_income}€']
+ _, account_sums = bookings_to_account_tree(bookings)
+ expenses_so_far = -1 * account_sums[acc_assets]['€'] - old_needed_income
+ needed_income_before_kk = expenses_so_far
+ ESt_this_month = 0
+ left_over = needed_income_before_kk - ESt_this_month
+ too_low = 0
+ too_high = 2 * needed_income_before_kk
+ E0 = decimal.Decimal(10908)
+ E1 = decimal.Decimal(15999)
+ E2 = decimal.Decimal(62809)
+ E3 = decimal.Decimal(277825)
+ months_passed = int(date[5:7]) - 1
+ while True:
+ zvE = buffer_expenses - kk_expenses + (12 - months_passed) * needed_income_before_kk
+ if finish:
+ zvE += last_monthbreak_assets + last_monthbreak_kk_add + last_monthbreak_kk_minimum
+ if zvE < E0:
+ ESt = decimal.Decimal(0)
+ elif zvE < E1:
+ y = (zvE - E0)/10000
+ ESt = (decimal.Decimal(979.18) * y + 1400) * y
+ elif zvE < E2:
+ y = (zvE - E1)/10000
+ ESt = (decimal.Decimal(192.59) * y + 2397) * y + decimal.Decimal(966.53)
+ elif zvE < E3:
+ ESt = decimal.Decimal(0.42) * (zvE - decimal.Decimal(62809)) + decimal.Decimal(16405.54)
+ else:
+ ESt = decimal.Decimal(0.45) * (zvE - decimal.Decimal(277825)) + decimal.Decimal(106713.52)
+ ESt_this_month = (ESt + last_monthbreak_est - est_expenses) / (12 - months_passed)
+ left_over = needed_income_before_kk - ESt_this_month
+ if abs(left_over - expenses_so_far) < 0.001:
+ break
+ elif left_over < expenses_so_far:
+ too_low = needed_income_before_kk
+ elif left_over > expenses_so_far:
+ too_high = needed_income_before_kk
+ needed_income_before_kk = too_low + (too_high - too_low)/2
+ ESt_this_month = ESt_this_month.quantize(decimal.Decimal('0.00'))
+ ret += [f' {acc_est} {ESt_this_month}€ ; expenses so far: {expenses_so_far:.2f}€; zvE: {zvE:.2f}€; ESt total: {ESt:.2f}€; needed before Krankenkasse: {needed_income_before_kk:.2f}€']
+ kk_minimum_income = 1131.67
+ if date < '2023-02-01':
+ kk_minimum_income = decimal.Decimal(1096.67)
+ kk_factor = decimal.Decimal(0.189)
+ kk_minimum_tax = decimal.Decimal(207.27).quantize(decimal.Decimal('0.00'))
+ elif date < '2023-08-01':
+ kk_factor = decimal.Decimal(0.191)
+ kk_minimum_tax = decimal.Decimal(216.15).quantize(decimal.Decimal('0.00'))
+ else:
+ kk_factor = decimal.Decimal(0.197)
+ kk_minimum_tax = decimal.Decimal(222.94).quantize(decimal.Decimal('0.00'))
+ kk_add = max(0, kk_factor * needed_income_before_kk - kk_minimum_tax)
+ kk_add = decimal.Decimal(kk_add).quantize(decimal.Decimal('0.00'))
+ if finish:
+ ret += [f' {acc_kk_add} {-last_monthbreak_kk_add}€ ; max(0, {kk_factor:.3f} * {-(old_needed_income - last_monthbreak_est):.2f}€ - {kk_minimum_tax}€)']
+ else:
+ ret += [f' {acc_kk_minimum} {kk_minimum_tax}€ ; assumed minimum income {kk_minimum_income:.2f}€ * {kk_factor:.3f}']
+ ret += [f' {acc_kk_add} {kk_add}€ ; max(0, {kk_factor:.3f} * {needed_income_before_kk:.2f}€ - {kk_minimum_tax}€)']
+ diff = - last_monthbreak_est + ESt_this_month - last_monthbreak_kk_add + kk_add
+ if not finish:
+ diff += kk_minimum_tax
+ final_minus = expenses_so_far + old_needed_income + diff
+ ret += [f' {acc_assets} {-diff} €']
+ ret += [f' {acc_assets} {final_minus} €']
+ ret += [f' {acc_buffer} {-final_minus} €']
+ return ret
+
class MyServer(BaseHTTPRequestHandler):
header = """<html>
parsed_url = urlparse(self.path)
lines = []
add_empty_line = None
+ start = int(postvars['start'][0])
+ end = int(postvars['end'][0])
if '/add_structured' == parsed_url.path and not 'revert' in postvars.keys():
date = postvars['date'][0]
description = postvars['description'][0]
new_line += f' ; {comment}'
lines += [new_line]
if 'add_taxes' in postvars.keys():
- lines += add_taxes(lines)
+ lines += db.add_taxes(lines, finish=False)
+ elif 'add_taxes2' in postvars.keys():
+ lines += db.add_taxes(lines, finish=True)
elif '/add_free' == parsed_url.path:
lines = postvars['booking'][0].splitlines()
- start = int(postvars['start'][0])
- end = int(postvars['end'][0])
try:
- _, _ = parse_lines(lines)
+ if ('save' in postvars.keys()) or ('check' in postvars.keys()):
+ _, _ = parse_lines(lines)
if 'save' in postvars.keys():
if start == end == 0:
db.append(lines)
start = int(params.get('start', ['0'])[0])
end = int(params.get('end', ['0'])[0])
if parsed_url.path == '/balance':
- page += self.balance_as_html(db)
+ stop_date = params.get('stop', [None])[0]
+ page += self.balance_as_html(db, stop_date)
elif parsed_url.path == '/add_free':
page += self.add_free(db, start, end)
elif parsed_url.path == '/add_structured':
page += self.footer
self.wfile.write(bytes(page, "utf-8"))
- def balance_as_html(self, db):
+ def balance_as_html(self, db, stop_date=None):
lines = []
- account_tree, account_sums = bookings_to_account_tree(db.bookings)
+ bookings = db.bookings
+ if stop_date:
+ bookings = []
+ for b in db.bookings:
+ if b.date_string == stop_date:
+ break
+ bookings += [b]
+ account_tree, account_sums = bookings_to_account_tree(bookings)
def print_subtree(lines, indent, node, subtree, path):
line = f"{indent}{node}"
n_tabs = 5 - (len(line) // 8)
<input type="submit" name="check" value="check" />
<input type="submit" name="revert" value="revert" />
<input type="submit" name="add_taxes" value="add taxes" />
+<input type="submit" name="add_taxes2" value="add taxes2" />
<br />
<input name="date" value="{{date|e}}" size=9 />
<input name="description" value="{{desc|e}}" list="descriptions" />
<input name="line_{{line.i}}_account" value="{{line.acc|e}}" size=40 list="accounts" />
<input type="number" name="line_{{line.i}}_amount" step=0.01 value="{{line.amt}}" size=10 />
<input name="line_{{line.i}}_currency" value="{{line.curr|e}}" size=3 list="currencies" />
-<textarea name="line_{{line.i}}_comment" rows=1 cols={% if line.comm_cols %}{{line.comm_cols}}{% else %}20{% endif %}>{{line.comment|e}}</textarea>
<input type="submit" name="line_{{line.i}}_delete" value="[x]" />
<input type="submit" name="line_{{line.i}}_add" value="[+]" />
+<textarea name="line_{{line.i}}_comment" rows=1 cols={% if line.comm_cols %}{{line.comm_cols}}{% else %}20{% endif %}>{{line.comment|e}}</textarea>
<br />
{% endfor %}
{% for name, items in datalist_sets.items() %}
""")
import datetime
lines = temp_lines if len(''.join(temp_lines)) > 0 else db.get_lines(start, end)
- bookings, comments = parse_lines(lines)
+ bookings, comments = parse_lines(lines, validate_bookings=False)
if len(bookings) > 1:
raise HandledException('can only edit single Booking')
if add_empty_line is not None:
projects / misc / commitdiff