svn commit: r784150 - /ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/order/OrderServices.java

[ashish-18]

Author: ashish
Date: Fri Jun 12 15:06:35 2009
New Revision: 784150

URL: http://svn.apache.org/viewvc?rev=784150&view=rev
Log:
Applied fix from trunk revision: 784149
Applied patch from jira OFBIZ-2598 (Additional Shipping Charges and Sales Taxes are getting lost on clicking update item button.)

Thanks Ratnesh

Modified:
    ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/order/OrderServices.java

Modified: ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=784150&r1=784149&r2=784150&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
+++ ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/order/OrderServices.java Fri Jun 12 15:06:35 2009
@@ -3876,7 +3876,8 @@
         }
         for (GenericValue toAdd: (List<GenericValue>)toAddList) {
             if ("OrderAdjustment".equals(toAdd.getEntityName())) {
-                if (toAdd.get("comments") != null && ((String)toAdd.get("comments")).startsWith("Added manually by") && ("PROMOTION_ADJUSTMENT".equals(toAdd.get("orderAdjustmentTypeId")))) {
+                if (toAdd.get("comments") != null && ((String)toAdd.get("comments")).startsWith("Added manually by") && (("PROMOTION_ADJUSTMENT".equals(toAdd.get("orderAdjustmentTypeId"))) ||
+                        ("SHIPPING_CHARGES".equals(toAdd.get("orderAdjustmentTypeId"))) || ("SALES_TAX".equals(toAdd.get("orderAdjustmentTypeId"))))) {
                     toStore.add(toAdd);
                 }
             }