0031838: Cash Management events are not filtered by the selected payment method

diff --git a/src/org/openbravo/retail/posterminal/term/CashMgmtDepositEvents.java b/src/org/openbravo/retail/posterminal/term/CashMgmtDepositEvents.java
--- a/src/org/openbravo/retail/posterminal/term/CashMgmtDepositEvents.java
+++ b/src/org/openbravo/retail/posterminal/term/CashMgmtDepositEvents.java
@@ -19,8 +19,9 @@
   @Override
   protected List<String> getQuery(JSONObject jsonsent) throws JSONException {
     return Arrays
-        .asList(new String[] { "select c.id as id, c.name as name, c.paymentMethod.id as paymentmethod, 'deposit' as type from OBRETCO_CashManagementEvents c "
-            + "where  c.$naturalOrgCriteria and c.eventtype like '%IN%' order by c.name  " });
+        .asList(new String[] { "select c.id as id, c.name as name, c.paymentMethod.id as paymentmethod, 'deposit' as type, "
+            + "c.currency.iSOCode as isocode from OBRETCO_CashManagementEvents c "
+            + "where c.$naturalOrgCriteria and c.eventtype like '%IN%' order by c.name  " });
   }
 
   @Override
diff --git a/src/org/openbravo/retail/posterminal/term/CashMgmtDropEvents.java b/src/org/openbravo/retail/posterminal/term/CashMgmtDropEvents.java
--- a/src/org/openbravo/retail/posterminal/term/CashMgmtDropEvents.java
+++ b/src/org/openbravo/retail/posterminal/term/CashMgmtDropEvents.java
@@ -19,8 +19,9 @@
   @Override
   protected List<String> getQuery(JSONObject jsonsent) throws JSONException {
     return Arrays
-        .asList(new String[] { "select c.id as id, c.name as name, c.paymentMethod.id as paymentmethod, 'drop' as type from OBRETCO_CashManagementEvents c "
-            + "where  c.$naturalOrgCriteria and c.eventtype like '%OUT%' order by c.name " });
+        .asList(new String[] { "select c.id as id, c.name as name, c.paymentMethod.id as paymentmethod, 'drop' as type, "
+            + "c.currency.iSOCode as isocode from OBRETCO_CashManagementEvents c "
+            + "where c.$naturalOrgCriteria and c.eventtype like '%OUT%' order by c.name " });
   }
 
   @Override
