svn commit: r667748 [14/16] - in /ofbiz/trunk: applications/accounting/script/org/ofbiz/accounting/agreement/ applications/accounting/script/org/ofbiz/accounting/cost/ applications/accounting/script/org/ofbiz/accounting/finaccount/ applications/account...

[lektran]

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Fri Jun 13 23:03:12 2008
@@ -57,7 +57,7 @@
         <call-service service-name="createWorkEffort" in-map-name="shipWorkEffortMap">
             <result-to-field result-name="workEffortId" field-name="newEntity.estimatedShipWorkEffId"/>
         </call-service>
-        <if-not-empty field-name="partyIdFrom" map-name="newEntity">
+        <if-not-empty field="newEntity.partyIdFrom">
             <set from-field="newEntity.estimatedShipWorkEffId" field="assignPartyToWorkEffortShip.workEffortId"/>
             <set from-field="newEntity.partyIdFrom" field="assignPartyToWorkEffortShip.partyId"/>
             <set value="CAL_ATTENDEE" field="assignPartyToWorkEffortShip.roleTypeId"/>
@@ -77,7 +77,7 @@
         <call-service service-name="createWorkEffort" in-map-name="arrivalWorkEffortMap">
             <result-to-field result-name="workEffortId" field-name="newEntity.estimatedArrivalWorkEffId"/>
         </call-service>
-        <if-not-empty field-name="partyIdTo" map-name="newEntity">
+        <if-not-empty field="newEntity.partyIdTo">
             <set from-field="newEntity.estimatedArrivalWorkEffId" field="assignPartyToWorkEffortArrival.workEffortId"/>
             <set from-field="newEntity.partyIdTo" field="assignPartyToWorkEffortArrival.partyId"/>
             <set value="CAL_ATTENDEE" field="assignPartyToWorkEffortArrival.roleTypeId"/>
@@ -89,7 +89,7 @@
         <create-value value-name="newEntity"/>
 
         <!-- get the ShipmentStatus history started -->
-        <if-not-empty field-name="statusId" map-name="newEntity">
+        <if-not-empty field="newEntity.statusId">
             <make-value entity-name="ShipmentStatus" value-name="newStatusValue"/>
             <set from-field="newEntity.statusId" field="newStatusValue.statusId"/>
             <set from-field="newEntity.shipmentId" field="newStatusValue.shipmentId"/>
@@ -111,14 +111,14 @@
         <!-- put the type in return map so that service consumer knows what type of shipment was updated -->
         <field-to-result field-name="lookedUpValue.shipmentTypeId" result-name="shipmentTypeId"/>
 
-        <if-not-empty field-name="parameters.statusId">
-            <if-compare-field field-name="parameters.statusId" operator="not-equals" to-field-name="lookedUpValue.statusId">
+        <if-not-empty field="parameters.statusId">
+            <if-compare-field field="parameters.statusId" to-field="lookedUpValue.statusId" operator="not-equals">
                 <!-- make sure a StatusValidChange record exists, if not return error -->
                 <entity-one entity-name="StatusValidChange" value-name="checkStatusValidChange" auto-field-map="false">
                     <field-map env-name="lookedUpValue.statusId" field-name="statusId"/>
                     <field-map env-name="parameters.statusId" field-name="statusIdTo"/>
                 </entity-one>
-                <if-empty field-name="checkStatusValidChange">
+                <if-empty field="checkStatusValidChange">
                     <string-to-list string="ERROR: Changing the status from ${lookedUpValue.statusId} to ${parameters.statusId} is not allowed." list-name="error_list"/>
                 </if-empty>
 
@@ -139,12 +139,12 @@
             <condition>
                 <or>
                     <and>
-                        <not><if-empty field-name="parameters.estimatedShipDate"/></not>
-                        <if-compare-field field-name="parameters.estimatedShipDate" operator="not-equals" to-field-name="lookedUpValue.estimatedShipDate"/>
+                        <not><if-empty field="parameters.estimatedShipDate"/></not>
+                        <if-compare-field field="parameters.estimatedShipDate" to-field="lookedUpValue.estimatedShipDate" operator="not-equals"/>
                     </and>
                     <and>
-                        <not><if-empty field-name="originFacilityId" map-name="parameters"/></not>
-                        <if-compare-field field-name="parameters.originFacilityId" operator="not-equals" to-field-name="lookedUpValue.originFacilityId"/>
+                        <not><if-empty field="parameters.originFacilityId"/></not>
+                        <if-compare-field field="parameters.originFacilityId" to-field="lookedUpValue.originFacilityId" operator="not-equals"/>
                     </and>
                 </or>
             </condition>
@@ -163,12 +163,12 @@
             <condition>
                 <or>
                     <and>
-                        <not><if-empty field-name="estimatedArrivalDate" map-name="parameters"/></not>
-                        <if-compare-field field-name="parameters.estimatedArrivalDate" operator="not-equals" to-field-name="lookedUpValue.estimatedArrivalDate"/>
+                        <not><if-empty field="parameters.estimatedArrivalDate"/></not>
+                        <if-compare-field field="parameters.estimatedArrivalDate" to-field="lookedUpValue.estimatedArrivalDate" operator="not-equals"/>
                     </and>
                     <and>
-                        <not><if-empty field-name="destinationFacilityId" map-name="parameters"/></not>
-                        <if-compare-field field-name="parameters.destinationFacilityId" operator="not-equals" to-field-name="lookedUpValue.destinationFacilityId"/>
+                        <not><if-empty field="parameters.destinationFacilityId"/></not>
+                        <if-compare-field field="parameters.destinationFacilityId" to-field="lookedUpValue.destinationFacilityId" operator="not-equals"/>
                     </and>
                 </or>
             </condition>
@@ -188,9 +188,9 @@
         <if>
             <condition>
                 <and>
-                    <not><if-empty field-name="parameters.partyIdFrom"/></not>
-                    <if-compare-field field-name="parameters.partyIdFrom" operator="not-equals" to-field-name="lookedUpValue.partyIdFrom"/>
-                    <not><if-empty field-name="lookedUpValue.estimatedShipWorkEffId"/></not>
+                    <not><if-empty field="parameters.partyIdFrom"/></not>
+                    <if-compare-field field="parameters.partyIdFrom" to-field="lookedUpValue.partyIdFrom" operator="not-equals"/>
+                    <not><if-empty field="lookedUpValue.estimatedShipWorkEffId"/></not>
                 </and>
             </condition>
             <then>
@@ -198,7 +198,7 @@
                 <set field="assignPartyToWorkEffortShip.partyId" from-field="parameters.partyIdFrom"/>
                 <find-by-and entity-name="WorkEffortPartyAssignment" list-name="existingShipWepas" map-name="assignPartyToWorkEffortShip"/>
                 <filter-list-by-date list-name="existingShipWepas"/>
-                <if-empty field-name="existingShipWepas">
+                <if-empty field="existingShipWepas">
                     <set field="assignPartyToWorkEffortShip.roleTypeId" value="CAL_ATTENDEE"/>
                     <set field="assignPartyToWorkEffortShip.statusId" value="CAL_SENT"/>
                     <call-service service-name="assignPartyToWorkEffort" in-map-name="assignPartyToWorkEffortShip"/>
@@ -208,9 +208,9 @@
         <if>
             <condition>
                 <and>
-                    <not><if-empty field-name="parameters.partyIdTo"/></not>
-                    <if-compare-field field-name="parameters.partyIdTo" operator="not-equals" to-field-name="lookedUpValue.partyIdTo"/>
-                    <not><if-empty field-name="lookedUpValue.estimatedArrivalWorkEffId"/></not>
+                    <not><if-empty field="parameters.partyIdTo"/></not>
+                    <if-compare-field field="parameters.partyIdTo" to-field="lookedUpValue.partyIdTo" operator="not-equals"/>
+                    <not><if-empty field="lookedUpValue.estimatedArrivalWorkEffId"/></not>
                 </and>
             </condition>
             <then>
@@ -218,7 +218,7 @@
                 <set field="assignPartyToWorkEffortArrival.partyId" from-field="parameters.partyIdTo"/>
                 <find-by-and entity-name="WorkEffortPartyAssignment" list-name="existingArrivalWepas" map-name="assignPartyToWorkEffortArrival"/>
                 <filter-list-by-date list-name="existingArrivalWepas"/>
-                <if-empty field-name="existingArrivalWepas">
+                <if-empty field="existingArrivalWepas">
                     <set field="assignPartyToWorkEffortArrival.roleTypeId" value="CAL_ATTENDEE"/>
                     <set field="assignPartyToWorkEffortArrival.statusId" value="CAL_SENT"/>
                     <call-service service-name="assignPartyToWorkEffort" in-map-name="assignPartyToWorkEffortArrival"/>
@@ -262,7 +262,7 @@
         <set from-field="returnHeader.destinationFacilityId" field="shipmentCtx.destinationFacilityId"/>
 
         <!-- later different behavior for customer vs. returns would happen here -->
-        <if-compare value="CUSTOMER_RETURN" field-name="returnHeader.returnHeaderTypeId" operator="equals">
+        <if-compare value="CUSTOMER_RETURN" field="returnHeader.returnHeaderTypeId" operator="equals">
             <set value="SALES_RETURN" field="shipmentCtx.shipmentTypeId"/>
             <set value="PURCH_SHIP_CREATED" field="shipmentCtx.statusId"/>  <!-- we may later need different status codes for return shipments -->
         <else>
@@ -293,14 +293,14 @@
         <!-- on Shipment set partyIdFrom, partyIdTo (vendorPartyId), originContactMechId, destinationContactMechId, estimatedShipCost -->
         <entity-one entity-name="Shipment" value-name="shipment"/>
 
