merge conflict

orders/static/css/oders_helper_style.css

@@ -108,7 +108,7 @@
     width: 300px;
     border-radius: 10px;
 }
-
+#products_table .help {cursor: help;}
 #table_header_select_all{
     display: flex;
     align-content: center;

orders/static/js/orders_helper.js

@@ -987,7 +987,8 @@ function prepare_datatable_data(product_ids = []) {
             qty_available: +parseFloat(product.qty_available).toFixed(3),
             daily_conso: product.daily_conso,
             purchase_ok: product.purchase_ok,
-            uom: product.uom_id[1]
+            uom: product.uom_id[1],
+            stats: "Ecart type: " + product.sigma + ", % jours sans vente = " + (product.vpc) * 100
         };
 
         const computed_data = _compute_product_data(product);
@@ -1056,6 +1057,9 @@ function prepare_datatable_columns() {
         {
             data: "daily_conso",
             title: "Conso moy /jour",
+            render: function (data, type, full) {
+                return '<div class="help" title="' + full.stats+ '">' + data + '</div>';
+            },
             className: "dt-body-center",
             width: "6%"
         }

products/models.py

@@ -507,7 +507,7 @@ class CagetteProducts(models.Model):
                 #'to': '2019-08-10',
             }
             sales = CagetteProducts.get_template_products_sales_average(sales_average_params)
-            
+
             if 'list' in sales and len(sales['list']) > 0:
                 sales = sales['list']
             else: