Merge pull request #602 from sussol/#69-Allow-Finalising-of-zero-diff…

…erence-stockake #69-Allow-Finalising-of-zero-difference-stockake
msupply-foundation · Feb 7, 2018 · 6bbdc9b · 6bbdc9b
2 parents b5a8e51 + 59df6fc
commit 6bbdc9b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/database/DataTypes/Stocktake.js b/src/database/DataTypes/Stocktake.js
@@ -69,7 +69,7 @@ export class Stocktake extends Realm.Object {
   }
 
   get hasSomeCountedItems() {
-    return this.items.some(item => item.hasBatchWithQuantityChange);
+    return this.items.some(item => item.hasCountedBatches);
   }
 
   get numberOfBatches() {
@@ -129,7 +129,7 @@ export class Stocktake extends Realm.Object {
   adjustInventory(database) {
     // Prune all StocktakeItems with no quantity change
     database.delete('StocktakeItem', this.items.filter(stocktakeItem =>
-                                     !stocktakeItem.hasBatchWithQuantityChange));
+                                     !stocktakeItem.hasCountedBatches));
     // Get list of all StocktakeBatches associated with this stocktake
     const stocktakeBatches = database.objects('StocktakeBatch')
                              .filtered('stocktake.id = $0', this.id);

diff --git a/src/database/DataTypes/StocktakeItem.js b/src/database/DataTypes/StocktakeItem.js
@@ -40,10 +40,6 @@ export class StocktakeItem extends Realm.Object {
    * for StocktakeItem is 0.
    * @return  {boolean} True if StocktakeBatches have adjustments
    */
-  get hasBatchWithQuantityChange() {
-    return this.batches.some(stocktakeBatch => stocktakeBatch.difference !== 0);
-  }
-
   get hasCountedBatches() {
     return this.batches.some(stocktakeBatch => stocktakeBatch.hasBeenCounted);
   }