diff --git a/templates/job_detail.html b/templates/job_detail.html index 7caf152..0c7069d 100644 --- a/templates/job_detail.html +++ b/templates/job_detail.html @@ -101,20 +101,36 @@ {% set prix_ht_net = prix_ttc - (job.tva_amount or 0) %} {% set marge_pct_ht = (tot_m / prix_ht_net * 100)|round(1) if prix_ht_net > 0 else 0 %} + {# Macro pour une ligne simple (label = texte pur) #} + {# Pour les labels avec HTML, les lignes sont écrites directement ci-dessous #} +
Cout fixe
- {{ brow('Matiere' + (' ' + job.material_name + '' if job.material_name else ''), job.material_cost, '', 4) }} - {{ brow('Marge matiere', job.material_margin, '', 4) }} - {{ brow('Usure machine', job.wear_cost, '', 4) }} - {{ brow('Electricite', job.electricity_cost, '', 4) }} - {{ brow('Total cout fixe', cout_f, 'subtotal') }} + +
+ Matiere{% if job.material_name %} {{ job.material_name }}{% endif %} + {{ "%.4f"|format(job.material_cost) }} € + {% if multi %}{{ "%.2f"|format(job.material_cost * qty) }} €{% endif %} +
+ {{ brow('Marge matiere', job.material_margin, 'breakdown-muted ps-2', 4) }} + {{ brow('Usure machine', job.wear_cost, 'breakdown-muted ps-2', 4) }} + {{ brow('Electricite', job.electricity_cost, 'breakdown-muted ps-2', 4) }} +
+ Total cout fixe + {{ "%.2f"|format(cout_f) }} € + {% if multi %}{{ "%.2f"|format(cout_f * qty) }} €{% endif %} +
Partie variable
- {{ brow('Manutention', job.handling_cost, '', 4) }} - {{ brow('Design (×' + job.design_multiplier|string + ')', job.design_cost, '', 4) }} - {{ brow('Marge brute (' + job.gross_margin_pct|string + '%)', job.margin_amount) }} - {{ brow('Total marge (' + marge_pct_ht|string + '% du HT)', tot_m, 'subtotal') }} + {{ brow('Manutention', job.handling_cost, 'breakdown-muted ps-2', 4) }} + {{ brow('Design (×' ~ job.design_multiplier ~ ')', job.design_cost, 'breakdown-muted ps-2', 4) }} + {{ brow('Marge brute (' ~ job.gross_margin_pct ~ '%)', job.margin_amount, 'breakdown-muted ps-2') }} +
+ Total marge ({{ marge_pct_ht }}% du HT) + {{ "%.2f"|format(tot_m) }} € + {% if multi %}{{ "%.2f"|format(tot_m * qty) }} €{% endif %} +
Fiscal