From 11dd17dd40b8d3a9f8eeac43df88c1f6f821152e Mon Sep 17 00:00:00 2001
From: Eric Antones <eantones@nuobit.com>
Date: Thu, 2 Apr 2026 18:54:05 +0200
Subject: [PATCH 1/2] [FIX] rental_base_extension: show rental service button
 on multi-variant products

The "Create Rental Service" button and the "Rentals" section were hidden
on product templates with more than one variant, preventing users from
creating rental services for existing products with variants (e.g.
regulators with sizes, wetsuits with sizes).

Now the "Rentals" section is visible for all storable products regardless
of variant count. For single-variant products, the original wizard is
used. For multi-variant products, a new button creates rental services
for all variants at once.

Also restrict the "Can be Rented" checkbox and the "Rentals" section to
storable products only (type == 'product'), hiding them for consumables
and services.
---
 rental_base_extension/models/__init__.py      |  1 +
 rental_base_extension/models/product.py       | 45 +++++++++++++++++++
 rental_base_extension/views/product_views.xml | 15 +++++--
 3 files changed, 57 insertions(+), 4 deletions(-)
 create mode 100644 rental_base_extension/models/product.py

diff --git a/rental_base_extension/models/__init__.py b/rental_base_extension/models/__init__.py
index ba1c090c8..7baeb4153 100644
--- a/rental_base_extension/models/__init__.py
+++ b/rental_base_extension/models/__init__.py
@@ -1,3 +1,4 @@
+from . import product
 from . import res_company
 from . import res_config_settings
 from . import sale_order
diff --git a/rental_base_extension/models/product.py b/rental_base_extension/models/product.py
new file mode 100644
index 000000000..79b9756cf
--- /dev/null
+++ b/rental_base_extension/models/product.py
@@ -0,0 +1,45 @@
+# Copyright 2026 NuoBiT Solutions SL - Eric Antones <eantones@nuobit.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
+
+from odoo import _, models
+from odoo.exceptions import UserError
+
+
+class ProductTemplate(models.Model):
+    _inherit = "product.template"
+
+    def action_create_rental_services(self):
+        self.ensure_one()
+        day_uom = self.env.ref("uom.product_uom_day")
+        variants_without_service = self.product_variant_ids.filtered(
+            lambda v: not v.rental_service_ids
+        )
+        if not variants_without_service:
+            raise UserError(_("All variants already have a rental service."))
+        created_products = self.env["product.product"]
+        for variant in variants_without_service:
+            variant_ctx = variant.with_context(display_default_code=False)
+            vals = {
+                "type": "service",
+                "sale_ok": True,
+                "purchase_ok": False,
+                "uom_id": day_uom.id,
+                "uom_po_id": day_uom.id,
+                "list_price": 1.0,
+                "name": _("Rental of %s") % variant_ctx.display_name,
+                "rented_product_id": variant.id,
+                "must_have_dates": True,
+                "categ_id": self.categ_id.id,
+                "invoice_policy": "order",
+            }
+            if variant.default_code:
+                vals["default_code"] = _("RENT-%s") % variant.default_code
+            created_products |= self.env["product.product"].create(vals)
+        return {
+            "type": "ir.actions.act_window",
+            "name": _("Created Rental Services"),
+            "res_model": "product.product",
+            "view_mode": "tree,form",
+            "domain": [("id", "in", created_products.ids)],
+            "target": "current",
+        }
diff --git a/rental_base_extension/views/product_views.xml b/rental_base_extension/views/product_views.xml
index 56ac2d067..eee441cda 100644
--- a/rental_base_extension/views/product_views.xml
+++ b/rental_base_extension/views/product_views.xml
@@ -2,7 +2,7 @@
 <!-- Copyright 2026 NuoBiT Solutions SL - Eric Antones <eantones@nuobit.com>
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo>
-    <!-- Hide 'Can be Rented' checkbox on service products -->
+    <!-- Hide 'Can be Rented' checkbox on non-storable products -->
     <record id="product_template_form_view" model="ir.ui.view">
         <field name="name">product.template.form.inherit.rental_base_extension</field>
         <field name="model">product.template</field>
@@ -13,7 +13,7 @@
                 position="attributes"
             >
                 <attribute name="attrs">
-                    {'invisible': [('type', '=', 'service')]}
+                    {'invisible': [('type', '!=', 'product')]}
                 </attribute>
             </xpath>
         </field>
@@ -56,7 +56,7 @@
                 <group
                     name="rental"
                     string="Rentals"
