0030536: [RR15Q3] Partial payments in a layaway through "Pay Open Tickets" option does not save Received & Outstanding fields correctly

diff -r bd4f337f5e93 -r 948db671622f src/org/openbravo/retail/posterminal/OrderLoader.java
--- a/src/org/openbravo/retail/posterminal/OrderLoader.java	Mon Aug 03 14:29:13 2015 +0200
+++ b/src/org/openbravo/retail/posterminal/OrderLoader.java	Wed Aug 05 10:30:52 2015 +0200
@@ -75,6 +75,7 @@
 import org.openbravo.model.common.order.OrderLineOffer;
 import org.openbravo.model.common.order.OrderTax;
 import org.openbravo.model.common.plm.AttributeSetInstance;
+import org.openbravo.model.common.plm.Product;
 import org.openbravo.model.financialmgmt.payment.FIN_FinaccTransaction;
 import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount;
 import org.openbravo.model.financialmgmt.payment.FIN_OrigPaymentScheduleDetail;
@@ -220,7 +221,13 @@
             orderLine.setDeliveredQuantity(orderLine.getOrderedQuantity());
           }
         } else {
-          order = OBProvider.getInstance().get(Order.class);
+          OBCriteria<Order> ordercrit = OBDal.getInstance().createCriteria(Order.class);
+          ordercrit.add(Restrictions.eq(Order.PROPERTY_ID, jsonorder.getString("id")));
+          if (ordercrit.count() > 0) {
+            order = (Order) ordercrit.uniqueResult();
+          } else {
+            order = OBProvider.getInstance().get(Order.class);
+          }
           createOrder(order, jsonorder);
           OBDal.getInstance().save(order);
           lineReferences = new ArrayList<OrderLine>();
@@ -1023,9 +1030,20 @@
     int stdPrecision = order.getCurrency().getStandardPrecision().intValue();
 
     for (int i = 0; i < orderlines.length(); i++) {
-
-      OrderLine orderline = OBProvider.getInstance().get(OrderLine.class);
       JSONObject jsonOrderLine = orderlines.getJSONObject(i);
+      OrderLine orderline = null;
+      JSONObject jsonproduct = jsonOrderLine.getJSONObject("product");
+      OBCriteria<Product> prodcrit = OBDal.getInstance().createCriteria(Product.class);
+      prodcrit.add(Restrictions.idEq(jsonproduct.get("id")));
+      Product product = (Product) prodcrit.uniqueResult();
+      OBCriteria<OrderLine> ordlincrit = OBDal.getInstance().createCriteria(OrderLine.class);
+      ordlincrit.add(Restrictions.eq(OrderLine.PROPERTY_PRODUCT, product));
+      ordlincrit.add(Restrictions.eq(OrderLine.PROPERTY_SALESORDER, order));
+      if (ordlincrit.count() > 0) {
+        orderline = (OrderLine) ordlincrit.uniqueResult();
+      } else {
+        orderline = OBProvider.getInstance().get(OrderLine.class);
+      }
 
       JSONPropertyToEntity.fillBobFromJSON(ModelProvider.getInstance().getEntity(OrderLine.class),
           orderline, jsonorder, jsonorder.getLong("timezoneOffset"));
@@ -1054,9 +1072,19 @@
       while (itKeys.hasNext()) {
         String taxId = itKeys.next();
         JSONObject jsonOrderTax = taxes.getJSONObject(taxId);
-        OrderLineTax orderlinetax = OBProvider.getInstance().get(OrderLineTax.class);
+        OrderLineTax orderlinetax = null;
         TaxRate tax = (TaxRate) OBDal.getInstance().getProxy(
             ModelProvider.getInstance().getEntity(TaxRate.class).getName(), taxId);
+        OBCriteria<OrderLineTax> lintaxcrit = OBDal.getInstance()
+            .createCriteria(OrderLineTax.class);
+        lintaxcrit.add(Restrictions.eq(OrderLineTax.PROPERTY_SALESORDERLINE, orderline));
+        lintaxcrit.add(Restrictions.eq(OrderLineTax.PROPERTY_TAX, tax));
+        lintaxcrit.add(Restrictions.eq(OrderLineTax.PROPERTY_SALESORDER, order));
+        if (lintaxcrit.count() > 0) {
+          orderlinetax = (OrderLineTax) lintaxcrit.uniqueResult();
+        } else {
+          orderlinetax = OBProvider.getInstance().get(OrderLineTax.class);
+        }
         orderlinetax.setTax(tax);
         orderlinetax.setTaxableAmount(BigDecimal.valueOf(jsonOrderTax.getDouble("net")).setScale(
             stdPrecision, RoundingMode.HALF_UP));
@@ -1145,16 +1173,26 @@
       order.setUserContact(bp.getADUserList().get(0));
     }
 
+    OBDal.getInstance().save(order);
+
     JSONObject taxes = jsonorder.getJSONObject("taxes");
     @SuppressWarnings("unchecked")
     Iterator<String> itKeys = taxes.keys();
     int i = 0;
     while (itKeys.hasNext()) {
       String taxId = itKeys.next();
+      OrderTax orderTax = null;
       JSONObject jsonOrderTax = taxes.getJSONObject(taxId);
-      OrderTax orderTax = OBProvider.getInstance().get(OrderTax.class);
       TaxRate tax = (TaxRate) OBDal.getInstance().getProxy(
           ModelProvider.getInstance().getEntity(TaxRate.class).getName(), taxId);
+      OBCriteria<OrderTax> ordtaxcrit = OBDal.getInstance().createCriteria(OrderTax.class);
+      ordtaxcrit.add(Restrictions.eq(OrderTax.PROPERTY_TAX, tax)).add(
+          Restrictions.eq(OrderTax.PROPERTY_SALESORDER, order));
+      if (ordtaxcrit.list().size() > 0) {
+        orderTax = (OrderTax) ordtaxcrit.uniqueResult();
+      } else {
+        orderTax = OBProvider.getInstance().get(OrderTax.class);
+      }
       orderTax.setTax(tax);
       orderTax.setTaxableAmount(BigDecimal.valueOf(jsonOrderTax.getDouble("net")).setScale(
           stdPrecision, RoundingMode.HALF_UP));
@@ -1287,13 +1325,22 @@
 
       // Create a unique payment schedule for all payments
       BigDecimal amt = BigDecimal.valueOf(jsonorder.getDouble("payment"));
-      FIN_PaymentSchedule paymentSchedule = OBProvider.getInstance().get(FIN_PaymentSchedule.class);
+      FIN_PaymentSchedule paymentSchedule = null;
+      OBCriteria<FIN_PaymentSchedule> paymschecrit = OBDal.getInstance().createCriteria(
+          FIN_PaymentSchedule.class);
+      paymschecrit.add(Restrictions.eq(FIN_PaymentSchedule.PROPERTY_ORDER, order));
+      paymschecrit.add(Restrictions.eq(FIN_PaymentSchedule.PROPERTY_FINPAYMENTMETHOD,
+          order.getPaymentMethod()));
+      if (paymschecrit.count() > 0) {
+        paymentSchedule = (FIN_PaymentSchedule) paymschecrit.uniqueResult();
+      } else {
+        paymentSchedule = OBProvider.getInstance().get(FIN_PaymentSchedule.class);
+      }
       int stdPrecision = order.getCurrency().getStandardPrecision().intValue();
       if (!newLayaway && (notpaidLayaway || creditpaidLayaway || fullypaidLayaway)) {
         paymentSchedule = order.getFINPaymentScheduleList().get(0);
         stdPrecision = order.getCurrency().getStandardPrecision().intValue();
       } else {
-        paymentSchedule = OBProvider.getInstance().get(FIN_PaymentSchedule.class);
         paymentSchedule.setCurrency(order.getCurrency());
         paymentSchedule.setOrder(order);
         paymentSchedule.setFinPaymentmethod(order.getBusinessPartner().getPaymentMethod());