diff --git a/website_form_partner_specific_user_account/README.rst b/website_form_partner_specific_user_account/README.rst index 84f6da9..ad5809d 100644 --- a/website_form_partner_specific_user_account/README.rst +++ b/website_form_partner_specific_user_account/README.rst @@ -28,16 +28,16 @@ Website Form Partner Specific User Account |badge1| |badge2| |badge3| |badge4| |badge5| -This module assigns the current website to partners used by website -forms and ensures partner lookup and assignment are restricted to that -website. +This module is intended for use when the “Specific User Account” setting +is enabled on a website. -In standard Odoo, partner searches triggered from the website may lead -to incorrect assignments. For example, the partner assignment does not -take the website into account and may assign the wrong partner when -“Specific User Account” is enabled, which allows a separate user account -to be created for each website even if they share the same email -address. +It assigns the current website to partners used by website forms and +ensures partner lookup and assignment are restricted to that website. + +In standard Odoo, partner resolution from website forms does not +consider the current website. When “Specific User Account” is enabled, +this may result in a partner from another website being assigned if the +same email address exists across multiple websites. This module addresses this issue. @@ -46,12 +46,30 @@ This module addresses this issue. .. contents:: :local: +Configuration +============= + +To enable company-based partner isolation for website forms: + +- Go to Website → Configuration → Websites. +- Open the website you want to configure. +- Enable Restrict Partner to Company. + + - When enabled, partner lookup and creation from website forms will + be limited to the website’s company. + - Only partners belonging to that company will be matched, and any + newly created partners will be assigned to the same company. + Known issues / Roadmap ====================== Partner email is currently inferred from multiple possible form fields (email_from, partner_email, email). +Note: The module assigns the current website to partners missing +``website_id``, affecting not only newly created partners from website +forms but also existing partners when they are used in a website form. + Bug Tracker =========== @@ -76,6 +94,7 @@ Contributors - ``Quartile ``\ \_\_: - Aung Ko Ko Lin + - Yoshi Tashiro Maintainers ----------- diff --git a/website_form_partner_specific_user_account/__init__.py b/website_form_partner_specific_user_account/__init__.py index e046e49..91c5580 100644 --- a/website_form_partner_specific_user_account/__init__.py +++ b/website_form_partner_specific_user_account/__init__.py @@ -1 +1,2 @@ from . import controllers +from . import models diff --git a/website_form_partner_specific_user_account/__manifest__.py b/website_form_partner_specific_user_account/__manifest__.py index e250fdf..4b6dacc 100644 --- a/website_form_partner_specific_user_account/__manifest__.py +++ b/website_form_partner_specific_user_account/__manifest__.py @@ -3,12 +3,17 @@ { "name": "Website Form Partner Specific User Account", + "summary": ( + "Restrict website form partner lookup to the current website " + "when Specific User Account is enabled" + ), "version": "15.0.1.0.0", "category": "Website", "license": "AGPL-3", "author": "Quartile, Odoo Community Association (OCA)", "website": "https://github.com/OCA/website", "depends": ["website"], + "data": ["views/website_views.xml"], "maintainers": ["yostashiro", "aungkokolin1997"], "installable": True, } diff --git a/website_form_partner_specific_user_account/controllers/main.py b/website_form_partner_specific_user_account/controllers/main.py index b054625..3c1e941 100644 --- a/website_form_partner_specific_user_account/controllers/main.py +++ b/website_form_partner_specific_user_account/controllers/main.py @@ -14,32 +14,48 @@ def insert_record(self, request, model, values, custom, meta=None): return super().insert_record(request, model, values, custom, meta) Partner = request.env["res.partner"].sudo() partner = Partner.browse(partner_id) - if not partner.exists(): + if not partner: return super().insert_record(request, model, values, custom, meta) email = ( values.get("email_from") or values.get("partner_email") or values.get("email") ) + restrict = website.restrict_partner_to_company + website_company = website.company_id + # Conflicts based on what the partner already has + company_conflict = ( + restrict + and bool(partner.company_id) + and partner.company_id != website_company + ) + website_conflict = bool(partner.website_id) and partner.website_id != website + # If there is any conflict, do not assign missing fields to this partner. + # Instead, look for/create a partner that matches website (+company if restricted). + if email and (website_conflict or company_conflict): + domain = [ + ("email", "=", email), + ("website_id", "=", website.id), + ] + if website.restrict_partner_to_company: + domain.append(("company_id", "=", website.company_id.id)) + website_partner = Partner.search(domain, limit=1) + if not website_partner: + vals = { + "email": email, + "name": values.get("partner_name", False), + "website_id": website.id, + } + if website.restrict_partner_to_company: + vals["company_id"] = website.company_id.id + website_partner = Partner.create(vals) + if website_partner: + values["partner_id"] = website_partner.id + partner = website_partner # Intended for newly created partners, but applies to any partner without website_id if not partner.website_id: partner.website_id = website.id - if email and partner.website_id != website: - website_partner = Partner.search( - [ - ("email", "=", email), - ("website_id", "=", website.id), - ], - limit=1, - ) - if not website_partner and values.get("partner_name"): - website_partner = Partner.create( - { - "email": email, - "name": values.get("partner_name"), - "website_id": website.id, - } - ) - if website_partner: - values["partner_id"] = website_partner.id + # Intended for newly created partners, but applies to any partner without company_id + if restrict and not partner.company_id: + partner.company_id = website_company.id return super().insert_record(request, model, values, custom, meta) diff --git a/website_form_partner_specific_user_account/models/__init__.py b/website_form_partner_specific_user_account/models/__init__.py new file mode 100644 index 0000000..bd190fa --- /dev/null +++ b/website_form_partner_specific_user_account/models/__init__.py @@ -0,0 +1 @@ +from . import website diff --git a/website_form_partner_specific_user_account/models/website.py b/website_form_partner_specific_user_account/models/website.py new file mode 100644 index 0000000..f7b45df --- /dev/null +++ b/website_form_partner_specific_user_account/models/website.py @@ -0,0 +1,13 @@ +# Copyright 2025 Quartile (https://www.quartile.co) +# License LGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class Website(models.Model): + _inherit = "website" + + restrict_partner_to_company = fields.Boolean( + help="When enabled, partner lookup and creation from website forms " + "are restricted to the website's company." + ) diff --git a/website_form_partner_specific_user_account/readme/CONFIGURE.md b/website_form_partner_specific_user_account/readme/CONFIGURE.md new file mode 100644 index 0000000..6877b4d --- /dev/null +++ b/website_form_partner_specific_user_account/readme/CONFIGURE.md @@ -0,0 +1,7 @@ +To enable company-based partner isolation for website forms: + +- Go to Website → Configuration → Websites. +- Open the website you want to configure. +- Enable Restrict Partner to Company. + - When enabled, partner lookup and creation from website forms will be limited to the website’s company. + - Only partners belonging to that company will be matched, and any newly created partners will be assigned to the same company. diff --git a/website_form_partner_specific_user_account/static/description/index.html b/website_form_partner_specific_user_account/static/description/index.html index 284535a..33e2f08 100644 --- a/website_form_partner_specific_user_account/static/description/index.html +++ b/website_form_partner_specific_user_account/static/description/index.html @@ -370,36 +370,54 @@

