diff --git a/donation_base/__manifest__.py b/donation_base/__manifest__.py
index e713c7042..c0a3ae916 100644
--- a/donation_base/__manifest__.py
+++ b/donation_base/__manifest__.py
@@ -4,7 +4,7 @@
 
 {
     "name": "Donation Base",
-    "version": "16.0.2.0.0",
+    "version": "17.0.1.0.0",
     "category": "Accounting",
     "license": "AGPL-3",
     "summary": "Base module for donations",
diff --git a/donation_base/data/donation_mail_template.xml b/donation_base/data/donation_mail_template.xml
index bb93cc3e1..cbb0aa96f 100644
--- a/donation_base/data/donation_mail_template.xml
+++ b/donation_base/data/donation_mail_template.xml
@@ -14,11 +14,11 @@
 <field name="partner_to">{{object.partner_id.id}}</field>
         <field name="model_id" ref="donation_base.model_donation_tax_receipt" />
         <field name="auto_delete" eval="False" />
-        <field name="report_template" ref="report_donation_tax_receipt" />
         <field
-            name="report_name"
-        >{{object.company_id.name.replace(' ', '_')}}-Tax_Receipt_{{(object.number or '').replace('/','_')}}</field>
-<field name="lang">{{object.partner_id.lang}}</field>
+            name="report_template_ids"
+            eval="[(4, ref('donation_base.report_donation_tax_receipt'))]"
+        />
+        <field name="lang">{{object.partner_id.lang}}</field>
         <field name="body_html" type="html">
         <div style="margin: 0px; padding: 0px;">
         <p style="margin: 0px; padding: 0px; font-size: 13px;">
diff --git a/donation_base/migrations/16.0.2.0.0/pre-migration.py b/donation_base/migrations/16.0.2.0.0/pre-migration.py
deleted file mode 100644
index c07da1568..000000000
--- a/donation_base/migrations/16.0.2.0.0/pre-migration.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2023 Akretion France (http://www.akretion.com/)
-# @author: Alexis de Lattre <alexis.delattre@akretion.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-
-def migrate(cr, version):
-    if not version:
-        return
-
-    cr.execute(
-        """UPDATE product_template
-        SET detailed_type='donation_in_kind_service'
-        WHERE donation IS true AND in_kind_donation IS true AND type = 'service'"""
-    )
-    cr.execute(
-        """UPDATE product_template
-        SET detailed_type='donation_in_kind_consu'
-        WHERE donation IS true AND in_kind_donation IS true AND type = 'consu'"""
-    )
-    cr.execute(
-        """UPDATE product_template
-        SET detailed_type='donation'
-        WHERE donation IS true AND in_kind_donation IS NOT true"""
-    )
diff --git a/donation_base/models/donation_tax_receipt.py b/donation_base/models/donation_tax_receipt.py
index 6bb19b148..33dc9fa1c 100644
--- a/donation_base/models/donation_tax_receipt.py
+++ b/donation_base/models/donation_tax_receipt.py
@@ -82,7 +82,7 @@ def action_send_tax_receipt(self):
         layout_xmlid = "donation_base.tax_receipt_email_template"
         ctx = dict(
             default_model=self._name,
-            default_res_id=self.id,
+            default_res_ids=[self.id],
             default_use_template=bool(template),
             default_template_id=template.id,
             default_composition_mode="comment",
diff --git a/donation_base/views/donation_tax_receipt.xml b/donation_base/views/donation_tax_receipt.xml
index 30fcc8399..50b7111b5 100644
--- a/donation_base/views/donation_tax_receipt.xml
+++ b/donation_base/views/donation_tax_receipt.xml
@@ -38,7 +38,7 @@
                             options="{'datepicker': {'warn_future': true}}"
                         />
                         <field name="print_date" />
-                        <field name="currency_id" invisible="1" />
+                        <field name="currency_id" column_invisible="1" />
                         <field name="amount" />
                         <field name="company_id" groups="base.group_multi_company" />
                     </group>
@@ -68,7 +68,7 @@
                     optional="show"
                 />
                 <field name="amount" />
-                <field name="currency_id" invisible="1" />
+                <field name="currency_id" column_invisible="1" />
                 <field name="print_date" optional="show" />
                 <field
                     name="company_id"
diff --git a/donation_base/views/product.xml b/donation_base/views/product.xml
index d2c0c3cde..ac711006b 100644
--- a/donation_base/views/product.xml
+++ b/donation_base/views/product.xml
@@ -33,10 +33,10 @@
         <field name="inherit_id" ref="product.product_template_form_view" />
         <field name="arch" type="xml">
             <field name="detailed_type" position="after">
-                <!-- unfortunately, Odoo doesn't accept 'not like' in attrs -->
+                <!-- unfortunately, Python doesn't accept 'not like' -->
                 <field
                     name="tax_receipt_ok"
-                    attrs="{'invisible': [('detailed_type', 'not in', ('donation', 'donation_in_kind_service', 'donation_in_kind_consu'))]}"
+                    invisible="detailed_type not in ('donation', 'donation_in_kind_service', 'donation_in_kind_consu')"
                 />
             </field>
         </field>
diff --git a/donation_base/views/res_partner.xml b/donation_base/views/res_partner.xml
index cd110874f..7ce9466f9 100644
--- a/donation_base/views/res_partner.xml
+++ b/donation_base/views/res_partner.xml
@@ -10,7 +10,7 @@
         <field name="name">Donation Tax Receipts</field>
         <field name="res_model">donation.tax.receipt</field>
         <field name="view_mode">tree,form,graph,pivot</field>
-        <field name="context">{'search_default_partner_id': active_id}</field>
+        <field name="context">{'search_default_partner_id': id}</field>
     </record>
     <record id="view_partner_property_form" model="ir.ui.view">
         <field name="name">donation.tax.receipt.res.partner.form</field>
@@ -21,11 +21,8 @@
                 expr="//group[@name='fiscal_information']/field[@name='property_account_position_id']"
                 position="after"
             >
-                <field
-                    name="tax_receipt_option"
-                    attrs="{'invisible': [('parent_id', '!=', False)]}"
-                />
-                <field name="donor_rank" invisible="1" />
+                <field name="tax_receipt_option" invisible="parent_id != False" />
+                <field name="donor_rank" column_invisible="1" />
             </xpath>
             <xpath expr="//div[@name='button_box']" position="inside">
                     <button
@@ -33,7 +30,7 @@
                     class="oe_stat_button"
                     type="action"
                     name="%(donation_base.partner_tax_receipt_action)d"
-                    attrs="{'invisible': [('parent_id', '!=', False)]}"
+                    invisible="parent_id != False"
                     icon="fa-file-text"
                     groups="account.group_account_invoice,account.group_account_readonly"
                 >