Merge pull request #1134 from OCA/15.0

Syncing from upstream OCA/partner-contact (15.0)
brain-tec · Dec 29, 2023 · d4bf10a · d4bf10a
2 parents 0005597 + 8abf090
commit d4bf10a
Show file tree

Hide file tree

Showing 10 changed files with 85 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ addon | version | maintainers | summary
 [partner_affiliate](partner_affiliate/) | 15.0.1.0.0 |  | Partner Affiliates
 [partner_bank_code](partner_bank_code/) | 15.0.1.0.0 |  | Add fields information in banks
 [partner_capital](partner_capital/) | 15.0.0.1.0 |  | Partners Capital
-[partner_company_default](partner_company_default/) | 15.0.1.0.0 |  | Partner Company Default
+[partner_company_default](partner_company_default/) | 15.0.1.0.1 |  | Partner Company Default
 [partner_company_group](partner_company_group/) | 15.0.2.0.0 |  | Adds the possibility to add a company group to a company
 [partner_company_type](partner_company_type/) | 15.0.1.0.1 |  | Adds a company type to partner that are companies
 [partner_contact_access_link](partner_contact_access_link/) | 15.0.1.1.1 | [![Yajo](https://github.com/Yajo.png?size=30px)](https://github.com/Yajo) | Allow to visit the full contact form from a company

diff --git a/partner_company_default/README.rst b/partner_company_default/README.rst
@@ -7,7 +7,7 @@ Partner Company Default
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:f9097886e172ea9b8e8596b1ec11b703527617f1ca72c9c8e8b8874025dd18ba
+   !! source digest: sha256:31378a85ad44a56fcf5d602180235c11ac64d4122a3a1523d68d6165a4acd6a6
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/partner_company_default/__manifest__.py b/partner_company_default/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 {
     "name": "Partner Company Default",
-    "version": "15.0.1.0.0",
+    "version": "15.0.1.0.1",
     "author": "Quartile Limited, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/partner-contact",
     "depends": ["base"],

diff --git a/partner_company_default/i18n/partner_company_default.pot b/partner_company_default/i18n/partner_company_default.pot
@@ -13,6 +13,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: partner_company_default
+#: model:ir.model,name:partner_company_default.model_res_company
+msgid "Companies"
+msgstr ""
+
 #. module: partner_company_default
 #: model:ir.model.fields,field_description:partner_company_default.field_res_partner__company_id
 msgid "Company"

diff --git a/partner_company_default/models/__init__.py b/partner_company_default/models/__init__.py
@@ -1 +1,2 @@
+from . import res_company
 from . import res_partner
diff --git a/partner_company_default/models/res_company.py b/partner_company_default/models/res_company.py
@@ -0,0 +1,13 @@
+# Copyright 2023 Quartile Limited
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import api, models
+
+
+class ResCompany(models.Model):
+    _inherit = "res.company"
+
+    @api.model
+    def create(self, vals):
+        self = self.with_context(creating_from_company=True)
+        return super().create(vals)
diff --git a/partner_company_default/models/res_partner.py b/partner_company_default/models/res_partner.py
@@ -1,10 +1,23 @@
 # Copyright 2023 Quartile Limited
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from odoo import fields, models
+from odoo import api, fields, models
+from odoo.tools import config
 
 
 class ResPartner(models.Model):
     _inherit = "res.partner"
 
-    company_id = fields.Many2one(default=lambda self: self.env.company)
+    company_id = fields.Many2one(default=lambda self: self._default_company_id())
+
+    @api.model
+    def _default_company_id(self):
+        """Return False for other tests or if creating a company."""
+        context = self.env.context
+        if (
+            context.get("creating_from_company")
+            or config["test_enable"]
+            and not context.get("test_partner_company_default")
+        ):
+            return False
+        return self.env.company
diff --git a/partner_company_default/static/description/index.html b/partner_company_default/static/description/index.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -367,7 +366,7 @@ <h1 class="title">Partner Company Default</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:f9097886e172ea9b8e8596b1ec11b703527617f1ca72c9c8e8b8874025dd18ba
+!! source digest: sha256:31378a85ad44a56fcf5d602180235c11ac64d4122a3a1523d68d6165a4acd6a6
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/partner-contact/tree/15.0/partner_company_default"><img alt="OCA/partner-contact" src="https://img.shields.io/badge/github-OCA%2Fpartner--contact-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/partner-contact-15-0/partner-contact-15-0-partner_company_default"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/partner-contact&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module assigns default company to res.parnter.</p>

diff --git a/partner_company_default/tests/__init__.py b/partner_company_default/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_partner_company_default
diff --git a/partner_company_default/tests/test_partner_company_default.py b/partner_company_default/tests/test_partner_company_default.py
@@ -0,0 +1,46 @@
+# Copyright 2023 Quartile Limited
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+import odoo.tests.common as common
+
+
+class TestPartnerCompanyDefault(common.TransactionCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.user = cls.env.ref("base.user_admin")
+
+    def test_partner_company_default(self):
+        # Check company of newly created partner
+        partner = (
+            self.env["res.partner"]
+            .with_user(self.user.id)
+            .with_context(test_partner_company_default=True)
+            .create({"name": "Test Partner 1"})
+        )
+        self.assertEqual(partner.company_id, self.user.company_id)
+
+        # Check company of the partner of newly created company
+        company_fr = (
+            self.env["res.company"]
+            .with_user(self.user.id)
+            .create(
+                {
+                    "name": "French company",
+                    "currency_id": self.env.ref("base.EUR").id,
+                    "country_id": self.env.ref("base.fr").id,
+                }
+            )
+        )
+        self.assertFalse(company_fr.partner_id.company_id)
+
+        # Switch user's company and create a partner
+        self.user.company_ids = [(4, company_fr.id)]
+        self.user.company_id = company_fr.id
+        partner = (
+            self.env["res.partner"]
+            .with_user(self.user.id)
+            .with_context(test_partner_company_default=True)
+            .create({"name": "Test Partner 2"})
+        )
+        self.assertEqual(partner.company_id, company_fr)
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		from . import res_company
		from . import res_partner