fix(stock sheet): fixup language and rendering

Right aligns certain values and rewords titles to make it more explicit. Also reorders the options so that they flow from required to optional. Closes #6149.
IMA-WorldHealth · Jan 4, 2022 · b14bd5f · b14bd5f
1 parent edd6afd
commit b14bd5f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/client/src/i18n/en/report.json b/client/src/i18n/en/report.json
@@ -305,7 +305,7 @@
       "VALUE": "Value",
       "ENTRIES": "Entries",
       "EXITS": "Exits",
-      "STOCKS": "Stocks",
+      "STOCK_ON_HAND": "Stock on Hand",
       "EXIT_REPORT": "Stock Exit Report",
       "EXIT_REPORT_DESCRIPTION": "This report shows stock exits which had occurred in different depots",
       "INCLUDE_AGGREGATE_CONSUMPTION": "Include aggregate consumption",

diff --git a/client/src/i18n/fr/report.json b/client/src/i18n/fr/report.json
@@ -309,7 +309,7 @@
       "VALUE" : "Valeur",
       "ENTRIES" : "Entrées",
       "EXITS" : "Sorties",
-      "STOCKS" : "Stocks",
+      "STOCK_ON_HAND" : "Stock disponible",
       "EXIT_REPORT" : "Rapport des sorties de stocks",
       "EXIT_REPORT_DESCRIPTION" : "Ce rapport affiche les sorties de stock qui ont eu lieu dans different dépôts",
       "INCLUDE_AGGREGATE_CONSUMPTION": "Inclure les consommations agrégées",

diff --git a/client/src/modules/reports/generate/stock_sheet/stock_sheet.html b/client/src/modules/reports/generate/stock_sheet/stock_sheet.html
@@ -24,14 +24,6 @@ <h3 translate>REPORT.STOCK.INVENTORY_REPORT</h3>
 
         <form name="ConfigForm" bh-submit="ReportConfigCtrl.preview(ConfigForm)" novalidate autocomplete="off">
 
-          <!-- select depot -->
-          <bh-depot-select
-            depot-uuid="ReportConfigCtrl.reportDetails.depot_uuid"
-            on-select-callback="ReportConfigCtrl.onSelectDepot(depot)"
-            required="false">
-            <bh-clear on-clear="ReportConfigCtrl.clear('depot_uuid')"></bh-clear>
-          </bh-depot-select>
-
           <!-- select inventory -->
           <bh-inventory-select
             inventory-uuid="ReportConfigCtrl.reportDetails.inventory_uuid"
@@ -41,6 +33,14 @@ <h3 translate>REPORT.STOCK.INVENTORY_REPORT</h3>
             <bh-clear on-clear="ReportConfigCtrl.clear('inventory_uuid')"></bh-clear>
           </bh-inventory-select>
 
+          <!-- select depot -->
+          <bh-depot-select
+            depot-uuid="ReportConfigCtrl.reportDetails.depot_uuid"
+            on-select-callback="ReportConfigCtrl.onSelectDepot(depot)"
+            required="false">
+            <bh-clear on-clear="ReportConfigCtrl.clear('depot_uuid')"></bh-clear>
+          </bh-depot-select>
+
           <!-- sort by real movement date -->
           <bh-yes-no-radios
             label="SETTINGS.HAVING_DATE_INTERVAL"

diff --git a/server/controllers/stock/reports/stock_sheet.report.handlebars b/server/controllers/stock/reports/stock_sheet.report.handlebars
@@ -38,7 +38,7 @@
             <th colspan={{#if depot.text}}"4"{{else}}"5"{{/if}}></th>
             <th class="text-center" colspan="3">{{translate 'REPORT.STOCK.ENTRIES'}}</th>
             <th class="text-center" colspan="3">{{translate 'REPORT.STOCK.EXITS'}}</th>
-            <th class="text-center" colspan="3">{{translate 'REPORT.STOCK.STOCKS'}}</th>
+            <th class="text-center" colspan="3">{{translate 'REPORT.STOCK.STOCK_ON_HAND'}}</th>
           </tr>
           <tr style="background-color:#ddd;">
             <th class="text-center" style="border-right: 1px solid #000;">{{translate 'TABLE.COLUMNS.REFERENCE'}}</th>
@@ -65,7 +65,7 @@
         <tbody>
           {{#if header}}
             <tr {{#if header.hasNegativeValues}}class="bg-danger text-danger"{{/if}}>
-              <td style="border-left: 1px solid #000; border-right:1px solid #000; border-bottom: 1px solid #000;" colspan={{#if depot.text}}"10"{{else}}"11"{{/if}} class="text-center"><b>{{translate 'REPORT.OPENING_BALANCE'}}</b></td>
+              <td style="border-left: 1px solid #000; border-right:1px solid #000; border-bottom: 1px solid #000;" colspan={{#if depot.text}}"10"{{else}}"11"{{/if}} class="text-right"><b>{{translate 'REPORT.OPENING_BALANCE'}}</b></td>
               <td style="border-right: 1px solid #000; border-bottom: 1px solid #000;" class="text-right" {{#unless header.hasNegativeValues}}style="background-color:#efefef;"{{/unless}}><b>{{header.quantity}}</b></td>
               <td style="border-right: 1px solid #000; border-bottom: 1px solid #000;" class="text-right" {{#unless header.hasNegativeValues}}style="background-color:#efefef;"{{/unless}}><b>{{currency header.unit_cost currencyId 4}}</b></td>
               <td style="border-right: 1px solid #000; border-bottom: 1px solid #000;" class="text-right" {{#unless header.hasNegativeValues}}style="background-color:#efefef;border-right: 1px solid #000;"{{/unless}}><b>{{currency header.value currencyId}}</b></td>
@@ -112,7 +112,7 @@
           </tr>
 
           <tr class="text-right" style="font-weight: bold; border-top: 1px solid #000;">
-            <th class="text-center" colspan={{#if depot.text}}"10"{{else}}"11"{{/if}}><b>{{translate 'STOCK.STOCK_VALUE_WITH_WAC'}}</b></th>
+            <th class="text-right" colspan={{#if depot.text}}"10"{{else}}"11"{{/if}}><b>{{translate 'STOCK.STOCK_VALUE_WITH_WAC'}}</b></th>
             <th class="text-right">{{result.stock.quantity}}</th>
             <th class="text-right">{{currency wacDetails.unit_cost currencyId 4}}</th>
             <th class="text-right">{{currency wacDetails.value currencyId}}</th>