Skip to content
Extraits de code Groupes Projets
Valider b159a4d7 rédigé par Benjamin - Le Filament's avatar Benjamin - Le Filament
Parcourir les fichiers

[fix] error function _compute_detail

parent 14d7e972
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -372,32 +372,31 @@ class Bordereau(models.Model): ...@@ -372,32 +372,31 @@ class Bordereau(models.Model):
) )
detail = "<table class='o_group o_inner_group'>" detail = "<table class='o_group o_inner_group'>"
for contrib in contribs: for contrib in contribs:
amount_cg = str("{:,.2f}".format(
contrib.get("amount_total_signed"))).replace(",", " ").replace(".", ",")
detail += ( detail += (
'<tr><td class="o_td_label font-weight-bold">' "<tr><td class='o_td_label font-weight-bold'>{}</td>"
+ str(contrib.get("type_contribution_id")[1]) "<td style='width: 100%;'>{} €"
+ '</td><td style="width: 100%;">' ).format(str(contrib.get("type_contribution_id")[1]), amount_cg)
+ str(contrib.get("amount_total_signed"))
+ " €</td></tr>"
)
detail += "</table><table class='o_group o_inner_group'>" detail += "</table><table class='o_group o_inner_group'>"
for i in range(1, 5): for i in range(1, 5):
# Add amount echeance # Add amount echeance
amount_echeance = round( amount_echeance = round(
sum( sum(
r.invoice_ids.filtered( r.invoice_ids.filtered(
lambda inv: inv.cotiz_quarter == i lambda inv: inv.cotiz_quarter == str(i)
).mapped("amount_total_signed") ).mapped("amount_total_signed")
), ),
2, 2,
) )
str_amount = str(
"{:,.2f}".format(amount_echeance)).replace(",", " ").replace(".", ",")
detail += ( detail += (
'<tr><td class="o_td_label font-weight-bold">' "<tr><td class='o_td_label font-weight-bold'>Trimestre {}</td>"
+ "Trimestre " "<td style='width: 100%;'>{} €"
+ str(i) ).format(str(i), str_amount)
+ '</td><td style="width: 100%;">'
+ str(amount_echeance)
+ ""
)
# Check if regul has been done after validation # Check if regul has been done after validation
type_contribs = r.invoice_ids.mapped("type_contribution_id") type_contribs = r.invoice_ids.mapped("type_contribution_id")
for type_contrib in type_contribs: for type_contrib in type_contribs:
...@@ -415,6 +414,7 @@ class Bordereau(models.Model): ...@@ -415,6 +414,7 @@ class Bordereau(models.Model):
break break
detail += "</td></tr>" detail += "</td></tr>"
detail += "</table>" detail += "</table>"
r.details = detail r.details = detail
# ------------------------------------------------------ # ------------------------------------------------------
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter