diff --git a/src-db/database/sourcedata/AD_MESSAGE.xml b/src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml
@@ -8033,6 +8033,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -8405,6 +8417,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/OBUIAPP_PROCESS.xml b/src-db/database/sourcedata/OBUIAPP_PROCESS.xml
--- a/src-db/database/sourcedata/OBUIAPP_PROCESS.xml
+++ b/src-db/database/sourcedata/OBUIAPP_PROCESS.xml
@@ -34,6 +34,7 @@
+
diff --git a/src/org/openbravo/retail/posterminal/OBPOSComponentProvider.java b/src/org/openbravo/retail/posterminal/OBPOSComponentProvider.java
--- a/src/org/openbravo/retail/posterminal/OBPOSComponentProvider.java
+++ b/src/org/openbravo/retail/posterminal/OBPOSComponentProvider.java
@@ -284,6 +284,8 @@
globalResources.add(createComponentResource(ComponentResourceType.Static, prefix
+ "utils/unlinkDeviceOnLoad.js", ComponentResource.APP_OB3));
globalResources.add(createComponentResource(ComponentResourceType.Static, prefix
+ + "utils/unlinkDeviceValidation.js", ComponentResource.APP_OB3));
+ globalResources.add(createComponentResource(ComponentResourceType.Static, prefix
+ "/utils/checkChToFilterInWebPos.js", ComponentResource.APP_OB3));
// Buttons to Open Hardware Manager
diff --git a/src/org/openbravo/retail/posterminal/process/ValidationUnlinkDeviceActionHandler.java b/src/org/openbravo/retail/posterminal/process/ValidationUnlinkDeviceActionHandler.java
new file mode 100644
--- /dev/null
+++ b/src/org/openbravo/retail/posterminal/process/ValidationUnlinkDeviceActionHandler.java
@@ -0,0 +1,52 @@
+/*
+ ************************************************************************************
+ * Copyright (C) 2018 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.
+ ************************************************************************************
+ */
+package org.openbravo.retail.posterminal.process;
+
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.codehaus.jettison.json.JSONObject;
+import org.hibernate.criterion.Restrictions;
+import org.openbravo.base.exception.OBException;
+import org.openbravo.client.kernel.BaseActionHandler;
+import org.openbravo.dal.service.OBCriteria;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.retail.posterminal.OBPOSAppCashup;
+import org.openbravo.retail.posterminal.OBPOSApplications;
+
+public class ValidationUnlinkDeviceActionHandler extends BaseActionHandler {
+ public static final Logger log = Logger.getLogger(ValidationUnlinkDeviceActionHandler.class);
+
+ @Override protected JSONObject execute(Map parameters,String content){
+ try {
+ JSONObject result = new JSONObject();
+ final JSONObject jsonData = new JSONObject(content);
+ final String terminalId = jsonData.getString("id");
+ final OBPOSApplications terminal = OBDal.getInstance().get(OBPOSApplications.class,
+ terminalId);
+ final OBCriteria qApp = OBDal.getInstance().createCriteria(
+ OBPOSAppCashup.class);
+ qApp.add(Restrictions.eq(OBPOSAppCashup.PROPERTY_POSTERMINAL, terminal));
+ qApp.add(Restrictions.eq(OBPOSAppCashup.PROPERTY_ISPROCESSEDBO, false));
+ qApp.add(Restrictions.eq(OBPOSAppCashup.PROPERTY_ISPROCESSED, false));
+
+ qApp.setMaxResults(1);
+
+ final int num = qApp.count();
+
+ if (num > 0) {
+ result.put("hasNotClosedCashup","Y");
+ }
+
+ return result;
+ } catch (Exception e) {
+ throw new OBException(e);
+ }
+ }
+}
\ No newline at end of file
diff --git a/web/org.openbravo.retail.posterminal/js/utils/unlinkDeviceValidation.js b/web/org.openbravo.retail.posterminal/js/utils/unlinkDeviceValidation.js
new file mode 100644
--- /dev/null
+++ b/web/org.openbravo.retail.posterminal/js/utils/unlinkDeviceValidation.js
@@ -0,0 +1,36 @@
+/*
+ ************************************************************************************
+ * Copyright (C) 2018 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.
+ ************************************************************************************
+ */
+
+/*global OB */
+
+OB.POS = window.OB.POS || {};
+OB.POS.UnlinkDevice = window.OB.POS.UnlinkDevice || {};
+
+OB.POS.UnlinkDevice.validation = function (view, actionHandlerCall, failureCallback) {
+ var callback = function (rpcResponse, data, rpcRequest) {
+ if (data.hasNotClosedCashup !== "Y") {
+ actionHandlerCall();
+ } else {
+ isc.confirm(OB.I18N.getLabel('OBPOS_CashupNotProcessed'), {
+ isModal: true,
+ showModalMask: true,
+ title: OB.I18N.getLabel('OBPOS_CashupNotProcessedTitle')
+ }, function (clickedOK) {
+ if (clickedOK) {
+ actionHandlerCall();
+ } else {
+ failureCallback();
+ }
+ });
+ }
+ };
+ OB.RemoteCallManager.call('org.openbravo.retail.posterminal.process.ValidationUnlinkDeviceActionHandler', {
+ id: view.parentWindow.view.viewGrid.getSelectedRecord().id
+ }, {}, callback);
+};
\ No newline at end of file