diff --git a/web/org.openbravo.retail.posterminal/js/cashmgmt/model/cashmgmt-model.js b/web/org.openbravo.retail.posterminal/js/cashmgmt/model/cashmgmt-model.js
--- a/web/org.openbravo.retail.posterminal/js/cashmgmt/model/cashmgmt-model.js
+++ b/web/org.openbravo.retail.posterminal/js/cashmgmt/model/cashmgmt-model.js
@@ -1,6 +1,6 @@
 /*
  ************************************************************************************
- * Copyright (C) 2012-2015 Openbravo S.L.U.
+ * Copyright (C) 2012-2016 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -190,18 +190,17 @@
     var me = this;
 
     function updateCashMgmEvents(paymentMethodList) {
-      var i;
-      var paymentMethodId;
-      for (i = 0; i < me.attributes.cashMgmtDepositEvents.models.length; i++) {
-        paymentMethodId = me.attributes.cashMgmtDepositEvents.models[i].attributes.paymentmethod;
+      var i, paymentMethodId;
+      for (i = 0; i < me.get('cashMgmtDepositEvents').models.length; i++) {
+        paymentMethodId = me.get('cashMgmtDepositEvents').at(i).get('paymentmethod');
         if (paymentMethodList.indexOf(paymentMethodId) === -1) {
-          me.attributes.cashMgmtDepositEvents.remove(me.attributes.cashMgmtDepositEvents.at(i));
+          me.get('cashMgmtDepositEvents').remove(me.get('cashMgmtDepositEvents').at(i));
         }
       }
-      for (i = 0; i < me.attributes.cashMgmtDropEvents.models.length; i++) {
-        paymentMethodId = me.attributes.cashMgmtDropEvents.models[i].attributes.paymentmethod;
+      for (i = 0; i < me.get('cashMgmtDropEvents').models.length; i++) {
+        paymentMethodId = me.get('cashMgmtDropEvents').at(i).get('paymentmethod');
         if (paymentMethodList.indexOf(paymentMethodId) === -1) {
-          me.attributes.cashMgmtDropEvents.remove(me.attributes.cashMgmtDropEvents.at(i));
+          me.get('cashMgmtDropEvents').remove(me.get('cashMgmtDropEvents').at(i));
         }
       }
     }
diff --git a/web/org.openbravo.retail.posterminal/js/cashmgmt/view/cashmgmtkeyboard.js b/web/org.openbravo.retail.posterminal/js/cashmgmt/view/cashmgmtkeyboard.js
--- a/web/org.openbravo.retail.posterminal/js/cashmgmt/view/cashmgmtkeyboard.js
+++ b/web/org.openbravo.retail.posterminal/js/cashmgmt/view/cashmgmtkeyboard.js
@@ -51,7 +51,7 @@
             backupDropEvents.add(cmevent);
           });
           backupDropEvents.each(function (cmevent) {
-            if (cmevent.attributes.paymentmethod !== paymentMethod) {
+            if (cmevent.attributes.paymentmethod !== paymentMethod || cmevent.get('isocode') !== isocode) {
               me.owner.owner.owner.model.attributes.cashMgmtDropEvents.remove(cmevent);
             }
           });
@@ -63,7 +63,7 @@
             backupDepositEvents.add(cmevent);
           });
           backupDepositEvents.each(function (cmevent) {
-            if (cmevent.attributes.paymentmethod !== paymentMethod) {
+            if (cmevent.attributes.paymentmethod !== paymentMethod || cmevent.get('isocode') !== isocode) {
               me.owner.owner.owner.model.attributes.cashMgmtDepositEvents.remove(cmevent);
             }
           });
@@ -94,23 +94,34 @@
       if (OB.POS.modelterminal.get('terminal').isslave && paymentMethod.paymentMethod.isshared) {
         return true;
       }
-      var payment = paymentMethod.payment;
+      var payment = paymentMethod.payment,
+          i;
       if (paymentMethod.paymentMethod.allowdeposits) {
-        buttons.push({
-          idSufix: 'Deposit.' + paymentMethod.isocode,
-          command: payment.searchKey + '_' + OB.I18N.getLabel('OBPOS_LblDeposit'),
-          definition: this.getPayment(payment.id, payment.searchKey, paymentMethod.paymentMethod.iscash, paymentMethod.paymentMethod.allowopendrawer, payment._identifier, payment._identifier, 'deposit', paymentMethod.rate, paymentMethod.isocode, paymentMethod.paymentMethod.gLItemForDeposits, paymentMethod.paymentMethod.paymentMethod),
-          label: payment._identifier + ' ' + OB.I18N.getLabel('OBPOS_LblDeposit')
-        });
+        for (i = 0; i < OB.MobileApp.model.get('cashMgmtDepositEvents').length; i++) {
+          if (OB.MobileApp.model.get('cashMgmtDepositEvents')[i].isocode === paymentMethod.isocode && paymentMethod.paymentMethod.paymentMethod === OB.MobileApp.model.get('cashMgmtDepositEvents')[i].paymentmethod) {
+            buttons.push({
+              idSufix: 'Deposit.' + paymentMethod.isocode,
+              command: payment.searchKey + '_' + OB.I18N.getLabel('OBPOS_LblDeposit'),
+              definition: this.getPayment(payment.id, payment.searchKey, paymentMethod.paymentMethod.iscash, paymentMethod.paymentMethod.allowopendrawer, payment._identifier, payment._identifier, 'deposit', paymentMethod.rate, paymentMethod.isocode, paymentMethod.paymentMethod.gLItemForDeposits, paymentMethod.paymentMethod.paymentMethod),
+              label: payment._identifier + ' ' + OB.I18N.getLabel('OBPOS_LblDeposit')
+            });
+            break;
+          }
+        }
       }
 
       if (paymentMethod.paymentMethod.allowdrops) {
-        buttons.push({
-          idSufix: 'Withdrawal.' + paymentMethod.isocode,
-          command: payment.searchKey + '_' + OB.I18N.getLabel('OBPOS_LblWithdrawal'),
-          definition: this.getPayment(payment.id, payment.searchKey, paymentMethod.paymentMethod.iscash, paymentMethod.paymentMethod.allowopendrawer, payment._identifier, payment._identifier, 'drop', paymentMethod.rate, paymentMethod.isocode, paymentMethod.paymentMethod.gLItemForDrops, paymentMethod.paymentMethod.paymentMethod),
-          label: payment._identifier + ' ' + OB.I18N.getLabel('OBPOS_LblWithdrawal')
-        });
+        for (i = 0; i < OB.MobileApp.model.get('cashMgmtDropEvents').length; i++) {
+          if (OB.MobileApp.model.get('cashMgmtDropEvents')[i].isocode === paymentMethod.isocode && paymentMethod.paymentMethod.paymentMethod === OB.MobileApp.model.get('cashMgmtDropEvents')[i].paymentmethod) {
+            buttons.push({
+              idSufix: 'Withdrawal.' + paymentMethod.isocode,
+              command: payment.searchKey + '_' + OB.I18N.getLabel('OBPOS_LblWithdrawal'),
+              definition: this.getPayment(payment.id, payment.searchKey, paymentMethod.paymentMethod.iscash, paymentMethod.paymentMethod.allowopendrawer, payment._identifier, payment._identifier, 'drop', paymentMethod.rate, paymentMethod.isocode, paymentMethod.paymentMethod.gLItemForDrops, paymentMethod.paymentMethod.paymentMethod),
+              label: payment._identifier + ' ' + OB.I18N.getLabel('OBPOS_LblWithdrawal')
+            });
+            break;
+          }
+        }
       }
     }, this);