diff --git a/stock_average_daily_sale/__manifest__.py b/stock_average_daily_sale/__manifest__.py index 582a9d3..1c99ade 100644 --- a/stock_average_daily_sale/__manifest__.py +++ b/stock_average_daily_sale/__manifest__.py @@ -15,7 +15,6 @@ "product_abc_classification", "product_abc_classification_sale_stock", "product_route_mto", - "stock_location_zone", ], "data": [ "security/stock_average_daily_sale_config.xml", diff --git a/stock_average_daily_sale/models/stock_average_daily_sale.py b/stock_average_daily_sale/models/stock_average_daily_sale.py index 0dfb148..41ed3e0 100644 --- a/stock_average_daily_sale/models/stock_average_daily_sale.py +++ b/stock_average_daily_sale/models/stock_average_daily_sale.py @@ -87,9 +87,6 @@ class StockAverageDailySale(models.Model): string="Daily Qty Standard Deviation", required=True ) warehouse_id = fields.Many2one(comodel_name="stock.warehouse", required=True) - zone_location_id = fields.Many2one( - string="Location Zone", comodel_name="stock.location", index=True - ) qty_in_stock = fields.Float( string="Quantity in stock", digits="Product Unit of Measure", @@ -187,7 +184,6 @@ class StockAverageDailySale(models.Model): sm.product_id, sm.product_uom_qty, sl_src.warehouse_id, - sl_src.zone_location_id, (avg(product_uom_qty) OVER pid - (stddev_samp(product_uom_qty) OVER pid * cfg.standard_deviation_exclude_factor) ) as lower_bound, @@ -220,7 +216,6 @@ class StockAverageDailySale(models.Model): concat(warehouse_id, product_id)::integer as id, product_id, warehouse_id, - zone_location_id, (avg(product_uom_qty) FILTER (WHERE product_uom_qty BETWEEN lower_bound AND upper_bound OR standard_deviation = 0) )::numeric AS average_qty_by_sale, @@ -235,7 +230,7 @@ class StockAverageDailySale(models.Model): config_id, nrb_days_without_sat_sun FROM deliveries_last - GROUP BY product_id, warehouse_id, zone_location_id, standard_deviation, nrb_days_without_sat_sun, date_from, date_to, config_id + GROUP BY product_id, warehouse_id, standard_deviation, nrb_days_without_sat_sun, date_from, date_to, config_id ), -- Compute the stock by product in locations under stock stock_qty AS ( @@ -277,7 +272,6 @@ class StockAverageDailySale(models.Model): t.id, t.product_id, t.warehouse_id, - t.zone_location_id, average_qty_by_sale, average_daily_sales_count, average_qty_by_sale * average_daily_sales_count as average_daily_qty, diff --git a/stock_average_daily_sale/models/stock_average_daily_sale_config.py b/stock_average_daily_sale/models/stock_average_daily_sale_config.py index 4b2521f..55f5ec5 100644 --- a/stock_average_daily_sale/models/stock_average_daily_sale_config.py +++ b/stock_average_daily_sale/models/stock_average_daily_sale_config.py @@ -32,12 +32,6 @@ class StockAverageDailySaleConfig(models.Model): ), readonly=True, ) - stock_location_kind = fields.Selection( - selection=lambda self: self.env["stock.location"] - ._fields["location_kind"] - .selection, - default="zone", - ) period_name = fields.Selection( string="Period analyzed unit", selection=[ diff --git a/stock_average_daily_sale/tests/common.py b/stock_average_daily_sale/tests/common.py index 05d4685..0cb1728 100644 --- a/stock_average_daily_sale/tests/common.py +++ b/stock_average_daily_sale/tests/common.py @@ -26,7 +26,6 @@ class CommonAverageSaleTest: cls.location_zone = cls.location_obj.create( { "name": "Zone Location", - "is_zone": True, "location_id": cls.warehouse_0.lot_stock_id.id, } ) diff --git a/stock_average_daily_sale/tests/test_average_daily_sale.py b/stock_average_daily_sale/tests/test_average_daily_sale.py index 905babb..4a78a39 100644 --- a/stock_average_daily_sale/tests/test_average_daily_sale.py +++ b/stock_average_daily_sale/tests/test_average_daily_sale.py @@ -54,7 +54,7 @@ class TestAverageSale(CommonAverageSaleTest, TransactionCase): "nbr_sales": 1.0, "average_qty_by_sale": 10.0, "qty_in_stock": 40.0, - "zone_location_id": self.location_zone.id, + "warehouse_id": self.warehouse_0.id, } ], ) @@ -68,7 +68,7 @@ class TestAverageSale(CommonAverageSaleTest, TransactionCase): "nbr_sales": 1.0, "average_qty_by_sale": 12.0, "qty_in_stock": 48.0, - "zone_location_id": self.location_zone.id, + "warehouse_id": self.warehouse_0.id, } ], ) @@ -128,7 +128,7 @@ class TestAverageSale(CommonAverageSaleTest, TransactionCase): { "nbr_sales": 3.0, "qty_in_stock": 19.0, - "zone_location_id": self.location_zone.id, + "warehouse_id": self.warehouse_0.id, } ], ) @@ -144,7 +144,7 @@ class TestAverageSale(CommonAverageSaleTest, TransactionCase): "nbr_sales": 2.0, "average_qty_by_sale": 8.0, "qty_in_stock": 44.0, - "zone_location_id": self.location_zone.id, + "warehouse_id": self.warehouse_0.id, } ], ) diff --git a/stock_average_daily_sale/views/stock_average_daily_sale.xml b/stock_average_daily_sale/views/stock_average_daily_sale.xml index a92bb2b..9aca7b5 100644 --- a/stock_average_daily_sale/views/stock_average_daily_sale.xml +++ b/stock_average_daily_sale/views/stock_average_daily_sale.xml @@ -8,7 +8,7 @@ - + @@ -56,7 +56,6 @@ -