0025623: It is possible to return more quantity than sold quantity

diff --git a/src/org/openbravo/retail/posterminal/PaidReceiptLinesProperties.java b/src/org/openbravo/retail/posterminal/PaidReceiptLinesProperties.java
--- a/src/org/openbravo/retail/posterminal/PaidReceiptLinesProperties.java
+++ b/src/org/openbravo/retail/posterminal/PaidReceiptLinesProperties.java
@@ -42,6 +42,10 @@
         add(new HQLProperty("ordLine.salesOrder.currency.pricePrecision", "pricePrecision"));
         add(new HQLProperty("ordLine.warehouse.id", "warehouse"));
         add(new HQLProperty("ordLine.warehouse.name", "warehousename"));
+        // Only used for returns
+        add(new HQLProperty(
+            "(ordLine.deliveredQuantity - (select coalesce(abs(sum(deliveredQuantity)),0) from OrderLine where goodsShipmentLine.salesOrderLine.id =ordLine.id))",
+            "remainingQuantity"));
       }
     };
 
diff --git a/src/org/openbravo/retail/posterminal/PaidReceiptShipLinesProperties.java b/src/org/openbravo/retail/posterminal/PaidReceiptShipLinesProperties.java
new file mode 100644
--- /dev/null
+++ b/src/org/openbravo/retail/posterminal/PaidReceiptShipLinesProperties.java
@@ -0,0 +1,46 @@
+/*
+ ************************************************************************************
+ * Copyright (C) 2014 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;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.openbravo.client.kernel.ComponentProvider.Qualifier;
+import org.openbravo.mobile.core.model.HQLProperty;
+import org.openbravo.mobile.core.model.ModelExtension;
+
+/**
+ * Defines hql properties for the PaidReceipsShipLines Order
+ * 
+ * @author mdj
+ * 
+ */
+
+@Qualifier(PaidReceipts.paidReceiptsShipLinesPropertyExtension)
+public class PaidReceiptShipLinesProperties extends ModelExtension {
+
+  @Override
+  public List<HQLProperty> getHQLProperties(Object params) {
+    ArrayList<HQLProperty> list = new ArrayList<HQLProperty>() {
+      private static final long serialVersionUID = 1L;
+      {
+        add(new HQLProperty("id", "shipLineId"));
+        add(new HQLProperty("shipmentReceipt.documentNo", "shipment"));
+        add(new HQLProperty("lineNo", "shipmentlineNo"));
+        add(new HQLProperty("movementQuantity", "qty"));
+        add(new HQLProperty(
+            "movementQuantity - (select coalesce(sum(abs(deliveredQuantity)),0) from OrderLine where goodsShipmentLine.id = m.id)",
+            "remainingQty"));
+      }
+    };
+
+    return list;
+  }
+}
diff --git a/src/org/openbravo/retail/posterminal/PaidReceipts.java b/src/org/openbravo/retail/posterminal/PaidReceipts.java
--- a/src/org/openbravo/retail/posterminal/PaidReceipts.java
+++ b/src/org/openbravo/retail/posterminal/PaidReceipts.java
@@ -32,12 +32,12 @@
 import org.openbravo.mobile.core.model.ModelExtension;
 import org.openbravo.mobile.core.model.ModelExtensionUtils;
 import org.openbravo.model.common.order.OrderLineOffer;
