diff --git a/l10n_it_fatturapa_out_wt/__manifest__.py b/l10n_it_fatturapa_out_wt/__manifest__.py
index 4f757ef6d0d7..998b39cecb91 100644
--- a/l10n_it_fatturapa_out_wt/__manifest__.py
+++ b/l10n_it_fatturapa_out_wt/__manifest__.py
@@ -20,7 +20,7 @@
         "l10n_it_withholding_tax_reason",
     ],
     "data": [
-        'views/account_invoice_it_dati_ritenuta.xml'
+        "views/account_invoice_it_dati_ritenuta.xml",
     ],
     "installable": True,
     "auto_install": True,
diff --git a/l10n_it_fatturapa_out_wt/readme/CONTRIBUTORS.rst b/l10n_it_fatturapa_out_wt/readme/CONTRIBUTORS.rst
index 45de63c47513..1783ba4797f0 100644
--- a/l10n_it_fatturapa_out_wt/readme/CONTRIBUTORS.rst
+++ b/l10n_it_fatturapa_out_wt/readme/CONTRIBUTORS.rst
@@ -1,2 +1,2 @@
 * Sergio Corato <info@efatto.it>
-* Ciro Urselli <c.urselli@apuliasoftware.it>
\ No newline at end of file
+* Ciro Urselli <c.urselli@apuliasoftware.it>
diff --git a/l10n_it_fatturapa_out_wt/tests/test_fatturapa_wt.py b/l10n_it_fatturapa_out_wt/tests/test_fatturapa_wt.py
index b6a557a7f4ad..b9d140d2fcde 100644
--- a/l10n_it_fatturapa_out_wt/tests/test_fatturapa_wt.py
+++ b/l10n_it_fatturapa_out_wt/tests/test_fatturapa_wt.py
@@ -5,10 +5,43 @@
 
 class TestInvoiceWT(FatturaPACommon):
     def setUp(self):
-        super(TestInvoiceWT, self).setUp()
+        super().setUp()
+
+        ###
+        # XXX this should really be in FatturaPACommon
+        # tested 2021/08/06 @TheMule71
+
+        # XXX - a company named "YourCompany" alread exists
+        # we move it out of the way but we should do better here
+        self.env.company.sudo().search([("name", "=", "YourCompany")]).write(
+            {"name": "YourCompany_"}
+        )
+        self.env.company.name = "YourCompany"
+        self.env.company.vat = "IT06363391001"
+        self.env.company.fatturapa_art73 = True
+        self.env.company.partner_id.street = "Via Milano, 1"
+        self.env.company.partner_id.city = "Roma"
+        self.env.company.partner_id.state_id = self.env.ref("base.state_us_2").id
+        self.env.company.partner_id.country_id = self.env.ref("base.it").id
+        self.env.company.partner_id.zip = "00100"
+        self.env.company.partner_id.phone = "06543534343"
+        self.env.company.email = "info@yourcompany.example.com"
+        self.env.company.fatturapa_fiscal_position_id = self.env.ref(
+            "l10n_it_fatturapa.fatturapa_RF01"
+        ).id
+        self.env["decimal.precision"].search(
+            [("name", "=", "Product Unit of Measure")]
+        ).digits = 3
+        self.env["uom.uom"].search([("name", "=", "Units")]).name = "Unit(s)"
+        ###
+
         type_payable = self.env.ref("account.data_account_type_payable")
         type_receivable = self.env.ref("account.data_account_type_receivable")