-        <if-empty field-name="shipment.primaryOrderId">
+        <if-empty field="shipment.primaryOrderId">
             <!-- No primaryOrderId specified, don't do anything -->
             <log level="info" message="Not running setShipmentSettingsFromPrimaryOrder, primaryOrderId is empty for shipmentId [${shipment.shipmentId}]"/>
             <return response-code="success"/>
         </if-empty>
 
         <!-- TODO: we may not want to check this if, for example, Purchase Orders don't have any OrderItemShipGroups -->
-        <if-empty field-name="shipment.primaryShipGroupSeqId">
+        <if-empty field="shipment.primaryShipGroupSeqId">
             <!-- No primaryShipGroupSeqId specified, don't do anything -->
             <log level="info" message="Not running setShipmentSettingsFromPrimaryOrder, primaryShipGroupSeqId is empty for shipmentId [${parameters.shipmentId}]"/>
             <return response-code="success"/>
@@ -309,18 +309,18 @@
         <entity-one entity-name="OrderHeader" value-name="orderHeader" auto-field-map="false">
             <field-map field-name="orderId" env-name="shipment.primaryOrderId"/>
         </entity-one>
-        <if-not-empty field-name="shipment.primaryShipGroupSeqId">
+        <if-not-empty field="shipment.primaryShipGroupSeqId">
             <entity-one entity-name="OrderItemShipGroup" value-name="orderItemShipGroup" auto-field-map="false">
                 <field-map field-name="orderId" env-name="shipment.primaryOrderId"/>
                 <field-map field-name="shipGroupSeqId" env-name="shipment.primaryShipGroupSeqId"/>
             </entity-one>
         </if-not-empty>
 
-        <if-compare field-name="orderHeader.orderTypeId" operator="equals" value="SALES_ORDER">
+        <if-compare field="orderHeader.orderTypeId" operator="equals" value="SALES_ORDER">
             <set value="SALES_SHIPMENT" field="shipment.shipmentTypeId"/>
         </if-compare>
-        <if-compare field-name="orderHeader.orderTypeId" operator="equals" value="PURCHASE_ORDER">
-            <if-compare field-name="shipment.shipmentTypeId" operator="not-equals" value="DROP_SHIPMENT">
+        <if-compare field="orderHeader.orderTypeId" operator="equals" value="PURCHASE_ORDER">
+            <if-compare field="shipment.shipmentTypeId" operator="not-equals" value="DROP_SHIPMENT">
                 <set value="PURCHASE_SHIPMENT" field="shipment.shipmentTypeId"/>
             </if-compare>
         </if-compare>
@@ -329,16 +329,16 @@
         <if>
             <condition>
                 <and>
-                    <if-empty field-name="shipment.originFacilityId"/>
-                    <if-compare field-name="shipment.shipmentTypeId" operator="equals" value="SALES_SHIPMENT"/>
-                    <not><if-empty field-name="orderHeader.productStoreId"/></not>
+                    <if-empty field="shipment.originFacilityId"/>
+                    <if-compare field="shipment.shipmentTypeId" operator="equals" value="SALES_SHIPMENT"/>
+                    <not><if-empty field="orderHeader.productStoreId"/></not>
                 </and>
             </condition>
             <then>
                 <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="false">
                     <field-map field-name="productStoreId" env-name="orderHeader.productStoreId"/>
                 </entity-one>
-                <if-compare field-name="productStore.oneInventoryFacility" operator="equals" value="Y">
+                <if-compare field="productStore.oneInventoryFacility" operator="equals" value="Y">
                     <set from-field="productStore.inventoryFacilityId" field="shipment.originFacilityId"/>
                 </if-compare>
             </then>
@@ -351,42 +351,42 @@
         </entity-and>
 
         <!-- From: SHIP_FROM_VENDOR -->
-        <if-empty field-name="partyIdFrom" map-name="shipment">
+        <if-empty field="shipment.partyIdFrom">
             <set value="SHIP_FROM_VENDOR" field="limitRoleMap.roleTypeId"/>
             <filter-list-by-and list-name="orderRoles" map-name="limitRoleMap" to-list-name="limitOrderRoles"/>
             <first-from-list entry-name="limitOrderRole" list-name="limitOrderRoles"/>
-            <if-not-empty field-name="limitOrderRole">
+            <if-not-empty field="limitOrderRole">
                 <set from-field="limitOrderRole.partyId" field="shipment.partyIdFrom"/>
             </if-not-empty>
             <clear-field field-name="limitRoleMap"/><clear-field field-name="limitOrderRoles"/><clear-field field-name="limitOrderRole"/>
         </if-empty>
         <!-- From: VENDOR -->
-        <if-empty field-name="partyIdFrom" map-name="shipment">
+        <if-empty field="shipment.partyIdFrom">
             <set value="VENDOR" field="limitRoleMap.roleTypeId"/>
             <filter-list-by-and list-name="orderRoles" map-name="limitRoleMap" to-list-name="limitOrderRoles"/>
             <first-from-list entry-name="limitOrderRole" list-name="limitOrderRoles"/>
-            <if-not-empty field-name="limitOrderRole">
+            <if-not-empty field="limitOrderRole">
                 <set from-field="limitOrderRole.partyId" field="shipment.partyIdFrom"/>
             </if-not-empty>
             <clear-field field-name="limitRoleMap"/><clear-field field-name="limitOrderRoles"/><clear-field field-name="limitOrderRole"/>
         </if-empty>
 
         <!-- To: SHIP_TO_CUSTOMER -->
-        <if-empty field-name="partyIdTo" map-name="shipment">
+        <if-empty field="shipment.partyIdTo">
             <set value="SHIP_TO_CUSTOMER" field="limitRoleMap.roleTypeId"/>
             <filter-list-by-and list-name="orderRoles" map-name="limitRoleMap" to-list-name="limitOrderRoles"/>
             <first-from-list entry-name="limitOrderRole" list-name="limitOrderRoles"/>
-            <if-not-empty field-name="limitOrderRole">
+            <if-not-empty field="limitOrderRole">
                 <set from-field="limitOrderRole.partyId" field="shipment.partyIdTo"/>
             </if-not-empty>
             <clear-field field-name="limitRoleMap"/><clear-field field-name="limitOrderRoles"/><clear-field field-name="limitOrderRole"/>
         </if-empty>
         <!-- To: CUSTOMER -->
-        <if-empty field-name="partyIdTo" map-name="shipment">
+        <if-empty field="shipment.partyIdTo">
             <set value="CUSTOMER" field="limitRoleMap.roleTypeId"/>
             <filter-list-by-and list-name="orderRoles" map-name="limitRoleMap" to-list-name="limitOrderRoles"/>
             <first-from-list entry-name="limitOrderRole" list-name="limitOrderRoles"/>
-            <if-not-empty field-name="limitOrderRole">
+            <if-not-empty field="limitOrderRole">
                 <set from-field="limitOrderRole.partyId" field="shipment.partyIdTo"/>
             </if-not-empty>
             <clear-field field-name="limitRoleMap"/><clear-field field-name="limitOrderRoles"/><clear-field field-name="limitOrderRole"/>
@@ -396,12 +396,12 @@
             <field-map field-name="orderId" env-name="shipment.primaryOrderId"/>
         </entity-and>
         <!-- destinationContactMechId -->
-        <if-empty field-name="shipment.destinationContactMechId">
+        <if-empty field="shipment.destinationContactMechId">
             <!-- first try from orderContactMechs -->
             <set value="SHIPPING_LOCATION" field="destinationContactMap.contactMechPurposeTypeId"/>
             <filter-list-by-and list-name="orderContactMechs" map-name="destinationContactMap" to-list-name="destinationOrderContactMechs"/>
             <first-from-list entry-name="destinationOrderContactMech" list-name="destinationOrderContactMechs"/>
-            <if-not-empty field-name="destinationOrderContactMech">
+            <if-not-empty field="destinationOrderContactMech">
                 <set from-field="destinationOrderContactMech.contactMechId" field="shipment.destinationContactMechId"/>
                <else>
                   <log level="warning" message="Cannot find a shipping destination address for ${shipment.primaryOrderId}"/>
@@ -409,12 +409,12 @@
             </if-not-empty>
         </if-empty>
         <!-- originContactMechId.  Only do this if it is not a purchase shipment -->
-        <if-compare field-name="shipmentTypeId" map-name="shipment" operator="not-equals" value="PURCHASE_SHIPMENT">
-            <if-empty field-name="shipment.originContactMechId">
+        <if-compare field="shipment.shipmentTypeId" operator="not-equals" value="PURCHASE_SHIPMENT">
+            <if-empty field="shipment.originContactMechId">
                 <set value="SHIP_ORIG_LOCATION" field="originContactMap.contactMechPurposeTypeId"/>
                 <filter-list-by-and list-name="orderContactMechs" map-name="originContactMap" to-list-name="originOrderContactMechs"/>
                 <first-from-list entry-name="originOrderContactMech" list-name="originOrderContactMechs"/>
-                <if-not-empty field-name="originOrderContactMech">
+                <if-not-empty field="originOrderContactMech">
                     <set from-field="originOrderContactMech.contactMechId" field="shipment.originContactMechId"/>
                     <else>
                         <log level="warning" message="Cannot find a shipping origin address for ${shipment.primaryOrderId}"/>
@@ -424,11 +424,11 @@
         </if-compare>
 
         <!-- destinationTelecomNumberId -->
