From 6c242a7ccb3ebb2c0cc77ec34ee13c1488fee676 Mon Sep 17 00:00:00 2001
From: lomamech <lomamech@gmail.com>
Date: Wed, 28 Sep 2022 13:24:28 +0100
Subject: [PATCH] improvememt(process of modules for shipments) - Display
 shipment register to descending order by reference number - Automatically
 import shipment description in stock exit modules - Fix code for hidden
 expiry date for asset and other non perimable inventory closes #6824

---
 client/src/modules/shipment/shipment.js                  | 5 +++--
 client/src/modules/stock/entry/modals/lots.modal.js      | 2 +-
 client/src/modules/stock/exit/exit.js                    | 5 +++++
 server/controllers/asset_management/shipment/shipment.js | 1 +
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/client/src/modules/shipment/shipment.js b/client/src/modules/shipment/shipment.js
index 52bfbc587d..ecc13c2392 100644
--- a/client/src/modules/shipment/shipment.js
+++ b/client/src/modules/shipment/shipment.js
@@ -4,13 +4,13 @@ angular.module('bhima.controllers')
 ShipmentRegistryController.$inject = [
   '$state', 'ShipmentService', 'ShipmentFilter', 'ShipmentModalService', 'ModalService',
   'uiGridConstants', 'GridStateService', 'GridColumnService',
-  'NotifyService', 'bhConstants',
+  'NotifyService', 'bhConstants', 'GridSortingService',
 ];
 
 function ShipmentRegistryController(
   $state, Shipments, ShipmentFilter, ShipmentModal, Modal,
   GridConstants, GridState, Columns,
-  Notify, Constants,
+  Notify, Constants, Sorting,
 ) {
   const vm = this;
   const cacheKey = 'shipment-grid';
@@ -55,6 +55,7 @@ function ShipmentRegistryController(
       headerTooltip : 'SHIPMENT.REFERENCE',
       headerCellFilter : 'translate',
       headerCellClass : 'wrappingColHeader',
+      sortingAlgorithm : Sorting.algorithms.sortByReference,
     },
     {
       field : 'stock_reference',
diff --git a/client/src/modules/stock/entry/modals/lots.modal.js b/client/src/modules/stock/entry/modals/lots.modal.js
index f20f201a5c..1c74cf3b2c 100644
--- a/client/src/modules/stock/entry/modals/lots.modal.js
+++ b/client/src/modules/stock/entry/modals/lots.modal.js
@@ -24,7 +24,7 @@ function StockDefineLotsModalController(
 
   // Hide columns in the grid when it doesn't apply to this inventory item.
   const isAsset = Data.stockLine.is_asset;
-  const showShowExpirationDate = !(Data.stockLine.tracking_expiration === false || Data.stockLine.is_asset);
+  const showShowExpirationDate = !(Data.stockLine.tracking_expiration === 0 || Data.stockLine.is_asset);
 
   Data.stockLine.prev_unit_cost = Data.stockLine.unit_cost; // Save for later checks
 
diff --git a/client/src/modules/stock/exit/exit.js b/client/src/modules/stock/exit/exit.js
index 3109522b54..968b074139 100644
--- a/client/src/modules/stock/exit/exit.js
+++ b/client/src/modules/stock/exit/exit.js
@@ -164,9 +164,14 @@ function StockExitController(
 
   //
   function onSelectExitType(exitType, entity) {
+    vm.stockForm.details.description = null;
     vm.selectedExitType = exitType;
     vm.stockForm.setExitType(exitType.label);
 
+    if (entity.shipment) {
+      vm.stockForm.details.description = entity.shipment.description;
+    }
+
     switch (exitType.label) {
     case 'patient':
       vm.stockForm.setPatientDistribution(entity);
diff --git a/server/controllers/asset_management/shipment/shipment.js b/server/controllers/asset_management/shipment/shipment.js
index 72acf7155e..e5b5f0cca2 100644
--- a/server/controllers/asset_management/shipment/shipment.js
+++ b/server/controllers/asset_management/shipment/shipment.js
@@ -604,6 +604,7 @@ function find(params) {
     LEFT JOIN document_map dm2 ON dm2.uuid = sh.document_uuid
   `;
 
+  filters.setOrder('ORDER BY sh.reference DESC');
   const query = filters.applyQuery(sql);
   const queryParameters = filters.parameters();
   return db.exec(query, queryParameters);