feat(server): Posting adjustement stock data to the journal through v…

…oucher
Third-Culture-Software · Oct 20, 2017 · 5a7ab79 · 5a7ab79
1 parent 419bb0c
commit 5a7ab79
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/client/src/modules/stock/adjustment/adjustment.html b/client/src/modules/stock/adjustment/adjustment.html
@@ -124,10 +124,8 @@ <h4><i class="fa fa-arrow-circle-down"></i> <span translate>STOCK.DECREASE</span
           <bh-add-item
             disable = "StockCtrl.adjustmentOption"
             callback = "StockCtrl.addItems(numItem)">
-          </bh-add-item> 
-
-        </div>
-
+          </bh-add-item>
+        </div>          
       </div>
 
       <!-- grid -->

diff --git a/client/src/modules/stock/adjustment/adjustment.js b/client/src/modules/stock/adjustment/adjustment.js
@@ -195,11 +195,9 @@ function StockAdjustmentController(
     if (form.$invalid || !vm.adjustmentOption) { return; }
 
     if (vm.adjustmentOption === 'increase') {
-      vm.adjustmentType = 'FORM.LABELS.INCREASE';
       isExit = 0;
       fluxId = bhConstants.flux.FROM_ADJUSTMENT;
     } else if (vm.adjustmentOption === 'decrease') {
-      vm.adjustmentType = 'FORM.LABELS.DECREASE';
       isExit = 1;
       fluxId = bhConstants.flux.TO_ADJUSTMENT;
     }
@@ -231,6 +229,7 @@ function StockAdjustmentController(
       })
       .catch(Notify.handleError);
   }
+
   function changeDepot() {
     return Depots.openSelectionModal(vm.depot)
       .then(function (depot) {

diff --git a/server/controllers/stock/index.js b/server/controllers/stock/index.js
@@ -266,12 +266,10 @@ function normalMovement(document, params, metadata) {
     transaction.addQuery('CALL ComputeMovementReference(?);', [db.bid(document.uuid)]);
   });
 
-  if (isStockExit) {
-    const projectId = metadata.project.id;
-    const currencyId = metadata.enterprise.currency_id;
-    const postStockParameters = [db.bid(document.uuid), parameters.is_exit, projectId, currencyId];
-    transaction.addQuery('CALL PostStockMovement(?, ?, ?, ?);', postStockParameters);
-  }
+  const projectId = metadata.project.id;
+  const currencyId = metadata.enterprise.currency_id;
+  const postStockParameters = [db.bid(document.uuid), parameters.is_exit, projectId, currencyId];
+  transaction.addQuery('CALL PostStockMovement(?, ?, ?, ?);', postStockParameters);
 
   return transaction.execute();
 }