[ofbiz-framework] branch trunk updated: Fixed: Create Exchange Order button on Return screen is distorted (OFBIZ-11144)

[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 63f0a84  Fixed: Create Exchange Order button on Return screen is 
distorted (OFBIZ-11144)
63f0a84 is described below

commit 63f0a84ae2763834fff7fd9d5a9ad1e9472f8738
Author: Pawan Verma <pawan.ve...@hotwaxsystems.com>
AuthorDate: Tue Apr 28 10:11:41 2020 +0530

    Fixed: Create Exchange Order button on Return screen is distorted
    (OFBIZ-11144)
    
    Thanks: Devanshu for the report, Suraj and Jacques for the review.
---
 applications/order/template/return/ReturnLinks.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/order/template/return/ReturnLinks.ftl 
b/applications/order/template/return/ReturnLinks.ftl
index 00e3960..2baff3c 100644
--- a/applications/order/template/return/ReturnLinks.ftl
+++ b/applications/order/template/return/ReturnLinks.ftl
@@ -41,7 +41,7 @@ under the License.
         <#if returnItems?has_content>
           <#assign orderId = 
(Static["org.apache.ofbiz.entity.util.EntityUtil"].getFirst(returnItems)).getString("orderId")/>
           <#assign partyId = "${(returnHeader.fromPartyId)!}"/>
-          <a 
href="<@ofbizUrl>setOrderCurrencyAgreementShipDates?partyId=${partyId!}&amp;originOrderId=${orderId!}</@ofbizUrl>"
 class="buttontext">${uiLabelMap.OrderCreateExchangeOrder} 
${uiLabelMap.CommonFor} ${orderId!}</a>
+          <li><a 
href="<@ofbizUrl>setOrderCurrencyAgreementShipDates?partyId=${partyId!}&amp;originOrderId=${orderId!}</@ofbizUrl>"
 class="buttontext">${uiLabelMap.OrderCreateExchangeOrder} 
${uiLabelMap.CommonFor} ${orderId!}</a></li>
         </#if>
         <#if returnHeader.statusId?has_content && "RETURN_ACCEPTED" == 
returnHeader.statusId>
           <#assign returnItems = 
EntityQuery.use(delegator).from("ReturnItem").where("returnId", 
returnId!).queryList()!/>