use of configured algo for cmm

Third-Culture-Software · Nov 20, 2020 · 6a1fbd3 · 6a1fbd3
1 parent d3bd766
commit 6a1fbd3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/client/src/i18n/en/stock.json b/client/src/i18n/en/stock.json
@@ -92,6 +92,7 @@
     "CURRENT_QUANTITY" : "Current Quantity",
     "RISK"            : "Risk",
     "RISK_QUANTITY"   : "Risk Quantity",
+    "RISK_VALUE"      : "Risk Value",
     "CMM"             : "CMM",
     "MSD"             : "MSD",
     "LOSS"            : "Stock Loss",

diff --git a/client/src/i18n/fr/stock.json b/client/src/i18n/fr/stock.json
@@ -95,6 +95,7 @@
     "RISK"            : "Risque",
     "CURRENT_QUANTITY" : "Quantité actuelle",
     "RISK_QUANTITY"   : "Quantité à risque",
+    "RISK_VALUE"      : "Valeur à risque",
     "CMM"             : "CMM",
     "MSD"             : "MSD",
     "LOSS"            : "Perte de stock",

diff --git a/server/controllers/stock/reports/stock_expiration_report.handlebars b/server/controllers/stock/reports/stock_expiration_report.handlebars
@@ -67,7 +67,7 @@
           <th>{{translate 'STOCK.RISK_QUANTITY'}}</th>
           <th>{{translate 'TABLE.COLUMNS.UNIT'}}</th>
           <th>{{translate 'REPORT.STOCK.UNIT_COST'}}</th>
-          <th>{{translate 'FORM.LABELS.VALUE'}}</th>
+          <th>{{translate 'STOCK.RISK_VALUE'}}</th>
           <th>{{translate 'STOCK.STATUS.LABEL'}}</th>
         </tr>
       </thead>
@@ -78,7 +78,7 @@
             <td>{{lot.text}}</td>
             <td>{{lot.label}}</td>
             <td>{{date lot.expiration_date}}</td>
-            <td class="text-right">{{lot.cmms.algo_msh}}</td>
+            <td class="text-right">{{lot.avg_consumption}}</td>
             <td class="text-right">{{lot.quantity}}</td>
             <td class="text-right">{{lot.quantity_at_risk}}</td>
             <td>{{lot.unit_type}}</td>