[ofbiz-framework] branch release18.12 updated: Fixed: Adding a group order generates an error(OFBIZ-6408)

[Pawan Verma-2]

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.git


The following commit(s) were added to refs/heads/release18.12 by this push:
     new b35dd06  Fixed: Adding a group order generates an error(OFBIZ-6408)
b35dd06 is described below

commit b35dd06905aebf1eb5aa08213f23112d5227bdf9
Author: Pawan Verma <[hidden email]>
AuthorDate: Sat May 30 15:36:52 2020 +0530

    Fixed: Adding a group order generates an error(OFBIZ-6408)
   
    The error is caused by an invalid expression, the two boolean evaluations should reside in the same groovy scriptlet.
   
    Thanks, Pierre for report, Scott for the solution and Adrian, Jacques, Rahul for the review.
---
 applications/product/widget/catalog/ProductForms.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/product/widget/catalog/ProductForms.xml b/applications/product/widget/catalog/ProductForms.xml
index 208ee72..5272250 100644
--- a/applications/product/widget/catalog/ProductForms.xml
+++ b/applications/product/widget/catalog/ProductForms.xml
@@ -2333,7 +2333,7 @@ under the License.
         <field name="fromDate" title="${uiLabelMap.ProductDealStartDate}"><display/></field>
         <field name="thruDate" title="${uiLabelMap.ProductDealEndDate}"><display/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
-        <field name="editLink" use-when="${groovy: return reqOrderQty.compareTo(soldOrderQty)!= 0;}&amp;&amp;${groovy: return thruDate.compareTo(org.apache.ofbiz.base.util.UtilDateTime.nowTimestamp()) == 1}" title=" " widget-style="buttontext">
+        <field name="editLink" use-when="${groovy: return reqOrderQty.compareTo(soldOrderQty) != 0 &amp;&amp; thruDate.compareTo(org.ofbiz.base.util.UtilDateTime.nowTimestamp()) == 1}" title=" " widget-style="buttontext">
             <hyperlink description="${uiLabelMap.CommonEdit}" target="EditProductGroupOrder" also-hidden="false">
                 <parameter param-name="productId"/>
                 <parameter param-name="groupOrderId"/>