0040468: If a previously imported layaway is paid, goes to Errors While Importing POS Data and layaway is voided it cannot be Save Again

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1553767639 -19800
#      Thu Mar 28 15:37:19 2019 +0530
# Node ID 5d59837eae03f2f88d38a271cf6eae11336e7d8f
# Parent  345300ecb83a20f03bf96f5e1f2591078d176e2b
Related to issue 40468 : Applied New Java Formatting

diff -r 345300ecb83a -r 5d59837eae03 src/org/openbravo/retail/autocancelreservation/process/VoidLayawaysBGProcess.java
--- a/src/org/openbravo/retail/autocancelreservation/process/VoidLayawaysBGProcess.java	Fri Feb 22 11:57:38 2019 +0100
+++ b/src/org/openbravo/retail/autocancelreservation/process/VoidLayawaysBGProcess.java	Thu Mar 28 15:37:19 2019 +0530
@@ -116,18 +116,19 @@
 
   private void logNumberOfLayawaysVoided(ProcessLogger logger, int voidedCounter) {
     String[] paramsVoided = { String.valueOf(voidedCounter - 1) };
-    logger.logln(OBMessageUtils.getI18NMessage("OBRACR_VoidLayawaysBGProcessLayawaysVoided",
-        paramsVoided));
+    logger.logln(
+        OBMessageUtils.getI18NMessage("OBRACR_VoidLayawaysBGProcessLayawaysVoided", paramsVoided));
   }
 
-  private int voidOrgLayaways(ProcessLogger logger, int pVoidedCounter,
-      String targetOrganizationId, String limitDate) throws Exception {
+  private int voidOrgLayaways(ProcessLogger logger, int pVoidedCounter, String targetOrganizationId,
+      String limitDate) throws Exception {
     int voidedCounter = pVoidedCounter;
     // Create query
     StringBuilder sb = new StringBuilder();
     sb.append("SELECT ord.id");
     sb.append(" FROM Order AS ord");
-    sb.append(" WHERE ord.obposApplications IS NOT NULL AND (SELECT SUM(ABS(deliveredQuantity)) FROM ord.orderLineList) = 0 AND ord.documentStatus = 'CO'");
+    sb.append(
+        " WHERE ord.obposApplications IS NOT NULL AND (SELECT SUM(ABS(deliveredQuantity)) FROM ord.orderLineList) = 0 AND ord.documentStatus = 'CO'");
     sb.append(" AND ord.obposIslayaway = true");
     sb.append(" AND ord.oBRACRErrorLog is null");
     sb.append(" AND ord.organization.id = :targetOrganizationId");
@@ -136,8 +137,10 @@
       sb.append(filter);
     }
 
-    sb.append(" AND not exists (select 1 from FIN_Payment_Schedule fps, FIN_Payment_ScheduleDetail fpsd WHERE ord.id = fps.order.id AND fpsd.orderPaymentSchedule = fps and fpsd.paymentDetails is not null)");
-    sb.append(" AND ((ord.obracrExpirationdate IS NULL AND TO_CHAR(ord.creationDate,'yyyy-mm-dd hh24:mi:ss') <= :limitDate )");
+    sb.append(
+        " AND not exists (select 1 from FIN_Payment_Schedule fps, FIN_Payment_ScheduleDetail fpsd WHERE ord.id = fps.order.id AND fpsd.orderPaymentSchedule = fps and fpsd.paymentDetails is not null)");
+    sb.append(
+        " AND ((ord.obracrExpirationdate IS NULL AND TO_CHAR(ord.creationDate,'yyyy-mm-dd hh24:mi:ss') <= :limitDate )");
     sb.append(" OR (ord.obracrExpirationdate IS NOT NULL AND ord.obracrExpirationdate <= NOW()))");
     // Get layaways
     Query<String> layawayList = OBDal.getInstance()
@@ -222,8 +225,8 @@
   }
 
   private Long getHoursToVoid(String targetOrganizationId) {
-    Organization targetOrganization = OBDal.getInstance().get(Organization.class,
-        targetOrganizationId);
+    Organization targetOrganization = OBDal.getInstance()
+        .get(Organization.class, targetOrganizationId);
     if (targetOrganizationId.equals("0") && targetOrganization.getObracrHourstovoid() == null) {
       return null;
     } else if (targetOrganization.getObracrHourstovoid() != null) {
@@ -244,8 +247,8 @@
     List<PostVoidLayawayBGHook> result = new ArrayList<PostVoidLayawayBGHook>();
     BeanManager manager = WeldUtils.getStaticInstanceBeanManager();
     for (Bean<?> hookBean : manager.getBeans(PostVoidLayawayBGHook.class)) {
-      result.add((PostVoidLayawayBGHook) manager.getReference(hookBean,
-          PostVoidLayawayBGHook.class, manager.createCreationalContext(hookBean)));
+      result.add((PostVoidLayawayBGHook) manager.getReference(hookBean, PostVoidLayawayBGHook.class,
+          manager.createCreationalContext(hookBean)));
     }
     return result;
   }

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1553768994 -19800
#      Thu Mar 28 15:59:54 2019 +0530
# Node ID 72a11d3ccbf75ae02309a810a0c7bc8cbb8f12b6
# Parent  5d59837eae03f2f88d38a271cf6eae11336e7d8f
Related to issue 40468 : Layaways present in Importing Error List should not be voided

diff -r 5d59837eae03 -r 72a11d3ccbf7 src/org/openbravo/retail/autocancelreservation/process/VoidLayawaysBGProcess.java
--- a/src/org/openbravo/retail/autocancelreservation/process/VoidLayawaysBGProcess.java	Thu Mar 28 15:37:19 2019 +0530
+++ b/src/org/openbravo/retail/autocancelreservation/process/VoidLayawaysBGProcess.java	Thu Mar 28 15:59:54 2019 +0530
@@ -141,6 +141,8 @@
         " AND not exists (select 1 from FIN_Payment_Schedule fps, FIN_Payment_ScheduleDetail fpsd WHERE ord.id = fps.order.id AND fpsd.orderPaymentSchedule = fps and fpsd.paymentDetails is not null)");
     sb.append(
         " AND ((ord.obracrExpirationdate IS NULL AND TO_CHAR(ord.creationDate,'yyyy-mm-dd hh24:mi:ss') <= :limitDate )");
+    sb.append(
+        " AND not exists (select 1 from OBPOS_Errors where jsoninfo LIKE CONCAT ('%', ord.id, '%'))");
     sb.append(" OR (ord.obracrExpirationdate IS NOT NULL AND ord.obracrExpirationdate <= NOW()))");
     // Get layaways
     Query<String> layawayList = OBDal.getInstance()