-        self.tax_0 = self.env.ref("l10n_it_fatturapa.tax_00_enas")
+        self.tax_0 = (
+            self.env.ref("l10n_it_fatturapa.tax_00_enas")
+            .sudo()
+            .copy({"company_id": self.env.company.id})
+        )
         self.wt_account_payable = self.env["account.account"].create(
             {
                 "name": "Debiti per ritenute da versare",
@@ -32,8 +65,7 @@ def setUp(self):
             "name": "",
             "line_ids": [(0, 0, {"value": "balance", "days": 15})],
         }
-        self.payment_term_15 = self.env["account.payment.term"].create(
-            vals_payment)
+        self.payment_term_15 = self.env["account.payment.term"].create(vals_payment)
         wt_vals = {
             "name": "Code 1040",
             "code": "1040",
@@ -42,8 +74,7 @@ def setUp(self):
             "account_payable_id": self.wt_account_payable.id,
             "journal_id": self.journal_misc.id,
             "payment_term": self.payment_term_15.id,
-            "causale_pagamento_id": self.env.ref(
-                "l10n_it_causali_pagamento.a").id,
+            "payment_reason_id": self.env.ref("l10n_it_payment_reason.a").id,
             "rate_ids": [
                 (
                     0,
@@ -64,8 +95,7 @@ def setUp(self):
             "journal_id": self.journal_misc.id,
             "wt_types": "enasarco",
             "payment_term": self.payment_term_15.id,
-            "causale_pagamento_id": self.env.ref(
-                "l10n_it_causali_pagamento.a").id,
+            "payment_reason_id": self.env.ref("l10n_it_payment_reason.a").id,
             "rate_ids": [
                 (
                     0,
@@ -86,8 +116,7 @@ def setUp(self):
             "journal_id": self.journal_misc.id,
             "wt_types": "enasarco",
             "payment_term": self.payment_term_15.id,
-            "causale_pagamento_id": self.env.ref(
-                "l10n_it_causali_pagamento.a").id,
+            "payment_reason_id": self.env.ref("l10n_it_payment_reason.a").id,
             "rate_ids": [
                 (
                     0,
@@ -103,15 +132,16 @@ def setUp(self):
 
     def test_e_invoice_wt(self):
         self.set_sequences(13, "2019-01-07")
+
         invoice = self.invoice_model.create(
             {
-                "date_invoice": "2019-01-07",
+                "name": "INV/2019/0013",
+                "invoice_date": "2019-01-07",
                 "partner_id": self.res_partner_fatturapa_2.id,
                 "journal_id": self.sales_journal.id,
-                "account_id": self.a_recv.id,
-                "payment_term_id": self.account_payment_term.id,
+                "invoice_payment_term_id": self.account_payment_term.id,
                 "user_id": self.user_demo.id,
-                "type": "out_invoice",
+                "move_type": "out_invoice",
                 "currency_id": self.EUR.id,
                 "invoice_line_ids": [
                     (
@@ -121,19 +151,17 @@ def test_e_invoice_wt(self):
                             "account_id": self.a_sale.id,
                             "name": "Service",
                             "quantity": 1,
-                            "uom_id": self.product_uom_unit.id,
+                            "product_uom_id": self.product_uom_unit.id,
                             "price_unit": 10,
-                            "invoice_line_tax_ids": [(6, 0, [self.tax_22.id])],
-                            "invoice_line_tax_wt_ids": [
-                                (6, 0, [self.wt1040.id])
-                            ],
+                            "tax_ids": [(6, 0, [self.tax_22.id])],
+                            "invoice_line_tax_wt_ids": [(6, 0, [self.wt1040.id])],
                         },
                     ),
                 ],
             }
         )
         invoice._onchange_invoice_line_wt_ids()
-        invoice.action_invoice_open()
+        invoice.action_post()
         res = self.run_wizard(invoice.id)
 
         attachment = self.attach_model.browse(res["res_id"])
@@ -151,13 +179,13 @@ def test_e_invoice_wt_enas_0(self):
         self.set_sequences(14, "2019-01-07")
         invoice = self.invoice_model.create(
             {
-                "date_invoice": "2019-01-07",
+                "name": "INV/2019/0014",
+                "invoice_date": "2019-01-07",
                 "partner_id": self.res_partner_fatturapa_2.id,
                 "journal_id": self.sales_journal.id,
-                "account_id": self.a_recv.id,
-                "payment_term_id": self.account_payment_term.id,
+                "invoice_payment_term_id": self.account_payment_term.id,
                 "user_id": self.user_demo.id,
-                "type": "out_invoice",
+                "move_type": "out_invoice",
                 "currency_id": self.EUR.id,
                 "invoice_line_ids": [
                     (
@@ -167,9 +195,9 @@ def test_e_invoice_wt_enas_0(self):
                             "account_id": self.a_sale.id,
                             "name": "Service",
                             "quantity": 1,
-                            "uom_id": self.product_uom_unit.id,
+                            "product_uom_id": self.product_uom_unit.id,
                             "price_unit": 10,
-                            "invoice_line_tax_ids": [(6, 0, [self.tax_22.id])],
+                            "tax_ids": [(6, 0, [self.tax_22.id])],
                             "invoice_line_tax_wt_ids": [
                                 (
                                     6,
@@ -186,7 +214,7 @@ def test_e_invoice_wt_enas_0(self):
             }
         )
         invoice._onchange_invoice_line_wt_ids()
-        invoice.action_invoice_open()
+        invoice.action_post()
         res = self.run_wizard(invoice.id)
 
         attachment = self.attach_model.browse(res["res_id"])
@@ -209,13 +237,13 @@ def test_e_invoice_wt_enas_1(self):
         self.enasarco.daticassprev_tax_id = self.tax_0
         invoice = self.invoice_model.create(
             {
-                "date_invoice": "2019-01-07",
+                "name": "INV/2019/0015",
+                "invoice_date": "2019-01-07",
                 "partner_id": self.res_partner_fatturapa_2.id,
                 "journal_id": self.sales_journal.id,
-                "account_id": self.a_recv.id,
-                "payment_term_id": self.account_payment_term.id,
+                "invoice_payment_term_id": self.account_payment_term.id,
                 "user_id": self.user_demo.id,
-                "type": "out_invoice",
+                "move_type": "out_invoice",
                 "currency_id": self.EUR.id,
                 "invoice_line_ids": [
                     (
@@ -225,9 +253,9 @@ def test_e_invoice_wt_enas_1(self):
                             "account_id": self.a_sale.id,
                             "name": "Service",
                             "quantity": 1,
-                            "uom_id": self.product_uom_unit.id,
+                            "product_uom_id": self.product_uom_unit.id,
                             "price_unit": 10,
-                            "invoice_line_tax_ids": [(6, 0, [self.tax_22.id])],
+                            "tax_ids": [(6, 0, [self.tax_22.id])],
                             "invoice_line_tax_wt_ids": [
                                 (
                                     6,
@@ -244,7 +272,7 @@ def test_e_invoice_wt_enas_1(self):
             }
         )
         invoice._onchange_invoice_line_wt_ids()
-        invoice.action_invoice_open()
+        invoice.action_post()
         res = self.run_wizard(invoice.id)
 
         attachment = self.attach_model.browse(res["res_id"])
@@ -268,13 +296,13 @@ def test_e_invoice_wt_enas_2(self):
         self.enasarco.daticassprev_tax_id = self.tax_0
         invoice = self.invoice_model.create(
             {
-                "date_invoice": "2019-01-07",
+                "name": "INV/2019/0016",
+                "invoice_date": "2019-01-07",
                 "partner_id": self.res_partner_fatturapa_2.id,
                 "journal_id": self.sales_journal.id,
-                "account_id": self.a_recv.id,
-                "payment_term_id": self.account_payment_term.id,
+                "invoice_payment_term_id": self.account_payment_term.id,
                 "user_id": self.user_demo.id,
-                "type": "out_invoice",
+                "move_type": "out_invoice",
                 "currency_id": self.EUR.id,
                 "invoice_line_ids": [
                     (
@@ -284,9 +312,9 @@ def test_e_invoice_wt_enas_2(self):
                             "account_id": self.a_sale.id,
                             "name": "Service",
                             "quantity": 1,
-                            "uom_id": self.product_uom_unit.id,
+                            "product_uom_id": self.product_uom_unit.id,
                             "price_unit": 10,
-                            "invoice_line_tax_ids": [(6, 0, [self.tax_0.id])],
+                            "tax_ids": [(6, 0, [self.tax_0.id])],
                             "invoice_line_tax_wt_ids": [
                                 (
                                     6,
@@ -303,7 +331,7 @@ def test_e_invoice_wt_enas_2(self):
             }
         )
         invoice._onchange_invoice_line_wt_ids()
-        invoice.action_invoice_open()
+        invoice.action_post()
         res = self.run_wizard(invoice.id)
 
         attachment = self.attach_model.browse(res["res_id"])
@@ -322,13 +350,12 @@ def test_e_invoice_wt_inps_0(self):
     self.set_sequences(17, "2019-01-07")
     invoice = self.invoice_model.create(
         {
-            "date_invoice": "2019-01-07",
+            "invoice_date": "2019-01-07",
             "partner_id": self.res_partner_fatturapa_2.id,
             "journal_id": self.sales_journal.id,
-            "account_id": self.a_recv.id,
-            "payment_term_id": self.account_payment_term.id,
+            "invoice_payment_term_id": self.account_payment_term.id,
             "user_id": self.user_demo.id,
-            "type": "out_invoice",
+            "move_type": "out_invoice",
             "currency_id": self.EUR.id,
             "invoice_line_ids": [
                 (
@@ -338,9 +365,9 @@ def test_e_invoice_wt_inps_0(self):
                         "account_id": self.a_sale.id,
                         "name": "Service",
                         "quantity": 1,
-                        "uom_id": self.product_uom_unit.id,
+                        "product_uom_id": self.product_uom_unit.id,
                         "price_unit": 10,
-                        "invoice_line_tax_ids": [(6, 0, [self.tax_22.id])],
+                        "tax_ids": [(6, 0, [self.tax_22.id])],
                         "invoice_line_tax_wt_ids": [
                             (
                                 6,
@@ -357,7 +384,7 @@ def test_e_invoice_wt_inps_0(self):
         }
     )
     invoice._onchange_invoice_line_wt_ids()
-    invoice.action_invoice_open()
+    invoice.action_post()
     res = self.run_wizard(invoice.id)
 
     attachment = self.attach_model.browse(res["res_id"])
@@ -366,8 +393,7 @@ def test_e_invoice_wt_inps_0(self):
     # XML doc to be validated
     xml_content = base64.decodebytes(attachment.datas)
     self.check_content(
-        xml_content, "IT06363391001_00017.xml", 
-        module_name="l10n_it_fatturapa_out_wt"
+        xml_content, "IT06363391001_00017.xml", module_name="l10n_it_fatturapa_out_wt"
     )
 
 
@@ -380,13 +406,12 @@ def test_e_invoice_wt_inps_1(self):
     self.inps.daticassprev_tax_id = self.tax_0
     invoice = self.invoice_model.create(
         {
-            "date_invoice": "2019-01-07",
+            "invoice_date": "2019-01-07",
             "partner_id": self.res_partner_fatturapa_2.id,
             "journal_id": self.sales_journal.id,
-            "account_id": self.a_recv.id,
-            "payment_term_id": self.account_payment_term.id,
+            "invoice_payment_term_id": self.account_payment_term.id,
             "user_id": self.user_demo.id,
-            "type": "out_invoice",
+            "move_type": "out_invoice",
             "currency_id": self.EUR.id,
             "invoice_line_ids": [
                 (
@@ -396,9 +421,9 @@ def test_e_invoice_wt_inps_1(self):
                         "account_id": self.a_sale.id,
                         "name": "Service",
                         "quantity": 1,
-                        "uom_id": self.product_uom_unit.id,
+                        "product_uom_id": self.product_uom_unit.id,
                         "price_unit": 10,
-                        "invoice_line_tax_ids": [(6, 0, [self.tax_22.id])],
+                        "tax_ids": [(6, 0, [self.tax_22.id])],
                         "invoice_line_tax_wt_ids": [
                             (
                                 6,
@@ -415,7 +440,7 @@ def test_e_invoice_wt_inps_1(self):
         }
     )
     invoice._onchange_invoice_line_wt_ids()
-    invoice.action_invoice_open()
+    invoice.action_post()
     res = self.run_wizard(invoice.id)
 
     attachment = self.attach_model.browse(res["res_id"])
@@ -424,8 +449,7 @@ def test_e_invoice_wt_inps_1(self):
     # XML doc to be validated
     xml_content = base64.decodebytes(attachment.datas)
     self.check_content(
-        xml_content, "IT06363391001_00018.xml", 
-        module_name="l10n_it_fatturapa_out_wt"
+        xml_content, "IT06363391001_00018.xml", module_name="l10n_it_fatturapa_out_wt"
     )
 
 
@@ -439,13 +463,12 @@ def test_e_invoice_wt_inps_2(self):
     self.inps.daticassprev_tax_id = self.tax_0
     invoice = self.invoice_model.create(
         {
-            "date_invoice": "2019-01-07",
+            "invoice_date": "2019-01-07",
             "partner_id": self.res_partner_fatturapa_2.id,
             "journal_id": self.sales_journal.id,
-            "account_id": self.a_recv.id,
-            "payment_term_id": self.account_payment_term.id,
+            "invoice_payment_term_id": self.account_payment_term.id,
             "user_id": self.user_demo.id,
-            "type": "out_invoice",
+            "move_type": "out_invoice",
             "currency_id": self.EUR.id,
             "invoice_line_ids": [
                 (
@@ -455,9 +478,9 @@ def test_e_invoice_wt_inps_2(self):
                         "account_id": self.a_sale.id,
                         "name": "Service",
                         "quantity": 1,
-                        "uom_id": self.product_uom_unit.id,
+                        "product_uom_id": self.product_uom_unit.id,
                         "price_unit": 10,
-                        "invoice_line_tax_ids": [(6, 0, [self.tax_0.id])],
+                        "tax_ids": [(6, 0, [self.tax_0.id])],
                         "invoice_line_tax_wt_ids": [
                             (
                                 6,
@@ -474,7 +497,7 @@ def test_e_invoice_wt_inps_2(self):
         }
     )
     invoice._onchange_invoice_line_wt_ids()
-    invoice.action_invoice_open()
+    invoice.action_post()
     res = self.run_wizard(invoice.id)
 
     attachment = self.attach_model.browse(res["res_id"])
@@ -483,6 +506,5 @@ def test_e_invoice_wt_inps_2(self):
     # XML doc to be validated
     xml_content = base64.decodebytes(attachment.datas)
     self.check_content(
-        xml_content, "IT06363391001_00019.xml", 
-        module_name="l10n_it_fatturapa_out_wt"
+        xml_content, "IT06363391001_00019.xml", module_name="l10n_it_fatturapa_out_wt"
     )
diff --git a/l10n_it_fatturapa_out_wt/views/account_invoice_it_dati_ritenuta.xml b/l10n_it_fatturapa_out_wt/views/account_invoice_it_dati_ritenuta.xml
index 22613bfa9335..d4310470ec74 100644
--- a/l10n_it_fatturapa_out_wt/views/account_invoice_it_dati_ritenuta.xml
+++ b/l10n_it_fatturapa_out_wt/views/account_invoice_it_dati_ritenuta.xml
@@ -1,74 +1,107 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
-    <template 
-    id="wt_account_invoice_it_dati_ritenuta"
-    inherit_id="l10n_it_fatturapa_out.account_invoice_it_dati_ritenuta">
+    <template
+        id="wt_account_invoice_it_dati_ritenuta"
+        inherit_id="l10n_it_fatturapa_out.account_invoice_it_dati_ritenuta"
+    >
 
         <xpath expr="t" position="replace">
-            <!-- <t t-set="WT_TAX_CODE" t-value="{'inps': 'RT03', 'enasarco': 'RT04', 'enpam': 'RT05', 'other': 'RT06'}"/> -->
-            <t t-set="ritenuta_lines" t-value="record.withholding_tax_line_ids.sorted(key=lambda l: l.withholding_tax_id.code)"/>
+            <t
+                t-set="ritenuta_lines"
+                t-value="record.withholding_tax_line_ids.sorted(key=lambda l: l.withholding_tax_id.code)"
+            />
             <!--2.1.1.5-->
-            <DatiRitenuta
-            t-if="ritenuta_lines"
-            t-foreach="ritenuta_lines" t-as="wt_line">
-                <t t-set="tipo_ritenuta" t-value="getTipoRitenuta(wt_line.withholding_tax_id.wt_types, record.partner_id)"/>
+            <DatiRitenuta t-foreach="ritenuta_lines" t-as="wt_line">
+                <t
+                    t-set="tipo_ritenuta"
+                    t-value="get_withholding_type(wt_line.withholding_tax_id.wt_types, record.partner_id)"
+                />
                 <TipoRitenuta t-esc="tipo_ritenuta" />
                 <ImportoRitenuta t-esc="format_numbers_two(wt_line.tax)" />
-                <AliquotaRitenuta t-esc="format_numbers_two(wt_line.withholding_tax_id.tax)" />
-                <CausalePagamento t-esc="wt_line.withholding_tax_id.causale_pagamento_id.code" />
+                <AliquotaRitenuta
+                    t-esc="format_numbers_two(wt_line.withholding_tax_id.tax)"
+                />
+                <CausalePagamento
+                    t-esc="wt_line.withholding_tax_id.payment_reason_id.code"
+                />
             </DatiRitenuta>
         </xpath>
     </template>
 
-    <template id="wt_account_invoice_it_dati_cassa_previdenziale"
-    inherit_id="l10n_it_fatturapa_out.account_invoice_it_dati_cassa_previdenziale">
+    <template
+        id="wt_account_invoice_it_dati_cassa_previdenziale"
+        inherit_id="l10n_it_fatturapa_out.account_invoice_it_dati_cassa_previdenziale"
+    >
 
         <xpath expr="t" position="replace">
-            <t t-set="TC_CODE" t-value="{'inps': 'TC22', 'enasarco': 'TC07', 'enpam': 'TC09',}"/>
-            <t t-set="ritenuta_lines" t-value="record.withholding_tax_line_ids.sorted(key=lambda l: l.withholding_tax_id.code)"/>
-            <!-- 2.1.1.7 -->
+            <t
+                t-set="TC_CODE"
+                t-value="{'inps': 'TC22', 'enasarco': 'TC07', 'enpam': 'TC09',}"
+            />
+            <t
+                t-set="ritenuta_lines"
+                t-value="record.withholding_tax_line_ids.sorted(key=lambda l: l.withholding_tax_id.code)"
+            />
+            <!--2.1.1.7-->
             <DatiCassaPrevidenziale
-            t-if="ritenuta_lines.filtred(lambda wtl: wtl.withholding_tax_id.use_daticassaprev)"
-            t-foreach="ritenuta_lines" t-as="wt_line">
-                <t t-if="wt_line.withholding_tax_id.use_daticassaprev">
-                    <TipoCassa t-esc="TC_CODE[wt_line.withholding_tax_id.wt_types]"/>
-                    <AlCassa t-esc="format_numbers_two(wt_line.withholding_tax_id.tax)" />
-                    <ImportoContributoCassa t-esc="format_numbers_two(wt_line.tax)"/>
-                    <AliquotaIVA t-esc="0.00"/>
-                    <Natura t-esc="wt_line.withholding_tax_id.daticassprev_tax_id.kind_id.code"/>
-                </t>
+                t-foreach="ritenuta_lines.filtered(lambda wtl: wtl.withholding_tax_id.use_daticassaprev)"
+                t-as="wt_line"
+            >
+                  <TipoCassa t-esc="TC_CODE[wt_line.withholding_tax_id.wt_types]" />
+                  <AlCassa t-esc="format_numbers_two(wt_line.withholding_tax_id.tax)" />
+                  <ImportoContributoCassa t-esc="format_numbers_two(wt_line.tax)" />
+                  <AliquotaIVA>0.00</AliquotaIVA>
+                  <Natura
+                    t-esc="wt_line.withholding_tax_id.daticassprev_tax_id.kind_id.code"
+                />
             </DatiCassaPrevidenziale>
         </xpath>
-        
+
     </template>
 
-    <template 
-    id="wt_account_invoice_line_ritenuta"
-    inherit_id="l10n_it_fatturapa_out.account_invoice_line_ritenuta">
+    <template
+        id="wt_account_invoice_line_ritenuta"
+        inherit_id="l10n_it_fatturapa_out.account_invoice_line_ritenuta"
+    >
 
         <xpath expr="t" position="replace">
-            <t t-if="any([wt for wt in line.invoice_line_tax_wt_ids])">
+            <t t-if="line.invoice_line_tax_wt_ids">
                 <!-- 2.2.1.13 -->
-                <Ritenuta t-esc="SI"/>
+                <Ritenuta>SI</Ritenuta>
             </t>
         </xpath>
     </template>
 
-    <!-- <template 
-    id="wt_account_invoice_it_fattura_elettronica_body"
-    inherit_id="l10n_it_fatturapa_out.account_invoice_it_fattura_elettronica_body">
+    <template
+        id="wt_account_invoice_it_fattura_elettronica_body"
+        inherit_id="l10n_it_fatturapa_out.account_invoice_it_fattura_elettronica_body"
+    >
 
+        <xpath expr="t" position="after">
+            <t
+                t-set="wt_hack_rate"
+                t-value="record.amount_net_pay / record.amount_total if record.withholding_tax_line_ids else 1.0"
+            />
+        </xpath>
+
+        <xpath expr="//DettaglioPagamento//ImportoPagamento" position="replace">
+            <ImportoPagamento
+                t-esc="format_numbers_two(wt_hack_rate * (move_line.amount_currency or move_line.debit or 0.0))"
+            />
+        </xpath>
+
+        <!--
         <xpath expr="//DatiBeniServizi" position="inside">
             <t t-set="wt_lines_to_write" t-value="record.withholding_tax_line_ids.filtered(lambda x: x.withholding_tax_id.wt_types not in ('ritenuta', 'other') and x.withholding_tax_id.use_daticassaprev)"/>
             <t t-if="wt_lines_to_write">
                 <t t-foreach="wt_lines_to_write" t-as="wt_line">
                     <DatiRiepilogo>
-                        
+
                     </DatiRiepilogo>
                 </t>
             </t>
         </xpath>
-    </template> -->
-
-</odoo>
\ No newline at end of file
+        -->
+    </template>
+</odoo>
diff --git a/l10n_it_fatturapa_out_wt/wizard/__init__.py b/l10n_it_fatturapa_out_wt/wizard/__init__.py
index aa1627f0e386..861a0af3e6aa 100644
--- a/l10n_it_fatturapa_out_wt/wizard/__init__.py
+++ b/l10n_it_fatturapa_out_wt/wizard/__init__.py
@@ -1 +1,2 @@
 from . import efattura
+from . import wizard_export_fatturapa
diff --git a/l10n_it_fatturapa_out_wt/wizard/efattura.py b/l10n_it_fatturapa_out_wt/wizard/efattura.py
index 45e89619036b..e5c53a8710a1 100644
--- a/l10n_it_fatturapa_out_wt/wizard/efattura.py
+++ b/l10n_it_fatturapa_out_wt/wizard/efattura.py
@@ -1,26 +1,71 @@
-# Copyright 2020 Giuseppe Borruso
-# Copyright 2020 Marco Colombo
 # Copyright 2021 Ciro Urselli <https://github.com/CiroBoxHub>
+# Copyright 2021 Marco Colombo <https://github.com/TheMule71>
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from odoo.addons.l10n_it_fatturapa_out.wizard.efattura import EFatturaOut
+from odoo.tools.float_utils import float_round
 
+from odoo.addons.l10n_it_account.tools.account_tools import encode_for_export
+from odoo.addons.l10n_it_fatturapa_out.wizard.efattura import (
+    EFatturaOut as _EFatturaOut,
+)
 
-WT_TAX_CODE = {
-    "inps": "RT03", 
-    "enasarco": "RT04", 
-    "enpam": "RT05", 
-    "other": "RT06"}
+WT_TAX_CODE = {"inps": "RT03", "enasarco": "RT04", "enpam": "RT05", "other": "RT06"}
 
 
-class EFatturaOut(EFatturaOut):
+class EFatturaOut(_EFatturaOut):
+    def get_template_values(self):
+        """Add/override some functions used in the template"""
 
-    def getTipoRitenuta(wt_types, partner):
-        if wt_types == "ritenuta":
-            if partner.is_company:
-                tipoRitenuta = "RT02"
+        def get_withholding_type(wt_types, partner):
+            if wt_types == "ritenuta":
+                if partner.is_company:
+                    withholding_type = "RT02"
+                else:
+                    withholding_type = "RT01"
             else:
-                tipoRitenuta = "RT01"
-        else:
-            tipoRitenuta = WT_TAX_CODE[wt_types]
-        return tipoRitenuta
+                withholding_type = WT_TAX_CODE[wt_types]
+            return withholding_type
+
+        def get_all_taxes(record):
+            template_values = super(EFatturaOut, self).get_template_values()
+            _get_all_taxes = template_values["get_all_taxes"]
+            format_numbers = template_values["format_numbers"]
+
+            all_taxes = _get_all_taxes(record)
+
+            wt_lines_to_write = record.withholding_tax_line_ids.filtered(
+                lambda x: x.withholding_tax_id.wt_types not in ("ritenuta", "other")
+                and x.withholding_tax_id.use_daticassaprev
+            )
+            for wt_line in wt_lines_to_write:
+                tax_id = wt_line.withholding_tax_id.daticassprev_tax_id
+                key = "{}_{}".format("0.00", tax_id.kind_id.code)
+                if key in all_taxes:
+                    base_amount = (
+                        float(all_taxes[key]["ImponibileImporto"]) + wt_line.tax
+                    )
+                    all_taxes[key]["ImponibileImporto"] = float_round(base_amount, 2)
+                else:
+                    all_taxes[key] = {
+                        "AliquotaIVA": format_numbers(0.0),
+                        "Natura": tax_id.kind_id.code,
+                        # 'Arrotondamento':'',
+                        "ImponibileImporto": float_round(wt_line.tax, 2),
+                        "Imposta": 0.0,
+                        "EsigibilitaIVA": tax_id.payability,
+                    }
+                    if tax_id.law_reference:
+                        all_taxes[key]["RiferimentoNormativo"] = encode_for_export(
+                            tax_id.law_reference, 100
+                        )
+            return all_taxes
+
+        template_values = super().get_template_values()
+        template_values.update(
+            {
+                "get_withholding_type": get_withholding_type,
+                "get_all_taxes": get_all_taxes,
+            }
+        )
+
+        return template_values
diff --git a/l10n_it_fatturapa_out_wt/wizard/wizard_export_fatturapa.py b/l10n_it_fatturapa_out_wt/wizard/wizard_export_fatturapa.py
new file mode 100644
index 000000000000..0c3dfd42b9d4
--- /dev/null
+++ b/l10n_it_fatturapa_out_wt/wizard/wizard_export_fatturapa.py
@@ -0,0 +1,10 @@
+from odoo import models
+
+from .efattura import EFatturaOut
+
+
+class WizardExportFatturapa(models.TransientModel):
+    _inherit = "wizard.export.fatturapa"
+
+    def _get_efattura_class(self):
+        return EFatturaOut