From 31bd2c070170f7651fc13a8f15bdd4f66591f8e2 Mon Sep 17 00:00:00 2001 From: twalter-c2c Date: Tue, 27 Aug 2024 16:50:25 +0200 Subject: [PATCH] Config adjustment: multi WH, company Add form view for config; add company_id to config; allow selecting multiple WHs to one config --- stock_average_daily_sale/__manifest__.py | 2 +- .../models/stock_average_daily_sale_config.py | 25 +++++----- .../views/stock_average_daily_sale_config.xml | 46 ++++++++++++++++--- 3 files changed, 55 insertions(+), 18 deletions(-) diff --git a/stock_average_daily_sale/__manifest__.py b/stock_average_daily_sale/__manifest__.py index cf050f329..a20e119ec 100644 --- a/stock_average_daily_sale/__manifest__.py +++ b/stock_average_daily_sale/__manifest__.py @@ -5,7 +5,7 @@ "name": "Stock Average Daily Sale", "summary": """ Allows to gather delivered products average on daily basis""", - "version": "16.0.1.0.0", + "version": "16.0.2.0.0", "license": "AGPL-3", "author": "ACSONE SA/NV,BCIM,Odoo Community Association (OCA)", "website": "https://github.com/OCA/stock-logistics-reporting", 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 b001a3fc4..4ce354e0f 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 @@ -9,20 +9,24 @@ class StockAverageDailySaleConfig(models.Model): - _name = "stock.average.daily.sale.config" _description = "Average daily sales computation parameters" + check_company_auto = True - abc_classification_profile_id = fields.Many2one( - comodel_name="abc.classification.profile", - required=True, - ondelete="cascade", - ) abc_classification_level = fields.Selection( - selection=ABC_SELECTION, required=True, readonly=True + selection=ABC_SELECTION, required=True, default="b" + ) + name = fields.Char(string="Name", required=True) + company_id = fields.Many2one( + string="Company", + comodel_name="res.company", + required=True, + default=lambda self: self.env.company, ) - standard_deviation_exclude_factor = fields.Float(required=True, digits=(2, 2)) - warehouse_id = fields.Many2one( + standard_deviation_exclude_factor = fields.Float( + required=True, default=0, digits=(2, 2) + ) # TODO check if 0 is correct as default + warehouse_ids = fields.Many2many( string="Warehouse", comodel_name="stock.warehouse", required=True, @@ -30,7 +34,6 @@ class StockAverageDailySaleConfig(models.Model): default=lambda self: self.env["stock.warehouse"].search( [("company_id", "=", self.env.company.id)], limit=1 ), - readonly=True, ) exclude_weekends = fields.Boolean( string="Exclude Weekends", @@ -52,4 +55,4 @@ class StockAverageDailySaleConfig(models.Model): number_days_qty_in_stock = fields.Integer( string="Number of days of quantities in stock", required=True, default=2 ) - safety_factor = fields.Float(digits=(2, 2), required=True) + safety_factor = fields.Float(digits=(2, 2), required=True, default=0) diff --git a/stock_average_daily_sale/views/stock_average_daily_sale_config.xml b/stock_average_daily_sale/views/stock_average_daily_sale_config.xml index d3afe4130..63ff34927 100644 --- a/stock_average_daily_sale/views/stock_average_daily_sale_config.xml +++ b/stock_average_daily_sale/views/stock_average_daily_sale_config.xml @@ -2,13 +2,15 @@ + - stock.average.daily.sale.config.tree (in stock_average_daily_sale) + stock.average.daily.sale.config.tree stock.average.daily.sale.config - + + + + @@ -16,24 +18,56 @@ - + + + stock.average.daily.sale.config.form + stock.average.daily.sale.config + +
+ + +
+
+
+ Average daily sales computation parameters + ir.actions.act_window stock.average.daily.sale.config - tree + tree,form + [] {} + Average daily sales computation parameters +