svn commit: r1781983 - /ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy

[mbrohl]

Author: mbrohl
Date: Tue Feb  7 09:58:41 2017
New Revision: 1781983

URL: http://svn.apache.org/viewvc?rev=1781983&view=rev
Log:
Fixed: Cancelled OrderItems are still included in orderGrandTotal.
(OFBIZ-9204)

Manually backported to 14.12.

Thanks: Maurice for reporting and providing the patch, Deepak and Jacques for their suggestions.

Modified:
    ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy

Modified: ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy?rev=1781983&r1=1781982&r2=1781983&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy (original)
+++ ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy Tue Feb  7 09:58:41 2017
@@ -118,7 +118,7 @@ if (orderHeader) {
     taxAmount = OrderReadHelper.getOrderTaxByTaxAuthGeoAndParty(orderAdjustments).taxGrandTotal;
     context.taxAmount = taxAmount;
 
-    grandTotal = OrderReadHelper.getOrderGrandTotal(orderItems, orderAdjustments);
+    grandTotal = orderReadHelper.getOrderGrandTotal();
     context.grandTotal = grandTotal;
 
     orderItemList = orderReadHelper.getOrderItems();