From 28be2b7509a4dba2712e3c07e8f723499506e2d5 Mon Sep 17 00:00:00 2001
From: Bonnerue <thomas.bonnerue@akretion.com>
Date: Tue, 3 Jun 2025 17:18:06 +0200
Subject: [PATCH 1/9] [MIG] donation_base: Migration to 18.0

---
 donation_base/__manifest__.py                 |  2 +-
 donation_base/data/donation_mail_template.xml |  9 ++--
 .../migrations/16.0.2.0.0/pre-migration.py    | 24 ---------
 donation_base/models/product.py               | 50 ++++++++++---------
 donation_base/views/donation_tax_receipt.xml  | 14 ++----
 donation_base/views/product.xml               |  8 +--
 donation_base/views/res_partner.xml           | 11 ++--
 7 files changed, 46 insertions(+), 72 deletions(-)
 delete mode 100644 donation_base/migrations/16.0.2.0.0/pre-migration.py

diff --git a/donation_base/__manifest__.py b/donation_base/__manifest__.py
index e713c7042..2c2557244 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": "18.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 7f459c073..a34877942 100644
--- a/donation_base/data/donation_mail_template.xml
+++ b/donation_base/data/donation_mail_template.xml
@@ -14,10 +14,13 @@
         <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>
+            name="report_template_ids"
+            eval="[(4, 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>
         <field name="body_html" type="html">
             <div style="margin: 0px; padding: 0px;">
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/product.py b/donation_base/models/product.py
index 6bce84c23..e41e2935f 100644
--- a/donation_base/models/product.py
+++ b/donation_base/models/product.py
@@ -10,18 +10,28 @@
 class ProductTemplate(models.Model):
     _inherit = "product.template"
 
