Verlauf zeigt Mengen in Artikeleinheiten (Gebinde) statt nur Basiseinheit
MovementOut liefert jetzt package_size, package_label sowie Name/Faktor der
Anzeigeeinheit mit. Die Verlauf-Tabelle zeigt die Bewegung als Leitangabe in
Gebinden (z.B. "1 Glas") und darunter klein die Basiseinheit ("195 g").
Ohne Gebinde/abweichende Einheit bleibt es bei einer Zeile.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -7,7 +7,7 @@ from ..database import get_db
|
||||
from ..deps import get_current_user
|
||||
from ..models import Group, Lot, Movement, Product, User
|
||||
from ..schemas import ExpiringItem, GroupShoppingItem, MovementOut, ShoppingItem
|
||||
from ..services.conversion import BASE_OF_KIND
|
||||
from ..services.conversion import BASE_OF_KIND, display_unit_info
|
||||
from ..services.stock import current_stock
|
||||
from .settings import get_expiry_warning_days
|
||||
|
||||
@@ -138,6 +138,7 @@ def movements(
|
||||
|
||||
result: list[MovementOut] = []
|
||||
for movement, product, user in rows:
|
||||
unit_name, unit_factor = display_unit_info(product)
|
||||
result.append(
|
||||
MovementOut(
|
||||
id=movement.id,
|
||||
@@ -150,6 +151,10 @@ def movements(
|
||||
username=user.username if user else None,
|
||||
note=movement.note,
|
||||
created_at=movement.created_at,
|
||||
package_size=product.package_size,
|
||||
package_label=product.package_label,
|
||||
unit_name=unit_name,
|
||||
unit_factor=unit_factor,
|
||||
)
|
||||
)
|
||||
return result
|
||||
|
||||
Reference in New Issue
Block a user