fix(Stock): Fix the financial writting to avoid multiple transaction …

…for one movement and refactor t
Third-Culture-Software · Sep 21, 2017 · aa505c5 · aa505c5
1 parent bf1181e
commit aa505c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 17 deletions.
diff --git a/client/src/modules/stock/entry/entry.js b/client/src/modules/stock/entry/entry.js
@@ -324,23 +324,10 @@ function StockEntryController(
       flux_id     : bhConstants.flux.FROM_INTEGRATION,
       user_id     : Session.user.id,
     };
-
-    var lots = vm.Stock.store.data.reduce(function (current, previous) {
-        return previous.lots.map(function (lot) {
-          return {
-            label            : lot.lot,
-            initial_quantity : lot.quantity,
-            quantity         : lot.quantity,
-            unit_cost        : previous.unit_cost,
-            expiration_date  : lot.expiration_date,
-            inventory_uuid   : previous.inventory.uuid
-          };
-        }).concat(current);
-      }, []);    
 
     var entry = {
       integration : { date : vm.movement.date, description : vm.movement.description },
-      lots : lots,
+      lots : processLotsFromStore(vm.Stock.store.data, movement.entity_uuid),
       movement : movement
     }
 

diff --git a/server/controllers/stock/index.js b/server/controllers/stock/index.js
@@ -341,7 +341,6 @@ function createIntegration(req, res, next) {
   const params = req.body;
   const identifier = uuid.v4();
   const documentUuid = uuid.v4();
-  let commonInfos;
 
   const integration = {
     uuid        : db.bid(identifier),
@@ -381,10 +380,12 @@ function createIntegration(req, res, next) {
       unit_cost     : lot.unit_cost,
       is_exit       : 0,
       user_id       : params.movement.user_id,
+      description   : integration.description,
     });
+  });
 
     // An arry of common info, to send to the store procedure in order to insert to the posting journal
-    commonInfos = [ 
+    const commonInfos = [ 
       db.bid(documentUuid),
       new Date(params.movement.date),
       req.session.enterprise.id,
@@ -398,7 +399,6 @@ function createIntegration(req, res, next) {
 
     // transaction - movement reference
     transaction.addQuery('CALL ComputeMovementReference(?);', [db.bid(documentUuid)]);
-  });
 
   // execute all operations as one transaction
   transaction.execute()