#1961 : Add minimal stock to quantities to order (and add explaination)

orders/static/js/orders_helper.js

@@ -210,7 +210,7 @@ function compute_products_coverage_qties() {
                 const daily_conso = product.daily_conso;
 
 
-                purchase_qty_for_coverage = order_doc.coverage_days * daily_conso - stock - incoming_qty;
+                purchase_qty_for_coverage = order_doc.coverage_days * daily_conso - stock - incoming_qty + product.minimal_stock;
                 purchase_qty_for_coverage = (purchase_qty_for_coverage < 0) ? 0 : purchase_qty_for_coverage;
 
                 // Reduce to nb of packages to purchase

outils/static/css/common.css

@@ -194,3 +194,16 @@ footer { position: fixed;
 }
 .notifyjs-cancelable-base .buttons {width: 190px; margin: 5px auto;}
 .notifyjs-cancelable-base button {width: 90px;text-align: center; margin: 3px;}
+
+button.accordion::after {
+    content: '\002B';
+    color: #777;
+    font-weight: bold;
+    float: right;
+    margin-left: 5px;
+}
+
+button.accordion.active::after {
+    content: "\2212";
+}
+

outils/static/css/module_config.css

@@ -30,15 +30,3 @@ input.link {min-width: 50em;}
   overflow: hidden;
 }
 
-button.accordion::after {
-    content: '\002B';
-    color: #777;
-    font-weight: bold;
-    float: right;
-    margin-left: 5px;
-}
-
-button.accordion.active::after {
-    content: "\2212";
-}
-

outils/static/js/all_common.js

@@ -460,6 +460,19 @@ for (i = 0; i < acc.length; i++) {
     });
 }
 
+$(document).on('click', '.accordion', function(){
+    /* Toggle between adding and removing the "active" class,
+    to highlight the button that controls the panel */
+    this.classList.toggle("active");
+
+    /* Toggle between hiding and showing the active panel */
+    var panel = this.nextElementSibling;
+    if (panel.style.display === "block") {
+      panel.style.display = "none";
+    } else {
+      panel.style.display = "block";
+    }
+});
 function report_JS_error(e, m) {
     try {
         $.post('/log_js_error', {module: m, error: JSON.stringify(e)});

outils/static/js/module_config.js

@@ -151,16 +151,3 @@ function get_module_settings() {
 
 get_module_settings();
 
-$(document).on('click', '.accordion', function(){
-    /* Toggle between adding and removing the "active" class,
-    to highlight the button that controls the panel */
-    this.classList.toggle("active");
-
-    /* Toggle between hiding and showing the active panel */
-    var panel = this.nextElementSibling;
-    if (panel.style.display === "block") {
-      panel.style.display = "none";
-    } else {
-      panel.style.display = "block";
-    }
-});
\ No newline at end of file

templates/orders/explanations.html

-<h3>Comment sont calculées les conso. moyennes / jour ?</h3>
-<div class="txtleft">
+<div>
+    <button type="button" class="accordion" style="width:100%"><label>Comment sont calculées les conso. moyennes / jour ?</label></button>
+    <div class="txtleft" style="display: none;">
         <p>
             La fonction qui calcule les consommations moyennes prend en paramètre une date de départ. <br/>
             Si elle n'est pas indiquée, la date prise en compte sera "<em>aujourd'hui - nb de jours paramétré dans Odoo</em>".<br/>
@@ -20,4 +21,15 @@
         <p>
             Pour chaque article, la consommation moyenne par jour est obtenue en divisant la quantité totale vendue sur la période par le nombre de jours significatifs.
         </p>
+    </div>
+</div>
+<div>
+    <button type="button" class="accordion" style="width:100%"><label>Comment sont calculés les besoins ?</label></button>
+    <div class="txtleft" style="display: none;">
+        La quantité à commander pour couvrir les besoins (en jours) est le résultat de :
+        <p>
+            (<em>nb_jours</em> <strong>x</strong> <em>conso_moyenne</em>) <strong>-</strong> <em>stock_existant</em> <strong>-</strong> <em>quantités_entrantes</em> <strong>+</strong> <em>stock_minimum</em>
+        </p>
+
+    </div>
 </div>