details:   https://code.openbravo.com/erp/devel/pi/rev/f7250e458578
changeset: 17580:f7250e458578
user:      Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date:      Tue Jul 31 12:18:51 2012 +0200
summary:   Fixed issue 21222.Fix issue in if clause.

diffstat:

 src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product.java |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 47c683261c3a -r f7250e458578 
src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product.java     Tue Jul 
31 11:19:22 2012 +0200
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product.java     Tue Jul 
31 12:18:51 2012 +0200
@@ -104,8 +104,8 @@
     if (_strPriceStd.startsWith("\"")) {
       strPriceStd = _strPriceStd.substring(1, _strPriceStd.length() - 1);
     }
-    boolean isTaxIncludedPriceList = OBDal.getInstance().get(Order.class, 
strCOrderId).getPriceList()
-        .isPriceIncludesTax();
+    boolean isTaxIncludedPriceList = OBDal.getInstance().get(Order.class, 
strCOrderId)
+        .getPriceList().isPriceIncludesTax();
 
     if (!strMProductID.equals("")) {
       SLOrderProductData[] dataOrder = SLOrderProductData.select(this, 
strCOrderId);
@@ -115,12 +115,12 @@
           + strPriceStd.replace("\"", ""));
       if (isTaxIncludedPriceList) {
         strNetPriceList = "0";
+      } else {
+        strGrossPriceList = "0";
         strPriceActual = SLOrderProductData.getOffersPrice(this, 
dataOrder[0].dateordered,
             dataOrder[0].cBpartnerId, strMProductID, 
(strPriceStd.equals("undefined") ? "0"
                 : strPriceStd.replace("\"", "")), strQty, 
dataOrder[0].mPricelistId,
             dataOrder[0].id);
-      } else {
-        strGrossPriceList = "0";
       }
       log4j.debug("get Offers price:" + strPriceActual);
 

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to