-        <if-empty field-name="shipment.destinationTelecomNumberId">
+        <if-empty field="shipment.destinationTelecomNumberId">
             <set value="PHONE_SHIPPING" field="destTelecomOrderContactMechMap.contactMechPurposeTypeId"/>
             <filter-list-by-and list-name="orderContactMechs" map-name="destTelecomOrderContactMechMap" to-list-name="destTelecomOrderContactMechs"/>
             <first-from-list entry-name="destTelecomOrderContactMech" list-name="destTelecomOrderContactMechs"/>
-            <if-not-empty field-name="destTelecomOrderContactMech">
+            <if-not-empty field="destTelecomOrderContactMech">
                 <set from-field="destTelecomOrderContactMech.contactMechId" field="shipment.destinationTelecomNumberId"/>
                 <else>
                     <!-- use the first unexpired phone number of the shipment partyIdTo -->
@@ -437,7 +437,7 @@
                     </entity-and>
                     <filter-list-by-date list-name="phoneNumbers"/>
                     <first-from-list entry-name="phoneNumber" list-name="phoneNumbers"/>
-                    <if-not-empty field-name="phoneNumber">
+                    <if-not-empty field="phoneNumber">
                         <set from-field="phoneNumber.contactMechId" field="shipment.destinationTelecomNumberId"/>
                         <else>
                             <log level="warning" message="Cannot find a shipping destination phone number for ${shipment.primaryOrderId}"/>
@@ -447,11 +447,11 @@
             </if-not-empty>
         </if-empty>
         <!-- originTelecomNumberId -->
-        <if-empty field-name="shipment.originTelecomNumberId">
+        <if-empty field="shipment.originTelecomNumberId">
             <set value="PHONE_SHIP_ORIG" field="originTelecomOrderContactMechMap.contactMechPurposeTypeId"/>
             <filter-list-by-and list-name="orderContactMechs" map-name="originTelecomOrderContactMechMap" to-list-name="originTelecomOrderContactMechs"/>
             <first-from-list entry-name="originTelecomOrderContactMech" list-name="originTelecomOrderContactMechs"/>
-            <if-not-empty field-name="originTelecomOrderContactMech">
+            <if-not-empty field="originTelecomOrderContactMech">
                 <set from-field="originTelecomOrderContactMech.contactMechId" field="shipment.originTelecomNumberId"/>
                 <else>
                     <log level="warning" message="Cannot find a shipping origin phone number for ${shipment.primaryOrderId}"/>
@@ -460,8 +460,8 @@
         </if-empty>
 
         <!-- set the destination facility if it is a purchase order -->
-        <if-empty field-name="originFacilityId" map-name="shipment">
-            <if-compare field-name="shipmentTypeId" map-name="shipment" operator="equals" value="PURCHASE_SHIPMENT">
+        <if-empty field="shipment.originFacilityId">
+            <if-compare field="shipment.shipmentTypeId" operator="equals" value="PURCHASE_SHIPMENT">
                 <set from-field="shipment.destinationContactMechId" field="facilityLookup.contactMechId"/>
                 <find-by-and entity-name="FacilityContactMech" map-name="facilityLookup" list-name="facilities"/>
                 <first-from-list list-name="facilities" entry-name="destinationFacility"/>
@@ -472,18 +472,18 @@
         <!-- NOTE: use new place to find source/destination location/addresses for new OrderItemShipGroup.contactMechId (destination address for sales orders, source address for purchase orders) -->
         <!-- do this second so it will override the orderContactMech -->
         <!-- TODO: maybe we should add a new entity for OrderItemShipGroup ContactMechs? -->
-        <if-not-empty field-name="orderItemShipGroup">
-            <if-compare field-name="orderHeader.orderTypeId" operator="equals" value="SALES_ORDER">
-                <if-empty field-name="shipment.destinationContactMechId">
+        <if-not-empty field="orderItemShipGroup">
+            <if-compare field="orderHeader.orderTypeId" operator="equals" value="SALES_ORDER">
+                <if-empty field="shipment.destinationContactMechId">
                     <set from-field="orderItemShipGroup.contactMechId" field="shipment.destinationContactMechId"/>
                 </if-empty>
-                <if-empty field-name="shipment.destinationTelecomNumberId">
+                <if-empty field="shipment.destinationTelecomNumberId">
                     <set from-field="orderItemShipGroup.telecomContactMechId" field="shipment.destinationTelecomNumberId"/>
                 </if-empty>
             </if-compare>
         </if-not-empty>
 