-    detailed_type = fields.Selection(
+    service_tracking = fields.Selection(
         selection_add=[
             ("donation", "Donation"),
-            ("donation_in_kind_consu", "In-Kind Donation Consummable"),
             ("donation_in_kind_service", "In-Kind Donation Service"),
         ],
         ondelete={
-            "donation": "set service",
-            "donation_in_kind_consu": "set consu",
-            "donation_in_kind_service": "set service",
+            "donation": "set default",
+            "donation_in_kind_service": "set default",
         },
     )
+    # service_tracking = fields.Selection(
+    #     selection_add=[
+    #         ("donation", "Donation"),
+    #         ("donation_in_kind_consu", "In-Kind Donation Consummable"),
+    #         ("donation_in_kind_service", "In-Kind Donation Service"),
+    #     ],
+    #     ondelete={
+    #         "donation": "set service",
+    #         "donation_in_kind_consu": "set consu",
+    #         "donation_in_kind_service": "set service",
+    #     },
+    # )
     tax_receipt_ok = fields.Boolean(
         string="Is Eligible for a Tax Receipt",
         tracking=True,
@@ -32,34 +42,23 @@ class ProductTemplate(models.Model):
         help="Specify if the product is eligible for a tax receipt",
     )
 
-    @api.depends("detailed_type")
+    @api.depends("service_tracking")
     def _compute_tax_receipt_ok(self):
         for product in self:
-            if product.detailed_type and not product.detailed_type.startswith(
+            if product.service_tracking and not product.service_tracking.startswith(
                 "donation"
             ):
                 product.tax_receipt_ok = False
 
-    def _detailed_type_mapping(self):
-        res = super()._detailed_type_mapping()
-        res.update(
-            {
-                "donation": "service",
-                "donation_in_kind_consu": "consu",
-                "donation_in_kind_service": "service",
-            }
-        )
-        return res
-
-    @api.onchange("detailed_type")
+    @api.onchange("service_tracking")
     def _donation_change(self):
         for product in self:
-            if product.detailed_type == "donation":
+            if product.service_tracking == "donation":
                 product.taxes_id = False
                 product.supplier_taxes_id = False
                 product.purchase_ok = False
 
-    @api.constrains("detailed_type", "taxes_id")
+    @api.constrains("service_tracking", "taxes_id")
     def donation_check(self):
         for product in self:
             # The check below is to make sure that we don't forget to remove
@@ -67,7 +66,7 @@ def donation_check(self):
             # for users of donation_sale. If there are countries that have
             # sale tax on donations (!), please tell us and we can remove this
             # constraint
-            if product.detailed_type == "donation" and product.taxes_id:
+            if product.service_tracking == "donation" and product.taxes_id:
                 raise ValidationError(
                     _(
                         "There shouldn't have any Customer Taxes on the "
@@ -76,14 +75,17 @@ def donation_check(self):
                     % product.display_name
                 )
 
+    def _service_tracking_blacklist(self):
+        return super()._service_tracking_blacklist() + ["donation"]
+
 
 class ProductProduct(models.Model):
     _inherit = "product.product"
 
-    @api.onchange("detailed_type")
+    @api.onchange("service_tracking")
     def _donation_change(self):
         for product in self:
-            if product.detailed_type == "donation":
+            if product.service_tracking == "donation":
                 product.taxes_id = False
                 product.supplier_taxes_id = False
                 product.purchase_ok = False
diff --git a/donation_base/views/donation_tax_receipt.xml b/donation_base/views/donation_tax_receipt.xml
index 30fcc8399..122ac4a96 100644
--- a/donation_base/views/donation_tax_receipt.xml
+++ b/donation_base/views/donation_tax_receipt.xml
@@ -43,19 +43,15 @@
                         <field name="company_id" groups="base.group_multi_company" />
                     </group>
                 </sheet>
-                <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers" />
-                    <field name="activity_ids" widget="mail_activity" />
-                    <field name="message_ids" widget="mail_thread" />
-                </div>
+                <chatter/>
             </form>
         </field>
     </record>
     <record id="donation_tax_receipt_tree" model="ir.ui.view">
-        <field name="name">donation.tax.receipt.tree</field>
+        <field name="name">donation.tax.receipt.list</field>
         <field name="model">donation.tax.receipt</field>
         <field name="arch" type="xml">
-            <tree>
+            <list>
                 <field name="number" decoration-bf="1" />
                 <field name="partner_id" />
                 <field name="date" />
@@ -75,7 +71,7 @@
                     groups="base.group_multi_company"
                     optional="show"
                 />
-            </tree>
+            </list>
         </field>
     </record>
     <record id="donation_tax_receipt_search" model="ir.ui.view">
@@ -153,6 +149,6 @@
     <record id="donation_tax_receipt_action" model="ir.actions.act_window">
         <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="view_mode">list,form,graph,pivot</field>
     </record>
 </odoo>
diff --git a/donation_base/views/product.xml b/donation_base/views/product.xml
index d2c0c3cde..c0c2a1c53 100644
--- a/donation_base/views/product.xml
+++ b/donation_base/views/product.xml
@@ -11,11 +11,11 @@
         <field name="model">product.template</field>
         <field name="inherit_id" ref="product.product_template_search_view" />
         <field name="arch" type="xml">
-            <filter name="consumable" position="after">
+            <filter name="goods" position="after">
                 <filter
                     name="filter_donation"
                     string="Donation"
-                    domain="[('detailed_type', 'in', ('donation', 'donation_in_kind_consu', 'donation_in_kind_service'))]"
+                    domain="[('service_tracking', 'in', ('donation', 'donation_in_kind_consu', 'donation_in_kind_service'))]"
                 />
             </filter>
             <filter name="filter_to_purchase" position="after">
@@ -32,11 +32,11 @@
         <field name="model">product.template</field>
         <field name="inherit_id" ref="product.product_template_form_view" />
         <field name="arch" type="xml">
-            <field name="detailed_type" position="after">
+            <field name="service_tracking" position="after">
                 <!-- unfortunately, Odoo doesn't accept 'not like' in attrs -->
                 <field
                     name="tax_receipt_ok"
-                    attrs="{'invisible': [('detailed_type', 'not in', ('donation', 'donation_in_kind_service', 'donation_in_kind_consu'))]}"
+                    invisible="service_tracking != 'donation'"
                 />
             </field>
         </field>
diff --git a/donation_base/views/res_partner.xml b/donation_base/views/res_partner.xml
index fead18309..7aa984608 100644
--- a/donation_base/views/res_partner.xml
+++ b/donation_base/views/res_partner.xml
@@ -9,7 +9,7 @@
     <record id="partner_tax_receipt_action" model="ir.actions.act_window">
         <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="view_mode">list,form,graph,pivot</field>
         <field name="context">{'search_default_partner_id': active_id}</field>
     </record>
     <record id="view_partner_property_form" model="ir.ui.view">
@@ -21,10 +21,7 @@
                 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="tax_receipt_option" invisible="parent_id != False" />
                 <field name="donor_rank" invisible="1" />
             </xpath>
             <xpath expr="//div[@name='button_box']" position="inside">
@@ -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"
                 >
@@ -59,7 +56,7 @@
     <record id="res_partner_action_donor" model="ir.actions.act_window">
         <field name="name">Donors</field>
         <field name="res_model">res.partner</field>
-        <field name="view_mode">kanban,tree,form</field>
+        <field name="view_mode">kanban,list,form</field>
         <field
             name="context"
         >{'search_default_donor': 1, 'res_partner_search_mode': 'donor', 'default_is_company': False, 'default_donor_rank': 1}</field>

From 69bf1d2d9ab8c54a11682e8e1cc6a9d5b48e2fa5 Mon Sep 17 00:00:00 2001
From: Florian du Garage Num <makayabou@gmail.com>
Date: Thu, 10 Jul 2025 23:31:35 +0200
Subject: [PATCH 2/9] remove nested loop in tax reports like in PR
 https://github.com/OCA/donation/pull/135

---
 donation_base/report/report_donationtax.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/donation_base/report/report_donationtax.xml b/donation_base/report/report_donationtax.xml
index 95f5464e4..4bef04704 100644
--- a/donation_base/report/report_donationtax.xml
+++ b/donation_base/report/report_donationtax.xml
@@ -9,7 +9,6 @@
     <!-- This is just a very basic tax receipt report
     You should customize the style and layout in a custom module -->
     <template id="donation_base.report_donationtaxreceipt_document">
-        <t t-foreach="docs" t-as="o">
             <t t-call="web.internal_layout">
                 <div class="page">
                     <h1>Donation Tax Receipt <span t-field="o.number" /></h1>
@@ -22,14 +21,13 @@
                     <h3>Amount Total: <span t-field="o.amount" /></h3>
                 </div>
             </t>
-        </t>
     </template>
     <template id="report_donationtaxreceipt">
         <t t-call="web.html_container">
-            <t t-foreach="docs" t-as="doc">
+            <t t-foreach="docs" t-as="o">
                 <t
                     t-call="donation_base.report_donationtaxreceipt_document"
-                    t-lang="doc.partner_id.lang"
+                    t-lang="o.partner_id.lang"
                 />
             </t>
         </t>

From 407658f3770f3aa05a0decbef86332a39c6af2b0 Mon Sep 17 00:00:00 2001
From: Bonnerue <thomas.bonnerue@akretion.com>
Date: Tue, 3 Jun 2025 17:18:06 +0200
Subject: [PATCH 3/9] [MIG] donation_base: Migration to 18.0

---
 donation_base/__manifest__.py                 |  2 +-
 donation_base/data/donation_mail_template.xml |  9 ++--
 donation_base/demo/donation_demo.xml          | 14 ++++--
 .../migrations/16.0.2.0.0/pre-migration.py    | 24 ---------
 donation_base/models/product.py               | 50 ++++++++++---------
 donation_base/views/donation_tax_receipt.xml  | 14 ++----
 donation_base/views/product.xml               |  8 +--
 donation_base/views/res_partner.xml           | 11 ++--
 8 files changed, 56 insertions(+), 76 deletions(-)
 delete mode 100644 donation_base/migrations/16.0.2.0.0/pre-migration.py

diff --git a/donation_base/__manifest__.py b/donation_base/__manifest__.py
index e713c7042..2c2557244 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": "18.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 7f459c073..a34877942 100644
--- a/donation_base/data/donation_mail_template.xml
+++ b/donation_base/data/donation_mail_template.xml
@@ -14,10 +14,13 @@
         <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>
+            name="report_template_ids"
+            eval="[(4, 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>
         <field name="body_html" type="html">
             <div style="margin: 0px; padding: 0px;">
diff --git a/donation_base/demo/donation_demo.xml b/donation_base/demo/donation_demo.xml
index 861a2b7ca..a6ce1e588 100644
--- a/donation_base/demo/donation_demo.xml
+++ b/donation_base/demo/donation_demo.xml
@@ -8,7 +8,8 @@
         <field name="sale_ok" eval="True" />
         <field name="tax_receipt_ok" eval="True" />
         <field name="list_price">0</field>
-        <field name="detailed_type">donation</field>
+        <field name="type">service</field>
+        <field name="service_tracking">donation</field>
         <field name="taxes_id" eval="False" />
         <field
             name="description"
@@ -21,7 +22,8 @@
         <field name="sale_ok" eval="True" />
         <field name="tax_receipt_ok" eval="False" />
         <field name="list_price">0</field>
-        <field name="detailed_type">donation</field>
+        <field name="type">service</field>
+        <field name="service_tracking">donation</field>
         <field name="taxes_id" eval="False" />
         <field
             name="description"
@@ -34,7 +36,9 @@
         <field name="sale_ok" eval="True" />
         <field name="tax_receipt_ok" eval="True" />
         <field name="list_price">0</field>
-        <field name="detailed_type">donation_in_kind_consu</field>
+        <field name="type">service</field>
+        <field name="service_tracking">donation</field>
+        <!-- <field name="detailed_type">donation_in_kind_consu</field> -->
         <field name="taxes_id" eval="False" />
         <field
             name="description"
@@ -47,7 +51,9 @@
         <field name="sale_ok" eval="True" />
         <field name="tax_receipt_ok" eval="False" />
         <field name="list_price">0</field>
-        <field name="detailed_type">donation_in_kind_consu</field>
+        <field name="type">service</field>
+        <field name="service_tracking">donation</field>
+        <!-- <field name="detailed_type">donation_in_kind_consu</field> -->
         <field name="taxes_id" eval="False" />
         <field
             name="description"
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/product.py b/donation_base/models/product.py
index 6bce84c23..e41e2935f 100644
--- a/donation_base/models/product.py
+++ b/donation_base/models/product.py
@@ -10,18 +10,28 @@
 class ProductTemplate(models.Model):
     _inherit = "product.template"
 
-    detailed_type = fields.Selection(
+    service_tracking = fields.Selection(
         selection_add=[
             ("donation", "Donation"),
-            ("donation_in_kind_consu", "In-Kind Donation Consummable"),
             ("donation_in_kind_service", "In-Kind Donation Service"),
         ],
         ondelete={
-            "donation": "set service",
-            "donation_in_kind_consu": "set consu",
-            "donation_in_kind_service": "set service",
+            "donation": "set default",
+            "donation_in_kind_service": "set default",
         },
     )
+    # service_tracking = fields.Selection(
+    #     selection_add=[
+    #         ("donation", "Donation"),
+    #         ("donation_in_kind_consu", "In-Kind Donation Consummable"),
+    #         ("donation_in_kind_service", "In-Kind Donation Service"),
+    #     ],
+    #     ondelete={
+    #         "donation": "set service",
+    #         "donation_in_kind_consu": "set consu",
+    #         "donation_in_kind_service": "set service",
+    #     },
+    # )
     tax_receipt_ok = fields.Boolean(
         string="Is Eligible for a Tax Receipt",
         tracking=True,
@@ -32,34 +42,23 @@ class ProductTemplate(models.Model):
         help="Specify if the product is eligible for a tax receipt",
     )
 
-    @api.depends("detailed_type")
+    @api.depends("service_tracking")
     def _compute_tax_receipt_ok(self):
         for product in self:
-            if product.detailed_type and not product.detailed_type.startswith(
+            if product.service_tracking and not product.service_tracking.startswith(
                 "donation"
             ):
                 product.tax_receipt_ok = False
 
-    def _detailed_type_mapping(self):
-        res = super()._detailed_type_mapping()
-        res.update(
-            {
-                "donation": "service",
-                "donation_in_kind_consu": "consu",
-                "donation_in_kind_service": "service",
-            }
-        )
-        return res
-
-    @api.onchange("detailed_type")
+    @api.onchange("service_tracking")
     def _donation_change(self):
         for product in self:
-            if product.detailed_type == "donation":
+            if product.service_tracking == "donation":
                 product.taxes_id = False
                 product.supplier_taxes_id = False
                 product.purchase_ok = False
 
-    @api.constrains("detailed_type", "taxes_id")
+    @api.constrains("service_tracking", "taxes_id")
     def donation_check(self):
         for product in self:
             # The check below is to make sure that we don't forget to remove
@@ -67,7 +66,7 @@ def donation_check(self):
             # for users of donation_sale. If there are countries that have
             # sale tax on donations (!), please tell us and we can remove this
             # constraint
-            if product.detailed_type == "donation" and product.taxes_id:
+            if product.service_tracking == "donation" and product.taxes_id:
                 raise ValidationError(
                     _(
                         "There shouldn't have any Customer Taxes on the "
@@ -76,14 +75,17 @@ def donation_check(self):
                     % product.display_name
                 )
 
+    def _service_tracking_blacklist(self):
+        return super()._service_tracking_blacklist() + ["donation"]
+
 
 class ProductProduct(models.Model):
     _inherit = "product.product"
 
-    @api.onchange("detailed_type")
+    @api.onchange("service_tracking")
     def _donation_change(self):
         for product in self:
-            if product.detailed_type == "donation":
+            if product.service_tracking == "donation":
                 product.taxes_id = False
                 product.supplier_taxes_id = False
                 product.purchase_ok = False
diff --git a/donation_base/views/donation_tax_receipt.xml b/donation_base/views/donation_tax_receipt.xml
index 30fcc8399..122ac4a96 100644
--- a/donation_base/views/donation_tax_receipt.xml
+++ b/donation_base/views/donation_tax_receipt.xml
@@ -43,19 +43,15 @@
                         <field name="company_id" groups="base.group_multi_company" />
                     </group>
                 </sheet>
-                <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers" />
-                    <field name="activity_ids" widget="mail_activity" />
-                    <field name="message_ids" widget="mail_thread" />
-                </div>
+                <chatter/>
             </form>
         </field>
     </record>
     <record id="donation_tax_receipt_tree" model="ir.ui.view">
-        <field name="name">donation.tax.receipt.tree</field>
+        <field name="name">donation.tax.receipt.list</field>
         <field name="model">donation.tax.receipt</field>
         <field name="arch" type="xml">
-            <tree>
+            <list>
                 <field name="number" decoration-bf="1" />
                 <field name="partner_id" />
                 <field name="date" />
@@ -75,7 +71,7 @@
                     groups="base.group_multi_company"
                     optional="show"
                 />
-            </tree>
+            </list>
         </field>
     </record>
     <record id="donation_tax_receipt_search" model="ir.ui.view">
@@ -153,6 +149,6 @@
     <record id="donation_tax_receipt_action" model="ir.actions.act_window">
         <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="view_mode">list,form,graph,pivot</field>
     </record>
 </odoo>
diff --git a/donation_base/views/product.xml b/donation_base/views/product.xml
index d2c0c3cde..c0c2a1c53 100644
--- a/donation_base/views/product.xml
+++ b/donation_base/views/product.xml
@@ -11,11 +11,11 @@
         <field name="model">product.template</field>
         <field name="inherit_id" ref="product.product_template_search_view" />
         <field name="arch" type="xml">
-            <filter name="consumable" position="after">
+            <filter name="goods" position="after">
                 <filter
                     name="filter_donation"
                     string="Donation"
-                    domain="[('detailed_type', 'in', ('donation', 'donation_in_kind_consu', 'donation_in_kind_service'))]"
+                    domain="[('service_tracking', 'in', ('donation', 'donation_in_kind_consu', 'donation_in_kind_service'))]"
                 />
             </filter>
             <filter name="filter_to_purchase" position="after">
@@ -32,11 +32,11 @@
         <field name="model">product.template</field>
         <field name="inherit_id" ref="product.product_template_form_view" />
         <field name="arch" type="xml">
-            <field name="detailed_type" position="after">
+            <field name="service_tracking" position="after">
                 <!-- unfortunately, Odoo doesn't accept 'not like' in attrs -->
                 <field
                     name="tax_receipt_ok"
-                    attrs="{'invisible': [('detailed_type', 'not in', ('donation', 'donation_in_kind_service', 'donation_in_kind_consu'))]}"
+                    invisible="service_tracking != 'donation'"
                 />
             </field>
         </field>
diff --git a/donation_base/views/res_partner.xml b/donation_base/views/res_partner.xml
index fead18309..7aa984608 100644
--- a/donation_base/views/res_partner.xml
+++ b/donation_base/views/res_partner.xml
@@ -9,7 +9,7 @@
     <record id="partner_tax_receipt_action" model="ir.actions.act_window">
         <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="view_mode">list,form,graph,pivot</field>
         <field name="context">{'search_default_partner_id': active_id}</field>
     </record>
     <record id="view_partner_property_form" model="ir.ui.view">
@@ -21,10 +21,7 @@
                 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="tax_receipt_option" invisible="parent_id != False" />
                 <field name="donor_rank" invisible="1" />
             </xpath>
             <xpath expr="//div[@name='button_box']" position="inside">
@@ -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"
                 >
@@ -59,7 +56,7 @@
     <record id="res_partner_action_donor" model="ir.actions.act_window">
         <field name="name">Donors</field>
         <field name="res_model">res.partner</field>
-        <field name="view_mode">kanban,tree,form</field>
+        <field name="view_mode">kanban,list,form</field>
         <field
             name="context"
         >{'search_default_donor': 1, 'res_partner_search_mode': 'donor', 'default_is_company': False, 'default_donor_rank': 1}</field>

From b2b42aae9efa547b9351750e0cf9abba402a4496 Mon Sep 17 00:00:00 2001
From: TB-Ph35 <thomas.bonneru@phelumtech.fr>
Date: Wed, 20 Aug 2025 09:37:53 +0200
Subject: [PATCH 4/9] [IMP]unused service_tracking, use is_donation

---
 donation_base/demo/donation_demo.xml          |  8 ++--
 donation_base/models/product.py               | 47 +++++--------------
 .../tests/test_donation_tax_receipt.py        |  1 +
 donation_base/views/product.xml               |  8 ++--
 4 files changed, 21 insertions(+), 43 deletions(-)

diff --git a/donation_base/demo/donation_demo.xml b/donation_base/demo/donation_demo.xml
index a6ce1e588..3acd085d0 100644
--- a/donation_base/demo/donation_demo.xml
+++ b/donation_base/demo/donation_demo.xml
@@ -9,7 +9,7 @@
         <field name="tax_receipt_ok" eval="True" />
         <field name="list_price">0</field>
         <field name="type">service</field>
-        <field name="service_tracking">donation</field>
+        <field name="is_donation" eval="True" />
         <field name="taxes_id" eval="False" />
         <field
             name="description"
@@ -23,7 +23,7 @@
         <field name="tax_receipt_ok" eval="False" />
         <field name="list_price">0</field>
         <field name="type">service</field>
-        <field name="service_tracking">donation</field>
+        <field name="is_donation" eval="True" />
         <field name="taxes_id" eval="False" />
         <field
             name="description"
@@ -37,7 +37,7 @@
         <field name="tax_receipt_ok" eval="True" />
         <field name="list_price">0</field>
         <field name="type">service</field>
-        <field name="service_tracking">donation</field>
+        <field name="is_donation" eval="True" />
         <!-- <field name="detailed_type">donation_in_kind_consu</field> -->
         <field name="taxes_id" eval="False" />
         <field
@@ -52,7 +52,7 @@
         <field name="tax_receipt_ok" eval="False" />
         <field name="list_price">0</field>
         <field name="type">service</field>
-        <field name="service_tracking">donation</field>
+        <field name="is_donation" eval="True" />
         <!-- <field name="detailed_type">donation_in_kind_consu</field> -->
         <field name="taxes_id" eval="False" />
         <field
diff --git a/donation_base/models/product.py b/donation_base/models/product.py
index e41e2935f..d606f6b8f 100644
--- a/donation_base/models/product.py
+++ b/donation_base/models/product.py
@@ -10,28 +10,12 @@
 class ProductTemplate(models.Model):
     _inherit = "product.template"
 
-    service_tracking = fields.Selection(
-        selection_add=[
-            ("donation", "Donation"),
-            ("donation_in_kind_service", "In-Kind Donation Service"),
-        ],
-        ondelete={
-            "donation": "set default",
-            "donation_in_kind_service": "set default",
-        },
+    is_donation = fields.Boolean(
+        string="Is a donation",
+        readonly=False,
+        default=False,
+        help="Specify if the product is a donation",
     )
-    # service_tracking = fields.Selection(
-    #     selection_add=[
-    #         ("donation", "Donation"),
-    #         ("donation_in_kind_consu", "In-Kind Donation Consummable"),
-    #         ("donation_in_kind_service", "In-Kind Donation Service"),
-    #     ],
-    #     ondelete={
-    #         "donation": "set service",
-    #         "donation_in_kind_consu": "set consu",
-    #         "donation_in_kind_service": "set service",
-    #     },
-    # )
     tax_receipt_ok = fields.Boolean(
         string="Is Eligible for a Tax Receipt",
         tracking=True,
@@ -42,23 +26,21 @@ class ProductTemplate(models.Model):
         help="Specify if the product is eligible for a tax receipt",
     )
 
-    @api.depends("service_tracking")
+    @api.depends("is_donation")
     def _compute_tax_receipt_ok(self):
         for product in self:
-            if product.service_tracking and not product.service_tracking.startswith(
-                "donation"
-            ):
+            if not product.is_donation:
                 product.tax_receipt_ok = False
 
-    @api.onchange("service_tracking")
+    @api.onchange("is_donation")
     def _donation_change(self):
         for product in self:
-            if product.service_tracking == "donation":
+            if product.donation:
                 product.taxes_id = False
                 product.supplier_taxes_id = False
                 product.purchase_ok = False
 
-    @api.constrains("service_tracking", "taxes_id")
+    @api.constrains("is_donation", "taxes_id")
     def donation_check(self):
         for product in self:
             # The check below is to make sure that we don't forget to remove
@@ -66,7 +48,7 @@ def donation_check(self):
             # for users of donation_sale. If there are countries that have
             # sale tax on donations (!), please tell us and we can remove this
             # constraint
-            if product.service_tracking == "donation" and product.taxes_id:
+            if product.is_donation and product.taxes_id:
                 raise ValidationError(
                     _(
                         "There shouldn't have any Customer Taxes on the "
@@ -75,17 +57,14 @@ def donation_check(self):
                     % product.display_name
                 )
 
-    def _service_tracking_blacklist(self):
-        return super()._service_tracking_blacklist() + ["donation"]
-
 
 class ProductProduct(models.Model):
     _inherit = "product.product"
 
-    @api.onchange("service_tracking")
+    @api.onchange("is_donation")
     def _donation_change(self):
         for product in self:
-            if product.service_tracking == "donation":
+            if product.is_donation:
                 product.taxes_id = False
                 product.supplier_taxes_id = False
                 product.purchase_ok = False
diff --git a/donation_base/tests/test_donation_tax_receipt.py b/donation_base/tests/test_donation_tax_receipt.py
index 2ae314997..215bf0bf4 100644
--- a/donation_base/tests/test_donation_tax_receipt.py
+++ b/donation_base/tests/test_donation_tax_receipt.py
@@ -38,6 +38,7 @@ def test_donation(self):
 
     def test_donation_type(self):
         self.assertEqual(self.product_id.type, "service")
+        self.assertTrue(self.product_id.is_donation)
 
 
 class TestTaxReceiptAnnualCreate(TransactionCase):
diff --git a/donation_base/views/product.xml b/donation_base/views/product.xml
index c0c2a1c53..727a05a17 100644
--- a/donation_base/views/product.xml
+++ b/donation_base/views/product.xml
@@ -15,7 +15,7 @@
                 <filter
                     name="filter_donation"
                     string="Donation"
-                    domain="[('service_tracking', 'in', ('donation', 'donation_in_kind_consu', 'donation_in_kind_service'))]"
+                    domain="[('is_donation', '=', True)]"
                 />
             </filter>
             <filter name="filter_to_purchase" position="after">
@@ -34,10 +34,8 @@
         <field name="arch" type="xml">
             <field name="service_tracking" position="after">
                 <!-- unfortunately, Odoo doesn't accept 'not like' in attrs -->
-                <field
-                    name="tax_receipt_ok"
-                    invisible="service_tracking != 'donation'"
-                />
+                <field name="is_donation" invisible="type == service" />
+                <field name="tax_receipt_ok" invisible="not is_donation" />
             </field>
         </field>
     </record>

From 6c26e32619d2617098b61ea777946306cede35fc Mon Sep 17 00:00:00 2001
From: TB-Ph35 <thomas.bonneru@phelumtech.fr>
Date: Wed, 20 Aug 2025 12:56:23 +0200
Subject: [PATCH 5/9] fixup! [IMP]unused service_tracking, use is_donation

---
 donation_base/demo/donation_demo.xml | 8 ++++----
 donation_base/models/product.py      | 7 +++++--
 donation_base/views/product.xml      | 4 ++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/donation_base/demo/donation_demo.xml b/donation_base/demo/donation_demo.xml
index 3acd085d0..6dcdacdf3 100644
--- a/donation_base/demo/donation_demo.xml
+++ b/donation_base/demo/donation_demo.xml
@@ -9,7 +9,7 @@
         <field name="tax_receipt_ok" eval="True" />
         <field name="list_price">0</field>
         <field name="type">service</field>
-        <field name="is_donation" eval="True" />
+        <field name="is_donation">donation</field>
         <field name="taxes_id" eval="False" />
         <field
             name="description"
@@ -23,7 +23,7 @@
         <field name="tax_receipt_ok" eval="False" />
         <field name="list_price">0</field>
         <field name="type">service</field>
-        <field name="is_donation" eval="True" />
+        <field name="is_donation">donation</field>
         <field name="taxes_id" eval="False" />
         <field
             name="description"
@@ -37,7 +37,7 @@
         <field name="tax_receipt_ok" eval="True" />
         <field name="list_price">0</field>
         <field name="type">service</field>
-        <field name="is_donation" eval="True" />
+        <field name="is_donation">donation_in_kind_service</field>
         <!-- <field name="detailed_type">donation_in_kind_consu</field> -->
         <field name="taxes_id" eval="False" />
         <field
@@ -52,7 +52,7 @@
         <field name="tax_receipt_ok" eval="False" />
         <field name="list_price">0</field>
         <field name="type">service</field>
-        <field name="is_donation" eval="True" />
+        <field name="is_donation">donation_in_kind_service</field>
         <!-- <field name="detailed_type">donation_in_kind_consu</field> -->
         <field name="taxes_id" eval="False" />
         <field
diff --git a/donation_base/models/product.py b/donation_base/models/product.py
index d606f6b8f..9a1ba3b2d 100644
--- a/donation_base/models/product.py
+++ b/donation_base/models/product.py
@@ -10,10 +10,13 @@
 class ProductTemplate(models.Model):
     _inherit = "product.template"
 
-    is_donation = fields.Boolean(
+    is_donation = fields.Selection(
+        selection=[
+            ("donation", "Donation"),
+            ("donation_in_kind_service", "In-Kind Donation Service"),
+        ],
         string="Is a donation",
         readonly=False,
-        default=False,
         help="Specify if the product is a donation",
     )
     tax_receipt_ok = fields.Boolean(
diff --git a/donation_base/views/product.xml b/donation_base/views/product.xml
index 727a05a17..720773d31 100644
--- a/donation_base/views/product.xml
+++ b/donation_base/views/product.xml
@@ -15,7 +15,7 @@
                 <filter
                     name="filter_donation"
                     string="Donation"
-                    domain="[('is_donation', '=', True)]"
+                    domain="[('is_donation', '!=', False)]"
                 />
             </filter>
             <filter name="filter_to_purchase" position="after">
@@ -34,7 +34,7 @@
         <field name="arch" type="xml">
             <field name="service_tracking" position="after">
                 <!-- unfortunately, Odoo doesn't accept 'not like' in attrs -->
-                <field name="is_donation" invisible="type == service" />
+                <field name="is_donation" invisible="type == 'service'" />
                 <field name="tax_receipt_ok" invisible="not is_donation" />
             </field>
         </field>

From 69d6f3f4008b58f3b2bb52ab3c136424d084d466 Mon Sep 17 00:00:00 2001
From: Florian du Garage Num <makayabou@gmail.com>
Date: Mon, 1 Sep 2025 23:27:46 +0200
Subject: [PATCH 6/9] no service_tracking

---
 donation_base/models/product.py | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/donation_base/models/product.py b/donation_base/models/product.py
index d53a22ae8..9a1ba3b2d 100644
--- a/donation_base/models/product.py
+++ b/donation_base/models/product.py
@@ -19,18 +19,6 @@ class ProductTemplate(models.Model):
         readonly=False,
         help="Specify if the product is a donation",
     )
-    # service_tracking = fields.Selection(
-    #     selection_add=[
-    #         ("donation", "Donation"),
-    #         ("donation_in_kind_consu", "In-Kind Donation Consummable"),
-    #         ("donation_in_kind_service", "In-Kind Donation Service"),
-    #     ],
-    #     ondelete={
-    #         "donation": "set service",
-    #         "donation_in_kind_consu": "set consu",
-    #         "donation_in_kind_service": "set service",
-    #     },
-    # )
     tax_receipt_ok = fields.Boolean(
         string="Is Eligible for a Tax Receipt",
         tracking=True,
@@ -72,9 +60,6 @@ def donation_check(self):
                     % product.display_name
                 )
 
-    def _service_tracking_blacklist(self):
-        return super()._service_tracking_blacklist() + ["donation"]
-
 
 class ProductProduct(models.Model):
     _inherit = "product.product"

From e8567d5d1e8aa4bc14ebb187dc07a19e97f0f56c Mon Sep 17 00:00:00 2001
From: Florian du Garage Num <makayabou@gmail.com>
Date: Tue, 2 Sep 2025 00:05:05 +0200
Subject: [PATCH 7/9] production.is_donation instead of product.donation in
 product.py

---
 donation_base/models/product.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/donation_base/models/product.py b/donation_base/models/product.py
index 9a1ba3b2d..1c5cad0ef 100644
--- a/donation_base/models/product.py
+++ b/donation_base/models/product.py
@@ -38,7 +38,7 @@ def _compute_tax_receipt_ok(self):
     @api.onchange("is_donation")
     def _donation_change(self):
         for product in self:
-            if product.donation:
+            if product.is_donation:
                 product.taxes_id = False
                 product.supplier_taxes_id = False
                 product.purchase_ok = False

From a31da465f057ee1412212ce698a74c7ab399404d Mon Sep 17 00:00:00 2001
From: Florian du Garage Num <makayabou@gmail.com>
Date: Sun, 7 Sep 2025 18:13:45 +0200
Subject: [PATCH 8/9] is_donation boolean

---
 donation_base/demo/donation_demo.xml          | 54 +++++++++++++++----
 donation_base/i18n/de.po                      |  8 +++
 donation_base/i18n/donation_base.pot          |  7 +++
 donation_base/i18n/es.po                      |  8 +++
 donation_base/i18n/fr.po                      |  8 +++
 donation_base/i18n/it.po                      |  8 +++
 donation_base/models/donation_tax_receipt.py  |  1 +
 donation_base/models/product.py               | 48 ++++++++++++++---
 .../tests/test_donation_tax_receipt.py        |  4 --
 donation_base/views/product.xml               |  4 +-
 .../wizard/tax_receipt_annual_create.py       |  2 +-
 11 files changed, 126 insertions(+), 26 deletions(-)

diff --git a/donation_base/demo/donation_demo.xml b/donation_base/demo/donation_demo.xml
index 6dcdacdf3..389cfc58d 100644
--- a/donation_base/demo/donation_demo.xml
+++ b/donation_base/demo/donation_demo.xml
@@ -9,13 +9,14 @@
         <field name="tax_receipt_ok" eval="True" />
         <field name="list_price">0</field>
         <field name="type">service</field>
-        <field name="is_donation">donation</field>
+        <field name="is_donation" eval="True" />
+        <field name="in_kind" eval="False" />
         <field name="taxes_id" eval="False" />
         <field
             name="description"
         >This donation item is eligible for a tax receipt.</field>
     </record>
-    <record id="product_product_donation_notaxreceipt" model="product.product">
+    <record id="product_product_donation_service_notaxreceipt" model="product.product">
         <field name="name">Donation - no tax receipt</field>
         <field name="default_code">DON-NOTAXR</field>
         <field name="categ_id" ref="product.product_category_5" />
@@ -23,12 +24,43 @@
         <field name="tax_receipt_ok" eval="False" />
         <field name="list_price">0</field>
         <field name="type">service</field>
-        <field name="is_donation">donation</field>
+        <field name="is_donation" eval="True" />
+        <field name="in_kind" eval="False" />
         <field name="taxes_id" eval="False" />
         <field
             name="description"
         >This donation item is not eligible for a tax receipt.</field>
     </record>
+    <record id="product_product_inkind_donation_service" model="product.product">
+        <field name="name">Donation Service</field>
+        <field name="default_code">KIND-DON-S</field>
+        <field name="categ_id" ref="product.product_category_5" />
+        <field name="sale_ok" eval="True" />
+        <field name="tax_receipt_ok" eval="True" />
+        <field name="list_price">0</field>
+        <field name="type">service</field>
+        <field name="is_donation" eval="True" />
+        <field name="in_kind" eval="True" />
+        <field name="taxes_id" eval="False" />
+        <field
+            name="description"
+        >This donation item is a service eligible for a tax receipt.</field>
+    </record>
+    <record id="product_product_inkind_donation_service_notaxreceipt" model="product.product">
+        <field name="name">Donation Service - no tax receipt</field>
+        <field name="default_code">KIND-DON-S-NOTAXR</field>
+        <field name="categ_id" ref="product.product_category_5" />
+        <field name="sale_ok" eval="True" />
+        <field name="tax_receipt_ok" eval="False" />
+        <field name="list_price">0</field>
+        <field name="type">service</field>
+        <field name="is_donation" eval="True" />
+        <field name="in_kind" eval="True" />
+        <field name="taxes_id" eval="False" />
+        <field
+            name="description"
+        >This donation item is a service not eligible for a tax receipt.</field>
+    </record>
     <record id="product_product_inkind_donation" model="product.product">
         <field name="name">In-Kind Donation</field>
         <field name="default_code">KIND-DON</field>
@@ -36,13 +68,13 @@
         <field name="sale_ok" eval="True" />
         <field name="tax_receipt_ok" eval="True" />
         <field name="list_price">0</field>
-        <field name="type">service</field>
-        <field name="is_donation">donation_in_kind_service</field>
-        <!-- <field name="detailed_type">donation_in_kind_consu</field> -->
+        <field name="type">consu</field>
+        <field name="is_donation" eval="True" />
+        <field name="in_kind" eval="True" />
         <field name="taxes_id" eval="False" />
         <field
             name="description"
-        >This donation item is eligible for a tax receipt.</field>
+        >This donation item is a consumable good eligible for a tax receipt.</field>
     </record>
     <record id="product_product_inkind_donation_notaxreceipt" model="product.product">
         <field name="name">In-Kind Donation - no tax receipt</field>
@@ -51,13 +83,13 @@
         <field name="sale_ok" eval="True" />
         <field name="tax_receipt_ok" eval="False" />
         <field name="list_price">0</field>
-        <field name="type">service</field>
-        <field name="is_donation">donation_in_kind_service</field>
-        <!-- <field name="detailed_type">donation_in_kind_consu</field> -->
+        <field name="type">consu</field>
+        <field name="is_donation" eval="True" />
+        <field name="in_kind" eval="True" />
         <field name="taxes_id" eval="False" />
         <field
             name="description"
-        >This donation item is not eligible for a tax receipt.</field>
+        >This donation item is a consumable good not eligible for a tax receipt.</field>
     </record>
     <!-- PARTNERS -->
     <record id="donor1" model="res.partner">
diff --git a/donation_base/i18n/de.po b/donation_base/i18n/de.po
index 7ba949d9b..d52c99ca7 100644
--- a/donation_base/i18n/de.po
+++ b/donation_base/i18n/de.po
@@ -595,6 +595,14 @@ msgstr ""
 "Im Produkt '%s' sind Steuern (Verkauf) ausgewählt. In Spendenprodukten "
 "dürfen keine Steuern definiert werden."
 
+#. module: donation_base
+#. odoo-python
+#: code:addons/donation_base/models/product.py:0
+#, python-format
+msgid "There shouldn't have any Customer Taxes on the donation product '%s'."
+msgstr ""
+"Ein Spendenprodukt des Typs '%s' ist immer eine Sachspende"
+
 #. module: donation_base
 #: model_terms:product.template,description:donation_base.product_product_donation_product_template
 #: model_terms:product.template,description:donation_base.product_product_inkind_donation_product_template
diff --git a/donation_base/i18n/donation_base.pot b/donation_base/i18n/donation_base.pot
index f69aae9fa..865c0fda8 100644
--- a/donation_base/i18n/donation_base.pot
+++ b/donation_base/i18n/donation_base.pot
@@ -585,6 +585,13 @@ msgstr ""
 msgid "There shouldn't have any Customer Taxes on the donation product '%s'."
 msgstr ""
 
+#. module: donation_base
+#. odoo-python
+#: code:addons/donation_base/models/product.py:0
+#, python-format
+msgid "A donation product of type '%s' is always an in-kind donation"
+msgstr ""
+
 #. module: donation_base
 #: model_terms:product.template,description:donation_base.product_product_donation_product_template
 #: model_terms:product.template,description:donation_base.product_product_inkind_donation_product_template
diff --git a/donation_base/i18n/es.po b/donation_base/i18n/es.po
index dd32854d0..74152a5a8 100644
--- a/donation_base/i18n/es.po
+++ b/donation_base/i18n/es.po
@@ -631,6 +631,14 @@ msgid "There shouldn't have any Customer Taxes on the donation product '%s'."
 msgstr ""
 "No debería haber ningún Impuesto al Cliente en el producto de donación '%s'."
 
+#. module: donation_base
+#. odoo-python
+#: code:addons/donation_base/models/product.py:0
+#, python-format
+msgid "A donation product of type '%s' is always an in-kind donation"
+msgstr ""
+"Un producto de donación de tipo '%s' es siempre una donación en especie"
+
 #. module: donation_base
 #: model_terms:product.template,description:donation_base.product_product_donation_product_template
 #: model_terms:product.template,description:donation_base.product_product_inkind_donation_product_template
diff --git a/donation_base/i18n/fr.po b/donation_base/i18n/fr.po
index 4c61c2fd6..c31fc42b2 100644
--- a/donation_base/i18n/fr.po
+++ b/donation_base/i18n/fr.po
@@ -594,6 +594,14 @@ msgid "There shouldn't have any Customer Taxes on the donation product '%s'."
 msgstr ""
 "Il ne devrait y avoir aucune taxe à la vente sur l'article de don '%s'."
 
+#. module: donation_base
+#. odoo-python
+#: code:addons/donation_base/models/product.py:0
+#, python-format
+msgid "A donation product of type '%s' is always an in-kind donation"
+msgstr ""
+"Un don du type '%s' est toujours un don en nature"
+
 #. module: donation_base
 #: model_terms:product.template,description:donation_base.product_product_donation_product_template
 #: model_terms:product.template,description:donation_base.product_product_inkind_donation_product_template
diff --git a/donation_base/i18n/it.po b/donation_base/i18n/it.po
index 78d578ff3..486d9d43f 100644
--- a/donation_base/i18n/it.po
+++ b/donation_base/i18n/it.po
@@ -626,6 +626,14 @@ msgstr ""
 "Non dovrebbero esserci imposte a carico del cliente sul prodotto donazione "
 "'%s'."
 
+#. module: donation_base
+#. odoo-python
+#: code:addons/donation_base/models/product.py:0
+#, python-format
+msgid "A donation product of type '%s' is always an in-kind donation"
+msgstr ""
+"Un prodotto di donazione di tipo '%s' è sempre una donazione in natura"
+
 #. module: donation_base
 #: model_terms:product.template,description:donation_base.product_product_donation_product_template
 #: model_terms:product.template,description:donation_base.product_product_inkind_donation_product_template
diff --git a/donation_base/models/donation_tax_receipt.py b/donation_base/models/donation_tax_receipt.py
index 6bb19b148..065ed23d1 100644
--- a/donation_base/models/donation_tax_receipt.py
+++ b/donation_base/models/donation_tax_receipt.py
@@ -51,6 +51,7 @@ class DonationTaxReceipt(models.Model):
         [("each", "One-Time Tax Receipt"), ("annual", "Annual Tax Receipt")],
         required=True,
         tracking=True,
+        readonly=True,
     )
 
     @api.model_create_multi
diff --git a/donation_base/models/product.py b/donation_base/models/product.py
index 9a1ba3b2d..895327fa9 100644
--- a/donation_base/models/product.py
+++ b/donation_base/models/product.py
@@ -10,15 +10,22 @@
 class ProductTemplate(models.Model):
     _inherit = "product.template"
 
-    is_donation = fields.Selection(
-        selection=[
-            ("donation", "Donation"),
-            ("donation_in_kind_service", "In-Kind Donation Service"),
-        ],
+    is_donation = fields.Boolean(
         string="Is a donation",
+        tracking=True,
         readonly=False,
+        store=True,
         help="Specify if the product is a donation",
     )
+    in_kind = fields.Boolean(
+        string="Is an in-kind donation",
+        tracking=True,
+        compute="_compute_is_inkind",
+        readonly=False,
+        store=True,
+        precompute=True,
+        help="Specify if the donation item is of type in-kind (a good or a service rather than a monetary donation)"
+    )
     tax_receipt_ok = fields.Boolean(
         string="Is Eligible for a Tax Receipt",
         tracking=True,
@@ -26,9 +33,17 @@ class ProductTemplate(models.Model):
         readonly=False,
         store=True,
         precompute=True,
-        help="Specify if the product is eligible for a tax receipt",
+        help="Specify if the donation item is eligible for a tax receipt",
     )
 
+    @api.depends("is_donation")
+    def _compute_is_inkind(self):
+        for product in self:
+            if not product.is_donation:
+                product.in_kind = False
+            elif product.type in ["consu", "combo"]:
+                product.in_kind = True
+
     @api.depends("is_donation")
     def _compute_tax_receipt_ok(self):
         for product in self:
@@ -38,11 +53,25 @@ def _compute_tax_receipt_ok(self):
     @api.onchange("is_donation")
     def _donation_change(self):
         for product in self:
-            if product.donation:
+            if product.is_donation:
                 product.taxes_id = False
                 product.supplier_taxes_id = False
                 product.purchase_ok = False
-
+                product.sale_ok = False
+                if "can_be_expensed" in product._fields:
+                    product.can_be_expensed = False
+                    
+    @api.constrains("type", "in_kind")
+    def inkind_check(self):
+        for product in self:
+            if product.type in ["consu", "combo"] and product.in_kind == False:
+                raise ValidationError(
+                    _(
+                        "A donation product of type '%s' "
+                        "is always an in-kind donation"
+                    )
+                    % product.type
+                )
     @api.constrains("is_donation", "taxes_id")
     def donation_check(self):
         for product in self:
@@ -71,3 +100,6 @@ def _donation_change(self):
                 product.taxes_id = False
                 product.supplier_taxes_id = False
                 product.purchase_ok = False
+                product.sale_ok = False
+                if "can_be_expensed" in product._fields:
+                    product.can_be_expensed = False
\ No newline at end of file
diff --git a/donation_base/tests/test_donation_tax_receipt.py b/donation_base/tests/test_donation_tax_receipt.py
index 215bf0bf4..40e1329e1 100644
--- a/donation_base/tests/test_donation_tax_receipt.py
+++ b/donation_base/tests/test_donation_tax_receipt.py
@@ -36,10 +36,6 @@ def test_donation(self):
         with self.assertRaises(UserError):
             self.dt_receipt_rec.action_send_tax_receipt()
 
-    def test_donation_type(self):
-        self.assertEqual(self.product_id.type, "service")
-        self.assertTrue(self.product_id.is_donation)
-
 
 class TestTaxReceiptAnnualCreate(TransactionCase):
     def setUp(self):
diff --git a/donation_base/views/product.xml b/donation_base/views/product.xml
index 720773d31..b2dc201c6 100644
--- a/donation_base/views/product.xml
+++ b/donation_base/views/product.xml
@@ -33,8 +33,8 @@
         <field name="inherit_id" ref="product.product_template_form_view" />
         <field name="arch" type="xml">
             <field name="service_tracking" position="after">
-                <!-- unfortunately, Odoo doesn't accept 'not like' in attrs -->
-                <field name="is_donation" invisible="type == 'service'" />
+                <field name="is_donation"/>
+                <field name="in_kind" invisible="not is_donation"/>
                 <field name="tax_receipt_ok" invisible="not is_donation" />
             </field>
         </field>
diff --git a/donation_base/wizard/tax_receipt_annual_create.py b/donation_base/wizard/tax_receipt_annual_create.py
index 670ce76fa..5220cfa58 100644
--- a/donation_base/wizard/tax_receipt_annual_create.py
+++ b/donation_base/wizard/tax_receipt_annual_create.py
@@ -83,7 +83,7 @@ def generate_annual_receipts(self):
                 raise UserError(
                     _(
                         "The Donor '%(partner)s' already has an annual tax receipt "
-                        "in this timeframe: %(receipt)s dated %(number)s.",
+                        "in this timeframe: %(receipt)s dated %(date)s.",
                         partner=partner.display_name,
                         receipt=existing_receipt.number,
                         date=format_date(self.env, existing_receipt.date),

From ffe34f91b0b6b764beff44cce16236c075dd1a8a Mon Sep 17 00:00:00 2001
From: Florian du Garage Num <makayabou@gmail.com>
Date: Mon, 8 Sep 2025 02:36:07 +0200
Subject: [PATCH 9/9] in_kind product management

---
 donation_base/models/product.py | 56 ++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/donation_base/models/product.py b/donation_base/models/product.py
index 895327fa9..f768e0cc9 100644
--- a/donation_base/models/product.py
+++ b/donation_base/models/product.py
@@ -41,7 +41,7 @@ def _compute_is_inkind(self):
         for product in self:
             if not product.is_donation:
                 product.in_kind = False
-            elif product.type in ["consu", "combo"]:
+            elif product.is_donation and product.type in ["consu", "combo"]:
                 product.in_kind = True
 
     @api.depends("is_donation")
@@ -52,19 +52,18 @@ def _compute_tax_receipt_ok(self):
 
     @api.onchange("is_donation")
     def _donation_change(self):
-        for product in self:
-            if product.is_donation:
-                product.taxes_id = False
-                product.supplier_taxes_id = False
-                product.purchase_ok = False
-                product.sale_ok = False
-                if "can_be_expensed" in product._fields:
-                    product.can_be_expensed = False
-                    
+        if self.is_donation:
+            self.taxes_id = False
+            self.supplier_taxes_id = False
+            self.purchase_ok = False
+            self.sale_ok = False
+            if "can_be_expensed" in self._fields:
+                self.can_be_expensed = False
+
     @api.constrains("type", "in_kind")
     def inkind_check(self):
         for product in self:
-            if product.type in ["consu", "combo"] and product.in_kind == False:
+            if product.is_donation and product.type in ["consu", "combo"] and product.in_kind == False:
                 raise ValidationError(
                     _(
                         "A donation product of type '%s' "
@@ -72,23 +71,24 @@ def inkind_check(self):
                     )
                     % product.type
                 )
-    @api.constrains("is_donation", "taxes_id")
-    def donation_check(self):
-        for product in self:
-            # The check below is to make sure that we don't forget to remove
-            # the default sale VAT tax on the donation product, particularly
-            # for users of donation_sale. If there are countries that have
-            # sale tax on donations (!), please tell us and we can remove this
-            # constraint
-            if product.is_donation and product.taxes_id:
-                raise ValidationError(
-                    _(
-                        "There shouldn't have any Customer Taxes on the "
-                        "donation product '%s'."
-                    )
-                    % product.display_name
-                )
-
+            
+    # @api.constrains("is_donation", "taxes_id")
+    # def donation_check(self):
+    #     for product in self:
+    #         # The check below is to make sure that we don't forget to remove
+    #         # the default sale VAT tax on the donation product, particularly
+    #         # for users of donation_sale. If there are countries that have
+    #         # sale tax on donations (!), please tell us and we can remove this
+    #         # constraint
+    #         _logger.debug(f"in donation constrains, len taxes_id: {len(product.taxes_id)}")
+    #         if product.is_donation and len(product.taxes_id) > 0:
+    #             raise ValidationError(
+    #                 _(
+    #                     "There shouldn't have any Customer Taxes on the "
+    #                     "donation product '%s'."
+    #                 )
+    #                 % product.display_name
+    #             )
 
 class ProductProduct(models.Model):
     _inherit = "product.product"