-import org.openbravo.model.materialmgmt.transaction.ShipmentInOutLine;
 import org.openbravo.service.json.JsonConstants;
 
 public class PaidReceipts extends JSONProcessSimple {
   public static final String paidReceiptsPropertyExtension = "PRExtension";
   public static final String paidReceiptsLinesPropertyExtension = "PRExtensionLines";
+  public static final String paidReceiptsShipLinesPropertyExtension = "PRExtensionShipLines";
 
   @Inject
   @Any
@@ -47,6 +47,10 @@
   @Any
   @Qualifier(paidReceiptsLinesPropertyExtension)
   private Instance<ModelExtension> extensionsLines;
+  @Inject
+  @Any
+  @Qualifier(paidReceiptsShipLinesPropertyExtension)
+  private Instance<ModelExtension> extensionsShipLines;
 
   @Override
   public JSONObject exec(JSONObject jsonsent) throws JSONException, ServletException {
@@ -87,8 +91,14 @@
             .getPropertyExtensions(extensionsLines);
         String hqlPaidReceiptsLines = "select " + hqlPropertiesLines.getHqlSelect() + //
             "  from OrderLine as ordLine " + //
-            " where ordLine.salesOrder.id=? " + //
-            " order by ordLine.lineNo";
+            " where ordLine.salesOrder.id=? "; //
+
+        // get returns
+        if (jsonsent.has("forReturn") && jsonsent.getBoolean("forReturn")) {
+          hqlPaidReceiptsLines += "and ordLine.deliveredQuantity > (select coalesce(abs(sum(deliveredQuantity)),0) from OrderLine where goodsShipmentLine.salesOrderLine.id =ordLine.id)";
+        }
+
+        hqlPaidReceiptsLines += " order by ordLine.lineNo";
         Query paidReceiptsLinesQuery = OBDal.getInstance().getSession()
             .createQuery(hqlPaidReceiptsLines);
         paidReceiptsLinesQuery.setString(0, orderid);
@@ -107,21 +117,31 @@
 
           // get shipmentLines for returns
           if (jsonsent.has("forReturn") && jsonsent.getBoolean("forReturn")) {
-            OBCriteria<ShipmentInOutLine> shipLinesCri = OBDal.getInstance().createCriteria(
-                ShipmentInOutLine.class);
-            shipLinesCri.add(Restrictions.eq(ShipmentInOutLine.PROPERTY_SALESORDERLINE + ".id",
-                (String) objpaidReceiptsLines[6]));
-            shipLinesCri.addOrder(Order.asc(ShipmentInOutLine.PROPERTY_LINENO));
+            HQLPropertyList hqlPropertiesShipLines = ModelExtensionUtils
+                .getPropertyExtensions(extensionsShipLines);
+            String hqlPaidReceiptsShipLines = "select "
+                + hqlPropertiesShipLines.getHqlSelect() //
+                + " from MaterialMgmtShipmentInOutLine as m where salesOrderLine.id= ? "
+                + " and movementQuantity > (select coalesce(sum(abs(deliveredQuantity)),0) from OrderLine where goodsShipmentLine.id = m.id)";
+            OBDal.getInstance().getSession().createQuery(hqlPaidReceiptsShipLines);
+            Query paidReceiptsShipLinesQuery = OBDal.getInstance().getSession()
+                .createQuery(hqlPaidReceiptsShipLines);
+            paidReceiptsShipLinesQuery.setString(0, (String) objpaidReceiptsLines[6]);
+
+            // cycle through the lines of the selected order
             JSONArray shipmentlines = new JSONArray();
-            for (ShipmentInOutLine shipline : shipLinesCri.list()) {
+            for (Object objShipLines : paidReceiptsShipLinesQuery.list()) {
+
               JSONObject jsonShipline = new JSONObject();
-              jsonShipline.put("shipLineId", shipline.getId());
-              jsonShipline.put("shipment", shipline.getShipmentReceipt().getDocumentNo());
-              jsonShipline.put("shipmentlineNo", shipline.getLineNo());
-              jsonShipline.put("qty", shipline.getMovementQuantity());
+              Object[] objpaidReceiptsShipLines = (Object[]) objShipLines;
+              jsonShipline.put("shipLineId", objpaidReceiptsShipLines[0]);
+              jsonShipline.put("shipment", objpaidReceiptsShipLines[1]);
+              jsonShipline.put("shipmentlineNo", objpaidReceiptsShipLines[2]);
+              jsonShipline.put("qty", objpaidReceiptsShipLines[3]);
+              jsonShipline.put("remainingQty", objpaidReceiptsShipLines[4]);
               shipmentlines.put(jsonShipline);
-              paidReceiptLine.put("shipmentlines", shipmentlines);
             }
+            paidReceiptLine.put("shipmentlines", shipmentlines);
           }
 
           // promotions per line
diff --git a/src/org/openbravo/retail/posterminal/PaidReceiptsHeader.java b/src/org/openbravo/retail/posterminal/PaidReceiptsHeader.java
--- a/src/org/openbravo/retail/posterminal/PaidReceiptsHeader.java
+++ b/src/org/openbravo/retail/posterminal/PaidReceiptsHeader.java
@@ -75,7 +75,7 @@
       hqlPaidReceipts += " and (select sum(deliveredQuantity) from ord.orderLineList where orderedQuantity > 0)=0 and ord.documentStatus = 'CO' ";
     } else if (json.getBoolean("isReturn")) {
       // (It is not Layaway and It is not a Return)
-      hqlPaidReceipts += " and ((select count(deliveredQuantity) from ord.orderLineList where deliveredQuantity != 0) > 0 and (select count(orderedQuantity) from ord.orderLineList where orderedQuantity > 0) > 0) ";
+      hqlPaidReceipts += " and ((select count(deliveredQuantity) from ord.orderLineList where deliveredQuantity != 0) > 0 and (select count(id) from OrderLine as line  where line.salesOrder=ord and line.deliveredQuantity > (select coalesce(abs(sum(deliveredQuantity)),0) from OrderLine where goodsShipmentLine.salesOrderLine.id =line.id)) > 0)";
     } else {
       // (It is not Layaway or it is a Return)
       hqlPaidReceipts += " and exists(select 1 from ord.orderLineList where deliveredQuantity != 0) ";

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
@@ -1,5 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <data>
+<!--2D7379FB65554D0DA2AFF2DA234C8AF7--><AD_MESSAGE>
+<!--2D7379FB65554D0DA2AFF2DA234C8AF7-->  <AD_MESSAGE_ID><![CDATA[2D7379FB65554D0DA2AFF2DA234C8AF7]]></AD_MESSAGE_ID>
+<!--2D7379FB65554D0DA2AFF2DA234C8AF7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2D7379FB65554D0DA2AFF2DA234C8AF7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2D7379FB65554D0DA2AFF2DA234C8AF7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2D7379FB65554D0DA2AFF2DA234C8AF7-->  <VALUE><![CDATA[OBRETUR_LblRemainingQty]]></VALUE>
+<!--2D7379FB65554D0DA2AFF2DA234C8AF7-->  <MSGTEXT><![CDATA[Rem. Qty]]></MSGTEXT>
+<!--2D7379FB65554D0DA2AFF2DA234C8AF7-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--2D7379FB65554D0DA2AFF2DA234C8AF7-->  <AD_MODULE_ID><![CDATA[540C0D82BFD74311A4912E29289B73CC]]></AD_MODULE_ID>
+<!--2D7379FB65554D0DA2AFF2DA234C8AF7-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--2D7379FB65554D0DA2AFF2DA234C8AF7--></AD_MESSAGE>
+
 <!--31A4800337384A27AF86F58901854342--><AD_MESSAGE>
 <!--31A4800337384A27AF86F58901854342-->  <AD_MESSAGE_ID><![CDATA[31A4800337384A27AF86F58901854342]]></AD_MESSAGE_ID>
 <!--31A4800337384A27AF86F58901854342-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -41,8 +53,8 @@
 <!--60647156393D4CC8974A10C4115C44BC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--60647156393D4CC8974A10C4115C44BC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--60647156393D4CC8974A10C4115C44BC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--60647156393D4CC8974A10C4115C44BC-->  <VALUE><![CDATA[OBRETUR_LblMaxQty]]></VALUE>
-<!--60647156393D4CC8974A10C4115C44BC-->  <MSGTEXT><![CDATA[Max Qty]]></MSGTEXT>
+<!--60647156393D4CC8974A10C4115C44BC-->  <VALUE><![CDATA[OBRETUR_LblTotalQty]]></VALUE>
+<!--60647156393D4CC8974A10C4115C44BC-->  <MSGTEXT><![CDATA[Tot. Qty]]></MSGTEXT>
 <!--60647156393D4CC8974A10C4115C44BC-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
 <!--60647156393D4CC8974A10C4115C44BC-->  <AD_MODULE_ID><![CDATA[540C0D82BFD74311A4912E29289B73CC]]></AD_MODULE_ID>
 <!--60647156393D4CC8974A10C4115C44BC-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
diff --git a/web/org.openbravo.retail.returns/js/modalReturnLines.js b/web/org.openbravo.retail.returns/js/modalReturnLines.js
--- a/web/org.openbravo.retail.returns/js/modalReturnLines.js
+++ b/web/org.openbravo.retail.returns/js/modalReturnLines.js
@@ -100,8 +100,8 @@
       var line, promotionsfactor;
       if (index !== -1) {
         if (this.$.checkboxButtonReturn.checked) {
-          var initialQty = inEvent.lines[index].quantity;
-          inEvent.lines[index].quantity = this.$.quantity.getValue();
+          var initialQty = inEvent.lines[index].remainingQuantity;
+          inEvent.lines[index].remainingQuantity = this.$.quantity.getValue();
           var qty = this.$.quantity.getValue();
           enyo.forEach(model.get('order').get('lines').models, function (l) {
             if (l.get('originalOrderLineId')) {
@@ -131,12 +131,16 @@
     }, {
       name: 'product',
       classes: 'span4',
-      style: 'line-height: 40px; font-size: 17px;'
+      style: 'line-height: 40px; font-size: 17px; width: 150px;'
     }, {
-      name: 'maxQuantity',
+      name: 'totalQuantity',
       classes: 'span2',
       style: 'line-height: 40px; font-size: 17px; width: 70px;'
     }, {
+      name: 'remainingQuantity',
+      classes: 'span2',
+      style: 'line-height: 40px; font-size: 17px; width:85px;'
+    }, {
       name: 'qtyminus',
       kind: 'OB.UI.SmallButton',
       style: 'width: 40px',
@@ -147,7 +151,7 @@
       kind: 'enyo.Input',
       type: 'text',
       classes: 'input span1',
-      style: 'margin-right: 2px; text-align: center;',
+      style: 'margin-right: 2px; text-align: center; width: 50px;',
       name: 'quantity',
       isFirstFocus: true,
       selectOnFocus: true,
@@ -163,7 +167,7 @@
     }, {
       name: 'price',
       classes: 'span2',
-      style: 'line-height: 40px; font-size: 17px;'
+      style: 'line-height: 40px; font-size: 17px; width: 100px;'
     }, {
       style: 'clear: both;'
     }],
@@ -234,12 +238,13 @@
       this.inherited(arguments);
 
       this.$.product.setContent(this.newAttribute.name);
-      this.$.maxQuantity.setContent(this.newAttribute.quantity);
+      this.$.remainingQuantity.setContent(this.newAttribute.remainingQuantity);
+      this.$.totalQuantity.setContent(this.newAttribute.quantity);
       this.$.quantity.setDisabled(true);
       this.$.qtyplus.setDisabled(true);
       this.$.qtyminus.setDisabled(true);
-      this.$.quantity.setValue(this.newAttribute.quantity);
-      this.$.quantity.setAttribute('max', this.newAttribute.quantity);
+      this.$.quantity.setValue(this.newAttribute.remainingQuantity);
+      this.$.quantity.setAttribute('max', this.newAttribute.remainingQuantity);
       this.$.quantity.setAttribute('min', OB.DEC.One);
       this.$.price.setContent(this.newAttribute.priceIncludesTax ? this.newAttribute.unitPrice : this.newAttribute.baseNetUnitPrice);
       if (this.newAttribute.promotions.length > 0) {
@@ -250,7 +255,7 @@
             return;
           }
           this.createComponent({
-            style: 'display: block; color:gray; font-size:13px; line-height: 20px;',
+            style: 'display: block; color:gray; font-size:13px; line-height: 20px;  width: 150px;',
             components: [{
               content: '-- ' + d.name,
               attributes: {
@@ -323,6 +328,8 @@
   enyo.kind({
     name: 'OB.UI.ModalReturnReceipt',
     kind: 'OB.UI.ModalAction',
+    classes: 'modal-dialog',
+    style: 'width: 650px;',
     correctQty: true,
     handlers: {
       onApplyChanges: 'applyChanges',
@@ -374,7 +381,7 @@
           OB.Dal.get(OB.Model.Product, line.id, function (prod) {
             prod.set('ignorePromotions', true);
             prod.set('standardPrice', line.priceIncludesTax ? line.unitPrice : line.baseNetUnitPrice);
-            me.args.args.context.model.get('order').createLine(prod, -line.quantity, null, {
+            me.args.args.context.model.get('order').createLine(prod, -line.remainingQuantity, null, {
               'originalOrderLineId': line.lineId,
               'originalDocumentNo': me.args.args.order.documentNo,
               'skipApplyPromotions': true,
@@ -452,6 +459,7 @@
             splitline.shiplineNo = sline.shipmentlineNo;
             splitline.shipment = sline.shipment;
             splitline.shipmentlineId = sline.shipLineId;
+            splitline.remainingQuantity = sline.remainingQty;
             // delete confusing properties
             delete splitline.linegrossamount;
             delete splitline.warehouse;
@@ -467,8 +475,8 @@
                       splitpromo[attr] = p[attr];
                     }
                   }
-                  splitpromo.amt = OB.DEC.mul(p.amt, (splitline.quantity / line.quantity));
-                  splitpromo.actualAmt = OB.DEC.mul(p.actualAmt, (splitline.quantity / line.quantity));
+                  splitpromo.amt = OB.DEC.mul(p.amt, (splitline.remainingQuantity / line.remainingQuantity));
+                  splitpromo.actualAmt = OB.DEC.mul(p.actualAmt, (splitline.remainingQuantity / line.remainingQuantity));
                   splitline.promotions.push(splitpromo);
                 }
               });
@@ -492,7 +500,8 @@
     },
     executeOnShow: function () {
       var me = this,
-          newArray = [];
+          newArray = [],
+          lineNum = 0;
       this.$.bodyContent.$.attributes.destroyComponents();
       this.$.header.destroyComponents();
       this.$.header.createComponent({
@@ -519,22 +528,27 @@
             content: OB.I18N.getLabel('OBRETUR_LblProductName'),
             name: 'productNameLbl',
             classes: 'span4',
-            style: 'line-height: 40px; font-size: 17px;'
+            style: 'line-height: 40px; font-size: 17px;  width: 150px;'
           }, {
-            name: 'maxQtyLbl',
-            content: OB.I18N.getLabel('OBRETUR_LblMaxQty'),
+            name: 'totalQtyLbl',
+            content: OB.I18N.getLabel('OBRETUR_LblTotalQty'),
             classes: 'span2',
             style: 'line-height: 40px; font-size: 17px; width: 70px;'
           }, {
+            name: 'remainingQtyLbl',
+            content: OB.I18N.getLabel('OBRETUR_LblRemainingQty'),
+            classes: 'span2',
+            style: 'line-height: 40px; font-size: 17px; width: 85px;'
+          }, {
             content: OB.I18N.getLabel('OBRETUR_LblQty'),
             name: 'qtyLbl',
             classes: 'span3',
-            style: 'line-height: 40px; font-size: 17px;'
+            style: 'line-height: 40px; font-size: 17px; width: 155px;'
           }, {
             content: OB.I18N.getLabel('OBRETUR_LblPrice'),
             name: 'priceLbl',
             classes: 'span2',
-            style: 'line-height: 40px; font-size: 17px;'
+            style: 'line-height: 40px; font-size: 17px; width: 110px;'
           }, {
             style: 'clear: both;'
           }]
@@ -543,22 +557,23 @@
         this.$.header.$.checkboxButtonAll.unCheck();
       }
       newArray = _.filter(this.args.args.order.receiptLines, function (line) {
-        return line.quantity > 0;
+        return line.remainingQuantity > 0;
       });
       newArray = this.splitShipmentLines(newArray);
       this.args.args.order.receiptLines = newArray;
       this.numberOfLines = 0;
       this.selectedLines = 0;
       this.allSelected = false;
+
       enyo.forEach(this.args.args.order.receiptLines, function (line) {
+        lineNum++;
         var isSelectableLine = true;
         _.each(this.lineShouldBeIncludedFunctions, function (f) {
           isSelectableLine = isSelectableLine && f.isSelectableLine(line);
         });
         var lineEnyoObject = this.$.bodyContent.$.attributes.createComponent({
           kind: 'OB.UI.EditOrderLine',
-          name: 'line_' + line.compname,
-          id: 'OB.UI.id.Returns.Line.' + line.compname,
+          name: 'line' + lineNum,
           newAttribute: line
         });
         if (!isSelectableLine) {