gru/fuel_track
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix w kalkulacji last price

Browse Source
This commit is contained in:
Mateusz Gruszczyński
2026-07-14 13:43:27 +02:00
parent d2f0077e86
commit 6f46508da4
4 changed files with 73 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/main.py
+36 -14
View File
@@ -120,29 +120,51 @@ def dashboard():
totals = {"gross": Decimal("0"), "deductible_vat": Decimal("0"), "final_cost": Decimal("0"), "liters": Decimal("0")}
by_vehicle = defaultdict(lambda: {"gross": 0, "payable": 0, "liters": 0}); invoices = defaultdict(lambda: {"gross": 0, "payable": 0, "count": 0}); settlements = {}
for e in entries:
vat_rate = effective_vat_rate(settings.vat_rate, e.fueled_at)
c = calculate_costs(e.gross, vat_rate, settings.vat_deduction_percent)
totals["gross"] += c["gross"]; totals["deductible_vat"] += c["deductible_vat"]; totals["final_cost"] += c["final_cost"]; totals["liters"] += Decimal(e.liters)
station_policy = e.station_company
entry_settings = e.vehicle.company or settings
vat_rate = effective_vat_rate(entry_settings.vat_rate, e.fueled_at)
vat_deduction_percent = entry_settings.vat_deduction_percent
normal_price = float(e.price_per_liter)
payable_price = normal_price
rule = FuelCardStationRule.query.filter_by(fuel_card_id=e.fuel_card_id, station_company_id=e.station_company_id).first() if e.used_fuel_card and e.fuel_card_id and e.station_company_id else None
uses_station_last_price = bool(rule and rule.use_orlen_last_price and e.wholesale_price is not None)
# Last price is a NET station price. Discounts and surcharges are also net.
if uses_station_last_price:
payable_price = float(e.wholesale_price) * (1 + float(vat_rate) / 100)
settlement_net = Decimal(e.wholesale_price)
else:
settlement_net = Decimal(str(normal_price)) / (Decimal("1") + Decimal(str(vat_rate)) / Decimal("100"))
if rule:
net = payable_price / (1 + float(vat_rate) / 100)
net = net * (1 - float(rule.discount_net_percent or 0) / 100) + float(rule.surcharge_net_per_liter or 0)
payable_price = net * (1 + float(vat_rate) / 100)
payable_price = max(payable_price, 0)
payable_gross = float(e.liters) * payable_price
settlements[e.id] = {"normal_price": normal_price, "payable_price": payable_price, "normal_gross": e.gross, "payable_gross": payable_gross, "uses_last_price": uses_station_last_price, "vat_rate": float(vat_rate)}
by_vehicle[e.vehicle.name]["gross"] += float(c["gross"]); by_vehicle[e.vehicle.name]["payable"] += payable_gross; by_vehicle[e.vehicle.name]["liters"] += float(e.liters)
settlement_net = settlement_net * (Decimal("1") - Decimal(rule.discount_net_percent or 0) / Decimal("100"))
settlement_net += Decimal(rule.surcharge_net_per_liter or 0)
settlement_net = max(settlement_net, Decimal("0"))
price_costs = calculate_net_price_costs(settlement_net, vat_rate, vat_deduction_percent)
liters = Decimal(e.liters)
invoice_gross = price_costs["invoice_gross"] * liters
deductible_vat = price_costs["deductible_vat"] * liters
effective_gross = price_costs["effective_cost"] * liters
totals["gross"] += invoice_gross
totals["deductible_vat"] += deductible_vat
totals["final_cost"] += effective_gross
totals["liters"] += liters
settlements[e.id] = {
"normal_price": normal_price,
"net_price": float(settlement_net),
"invoice_price": float(price_costs["invoice_gross"]),
"payable_price": float(price_costs["effective_cost"]),
"normal_gross": e.gross,
"invoice_gross": float(invoice_gross),
"payable_gross": float(effective_gross),
"uses_last_price": uses_station_last_price,
"vat_rate": float(vat_rate),
"vat_deduction_percent": float(vat_deduction_percent),
}
by_vehicle[e.vehicle.name]["gross"] += float(invoice_gross); by_vehicle[e.vehicle.name]["payable"] += float(effective_gross); by_vehicle[e.vehicle.name]["liters"] += float(liters)
if e.used_fuel_card:
key = invoice_period(e.fueled_at, settings.invoice_split_day) if split_enabled else "Cały miesiąc"
else:
key = "Poza kartą"
invoices[key]["gross"] += float(c["gross"]); invoices[key]["payable"] += payable_gross; invoices[key]["count"] += 1
invoices[key]["gross"] += float(invoice_gross); invoices[key]["payable"] += float(effective_gross); invoices[key]["count"] += 1
return render_template("dashboard.html", vehicles=vehicles, entries=entries, totals=totals, month=month, by_vehicle=dict(by_vehicle), invoices=dict(invoices), settings=settings, split_enabled=split_enabled, settlements=settlements, vat_override=global_vat_override())
@main.route("/vehicles", methods=["GET", "POST"])