-                    attrs="{'invisible': [('type', '=', 'service')]}"
+                    attrs="{'invisible': [('type', '!=', 'product')]}"
                 >
                     <field name="rental_service_ids" nolabel="1" colspan="2" />
                     <button
@@ -108,13 +108,20 @@
                 <group
                     name="rental"
                     string="Rentals"
-                    attrs="{'invisible': ['|', ('type', '=', 'service'), ('product_variant_count', '&gt;', 1)]}"
+                    attrs="{'invisible': [('type', '!=', 'product')]}"
                 >
                     <field name="rental_service_tmpl_ids" nolabel="1" colspan="2" />
                     <button
                         type="action"
                         name="%(sale_rental.create_rental_product_action)d"
                         string="Create Rental Service"
+                        attrs="{'invisible': [('product_variant_count', '&gt;', 1)]}"
+                    />
+                    <button
+                        name="action_create_rental_services"
+                        type="object"
+                        string="Create Rental Services"
+                        attrs="{'invisible': [('product_variant_count', '&lt;=', 1)]}"
                     />
                 </group>
             </group>

From 94b00964747f51f4ccd8e35abb90d044fed40f96 Mon Sep 17 00:00:00 2001
From: Eric Antones <eantones@nuobit.com>
Date: Tue, 7 Apr 2026 13:20:07 +0200
Subject: [PATCH 2/2] [IMP] rental_base_extension: translations for batch
 rental service action

Add Catalan and Spanish translations for the new strings introduced
by the multi-variant rental service creation:

- "Create Rental Services" button label
- "Created Rental Services" action window name
- "All variants already have a rental service." error message

Reuse the parent module's "Rental of a {}" and "RENT-{}" strings
(via .format()) so we share the existing translation keys with
sale_rental's wizard.

Update rental_base_extension.pot with the new entries.
---
 rental_base_extension/i18n/ca.po              | 17 +++++++++++
 rental_base_extension/i18n/es.po              | 17 +++++++++++
 .../i18n/rental_base_extension.pot            | 29 +++++++++++++++++++
 rental_base_extension/models/product.py       |  4 +--
 4 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/rental_base_extension/i18n/ca.po b/rental_base_extension/i18n/ca.po
index 475c2c07c..aa861b609 100644
--- a/rental_base_extension/i18n/ca.po
+++ b/rental_base_extension/i18n/ca.po
@@ -56,6 +56,12 @@ msgstr "<strong>Signatura</strong>"
 msgid "Adopt & Sign"
 msgstr "Adopta i signa"
 
+#. module: rental_base_extension
+#: code:addons/rental_base_extension/models/product.py:0
+#, python-format
+msgid "All variants already have a rental service."
+msgstr "Totes les variants ja tenen un servei de lloguer."
+
 #. module: rental_base_extension
 #. odoo-javascript
 #: code:addons/rental_base_extension/static/src/xml/signature_dialog.xml:0
@@ -78,11 +84,22 @@ msgstr ""
 msgid "Confirm & Sign"
 msgstr "Confirma i signa"
 
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.product_template_only_form_view
+msgid "Create Rental Services"
+msgstr "Crea serveis de lloguer"
+
 #. module: rental_base_extension
 #: model_terms:ir.actions.act_window,help:rental_base_extension.sale_order_action_rental
 msgid "Create a new rental order!"
 msgstr "Creeu una nova comanda de lloguer!"
 
+#. module: rental_base_extension
+#: code:addons/rental_base_extension/models/product.py:0
+#, python-format
+msgid "Created Rental Services"
+msgstr "Serveis de lloguer creats"
+
 #. module: rental_base_extension
 #. odoo-javascript
 #: code:addons/rental_base_extension/static/src/js/signature_widget.js:0
diff --git a/rental_base_extension/i18n/es.po b/rental_base_extension/i18n/es.po
index efb0576af..0d62c080d 100644
--- a/rental_base_extension/i18n/es.po
+++ b/rental_base_extension/i18n/es.po
@@ -56,6 +56,12 @@ msgstr "<strong>Firma</strong>"
 msgid "Adopt & Sign"
 msgstr "Adoptar y firmar"
 
+#. module: rental_base_extension
+#: code:addons/rental_base_extension/models/product.py:0
+#, python-format
+msgid "All variants already have a rental service."
+msgstr "Todas las variantes ya tienen un servicio de alquiler."
+
 #. module: rental_base_extension
 #. odoo-javascript
 #: code:addons/rental_base_extension/static/src/xml/signature_dialog.xml:0
