This is an automated email from the ASF dual-hosted git repository.
pawan pushed a commit to branch release18.12
in repository
https://gitbox.apache.org/repos/asf/ofbiz-framework.gitThe following commit(s) were added to refs/heads/release18.12 by this push:
new 9e60ec7 Fixed: Create Exchange Order button on Return screen is distorted (OFBIZ-11144)
9e60ec7 is described below
commit 9e60ec7739e892c9b2e8ff2c568bfcedefa47da8
Author: Pawan Verma <
[hidden email]>
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 62ca028..8026781 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!}&originOrderId=${orderId!}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateExchangeOrder} ${uiLabelMap.CommonFor} ${orderId!}</a>
+ <li><a href="<@ofbizUrl>setOrderCurrencyAgreementShipDates?partyId=${partyId!}&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()!/>