odoo-addon-openupgrade-scripts 17.0.1.0.1.272__py3-none-any.whl → 18.0.1.0.0.4__py3-none-any.whl

odoo/addons/openupgrade_scripts/scripts/auth_signup/17.0.1.0/noupdate_changes.xml

@@ -1,208 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<odoo>
-  <record id="mail_template_user_signup_account_created" model="mail.template">
-    <field name="body_html" type="html">
-      <table border="0" cellpadding="0" cellspacing="0" style="padding-top: 16px; background-color: #FFFFFF; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;">
-        <tr>
-          <td align="center">
-            <table border="0" cellpadding="0" cellspacing="0" width="590" style="padding: 16px; background-color: #FFFFFF; color: #454748; border-collapse:separate;">
-              <tbody>
-                <!-- HEADER -->
-                <tr>
-                  <td align="center" style="min-width: 590px;">
-                    <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
-                      <tr>
-                        <td valign="middle">
-                          <span style="font-size: 10px;">Your Account</span>
-                          <br/>
-                          <span style="font-size: 20px; font-weight: bold;">
-                            <t t-out="object.name or ''">Marc Demo</t>
-                          </span>
-                        </td>
-                        <td valign="middle" align="right" t-if="not object.company_id.uses_default_logo">
-                          <img t-attf-src="/logo.png?company={{ object.company_id.id }}" style="padding: 0px; margin: 0px; height: auto; width: 80px;" t-att-alt="object.company_id.name"/>
-                        </td>
-                      </tr>
-                      <tr>
-                        <td colspan="2" style="text-align:center;">
-                          <hr width="100%" style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;"/>
-                        </td>
-                      </tr>
-                    </table>
-                  </td>
-                </tr>
-                <!-- CONTENT -->
-                <tr>
-                  <td align="center" style="min-width: 590px;">
-                    <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
-                      <tr>
-                        <td valign="top" style="font-size: 13px;">
-                          <div>
-                        Dear <t t-out="object.name or ''">Marc Demo</t>,<br/><br/>
-                        Your account has been successfully created!<br/>
-                        Your login is <strong><t t-out="object.email or ''">mark.brown23@example.com</t></strong><br/>
-                        To gain access to your account, you can use the following link:
-                        <div style="margin: 16px 0px 16px 0px;"><a t-attf-href="/web/login?auth_login={{object.email}}" style="background-color: #875A7B; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px; font-size:13px;">
-                                Go to My Account
-                            </a></div>
-                        Thanks,<br/>
-                        <t t-if="user.signature"><br/><t t-out="user.signature or ''">--<br/>Mitchell Admin</t></t>
-                    </div>
-                        </td>
-                      </tr>
-                      <tr>
-                        <td style="text-align:center;">
-                          <hr width="100%" style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;"/>
-                        </td>
-                      </tr>
-                    </table>
-                  </td>
-                </tr>
-                <!-- FOOTER -->
-                <tr>
-                  <td align="center" style="min-width: 590px;">
-                    <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;">
-                      <tr>
-                        <td valign="middle" align="left">
-                          <t t-out="object.company_id.name or ''">YourCompany</t>
-                        </td>
-                      </tr>
-                      <tr>
-                        <td valign="middle" align="left" style="opacity: 0.7;">
-                          <t t-out="object.company_id.phone or ''">+1 650-123-4567</t>
-                          <t t-if="object.company_id.email">
-                        | <a t-attf-href="'mailto:%s' % {{ object.company_id.email }}" style="text-decoration:none; color: #454748;"><t t-out="object.company_id.email or ''">info@yourcompany.com</t></a>
-                    </t>
-                          <t t-if="object.company_id.website">
-                        | <a t-attf-href="'%s' % {{ object.company_id.website }}" style="text-decoration:none; color: #454748;"><t t-out="object.company_id.website or ''">http://www.example.com</t></a>
-                    </t>
-                        </td>
-                      </tr>
-                    </table>
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </td>
-        </tr>
-        <!-- POWERED BY -->
-        <tr>
-          <td align="center" style="min-width: 590px;">
-            <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;">
-              <tr>
-                <td style="text-align: center; font-size: 13px;">
-        Powered by <a target="_blank" href="https://www.odoo.com?utm_source=db&amp;utm_medium=auth" style="color: #875A7B;">Odoo</a>
-      </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </field>
-  </record>
-  <record id="set_password_email" model="mail.template">
-    <field name="body_html" type="html">
-      <table border="0" cellpadding="0" cellspacing="0" style="padding-top: 16px; background-color: #FFFFFF; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;">
-        <tr>
-          <td align="center">
-            <table border="0" cellpadding="0" cellspacing="0" width="590" style="padding: 16px; background-color: #FFFFFF; color: #454748; border-collapse:separate;">
-              <tbody>
-                <!-- HEADER -->
-                <tr>
-                  <td align="center" style="min-width: 590px;">
-                    <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
-                      <tr>
-                        <td valign="middle">
-                          <span style="font-size: 10px;">Welcome to Odoo</span>
-                          <br/>
-                          <span style="font-size: 20px; font-weight: bold;">
-                            <t t-out="object.name or ''">Marc Demo</t>
-                          </span>
-                        </td>
-                        <td valign="middle" align="right" t-if="not object.company_id.uses_default_logo">
-                          <img t-attf-src="/logo.png?company={{ object.company_id.id }}" style="padding: 0px; margin: 0px; height: auto; width: 80px;" t-att-alt="object.company_id.name"/>
-                        </td>
-                      </tr>
-                      <tr>
-                        <td colspan="2" style="text-align:center;">
-                          <hr width="100%" style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;"/>
-                        </td>
-                      </tr>
-                    </table>
-                  </td>
-                </tr>
-                <!-- CONTENT -->
-                <tr>
-                  <td align="center" style="min-width: 590px;">
-                    <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
-                      <tr>
-                        <td valign="top" style="font-size: 13px;">
-                          <div>
-                        Dear <t t-out="object.name or ''">Marc Demo</t>,<br/><br/>
-                        You have been invited by <t t-out="object.create_uid.name or ''">OdooBot</t> of <t t-out="object.company_id.name or ''">YourCompany</t> to connect on Odoo.
-                        <div style="margin: 16px 0px 16px 0px;"><a t-att-href="object.signup_url" style="background-color: #875A7B; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px; font-size:13px;">
-                                Accept invitation
-                            </a></div>
-                        <t t-set="website_url" t-value="object.get_base_url()"/>
-                        Your Odoo domain is: <b><a t-att-href="website_url" t-out="website_url or ''">http://yourcompany.odoo.com</a></b><br/>
-                        Your sign in email is: <b><a t-attf-href="/web/login?login={{ object.email }}" target="_blank" t-out="object.email or ''">mark.brown23@example.com</a></b><br/><br/>
-                        Never heard of Odoo? It’s an all-in-one business software loved by 7+ million users. It will considerably improve your experience at work and increase your productivity.
-                        <br/><br/>
-                        Have a look at the <a href="https://www.odoo.com/page/tour?utm_source=db&amp;utm_medium=auth" style="color: #875A7B;">Odoo Tour</a> to discover the tool.
-                        <br/><br/>
-                        Enjoy Odoo!<br/>
-                        --<br/>The <t t-out="object.company_id.name or ''">YourCompany</t> Team
-                    </div>
-                        </td>
-                      </tr>
-                      <tr>
-                        <td style="text-align:center;">
-                          <hr width="100%" style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;"/>
-                        </td>
-                      </tr>
-                    </table>
-                  </td>
-                </tr>
-                <!-- FOOTER -->
-                <tr>
-                  <td align="center" style="min-width: 590px;">
-                    <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;">
-                      <tr>
-                        <td valign="middle" align="left">
-                          <t t-out="object.company_id.name or ''">YourCompany</t>
-                        </td>
-                      </tr>
-                      <tr>
-                        <td valign="middle" align="left" style="opacity: 0.7;">
-                          <t t-out="object.company_id.phone or ''">+1 650-123-4567</t>
-                          <t t-if="object.company_id.email">
-                        | <a t-att-href="'mailto:%s' % object.company_id.email" style="text-decoration:none; color: #454748;" t-out="object.company_id.email or ''">info@yourcompany.com</a>
-                    </t>
-                          <t t-if="object.company_id.website">
-                        | <a t-att-href="'%s' % object.company_id.website" style="text-decoration:none; color: #454748;" t-out="object.company_id.website or ''">http://www.example.com</a>
-                    </t>
-                        </td>
-                      </tr>
-                    </table>
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </td>
-        </tr>
-        <!-- POWERED BY -->
-        <tr>
-          <td align="center" style="min-width: 590px;">
-            <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;">
-              <tr>
-                <td style="text-align: center; font-size: 13px;">
-        Powered by <a target="_blank" href="https://www.odoo.com?utm_source=db&amp;utm_medium=auth" style="color: #875A7B;">Odoo</a>
-      </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </field>
-  </record>
-</odoo>

