[ofbiz-plugins] branch release18.12 updated: Fixed: User is unable to create return. (OFBIZ-10850) Thanks, Ashish and Ankush Upadhyay for your contribution.

[akashjain]

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

akashjain pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git


The following commit(s) were added to refs/heads/release18.12 by this push:
     new 3045557  Fixed: User is unable to create return. (OFBIZ-10850) Thanks, Ashish and Ankush Upadhyay for your contribution.
3045557 is described below

commit 3045557f3212f2e199233abc7e2d4d0b3096d431
Author: akash <[hidden email]>
AuthorDate: Sat Jan 25 18:31:23 2020 +0530

    Fixed: User is unable to create return.
    (OFBIZ-10850)
    Thanks, Ashish and Ankush Upadhyay for your contribution.
---
 ecommerce/template/order/RequestReturn.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ecommerce/template/order/RequestReturn.ftl b/ecommerce/template/order/RequestReturn.ftl
index f1571d2..9d7b067 100644
--- a/ecommerce/template/order/RequestReturn.ftl
+++ b/ecommerce/template/order/RequestReturn.ftl
@@ -57,7 +57,7 @@ under the License.
             <#if returnableItems?has_content>
               <#assign rowCount = 0>
               <#list returnableItems.keySet() as orderItem>
-              <#if !orderItem.orderAdjustmentId?has_content>    <#-- filter orderAdjustments -->
+              <#if "OrderAdjustment" != orderItem.getEntityName()>    <#-- filter orderAdjustments -->
                 <input type="hidden" name="orderId_o_${rowCount}" value="${orderItem.orderId}"/>
                 <input type="hidden" name="orderItemSeqId_o_${rowCount}" value="${orderItem.orderItemSeqId}"/>
                 <input type="hidden" name="description_o_${rowCount}" value="${orderItem.itemDescription!}"/>