diff --git a/report/_helpers.html b/report/_helpers.html index c98aca5..51d0b4f 100644 --- a/report/_helpers.html +++ b/report/_helpers.html @@ -13,11 +13,11 @@ {% for production in productions %} {{ production.name }} - {{ production.balance_quantity|render_field(decimal_digits=4) }} {{ production.balance_quantity_uom.symbol }} - {{ production.balance_consumption|render_field(decimal_digits=4) }} {{ production.balance_consumption_uom.symbol }} - {{ production.balance_plan_consumption|render_field(decimal_digits=4) }} {{ production.balance_plan_consumption_uom.symbol }} - {{ production.balance_difference|render_field(decimal_digits=4) }} {{ production.balance_difference_uom.symbol }} - {{ production.balance_difference_percent|render_field }} % + {{ production.balance_quantity|render(digits=4) }} {{ production.balance_quantity_uom.symbol }} + {{ production.balance_consumption|render(digits=4) }} {{ production.balance_consumption_uom.symbol }} + {{ production.balance_plan_consumption|render(digits=4) }} {{ production.balance_plan_consumption_uom.symbol }} + {{ production.balance_difference|render(digits=4) }} {{ production.balance_difference_uom.symbol }} + {{ production.balance_difference_percent|render }} % {% endfor %} diff --git a/report/production_mass_balance_report.html b/report/production_mass_balance_report.html index d67835d..4f9105e 100644 --- a/report/production_mass_balance_report.html +++ b/report/production_mass_balance_report.html @@ -65,11 +65,11 @@ {{ product.rec_name }} - {{ values.balance_quantity|render_field(decimal_digits=4) }} {{ values.balance_quantity_uom.symbol }} - {{ values.balance_consumption|render_field(decimal_digits=4) }} {{ values.balance_consumption_uom.symbol }} - {{ values.balance_plan_consumption|render_field(decimal_digits=4) }} {{ values.balance_plan_consumption_uom.symbol }} - {{ values.balance_difference|render_field(decimal_digits=4) }} {{ values.balance_difference_uom.symbol }} - {% if values['balance_plan_consumption'] %}{{ (((values.balance_consumption - values.balance_plan_consumption) / values.balance_plan_consumption) * 100)|render_field(decimal_digits=2) }}{% else %} 0.0{% endif %}% + {{ values.balance_quantity|render(digits=4) }} {{ values.balance_quantity_uom.symbol }} + {{ values.balance_consumption|render(digits=4) }} {{ values.balance_consumption_uom.symbol }} + {{ values.balance_plan_consumption|render(digits=4) }} {{ values.balance_plan_consumption_uom.symbol }} + {{ values.balance_difference|render(digits=4) }} {{ values.balance_difference_uom.symbol }} + {% if values['balance_plan_consumption'] %}{{ (((values.balance_consumption - values.balance_plan_consumption) / values.balance_plan_consumption) * 100)|render(digits=2) }}{% else %} 0.0{% endif %}%