From 5f8688fd52a18614f7c8e09694c3cabe42561430 Mon Sep 17 00:00:00 2001 From: Carolina Fernandez Date: Tue, 16 Jan 2024 15:25:34 -0300 Subject: [PATCH] [MIG] sale_product_variant_attribute_tax: Migration to 16.0 --- sale_product_variant_attribute_tax/README.rst | 13 +++++----- .../__manifest__.py | 5 ++-- .../models/sale_order.py | 2 +- .../readme/CONTRIBUTORS.rst | 1 + .../static/description/index.html | 10 ++++---- ...test_sale_product_variant_attribute_tax.py | 24 +++++++++++++++++-- 6 files changed, 39 insertions(+), 16 deletions(-) diff --git a/sale_product_variant_attribute_tax/README.rst b/sale_product_variant_attribute_tax/README.rst index 5463020d2..6bd4f6b29 100644 --- a/sale_product_variant_attribute_tax/README.rst +++ b/sale_product_variant_attribute_tax/README.rst @@ -7,7 +7,7 @@ Put attribute taxes on sales orders !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:5214fb55fb7de489a8b0134f2e16529d82c23708acd4ece401ad6f51d0991404 + !! source digest: sha256:9352d88ee2b52de80b7e744156585858898fb96f97bfdfedf9bb2819a9d573ed !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png @@ -17,13 +17,13 @@ Put attribute taxes on sales orders :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--variant-lightgray.png?logo=github - :target: https://github.com/OCA/product-variant/tree/13.0/sale_product_variant_attribute_tax + :target: https://github.com/OCA/product-variant/tree/16.0/sale_product_variant_attribute_tax :alt: OCA/product-variant .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/product-variant-13-0/product-variant-13-0-sale_product_variant_attribute_tax + :target: https://translation.odoo-community.org/projects/product-variant-16-0/product-variant-16-0-sale_product_variant_attribute_tax :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-variant&target_branch=13.0 + :target: https://runboat.odoo-community.org/builds?repo=OCA/product-variant&target_branch=16.0 :alt: Try me on Runboat |badge1| |badge2| |badge3| |badge4| |badge5| @@ -55,7 +55,7 @@ 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 -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -75,6 +75,7 @@ Contributors * Vicent Cubells * Pedro M. Baeza * Ernesto Tejeda + * Carolina Fernandez Maintainers ~~~~~~~~~~~ @@ -89,6 +90,6 @@ 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. -This module is part of the `OCA/product-variant `_ project on GitHub. +This module is part of the `OCA/product-variant `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/sale_product_variant_attribute_tax/__manifest__.py b/sale_product_variant_attribute_tax/__manifest__.py index ab17e98a5..4132a9a2b 100644 --- a/sale_product_variant_attribute_tax/__manifest__.py +++ b/sale_product_variant_attribute_tax/__manifest__.py @@ -1,14 +1,15 @@ # Copyright 2016-2017 Tecnativa - Pedro M. Baeza +# Copyright 2024 Tecnativa - Carolina Fernandez # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). { "name": "Put attribute taxes on sales orders", "summary": "Bring the taxes associated to product values", - "version": "13.0.1.0.0", + "version": "16.0.1.0.0", "development_status": "Production/Stable", "category": "Sales/Sales", "website": "https://github.com/OCA/product-variant", "author": "Tecnativa, Odoo Community Association (OCA)", "license": "AGPL-3", - "depends": ["product_variant_attribute_tax", "sale_variant_configurator"], + "depends": ["sale_variant_configurator", "product_variant_attribute_tax"], "installable": True, } diff --git a/sale_product_variant_attribute_tax/models/sale_order.py b/sale_product_variant_attribute_tax/models/sale_order.py index ace27bf21..89d008865 100644 --- a/sale_product_variant_attribute_tax/models/sale_order.py +++ b/sale_product_variant_attribute_tax/models/sale_order.py @@ -10,7 +10,7 @@ class SaleOrderLine(models.Model): def _onchange_product_attribute_ids_configurator(self): res = super()._onchange_product_attribute_ids_configurator() # if there's a product set, taxes on that product have priority - if self.product_id or not self.product_tmpl_id: + if not self.product_tmpl_id: return res values = self.mapped("product_attribute_ids.value_id") taxes = values.mapped("tax_ids").filtered( diff --git a/sale_product_variant_attribute_tax/readme/CONTRIBUTORS.rst b/sale_product_variant_attribute_tax/readme/CONTRIBUTORS.rst index 98667c5d5..dfc917a0e 100644 --- a/sale_product_variant_attribute_tax/readme/CONTRIBUTORS.rst +++ b/sale_product_variant_attribute_tax/readme/CONTRIBUTORS.rst @@ -3,3 +3,4 @@ * Vicent Cubells * Pedro M. Baeza * Ernesto Tejeda + * Carolina Fernandez diff --git a/sale_product_variant_attribute_tax/static/description/index.html b/sale_product_variant_attribute_tax/static/description/index.html index f08a65e46..b71f85069 100644 --- a/sale_product_variant_attribute_tax/static/description/index.html +++ b/sale_product_variant_attribute_tax/static/description/index.html @@ -1,4 +1,3 @@ - @@ -367,9 +366,9 @@

