diff --git a/sale_order_line_variant_description/README.rst b/sale_order_line_variant_description/README.rst index 362ad88d4..db1784e32 100644 --- a/sale_order_line_variant_description/README.rst +++ b/sale_order_line_variant_description/README.rst @@ -60,6 +60,7 @@ Contributors - Alex Comba - Simone Vanin - Dhara Solanki +- Nils Coenen Maintainers ----------- diff --git a/sale_order_line_variant_description/__manifest__.py b/sale_order_line_variant_description/__manifest__.py index f32f0f789..404c00bb4 100644 --- a/sale_order_line_variant_description/__manifest__.py +++ b/sale_order_line_variant_description/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Sale order line variant description", - "version": "16.0.1.1.0", + "version": "17.0.1.0.0", "category": "Sales Management", "author": "Agile Business Group, Odoo Community Association (OCA)", "website": "https://github.com/OCA/product-variant", diff --git a/sale_order_line_variant_description/models/sale_order_line.py b/sale_order_line_variant_description/models/sale_order_line.py index 13fd34c30..d7361ffe0 100644 --- a/sale_order_line_variant_description/models/sale_order_line.py +++ b/sale_order_line_variant_description/models/sale_order_line.py @@ -9,9 +9,11 @@ class SaleOrderLine(models.Model): @api.onchange("product_id") def _onchange_product_id_warning(self): - res = super(SaleOrderLine, self)._onchange_product_id_warning() + res = super()._onchange_product_id_warning() if self.product_id: product = self.product_id.with_context(lang=self.order_id.partner_id.lang) + self.name = product.get_product_multiline_description_sale() if product.variant_description_sale: - self.name = product.variant_description_sale + self.name += f"\n{product.variant_description_sale}" + return res diff --git a/sale_order_line_variant_description/readme/CONTRIBUTORS.md b/sale_order_line_variant_description/readme/CONTRIBUTORS.md index aea69db3b..da07228be 100644 --- a/sale_order_line_variant_description/readme/CONTRIBUTORS.md +++ b/sale_order_line_variant_description/readme/CONTRIBUTORS.md @@ -1,3 +1,4 @@ - Alex Comba \<\> - Simone Vanin \<\> - Dhara Solanki \<\> +- Nils Coenen \<\> diff --git a/sale_order_line_variant_description/static/description/index.html b/sale_order_line_variant_description/static/description/index.html index 0b13bc774..33c09ed6f 100644 --- a/sale_order_line_variant_description/static/description/index.html +++ b/sale_order_line_variant_description/static/description/index.html @@ -406,6 +406,7 @@

Contributors

  • Alex Comba <alex.comba@agilebg.com>
  • Simone Vanin <simone.vanin@agilebg.com>
  • Dhara Solanki <dhara.solanki@initos.com>
    • +
  • Nils Coenen <nils.coenen@nico-solutions.de>
    • diff --git a/sale_order_line_variant_description/tests/test_sale_order_line_variant_description.py b/sale_order_line_variant_description/tests/test_sale_order_line_variant_description.py index 547aabc54..d34a2a477 100644 --- a/sale_order_line_variant_description/tests/test_sale_order_line_variant_description.py +++ b/sale_order_line_variant_description/tests/test_sale_order_line_variant_description.py @@ -5,20 +5,27 @@ class TestSaleOrderLineVariantDescription(TransactionCase): - def setUp(self): - super(TestSaleOrderLineVariantDescription, self).setUp() - self.fiscal_position_model = self.env["account.fiscal.position"] - self.tax_model = self.env["account.tax"] - self.pricelist_model = self.env["product.pricelist"] - self.uom_uom_model = self.env["uom.uom"] - self.product_tmpl_model = self.env["product.template"] - self.product_model = self.env["product.product"] - self.so_model = self.env["sale.order"] - self.so_line_model = self.env["sale.order.line"] - self.partner = self.env.ref("base.res_partner_1") + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.fiscal_position_model = cls.env["account.fiscal.position"] + cls.tax_model = cls.env["account.tax"] + cls.pricelist_model = cls.env["product.pricelist"] + cls.uom_uom_model = cls.env["uom.uom"] + cls.product_tmpl_model = cls.env["product.template"] + cls.product_model = cls.env["product.product"] + cls.so_model = cls.env["sale.order"] + cls.so_line_model = cls.env["sale.order.line"] + cls.partner = cls.env.ref("base.res_partner_1") def test_product_id_change(self): - pricelist = self.pricelist_model.search([("name", "=", "Public Pricelist")])[0] + pricelist = self.pricelist_model.search([("name", "=", "Public Pricelist")]) + if not pricelist: + pricelist = self.pricelist_model.create( + {"name": "Public Pricelist", "currency_id": self.env.ref("base.USD").id} + ) + pricelist = pricelist[0] + uom = self.uom_uom_model.search([("name", "=", "Units")])[0] tax_include = self.tax_model.create( dict(name="Include tax", amount="0.21", price_include=True) @@ -55,4 +62,7 @@ def test_product_id_change(self): } ) so_line._onchange_product_id_warning() - self.assertEqual(product.variant_description_sale, so_line.name) + so_line_name_without_product_name = so_line.name.split("\n", 1)[-1] + self.assertEqual( + product.variant_description_sale, so_line_name_without_product_name + ) diff --git a/sale_order_line_variant_description/views/product_view.xml b/sale_order_line_variant_description/views/product_view.xml index f22ca5628..6200a2a95 100644 --- a/sale_order_line_variant_description/views/product_view.xml +++ b/sale_order_line_variant_description/views/product_view.xml @@ -2,29 +2,25 @@ - product.product.form product.product - {'invisible': [('product_variant_count', '>', 1)]} + product_variant_count > 1 - product.product.view.form.easy product.product @@ -37,6 +33,4 @@ - -