X-Git-Url: https://plomlompom.com/repos/%22https:/validator.w3.org/static/gitweb.js?a=blobdiff_plain;ds=sidebyside;f=ledger.py;h=b93b202e462cb47566bbc1fcf2aee598eec72775;hb=169d6b20b9f3d63508180971426db3bc195a3581;hp=0785b1a7559869c074080b0775d16f1a81c2cb3a;hpb=3edadb6c0b977d0362ca8344303b3260184bebae;p=misc diff --git a/ledger.py b/ledger.py index 0785b1a..b93b202 100755 --- a/ledger.py +++ b/ledger.py @@ -2,8 +2,9 @@ from http.server import BaseHTTPRequestHandler, HTTPServer import sys import os import html -import jinja2 +import jinja2 import decimal +import datetime from urllib.parse import parse_qs, urlparse hostName = "localhost" serverPort = 8082 @@ -27,61 +28,6 @@ def apply_booking_to_account_balances(account_sums, account, currency, amount): 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: @@ -126,7 +72,7 @@ def bookings_to_account_tree(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 @@ -135,6 +81,7 @@ def parse_lines(lines): bookings = [] comments = [] lines = lines.copy() + [''] # to ensure a booking-ending last line + last_date = '' for i, line in enumerate(lines): prefix = f"line {i}" # we start with the case of an utterly empty line @@ -145,7 +92,7 @@ def parse_lines(lines): # 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 @@ -171,6 +118,9 @@ def parse_lines(lines): datetime.datetime.strptime(date_string, '%Y-%m-%d') except ValueError: raise HandledException(f"{prefix} bad date string: {date_string}") + if last_date > date_string: + raise HandledException(f"{prefix} out-of-order-date") + last_date = date_string try: description = toks[1] except IndexError: @@ -236,11 +186,10 @@ def parse_lines(lines): raise HandledException(f"{prefix} amount has multiple dots: {value}") dots_counted += 1 amount_string += c - if len(amount_string) == 0: - raise HandledException(f"{prefix} amount missing: {value}") if len(currency) == 0: raise HandledException(f"{prefix} currency missing: {value}") - amount = decimal.Decimal(amount_string) + if len(amount_string) > 0: + amount = decimal.Decimal(amount_string) booking_lines += [(account_name, amount, currency)] if inside_booking: raise HandledException(f"{prefix} last booking unfinished") @@ -249,14 +198,15 @@ def parse_lines(lines): 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}" @@ -277,7 +227,7 @@ class Booking: 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(): @@ -329,31 +279,178 @@ class Database: def get_lines(self, start, end): return self.real_lines[start:end] - def replace(self, start, end, lines): + def write_db(self, text, mode='w'): import shutil if os.path.exists(self.lock_file): raise HandledException('Sorry, lock file!') - if os.path.exists(self.db_file): - shutil.copy(self.db_file, self.db_file + ".bak") f = open(self.lock_file, 'w+') f.close() - total_lines = self.real_lines[:start] + lines + self.real_lines[end:] - text = '\n'.join(total_lines) - with open(self.db_file, 'w') as f: + + # always back up most recent to .bak + bakpath = f'{self.db_file}.bak' + shutil.copy(self.db_file, bakpath) + + # collect modification times of numbered .bak files + bak_prefix = f'{bakpath}.' + backup_dates = [] + i = 0 + bak_as = f'{bak_prefix}{i}' + while os.path.exists(bak_as): + mod_time = os.path.getmtime(bak_as) + backup_dates += [str(datetime.datetime.fromtimestamp(mod_time))] + i += 1 + bak_as = f'{bak_prefix}{i}' + + # collect what numbered .bak files to save + to_save = [] + datetime_len = 19 + now = str(datetime.datetime.now())[:datetime_len] + while datetime_len > 2: + for i, date in reversed(list(enumerate(backup_dates))): + if date[:datetime_len] == now: + if i not in to_save: + to_save += [i] + break + datetime_len -= 1 + now = now[:datetime_len] + + # remove redundant backup files + j = 0 + for i in reversed(to_save): + if i != j: + source = f'{bak_prefix}{i}' + target = f'{bak_prefix}{j}' + shutil.move(source, target) + else: + print("keeping", i) + j += 1 + for i in range(j, len(backup_dates)): + print("removing", i) + try: + os.remove(f'{bak_prefix}{i}') + except FileNotFoundError: + pass + + # + shutil.copy(self.db_file, f'{bak_prefix}{j}') + with open(self.db_file, mode) as f: f.write(text); os.remove(self.lock_file) + def replace(self, start, end, lines): + total_lines = self.real_lines[:start] + lines + self.real_lines[end:] + text = '\n'.join(total_lines) + self.write_db(text) + def append(self, lines): - import shutil - if os.path.exists(self.lock_file): - raise HandledException('Sorry, lock file!') - if os.path.exists(self.db_file): - shutil.copy(self.db_file, self.db_file + ".bak") - f = open(self.lock_file, 'w+') - f.close() - with open(self.db_file, 'a') as f: - f.write('\n\n' + '\n'.join(lines) + '\n\n'); - os.remove(self.lock_file) + text = '\n\n' + '\n'.join(lines) + '\n\n' + self.write_db(text, 'a') + + 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 + months_passed = -int(finish) + 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 acc_kk_add in acc_keys and acc_kk_minimum in acc_keys: + months_passed += 1 + if finish: + 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) + 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} â¬'] + year_needed = buffer_expenses + final_minus + (12 - months_passed - 1) * final_minus + ret += [f' {acc_buffer} {-final_minus} ⬠; assume as to earn in year: {acc_buffer} + {12 - months_passed - 1} * this = {-year_needed}'] + return ret class MyServer(BaseHTTPRequestHandler): @@ -366,66 +463,103 @@ th, td { text-align: left } input[type=number] { text-align: right; font-family: monospace; } .money { font-family: monospace; text-align: right; } .comment { font-style: italic; color: #777777; } +.meta { font-size: 0.75em; color: #777777; } .full_line_comment { display: block; white-space: nowrap; width: 0; }
-ledger +ledger1 +ledger2 balance add free add structured{{date}} {{desc}} {{head_comment|e}}
+
+
{{l.acc|e}} | {{l.money|e}} | {{l.comment|e}} |
{{l.comment|e}} |
{content}" def ledger2_as_html(self, db): - single_c_tmpl = jinja2.Template('{{c|e}}
{{date}} {{desc}} {{head_comment|e}} -[edit: structured -/ free -| copy:structured -/ free] -
{{l.acc|e}} | {{l.money|e}} | {{l.balance|e}} |
{{date}} {{desc}} {{head_comment|e}} -[edit: structured -/ free -| copy:structured -/ free] -
{{l.acc|e}} | {{l.money|e}} | {{l.comment|e}} |
{{l.comment|e}} |