From ef33ed1b2f84536f00ac188f90106fbaba9e7f97 Mon Sep 17 00:00:00 2001 From: ArnauCForgeFlow Date: Tue, 28 May 2024 18:36:25 +0200 Subject: [PATCH] [IMP] stock_cycle_count: start inv adjustments depending on setting --- stock_cycle_count/models/stock_cycle_count.py | 9 ++++++++- stock_cycle_count/models/stock_inventory.py | 1 - stock_cycle_count/models/stock_warehouse.py | 4 ---- stock_cycle_count/tests/test_stock_cycle_count.py | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/stock_cycle_count/models/stock_cycle_count.py b/stock_cycle_count/models/stock_cycle_count.py index e1b40d30d..8f9a633fc 100644 --- a/stock_cycle_count/models/stock_cycle_count.py +++ b/stock_cycle_count/models/stock_cycle_count.py @@ -1,10 +1,13 @@ # Copyright 2017-18 ForgeFlow S.L. # (http://www.forgeflow.com) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +import logging from odoo import _, api, fields, models from odoo.exceptions import UserError +_logger = logging.getLogger(__name__) + class StockCycleCount(models.Model): _name = "stock.cycle.count" @@ -117,7 +120,11 @@ class StockCycleCount(models.Model): inv.prefill_counted_quantity = ( rec.company_id.inventory_adjustment_counted_quantities ) - inv.action_state_to_in_progress() + try: + inv.action_state_to_in_progress() + except Exception as e: + _logger.info("Error when beginning an adjustment: %s", str(e)) + if inv.prefill_counted_quantity == "zero": inv.stock_quant_ids.write({"inventory_quantity": 0}) else: diff --git a/stock_cycle_count/models/stock_inventory.py b/stock_cycle_count/models/stock_inventory.py index e9472932a..fb6838e73 100644 --- a/stock_cycle_count/models/stock_inventory.py +++ b/stock_cycle_count/models/stock_inventory.py @@ -35,7 +35,6 @@ class StockInventory(models.Model): default=False, ) - def _update_cycle_state(self): for inv in self: if inv.cycle_count_id and inv.state == "done": diff --git a/stock_cycle_count/models/stock_warehouse.py b/stock_cycle_count/models/stock_warehouse.py index afe05f636..db84413d1 100644 --- a/stock_cycle_count/models/stock_warehouse.py +++ b/stock_cycle_count/models/stock_warehouse.py @@ -158,10 +158,6 @@ class StockWarehouse(models.Model): if open_cycle_counts: continue cycle_count.action_create_inventory_adjustment() - try: - cycle_count.stock_adjustment_ids.action_state_to_in_progress() - except Exception as e: - _logger.info("Error when beginning an adjustment: %s", str(e)) except Exception as e: _logger.info("Error while running stock_cycle_count cron job: %s", str(e)) raise diff --git a/stock_cycle_count/tests/test_stock_cycle_count.py b/stock_cycle_count/tests/test_stock_cycle_count.py index 6299f2a25..74926a33e 100644 --- a/stock_cycle_count/tests/test_stock_cycle_count.py +++ b/stock_cycle_count/tests/test_stock_cycle_count.py @@ -77,7 +77,7 @@ class TestStockCycleCount(common.TransactionCase): cls.product1 = cls.product_model.create( {"name": "Test Product 1", "type": "product", "default_code": "PROD1"} ) - self.product2 = self.product_model.create( + cls.product2 = cls.product_model.create( {"name": "Test Product 2", "type": "product", "default_code": "PROD2"} )