Skip to content

Commit 14cc0b5

Browse files
committed
[MIG] product_pricelist_alternative: Migration to 18.0
1 parent 5dbaea0 commit 14cc0b5

7 files changed

+16
-25
lines changed

product_pricelist_alternative/__manifest__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
{
55
"name": "Product Pricelist Alternative",
6-
"version": "16.0.1.2.0",
6+
"version": "18.0.1.0.0",
77
"development_status": "Beta",
88
"category": "Product",
99
"summary": "Calculate product price based on alternative pricelists",

product_pricelist_alternative/models/product_pricelist.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2024 Camptocamp (<https://www.camptocamp.com>).
22
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
33

4-
from odoo import _, api, fields, models
4+
from odoo import api, fields, models
55
from odoo.exceptions import ValidationError
66

77

@@ -45,9 +45,9 @@ def action_view_is_alternative_to_pricelist(self):
4545
self.ensure_one()
4646
action = {
4747
"type": "ir.actions.act_window",
48-
"name": _("Is Alternative to Pricelist"),
48+
"name": self.env._("Is Alternative to Pricelist"),
4949
"res_model": "product.pricelist",
50-
"view_mode": "tree,form",
50+
"view_mode": "list,form",
5151
"domain": [("id", "in", self.is_alternative_to_pricelist_ids.ids)],
5252
"context": dict(self.env.context, create=False),
5353
}
@@ -91,7 +91,7 @@ def _check_pricelist_alternative_items_based_on_other_pricelist(self):
9191
and item.base == "pricelist"
9292
):
9393
raise ValidationError(
94-
_(
94+
self.env._(
9595
"Formulas based on another pricelist are not allowed "
9696
"on alternative pricelists."
9797
)

product_pricelist_alternative/models/product_pricelist_item.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2024 Camptocamp (<https://www.camptocamp.com>).
22
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
33

4-
from odoo import _, api, fields, models
4+
from odoo import api, fields, models
55
from odoo.exceptions import ValidationError
66

77

@@ -27,7 +27,7 @@ def _check_pricelist_alternative_items_based_on_other_pricelist(self):
2727
and item.pricelist_id.is_alternative_to_pricelist_count
2828
):
2929
raise ValidationError(
30-
_(
30+
self.env._(
3131
"It is not possible to encode this price rule. "
3232
"Formulas based on another pricelist "
3333
"are not allowed on alternative pricelists. "

product_pricelist_alternative/tests/common.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,16 @@
22
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
33

44
from odoo.fields import Command
5-
from odoo.tests import common, tagged
5+
from odoo.tests import tagged
66

7-
from odoo.addons.base.tests.common import DISABLED_MAIL_CONTEXT
7+
from odoo.addons.base.tests.common import BaseCommon
88

99

1010
@tagged("post_install", "-at_install")
11-
class CommonProductPricelistAlternative(common.TransactionCase):
11+
class CommonProductPricelistAlternative(BaseCommon):
1212
@classmethod
1313
def setUpClass(cls):
1414
super().setUpClass()
15-
cls.env = cls.env["base"].with_context(**DISABLED_MAIL_CONTEXT).env
1615
cls.datacard = cls.env["product.product"].create(
1716
{"name": "Data card", "list_price": 100}
1817
)

product_pricelist_alternative/tests/test_pricelist_alternative.py

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
# Copyright 2024 Camptocamp (<https://www.camptocamp.com>).
22
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
33
from odoo.exceptions import ValidationError
4-
from odoo.tests import common, tagged
4+
from odoo.tests import tagged
55

66
from .common import CommonProductPricelistAlternative
77

88

99
@tagged("post_install", "-at_install")
10-
class TestPricelistAlternative(
11-
CommonProductPricelistAlternative, common.TransactionCase
12-
):
10+
class TestPricelistAlternative(CommonProductPricelistAlternative):
1311
def test_is_alternative_to_pricelist_count(self):
1412
"""Test that the is_alternative_to_pricelist_count is correctly computed"""
1513

@@ -22,7 +20,7 @@ def test_is_alternative_to_pricelist_count(self):
2220

2321
def test_action_view_is_alternative_to_pricelist(self):
2422
action = self.alternative_pricelist_01.action_view_is_alternative_to_pricelist()
25-
self.assertEqual(action["view_mode"], "tree,form")
23+
self.assertEqual(action["view_mode"], "list,form")
2624
self.assertEqual(
2725
action["domain"][0][2],
2826
self.alternative_pricelist_01.is_alternative_to_pricelist_ids.ids,

product_pricelist_alternative/views/product_pricelist_item_view.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</record>
1313

1414
<record id="product_pricelist_item_view_tree" model="ir.ui.view">
15-
<field name="name">product.pricelist.item.tree</field>
15+
<field name="name">product.pricelist.item.list</field>
1616
<field name="model">product.pricelist.item</field>
1717
<field name="inherit_id" ref="product.product_pricelist_item_tree_view" />
1818
<field name="arch" type="xml">
@@ -23,7 +23,7 @@
2323
</record>
2424

2525
<record id="product_pricelist_item_tree_view_from_product" model="ir.ui.view">
26-
<field name="name">product.pricelist.item.tree</field>
26+
<field name="name">product.pricelist.item.list</field>
2727
<field name="model">product.pricelist.item</field>
2828
<field
2929
name="inherit_id"

product_pricelist_alternative/views/product_pricelist_view.xml

+1-7
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,7 @@
3434
</group>
3535
</group>
3636
<xpath
37-
expr="//page[@name='pricelist_rules']/field[@name='item_ids']/tree/field[@name='product_id']"
38-
position="after"
39-
>
40-
<field name="alternative_pricelist_policy" />
41-
</xpath>
42-
<xpath
43-
expr="//page[@name='pricelist_rules']/field[@name='item_ids']/tree[@groups='product.group_sale_pricelist']/field[@name='name']"
37+
expr="//page[@name='pricelist_rules']/field[@name='item_ids']/list/field[@name='product_tmpl_id']"
4438
position="after"
4539
>
4640
<field name="alternative_pricelist_policy" />

0 commit comments

Comments
 (0)