From 341ad3f4dd575f7207d9bd16adac35276e86290f Mon Sep 17 00:00:00 2001 From: roen-odoo Date: Thu, 25 Nov 2021 13:27:35 +0000 Subject: [PATCH] [FIX] point_of_sale, pos_coupon, pos_hr, pos_restaurant : Check COA not used Check COA parameter in the open_session_cb was actually never used opw-2691615 closes odoo/odoo#80410 Related: odoo/enterprise#22522 Signed-off-by: Yannick Tivisse (yti) --- addons/point_of_sale/models/pos_config.py | 2 +- addons/point_of_sale/tests/common.py | 2 +- addons/point_of_sale/tests/test_anglo_saxon.py | 4 ++-- addons/point_of_sale/tests/test_frontend.py | 8 ++++---- addons/point_of_sale/tests/test_js.py | 2 +- .../point_of_sale/tests/test_point_of_sale_flow.py | 14 +++++++------- addons/pos_coupon/models/pos_config.py | 2 +- addons/pos_coupon/tests/test_frontend.py | 2 +- addons/pos_hr/tests/test_frontend.py | 2 +- addons/pos_restaurant/tests/test_frontend.py | 8 ++++---- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/addons/point_of_sale/models/pos_config.py b/addons/point_of_sale/models/pos_config.py index 9656b42be4b..1f284e95c5a 100644 --- a/addons/point_of_sale/models/pos_config.py +++ b/addons/point_of_sale/models/pos_config.py @@ -558,7 +558,7 @@ class PosConfig(models.Model): 'target': 'self', } - def open_session_cb(self, check_coa=True): + def open_session_cb(self): """ new session button create one if none exist diff --git a/addons/point_of_sale/tests/common.py b/addons/point_of_sale/tests/common.py index b52d789f555..f0d4e988a59 100644 --- a/addons/point_of_sale/tests/common.py +++ b/addons/point_of_sale/tests/common.py @@ -520,7 +520,7 @@ class TestPoSCommon(ValuationReconciliationTestCommon): * currency : currency of the current pos.session * pricelist : the default pricelist of the session """ - self.config.open_session_cb(check_coa=False) + self.config.open_session_cb() self.pos_session = self.config.current_session_id self.currency = self.pos_session.currency_id self.pricelist = self.pos_session.config_id.pricelist_id diff --git a/addons/point_of_sale/tests/test_anglo_saxon.py b/addons/point_of_sale/tests/test_anglo_saxon.py index 0c605b4bb25..9b66b37170c 100644 --- a/addons/point_of_sale/tests/test_anglo_saxon.py +++ b/addons/point_of_sale/tests/test_anglo_saxon.py @@ -65,7 +65,7 @@ class TestAngloSaxonFlow(TestAngloSaxonCommon): def test_create_account_move_line(self): # This test will check that the correct journal entries are created when a product in real time valuation # is sold in a company using anglo-saxon - self.pos_config.open_session_cb(check_coa=False) + self.pos_config.open_session_cb() current_session = self.pos_config.current_session_id self.cash_journal.loss_account_id = self.account current_session.set_cashbox_pos(0, None) @@ -148,7 +148,7 @@ class TestAngloSaxonFlow(TestAngloSaxonCommon): self.assertEqual(self.product.quantity_svl, 10) self.pos_config.module_account = True - self.pos_config.open_session_cb(check_coa=False) + self.pos_config.open_session_cb() pos_session = self.pos_config.current_session_id pos_session.set_cashbox_pos(0, None) diff --git a/addons/point_of_sale/tests/test_frontend.py b/addons/point_of_sale/tests/test_frontend.py index 577c88c68ab..4bccc38f55b 100644 --- a/addons/point_of_sale/tests/test_frontend.py +++ b/addons/point_of_sale/tests/test_frontend.py @@ -490,7 +490,7 @@ class TestUi(TestPointOfSaleHttpCommon): }) # open a session, the /pos/ui controller will redirect to it - self.main_pos_config.open_session_cb(check_coa=False) + self.main_pos_config.open_session_cb() # needed because tests are run before the module is marked as # installed. In js web will only load qweb coming from modules @@ -512,7 +512,7 @@ class TestUi(TestPointOfSaleHttpCommon): self.assertEqual(email_count, 1) def test_02_pos_with_invoiced(self): - self.main_pos_config.open_session_cb(check_coa=False) + self.main_pos_config.open_session_cb() self.start_tour("/pos/ui?config_id=%d" % self.main_pos_config.id, 'ChromeTour', login="accountman") n_invoiced = self.env['pos.order'].search_count([('state', '=', 'invoiced')]) n_paid = self.env['pos.order'].search_count([('state', '=', 'paid')]) @@ -521,9 +521,9 @@ class TestUi(TestPointOfSaleHttpCommon): def test_04_product_configurator(self): self.main_pos_config.write({ 'product_configurator': True }) - self.main_pos_config.open_session_cb(check_coa=False) + self.main_pos_config.open_session_cb() self.start_tour("/pos/ui?config_id=%d" % self.main_pos_config, 'ProductConfiguratorTour', login="accountman") def test_05_ticket_screen(self): - self.main_pos_config.open_session_cb(check_coa=False) + self.main_pos_config.open_session_cb() self.start_tour("/pos/ui?config_id=%d" % self.main_pos_config.id, 'TicketScreenTour', login="accountman") diff --git a/addons/point_of_sale/tests/test_js.py b/addons/point_of_sale/tests/test_js.py index 02c4746a4fc..ae851a740bc 100644 --- a/addons/point_of_sale/tests/test_js.py +++ b/addons/point_of_sale/tests/test_js.py @@ -13,7 +13,7 @@ class WebSuite(odoo.tests.HttpCase): def test_pos_js(self): # open a session, the /pos/ui controller will redirect to it - self.main_pos_config.open_session_cb(check_coa=False) + self.main_pos_config.open_session_cb() # point_of_sale desktop test suite self.browser_js("/pos/ui/tests?mod=web", "", "", login="admin", timeout=1800) diff --git a/addons/point_of_sale/tests/test_point_of_sale_flow.py b/addons/point_of_sale/tests/test_point_of_sale_flow.py index 810b6b013f9..89f8d6a95a2 100644 --- a/addons/point_of_sale/tests/test_point_of_sale_flow.py +++ b/addons/point_of_sale/tests/test_point_of_sale_flow.py @@ -22,7 +22,7 @@ class TestPointOfSaleFlow(TestPointOfSaleCommon): return untax, sum(tax.get('amount', 0.0) for tax in res['taxes']) def test_order_refund(self): - self.pos_config.open_session_cb(check_coa=False) + self.pos_config.open_session_cb() current_session = self.pos_config.current_session_id # I create a new PoS order with 2 lines order = self.PosOrder.create({ @@ -194,7 +194,7 @@ class TestPointOfSaleFlow(TestPointOfSaleCommon): """ # I click on create a new session button - self.pos_config.open_session_cb(check_coa=False) + self.pos_config.open_session_cb() current_session = self.pos_config.current_session_id # I create a PoS order with 2 units of PCSC234 at 450 EUR @@ -482,7 +482,7 @@ class TestPointOfSaleFlow(TestPointOfSaleCommon): def test_order_to_invoice(self): - self.pos_config.open_session_cb(check_coa=False) + self.pos_config.open_session_cb() current_session = self.pos_config.current_session_id untax1, atax1 = self.compute_tax(self.product3, 450*0.95, 2) @@ -598,7 +598,7 @@ class TestPointOfSaleFlow(TestPointOfSaleCommon): """ # I click on create a new session button - self.pos_config.open_session_cb(check_coa=False) + self.pos_config.open_session_cb() current_session = self.pos_config.current_session_id num_starting_orders = len(current_session.order_ids) @@ -778,7 +778,7 @@ class TestPointOfSaleFlow(TestPointOfSaleCommon): }) # I click on create a new session button - eur_config.open_session_cb(check_coa=False) + eur_config.open_session_cb() current_session = eur_config.current_session_id # I create a PoS order with 2 units of PCSC234 at 450 EUR (Tax Incl) @@ -877,7 +877,7 @@ class TestPointOfSaleFlow(TestPointOfSaleCommon): self.assertAlmostEqual(a, b) def test_order_to_invoice_no_tax(self): - self.pos_config.open_session_cb(check_coa=False) + self.pos_config.open_session_cb() current_session = self.pos_config.current_session_id # I create a new PoS order with 2 units of PC1 at 450 EUR (Tax Incl) and 3 units of PCSC349 at 300 EUR. (Tax Excl) @@ -957,7 +957,7 @@ class TestPointOfSaleFlow(TestPointOfSaleCommon): }) # sell product thru pos - self.pos_config.open_session_cb(check_coa=False) + self.pos_config.open_session_cb() pos_session = self.pos_config.current_session_id untax, atax = self.compute_tax(product5, 10.0) product5_order = {'data': diff --git a/addons/pos_coupon/models/pos_config.py b/addons/pos_coupon/models/pos_config.py index de5796093d4..9cbe85c970d 100644 --- a/addons/pos_coupon/models/pos_config.py +++ b/addons/pos_coupon/models/pos_config.py @@ -44,7 +44,7 @@ class PosConfig(models.Model): for config in self: config.program_ids = config.coupon_program_ids | config.promo_program_ids - def open_session_cb(self, check_coa=True): + def open_session_cb(self): # Check validity of programs before opening a new session invalid_reward_products_msg = "" for program in self.program_ids: diff --git a/addons/pos_coupon/tests/test_frontend.py b/addons/pos_coupon/tests/test_frontend.py index 4979bf4f34f..e8626f8e773 100644 --- a/addons/pos_coupon/tests/test_frontend.py +++ b/addons/pos_coupon/tests/test_frontend.py @@ -100,7 +100,7 @@ class TestUi(TestPointOfSaleHttpCommon): for promo_program in self.promo_programs: pos_config.promo_program_ids.add(promo_program) - self.main_pos_config.open_session_cb(check_coa=False) + self.main_pos_config.open_session_cb() ## # Tour Part 1 diff --git a/addons/pos_hr/tests/test_frontend.py b/addons/pos_hr/tests/test_frontend.py index 440abbb9960..d51133ac994 100644 --- a/addons/pos_hr/tests/test_frontend.py +++ b/addons/pos_hr/tests/test_frontend.py @@ -56,7 +56,7 @@ class TestPosHrHttpCommon(TestPointOfSaleHttpCommon): class TestUi(TestPosHrHttpCommon): def test_01_pos_hr_tour(self): # open a session, the /pos/ui controller will redirect to it - self.main_pos_config.open_session_cb(check_coa=False) + self.main_pos_config.open_session_cb() self.start_tour( "/pos/ui?config_id=%d" % self.main_pos_config.id, diff --git a/addons/pos_restaurant/tests/test_frontend.py b/addons/pos_restaurant/tests/test_frontend.py index 15bd01e013f..7c66e2abe89 100644 --- a/addons/pos_restaurant/tests/test_frontend.py +++ b/addons/pos_restaurant/tests/test_frontend.py @@ -155,7 +155,7 @@ class TestFrontend(odoo.tests.HttpCase): def test_01_pos_restaurant(self): - self.pos_config.with_user(self.env.ref('base.user_admin')).open_session_cb(check_coa=False) + self.pos_config.with_user(self.env.ref('base.user_admin')).open_session_cb() self.start_tour("/pos/ui?config_id=%d" % self.pos_config.id, 'pos_restaurant_sync', login="admin") @@ -169,18 +169,18 @@ class TestFrontend(odoo.tests.HttpCase): self.assertEqual(2, self.env['pos.order'].search_count([('amount_total', '=', 4.4), ('state', '=', 'paid')])) def test_02_others(self): - self.pos_config.with_user(self.env.ref('base.user_admin')).open_session_cb(check_coa=False) + self.pos_config.with_user(self.env.ref('base.user_admin')).open_session_cb() self.start_tour("/pos/ui?config_id=%d" % self.pos_config.id, 'SplitBillScreenTour', login="admin") self.start_tour("/pos/ui?config_id=%d" % self.pos_config.id, 'ControlButtonsTour', login="admin") self.start_tour("/pos/ui?config_id=%d" % self.pos_config.id, 'FloorScreenTour', login="admin") def test_04_ticket_screen(self): - self.pos_config.with_user(self.env.ref('base.user_admin')).open_session_cb(check_coa=False) + self.pos_config.with_user(self.env.ref('base.user_admin')).open_session_cb() self.start_tour("/pos/ui?config_id=%d" % self.pos_config.id, 'PosResTicketScreenTour', login="admin") def test_05_tip_screen(self): self.pos_config.write({'set_tip_after_payment': True, 'iface_tipproduct': True, 'tip_product_id': self.env.ref('point_of_sale.product_product_tip')}) - self.pos_config.with_user(self.env.ref('base.user_admin')).open_session_cb(check_coa=False) + self.pos_config.with_user(self.env.ref('base.user_admin')).open_session_cb() self.start_tour("/pos/ui?config_id=%d" % self.pos_config.id, 'PosResTipScreenTour', login="admin") order1 = self.env['pos.order'].search([('pos_reference', 'ilike', '%-0001')])