svn commit: r1781981 - in /ofbiz/branches/release16.11: ./ applications/order/groovyScripts/order/OrderView.groovy

[mbrohl]

Author: mbrohl
Date: Tue Feb  7 09:48:21 2017
New Revision: 1781981

URL: http://svn.apache.org/viewvc?rev=1781981&view=rev
Log:
Applied fix from trunk for revision: 1781979
===

Fixed: Cancelled OrderItems are still included in orderGrandTotal.
(OFBIZ-9204)

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

Modified:
    ofbiz/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/applications/order/groovyScripts/order/OrderView.groovy

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  7 09:48:21 2017
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125
+/ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979

Modified: ofbiz/branches/release16.11/applications/order/groovyScripts/order/OrderView.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/groovyScripts/order/OrderView.groovy?rev=1781981&r1=1781980&r2=1781981&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/order/groovyScripts/order/OrderView.groovy (original)
+++ ofbiz/branches/release16.11/applications/order/groovyScripts/order/OrderView.groovy Tue Feb  7 09:48:21 2017
@@ -116,7 +116,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()