[ofbiz-framework] branch trunk 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 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 f0e60ba  Fixed: Adding a group order generates an error(OFBIZ-6408)
f0e60ba is described below

commit f0e60ba3dc6d4a3a9b09f3d87a42c9e8a53d4e25
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 d3fd3c8..5979bf7 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"/>