0033137: Useless m_product read from services product even if services are not used

diff -u b/src/org/openbravo/retail/posterminal/OrderLoader.java b/src/org/openbravo/retail/posterminal/OrderLoader.java
--- b/src/org/openbravo/retail/posterminal/OrderLoader.java	Sun Jun 05 13:52:53 2016 +0200
+++ b/src/org/openbravo/retail/posterminal/OrderLoader.java	Sun Jun 05 14:14:59 2016 +0200
@@ -1305,8 +1305,6 @@
         // related can be null
         if (jsonOrderLine.has("relatedLines")) {
           orderLineServiceList.put(orderline.getId(), jsonOrderLine.getJSONArray("relatedLines"));
-        } else {
-          orderLineServiceList.put(orderline.getId(), null);
         }
       }
 
@@ -1380,42 +1378,40 @@
       Entry<String, JSONArray> olservice = orderLineIterator.next();
       OrderLine orderLine = OBDal.getInstance().get(OrderLine.class, olservice.getKey());
       JSONArray relatedLines = olservice.getValue();
-      if (relatedLines != null) {
-        for (int i = 0; i < relatedLines.length(); i++) {
-          OrderlineServiceRelation olServiceRelation = OBProvider.getInstance().get(
-              OrderlineServiceRelation.class);
-          JSONObject relatedJsonOrderLine = relatedLines.getJSONObject(i);
-          OrderLine rol = OBDal.getInstance().get(OrderLine.class,
-              relatedJsonOrderLine.get("orderlineId"));
-          if (rol != null) {
-            olServiceRelation.setActive(true);
-            olServiceRelation.setOrganization(orderLine.getOrganization());
-            olServiceRelation.setCreatedBy(orderLine.getCreatedBy());
-            olServiceRelation.setCreationDate(orderLine.getCreationDate());
-            if ("UQ".equals(orderLine.getProduct().getQuantityRule())) {
-              if (orderLine.getOrderedQuantity().compareTo(BigDecimal.ZERO) > 0) {
-                olServiceRelation.setQuantity(BigDecimal.ONE);
-              } else {
-                olServiceRelation.setQuantity(new BigDecimal(-1));
-              }
+      for (int i = 0; i < relatedLines.length(); i++) {
+        OrderlineServiceRelation olServiceRelation = OBProvider.getInstance().get(
+            OrderlineServiceRelation.class);
+        JSONObject relatedJsonOrderLine = relatedLines.getJSONObject(i);
+        OrderLine rol = OBDal.getInstance().get(OrderLine.class,
+            relatedJsonOrderLine.get("orderlineId"));
+        if (rol != null) {
+          olServiceRelation.setActive(true);
+          olServiceRelation.setOrganization(orderLine.getOrganization());
+          olServiceRelation.setCreatedBy(orderLine.getCreatedBy());
+          olServiceRelation.setCreationDate(orderLine.getCreationDate());
+          if ("UQ".equals(orderLine.getProduct().getQuantityRule())) {
+            if (orderLine.getOrderedQuantity().compareTo(BigDecimal.ZERO) > 0) {
+              olServiceRelation.setQuantity(BigDecimal.ONE);
             } else {
-              if (rol.getOrderedQuantity().signum() != orderLine.getOrderedQuantity().signum()) {
-                olServiceRelation.setQuantity(rol.getOrderedQuantity().negate());
-              } else {
-                olServiceRelation.setQuantity(rol.getOrderedQuantity());
-              }
-
+              olServiceRelation.setQuantity(new BigDecimal(-1));
+            }
+          } else {
+            if (rol.getOrderedQuantity().signum() != orderLine.getOrderedQuantity().signum()) {
+              olServiceRelation.setQuantity(rol.getOrderedQuantity().negate());
+            } else {
+              olServiceRelation.setQuantity(rol.getOrderedQuantity());
             }
-            olServiceRelation.setAmount(rol.getBaseGrossUnitPrice().multiply(
-                olServiceRelation.getQuantity()));
-            olServiceRelation.setUpdated(orderLine.getUpdated());
-            olServiceRelation.setUpdatedBy(orderLine.getUpdatedBy());
-            olServiceRelation.setSalesOrderLine(orderLine);
-            olServiceRelation.setOrderlineRelated(rol);
-            olServiceRelation.setId(OBMOBCUtils.getUUIDbyString(orderLine.getId() + i));
-            olServiceRelation.setNewOBObject(true);
-            OBDal.getInstance().save(olServiceRelation);
+
           }
+          olServiceRelation.setAmount(rol.getBaseGrossUnitPrice().multiply(
+              olServiceRelation.getQuantity()));
+          olServiceRelation.setUpdated(orderLine.getUpdated());
+          olServiceRelation.setUpdatedBy(orderLine.getUpdatedBy());
+          olServiceRelation.setSalesOrderLine(orderLine);
+          olServiceRelation.setOrderlineRelated(rol);
+          olServiceRelation.setId(OBMOBCUtils.getUUIDbyString(orderLine.getId() + i));
+          olServiceRelation.setNewOBObject(true);
+          OBDal.getInstance().save(olServiceRelation);
         }
       }
     }

diff -u b/src/org/openbravo/retail/posterminal/OrderLoader.java b/src/org/openbravo/retail/posterminal/OrderLoader.java
--- b/src/org/openbravo/retail/posterminal/OrderLoader.java	Sun Jun 05 14:14:59 2016 +0200
+++ b/src/org/openbravo/retail/posterminal/OrderLoader.java	Sun Jun 05 14:16:36 2016 +0200
@@ -1301,9 +1301,8 @@
       order.getOrderLineList().add(orderline);
       OBDal.getInstance().save(orderline);
 
-      if ("S".equals(orderline.getProduct().getProductType())) {
-        // related can be null
-        if (jsonOrderLine.has("relatedLines")) {
+      if (jsonOrderLine.has("relatedLines")) {
+        if ("S".equals(orderline.getProduct().getProductType())) {
           orderLineServiceList.put(orderline.getId(), jsonOrderLine.getJSONArray("relatedLines"));
         }
       }