svn commit: r1867585 - in /ofbiz/ofbiz-framework/trunk/applications: accounting/minilang/fixedasset/ order/minilang/order/ product/minilang/shipment/picklist/ workeffort/minilang/workeffort/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1867585 - in /ofbiz/ofbiz-framework/trunk/applications: accounting/minilang/fixedasset/ order/minilang/order/ product/minilang/shipment/picklist/ workeffort/minilang/workeffort/

jleroux@apache.org
Author: jleroux
Date: Thu Sep 26 15:38:52 2019
New Revision: 1867585

URL: http://svn.apache.org/viewvc?rev=1867585&view=rev
Log:
Fixed: Error in log when looking for parties at partymgr/control/main
(OFBIZ-11201)

These are similar issues in Minilang than the one fixed initially for
<set field="userLoginSize" value="${util:size(logins)}" type="Integer"/>
Fixed by replacing by
<set field="userLoginSize" value="${groovy:logins.size()}"/>


Modified:
    ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml
    ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderReturnServices.xml
    ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml
    ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml?rev=1867585&r1=1867584&r2=1867585&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml Thu Sep 26 15:38:52 2019
@@ -186,7 +186,7 @@ under the License.
             </entity-condition>
             <set field="listSize" value="0" type="Long"/>
             <if-not-empty field="maintList">
-                <set field="listSize" value="${util:size(maintList)}" type="Long"/>
+                <set field="listSize" value="${groovy:maintList.size()}" type="Long"/>
             </if-not-empty>
             <set field="maxIntervalQty" value="0" type="BigDecimal"/>
             <iterate list="maintList" entry="maintValue">
@@ -263,7 +263,7 @@ under the License.
                 <if-not-empty field="compareDate">
                     <set field="listSize" value="0" type="Long"/>
                     <if-not-empty field="maintList">
-                        <set field="listSize" value="${util:size(maintList)}" type="Long"/>
+                        <set field="listSize" value="${groovy:maintList.size()}" type="Long"/>
                     </if-not-empty>
                     <set field="lastSvcLong" value="0" type="Long"/>
                     <set field="lastSvcDate" from-field="lastSvcLong" type="Timestamp"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderReturnServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderReturnServices.xml?rev=1867585&r1=1867584&r2=1867585&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderReturnServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderReturnServices.xml Thu Sep 26 15:38:52 2019
@@ -933,11 +933,11 @@ under the License.
             <field-map field-name="orderId" from-field="parameters.originOrderId"/>
             <field-map field-name="returnTypeId" value="RTN_REFUND"/>
         </entity-and>
-        <set field="returnItemSize" value="${util:size(returnItems)}" type="Long"/>
+        <set field="returnItemSize" value="${groovy:returnItems.size()}" type="Long"/>
         <entity-and entity-name="OrderItem" list="orderItems">
             <field-map field-name="orderId" from-field="parameters.orderId"/>
         </entity-and>
-        <set field="orderItemSize" value="${util:size(orderItems)}" type="Long"/>
+        <set field="orderItemSize" value="${groovy:orderItems.size()}" type="Long"/>
         <if>
             <condition>
                 <if-compare-field field="returnItemSize" operator="greater" to-field="orderItemSize" type="Long"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml?rev=1867585&r1=1867584&r2=1867585&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml Thu Sep 26 15:38:52 2019
@@ -188,7 +188,7 @@ under the License.
                 <!-- count no. of locations in location list -->
                 <set field="locationCount" value="0"/>
                 <if-not-empty field="locations">
-                    <set field="locationCount" value="${util:size(locations)}" type="Long"/>
+                    <set field="locationCount" value="${groovy:locations.size()}" type="Long"/>
                 </if-not-empty>
 
                 <!-- If order items are picked from different locations of a facility, then create a new group called multiple locations. This order will now belong to this new group -->

Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml?rev=1867585&r1=1867584&r2=1867585&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml Thu Sep 26 15:38:52 2019
@@ -1364,7 +1364,7 @@ under the License.
             </condition-list>
             <order-by field-name="contactMechPurposeTypeId"/>
         </entity-condition>
-        <if-compare field="util:size(contactMechs)" operator="greater" value="0" type="Integer">
+        <if-compare field="${groovy:contactMechs.size()}" operator="greater" value="0" type="Integer">
             <field-to-result field="contactMechs[0].infoString" result-name="iCalUrl"/>
         </if-compare>
     </simple-method>