odoo/addons/openupgrade_scripts/scripts/auth_signup/17.0.1.0/pre-migration.py

@@ -1,12 +0,0 @@
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from openupgradelib import openupgrade
-
-_deleted_xml_records = ["auth_signup.reset_password_email"]
-
-
-@openupgrade.migrate()
-def migrate(env, version):
-    openupgrade.delete_records_safely_by_xml_id(
-        env,
-        _deleted_xml_records,
-    )

odoo/addons/openupgrade_scripts/scripts/auth_signup/17.0.1.0/upgrade_analysis.txt

@@ -1,6 +0,0 @@
----Models in module 'auth_signup'---
----Fields in module 'auth_signup'---
----XML records in module 'auth_signup'---
-NEW ir.ui.view: auth_signup.alert_login_new_device
-NEW ir.ui.view: auth_signup.reset_password_email
-DEL mail.template: auth_signup.reset_password_email (noupdate)

odoo/addons/openupgrade_scripts/scripts/auth_signup/17.0.1.0/upgrade_analysis_work.txt

@@ -1,11 +0,0 @@
----Models in module 'auth_signup'---
----Fields in module 'auth_signup'---
----XML records in module 'auth_signup'---
-NEW ir.ui.view: auth_signup.alert_login_new_device
-
-# NOTHING TO DO
-
-NEW ir.ui.view: auth_signup.reset_password_email
-DEL mail.template: auth_signup.reset_password_email (noupdate)
-
-# DONE: delete the xmlid in pre-migration