Website Form Partner Specific User Account

!! source digest: sha256:2e500aa333d78504c4193278e7dcc9109518c14d7bb60052e41f51baa0777d78 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

Beta License: AGPL-3 OCA/website Translate me on Weblate Try me on Runboat

-

This module assigns the current website to partners used by website -forms and ensures partner lookup and assignment are restricted to that -website.

-

In standard Odoo, partner searches triggered from the website may lead -to incorrect assignments. For example, the partner assignment does not -take the website into account and may assign the wrong partner when -“Specific User Account” is enabled, which allows a separate user account -to be created for each website even if they share the same email -address.

+

This module is intended for use when the “Specific User Account” setting +is enabled on a website.

+

It assigns the current website to partners used by website forms and +ensures partner lookup and assignment are restricted to that website.

+

In standard Odoo, partner resolution from website forms does not +consider the current website. When “Specific User Account” is enabled, +this may result in a partner from another website being assigned if the +same email address exists across multiple websites.

This module addresses this issue.

Table of contents

+
+

Configuration

+

To enable company-based partner isolation for website forms:

+
-

Known issues / Roadmap

+

Known issues / Roadmap

Partner email is currently inferred from multiple possible form fields (email_from, partner_email, email).

+

Note: The module assigns the current website to partners missing +website_id, affecting not only newly created partners from website +forms but also existing partners when they are used in a website form.

-

Bug Tracker

+

Bug Tracker

Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us to smash it by providing a detailed and welcomed @@ -407,24 +425,25 @@

Bug Tracker

Do not contact contributors directly about support or help with technical issues.

-

Credits

+

Credits

-

Authors

+

Authors

  • Quartile
-

Contributors

+

Contributors

  • Quartile <https://www.quartile.co>__:
    • Aung Ko Ko Lin
      • +
    • Yoshi Tashiro
-

Maintainers

+

Maintainers

