diff --git a/account_ecotax/__manifest__.py b/account_ecotax/__manifest__.py
index fba33c82e..024b99f71 100644
--- a/account_ecotax/__manifest__.py
+++ b/account_ecotax/__manifest__.py
@@ -25,6 +25,7 @@
         "views/account_move_view.xml",
         "views/product_template_view.xml",
         "views/product_view.xml",
+        "report/invoice.xml",
     ],
     "installable": True,
 }
diff --git a/account_ecotax/models/account_move.py b/account_ecotax/models/account_move.py
index f30a74eb7..93d8a8dfd 100644
--- a/account_ecotax/models/account_move.py
+++ b/account_ecotax/models/account_move.py
@@ -59,3 +59,7 @@ def _get_tax_totals(
         )
         res["groups_by_subtotal"][_("Untaxed Amount")] = data
         return res
+
+    def _get_formatted_ecotax_amount(self):
+        self.ensure_one()
+        return formatLang(self.env, self.amount_ecotax, currency_obj=self.currency_id)
diff --git a/account_ecotax/report/invoice.xml b/account_ecotax/report/invoice.xml
new file mode 100644
index 000000000..75acf2a21
--- /dev/null
+++ b/account_ecotax/report/invoice.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <template
+        id="report_invoice_document"
+        inherit_id="account.report_invoice_document"
+        priority="100"
+    >
+        <xpath expr="//th[@name='th_price_unit']" position="after">
+                    <th
+                name="th_ecotax"
+                t-if="o.amount_ecotax"
+                t-attf-class="text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}"
+            >
+                        <span name="ecotax_line_label">Eco Part Unit</span>
+                    </th>
+        </xpath>
+        <xpath expr="//td[span[@t-field='line.discount']]" position="after">
+                            <td
+                t-if="o.amount_ecotax"
+                t-attf-class="text-center {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}"
+            >
+                                <span
+                    class="text-nowrap"
+                    t-field="line.ecotax_amount_unit"
+                />
+                            </td>
+        </xpath>
+    </template>
+
+    <template
+        id="document_tax_totals"
+        inherit_id="account.document_tax_totals"
+        priority="100"
+    >
+        <xpath expr="//t[@t-set='subtotal_to_show']" position="before">
+                                    <tr
+                t-if="o._name == 'account_move' and o.amount_ecotax"
+                name="ecotax_line"
+            >
+                                        <td name="ecotax_label">Including Eco Part</td>
+                                        <td class="text-end">
+                                            <span
+                        t-esc="o._get_formatted_ecotax_amount()"
+                    />
+                                        </td>
+                                    </tr>
+        </xpath>
+    </template>
+</odoo>
diff --git a/account_ecotax/views/account_move_view.xml b/account_ecotax/views/account_move_view.xml
index 61d8f0aa2..e7733cfa4 100644
--- a/account_ecotax/views/account_move_view.xml
+++ b/account_ecotax/views/account_move_view.xml
@@ -138,10 +138,14 @@
                     <field name="name" widget="text" readonly="1" />
                     <notebook>
                         <page string="Ecotaxe lines" name="ecotax_line">
-                                <field name="ecotax_line_ids" nolabel="1" readonly="1">
+                            <field
+                                name="ecotax_line_ids"
+                                nolabel="1"
+                                attrs="{'readonly': [('parent_state', '!=', 'draft')]}"
+                            >
                                    <tree editable="bottom">
                                         <field name="classification_id" />
-                                        <field name="force_amount_unit" readonly="1" />
+                                        <field name="force_amount_unit" />
                                         <field name="amount_unit" />
                                         <field
                                         name="amount_total"
diff --git a/account_ecotax_tax/__manifest__.py b/account_ecotax_tax/__manifest__.py
index 5e078741d..9f5979c5f 100644
--- a/account_ecotax_tax/__manifest__.py
+++ b/account_ecotax_tax/__manifest__.py
@@ -17,6 +17,8 @@
     "data": [
         "views/account_ecotax_classification_view.xml",
         "views/account_tax_view.xml",
+        "views/account_move_view.xml",
+        "report/invoice.xml",
     ],
     "installable": True,
 }
diff --git a/account_ecotax_tax/report/invoice.xml b/account_ecotax_tax/report/invoice.xml
new file mode 100644
index 000000000..eae52f23c
--- /dev/null
+++ b/account_ecotax_tax/report/invoice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <template
+        id="report_invoice_document"
+        inherit_id="account.report_invoice_document"
+        priority="150"
+    >
+        <xpath expr="//t[@t-set='taxes']" position="replace">
+            <t
+                t-set="taxes"
+                t-value="', '.join([(tax.description or tax.name) for tax in line.tax_ids.filtered(lambda t: not t.is_ecotax)])"
+            />
+        </xpath>
+    </template>
+
+    <template
+        id="document_tax_totals"
+        inherit_id="account.document_tax_totals"
+        priority="150"
+    >
+        <xpath expr="//tr[@name='ecotax_line']" position="replace">
+        </xpath>
+    </template>
+</odoo>
diff --git a/account_ecotax_tax/views/account_move_view.xml b/account_ecotax_tax/views/account_move_view.xml
new file mode 100644
index 000000000..32d86d661
--- /dev/null
+++ b/account_ecotax_tax/views/account_move_view.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="view_move_line_ecotax_form" model="ir.ui.view">
+        <field name="model">account.move.line</field>
+        <field name="inherit_id" ref="account_ecotax.view_move_line_ecotax_form" />
+        <field name="arch" type="xml">
+                            <field name="ecotax_line_ids" position="attributes">
+                                <attribute name="readonly">1</attribute>
+                            </field>
+        </field>
+    </record>
+</odoo>