diff --git a/web/org.openbravo.retail.posterminal/js/closecash/model/cashup-model.js b/web/org.openbravo.retail.posterminal/js/closecash/model/cashup-model.js
--- a/web/org.openbravo.retail.posterminal/js/closecash/model/cashup-model.js
+++ b/web/org.openbravo.retail.posterminal/js/closecash/model/cashup-model.js
@@ -121,7 +121,7 @@
     var result = null;
     _.each(this.get('paymentList').models, function (model) {
       if (model.get('paymentMethod').automatemovementtoother === false) {
-        model.set('qtyToKeep', null);
+        model.set('qtyToKeep', '0');
         if (result !== false) {
           result = true;
         }
@@ -239,7 +239,8 @@
         }
       }, 0),
       totalQtyToDepo: _.reduce(this.get('paymentList').models, function (total, model) {
-        if (model.get('qtyToKeep') !== null && model.get('qtyToKeep') !== undf) {
+        if (model.get('qtyToKeep') !== null && model.get('qtyToKeep') !== undf && 
+            model.get('foreignCounted') !== null && model.get('foreignCounted') !== undf) {
           return OB.DEC.add(total, OB.DEC.mul(OB.DEC.sub(model.get('foreignCounted'), model.get('qtyToKeep')), model.get('rate')));
         } else {
           return total;
diff --git a/web/org.openbravo.retail.posterminal/js/closecash/view/tabcashtokeep.js b/web/org.openbravo.retail.posterminal/js/closecash/view/tabcashtokeep.js
--- a/web/org.openbravo.retail.posterminal/js/closecash/view/tabcashtokeep.js
+++ b/web/org.openbravo.retail.posterminal/js/closecash/view/tabcashtokeep.js
@@ -181,6 +181,9 @@
           },
           renderBody: function (modelToDraw) {
             var paymentMethod = modelToDraw.get('paymentMethod');
+            if (!paymentMethod.automatemovementtoother){
+              return true;
+            }
             this.disableControls();
             //draw
             this.renderFixedAmount(modelToDraw);