Merge pull request #368 from OCA/16.0

Syncing from upstream OCA/product-variant (16.0)
brain-tec · Feb 25, 2025 · 02ad945 · 02ad945
2 parents 9610258 + e7dced3
commit 02ad945
Show file tree

Hide file tree

Showing 48 changed files with 1,284 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -27,10 +27,10 @@ addon | version | maintainers | summary
 [product_variant_name](product_variant_name/) | 16.0.1.0.0 |  | Product Variant Name
 [product_variant_sale_price](product_variant_sale_price/) | 16.0.1.0.2 |  | Allows to write fixed prices in product variants
 [product_variant_specific_description](product_variant_specific_description/) | 16.0.1.0.1 |  | Product Variant Specific Description
-[purchase_variant_configurator](purchase_variant_configurator/) | 16.0.2.0.0 |  | Product variants in purchase management
+[purchase_variant_configurator](purchase_variant_configurator/) | 16.0.2.0.1 |  | Product variants in purchase management
 [sale_order_line_variant_description](sale_order_line_variant_description/) | 16.0.1.1.0 |  | Sale order line variant description
 [sale_product_variant_attribute_tax](sale_product_variant_attribute_tax/) | 16.0.1.0.0 |  | Bring the taxes associated to product values
-[sale_variant_configurator](sale_variant_configurator/) | 16.0.1.0.0 |  | Product variants in sale management
+[sale_variant_configurator](sale_variant_configurator/) | 16.0.1.0.1 |  | Product variants in sale management
 
 [//]: # (end addons)
 

diff --git a/purchase_variant_configurator/README.rst b/purchase_variant_configurator/README.rst
@@ -7,7 +7,7 @@ Purchase - Product variants
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:5a6a8e2623d817b25248609a00674655445eb02261a631e135aee18290aa444a
+   !! source digest: sha256:81a814403e6a8d63ddc193d3ced1a52b67523dd57b293a0bf361ea98b4132b79
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/purchase_variant_configurator/__manifest__.py b/purchase_variant_configurator/__manifest__.py
@@ -6,7 +6,7 @@
 {
     "name": "Purchase - Product variants",
     "summary": "Product variants in purchase management",
-    "version": "16.0.2.0.0",
+    "version": "16.0.2.0.1",
     "license": "AGPL-3",
     "depends": ["purchase", "product_variant_configurator"],
     "author": "AvanzOSC, "

diff --git a/purchase_variant_configurator/i18n/es.po b/purchase_variant_configurator/i18n/es.po
@@ -94,6 +94,11 @@ msgstr ""
 msgid "Product Template"
 msgstr ""
 
+#. module: purchase_variant_configurator
+#: model:ir.model.fields,field_description:purchase_variant_configurator.field_purchase_order_line__product_uom_category_id
+msgid "Product Uom Category"
+msgstr ""
+
 #. module: purchase_variant_configurator
 #: model:ir.model,name:purchase_variant_configurator.model_product_product
 msgid "Product Variant"

diff --git a/purchase_variant_configurator/i18n/es_AR.po b/purchase_variant_configurator/i18n/es_AR.po
@@ -92,6 +92,11 @@ msgstr ""
 msgid "Product Template"
 msgstr ""
 
+#. module: purchase_variant_configurator
+#: model:ir.model.fields,field_description:purchase_variant_configurator.field_purchase_order_line__product_uom_category_id
+msgid "Product Uom Category"
+msgstr ""
+
 #. module: purchase_variant_configurator
 #: model:ir.model,name:purchase_variant_configurator.model_product_product
 msgid "Product Variant"

diff --git a/purchase_variant_configurator/i18n/fr.po b/purchase_variant_configurator/i18n/fr.po
@@ -94,6 +94,11 @@ msgstr ""
 msgid "Product Template"
 msgstr ""
 
+#. module: purchase_variant_configurator
+#: model:ir.model.fields,field_description:purchase_variant_configurator.field_purchase_order_line__product_uom_category_id
+msgid "Product Uom Category"
+msgstr ""
+
 #. module: purchase_variant_configurator
 #: model:ir.model,name:purchase_variant_configurator.model_product_product
 msgid "Product Variant"

diff --git a/purchase_variant_configurator/i18n/hr.po b/purchase_variant_configurator/i18n/hr.po
@@ -16,8 +16,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: purchase_variant_configurator
 #: model:ir.model.fields,field_description:purchase_variant_configurator.field_purchase_order_line__can_create_product
@@ -95,6 +95,11 @@ msgstr ""
 msgid "Product Template"
 msgstr ""
 
+#. module: purchase_variant_configurator
+#: model:ir.model.fields,field_description:purchase_variant_configurator.field_purchase_order_line__product_uom_category_id
+msgid "Product Uom Category"
+msgstr ""
+
 #. module: purchase_variant_configurator
 #: model:ir.model,name:purchase_variant_configurator.model_product_product
 msgid "Product Variant"

diff --git a/purchase_variant_configurator/i18n/it.po b/purchase_variant_configurator/i18n/it.po
@@ -98,6 +98,11 @@ msgstr "È richiesto l'ID prodotto"
 msgid "Product Template"
 msgstr "Modello prodotto"
 
+#. module: purchase_variant_configurator
+#: model:ir.model.fields,field_description:purchase_variant_configurator.field_purchase_order_line__product_uom_category_id
+msgid "Product Uom Category"
+msgstr ""
+
 #. module: purchase_variant_configurator
 #: model:ir.model,name:purchase_variant_configurator.model_product_product
 msgid "Product Variant"

diff --git a/purchase_variant_configurator/i18n/pt_BR.po b/purchase_variant_configurator/i18n/pt_BR.po
@@ -12,8 +12,8 @@ msgstr ""
 "PO-Revision-Date: 2024-07-05 19:47+0000\n"
 "Last-Translator: rodrigosottomaiormacedo "
 "<[email protected]>\n"
-"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/"
-"23907/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/"
+"teams/23907/pt_BR/)\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -100,6 +100,11 @@ msgstr "O ID do produto é obrigatório"
 msgid "Product Template"
 msgstr "Modelo Produto"
 
+#. module: purchase_variant_configurator
+#: model:ir.model.fields,field_description:purchase_variant_configurator.field_purchase_order_line__product_uom_category_id
+msgid "Product Uom Category"
+msgstr ""
+
 #. module: purchase_variant_configurator
 #: model:ir.model,name:purchase_variant_configurator.model_product_product
 msgid "Product Variant"

diff --git a/purchase_variant_configurator/i18n/purchase_variant_configurator.pot b/purchase_variant_configurator/i18n/purchase_variant_configurator.pot
@@ -89,6 +89,11 @@ msgstr ""
 msgid "Product Template"
 msgstr ""
 
+#. module: purchase_variant_configurator
+#: model:ir.model.fields,field_description:purchase_variant_configurator.field_purchase_order_line__product_uom_category_id
+msgid "Product Uom Category"
+msgstr ""
+
 #. module: purchase_variant_configurator
 #: model:ir.model,name:purchase_variant_configurator.model_product_product
 msgid "Product Variant"

diff --git a/purchase_variant_configurator/i18n/ro.po b/purchase_variant_configurator/i18n/ro.po
@@ -95,6 +95,11 @@ msgstr ""
 msgid "Product Template"
 msgstr ""
 
+#. module: purchase_variant_configurator
+#: model:ir.model.fields,field_description:purchase_variant_configurator.field_purchase_order_line__product_uom_category_id
+msgid "Product Uom Category"
+msgstr ""
+
 #. module: purchase_variant_configurator
 #: model:ir.model,name:purchase_variant_configurator.model_product_product
 msgid "Product Variant"

diff --git a/purchase_variant_configurator/i18n/sl.po b/purchase_variant_configurator/i18n/sl.po
@@ -16,8 +16,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
+"n%100==4 ? 2 : 3);\n"
 
 #. module: purchase_variant_configurator
 #: model:ir.model.fields,field_description:purchase_variant_configurator.field_purchase_order_line__can_create_product
@@ -95,6 +95,11 @@ msgstr ""
 msgid "Product Template"
 msgstr ""
 
+#. module: purchase_variant_configurator
+#: model:ir.model.fields,field_description:purchase_variant_configurator.field_purchase_order_line__product_uom_category_id
+msgid "Product Uom Category"
+msgstr ""
+
 #. module: purchase_variant_configurator
 #: model:ir.model,name:purchase_variant_configurator.model_product_product
 msgid "Product Variant"

diff --git a/purchase_variant_configurator/models/purchase_order.py b/purchase_variant_configurator/models/purchase_order.py
@@ -40,6 +40,13 @@ class PurchaseOrderLine(models.Model):
 
     product_id = fields.Many2one(required=False)
     product_id_is_required = fields.Boolean(compute="_compute_product_id_is_required")
+    product_uom_category_id = fields.Many2one(
+        comodel_name="uom.category",
+        compute="_compute_product_uom_category_id",
+        # We need to define related=False so that the field is only compute
+        # and not related.
+        related=False,
+    )
 
     _sql_constraints = [
         (
@@ -63,6 +70,19 @@ def _compute_product_id_is_required(self):
         for item in self:
             item.product_id_is_required = not item.company_id.po_confirm_create_variant
 
+    @api.depends("product_tmpl_id", "product_id")
+    def _compute_product_uom_category_id(self):
+        """This compute is intended to do something similar to the related of the
+        purchase module product_id.uom_id.category_id but adding the casuistry of the
+        product_tmpl_id field.
+        """
+        for line in self:
+            product = line.product_id or line.product_tmpl_id
+            if product:
+                line.product_uom_category_id = product.uom_id.category_id
+            else:
+                line.product_uom_category_id = line.product_uom_category_id
+
     @api.onchange("product_tmpl_id")
     def _onchange_product_tmpl_id_configurator(self):
         """Make use of PurchaseOrderLine onchange_product_id method with

diff --git a/purchase_variant_configurator/static/description/index.html b/purchase_variant_configurator/static/description/index.html
@@ -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.
@@ -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 }
@@ -300,7 +301,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -366,7 +367,7 @@ <h1 class="title">Purchase - Product variants</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:5a6a8e2623d817b25248609a00674655445eb02261a631e135aee18290aa444a
+!! source digest: sha256:81a814403e6a8d63ddc193d3ced1a52b67523dd57b293a0bf361ea98b4132b79
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/product-variant/tree/16.0/purchase_variant_configurator"><img alt="OCA/product-variant" src="https://img.shields.io/badge/github-OCA%2Fproduct--variant-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/product-variant-16-0/product-variant-16-0-purchase_variant_configurator"><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/product-variant&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module allows you to create the product variant when a purchase order is
@@ -452,7 +453,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>

diff --git a/sale_variant_configurator/__manifest__.py b/sale_variant_configurator/__manifest__.py
@@ -7,7 +7,7 @@
 {
     "name": "Sale - Product variants",
     "summary": "Product variants in sale management",
-    "version": "16.0.1.0.0",
+    "version": "16.0.1.0.1",
     "development_status": "Production/Stable",
     "license": "AGPL-3",
     "depends": ["sale", "product_variant_configurator"],

diff --git a/sale_variant_configurator/i18n/ca.po b/sale_variant_configurator/i18n/ca.po
@@ -18,6 +18,16 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: sale_variant_configurator
+#: model:ir.model.fields,field_description:sale_variant_configurator.field_sale_order_line__can_create_product
+msgid "Can Create Product"
+msgstr ""
+
+#. module: sale_variant_configurator
+#: model:ir.model.fields,field_description:sale_variant_configurator.field_sale_order_line__create_product_variant
+msgid "Create product now!"
+msgstr ""
+
 #. module: sale_variant_configurator
 #: model:ir.model.constraint,message:sale_variant_configurator.constraint_sale_order_line_non_accountable_null_fields
 msgid "Forbidden values on non-accountable sale order line"
@@ -28,11 +38,28 @@ msgstr ""
 msgid "Missing required fields on accountable sale order line."
 msgstr ""
 
+#. module: sale_variant_configurator
+#: model:ir.model.fields,field_description:sale_variant_configurator.field_sale_order_line__price_extra
+msgid "Price Extra"
+msgstr ""
+
+#. module: sale_variant_configurator
+#: model:ir.model.fields,help:sale_variant_configurator.field_sale_order_line__price_extra
+msgid ""
+"Price Extra: Extra price for the variant with the currently selected "
+"attributes values on sale price. eg. 200 price extra, 1000 + 200 = 1200."
+msgstr ""
+
 #. module: sale_variant_configurator
 #: model:ir.model.fields,field_description:sale_variant_configurator.field_sale_order_line__product_id
 msgid "Product"
 msgstr ""
 
+#. module: sale_variant_configurator
+#: model:ir.model.fields,field_description:sale_variant_configurator.field_sale_order_line__product_id_configurator_domain
+msgid "Product Id Configurator Domain"
+msgstr ""
+
 #. module: sale_variant_configurator
 #: model_terms:ir.ui.view,arch_db:sale_variant_configurator.view_order_form
 #: model_terms:ir.ui.view,arch_db:sale_variant_configurator.view_order_line_tree
@@ -45,6 +72,16 @@ msgstr "Plantilla del producte"
 msgid "Product Template (no related)"
 msgstr ""
 
+#. module: sale_variant_configurator
+#: model:ir.model.fields,field_description:sale_variant_configurator.field_sale_order_line__product_uom_category_id
+msgid "Product Uom Category"
+msgstr ""
+
+#. module: sale_variant_configurator
+#: model:ir.model.fields,field_description:sale_variant_configurator.field_sale_order_line__product_attribute_ids
+msgid "Product attributes"
+msgstr ""
+
 #. module: sale_variant_configurator
 #: model:ir.model,name:sale_variant_configurator.model_sale_order
 msgid "Sales Order"

diff --git a/sale_variant_configurator/i18n/de.po b/sale_variant_configurator/i18n/de.po
@@ -18,6 +18,16 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: sale_variant_configurator
+#: model:ir.model.fields,field_description:sale_variant_configurator.field_sale_order_line__can_create_product
+msgid "Can Create Product"
+msgstr ""
+
+#. module: sale_variant_configurator
+#: model:ir.model.fields,field_description:sale_variant_configurator.field_sale_order_line__create_product_variant
+msgid "Create product now!"
+msgstr ""
+
 #. module: sale_variant_configurator
 #: model:ir.model.constraint,message:sale_variant_configurator.constraint_sale_order_line_non_accountable_null_fields
 msgid "Forbidden values on non-accountable sale order line"
@@ -28,11 +38,28 @@ msgstr ""
 msgid "Missing required fields on accountable sale order line."
 msgstr ""
 
+#. module: sale_variant_configurator
+#: model:ir.model.fields,field_description:sale_variant_configurator.field_sale_order_line__price_extra
+msgid "Price Extra"
+msgstr ""
+
+#. module: sale_variant_configurator
+#: model:ir.model.fields,help:sale_variant_configurator.field_sale_order_line__price_extra
+msgid ""
+"Price Extra: Extra price for the variant with the currently selected "
+"attributes values on sale price. eg. 200 price extra, 1000 + 200 = 1200."
+msgstr ""
+
 #. module: sale_variant_configurator
 #: model:ir.model.fields,field_description:sale_variant_configurator.field_sale_order_line__product_id
 msgid "Product"
 msgstr ""
 
+#. module: sale_variant_configurator
+#: model:ir.model.fields,field_description:sale_variant_configurator.field_sale_order_line__product_id_configurator_domain
+msgid "Product Id Configurator Domain"
+msgstr ""
+
 #. module: sale_variant_configurator
 #: model_terms:ir.ui.view,arch_db:sale_variant_configurator.view_order_form
 #: model_terms:ir.ui.view,arch_db:sale_variant_configurator.view_order_line_tree
@@ -45,6 +72,16 @@ msgstr "Produktvorlage"
 msgid "Product Template (no related)"
 msgstr ""
 
+#. module: sale_variant_configurator
+#: model:ir.model.fields,field_description:sale_variant_configurator.field_sale_order_line__product_uom_category_id
+msgid "Product Uom Category"
+msgstr ""
+
+#. module: sale_variant_configurator
+#: model:ir.model.fields,field_description:sale_variant_configurator.field_sale_order_line__product_attribute_ids
+msgid "Product attributes"
+msgstr ""
+
 #. module: sale_variant_configurator
 #: model:ir.model,name:sale_variant_configurator.model_sale_order
 msgid "Sales Order"