odoo/addons/openupgrade_scripts/scripts/auth_totp_mail/17.0.1.0/upgrade_analysis.txt

@@ -1,4 +0,0 @@
----Models in module 'auth_totp_mail'---
----Fields in module 'auth_totp_mail'---
----XML records in module 'auth_totp_mail'---
-NEW ir.ui.view: auth_totp_mail.account_security_setting_update

odoo/addons/openupgrade_scripts/scripts/auth_totp_mail/17.0.1.0/upgrade_analysis_work.txt

@@ -1,4 +0,0 @@
----Models in module 'auth_totp_mail'---
----Fields in module 'auth_totp_mail'---
----XML records in module 'auth_totp_mail'---
-NEW ir.ui.view: auth_totp_mail.account_security_setting_update

odoo/addons/openupgrade_scripts/scripts/base/17.0.1.3/end-migration.py

@@ -1,19 +0,0 @@
-# Copyright 2024 Viindoo Technology Joint Stock Company (Viindoo)
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from openupgradelib import openupgrade
-
-_deleted_xml_records = [
-    "base.icp_mail_bounce_alias",
-    "base.icp_mail_catchall_alias",
-    "base.icp_mail_default_from",
-]
-
-
-@openupgrade.migrate()
-def migrate(env, version):
-    """Call disable_invalid_filters in every edition of openupgrade"""
-    openupgrade.disable_invalid_filters(env)
-    openupgrade.delete_records_safely_by_xml_id(
-        env,
-        _deleted_xml_records,
-    )

odoo/addons/openupgrade_scripts/scripts/base/17.0.1.3/noupdate_changes.xml

@@ -1,49 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<odoo>
-  <record id="KZT" model="res.currency">
-    <field name="symbol">₸</field>
-  </record>
-  <record id="MVR" model="res.currency">
-    <field name="position">before</field>
-  </record>
-  <record id="UYI" model="res.currency">
-    <field name="rounding">0.0001</field>
-  </record>
-  <record id="ca" model="res.country">
-    <field name="vat_label">GST/HST number</field>
-  </record>
-  <record id="ec" model="res.country">
-    <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s\n%(country_name)s'"/>
-    <field name="zip_required">0</field>
-  </record>
-  <!-- <record id="es" model="res.country">
-    <field eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(state_name)s\n%(country_name)s'" name="address_format"/>
-  </record> -->
-  <record id="europe" model="res.country.group">
-    <field name="name">European Union</field>
-  </record>
-  <!-- <record id="main_company" model="res.company">
-    <field name="currency_id" ref="base.USD"/>
-  </record> -->
-  <record id="nz" model="res.country">
-    <field name="vat_label">GST</field>
-  </record>
-  <record id="res_currency_rate_rule" model="ir.rule">
-    <field name="domain_force">['|', ('company_id', 'parent_of', company_ids), ('company_id', '=', False)]</field>
-  </record>
-  <record id="res_partner_rule" model="ir.rule">
-    <field name="domain_force">['|', '|', ('partner_share', '=', False), ('company_id', 'parent_of', company_ids), ('company_id', '=', False)]</field>
-  </record>
-  <record id="sl" model="res.country">
-    <field name="currency_id" ref="SLE"/>
-  </record>
-  <record id="ug" model="res.country">
-    <field name="vat_label">TIN</field>
-  </record>
-  <record id="uy" model="res.country">
-    <field name="vat_label">RUT</field>
-  </record>
-  <record id="zm" model="res.country">
-    <field name="vat_label">TPIN</field>
-  </record>
-</odoo>