@@ -78,11 +84,22 @@ msgstr ""
 msgid "Confirm & Sign"
 msgstr "Confirmar y firmar"
 
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.product_template_only_form_view
+msgid "Create Rental Services"
+msgstr "Crear servicios de alquiler"
+
 #. module: rental_base_extension
 #: model_terms:ir.actions.act_window,help:rental_base_extension.sale_order_action_rental
 msgid "Create a new rental order!"
 msgstr "¡Cree un nuevo pedido de alquiler!"
 
+#. module: rental_base_extension
+#: code:addons/rental_base_extension/models/product.py:0
+#, python-format
+msgid "Created Rental Services"
+msgstr "Servicios de alquiler creados"
+
 #. module: rental_base_extension
 #. odoo-javascript
 #: code:addons/rental_base_extension/static/src/js/signature_widget.js:0
diff --git a/rental_base_extension/i18n/rental_base_extension.pot b/rental_base_extension/i18n/rental_base_extension.pot
index be1b514d1..4ff0134a4 100644
--- a/rental_base_extension/i18n/rental_base_extension.pot
+++ b/rental_base_extension/i18n/rental_base_extension.pot
@@ -51,6 +51,12 @@ msgstr ""
 msgid "Adopt & Sign"
 msgstr ""
 
+#. module: rental_base_extension
+#: code:addons/rental_base_extension/models/product.py:0
+#, python-format
+msgid "All variants already have a rental service."
+msgstr ""
+
 #. module: rental_base_extension
 #. odoo-javascript
 #: code:addons/rental_base_extension/static/src/xml/signature_dialog.xml:0
@@ -90,11 +96,22 @@ msgstr ""
 msgid "Create Rental Service"
 msgstr ""
 
+#. module: rental_base_extension
+#: model_terms:ir.ui.view,arch_db:rental_base_extension.product_template_only_form_view
+msgid "Create Rental Services"
+msgstr ""
+
 #. module: rental_base_extension
 #: model_terms:ir.actions.act_window,help:rental_base_extension.sale_order_action_rental
 msgid "Create a new rental order!"
 msgstr ""
 
+#. module: rental_base_extension
+#: code:addons/rental_base_extension/models/product.py:0
+#, python-format
+msgid "Created Rental Services"
+msgstr ""
+
 #. module: rental_base_extension
 #: model_terms:ir.ui.view,arch_db:rental_base_extension.sale_order_view_search_rental
 msgid "Customer"
@@ -216,6 +233,12 @@ msgstr ""
 msgid "Quotation Sent"
 msgstr ""
 
+#. module: rental_base_extension
+#: code:addons/rental_base_extension/models/product.py:0
+#, python-format
+msgid "RENT-{}"
+msgstr ""
+
 #. module: rental_base_extension
 #: model:ir.model.fields,field_description:rental_base_extension.field_sale_order__rental_ids
 #: model_terms:ir.ui.view,arch_db:rental_base_extension.product_normal_form_view
@@ -252,6 +275,12 @@ msgstr ""
 msgid "Rental Status"
 msgstr ""
 
+#. module: rental_base_extension
+#: code:addons/rental_base_extension/models/product.py:0
+#, python-format
+msgid "Rental of a {}"
+msgstr ""
+
 #. module: rental_base_extension
 #: model_terms:ir.ui.view,arch_db:rental_base_extension.product_normal_form_view
 #: model_terms:ir.ui.view,arch_db:rental_base_extension.product_template_only_form_view
diff --git a/rental_base_extension/models/product.py b/rental_base_extension/models/product.py
index 79b9756cf..873ea2f9f 100644
--- a/rental_base_extension/models/product.py
+++ b/rental_base_extension/models/product.py
@@ -26,14 +26,14 @@ def action_create_rental_services(self):
                 "uom_id": day_uom.id,
                 "uom_po_id": day_uom.id,
                 "list_price": 1.0,
-                "name": _("Rental of %s") % variant_ctx.display_name,
+                "name": _("Rental of a {}").format(variant_ctx.display_name),
                 "rented_product_id": variant.id,
                 "must_have_dates": True,
                 "categ_id": self.categ_id.id,
                 "invoice_policy": "order",
             }
             if variant.default_code:
-                vals["default_code"] = _("RENT-%s") % variant.default_code
+                vals["default_code"] = _("RENT-{}").format(variant.default_code)
             created_products |= self.env["product.product"].create(vals)
         return {
             "type": "ir.actions.act_window",