Skip to content
Permalink
Browse files

[FIX] point_of_sale: pick default pricelist in the right company

To reproduce:

- Create a second company with the same currency as the first,
- Assign the first pricelist with that currency (based on _order) to
  the second company
- Install the POS, or create a new pos.config while in the first
  company

The above results in:
raise ValidationError("The selected pricelists must belong to no
company or the company of the point of sale")

opw-2192658

closes #45151

X-original-commit: e90d30b
Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
  • Loading branch information
jorenvo committed Feb 7, 2020
1 parent 26a856d commit 16b679aa7d371c4757203956765a9dc3795199a5
@@ -49,7 +49,7 @@ def _default_invoice_journal(self):
return self.env['account.journal'].search([('type', '=', 'sale'), ('company_id', '=', self.env.user.company_id.id)], limit=1)

def _default_pricelist(self):
return self.env['product.pricelist'].search([('currency_id', '=', self.env.user.company_id.currency_id.id)], limit=1)
return self.env['product.pricelist'].search([('company_id', 'in', (False, self.env.user.company_id.id)), ('currency_id', '=', self.env.user.company_id.currency_id.id)], limit=1)

def _get_default_location(self):
return self.env['stock.warehouse'].search([('company_id', '=', self.env.user.company_id.id)], limit=1).lot_stock_id
@@ -5,3 +5,4 @@
from . import test_frontend
from . import test_point_of_sale_ui
from . import test_anglo_saxon
from . import test_point_of_sale
@@ -0,0 +1,63 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

from odoo.tests.common import TransactionCase


class TestPointOfSale(TransactionCase):
def setUp(self):
super(TestPointOfSale, self).setUp()

# ignore pre-existing pricelists for the purpose of this test
self.env["product.pricelist"].search([]).write({"active": False})

self.currency = self.env.ref("base.USD")
self.company1 = self.env["res.company"].create({
"name": "company 1",
"currency_id": self.currency.id
})
self.company2 = self.env["res.company"].create({
"name": "company 2",
"currency_id": self.currency.id
})
self.company2_pricelist = self.env["product.pricelist"].create({
"name": "company 2 pricelist",
"currency_id": self.currency.id,
"company_id": self.company2.id,
"sequence": 1, # force this pricelist to be first
})

self.env.user.company_id = self.company1

def test_default_pricelist_with_company(self):
""" Verify that the default pricelist belongs to the same company as the config """
company1_pricelist = self.env["product.pricelist"].create({
"name": "company 1 pricelist",
"currency_id": self.currency.id,
"company_id": self.company1.id,
"sequence": 2,
})

# make sure this doesn't pick the company2 pricelist
new_config = self.env["pos.config"].create({
"name": "usd config"
})

self.assertEqual(new_config.pricelist_id, company1_pricelist,
"POS config incorrectly has pricelist %s" % new_config.pricelist_id.display_name)

def test_default_pricelist_without_company(self):
""" Verify that a default pricelist without a company works """
universal_pricelist = self.env["product.pricelist"].create({
"name": "universal pricelist",
"currency_id": self.currency.id,
"sequence": 2,
})

# make sure this doesn't pick the company2 pricelist
new_config = self.env["pos.config"].create({
"name": "usd config"
})

self.assertEqual(new_config.pricelist_id, universal_pricelist,
"POS config incorrectly has pricelist %s" % new_config.pricelist_id.display_name)

0 comments on commit 16b679a

Please sign in to comment.
You can’t perform that action at this time.