-        <if-empty field-name="estimatedShipCost" map-name="shipment">
+        <if-empty field="shipment.estimatedShipCost">
             <call-bsh><![CDATA[
                     import java.math.BigDecimal;
                     import org.ofbiz.order.order.OrderReadHelper;
@@ -505,7 +505,7 @@
             and from OrderItemShipGroup shipmentMethodTypeId, carrierPartyId, etc -->
             <set from-field="shipment.shipmentId" field="shipmentRouteSegmentMap.shipmentId"/>
         <find-by-and entity-name="ShipmentRouteSegment" map-name="shipmentRouteSegmentMap" list-name="shipmentRouteSegments"/>
-        <if-empty field-name="shipmentRouteSegments">
+        <if-empty field="shipmentRouteSegments">
             <!-- estimatedShipDate, estimatedArrivalDate -->
             <set from-field="shipment.estimatedShipDate" field="shipmentRouteSegmentMap.estimatedStartDate"/>
             <set from-field="shipment.estimatedArrivalDate" field="shipmentRouteSegmentMap.estimatedArrivalDate"/>
@@ -521,7 +521,7 @@
                 <field-map field-name="orderId" env-name="shipment.primaryOrderId"/>
                 <field-map field-name="shipGroupSeqId" env-name="shipment.primaryShipGroupSeqId"/>
             </entity-one>
-            <if-not-empty field-name="orderItemShipGroup">
+            <if-not-empty field="orderItemShipGroup">
                 <set from-field="orderItemShipGroup.carrierPartyId" field="shipmentRouteSegmentMap.carrierPartyId"/>
                 <set from-field="orderItemShipGroup.shipmentMethodTypeId" field="shipmentRouteSegmentMap.shipmentMethodTypeId"/>
             </if-not-empty>
@@ -548,8 +548,8 @@
         <clone-value value-name="shipment" new-value-name="shipmentCopy"/>
 
         <string-to-list string="-fromDate" list-name="descendingFromDateOrder"/>
-        <if-not-empty field-name="shipment.originFacilityId">
-            <if-empty field-name="shipment.originContactMechId">
+        <if-not-empty field="shipment.originFacilityId">
+            <if-empty field="shipment.originContactMechId">
                 <set from-field="shipment.originFacilityId" field="findFcmpMap.facilityId"/>
                 <set value="SHIP_ORIG_LOCATION" field="findFcmpMap.contactMechPurposeTypeId"/>
                 <find-by-and entity-name="FacilityContactMechPurpose" map-name="findFcmpMap" order-by-list-name="descendingFromDateOrder" list-name="facilityContactMechPurposes"/>
@@ -557,7 +557,7 @@
                 <first-from-list entry-name="facilityContactMechPurpose" list-name="facilityContactMechPurposes"/>
                 <set from-field="facilityContactMechPurpose.contactMechId" field="shipment.originContactMechId"/>
             </if-empty>
-            <if-empty field-name="shipment.originTelecomNumberId">
+            <if-empty field="shipment.originTelecomNumberId">
                 <set from-field="shipment.originFacilityId" field="findFcmpMap.facilityId"/>
                 <set value="PHONE_SHIP_ORIG" field="findFcmpMap.contactMechPurposeTypeId"/>
                 <find-by-and entity-name="FacilityContactMechPurpose" map-name="findFcmpMap" order-by-list-name="descendingFromDateOrder" list-name="facilityContactMechPurposes"/>
@@ -566,8 +566,8 @@
                 <set from-field="facilityContactMechPurpose.contactMechId" field="shipment.originTelecomNumberId"/>
             </if-empty>
         </if-not-empty>
-        <if-not-empty field-name="shipment.destinationFacilityId">
-            <if-empty field-name="shipment.destinationContactMechId">
+        <if-not-empty field="shipment.destinationFacilityId">
+            <if-empty field="shipment.destinationContactMechId">
                 <set from-field="shipment.destinationFacilityId" field="findFcmpMap.facilityId"/>
                 <set value="SHIPPING_LOCATION" field="findFcmpMap.contactMechPurposeTypeId"/>
                 <find-by-and entity-name="FacilityContactMechPurpose" map-name="findFcmpMap" order-by-list-name="descendingFromDateOrder" list-name="facilityContactMechPurposes"/>
@@ -575,21 +575,21 @@
                 <first-from-list entry-name="facilityContactMechPurpose" list-name="facilityContactMechPurposes"/>
                 <set from-field="facilityContactMechPurpose.contactMechId" field="shipment.destinationContactMechId"/>
             </if-empty>
-            <if-empty field-name="shipment.destinationTelecomNumberId">
+            <if-empty field="shipment.destinationTelecomNumberId">
                 <set from-field="shipment.destinationFacilityId" field="findFcmpMap.facilityId"/>
                 <set value="PHONE_SHIPPING" field="findFcmpMap.contactMechPurposeTypeId"/>
                 <find-by-and entity-name="FacilityContactMechPurpose" map-name="findFcmpMap" order-by-list-name="descendingFromDateOrder" list-name="facilityContactMechPurposes"/>
                 <filter-list-by-date list-name="facilityContactMechPurposes"/>
                 <!-- This check is necessary or some random contactMechId might be filled in by minilang, possibly from another call earlier, if facilityContactMechPurpoess is indeed null.
                 It should probably be implemented for all of the above but I have not had a chance to test it. (Si) -->
-                <if-not-empty field-name="facilityContactMechPurposes">
+                <if-not-empty field="facilityContactMechPurposes">
                     <first-from-list entry-name="facilityContactMechPurpose" list-name="facilityContactMechPurposes"/>
                     <set from-field="facilityContactMechPurpose.contactMechId" field="shipment.destinationTelecomNumberId"/>
                 </if-not-empty>
             </if-empty>
         </if-not-empty>
 
-        <if-compare-field field-name="shipment" operator="not-equals" to-field-name="shipmentCopy">
+        <if-compare-field field="shipment" to-field="shipmentCopy" operator="not-equals">
             <set-service-fields service-name="updateShipment" map-name="shipment" to-map-name="shipmentUpdateMap"/>
             <call-service service-name="updateShipment" in-map-name="shipmentUpdateMap"/>
         </if-compare-field>
@@ -640,7 +640,7 @@
 
         <!-- set subject, contentType, templateName, templateData -->
         <set value="Scheduled Notification for Shipment ${shipment.shipmentId}" field="sendEmailMap.subject"/>
-        <if-not-empty field-name="shipment.primaryOrderId">
+        <if-not-empty field="shipment.primaryOrderId">
             <string-append string=" for Primary Order ${shipment.primaryOrderId}" field-name="sendEmailMap.subject"/>
         </if-not-empty>
         <set value="text/html" field="sendEmailMap.contentType"/>
@@ -652,8 +652,8 @@
         <if>
             <condition>
                 <and>
-                    <not><if-empty field-name="sendTo" map-name="sendEmailMap"/></not>
-                    <not><if-empty field-name="sendFrom" map-name="sendEmailMap"/></not>
+                    <not><if-empty field="sendEmailMap.sendTo"/></not>
+                    <not><if-empty field="sendEmailMap.sendFrom"/></not>
                 </and>
             </condition>
             <then>
@@ -770,8 +770,8 @@
         
         <set field="orderShipmentQuantityLeft" from-field="parameters.newItemQuantity"/>
         <iterate entry-name="itemOrderShipment" list-name="itemOrderShipmentList">
-            <if-compare field-name="orderShipmentQuantityLeft" operator="greater" value="0" type="Double">
-                <if-compare-field field-name="itemOrderShipment.quantity" operator="greater" to-field-name="orderShipmentQuantityLeft" type="Double">
+            <if-compare field="orderShipmentQuantityLeft" operator="greater" value="0" type="Double">
+                <if-compare-field field="itemOrderShipment.quantity" to-field="orderShipmentQuantityLeft" operator="greater" type="Double">
                     <!-- there is enough in this OrderShipment record, so just adjust it and move on -->
                     <clear-field field-name="updateOrderShipmentMap"/>
                     <set-service-fields service-name="updateOrderShipment" map-name="itemOrderShipment" to-map-name="updateOrderShipmentMap"/>
@@ -832,7 +832,7 @@
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
 
-        <if-compare value="New" operator="equals" field-name="shipmentPackageSeqId" map-name="newEntity">
+        <if-compare value="New" operator="equals" field="newEntity.shipmentPackageSeqId">
             <clear-field field-name="shipmentPackageSeqId" map-name="newEntity"/>
         </if-compare>
 
@@ -889,7 +889,7 @@
                 <field-map field-name="shipmentRouteSegmentId" env-name="shipmentRouteSegment.shipmentRouteSegmentId"/>
             </entity-one>
             
-            <if-empty field-name="checkShipmentPackageRouteSeg">
+            <if-empty field="checkShipmentPackageRouteSeg">
                <set field="checkShipmentPackageRouteSegMap.shipmentRouteSegmentId" from-field="shipmentRouteSegment.shipmentRouteSegmentId"/>
                <set field="checkShipmentPackageRouteSegMap.shipmentPackageSeqId" from-field="shipmentPackageSeqId"/>
                <set field="checkShipmentPackageRouteSegMap.shipmentId" from-field="shipmentId"/>
@@ -953,7 +953,7 @@
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <find-by-primary-key value-name="shipmentPackageContent" map-name="newEntity"/>
         <log level="verbose" message="In addShipmentContentToPackage trying values: ${newEntity}"/>
-        <if-empty field-name="shipmentPackageContent">            
+        <if-empty field="shipmentPackageContent">            
             <set-service-fields service-name="createShipmentPackageContent" map-name="parameters" to-map-name="createSPCMap"/>
             <call-service service-name="createShipmentPackageContent" in-map-name="createSPCMap">
                 <result-to-field result-name="shipmentPackageSeqId" field-name="newEntity.shipmentPackageSeqId"/>
@@ -1066,7 +1066,7 @@
         <make-next-seq-id value-name="newEntity" seq-field-name="shipmentRouteSegmentId"/>
         <field-to-result field-name="shipmentRouteSegmentId" map-name="newEntity" result-name="shipmentRouteSegmentId"/>
 
-        <if-empty field-name="carrierServiceStatusId" map-name="newEntity">
+        <if-empty field="newEntity.carrierServiceStatusId">
             <set value="SHRSCS_NOT_STARTED" field="newEntity.carrierServiceStatusId"/>
         </if-empty>
 
@@ -1087,7 +1087,7 @@
         <entity-one entity-name="ShipmentRouteSegment" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
 
-        <if-empty field-name="newEntity.carrierServiceStatusId">
+        <if-empty field="newEntity.carrierServiceStatusId">
             <set value="SHRSCS_NOT_STARTED" field="newEntity.carrierServiceStatusId"/>
         </if-empty>
 
@@ -1121,7 +1121,7 @@
                 <field-map field-name="shipmentRouteSegmentId" env-name="shipmentRouteSegmentId"/>
                 <field-map field-name="shipmentPackageSeqId" env-name="shipmentPackage.shipmentPackageSeqId"/>
             </entity-one>
-            <if-empty field-name="checkShipmentPackageRouteSeg">
+            <if-empty field="checkShipmentPackageRouteSeg">
                 <set field="createShipmentPackageRouteSegMap.shipmentId" from-field="shipmentId"/>
                 <set field="createShipmentPackageRouteSegMap.shipmentRouteSegmentId" from-field="shipmentRouteSegmentId"/>
                 <set field="createShipmentPackageRouteSegMap.shipmentPackageSeqId" from-field="shipmentPackage.shipmentPackageSeqId"/>
@@ -1150,27 +1150,27 @@
                 <or>
                     <and>
                         <or>
-                            <if-empty field-name="fromStatusId"/>
-                            <if-compare field-name="fromStatusId" operator="equals" value="SHIPMENT_PACKED"/>
+                            <if-empty field="fromStatusId"/>
+                            <if-compare field="fromStatusId" operator="equals" value="SHIPMENT_PACKED"/>
                         </or>
-                        <if-compare field-name="testShipment.statusId" operator="equals" value="SHIPMENT_PACKED"/>
+                        <if-compare field="testShipment.statusId" operator="equals" value="SHIPMENT_PACKED"/>
                     </and>
                     <and>
                         <or>
-                            <if-compare field-name="fromStatusId" operator="equals" value="SHIPMENT_PACKED"/>
-                            <if-compare field-name="fromStatusId" operator="equals" value="SHIPMENT_SHIPPED"/>
+                            <if-compare field="fromStatusId" operator="equals" value="SHIPMENT_PACKED"/>
+                            <if-compare field="fromStatusId" operator="equals" value="SHIPMENT_SHIPPED"/>
                         </or>
-                        <if-compare field-name="testShipment.statusId" operator="equals" value="SHIPMENT_SHIPPED"/>
+                        <if-compare field="testShipment.statusId" operator="equals" value="SHIPMENT_SHIPPED"/>
                     </and>
                     <and>
                         <or>
-                            <if-compare field-name="fromStatusId" operator="equals" value="SHIPMENT_PACKED"/>
-                            <if-compare field-name="fromStatusId" operator="equals" value="SHIPMENT_SHIPPED"/>
-                            <if-compare field-name="fromStatusId" operator="equals" value="SHIPMENT_DELIVERED"/>
+                            <if-compare field="fromStatusId" operator="equals" value="SHIPMENT_PACKED"/>
+                            <if-compare field="fromStatusId" operator="equals" value="SHIPMENT_SHIPPED"/>
+                            <if-compare field="fromStatusId" operator="equals" value="SHIPMENT_DELIVERED"/>
                         </or>
-                        <if-compare field-name="testShipment.statusId" operator="equals" value="SHIPMENT_DELIVERED"/>
+                        <if-compare field="testShipment.statusId" operator="equals" value="SHIPMENT_DELIVERED"/>
                     </and>
-                    <if-compare field-name="testShipment.statusId" operator="equals" value="SHIPMENT_CANCELLED"/>
+                    <if-compare field="testShipment.statusId" operator="equals" value="SHIPMENT_CANCELLED"/>
                 </or>
             </condition>
             <then>
@@ -1217,7 +1217,7 @@
     <simple-method method-name="quickShipEntireOrder" short-description="Quick ships an entire order from multiple facilities">
         <!-- first get the order header; make sure we have a product store -->
         <entity-one entity-name="OrderHeader" value-name="orderHeader"/>
-        <if-empty field-name="productStoreId" map-name="orderHeader">
+        <if-empty field="orderHeader.productStoreId">
             <!-- no store cannot use quick ship; throw error -->
             <add-error><fail-message message="No ProductStore associated with order; cannot use Quick Ship"/></add-error>
             <check-errors/>
@@ -1228,11 +1228,11 @@
             <field-map field-name="productStoreId" env-name="orderHeader.productStoreId"/>
         </entity-one>
         
-        <if-compare field-name="reserveInventory" map-name="productStore" operator="not-equals" value="Y">
+        <if-compare field="productStore.reserveInventory" operator="not-equals" value="Y">
             <!-- no reservations; no shipment; cannot use quick ship -->
             <add-error><fail-message message="ProductStore [${productStore.productStoreId}] does not reserve inventory; cannot use Quick Ship for Multiple Facilities"/></add-error>
         </if-compare>
-        <if-compare field-name="explodeOrderItems" map-name="productStore" operator="equals" value="Y">
+        <if-compare field="productStore.explodeOrderItems" operator="equals" value="Y">
             <!-- can't insert duplicate rows in shipmentPackageContent -->
             <add-error><fail-message message="ProductStore [${productStore.productStoreId}] explodes order items; cannot use Quick Ship for Multiple Facilities"/></add-error>
         </if-compare>
@@ -1245,7 +1245,7 @@
         </entity-condition>
         <iterate list-name="orderItemAndShipGrpInvResAndItemList" entry-name="orderItemAndShipGrpInvResAndItem">
             <if>
-                <condition><not><if-compare-field field-name="orderItemShipGrpInvResFacilityIds" operator="contains" to-field-name="orderItemAndShipGrpInvResAndItem.facilityId"/></not></condition>
+                <condition><not><if-compare-field field="orderItemShipGrpInvResFacilityIds" to-field="orderItemAndShipGrpInvResAndItem.facilityId" operator="contains"/></not></condition>
                 <then><field-to-list field-name="orderItemAndShipGrpInvResAndItem.facilityId" list-name="orderItemShipGrpInvResFacilityIds"/></then>
             </if>
         </iterate>
@@ -1267,7 +1267,7 @@
         <field-to-result field-name="shipmentShipGroupFacilityList"/>
         <field-to-result field-name="successMessageList"/>
 
-        <if-empty field-name="shipmentShipGroupFacilityList">
+        <if-empty field="shipmentShipGroupFacilityList">
             <add-error><fail-message message="Warning: no shipments created; could not find anything ready and needing to be shipped."/></add-error>
         </if-empty>
         <check-errors/>
@@ -1312,7 +1312,7 @@
                 <field-map field-name="toOrderItemSeqId" env-name="orderItem.orderItemSeqId"/>
                 <field-map field-name="orderItemAssocTypeId" value="DROP_SHIPMENT"/>
             </entity-and>
-            <if-not-empty field-name="orderItemAssocs">
+            <if-not-empty field="orderItemAssocs">
                 <iterate entry-name="orderItemAssoc" list-name="orderItemAssocs">
                     <set field="itemStatusContext.orderId" from-field="orderItemAssoc.orderId"/>
                     <set field="itemStatusContext.orderItemSeqId" from-field="orderItemAssoc.orderItemSeqId"/>
@@ -1340,7 +1340,7 @@
         </entity-and>
 
         <!-- make sure we have something to ship -->
-        <if-empty field-name="orderItemAndShipGroupAssocList">
+        <if-empty field="orderItemAndShipGroupAssocList">
             <add-error><fail-message message="No items available to ship at this time"/></add-error>
             <check-errors/>
         </if-empty>
@@ -1368,7 +1368,7 @@
             <set from-field="orderItemListByShGrpMap.${orderItemShipGroup.shipGroupSeqId}" field="perShipGroupItemList"/>
 
             <!-- make sure we have something to ship -->
-            <if-empty field-name="perShipGroupItemList">
+            <if-empty field="perShipGroupItemList">
                 <string-to-list string="No items available to ship at this time for ship group ID [${orderItemShipGroup.shipGroupSeqId}]" list-name="successMessageList"/>
             <else>
                 <!-- create the shipment for this facility and ship group combination -->
@@ -1376,7 +1376,7 @@
                 <set from-field="orderItemShipGroup.shipGroupSeqId" field="shipmentContext.primaryShipGroupSeqId"/>
                 <!-- for Sales Shipment, order items' reservation facilityId is the originFacilityId, and the initial status is "INPUT"
                      for Purchase Shipment, the facilityId parameter is the destinationFacilityId, and the initial status is "CREATED" -->
-                <if><condition><if-compare field-name="orderHeader.orderTypeId" operator="equals" value="SALES_ORDER"/></condition>
+                <if><condition><if-compare field="orderHeader.orderTypeId" operator="equals" value="SALES_ORDER"/></condition>
                   <then>
                     <set from-field="orderItemShipGrpInvResFacilityId" field="shipmentContext.originFacilityId"/>
                     <set value="SHIPMENT_INPUT" field="shipmentContext.statusId"/>
@@ -1391,7 +1391,7 @@
                 </call-service>
                 <find-by-primary-key entity-name="Shipment" map-name="shipmentLookupMap" value-name="shipment"/>
 
-                <if><condition><if-compare field-name="orderHeader.orderTypeId" operator="equals" value="SALES_ORDER"/></condition>
+                <if><condition><if-compare field="orderHeader.orderTypeId" operator="equals" value="SALES_ORDER"/></condition>
                   <then>
                     <iterate list-name="perShipGroupItemList" entry-name="orderItemAndShipGroupAssoc">
                       <!-- just get the OrderItemShipGrpInvResAndItem records for this facility and this ship group, since that is what this shipment is for -->
@@ -1443,7 +1443,7 @@
                     </call-service>
                 </iterate>
 
-                <if><condition><if-compare field-name="orderHeader.orderTypeId" operator="equals" value="SALES_ORDER"/></condition>
+                <if><condition><if-compare field="orderHeader.orderTypeId" operator="equals" value="SALES_ORDER"/></condition>
                   <then>
                     <!-- update the shipment status to packed -->
                     <set from-field="shipment.shipmentId" field="packedContext.shipmentId"/>
@@ -1476,7 +1476,7 @@
     <simple-method method-name="createOrderShipmentPlan" short-description="Create Shipment, ShipmentItems and OrderShipment">
         <!-- first get the order header; make sure we have a product store -->
         <entity-one entity-name="OrderHeader" value-name="orderHeader"/>
-        <if-empty field-name="productStoreId" map-name="orderHeader">
+        <if-empty field="orderHeader.productStoreId">
             <!-- no store cannot use quick ship; throw error -->
             <add-error><fail-message message="No ProductStore associated with order; cannot use Quick Ship"/></add-error>
             <check-errors/>
@@ -1507,9 +1507,9 @@
                 </entity-one>
                 
                 <!-- make sure the OrderItem is for a Product that has a ProductType with isPhysical=Y -->
-                <if-not-empty field-name="itemProduct">
+                <if-not-empty field="itemProduct">
                     <get-related-one value-name="itemProduct" relation-name="ProductType" to-value-name="itemProductType" use-cache="true"/>
-                    <if-compare field-name="itemProductType.isPhysical" operator="equals" value="Y">
+                    <if-compare field="itemProductType.isPhysical" operator="equals" value="Y">
                         <!-- Create shipment item -->
                         <clear-field field-name="addOrderShipmentToShipmentCtx"/>
                         <set field="addOrderShipmentToShipmentCtx.orderId" from-field="orderHeader.orderId"/>
@@ -1531,12 +1531,12 @@
         <!-- If serialNumber exist then run reserveAnInventoryItem for serialisedInventory.There is no need to check
              this condition for the non-serialized inventory (Non serialized Inventory will directly issued).
         -->
-        <if-not-empty field-name="parameters.serialNumber">                
+        <if-not-empty field="parameters.serialNumber">                
         <make-value entity-name="OrderItemShipGrpInvRes" value-name="orderItemShipGrpInvResLookupPk"/>                
         <set-pk-fields value-name="orderItemShipGrpInvResLookupPk" map-name="parameters"/>
         <find-by-primary-key entity-name="OrderItemShipGrpInvRes" map-name="orderItemShipGrpInvResLookupPk" value-name="orderItemShipGrpInvRes"/>      
         <get-related-one to-value-name="inventoryItem" relation-name="InventoryItem" value-name="orderItemShipGrpInvRes"/>        
-        <if-compare-field operator="not-equals" field-name="inventoryItem.serialNumber" to-field-name="parameters.serialNumber">            
+        <if-compare-field operator="not-equals" field="inventoryItem.serialNumber" to-field="parameters.serialNumber">            
             <!-- The inventory that we have reserved is not what we shipped. Lets reReserve, this time we'll get what we want -->
             <set-service-fields map-name="parameters" to-map-name="reserveAnInventoryItemCtx" service-name="reserveAnInventoryItem"/>
             <call-service service-name="reserveAnInventoryItem" in-map-name="reserveAnInventoryItemCtx">
@@ -1563,14 +1563,14 @@
         </entity-one>
         <clear-field field-name="shipItemContext"/>
         <set from-field="parameters.shipmentPackageSeqId" field="shipItemContext.shipmentPackageSeqId"/>
-        <if-empty field-name="shipItemContext.shipmentPackageSeqId">
+        <if-empty field="shipItemContext.shipmentPackageSeqId">
             <set value="New" field="shipItemContext.shipmentPackageSeqId"/>
         </if-empty>
         <log level="info" message="Package SeqID : ${shipItemContext.shipmentPackageSeqId}"/>
         <make-value entity-name="ShipmentPackage" value-name="shipmentPackageLookupPk"/>                
         <set-pk-fields value-name="shipmentPackageLookupPk" map-name="parameters"/>
         <find-by-primary-key entity-name="ShipmentPackage" map-name="shipmentPackageLookupPk" value-name="shipmentPackage"/>
-        <if-empty field-name="shipmentPackage">
+        <if-empty field="shipmentPackage">
             <set from-field="itemIssuance.shipmentId" field="shipPackageContext.shipmentId"/>
             <set from-field="shipItemContext.shipmentPackageSeqId" field="shipPackageContext.shipmentPackageSeqId"/>  
             <call-service service-name="createShipmentPackage" in-map-name="shipPackageContext"/>            
@@ -1584,20 +1584,20 @@
             <result-to-field result-name="shipmentPackageSeqId" map-name="routeSegLookup"/>
         </call-service>
         
-        <if-not-empty field-name="shipmentPackageSeqId" map-name="routeSegLookup">
+        <if-not-empty field="routeSegLookup.shipmentPackageSeqId">
             <set from-field="itemIssuance.shipmentId" field="routeSegLookup.shipmentId"/>
             <!-- quick ship orders should only have one route segment -->
             <set value="00001" field="routeSegLookup.shipmentRouteSegmentId"/>
             <find-by-primary-key entity-name="ShipmentPackageRouteSeg" map-name="routeSegLookup" value-name="packageRouteSegment"/>
-            <if-not-empty field-name="packageRouteSegment">
+            <if-not-empty field="packageRouteSegment">
                 <set from-field="parameters.trackingNum" field="packageRouteSegment.trackingCode"/>
                 <store-value value-name="packageRouteSegment"/>
             </if-not-empty>
-            <if-empty field-name="packageRouteSegment">
+            <if-empty field="packageRouteSegment">
                 <log level="warning" message="No route segment found : ${routeSegLookup}"/>
             </if-empty>
         </if-not-empty>
-        <if-empty field-name="routeSegLookup.shipmentPackageSeqId">
+        <if-empty field="routeSegLookup.shipmentPackageSeqId">
             <log level="warning" message="No shipment package ID found; cannot update RouteSegment"/>
         </if-empty>
                   
@@ -1609,7 +1609,7 @@
         <set value="SHIPMENT_PACKED" field="packedContext.statusId"/>
         <call-service service-name="updateShipment" in-map-name="packedContext"/>
         <!--update the shipment status to shipped -->
-        <if-empty field-name="parameters.setPackedOnly">
+        <if-empty field="parameters.setPackedOnly">
             <set from-field="parameters.shipmentId" field="packedContext.shipmentId"/>
             <set value="SHIPMENT_SHIPPED" field="packedContext.statusId"/>
             <call-service service-name="updateShipment" in-map-name="packedContext"/>
@@ -1625,27 +1625,27 @@
         <!-- first get the order header; make sure we have a product store -->
         <entity-one entity-name="OrderHeader" value-name="orderHeader"/>
 
-        <if-empty field-name="parameters.originFacilityId">
-            <if-empty field-name="orderHeader.productStoreId">
+        <if-empty field="parameters.originFacilityId">
+            <if-empty field="orderHeader.productStoreId">
                 <!-- no store cannot use quick ship; throw error -->
                 <add-error><fail-message message="No ProductStore associated with order; cannot use Quick Ship"/></add-error>
                 <check-errors/>
             </if-empty>
-            <if-not-empty field-name="orderHeader.productStoreId">
+            <if-not-empty field="orderHeader.productStoreId">
                 <!-- get the product store entity -->
                 <entity-one entity-name="ProductStore" value-name="productStore">
                     <field-map field-name="productStoreId" env-name="orderHeader.productStoreId"/>
                 </entity-one>
 
-                <if-compare field-name="productStore.reserveInventory" operator="not-equals" value="Y">
+                <if-compare field="productStore.reserveInventory" operator="not-equals" value="Y">
                     <!-- no reservations; no shipment; cannot use quick ship -->
                     <add-error><fail-message message="ProductStore [${productStore.productStoreId}] does not reserve inventory; cannot use Quick Ship"/></add-error>
                 </if-compare>
-                <if-compare field-name="productStore.oneInventoryFacility" operator="not-equals" value="Y">
+                <if-compare field="productStore.oneInventoryFacility" operator="not-equals" value="Y">
                     <!-- if we allow multiple facilities we cannot use quick ship; throw error -->
                     <add-error><fail-message message="ProductStore [${productStore.productStoreId}] allows multiple facilities; cannot use Quick Ship"/></add-error>
                 </if-compare>
-                <if-empty field-name="productStore.inventoryFacilityId">
+                <if-empty field="productStore.inventoryFacilityId">
                     <!-- if no inventoryFacility is defined we cannot use quick ship; throw error -->
                     <add-error><fail-message message="No inventory facility associated with ProductStore [${productStore.productStoreId}]; cannot use Quick Ship"/></add-error>
                 </if-empty>
@@ -1654,7 +1654,7 @@
         </if-empty>
 
         <!-- make sure we have items to issue -->
-        <if-empty field-name="parameters.itemShipList">
+        <if-empty field="parameters.itemShipList">
             <add-error><fail-message message="No items available to ship at this time"/></add-error>
             <check-errors/>
         </if-empty>
@@ -1663,7 +1663,7 @@
         <set from-field="parameters.itemShipList" field="itemMapList"/>
 
         <!-- we are all good to go; create the shipment -->
-        <if-not-empty field-name="parameters.originFacilityId">
+        <if-not-empty field="parameters.originFacilityId">
             <set from-field="parameters.originFacilityId" field="shipmentContext.originFacilityId"/>
         </if-not-empty>
         <set from-field="parameters.orderId" field="shipmentContext.primaryOrderId"/>
@@ -1700,7 +1700,7 @@
 
             <clear-field field-name="shipItemContext"/>
             <set from-field="packageMap.${itemMap.trackingNum}" field="shipItemContext.shipmentPackageSeqId"/>
-            <if-empty field-name="shipItemContext.shipmentPackageSeqId">
+            <if-empty field="shipItemContext.shipmentPackageSeqId">
                 <set value="New" field="shipItemContext.shipmentPackageSeqId"/>
             </if-empty>
             <log level="info" message="Package SeqID : ${shipItemContext.shipmentPackageSeqId}"/>
@@ -1713,21 +1713,21 @@
                 <result-to-field result-name="shipmentPackageSeqId" map-name="routeSegLookup"/>
             </call-service>
 
-            <if-not-empty field-name="shipmentPackageSeqId" map-name="routeSegLookup">
+            <if-not-empty field="routeSegLookup.shipmentPackageSeqId">
                 <set from-field="itemIssuance.shipmentId" field="routeSegLookup.shipmentId"/>
                 <!-- quick ship orders should only have one route segment -->
                 <set value="00001" field="routeSegLookup.shipmentRouteSegmentId"/>
                 <find-by-primary-key entity-name="ShipmentPackageRouteSeg" map-name="routeSegLookup" value-name="packageRouteSegment"/>
 
-                <if-not-empty field-name="packageRouteSegment">
+                <if-not-empty field="packageRouteSegment">
                     <set from-field="itemMap.trackingNum" field="packageRouteSegment.trackingCode"/>
                     <store-value value-name="packageRouteSegment"/>
                 </if-not-empty>
-                <if-empty field-name="packageRouteSegment">
+                <if-empty field="packageRouteSegment">
                     <log level="warning" message="No route segment found : ${routeSegLookup}"/>
                 </if-empty>
             </if-not-empty>
-            <if-empty field-name="routeSegLookup.shipmentPackageSeqId">
+            <if-empty field="routeSegLookup.shipmentPackageSeqId">
                 <log level="warning" message="No shipment package ID found; cannot update RouteSegment"/>
             </if-empty>
         </iterate>
@@ -1738,7 +1738,7 @@
         <call-service service-name="updateShipment" in-map-name="packedContext"/>
 
         <!-- update the shipment status to shipped -->
-        <if-empty field-name="parameters.setPackedOnly">
+        <if-empty field="parameters.setPackedOnly">
             <set from-field="shipment.shipmentId" field="packedContext.shipmentId"/>
             <set value="SHIPMENT_SHIPPED" field="packedContext.statusId"/>
             <call-service service-name="updateShipment" in-map-name="packedContext"/>
@@ -1776,7 +1776,7 @@
             </calcop>
         </calculate>
         <clear-field field-name="inMap"/>
-        <if-compare field-name="shipmentItem.quantity" operator="greater" value="0.0" type="Double">
+        <if-compare field="shipmentItem.quantity" operator="greater" value="0.0" type="Double">
             <set from-field="parameters.userLogin" field="inMap.userLogin"/>
             <set from-field="parameters.shipmentId" field="inMap.shipmentId"/>
             <set from-field="parameters.shipmentItemSeqId" field="inMap.shipmentItemSeqId"/>
@@ -1803,7 +1803,7 @@
         </check-permission>
 
         <!-- if quantity is greater than 0 we add or update the ShipmentPlan -->
-        <if-compare field-name="parameters.quantity" operator="greater" value="0" type="Double">
+        <if-compare field="parameters.quantity" operator="greater" value="0" type="Double">
 
             <!-- get orderHeader -->
             <make-value entity-name="OrderHeader" value-name="orderHeaderLookupPk"/>
@@ -1811,7 +1811,7 @@
             <find-by-primary-key map-name="orderHeaderLookupPk" value-name="orderHeader"/>
 
             <!-- make sure the order is of orderTypeId: SALES_ORDER -->
-            <if-compare field-name="orderTypeId" map-name="orderHeader" operator="not-equals" value="SALES_ORDER">
+            <if-compare field="orderHeader.orderTypeId" operator="not-equals" value="SALES_ORDER">
                 <string-to-list string="Not adding Order Item to plan for shipment [${parameters.shipmentId}] because the order is not a Sales Order for order [${parameters.orderId}] order item [${parameters.orderItemSeqId}]" list-name="error_list"/>
             </if-compare>
 
@@ -1824,7 +1824,7 @@
             <make-value entity-name="OrderShipment" value-name="orderShipmentLookup"/>
             <set-pk-fields value-name="orderShipmentLookup" map-name="parameters"/>
             <find-by-and entity-name="OrderShipment" map-name="orderShipmentLookup" list-name="existingOrderShipments"/>
-            <if-not-empty field-name="existingOrderShipments">
+            <if-not-empty field="existingOrderShipments">
                 <string-to-list string="Not adding Order Item to plan for shipment [${parameters.shipmentId}] because the order item is already in the shipment (order [${parameters.orderId}], order item [${parameters.orderItemSeqId}])" list-name="error_list"/>
             </if-not-empty>
 
@@ -1834,7 +1834,7 @@
                 <result-to-field result-name="remainingQuantity" field-name="remainingQuantity"/>
             </call-service>
 
-            <if-compare-field field-name="parameters.quantity" operator="greater" to-field-name="remainingQuantity" type="Double">
+            <if-compare-field field="parameters.quantity" to-field="remainingQuantity" operator="greater" type="Double">
                 <string-to-list string="Not adding Order Item to plan for shipment [${parameters.shipmentId}] because the quantity is greater than the remaining quantity (order [${parameters.orderId}], order item [${parameters.orderItemSeqId}])" list-name="error_list"/>
             </if-compare-field>
             <check-errors/>
@@ -1952,9 +1952,9 @@
             <field-map field-name="shipmentRouteSegmentId" env-name="routeSegMap.shipmentRouteSegmentId"/>
         </entity-one>
         <assert>
-            <not><if-empty field-name="shipmentRouteSegment"/></not>
-            <if-compare-field field-name="shipmentRouteSegment.shipmentId" operator="equals" to-field-name="shipRouteSegMap.shipmentId"/>
-            <if-compare-field field-name="shipmentRouteSegment.shipmentRouteSegmentId" operator="equals" to-field-name="routeSegMap.shipmentRouteSegmentId"/>
+            <not><if-empty field="shipmentRouteSegment"/></not>
+            <if-compare-field field="shipmentRouteSegment.shipmentId" to-field="shipRouteSegMap.shipmentId" operator="equals"/>
+            <if-compare-field field="shipmentRouteSegment.shipmentRouteSegmentId" to-field="routeSegMap.shipmentRouteSegmentId" operator="equals"/>
         </assert>
         <check-errors/>
     </simple-method>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml Fri Jun 13 23:03:12 2008
@@ -77,8 +77,8 @@
         </entity-one>
         
         <assert>
-        <not><if-empty field-name="shipment"/></not>
-        <if-compare-field field-name="shipment.shipmentId" operator="equals" to-field-name="completePackOutMap.shipmentId"/>
+        <not><if-empty field="shipment"/></not>
+        <if-compare-field field="shipment.shipmentId" to-field="completePackOutMap.shipmentId" operator="equals"/>
         </assert>
         <check-errors/>
         
@@ -97,7 +97,7 @@
             </entity-one>
         
             <assert>
-            <not><if-empty field-name="invoice"/></not>
+            <not><if-empty field="invoice"/></not>
             </assert>
             <check-errors/>
         </iterate>
@@ -136,9 +136,9 @@
         </entity-one>
         
         <assert>
-        <not><if-empty field-name="shipment"/></not>
-        <if-compare-field field-name="shipment.shipmentId" operator="equals" to-field-name="updateShipmentOutMap.shipmentId"/>
-        <if-compare-field field-name="shipment.statusId" operator="equals" to-field-name="updateShipmentInMap.statusId"/>
+        <not><if-empty field="shipment"/></not>
+        <if-compare-field field="shipment.shipmentId" to-field="updateShipmentOutMap.shipmentId" operator="equals"/>
+        <if-compare-field field="shipment.statusId" to-field="updateShipmentInMap.statusId" operator="equals"/>
         </assert>
         <check-errors/>
 
@@ -190,4 +190,4 @@
         </assert>
         <check-errors/>
     </simple-method>  
-</simple-methods>
\ No newline at end of file
+</simple-methods>

Modified: ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/login/LoginSimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/login/LoginSimpleEvents.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/login/LoginSimpleEvents.xml (original)
+++ ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/login/LoginSimpleEvents.xml Fri Jun 13 23:03:12 2008
@@ -36,7 +36,7 @@
             <result-to-field result-name="updatedUserLogin" field-name="updatedUserLogin"/>
         </call-service>
         <session-to-field field-name="userLogin"/>
-        <if-compare-field map-name="userLogin" field-name="userLoginId" operator="equals" to-map-name="updatedUserLogin" to-field-name="userLoginId">
+        <if-compare-field field="userLogin.userLoginId" operator="equals" to-field="updatedUserLogin.userLoginId">
             <field-to-session field-name="updatedUserLogin" session-name="userLogin"/>
         </if-compare-field>
     </simple-method>

Modified: ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml (original)
+++ ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml Fri Jun 13 23:03:12 2008
@@ -98,7 +98,7 @@
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         
-        <if-empty field-name="fromDate" map-name="newEntity">
+        <if-empty field="newEntity.fromDate">
             <now-timestamp-to-env env-name="nowTimestamp"/>
             <set from-field="nowTimestamp" field="newEntity.fromDate"/>
         </if-empty>

Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml Fri Jun 13 23:03:12 2008
@@ -32,7 +32,7 @@
         <if>
             <condition>
                 <not>
-                    <if-compare field-name="hasPermission" value="true" operator="equals"/>
+                    <if-compare field="hasPermission" value="true" operator="equals"/>
                 </not>
             </condition>
             <then>
@@ -42,16 +42,16 @@
                 <call-simple-method method-name="genericBasePermissionCheck" xml-resource="org/ofbiz/common/permission/CommonPermissionServices.xml"/>
                 <if>
                     <condition>
-                        <if-compare field-name="hasPermission" value="true" operator="equals"/>
+                        <if-compare field="hasPermission" value="true" operator="equals"/>
                     </condition>
                     <then>
                         <log level="info" message="User has ROLE permission, now checking if user is in required ROLE "></log>
                         <if>
                             <condition>
                                 <and>
-                                    <if-compare field-name="mainAction" value="CREATE" operator="equals"/>
+                                    <if-compare field="mainAction" value="CREATE" operator="equals"/>
                                     <not>
-                                        <if-empty field-name="parameters.workEffortParentId"/>
+                                        <if-empty field="parameters.workEffortParentId"/>
                                     </not>
                                 </and>
                             </condition>
@@ -63,7 +63,7 @@
                         <else-if>
                             <!-- Processing UPDATE permission check  -->
                             <condition>
-                                <if-compare field-name="mainAction" value="UPDATE" operator="equals"/>
+                                <if-compare field="mainAction" value="UPDATE" operator="equals"/>
                             </condition>
                             <then>
                                 <!-- make sure we have role permission to update THIS workeffort -->
@@ -76,9 +76,9 @@
                                 <if>
                                     <condition>
                                         <and>
-                                            <if-compare field-name="hasPermission" value="true" operator="equals"/>
-                                            <not><if-empty field-name="parameters.workEffortParentId"/></not>                                                                                                    
-                                            <if-compare-field field-name="parameters.workEffortParentId" operator="not-equals" to-field-name="workEffort.workEffortParentId"/>
+                                            <if-compare field="hasPermission" value="true" operator="equals"/>
+                                            <not><if-empty field="parameters.workEffortParentId"/></not>                                                                                                    
+                                            <if-compare-field field="parameters.workEffortParentId" to-field="workEffort.workEffortParentId" operator="not-equals"/>
                                         </and>
                                     </condition>
                                     <then>
@@ -92,7 +92,7 @@
                                 <if>
                                     <condition>
                                         <not>
-                                            <if-compare field-name="hasPermission" value="true" operator="equals"/>
+                                            <if-compare field="hasPermission" value="true" operator="equals"/>
                                         </not>
                                     </condition>
                                     <then>
@@ -102,9 +102,9 @@
                                         <if>
                                             <condition>
                                                 <and>
-                                                    <if-compare field-name="hasPermission" value="true" operator="equals"/>
-                                                    <not><if-empty field-name="parameters.workEffortParentId"/></not>                                                                                                    
-                                                    <if-compare-field field-name="parameters.workEffortParentId" operator="not-equals" to-field-name="workEffort.workEffortParentId"/>
+                                                    <if-compare field="hasPermission" value="true" operator="equals"/>
+                                                    <not><if-empty field="parameters.workEffortParentId"/></not>                                                                                                    
+                                                    <if-compare-field field="parameters.workEffortParentId" to-field="workEffort.workEffortParentId" operator="not-equals"/>
                                                 </and>
                                             </condition>
                                             <then>
@@ -125,11 +125,11 @@
     </simple-method>
     
     <simple-method method-name="workEffortPartyOwnerRolePermission" short-description="Check if Party is in CAL_OWNER or CAL_DELEGATE role with WorkEffort">
-        <if-empty field-name="workEffortId">
+        <if-empty field="workEffortId">
             <!-- This should be case of create WorkEffort -->
             <set field="workEffortId" from-field="parameters.workEffortParentId"/>    
         </if-empty>
-        <while><condition><not><if-empty field-name="workEffortId"></if-empty></not></condition>
+        <while><condition><not><if-empty field="workEffortId"></if-empty></not></condition>
             <then>
                 <!-- if the case is of new workEffort with Parent workEffort Id,
                     then lookup the parent workEffort and check if user  is in any OWNER role with WorkEffort -->
@@ -142,14 +142,14 @@
                 <filter-list-by-date list-name="roleParties"/>
                 <log level="always" message="Found role parties: ${roleParties}"/>
                 
-                <if-empty field-name="roleParties">
+                <if-empty field="roleParties">
                     <log level="info" message="Party ${userLogin.partyId} is not in ${roleTypeId} role with workEffort: ${workEffortId}"/>
                     <set value="CAL_DELEGATE" field="lookupRoleWorkEffortMap.roleTypeId"/>
                     <find-by-and entity-name="WorkEffortPartyAssignment" map-name="lookupRoleWorkEffortMap" list-name="roleParties"/>
                 </if-empty>
                 <filter-list-by-date list-name="roleParties"/>
 
-                <if-not-empty field-name="roleParties">
+                <if-not-empty field="roleParties">
                     <set field="hasPermission" type="Boolean" value="true"/>
                     <field-to-result field-name="hasPermission"/>
                     <log level="info" message="Party ${userLogin.partyId} is in ${lookupRoleWorkEffortMap.roleTypeId} role with workEffort: ${workEffortId}"/>
@@ -166,7 +166,7 @@
                         <set field="workEffortLookUpMap.workEffortId" from-field="workEffortId"/>
                         <find-by-primary-key entity-name="WorkEffort" map-name="workEffortLookUpMap" value-name="workEffortParent"/>
                         <set from-field="workEffortParent.workEffortParentId" field="workEffortId"/>
-                        <if-empty field-name="workEffortParent.workEffortParentId">
+                        <if-empty field="workEffortParent.workEffortParentId">
                             <clear-field field-name="workEffortId"/>
                         </if-empty>
                     </else>
@@ -177,11 +177,11 @@
     </simple-method>
 
     <simple-method method-name="workEffortPartyAnyRolePermission" short-description="Check if Party is in ANY role with WorkEffort">
-        <if-empty field-name="workEffortId">
+        <if-empty field="workEffortId">
             <!-- This should be case of create WorkEffort -->
             <set field="workEffortId" from-field="parameters.workEffortParentId"/>
         </if-empty>
-        <while><condition><not><if-empty field-name="workEffortId"></if-empty></not></condition>
+        <while><condition><not><if-empty field="workEffortId"></if-empty></not></condition>
             <then>
                 <!-- if the case is of new workEffort with Parent workEffort Id,
                     then lookup the parent workEffort and check if user  is in any role with WorkEffort -->
@@ -190,7 +190,7 @@
                 <find-by-and entity-name="WorkEffortPartyAssignment" map-name="lookupRoleWorkEffortMap" list-name="roleParties"/>
                 <filter-list-by-date list-name="roleParties"/>
 
-                <if-not-empty field-name="roleParties">
+                <if-not-empty field="roleParties">
                     <set field="hasPermission" type="Boolean" value="true"/>
                     <field-to-result field-name="hasPermission"/>
                     <log level="info" message="Party ${userLogin.partyId} is associated with workEffort: ${workEffortId}"/>
@@ -207,7 +207,7 @@
                         <set field="workEffortLookUpMap.workEffortId" from-field="workEffortId"/>
                         <find-by-primary-key entity-name="WorkEffort" map-name="workEffortLookUpMap" value-name="workEffortParent"/>
                         <set from-field="workEffortParent.workEffortParentId" field="workEffortId"/>
-                        <if-empty field-name="workEffortParent.workEffortParentId">
+                        <if-empty field="workEffortParent.workEffortParentId">
                             <clear-field field-name="workEffortId"/>
                         </if-empty>
                     </else>
@@ -221,18 +221,18 @@
         <set field="parameters.mainAction" value="UPDATE"/>
         <call-simple-method method-name="workEffortGenericPermission"/>
         <check-errors/>
-        <if-compare-field operator="not-equals" field-name="parameters.partyId" to-field-name="userLogin.partyId">
+        <if-compare-field operator="not-equals" field="parameters.partyId" to-field="userLogin.partyId">
             <property-to-field resource="WorkEffortUiLabels" property="WorkEffortTimeSheetNotInRolePermissionError" field-name="failMessage"/>
             <set field="hasPermission" type="Boolean" value="false"/>
             <field-to-result field-name="hasPermission"/>
             <field-to-result field-name="failMessage"/>
         </if-compare-field>
-        <if-not-empty field-name="workEffortId">
+        <if-not-empty field="workEffortId">
             <set from-field="workEffortId" field="lookupRoleWorkEffortMap.workEffortId"/>
             <set from-field="userLogin.partyId" field="lookupRoleWorkEffortMap.partyId"/>
             <find-by-and entity-name="WorkEffortPartyAssignByRole" map-name="lookupRoleWorkEffortMap" list-name="roleParties"/>                    
             <filter-list-by-date list-name="roleParties"/>
-            <if-empty field-name="roleParties">
+            <if-empty field="roleParties">
                 <property-to-field resource="WorkEffortUiLabels" property="WorkEffortTimeSheetNotInRolePermissionError" field-name="failMessage"/>
                 <set field="hasPermission" type="Boolean" value="false"/>
                 <field-to-result field-name="hasPermission"/>
@@ -244,11 +244,11 @@
     <!-- check for party groups -->
     <!-- Get list of Party Groups in CAL_OWNER or CAL_DELEGATE with WorkEffort or its parents -->
     <simple-method method-name="workEffortPartyGroupRolePermission" short-description="Check if Party is party member of PartyGroup that is in CAL_OWNER or CAL_DELEGATE role with WorkEffort">
-        <if-empty field-name="workEffortId">
+        <if-empty field="workEffortId">
             <!-- This should be case of create WorkEffort -->
             <set field="workEffortId" from-field="parameters.workEffortParentId"/>
         </if-empty>
-        <while><condition><not><if-empty field-name="workEffortId"></if-empty></not></condition>
+        <while><condition><not><if-empty field="workEffortId"></if-empty></not></condition>
             <then>
                 <!-- Get list of Parties of Type PartyGroup in CAL_OWNER or CAL_DELEGATE with WorkEffort -->      
                 <set from-field="workEffortId" field="lookupPartyRoleWorkEffortMap.workEffortId"/>
@@ -260,13 +260,13 @@
                 <filter-list-by-date list-name="rolePartyGroups"/>
                 <log level="always" message="Found role parties Group: ${rolePartyGroups}"/>
                 
-                <if-empty field-name="rolePartyGroups">
+                <if-empty field="rolePartyGroups">
                     <log level="info" message="No Party Group found in CAL_OWNER role with workEffort: ${workEffortId}"/>
                     <set value="CAL_DELEGATE" field="lookupRoleWorkEffortMap.roleTypeId"/>
                     <find-by-and entity-name="WorkEffortPartyAssignView" map-name="lookupRoleWorkEffortMap" list-name="rolePartyGroups"/>
                 </if-empty>
                 <filter-list-by-date list-name="rolePartyGroups"/>
-                <if-not-empty field-name="rolePartyGroups">
+                <if-not-empty field="rolePartyGroups">
                     <!-- Check to see if User is member of any of these Party groups -->
                     <iterate entry-name="rolePartyGroup" list-name="rolePartyGroups">
                         <!-- check current party is the member of party group-->
@@ -277,7 +277,7 @@
                         <log level="always" message="Conditions: ${lookupPartyRoleMap}"/>
                         <find-by-and entity-name="PartyRelationship" map-name="lookupPartyRoleMap" list-name="partyGroupRelationships"/>
                         <log level="always" message="Found role parties relations: ${partyGroupRelationships}"/>
-                        <if-not-empty field-name="partyGroupRelationships">
+                        <if-not-empty field="partyGroupRelationships">
                             <set field="hasPermission" type="Boolean" value="true"/>
                             <field-to-result field-name="hasPermission"/>
                             <log level="info" message="Party ${userLogin.partyId} is associated with workEffort: ${workEffortId}"/>                            
@@ -294,7 +294,7 @@
                     <set field="workEffortLookUpMap.workEffortId" from-field="workEffortId"/>
                     <find-by-primary-key entity-name="WorkEffort" map-name="workEffortLookUpMap" value-name="workEffortParent"/>
                     <set from-field="workEffortParent.workEffortParentId" field="workEffortId"/>
-                    <if-empty field-name="workEffortParent.workEffortParentId">
+                    <if-empty field="workEffortParent.workEffortParentId">
                         <clear-field field-name="workEffortId"/>
                     </if-empty>
                 </else>

Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/RateServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/RateServices.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/RateServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/RateServices.xml Fri Jun 13 23:03:12 2008
@@ -27,7 +27,7 @@
         <check-errors/>
         <make-value value-name="newEntity" entity-name="PartyRate"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
-        <if-empty field-name="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty>
+        <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <call-simple-method method-name="checkOtherDefaultRate"/>
         <create-value value-name="newEntity"/>
@@ -41,12 +41,12 @@
         <store-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="checkOtherDefaultRate" short-description="remove an other defaultRate flag">
-        <if-compare field-name="newEntity.defaultRate" value="Y" operator="equals">
+        <if-compare field="newEntity.defaultRate" value="Y" operator="equals">
             <entity-and entity-name="PartyRate" list-name="rates" filter-by-date="true">
                 <field-map field-name="partyId" env-name="newEntity.partyId"/>
                 <field-map field-name="defaultRate" value="Y"/>
             </entity-and>
-            <if-not-empty field-name="rates">
+            <if-not-empty field="rates">
                 <first-from-list entry-name="rate" list-name="rates"/>
                 <set field="rate.defaultRate" value="N"/>
                 <store-value value-name="rate"/>
@@ -68,7 +68,7 @@
         
         <make-value value-name="newEntity" entity-name="WorkEffortAssignmentRate"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
-        <if-empty field-name="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty>
+        <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>