This commit is contained in:
@@ -424,8 +424,8 @@ def generate_recap(
|
||||
key=lambda x: x.product.name
|
||||
)
|
||||
recurrents = [
|
||||
f'{pr.name}{f' - {pr.quantity}{pr.quantity_unit}'
|
||||
if pr.quantity else ''} ({product_unit_map[pr.unit]})'
|
||||
f'{pr.product.name}{f' - {pr.product.quantity}{pr.product.quantity_unit}'
|
||||
if pr.product.quantity else ''} ({product_unit_map[pr.product.unit]})'
|
||||
for pr in reccurents_sorted
|
||||
]
|
||||
occasionnals_sorted = sorted(
|
||||
@@ -436,8 +436,8 @@ def generate_recap(
|
||||
key=lambda x: (x.shipment.name, x.product.name)
|
||||
)
|
||||
occasionnals = [
|
||||
f'{pr.name}{f' - {pr.quantity}{pr.quantity_unit}'
|
||||
if pr.quantity else ''} ({product_unit_map[pr.unit]})'
|
||||
f'{pr.product.name}{f' - {pr.product.quantity}{pr.product.quantity_unit}'
|
||||
if pr.product.quantity else ''} ({product_unit_map[pr.product.unit]})'
|
||||
for pr in occasionnals_sorted
|
||||
]
|
||||
shipments = form.shipments
|
||||
|
||||
Reference in New Issue
Block a user