Read the income and the proceeds without the dead fee
This commit is contained in:
1 parent
17987245fa
commit
ba48a14b1b
1 file changed
+3
-3
@@ -146,7 +146,7 @@ def report(year, conn=None):
|
|||||||
counted = bool(market["taxable"]) and bool(row["taxable"])
|
counted = bool(market["taxable"]) and bool(row["taxable"])
|
||||||
informational = counted or not market["taxable"]
|
informational = counted or not market["taxable"]
|
||||||
if row["type"] == "income":
|
if row["type"] == "income":
|
||||||
value = (row["value_ore"] or 0) - (row["fee_ore"] or 0)
|
value = row["value_ore"] or 0
|
||||||
if counted:
|
if counted:
|
||||||
income_ore += value
|
income_ore += value
|
||||||
elif (
|
elif (
|
||||||
@@ -157,9 +157,9 @@ def report(year, conn=None):
|
|||||||
if row["type"] == "loss":
|
if row["type"] == "loss":
|
||||||
proceeds = 0
|
proceeds = 0
|
||||||
elif row["type"] == "spend":
|
elif row["type"] == "spend":
|
||||||
proceeds = (row["value_ore"] or 0) - (row["fee_ore"] or 0)
|
proceeds = row["value_ore"] or 0
|
||||||
else:
|
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"]
|
cost_ore = row["cost_ore"]
|
||||||
figure = figures[row["market_id"]]
|
figure = figures[row["market_id"]]
|
||||||
figure["brukt_ore"] += cost_ore
|
figure["brukt_ore"] += cost_ore
|
||||||
|
|||||||
Reference in new issue
Block a user