diff --git a/tax.py b/tax.py index 84e22e2..f719e40 100644 --- a/tax.py +++ b/tax.py @@ -146,7 +146,7 @@ def report(year, conn=None): counted = bool(market["taxable"]) and bool(row["taxable"]) informational = counted or not market["taxable"] if row["type"] == "income": - value = (row["value_ore"] or 0) - (row["fee_ore"] or 0) + value = row["value_ore"] or 0 if counted: income_ore += value elif ( @@ -157,9 +157,9 @@ def report(year, conn=None): if row["type"] == "loss": proceeds = 0 elif row["type"] == "spend": - proceeds = (row["value_ore"] or 0) - (row["fee_ore"] or 0) + proceeds = row["value_ore"] or 0 else: - proceeds = (row["leg_in_ore"] or 0) - (row["fee_ore"] or 0) + proceeds = row["leg_in_ore"] or 0 cost_ore = row["cost_ore"] figure = figures[row["market_id"]] figure["brukt_ore"] += cost_ore