svn commit: r539667 - /ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java

[jaz-3]

Author: jaz
Date: Fri May 18 18:38:16 2007
New Revision: 539667

URL: http://svn.apache.org/viewvc?view=rev&rev=539667
Log:
forgot to remove the old one

Modified:
    ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java?view=diff&rev=539667&r1=539666&r2=539667
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java Fri May 18 18:38:16 2007
@@ -438,8 +438,7 @@
         double orderPercentage = shippableTotal.doubleValue() * (orderPercent / 100);
 
         // flat total
-        double flatTotal = orderFlat + itemFlatAmount + orderPercentage;
-        flatTotal = flatTotal + flatTotal * (shippingPricePercent / 100);
+        double flatTotal = orderFlat + itemFlatAmount + orderPercentage;        
 
         // spans
         double weightUnit = 0.00;