fixup! stock_average_daily_sale: returns handling

Author: twalter-c2c

stock_average_daily_sale/models/stock_average_daily_sale.py

@@ -92,14 +92,21 @@ class StockAverageDailySale(models.Model):
     recommended_qty = fields.Float(
         required=True,
         digits="Product Unit of Measure",
-        help="Minimal recommended quantity in stock. Formula: average daily qty * number days in stock + safety",
+        help=(
+            "Recommended minimal quantity in stock. The bigger of the two values of:\n"
+            "I) number of days in stock * average daily quantity * average daily consumption count\n"
+            "II) number of days in stock * average quantity by consumption"
+        ),
     )
     recommended_qty_incl_returns = fields.Float(
         required=True,
         digits="Product Unit of Measure",
         help=(
-            "Minimal recommended quantity in stock taking into account returns. "
-            "Formula: (average daily qty - average return qty) * number days in stock + safety"
+            "Recommended minimal quantity in stock taking into account returns. "
+            "The bigger of the two values of:\n"
+            "I) number of days in stock * (average daily quantity - average daily return quantity) "
+            "* (average daily consumption count - average daily returns count)\n"
+            "II) number of days in stock * (average quantity by consumption - average quantity by return)"
         ),
     )
     sale_ok = fields.Boolean(
@@ -415,8 +422,8 @@ def _create_materialized_view(self):
                             (cfg.number_days_qty_in_stock *  average_qty_by_sale)
                         ) as recommended_qty,
                         GREATEST(
-                            (cfg.number_days_qty_in_stock * (average_qty_by_sale - average_qty_by_return) * (average_daily_sales_count - average_daily_returns_count)) + ((ds.daily_standard_deviation - dsr.daily_standard_deviation) * cfg.safety_factor * sqrt(nbr_days)),
-                            (cfg.number_days_qty_in_stock * (average_qty_by_sale - average_qty_by_return))
+                            (cfg.number_days_qty_in_stock * (average_qty_by_sale - COALESCE(average_qty_by_return, 0)) * (average_daily_sales_count - COALESCE(average_daily_returns_count, 0))) + ((ds.daily_standard_deviation - COALESCE(dsr.daily_standard_deviation, 0)) * cfg.safety_factor * sqrt(nbr_days)),
+                            (cfg.number_days_qty_in_stock * (average_qty_by_sale - COALESCE(average_qty_by_return, 0)))
                         ) as recommended_qty_incl_returns
                     FROM averages t
                     JOIN daily_standard_deviation ds on ds.id= t.window_id

stock_average_daily_sale/tests/test_average_daily_sale.py

@@ -59,6 +59,9 @@ def test_average_sale(self):
                     "average_qty_by_sale": 10.0,
                     "qty_in_stock": 40.0,
                     "recommended_qty": 20.0,
+                    "average_qty_by_return": 0.0,
+                    "average_daily_returns_count": 0.0,
+                    "recommended_qty_incl_returns": 20.0,
                     "warehouse_id": self.warehouse_0.id,
                 }
             ],
@@ -74,6 +77,7 @@ def test_average_sale(self):
                     "average_qty_by_sale": 12.0,
                     "qty_in_stock": 48.0,
                     "recommended_qty": 24.0,
+                    "recommended_qty_incl_returns": 24.0,
                     "warehouse_id": self.warehouse_0.id,
                 }
             ],
@@ -151,6 +155,7 @@ def test_average_sale_multiple(self):
                     "nbr_sales": 2.0,
                     "average_qty_by_sale": 8.0,
                     "recommended_qty": 16.0,
+                    "recommended_qty_incl_returns": 16.0,
                     "qty_in_stock": 44.0,
                     "warehouse_id": self.warehouse_0.id,
                 }