Add option to display negative quantities

Third-Culture-Software · Nov 25, 2020 · 2461429 · 2461429
1 parent 93e7dd9
commit 2461429
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 2 deletions.
diff --git a/client/src/i18n/en/stock.json b/client/src/i18n/en/stock.json
@@ -237,6 +237,7 @@
     "ASSIGNMENT_CURRENT":"Current",
     "NO_ASSIGNMENT":"No Assignment",
     "INCLUDE_EXHAUSTED_LOTS":"Include exhausted lots",
+    "INCLUDE_EMPTY_OR_NEGATIVE_LOTS" : "Include exhausted or negative lots",
     "INCLUDE_ONLY_EXHAUSTED_LOTS": "Include only exhausted lots",
     "CLICK_TO_SEE":"Click here to see lots",
     "SHOW_WARNINGS":"Click to show Warnings",

diff --git a/client/src/i18n/fr/stock.json b/client/src/i18n/fr/stock.json
@@ -67,6 +67,7 @@
     "GROUPING"        : "Groupage",
     "JOIN_INVOICE"    : "Joindre une facture",
     "INCLUDE_EMPTY_LOTS" : "Inclure les lots épuisés",
+    "INCLUDE_EMPTY_OR_NEGATIVE_LOTS" : "Inclure les lots épuisés ou négatives",
     "INCLUDE_EMPTY_LOTS_HELP" : "Afficher les articles dont la quantité est zero",
     "INCREASE"        : "Augmentation",
     "INCREASE_HELP"   : "Ajustement de stock en augmentant la quantité des lots des produits en stock",

diff --git a/client/src/modules/stock/inventory-adjustment/inventory-adjustment.html b/client/src/modules/stock/inventory-adjustment/inventory-adjustment.html
@@ -68,6 +68,20 @@ <h3 translate>INVENTORY_ADJUSTMENT.TITLE</h3>
           <bh-filter-toggle on-toggle="StockCtrl.toggleInlineFilter()">
             <span translate>FORM.LABELS.FILTER</span>
           </bh-filter-toggle>
+          <div class="toolbar-item">
+            <div class="checkbox">
+              <label>
+                <input
+                  type="checkbox"
+                  name="includeEmptyLot"
+                  ng-true-value="1"
+                  ng-false-value="0"
+                  ng-model="StockCtrl.includeEmptyLot"
+                  ng-change="StockCtrl.reloadInventories()">
+                <span translate>STOCK.INCLUDE_EMPTY_OR_NEGATIVE_LOTS</span>
+              </label>
+            </div>
+          </div>
         </div>
       </div>
 

diff --git a/client/src/modules/stock/inventory-adjustment/inventory-adjustment.js b/client/src/modules/stock/inventory-adjustment/inventory-adjustment.js
@@ -134,13 +134,17 @@ function StockInventoryAdjustmentController(
   }
 
   // ============================ Inventories ==========================
+  vm.reloadInventories = () => {
+    loadInventories(vm.depot);
+  };
+
   function loadInventories(depot) {
     vm.loading = true;
     setupStock();
 
     Stock.lots.read(null, {
       depot_uuid : depot.uuid,
-      includeEmptyLot : 0,
+      includeEmptyLot : vm.includeEmptyLot || 0,
       dateTo : vm.movement.date,
     })
       .then(lots => {

diff --git a/server/controllers/stock/index.js b/server/controllers/stock/index.js
@@ -315,7 +315,7 @@ async function createInventoryAdjustment(req, res, next) {
         lot_uuid : db.bid(lot.uuid),
         depot_uuid : db.bid(movement.depot_uuid),
         document_uuid : db.bid(positiveAdjustmentUuid),
-        quantity : lot.oldQuantity,
+        quantity : lot.oldQuantity * -1,
         unit_cost : lot.unit_cost,
         date : new Date(movement.date),
         entity_uuid : movement.entity_uuid,