[ofbiz-framework] branch trunk updated: Fixed: Error showing on Allocation Plan screen (OFBIZ-11338)

[pawan]

This is an automated email from the ASF dual-hosted git repository.

pawan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 95af7cf  Fixed: Error showing on Allocation Plan screen (OFBIZ-11338)
95af7cf is described below

commit 95af7cf8baf8622c22f1e59636c486b1fa38fe60
Author: Pawan Verma <pawan.ve...@hotwaxsystems.com>
AuthorDate: Mon Feb 24 17:18:24 2020 +0530

    Fixed: Error showing on Allocation Plan screen
    (OFBIZ-11338)
    
    Thanks: Yashwant Dhakad for the report and Aman Mishra for the patch.
---
 applications/order/template/order/ViewAllocationPlan.ftl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/applications/order/template/order/ViewAllocationPlan.ftl 
b/applications/order/template/order/ViewAllocationPlan.ftl
index 1d9b77c..3bb374a 100644
--- a/applications/order/template/order/ViewAllocationPlan.ftl
+++ b/applications/order/template/order/ViewAllocationPlan.ftl
@@ -162,18 +162,18 @@ under the License.
               <tr>
                 <td>${summary.salesChannel!}</td>
                 <td align="right">${summary.orderedQuantity!}</td>
-                <td align="right"><@ofbizCurrency 
amount=summary.orderedValue!?default(0.00) isoCode=currencyUomId/></td>
+                <td align="right"><@ofbizCurrency 
amount=summary.orderedValue?default(0.00) isoCode=currencyUomId/></td>
                 <td align="right">${summary.allocatedQuantity!}</td>
-                <td align="right"><@ofbizCurrency 
amount=summary.allocatedValue!?default(0.00) isoCode=currencyUomId/></td>
+                <td align="right"><@ofbizCurrency 
amount=summary.allocatedValue?default(0.00) isoCode=currencyUomId/></td>
                 <td 
align="right">${summary.allocationPercentage!?string("0.####")}</td>
               </tr>
             </#list>
             <tr>
               <td ><b>${uiLabelMap.CommonTotal}</b></td>
               <td 
align="right"><b>${allocationPlanInfo.orderedQuantityTotal!}</b></td>
-              <td align="right"><b><@ofbizCurrency 
amount=allocationPlanInfo.orderedValueTotal!?default(0.00) 
isoCode=currencyUomId/></td>
+              <td align="right"><b><@ofbizCurrency 
amount=allocationPlanInfo.orderedValueTotal?default(0.00) 
isoCode=currencyUomId/></td>
               <td 
align="right"><b>${allocationPlanInfo.allocatedQuantityTotal!}</b></td>
-              <td align="right"><b><@ofbizCurrency 
amount=allocationPlanInfo.allocatedValueTotal!?default(0.00) 
isoCode=currencyUomId/></b></td>
+              <td align="right"><b><@ofbizCurrency 
amount=allocationPlanInfo.allocatedValueTotal?default(0.00) 
isoCode=currencyUomId/></b></td>
               <td 
align="right"><b>${allocationPlanInfo.allocationPercentageTotal!?string("0.####")}</b></td>
             </tr>
           </table>
@@ -259,7 +259,7 @@ under the License.
               <td colspan="6"><b>${uiLabelMap.CommonTotal}</b></td>
               <td 
align="right"><b>${allocationPlanInfo.orderedQuantityTotal!}</b></td>
               <td 
align="right"><b>${allocationPlanInfo.reservedQuantityTotal!}</b></td>
-              <td align="right"><b><@ofbizCurrency 
amount=allocationPlanInfo.orderedValueTotal!?default(0.00) 
isoCode=currencyUomId/>
+              <td align="right"><b><@ofbizCurrency 
amount=allocationPlanInfo.orderedValueTotal?default(0.00) 
isoCode=currencyUomId/>
               <td 
align="right"><b>${allocationPlanInfo.allocatedQuantityTotal!}</b></td>
               <td 
align="right"><b>${allocationPlanInfo.allocationPercentageTotal!?string("0.####")}</b></td>
               <#if editMode>