This module is maintained by the OCA.

Odoo Community Association diff --git a/website_form_partner_specific_user_account/tests/__init__.py b/website_form_partner_specific_user_account/tests/__init__.py new file mode 100644 index 0000000..5f56592 --- /dev/null +++ b/website_form_partner_specific_user_account/tests/__init__.py @@ -0,0 +1 @@ +from . import test_website_form_partner_specific_user_account diff --git a/website_form_partner_specific_user_account/tests/test_website_form_partner_specific_user_account.py b/website_form_partner_specific_user_account/tests/test_website_form_partner_specific_user_account.py new file mode 100644 index 0000000..26835bf --- /dev/null +++ b/website_form_partner_specific_user_account/tests/test_website_form_partner_specific_user_account.py @@ -0,0 +1,137 @@ +# Copyright 2025 Quartile (https://www.quartile.co) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from types import SimpleNamespace +from unittest.mock import patch + +from odoo.tests.common import TransactionCase + +from odoo.addons.website_form_partner_specific_user_account.controllers.main import ( + WebsiteForm, +) + + +class TestWebsiteFormSimple(TransactionCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.company_1 = cls.env["res.company"].create({"name": "Company 1"}) + cls.company_2 = cls.env["res.company"].create({"name": "Company 2"}) + cls.website_1 = cls.env["website"].create( + { + "name": "Website 1", + "specific_user_account": True, + "restrict_partner_to_company": True, + "company_id": cls.company_1.id, + } + ) + cls.website_2 = cls.env["website"].create( + { + "name": "Website 2", + "specific_user_account": True, + "restrict_partner_to_company": False, + "company_id": cls.company_2.id, + } + ) + + def mock_insert_record(self, request, model, values, custom, meta=None): + return values + + def _req(self, website): + return SimpleNamespace(env=self.env, website=website) + + @patch( + "odoo.addons.website.controllers.form.WebsiteForm.insert_record", + new=mock_insert_record, + ) + def test_partner_website_and_company_when_restricted(self): + partner = self.env["res.partner"].create( + { + "name": "Partner", + "email": "test1@example.com", + "company_id": False, + } + ) + WebsiteForm().insert_record( + self._req(self.website_1), + "res.partner", + { + "partner_id": partner.id, + "email_from": partner.email, + }, + {}, + ) + self.assertEqual(partner.website_id, self.website_1) + self.assertEqual(partner.company_id, self.company_1) + + @patch( + "odoo.addons.website.controllers.form.WebsiteForm.insert_record", + new=mock_insert_record, + ) + def test_website_partner_with_existing_website(self): + original = self.env["res.partner"].create( + { + "name": "Original", + "email": "test2@example.com", + "website_id": self.website_1.id, + "company_id": False, + } + ) + WebsiteForm().insert_record( + self._req(self.website_2), + "res.partner", + { + "partner_id": original.id, + "email_from": original.email, + "partner_name": "Website 2 Partner", + }, + {}, + ) + website_partner = self.env["res.partner"].search( + [ + ("email", "=", original.email), + ("website_id", "=", self.website_2.id), + ], + limit=1, + ) + self.assertTrue(website_partner) + self.assertNotEqual(website_partner, original) + # Compare against website_2's company instead of using assertFalse, + # because another module may assign a default company. + # In this test environment, the current company is base.main_company. + self.assertNotEqual(website_partner.company_id, self.website_2.company_id) + + @patch( + "odoo.addons.website.controllers.form.WebsiteForm.insert_record", + new=mock_insert_record, + ) + def test_website_partner_with_company_when_restricted(self): + self.website_2.restrict_partner_to_company = True + original = self.env["res.partner"].create( + { + "name": "Original", + "email": "test3@example.com", + "website_id": self.website_1.id, + "company_id": False, + } + ) + original.company_id = False + WebsiteForm().insert_record( + self._req(self.website_2), + "res.partner", + { + "partner_id": original.id, + "email_from": original.email, + "partner_name": "Restricted Partner", + }, + {}, + ) + website_partner = self.env["res.partner"].search( + [ + ("email", "=", original.email), + ("website_id", "=", self.website_2.id), + ("company_id", "=", self.website_2.company_id.id), + ], + limit=1, + ) + self.assertTrue(website_partner) diff --git a/website_form_partner_specific_user_account/views/website_views.xml b/website_form_partner_specific_user_account/views/website_views.xml new file mode 100644 index 0000000..6a809a4 --- /dev/null +++ b/website_form_partner_specific_user_account/views/website_views.xml @@ -0,0 +1,13 @@ + + + + website.view.inherit + website + + + + + + + +