0025441: Purchase order - Unit price is not correctly set when the unit price and the price list are different

diff -r 368bed7f2e19 src/org/openbravo/common/hooks/OrderLineQtyChangedHookObject.java
--- a/src/org/openbravo/common/hooks/OrderLineQtyChangedHookObject.java	Thu Jan 09 06:18:37 2014 +0100
+++ b/src/org/openbravo/common/hooks/OrderLineQtyChangedHookObject.java	Thu Jan 30 12:03:54 2014 +0100
@@ -2,6 +2,8 @@
 
 import java.math.BigDecimal;
 
+import org.openbravo.model.pricing.pricelist.PriceList;
+
 public class OrderLineQtyChangedHookObject {
 
   private String productId;
@@ -10,6 +12,8 @@
   private BigDecimal price;
   private String changed;
   private int pricePrecision;
+  private PriceList priceList;
+  private BigDecimal listPrice;
 
   public int getPricePrecision() {
     return pricePrecision;
@@ -63,4 +67,20 @@
     this.price = price;
   }
 
+  public PriceList getPriceList() {
+    return priceList;
+  }
+
+  public void setPriceList(PriceList priceList) {
+    this.priceList = priceList;
+  }
+
+  public BigDecimal getListPrice() {
+    return listPrice;
+  }
+
+  public void setListPrice(BigDecimal listPrice) {
+    this.listPrice = listPrice;
+  }
+
 }
diff -r 368bed7f2e19 src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java	Thu Jan 09 06:18:37 2014 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java	Thu Jan 30 12:03:54 2014 +0100
@@ -110,8 +110,8 @@
     String strStockNoAttribute;
     String strStockAttribute;
     String strPriceActual = _strPriceActual;
-    boolean isTaxIncludedPriceList = OBDal.getInstance().get(PriceList.class, data[0].mPricelistId)
-        .isPriceIncludesTax();
+    PriceList currentPriceList = OBDal.getInstance().get(PriceList.class, data[0].mPricelistId);
+    boolean isTaxIncludedPriceList = currentPriceList.isPriceIncludesTax();
     boolean isGrossUnitPriceChanged = strChanged.equals("inpgrossUnitPrice");
     boolean forceSetPriceStd = false;
     if (data1 != null && data1.length > 0) {
@@ -158,10 +158,13 @@
         hookObject.setQty(qtyOrdered);
         hookObject.setOrderId(strCOrderId);
         hookObject.setPricePrecision(pricePrecision);
+        hookObject.setPriceList(currentPriceList);
         if (isTaxIncludedPriceList) {
-          hookObject.setPrice(grossPriceList);
+          hookObject.setListPrice(grossPriceList);
+          hookObject.setPrice(grossBaseUnitPrice);
         } else {
-          hookObject.setPrice(netPriceList);
+          hookObject.setListPrice(netPriceList);
+          hookObject.setPrice(priceStd);
         }
 
         hookObject.setChanged(strChanged);