[ofbiz-framework] branch release18.12 updated: Fixed: Corrected package path for UtilDateTime.(OFBIZ-6408)

[pawan]

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 73bfbc6  Fixed: Corrected package path for UtilDateTime.(OFBIZ-6408)
73bfbc6 is described below

commit 73bfbc643b5e2f35f5c8e9dae777cd760405fdeb
Author: Pawan Verma <pawan.ve...@hotwaxsystems.com>
AuthorDate: Sat May 30 23:07:03 2020 +0530

    Fixed: Corrected package path for UtilDateTime.(OFBIZ-6408)
---
 applications/product/widget/catalog/ProductForms.xml | 2 +-
 plugins                                              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/applications/product/widget/catalog/ProductForms.xml 
b/applications/product/widget/catalog/ProductForms.xml
index 5272250..7ef2551 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; 
thruDate.compareTo(org.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.apache.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"/>
diff --git a/plugins b/plugins
new file mode 160000
index 0000000..2c65f7d
--- /dev/null
+++ b/plugins
@@ -0,0 +1 @@
+Subproject commit 2c65f7d17bcdbccd7d166701365c56bca40d2f2d