0028975: additional checks to avoid wrong cashups

diff --git a/src/org/openbravo/retail/posterminal/OrderLoader.java b/src/org/openbravo/retail/posterminal/OrderLoader.java
--- a/src/org/openbravo/retail/posterminal/OrderLoader.java
+++ b/src/org/openbravo/retail/posterminal/OrderLoader.java
@@ -142,6 +142,11 @@
           && (!jsonorder.has("preserveId") || jsonorder.getBoolean("preserveId"))) {
         return successMessage(jsonorder);
       }
+
+      if (!isQuotation && !jsonorder.getBoolean("isLayaway")) {
+        verifyCashupStatus(jsonorder);
+      }
+
       long t0 = System.currentTimeMillis();
       long t1, t11, t2, t3;
       Order order = null;
@@ -1598,6 +1603,23 @@
 
   }
 
+  protected void verifyCashupStatus(JSONObject jsonorder) throws JSONException, OBException {
+    OBContext.setAdminMode(false);
+    try {
+      if (jsonorder.has("obposAppCashup") && jsonorder.getString("obposAppCashup") != null
+          && !jsonorder.getString("obposAppCashup").equals("")) {
+        OBPOSAppCashup cashUp = OBDal.getInstance().get(OBPOSAppCashup.class,
+            jsonorder.getString("obposAppCashup"));
+        if (cashUp != null && cashUp.isProcessedbo()) {
+          // Additional check to verify that the cashup related to the order has not been processed
+          throw new OBException("The cashup related to this order has been processed");
+        }
+      }
+    } finally {
+      OBContext.restorePreviousMode();
+    }
+  }
+
   protected void createApprovals(Order order, JSONObject jsonorder) {
     if (!jsonorder.has("approvals")) {
       return;
diff --git a/src/org/openbravo/retail/posterminal/ProcessCashClose.java b/src/org/openbravo/retail/posterminal/ProcessCashClose.java
--- a/src/org/openbravo/retail/posterminal/ProcessCashClose.java
+++ b/src/org/openbravo/retail/posterminal/ProcessCashClose.java
@@ -161,7 +161,7 @@
   }
 
   private void updateOrCreateCashupInfo(String cashUpId, JSONObject jsonCashup, Date cashUpDate)
-      throws JSONException {
+      throws JSONException, OBException {
     OBPOSAppCashup cashup = OBDal.getInstance().get(OBPOSAppCashup.class, cashUpId);
     // Update cashup info
     updateCashUpInfo(cashup, jsonCashup, cashUpDate);
@@ -206,8 +206,11 @@
    * @throws JSONException
    */
   private void updateCashUpInfo(OBPOSAppCashup cashup, JSONObject jsonCashup, Date cashUpDate)
-      throws JSONException {
+      throws JSONException, OBException {
 
+    if (cashup.isProcessed() && jsonCashup.getString("isprocessed").equalsIgnoreCase("N")) {
+      throw new OBException("The cashup is processed, and it can not be set as unprocessed");
+    }
     cashup.setNetsales(new BigDecimal(jsonCashup.getString("netSales")));
     cashup.setGrosssales(new BigDecimal(jsonCashup.getString("grossSales")));
     cashup.setNetreturns(new BigDecimal(jsonCashup.getString("netReturns")));

diff --git a/src/org/openbravo/retail/posterminal/master/Cashup.java b/src/org/openbravo/retail/posterminal/master/Cashup.java
--- a/src/org/openbravo/retail/posterminal/master/Cashup.java
+++ b/src/org/openbravo/retail/posterminal/master/Cashup.java
@@ -47,10 +47,16 @@
       JSONArray respArray = new JSONArray();
       String posId = RequestContext.get().getSessionAttribute("POSTerminal").toString();
       String isprocessed = jsonsent.getString("isprocessed");
+      String isprocessedbo = "";
+      if (jsonsent.has("isprocessedbo")) {
+        isprocessedbo = " and c.isprocessedbo = "
+            + jsonsent.getString("isprocessedbo").equalsIgnoreCase("Y");
+      }
       String hqlCashup = "select c.id, c.netsales as netSales, c.grosssales as grossSales, "
           + "c.netreturns as netReturns, c.grossreturns as grossReturns, c.totalretailtransactions as totalRetailTransactions,"
           + "c.creationDate as createdDate, c.createdBy.id as userId, c.isbeingprocessed, c.isProcessed, c.pOSTerminal.id as posterminal "
-          + "from OBPOS_App_Cashup c where c.isProcessed=:isprocessed and c.pOSTerminal.id= :terminal order by c.creationDate desc";
+          + "from OBPOS_App_Cashup c where c.isProcessed=:isprocessed and c.pOSTerminal.id= :terminal "
+          + isprocessedbo + " order by c.creationDate desc";
 
       SimpleQueryBuilder querybuilder = new SimpleQueryBuilder(hqlCashup, OBContext.getOBContext()
           .getCurrentClient().getId(), OBContext.getOBContext().getCurrentOrganization().getId(),
diff --git a/web/org.openbravo.retail.posterminal/js/utils/cashUpReportUtils.js b/web/org.openbravo.retail.posterminal/js/utils/cashUpReportUtils.js
--- a/web/org.openbravo.retail.posterminal/js/utils/cashUpReportUtils.js
+++ b/web/org.openbravo.retail.posterminal/js/utils/cashUpReportUtils.js
@@ -350,7 +350,8 @@
       if (cashUp.length === 0) {
         // Search in the backoffice
         new OB.DS.Process('org.openbravo.retail.posterminal.master.Cashup').exec({
-          isprocessed: 'N'
+          isprocessed: 'N',
+          isprocessedbo: 'N'
         }, function (data) {
           // Found non processed cashups
           if (data[0]) {