Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[16.0][FIX] product_multi_company: search in False #720

Merged
merged 1 commit into from
Nov 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion product_multi_company/models/product_product.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright 2015-2016 Pedro M. Baeza <[email protected]>
# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html

from odoo import fields, models
from odoo import api, fields, models


class ProductProduct(models.Model):
Expand All @@ -19,3 +19,8 @@ class ProductProduct(models.Model):
readonly=False,
store=True,
)

@api.model
def search(self, args, offset=0, limit=None, order=None, count=False):
dom = self.env["multi.company.abstract"]._patch_company_domain(args)
return super().search(dom, offset=offset, limit=limit, order=order, count=count)
11 changes: 7 additions & 4 deletions product_multi_company/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@

/*
:Author: David Goodger ([email protected])
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
:Copyright: This stylesheet has been placed in the public domain.

Default cascading style sheet for the HTML output of Docutils.
Despite the name, some widely supported CSS2 features are used.

See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet.
Expand Down Expand Up @@ -274,7 +275,7 @@
margin-left: 2em ;
margin-right: 2em }

pre.code .ln { color: grey; } /* line numbers */
pre.code .ln { color: gray; } /* line numbers */
pre.code, code { background-color: #eeeeee }
pre.code .comment, code .comment { color: #5C6576 }
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
Expand All @@ -300,7 +301,7 @@
span.pre {
white-space: pre }

span.problematic {
span.problematic, pre.problematic {
color: red }

span.section-subtitle {
Expand Down Expand Up @@ -434,7 +435,9 @@ <h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
<p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
<a class="reference external image-reference" href="https://odoo-community.org">
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
</a>
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.</p>
Expand Down
23 changes: 23 additions & 0 deletions product_multi_company/tests/test_product_multi_company.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,29 @@ def test_product_write(self):
self.product_company_both.product_tmpl_id.company_ids,
)

def test_search_product(self):
"""Products with no company are shared across companies but we need to convert
those queries with an or operator"""
expected_products = (
self.product_company_both
+ self.product_company_1
+ self.product_company_none
)
searched_templates = self.env["product.template"].search(
[
("company_id", "in", [self.company_1.id, False]),
("id", "in", expected_products.product_tmpl_id.ids),
]
)
self.assertEqual(searched_templates, expected_products.product_tmpl_id)
searched_products = self.product_obj.search(
[
("company_id", "in", [self.company_1.id, False]),
("id", "in", expected_products.ids),
]
)
self.assertEqual(searched_products, expected_products)

def test_uninstall(self):
from ..hooks import uninstall_hook

Expand Down
Loading