Put attribute taxes on sales orders

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:5214fb55fb7de489a8b0134f2e16529d82c23708acd4ece401ad6f51d0991404 +!! source digest: sha256:9352d88ee2b52de80b7e744156585858898fb96f97bfdfedf9bb2819a9d573ed !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Production/Stable License: AGPL-3 OCA/product-variant Translate me on Weblate Try me on Runboat

+

Production/Stable License: AGPL-3 OCA/product-variant Translate me on Weblate Try me on Runboat

This module uses product_variant_attribute_tax for adding the taxes set on product attribute values when adding a product in sales orders that contains this attribute value.

@@ -403,7 +402,7 @@

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 -feedback.

+feedback.

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

@@ -421,6 +420,7 @@

Contributors

  • Vicent Cubells
  • Pedro M. Baeza
  • Ernesto Tejeda
    • +
  • Carolina Fernandez
    • @@ -432,7 +432,7 @@

    Maintainers

    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.

    -

    This module is part of the OCA/product-variant project on GitHub.

    +

    This module is part of the OCA/product-variant project on GitHub.

    You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

    diff --git a/sale_product_variant_attribute_tax/tests/test_sale_product_variant_attribute_tax.py b/sale_product_variant_attribute_tax/tests/test_sale_product_variant_attribute_tax.py index a7a2d277c..084bc7e7e 100644 --- a/sale_product_variant_attribute_tax/tests/test_sale_product_variant_attribute_tax.py +++ b/sale_product_variant_attribute_tax/tests/test_sale_product_variant_attribute_tax.py @@ -1,9 +1,10 @@ # Copyright 2016-2017 Tecnativa - Pedro M. Baeza +# Copyright 2024 Tecnativa - Carolina Fernandez # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from odoo.tests import Form, common -class TestSaleProductVariantAttributeTax(common.SavepointCase): +class TestSaleProductVariantAttributeTax(common.TransactionCase): @classmethod def setUpClass(cls): super().setUpClass() @@ -57,10 +58,29 @@ def setUpClass(cls): ], } ) + cls.product = cls.env["product.product"].create( + { + "name": cls.product_template.name, + "list_price": 100, + "product_tmpl_id": cls.product_template.id, + "product_attribute_ids": [ + ( + 0, + 0, + { + "product_tmpl_id": cls.product_template.id, + "attribute_id": cls.attribute.id, + "value_id": cls.attribute_value.id, + "owner_model": "sale.order.line", + }, + ) + ], + } + ) order_form = Form(cls.env["sale.order"]) order_form.partner_id = cls.partner with order_form.order_line.new() as order_line_form: - order_line_form.product_tmpl_id = cls.product_template + order_line_form.product_id = cls.product cls.order = order_form.save() cls.order_line = cls.order.order_line