odoo/addons/openupgrade_scripts/scripts/base/17.0.1.3/post-migration.py

@@ -1,19 +0,0 @@
-# Copyright 2024 Viindoo Technology Joint Stock Company (Viindoo)
-# Copyright 2024 Tecnativa - Pedro M. Baeza
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-
-from openupgradelib import openupgrade
-
-_deleted_xml_records = [
-    "base.res_partner_rule_private_employee",
-    "base.res_partner_rule_private_group",
-]
-
-
-@openupgrade.migrate()
-def migrate(env, version):
-    openupgrade.load_data(env, "base", "17.0.1.3/noupdate_changes.xml")
-    openupgrade.delete_records_safely_by_xml_id(
-        env,
-        _deleted_xml_records,
-    )

odoo/addons/openupgrade_scripts/scripts/base/17.0.1.3/pre-migration.py

@@ -1,228 +0,0 @@
-# Copyright 2024 Viindoo Technology Joint Stock Company (Viindoo)
-# Copyright 2024 Tecnativa - Pedro M. Baeza
-# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
-import logging
-
-from openupgradelib import openupgrade
-
-from odoo import tools
-
-from odoo.addons.openupgrade_scripts.apriori import (  # pylint: disable=odoo-addons-relative-import
-    merged_modules,
-    renamed_modules,
-)
-
-_logger = logging.getLogger(__name__)
-
-_xmlids_renames = [
-    (
-        "mail.model_res_users_settings",
-        "base.model_res_users_settings",
-    ),
-    (
-        "mail.access_res_users_settings_all",
-        "base.access_res_users_settings_all",
-    ),
-    (
-        "mail.access_res_users_settings_user",
-        "base.access_res_users_settings_user",
-    ),
-    (
-        "mail.res_users_settings_rule_admin",
-        "base.res_users_settings_rule_admin",
-    ),
-    (
-        "mail.res_users_settings_rule_user",
-        "base.res_users_settings_rule_user",
-    ),
-    (
-        "mail.constraint_res_users_settings_unique_user_id",
-        "base.constraint_res_users_settings_unique_user_id",
-    ),
-]
-_column_renames = {
-    "res_partner": [("display_name", "complete_name")],
-}
-
-
-def _fill_ir_server_object_lines_into_action_server(cr):
-    openupgrade.logged_query(
-        cr,
-        """
-        ALTER TABLE ir_act_server
-            ADD COLUMN IF NOT EXISTS old_ias_id INTEGER,
-            ADD COLUMN IF NOT EXISTS evaluation_type VARCHAR,
-            ADD COLUMN IF NOT EXISTS resource_ref VARCHAR,
-            ADD COLUMN IF NOT EXISTS selection_value INTEGER,
-            ADD COLUMN IF NOT EXISTS update_boolean_value VARCHAR,
-            ADD COLUMN IF NOT EXISTS update_field_id INTEGER,
-            ADD COLUMN IF NOT EXISTS update_m2m_operation VARCHAR,
-            ADD COLUMN IF NOT EXISTS update_path VARCHAR,
-            ADD COLUMN IF NOT EXISTS update_related_model_id INTEGER,
-            ADD COLUMN IF NOT EXISTS value TEXT;
-        """,
-    )
-    # Update operations
-    openupgrade.logged_query(
-        cr,
-        """
-        WITH sub AS (
-            INSERT INTO ir_act_server
-            (
-                old_ias_id,
-                evaluation_type,
-                update_field_id,
-                update_path,
-                update_related_model_id,
-                value,
-                resource_ref,
-                selection_value,
-                update_boolean_value,
-                update_m2m_operation,
-                binding_type,
-                state,
-                type,
-                usage,
-                model_id,
-                name
-            )
-            SELECT
-                ias.id,
-                CASE
-                    WHEN isol.evaluation_type = 'equation' then 'equation'
-                    ELSE 'value'
-                END,
-                imf.id,
-                imf.name,
-                im.id,
-                CASE WHEN isol.evaluation_type = 'equation'
-                    THEN isol.value
-                    ELSE NULL
-                END,
-                CASE WHEN imf.ttype in ('many2one', 'many2many')
-                    THEN imf.relation || ',' || isol.value
-                    ELSE NULL
-                END,
-                imfs.id,
-                CASE WHEN imf.ttype = 'boolean'
-                    THEN isol.value::bool
-                    ELSE NULL
-                END,
-                'add',
-                'action',
-                'object_write',
-                'ir.actions.server',
-                'ir_actions_server',
-                ias.model_id,
-                ias.name
-            FROM ir_act_server ias
-            JOIN ir_server_object_lines isol ON isol.server_id = ias.id
-            JOIN ir_model_fields imf ON imf.id = isol.col1
-            LEFT JOIN ir_model im ON im.model = imf.relation
-            LEFT JOIN ir_model_fields_selection imfs
-                ON imf.id = imfs.field_id AND imfs.value = isol.value
-            WHERE ias.state = 'object_write'
-            RETURNING id, old_ias_id
-        )
-        INSERT INTO rel_server_actions (action_id, server_id)
-        SELECT sub.id as action_id, sub.old_ias_id as server_id
-        FROM sub
-        """,
-    )
-    openupgrade.logged_query(
-        cr,
-        """UPDATE ir_act_server ias
-        SET state = 'multi'
-        FROM ir_server_object_lines isol
-        WHERE ias.state = 'object_write'
-        AND isol.server_id = ias.id
-        """,
-    )
-    # Create operations
-    openupgrade.logged_query(
-        cr,
-        """UPDATE ir_act_server ias
-        SET value = isol.value
-        FROM ir_server_object_lines isol
-        JOIN ir_model_fields imf ON imf.id = isol.col1
-        WHERE ias.state = 'object_create'
-        AND isol.server_id = ias.id
-        AND isol.evaluation_type = 'value'
-        AND imf.name = 'name'
-        """,
-    )
-
-
-def _fill_empty_country_codes(cr):
-    openupgrade.logged_query(
-        cr,
-        """
-        UPDATE res_country
-        SET code = 'OU' || id::VARCHAR
-        WHERE code IS NULL
-        """,
-    )
-
-
-def _handle_partner_private_type(cr):
-    # Copy private records into a new table
-    openupgrade.logged_query(
-        cr,
-        """
-        CREATE TABLE ou_res_partner_private AS
-        SELECT * FROM res_partner
-        WHERE type = 'private'
-        """,
-    )
-    # Copy column for preserving the old type values
-    _column_copies = {"res_partner": [("type", None, None)]}
-    openupgrade.copy_columns(cr, _column_copies)
-    # Change contact type and erase sensitive information
-    query = "type = 'contact'"
-    for field in [
-        "street",
-        "street2",
-        "city",
-        "zip",
-        "vat",
-        "function",
-        "phone",
-        "mobile",
-        "email",
-        "website",
-        "comment",
-    ]:
-        query += f", {field} = CASE WHEN {field} IS NULL THEN NULL ELSE '*****' END"
-    openupgrade.logged_query(
-        cr,
-        f"""
-        UPDATE res_partner
-        SET {query},
-        country_id = NULL,
-        state_id = NULL
-        WHERE type = 'private'
-        """,
-    )
-
-
-@openupgrade.migrate(use_env=False)
-def migrate(cr, version):
-    """
-    Don't request an env for the base pre-migration as flushing the env in
-    odoo/modules/registry.py will break on the 'base' module not yet having
-    been instantiated.
-    """
-    if "openupgrade_framework" not in tools.config["server_wide_modules"]:
-        _logger.error(
-            "openupgrade_framework is not preloaded. You are highly "
-            "recommended to run the Odoo with --load=openupgrade_framework "
-            "when migrating your database."
-        )
-    openupgrade.update_module_names(cr, renamed_modules.items())
-    openupgrade.update_module_names(cr, merged_modules.items(), merge_modules=True)
-    openupgrade.clean_transient_models(cr)
-    openupgrade.rename_xmlids(cr, _xmlids_renames)
-    openupgrade.rename_columns(cr, _column_renames)
-    _fill_ir_server_object_lines_into_action_server(cr)
-    _fill_empty_country_codes(cr)
-    _handle_partner_private_type(cr)