From f5d40565a8cc67c7dea161cefbf1b6f57a8003c6 Mon Sep 17 00:00:00 2001 From: Michael Tietz Date: Mon, 10 Jan 2022 16:41:02 +0100 Subject: [PATCH] [MIG] stock_reserve: Migration to 14.0 --- stock_reserve/__init__.py | 2 +- stock_reserve/__manifest__.py | 2 +- stock_reserve/{model => models}/__init__.py | 0 stock_reserve/{model => models}/product.py | 0 stock_reserve/{model => models}/stock_reserve.py | 2 +- stock_reserve/tests/test_stock_reserve.py | 16 ++++++++-------- 6 files changed, 11 insertions(+), 11 deletions(-) rename stock_reserve/{model => models}/__init__.py (100%) rename stock_reserve/{model => models}/product.py (100%) rename stock_reserve/{model => models}/stock_reserve.py (99%) diff --git a/stock_reserve/__init__.py b/stock_reserve/__init__.py index 1d2b05143..d47f4d15e 100644 --- a/stock_reserve/__init__.py +++ b/stock_reserve/__init__.py @@ -1,3 +1,3 @@ # Copyright 2013 Camptocamp SA - Guewen Baconnier # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from . import model +from . import models diff --git a/stock_reserve/__manifest__.py b/stock_reserve/__manifest__.py index 9cf87acfc..b95bca60e 100644 --- a/stock_reserve/__manifest__.py +++ b/stock_reserve/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Stock Reservation", "summary": "Stock reservations on products", - "version": "13.0.1.0.0", + "version": "14.0.1.0.0", "author": "Camptocamp, Odoo Community Association (OCA)", "category": "Warehouse", "license": "AGPL-3", diff --git a/stock_reserve/model/__init__.py b/stock_reserve/models/__init__.py similarity index 100% rename from stock_reserve/model/__init__.py rename to stock_reserve/models/__init__.py diff --git a/stock_reserve/model/product.py b/stock_reserve/models/product.py similarity index 100% rename from stock_reserve/model/product.py rename to stock_reserve/models/product.py diff --git a/stock_reserve/model/stock_reserve.py b/stock_reserve/models/stock_reserve.py similarity index 99% rename from stock_reserve/model/stock_reserve.py rename to stock_reserve/models/stock_reserve.py index ad767dd6a..072138d30 100644 --- a/stock_reserve/model/stock_reserve.py +++ b/stock_reserve/models/stock_reserve.py @@ -121,7 +121,7 @@ class StockReservation(models.Model): The reservation is done using the default UOM of the product. A date until which the product is reserved can be specified. """ - self.write({"date_expected": fields.Datetime.now()}) + self.write({"date_deadline": fields.Datetime.now()}) self.mapped("move_id")._action_confirm(merge=False) self.mapped("move_id.picking_id").action_assign() return True diff --git a/stock_reserve/tests/test_stock_reserve.py b/stock_reserve/tests/test_stock_reserve.py index 653de7412..5e8be16d9 100644 --- a/stock_reserve/tests/test_stock_reserve.py +++ b/stock_reserve/tests/test_stock_reserve.py @@ -30,16 +30,16 @@ class TestStockReserve(common.TransactionCase): form_reservation_1.location_id = self.warehouse.lot_stock_id reservation_1 = form_reservation_1.save() reservation_1.reserve() - self.assertEquals(self.product.virtual_available, 4) + self.assertEqual(self.product.virtual_available, 4) form_reservation_2 = Form(self.env["stock.reservation"]) form_reservation_2.product_id = self.product form_reservation_2.product_uom_qty = 1 form_reservation_2.location_id = self.warehouse.lot_stock_id reservation_2 = form_reservation_2.save() reservation_2.reserve() - self.assertEquals(self.product.virtual_available, 3) + self.assertEqual(self.product.virtual_available, 3) reservation_1.release_reserve() - self.assertEquals(self.product.virtual_available, 9) + self.assertEqual(self.product.virtual_available, 9) def test_cron_release(self): form_reservation_1 = Form(self.env["stock.reservation"]) @@ -49,10 +49,10 @@ class TestStockReserve(common.TransactionCase): form_reservation_1.date_validity = fields.Date.from_string("2021-01-01") reservation_1 = form_reservation_1.save() reservation_1.reserve() - self.assertEquals(self.product.virtual_available, 4) + self.assertEqual(self.product.virtual_available, 4) cron = self.env.ref("stock_reserve.ir_cron_release_stock_reservation") cron.method_direct_trigger() - self.assertEquals(self.product.virtual_available, 10) + self.assertEqual(self.product.virtual_available, 10) def test_cron_reserve(self): form_reservation_1 = Form(self.env["stock.reservation"]) @@ -61,7 +61,7 @@ class TestStockReserve(common.TransactionCase): form_reservation_1.location_id = self.warehouse.lot_stock_id reservation_1 = form_reservation_1.save() reservation_1.reserve() - self.assertEquals(reservation_1.state, "partially_available") + self.assertEqual(reservation_1.state, "partially_available") self.env["stock.quant"].create( { "product_id": self.product.id, @@ -71,5 +71,5 @@ class TestStockReserve(common.TransactionCase): ) cron = self.env.ref("stock_reserve.ir_cron_reserve_waiting_confirmed") cron.method_direct_trigger() - self.assertEquals(reservation_1.state, "assigned") - self.assertEquals(self.product.virtual_available, 9) + self.assertEqual(reservation_1.state, "assigned") + self.assertEqual(self.product.virtual_available, 9)