Mop/amap
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix recap
All checks were successful
Deploy Amap / deploy (push) Successful in 14s
Details

Browse Source
This commit is contained in:
Julien Aldon
2026-03-09 09:42:19 +01:00
parent 7bf20bafa8
commit 71839b0ccf
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/contracts/contracts.py
View File

@@ -270,7 +270,9 @@ def get_contract_recap(
filename = f'{form.name}_recapitulatif_contrats.ods' filename = f'{form.name}_recapitulatif_contrats.ods'
recap = generate_recap(contracts, form) recap = generate_recap(contracts, form)
if recap is None: if recap is None:
raise HTTPException(status_code=404) raise HTTPException(
status_code=404, detail=messages.Messages.not_found('contracts')
)
return StreamingResponse( return StreamingResponse(
io.BytesIO(recap), io.BytesIO(recap),
media_type='application/vnd.oasis.opendocument.spreadsheet', media_type='application/vnd.oasis.opendocument.spreadsheet',

8
backend/src/contracts/generate_contract.py
View File

@@ -424,8 +424,8 @@ def generate_recap(
key=lambda x: x.product.name key=lambda x: x.product.name
) )
recurrents = [ recurrents = [
f'{pr.name}{f' - {pr.quantity}{pr.quantity_unit}' f'{pr.product.name}{f' - {pr.product.quantity}{pr.product.quantity_unit}'
if pr.quantity else ''} ({product_unit_map[pr.unit]})' if pr.product.quantity else ''} ({product_unit_map[pr.product.unit]})'
for pr in reccurents_sorted for pr in reccurents_sorted
] ]
occasionnals_sorted = sorted( occasionnals_sorted = sorted(
@@ -436,8 +436,8 @@ def generate_recap(
key=lambda x: (x.shipment.name, x.product.name) key=lambda x: (x.shipment.name, x.product.name)
) )
occasionnals = [ occasionnals = [
f'{pr.name}{f' - {pr.quantity}{pr.quantity_unit}' f'{pr.product.name}{f' - {pr.product.quantity}{pr.product.quantity_unit}'
if pr.quantity else ''} ({product_unit_map[pr.unit]})' if pr.product.quantity else ''} ({product_unit_map[pr.product.unit]})'
for pr in occasionnals_sorted for pr in occasionnals_sorted
] ]
shipments = form.shipments shipments = form.shipments