-
-
Notifications
You must be signed in to change notification settings - Fork 714
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
[17.0][MIG] product_main_supplierinfo #1660
Merged
OCA-git-bot
merged 11 commits into
OCA:17.0
from
solvosci:17.0-mig-product_main_supplierinfo
Dec 10, 2024
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
d4ada7a
[ADD] New module 'product_main_supplierinfo'
sebalix 602d47a
[UPD] Update product_main_supplierinfo.pot
oca-travis dd843d1
[UPD] README.rst
OCA-git-bot cc801a9
[ADD] icon.png
OCA-git-bot fe04d84
Added translation using Weblate (French)
Kev-Roche 6cb05a9
[IMP] update dotfiles [ci skip]
OCA-git-bot e273556
product_main_supplierinfo: fix default sellers for variant
TDu b68b46c
product_main_supplierinfo 14.0.1.0.1
OCA-git-bot 99f9622
[MIG] product_main_supplierinfo: Migration to 16.0
aliciagaarzo 7c70620
[IMP] product_main_supplierinfo: pre-commit auto fixes
adriresu 08a9af4
[MIG] product_main_supplierinfo: Migration to 17.0
adriresu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
=================== | ||
Product Main Vendor | ||
=================== | ||
|
||
.. | ||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
!! This file is generated by oca-gen-addon-readme !! | ||
!! changes will be overwritten. !! | ||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
!! source digest: sha256:1c09eb9d7bd0160627eb3c38acbb27f822a296e66a655582636d42311aca7dfc | ||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
|
||
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png | ||
:target: https://odoo-community.org/page/development-status | ||
:alt: Beta | ||
.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png | ||
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html | ||
:alt: License: AGPL-3 | ||
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github | ||
:target: https://github.com/OCA/product-attribute/tree/17.0/product_main_supplierinfo | ||
:alt: OCA/product-attribute | ||
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png | ||
:target: https://translation.odoo-community.org/projects/product-attribute-17-0/product-attribute-17-0-product_main_supplierinfo | ||
:alt: Translate me on Weblate | ||
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png | ||
:target: https://runboat.odoo-community.org/builds?repo=OCA/product-attribute&target_branch=17.0 | ||
:alt: Try me on Runboat | ||
|
||
|badge1| |badge2| |badge3| |badge4| |badge5| | ||
|
||
This module shows the main vendor of a product. | ||
|
||
**Table of contents** | ||
|
||
.. contents:: | ||
:local: | ||
|
||
Bug Tracker | ||
=========== | ||
|
||
Bugs are tracked on `GitHub Issues <https://github.com/OCA/product-attribute/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 | ||
`feedback <https://github.com/OCA/product-attribute/issues/new?body=module:%20product_main_supplierinfo%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_. | ||
|
||
Do not contact contributors directly about support or help with technical issues. | ||
|
||
Credits | ||
======= | ||
|
||
Authors | ||
------- | ||
|
||
* Camptocamp | ||
|
||
Contributors | ||
------------ | ||
|
||
- `Camptocamp <https://www.camptocamp.com>`__ | ||
|
||
- Sébastien Alix <[email protected]> | ||
|
||
Maintainers | ||
----------- | ||
|
||
This module is maintained by the OCA. | ||
|
||
.. image:: https://odoo-community.org/logo.png | ||
:alt: Odoo Community Association | ||
:target: https://odoo-community.org | ||
|
||
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. | ||
|
||
.. |maintainer-sebalix| image:: https://github.com/sebalix.png?size=40px | ||
:target: https://github.com/sebalix | ||
:alt: sebalix | ||
|
||
Current `maintainer <https://odoo-community.org/page/maintainer-role>`__: | ||
|
||
|maintainer-sebalix| | ||
|
||
This module is part of the `OCA/product-attribute <https://github.com/OCA/product-attribute/tree/17.0/product_main_supplierinfo>`_ project on GitHub. | ||
|
||
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
from . import models |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
# Copyright 2021 Camptocamp SA | ||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) | ||
{ | ||
"name": "Product Main Vendor", | ||
"version": "17.0.1.0.0", | ||
"summary": "Display the main vendor of a product.", | ||
"website": "https://github.com/OCA/product-attribute", | ||
"author": "Camptocamp, Odoo Community Association (OCA)", | ||
"maintainers": ["sebalix"], | ||
"development_status": "Beta", | ||
"license": "AGPL-3", | ||
"category": "Product", | ||
"depends": ["product", "purchase"], | ||
"data": ["views/product_product.xml"], | ||
"auto_install": False, | ||
"installable": True, | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
# Translation of Odoo Server. | ||
# This file contains the translation of the following modules: | ||
# * product_main_supplierinfo | ||
# | ||
msgid "" | ||
msgstr "" | ||
"Project-Id-Version: Odoo Server 14.0\n" | ||
"Report-Msgid-Bugs-To: \n" | ||
"Last-Translator: Automatically generated\n" | ||
"Language-Team: none\n" | ||
"Language: fr\n" | ||
"MIME-Version: 1.0\n" | ||
"Content-Type: text/plain; charset=UTF-8\n" | ||
"Content-Transfer-Encoding: \n" | ||
"Plural-Forms: nplurals=2; plural=n > 1;\n" | ||
|
||
#. module: product_main_supplierinfo | ||
#: model:ir.model.fields,field_description:product_main_supplierinfo.field_product_product__display_name | ||
msgid "Display Name" | ||
msgstr "" | ||
|
||
#. module: product_main_supplierinfo | ||
#: model:ir.model.fields,field_description:product_main_supplierinfo.field_product_product__id | ||
msgid "ID" | ||
msgstr "" | ||
|
||
#. module: product_main_supplierinfo | ||
#: model:ir.model.fields,field_description:product_main_supplierinfo.field_product_product____last_update | ||
msgid "Last Modified on" | ||
msgstr "" | ||
|
||
#. module: product_main_supplierinfo | ||
#: model:ir.model.fields,field_description:product_main_supplierinfo.field_product_product__main_seller_id | ||
msgid "Main Vendor" | ||
msgstr "" | ||
|
||
#. module: product_main_supplierinfo | ||
#: model:ir.model,name:product_main_supplierinfo.model_product_product | ||
msgid "Product" | ||
msgstr "" |
39 changes: 39 additions & 0 deletions
39
product_main_supplierinfo/i18n/product_main_supplierinfo.pot
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
# Translation of Odoo Server. | ||
# This file contains the translation of the following modules: | ||
# * product_main_supplierinfo | ||
# | ||
msgid "" | ||
msgstr "" | ||
"Project-Id-Version: Odoo Server 14.0\n" | ||
"Report-Msgid-Bugs-To: \n" | ||
"Last-Translator: \n" | ||
"Language-Team: \n" | ||
"MIME-Version: 1.0\n" | ||
"Content-Type: text/plain; charset=UTF-8\n" | ||
"Content-Transfer-Encoding: \n" | ||
"Plural-Forms: \n" | ||
|
||
#. module: product_main_supplierinfo | ||
#: model:ir.model.fields,field_description:product_main_supplierinfo.field_product_product__display_name | ||
msgid "Display Name" | ||
msgstr "" | ||
|
||
#. module: product_main_supplierinfo | ||
#: model:ir.model.fields,field_description:product_main_supplierinfo.field_product_product__id | ||
msgid "ID" | ||
msgstr "" | ||
|
||
#. module: product_main_supplierinfo | ||
#: model:ir.model.fields,field_description:product_main_supplierinfo.field_product_product____last_update | ||
msgid "Last Modified on" | ||
msgstr "" | ||
|
||
#. module: product_main_supplierinfo | ||
#: model:ir.model.fields,field_description:product_main_supplierinfo.field_product_product__main_seller_id | ||
msgid "Main Vendor" | ||
msgstr "" | ||
|
||
#. module: product_main_supplierinfo | ||
#: model:ir.model,name:product_main_supplierinfo.model_product_product | ||
msgid "Product" | ||
msgstr "" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
from . import product_product |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
# Copyright 2021 Camptocamp SA | ||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) | ||
|
||
from odoo import api, fields, models | ||
|
||
|
||
class ProductProduct(models.Model): | ||
_inherit = "product.product" | ||
|
||
main_seller_id = fields.Many2one( | ||
comodel_name="product.supplierinfo", | ||
string="Main Vendor", | ||
compute="_compute_main_seller_id", | ||
) | ||
|
||
@api.depends( | ||
"seller_ids.partner_id.active", | ||
"seller_ids.sequence", | ||
"seller_ids.min_qty", | ||
"seller_ids.price", | ||
"seller_ids.company_id", | ||
"seller_ids.product_id", | ||
"seller_ids.date_start", | ||
"seller_ids.date_end", | ||
) | ||
@api.depends_context("company") | ||
def _compute_main_seller_id(self): | ||
for product in self: | ||
sellers = product._get_sellers() | ||
product.main_seller_id = fields.first(sellers) | ||
|
||
def _get_sellers(self): | ||
"""Returns all available sellers of a product based on some constraints. | ||
|
||
They are ordered and filtered like it is done in the standard 'product' addon. | ||
""" | ||
self.ensure_one() | ||
all_sellers = self._prepare_sellers(False).filtered( | ||
lambda s: not s.company_id or s.company_id.id == self.env.company.id | ||
) | ||
today = fields.Date.context_today(self) | ||
sellers = all_sellers.filtered( | ||
lambda s: ( | ||
(s.product_id == self or not s.product_id) | ||
and ( | ||
(s.date_start <= today if s.date_start else True) | ||
and (s.date_end >= today if s.date_end else True) | ||
) | ||
) | ||
) | ||
if not sellers: | ||
sellers = all_sellers.filtered(lambda s: (s.product_id == self)) | ||
if not sellers: | ||
sellers = all_sellers.filtered(lambda s: not s.product_id) | ||
return sellers.sorted("price") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
[build-system] | ||
requires = ["whool"] | ||
build-backend = "whool.buildapi" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
- [Camptocamp](https://www.camptocamp.com) | ||
- Sébastien Alix \<<[email protected]>\> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
This module shows the main vendor of a product. |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@adriresu @sebalix My question arrives late but why not using standard method
_get_filtered_sellers()
or_select_seller()
to avoid code duplication ?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good question, had to re-check the original v14 PR to see if I mentioned something there, but nothing!
The only difference that remembers me a thing is that
_select_seller()
is sorting the sellers based onprice
before returning one (which is OK when encoding a PO). Here the price is not a criteria to become the "main vendor" of a product, but sequence and dates matter.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just saw that starting from Odoo v17,
_select_seller
method accepts a newordered_by
parameter, which could be used to force the use ofsequence
, if that works we could drop this method 🤔There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's not that neither, we are sorting on the price at the end of this method too... I don't remember then why I duplicated this code, for sure there is a reason.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Find out, so we could not use
_select_seller
in v14 because of this filter:But starting from v15, which introduced the submethod
_get_filtered_sellers
you were talking about, it should definitely work.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Trying this here: #1812
One test is failing, to check.