svn commit: r667748 [7/16] - in /ofbiz/trunk: applications/accounting/script
Locked
svn commit: r667748 [7/16] - in /ofbiz/trunk: applications/accounting/script
 
|
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml Fri Jun 13 23:03:12 2008 @@ -25,7 +25,7 @@ <condition> <and> <not><if-has-permission permission="ORDERMGR" action="_VIEW"/></not> - <if-compare-field field-name="parameters.partyId" operator="not-equals" to-field-name="userLogin.partyId"/> + <if-compare-field field="parameters.partyId" to-field="userLogin.partyId" operator="not-equals"/> </and> </condition> <then> @@ -34,7 +34,7 @@ </if> <check-errors/> - <if-not-empty field-name="monthsToInclude"> + <if-not-empty field="monthsToInclude"> <now-timestamp-to-env env-name="nowTimestamp"/> <call-bsh><![CDATA[ calendar = java.util.Calendar.getInstance(); @@ -45,13 +45,13 @@ <set from-field="nowTimestamp" field="parameters.thruDate"/> </if-not-empty> - <if-empty field-name="parameters.roleTypeId"> + <if-empty field="parameters.roleTypeId"> <set value="PLACING_CUSTOMER" field="parameters.roleTypeId"/> </if-empty> - <if-empty field-name="parameters.orderTypeId"> + <if-empty field="parameters.orderTypeId"> <set value="SALES_ORDER" field="parameters.orderTypeId"/> </if-empty> - <if-empty field-name="parameters.statusId"> + <if-empty field="parameters.statusId"> <set value="ORDER_COMPLETED" field="parameters.statusId"/> </if-empty> @@ -80,7 +80,7 @@ <!-- because we specified the partyId and the roleTypeId, should only be one item in list returned --> <first-from-list list-name="orderInfoList" entry-name="orderInfo"/> - <if-not-empty field-name="orderInfo"> + <if-not-empty field="orderInfo"> <field-to-result field-name="orderInfo.totalGrandAmount" result-name="totalGrandAmount"/> <field-to-result field-name="orderInfo.totalSubRemainingAmount" result-name="totalSubRemainingAmount"/> <field-to-result field-name="orderInfo.totalOrders" result-name="totalOrders"/> @@ -142,7 +142,7 @@ <!-- Include the facilityId corresponding to this order by looking up the ProductStore --> <entity-one entity-name="OrderHeader" value-name="orderHeader" auto-field-map="true"/> <get-related-one value-name="orderHeader" relation-name="ProductStore" to-value-name="productStore" use-cache="true"/> - <if-not-empty field-name="productStore.inventoryFacilityId"> + <if-not-empty field="productStore.inventoryFacilityId"> <set from-field="productStore.inventoryFacilityId" field="inputMap.facilityId"/> </if-not-empty> @@ -175,19 +175,19 @@ </simple-method> <simple-method method-name="getProductRequirementMethod" short-description="finds the requirement method for the product"> - <if-not-empty field-name="parameters.orderId"> + <if-not-empty field="parameters.orderId"> <entity-one entity-name="OrderHeader" auto-field-map="true" value-name="order"/> </if-not-empty> <entity-one entity-name="Product" auto-field-map="true" value-name="product"/> <set from-field="product.requirementMethodEnumId" field="requirementMethodId"/> - <if-empty field-name="requirementMethodId"> + <if-empty field="requirementMethodId"> <if> <condition> <and> - <if-compare field-name="product.productTypeId" operator="not-equals" value="MARKETING_PKG_AUTO"/> - <if-compare field-name="product.productTypeId" operator="not-equals" value="MARKETING_PKG_PICK"/> - <if-compare field-name="product.productTypeId" operator="not-equals" value="DIGITAL_GOOD"/> - <not><if-empty field-name="order"/></not> + <if-compare field="product.productTypeId" operator="not-equals" value="MARKETING_PKG_AUTO"/> + <if-compare field="product.productTypeId" operator="not-equals" value="MARKETING_PKG_PICK"/> + <if-compare field="product.productTypeId" operator="not-equals" value="DIGITAL_GOOD"/> + <not><if-empty field="order"/></not> </and> </condition> <then> @@ -206,8 +206,8 @@ </check-permission> <check-errors/> <call-simple-method method-name="getProductRequirementMethod"/> - <if-compare field-name="order.orderTypeId" operator="equals" value="SALES_ORDER"> - <if-compare field-name="requirementMethodId" operator="equals" value="PRODRQM_AUTO"> + <if-compare field="order.orderTypeId" operator="equals" value="SALES_ORDER"> + <if-compare field="requirementMethodId" operator="equals" value="PRODRQM_AUTO"> <!-- create the requirement --> <set from-field="parameters.productId" field="inputMap.productId"/> <set from-field="parameters.quantity" field="inputMap.quantity"/> @@ -223,7 +223,7 @@ <check-errors/> <!-- If the service is triggered by the updateItemIssuance service, get the ItemIssuance by the passed itemIssuanceId --> - <if-not-empty field-name="parameters.itemIssuanceId"> + <if-not-empty field="parameters.itemIssuanceId"> <entity-one entity-name="ItemIssuance" auto-field-map="true" value-name="itemIssuance"/> <entity-one entity-name="InventoryItem" value-name="inventoryItem"> <field-map env-name="itemIssuance.inventoryItemId" field-name="inventoryItemId"/> @@ -236,23 +236,23 @@ <set from-field="inventoryItem.productId" field="parameters.productId"/> <call-simple-method method-name="getProductRequirementMethod"/> - <if-compare field-name="requirementMethodId" operator="equals" value="PRODRQM_STOCK"> + <if-compare field="requirementMethodId" operator="equals" value="PRODRQM_STOCK"> <!-- get QOH, ATP quantities and find ProductFacility which has the minimum stock --> <call-simple-method method-name="getProductFacilityAndQuantities"/> - <if-not-empty field-name="productFacility.minimumStock"> + <if-not-empty field="productFacility.minimumStock"> <!-- No requirements are created if we are already under stock --> - <if-compare-field field-name="quantityOnHandTotal" to-field-name="productFacility.minimumStock" operator="greater-equals" type="Double"> + <if-compare-field field="quantityOnHandTotal" to-field="productFacility.minimumStock" operator="greater-equals" type="Double"> <calculate field-name="newQuantityOnHand"> <calcop field-name="quantityOnHandTotal" operator="subtract"> <calcop operator="get" field-name="parameters.quantity"/> </calcop> </calculate> <!-- If this new issuance will cause the quantityOnHandTotal to go below the minimumStock, create a new requirement --> - <if-compare-field field-name="newQuantityOnHand" to-field-name="productFacility.minimumStock" operator="less" type="Double"> + <if-compare-field field="newQuantityOnHand" to-field="productFacility.minimumStock" operator="less" type="Double"> <set from-field="inventoryItem.productId" field="inputMap.productId"/> <set from-field="productFacility.facilityId" field="inputMap.facilityId"/> - <if-not-empty field-name="productFacility.reorderQuantity"> + <if-not-empty field="productFacility.reorderQuantity"> <set from-field="productFacility.reorderQuantity" field="inputMap.quantity"/> <else> <set from-field="parameters.quantity" field="inputMap.quantity"/> @@ -282,24 +282,24 @@ <set from-field="inventoryItem.productId" field="parameters.productId"/> <call-simple-method method-name="getProductRequirementMethod"/> - <if-compare field-name="requirementMethodId" operator="equals" value="PRODRQM_STOCK_ATP"> + <if-compare field="requirementMethodId" operator="equals" value="PRODRQM_STOCK_ATP"> <!-- get QOH, ATP quantities and find ProductFacility which has the minimum stock --> <call-simple-method method-name="getProductFacilityAndQuantities"/> - <if-not-empty field-name="productFacility.minimumStock"> + <if-not-empty field="productFacility.minimumStock"> <!-- No requirements are created if we are not under stock --> <!-- this service is supposed to be called after inventory is reserved, so inventory should have been updated already --> - <if-compare-field field-name="availableToPromiseTotal" to-field-name="productFacility.minimumStock" operator="less" type="Double"> + <if-compare-field field="availableToPromiseTotal" to-field="productFacility.minimumStock" operator="less" type="Double"> <calculate field-name="oldAvailableToPromise"> <calcop field-name="availableToPromiseTotal" operator="add"> <calcop operator="get" field-name="parameters.quantity"/> </calcop> </calculate> <!-- If before this reservation the availableToPromiseTotal was over minimumStock, create a new requirement --> - <if-compare-field field-name="oldAvailableToPromise" to-field-name="productFacility.minimumStock" operator="greater-equals" type="Double"> + <if-compare-field field="oldAvailableToPromise" to-field="productFacility.minimumStock" operator="greater-equals" type="Double"> <set from-field="inventoryItem.productId" field="inputMap.productId"/> <set from-field="productFacility.facilityId" field="inputMap.facilityId"/> - <if-not-empty field-name="productFacility.reorderQuantity"> + <if-not-empty field="productFacility.reorderQuantity"> <set from-field="productFacility.reorderQuantity" field="inputMap.quantity"/> <else> <set from-field="parameters.quantity" field="inputMap.quantity"/> @@ -329,20 +329,20 @@ <set from-field="inventoryItem.productId" field="parameters.productId"/> <call-simple-method method-name="getProductRequirementMethod"/> - <if-compare field-name="requirementMethodId" operator="equals" value="PRODRQM_ATP"> + <if-compare field="requirementMethodId" operator="equals" value="PRODRQM_ATP"> <!-- get the ATP, QOH quantities and the product facility's minimum stock --> <call-simple-method method-name="getProductFacilityAndQuantities"/> - <if-not-empty field-name="productFacility"> + <if-not-empty field="productFacility"> <!-- are we below minimum stock? this service is supposed to be called after inventory is reserved, so inventory should have been updated already --> - <if-compare-field field-name="availableToPromiseTotal" to-field-name="productFacility.minimumStock" operator="less" type="Double"> + <if-compare-field field="availableToPromiseTotal" to-field="productFacility.minimumStock" operator="less" type="Double"> <!-- what is the right quantity? It is the lesser of the actual quantity and the quantity required to bring us back up to minimum stock --> <calculate field-name="quantityShortfall"> <calcop field-name="productFacility.minimumStock" operator="subtract"> <calcop operator="get" field-name="availableToPromiseTotal"/> </calcop> </calculate> - <if-compare-field field-name="quantityShortfall" operator="less" type="Double" to-field-name="parameters.quantity"> + <if-compare-field field="quantityShortfall" operator="less" to-field="parameters.quantity" type="Double"> <set from-field="quantityShortfall" field="inputMap.quantity"/> <else> <set from-field="parameters.quantity" field="inputMap.quantity"/> @@ -381,7 +381,7 @@ </calculate> <!-- If a new requirement needs to be created, create it for the difference between the required quantity and the total quantity of existing requirements --> - <if-compare field-name="newRequirementTotal" operator="greater-equals" value="0"> + <if-compare field="newRequirementTotal" operator="greater-equals" value="0"> <set from-field="inputMap.quantity" field="newRequirementTotal"/> <call-simple-method method-name="createRequirementAndCommitment"/> </if-compare> @@ -405,21 +405,21 @@ <set from-field="productFacility.productId" field="parameters.productId"/> <clear-field field-name="requirementMethodId"/> <call-simple-method method-name="getProductRequirementMethod"/> - <if-empty field-name="requirementMethodId"> + <if-empty field="requirementMethodId"> <set field="requirementMethodId" from-field="parameters.defaultRequirementMethodId"/> </if-empty> <if> <condition> <or> - <if-compare field-name="requirementMethodId" operator="equals" value="PRODRQM_STOCK"/> - <if-compare field-name="requirementMethodId" operator="equals" value="PRODRQM_STOCK_ATP"/> + <if-compare field="requirementMethodId" operator="equals" value="PRODRQM_STOCK"/> + <if-compare field="requirementMethodId" operator="equals" value="PRODRQM_STOCK_ATP"/> </or> </condition> <then> <!-- get QOH, ATP and find ProductFacility which has the minimum stock --> - <if-not-empty field-name="productFacility.minimumStock"> + <if-not-empty field="productFacility.minimumStock"> <!-- Get the product's total quantityOnHand in the facility --> <clear-field field-name="inputMap"/> <set from-field="productFacility.productId" field="inputMap.productId"/> @@ -429,7 +429,7 @@ <result-to-field field-name="availableToPromiseTotal" result-name="availableToPromiseTotal"/> </call-service> - <if-compare field-name="requirementMethodId" operator="equals" value="PRODRQM_STOCK"> + <if-compare field="requirementMethodId" operator="equals" value="PRODRQM_STOCK"> <set from-field="quantityOnHandTotal" field="currentQuantity"/> <else> <set from-field="availableToPromiseTotal" field="currentQuantity"/> @@ -437,10 +437,10 @@ </if-compare> <!-- No requirements are created if we are already under stock --> - <if-compare-field field-name="currentQuantity" to-field-name="productFacility.minimumStock" operator="less" type="Double"> + <if-compare-field field="currentQuantity" to-field="productFacility.minimumStock" operator="less" type="Double"> <clear-field field-name="inputMap"/> <set from-field="productFacility.productId" field="inputMap.productId"/> - <if-not-empty field-name="productFacility.reorderQuantity"> + <if-not-empty field="productFacility.reorderQuantity"> <set from-field="productFacility.reorderQuantity" field="inputMap.quantity" type="Double"/> <else> <set value="0" field="inputMap.quantity" type="Double"/> @@ -452,7 +452,7 @@ <calcop operator="get" field-name="currentQuantity"/> </calcop> </calculate> - <if-compare-field field-name="inputMap.quantity" to-field-name="quantityShortfall" operator="less" type="Double"> + <if-compare-field field="inputMap.quantity" to-field="quantityShortfall" operator="less" type="Double"> <set from-field="quantityShortfall" field="inputMap.quantity" type="Double"/> </if-compare-field> @@ -476,12 +476,12 @@ <if> <condition> - <if-compare field-name="partyAcctgPreference.orderSequenceEnumId" operator="equals" value="ODRSQ_ENF_SEQ"/> + <if-compare field="partyAcctgPreference.orderSequenceEnumId" operator="equals" value="ODRSQ_ENF_SEQ"/> </condition> <then> <!-- <log level="info" message="In getNextOrderId sequence enum ODRSQ_ENF_SEQ"/> --> <!-- this is sequential sequencing, we can't skip a number, also it must be a unique sequence per partyIdFrom --> - <if-not-empty field-name="partyAcctgPreference.lastOrderNumber"> + <if-not-empty field="partyAcctgPreference.lastOrderNumber"> <calculate field-name="partyAcctgPreference.lastOrderNumber" type="Long"> <calcop operator="add" field-name="partyAcctgPreference.lastOrderNumber"/> <number value="1"/> @@ -497,7 +497,7 @@ <!-- <log level="info" message="In getNextOrderId sequence enum ODRSQ_STANDARD"/> --> <!-- default to the default sequencing: ODRSQ_STANDARD --> <set from-field="parameters.orderId" field="orderIdTemp"/> - <if-empty field-name="orderIdTemp"> + <if-empty field="orderIdTemp"> <sequenced-id-to-env sequence-name="OrderHeader" env-name="orderIdTemp"/> <else> <!-- check the provided ID --> @@ -508,7 +508,7 @@ </else> </if> - <if-not-empty field-name="parameters.productStoreId"> + <if-not-empty field="parameters.productStoreId"> <entity-one entity-name="ProductStore" value-name="productStore"/> </if-not-empty> @@ -525,7 +525,7 @@ <check-errors/> <make-value value-name="newEntity" entity-name="OrderHeader"/> - <if-not-empty field-name="parameters.orderId"> + <if-not-empty field="parameters.orderId"> <set field="newEntity.orderId" from-field="parameters.orderId"/> <else> <sequenced-id-to-env sequence-name="OrderHeader" env-name="newEntity.orderId"/> @@ -544,7 +544,7 @@ <check-errors/> <entity-one entity-name="OrderHeader" value-name="orderHeader"/> - <if-empty field-name="orderHeader"> + <if-empty field="orderHeader"> <add-error><fail-message message="ERROR: Cannot update specified contact info because it does not correspond to the specified work effort"/></add-error> </if-empty> <check-errors/> @@ -564,8 +564,8 @@ <if> <condition> <and> - <if-compare field-name="orderItem.isPromo" value="Y" operator="equals"/> - <if-compare field-name="orderItem.statusId" value="ITEM_CANCELLED" operator="not-equals"/> + <if-compare field="orderItem.isPromo" value="Y" operator="equals"/> + <if-compare field="orderItem.statusId" value="ITEM_CANCELLED" operator="not-equals"/> </and> </condition> <then> @@ -584,7 +584,7 @@ <iterate list-name="orderAdjustments" entry-name="orderAdjustment"> <if> <condition> - <not><if-empty field-name="orderAdjustment.productPromoId"/></not> + <not><if-empty field="orderAdjustment.productPromoId"/></not> </condition> <then> <calculate field-name="existingOrderAdjustmentTotal" decimal-scale="3"> @@ -607,7 +607,7 @@ <call-object-method obj-field-name="cart" method-name="items" ret-field-name="items"/> <iterate list-name="items" entry-name="item"> <call-object-method obj-field-name="item" method-name="getOrderItemSeqId" ret-field-name="orderItemSeqId"/> - <if-empty field-name="orderItemSeqId"> + <if-empty field="orderItemSeqId"> <!-- this is a new (promo) item --> <!-- a new order item is created --> <make-value value-name="newOrderItem" entity-name="OrderItem"/> @@ -622,7 +622,7 @@ <call-object-method obj-field-name="item" method-name="getQuantity" ret-field-name="newOrderItem.quantity"/> <set field="newOrderItem.isModifiedPrice" value="N"/> <set field="newOrderItem.isPromo" value="Y"/> - <if-empty field-name="newOrderItem.statusId"> + <if-empty field="newOrderItem.statusId"> <set field="newOrderItem.statusId" value="ITEM_CREATED"/> </if-empty> <make-next-seq-id value-name="newOrderItem" seq-field-name="orderItemSeqId"/> @@ -640,7 +640,7 @@ <iterate list-name="adjustments" entry-name="adjustment"> <if> <condition> - <not><if-empty field-name="orderAdjustment.productPromoId"/></not> + <not><if-empty field="orderAdjustment.productPromoId"/></not> </condition> <then> <calculate field-name="newOrderAdjustmentTotal" decimal-scale="3"> @@ -661,7 +661,7 @@ </calculate> <!-- If the total has changed, create an OrderAdjustment to reflect the fact --> - <if-compare field-name="orderAdjustmentTotalDifference" value="0" operator="not-equals" type="BigDecimal"> + <if-compare field="orderAdjustmentTotalDifference" value="0" operator="not-equals" type="BigDecimal"> <set field="createOrderAdjContext.orderAdjustmentTypeId" value="PROMOTION_ADJUSTMENT"/> <set field="createOrderAdjContext.orderId" from-field="parameters.orderId"/> <set field="createOrderAdjContext.orderItemSeqId" value="_NA_"/> @@ -685,12 +685,12 @@ <set from-field="parameters.orderId" field="inputMap.orderId"/> <set from-field="parameters.contactMechPurposeTypeId" field="inputMap.contactMechPurposeTypeId"/> <set from-field="parameters.contactMechId" field="inputMap.contactMechId"/> - <if-compare value="SHIPPING_LOCATION" field-name="parameters.contactMechPurposeTypeId" operator="equals"> - <if-compare value="parameters.oldContactMechId" field-name="parameters.contactMechId" operator="not-equals"> + <if-compare value="SHIPPING_LOCATION" field="parameters.contactMechPurposeTypeId" operator="equals"> + <if-compare value="parameters.oldContactMechId" field="parameters.contactMechId" operator="not-equals"> <set field="orderItemShipGroupMap.orderId" from-field="parameters.orderId"/> <set field="orderItemShipGroupMap.contactMechId" from-field="parameters.oldContactMechId"/> <find-by-and entity-name="OrderItemShipGroup" list-name="shipGroupList" map-name="orderItemShipGroupMap"/> - <if-not-empty field-name="shipGroupList"> + <if-not-empty field="shipGroupList"> <iterate list-name="shipGroupList" entry-name="shipGroup"> <set field="inputMap.shipGroupSeqId" from-field="shipGroup.shipGroupSeqId"/> <set field="inputMap.shipmentMethod" value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId}"/> @@ -703,7 +703,7 @@ <else> <find-by-and entity-name="OrderContactMech" map-name="inputMap" list-name="orderContactMechList"/> <!-- If orderContactMechList value is null then create new entry in OrderContactMech entity--> - <if-empty field-name="orderContactMechList"> + <if-empty field="orderContactMechList"> <set-service-fields service-name="createOrderContactMech" map-name="parameters" to-map-name="createOrderContactMechMap"/> <call-service service-name="createOrderContactMech" in-map-name="createOrderContactMechMap" include-user-login="true"/> <set from-field="parameters.orderId" field="orderContactMechLookupMap.orderId"/> @@ -743,7 +743,7 @@ <set from-field="parameters.contactMechId" field="inputMap.contactMechId"/> <find-by-and entity-name="OrderContactMech" map-name="inputMap" list-name="orderContactMechList"/> <!-- If orderContactMechList value is null then create new entry in OrderContactMech entity--> - <if-empty field-name="orderContactMechList"> + <if-empty field="orderContactMechList"> <set-service-fields service-name="createOrderContactMech" map-name="parameters" to-map-name="createOrderContactMechMap"/> <call-service service-name="createOrderContactMech" in-map-name="createOrderContactMechMap" include-user-login="true"/> </if-empty> @@ -752,7 +752,7 @@ <set from-field="parameters.orderId" field="shipGroupLookupMap.orderId"/> <set from-field="parameters.oldContactMechId" field="shipGroupLookupMap.contactMechId"/> <find-by-and entity-name="OrderItemShipGroup" map-name="shipGroupLookupMap" list-name="orderItemShipGroupList"/> - <if-empty field-name="orderItemShipGroupList"> + <if-empty field="orderItemShipGroupList"> <set from-field="parameters.orderId" field="inputMap.orderId"/> <set from-field="parameters.contactMechPurposeTypeId" field="inputMap.contactMechPurposeTypeId"/> <set from-field="parameters.oldContactMechId" field="inputMap.contactMechId"/> @@ -764,7 +764,7 @@ <simple-method method-name="getOrderItemShipGroupEstimatedShipDate" short-description="Compute and return the OrderItemShipGroup estimated ship date based on the associated items."> <entity-one entity-name="OrderItemShipGroup" value-name="orderItemShipGroup"/> - <if-compare field-name="orderItemShipGroup.maySplit" operator="equals" value="Y"> + <if-compare field="orderItemShipGroup.maySplit" operator="equals" value="Y"> <set field="orderByList[]" value="+promisedDatetime"/> <else> <set field="orderByList[]" value="-promisedDatetime"/> @@ -858,7 +858,7 @@ <simple-method method-name="getOrderStatus" short-description="Gets an order status" login-required="false"> <entity-one entity-name="OrderHeader" value-name="order"/> - <if-empty field-name="order"> + <if-empty field="order"> <add-error><fail-message message="Order not found [{parameters.orderId}]"/></add-error> <check-errors/> </if-empty> @@ -874,7 +874,7 @@ <condition-expr field-name="quantityNotAvailable" operator="greater" env-name="zeroEnv"/> </condition-list> </entity-condition> - <if-empty field-name="orderItemShipGrpInvResList"> + <if-empty field="orderItemShipGrpInvResList"> <set field="isBackOrder" value="false" type="Boolean"/> <else> <set field="isBackOrder" value="true" type="Boolean"/> @@ -886,11 +886,11 @@ <simple-method method-name="createOrderItemChange" short-description="Creates a new Order Item Change record"> <make-value value-name="newEntity" entity-name="OrderItemChange"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="parameters.changeDatetime"> + <if-empty field="parameters.changeDatetime"> <now-timestamp-to-env env-name="nowTimestamp"/> <set field="newEntity.changeDatetime" from-field="nowTimestamp"/> </if-empty> - <if-empty field-name="parameters.changeUserLogin"> + <if-empty field="parameters.changeUserLogin"> <set field="newEntity.changeUserLogin" from-field="userLogin.userLoginId"/> </if-empty> <sequenced-id-to-env sequence-name="OrderItemChange" env-name="newEntity.orderItemChangeId"/> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml Fri Jun 13 23:03:12 2008 @@ -85,7 +85,7 @@ <field-map field-name="orderId" env-name="parameters.orderId"/> </entity-and> <iterate list-name="shipmentReceipts" entry-name="receipt"> - <if-empty field-name="totalsMap.${receipt.orderItemSeqId}"> + <if-empty field="totalsMap.${receipt.orderItemSeqId}"> <set field="totalsMap.${receipt.orderItemSeqId}" value="0" type="Double"/> </if-empty> <calculate field-name="${receipt.orderItemSeqId}" map-name="totalsMap" type="Double"> @@ -97,8 +97,8 @@ <set from-field="receipt.orderId" field="newLookupMap.orderId"/> <set from-field="receipt.orderItemSeqId" field="newLookupMap.orderItemSeqId"/> <find-by-primary-key entity-name="OrderItem" map-name="newLookupMap" value-name="orderItem"/> - <if-compare field-name="statusId" map-name="orderItem" operator="not-equals" value="ITEM_COMPLETED"> - <if-compare-field field-name="quantity" map-name="orderItem" operator="less-equals" to-field-name="${receipt.orderItemSeqId}" to-map-name="totalsMap" type="Double"> + <if-compare field="orderItem.statusId" operator="not-equals" value="ITEM_COMPLETED"> + <if-compare-field field="orderItem.quantity" to-field="totalsMap.${receipt.orderItemSeqId}" operator="less-equals" type="Double"> <!-- update the status for the item --> <set field="orderItem.statusId" value="ITEM_COMPLETED"/> <store-value value-name="orderItem"/> @@ -122,12 +122,12 @@ </entity-and> <set value="true" field="allCompleted"/> <iterate list-name="allOrderItems" entry-name="item"> - <if-compare field-name="item.statusId" operator="not-equals" value="ITEM_COMPLETED"> + <if-compare field="item.statusId" operator="not-equals" value="ITEM_COMPLETED"> <set value="false" field="allCompleted"/> </if-compare> </iterate> - <if-compare field-name="allCompleted" operator="equals" value="true"> + <if-compare field="allCompleted" operator="equals" value="true"> <!-- update the order header --> <set field="orderHeader.statusId" value="ORDER_COMPLETED"/> <store-value value-name="orderHeader"/> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml Fri Jun 13 23:03:12 2008 @@ -32,12 +32,12 @@ <if> <condition> - <if-compare field-name="partyAcctgPreference.quoteSequenceEnumId" operator="equals" value="QTESQ_ENF_SEQ"/> + <if-compare field="partyAcctgPreference.quoteSequenceEnumId" operator="equals" value="QTESQ_ENF_SEQ"/> </condition> <then> <!-- <log level="info" message="In getNextQuoteId sequence enum QTESQ_ENF_SEQ"/> --> <!-- this is sequential sequencing, we can't skip a number, also it must be a unique sequence per partyIdFrom --> - <if-not-empty field-name="partyAcctgPreference.lastQuoteNumber"> + <if-not-empty field="partyAcctgPreference.lastQuoteNumber"> <calculate field-name="partyAcctgPreference.lastQuoteNumber" type="Long"> <calcop operator="add" field-name="partyAcctgPreference.lastQuoteNumber"/> <number value="1"/> @@ -53,7 +53,7 @@ <!-- <log level="info" message="In getNextQuoteId sequence enum QTESQ_STANDARD"/> --> <!-- default to the default sequencing: QTESQ_STANDARD --> <set from-field="parameters.quoteId" field="quoteIdTemp"/> - <if-empty field-name="quoteIdTemp"> + <if-empty field="quoteIdTemp"> <sequenced-id-to-env sequence-name="Quote" env-name="quoteIdTemp"/> <else> <!-- check the provided ID --> @@ -74,8 +74,8 @@ <if> <condition> <and> - <not><if-empty field-name="parameters.partyId"/></not> - <not><if-compare-field field-name="parameters.partyId" operator="equals" to-field-name="userLogin.partyId"/></not> + <not><if-empty field="parameters.partyId"/></not> + <not><if-compare-field field="parameters.partyId" to-field="userLogin.partyId" operator="equals"/></not> <not><if-has-permission permission="ORDERMGR" action="_CREATE"/></not> </and> </condition> @@ -87,13 +87,13 @@ <!-- create new entity and create all the fields --> <make-value value-name="newEntity" entity-name="Quote"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="newEntity.statusId"> + <if-empty field="newEntity.statusId"> <set value="QUO_CREATED" field="newEntity.statusId"/> </if-empty> <!-- create a non existing ID; if we have a productStoreId do it for the payToPartyId of that ProductStore according to PartyAcctgPreferences, otherwise get from standard sequence --> <entity-one entity-name="ProductStore" value-name="productStore"/> - <if-not-empty field-name="productStore.payToPartyId"> + <if-not-empty field="productStore.payToPartyId"> <set field="getNextQuoteIdContext.partyId" from-field="productStore.payToPartyId"/> <call-service service-name="getNextQuoteId" in-map-name="getNextQuoteIdContext"> <result-to-field result-name="quoteId" field-name="newEntity.quoteId"/> @@ -111,7 +111,7 @@ then we associate it to the quote as the request taker. This is not done if they are the same e.g. a logged in customer that is creating a quote for its own sake. --> - <if-compare-field field-name="parameters.partyId" operator="not-equals" to-field-name="userLogin.partyId"> + <if-compare-field field="parameters.partyId" to-field="userLogin.partyId" operator="not-equals"> <set from-field="newEntity.quoteId" field="takerMap.quoteId"/> <set from-field="userLogin.partyId" field="takerMap.partyId"/> <set value="REQ_TAKER" field="takerMap.roleTypeId"/> @@ -129,17 +129,17 @@ <check-errors/> <entity-one entity-name="Quote" value-name="quote" auto-field-map="true"/> <check-errors/> - <if-empty field-name="parameters.statusId"> + <if-empty field="parameters.statusId"> <set field="parameters.statusId" from-field="quote.statusId"/> </if-empty> - <if-compare-field field-name="quote.statusId" operator="not-equals" to-field-name="parameters.statusId"> + <if-compare-field field="quote.statusId" to-field="parameters.statusId" operator="not-equals"> <!-- check if the status change is a valid change --> <entity-and entity-name="StatusValidChange" list-name="validChange"> <field-map field-name="statusId" env-name="quote.statusId"/> <field-map field-name="statusIdTo" env-name="parameters.statusId"/> </entity-and> - <if-empty field-name="validChange"> + <if-empty field="validChange"> <add-error><fail-message message="The status change from ${quote.statusId} to ${parameters.statusId} is not a valid change"/></add-error> <log level="error" message="The status change from ${quote.statusId} to ${parameters.statusId} is not a valid change"/> <check-errors/> @@ -163,7 +163,7 @@ <call-service service-name="createQuote" in-map-name="createQuoteInMap"> <result-to-field result-name="quoteId" field-name="quoteIdTo"/> </call-service> - <if-compare field-name="parameters.copyQuoteItems" value="Y" operator="equals"> + <if-compare field="parameters.copyQuoteItems" value="Y" operator="equals"> <get-related value-name="quote" relation-name="QuoteItem" list-name="quoteItems"/> <iterate list-name="quoteItems" entry-name="quoteItem"> <clear-field field-name="createQuoteItemInMap"/> @@ -174,10 +174,10 @@ </iterate> </if-compare> - <if-compare field-name="parameters.copyQuoteAdjustments" value="Y" operator="equals"> + <if-compare field="parameters.copyQuoteAdjustments" value="Y" operator="equals"> <get-related value-name="quote" relation-name="QuoteAdjustment" list-name="quoteAdjustments"/> <iterate list-name="quoteAdjustments" entry-name="quoteAdjustment"> - <if-empty field-name="quoteAdjustment.quoteItemSeqId"> + <if-empty field="quoteAdjustment.quoteItemSeqId"> <clear-field field-name="createQuoteAdjustmentInMap"/> <set-service-fields service-name="createQuoteAdjustment" to-map-name="createQuoteAdjustmentInMap" map-name="quoteAdjustment"/> <set from-field="quoteIdTo" field="createQuoteAdjustmentInMap.quoteId"/> @@ -186,10 +186,10 @@ </iterate> </if-compare> - <if-compare field-name="parameters.copyQuoteRoles" value="Y" operator="equals"> + <if-compare field="parameters.copyQuoteRoles" value="Y" operator="equals"> <get-related value-name="quote" relation-name="QuoteRole" list-name="quoteRoles"/> <iterate list-name="quoteRoles" entry-name="quoteRole"> - <if-compare field-name="quoteRole.roleTypeId" value="REQ_TAKER" operator="not-equals"> + <if-compare field="quoteRole.roleTypeId" value="REQ_TAKER" operator="not-equals"> <clear-field field-name="createQuoteRoleInMap"/> <set-service-fields service-name="createQuoteRole" to-map-name="createQuoteRoleInMap" map-name="quoteRole"/> <set from-field="quoteIdTo" field="createQuoteRoleInMap.quoteId"/> @@ -198,7 +198,7 @@ </iterate> </if-compare> - <if-compare field-name="parameters.copyQuoteAttributes" value="Y" operator="equals"> + <if-compare field="parameters.copyQuoteAttributes" value="Y" operator="equals"> <get-related value-name="quote" relation-name="QuoteAttribute" list-name="quoteAttributes"/> <iterate list-name="quoteAttributes" entry-name="quoteAttribute"> <clear-field field-name="createQuoteAttributeInMap"/> @@ -208,7 +208,7 @@ </iterate> </if-compare> - <if-compare field-name="parameters.copyQuoteCoefficients" value="Y" operator="equals"> + <if-compare field="parameters.copyQuoteCoefficients" value="Y" operator="equals"> <get-related value-name="quote" relation-name="QuoteCoefficient" list-name="quoteCoefficients"/> <iterate list-name="quoteCoefficients" entry-name="quoteCoefficient"> <clear-field field-name="createQuoteCoefficientInMap"/> @@ -241,7 +241,7 @@ <set from-field="parameters.partyId" field="lookupPKMap.partyId"/> <set from-field="parameters.roleTypeId" field="lookupPKMap.roleTypeId"/> <find-by-primary-key entity-name="PartyRole" map-name="lookupPKMap" value-name="partyRole"/> - <if-empty map-name="partyRole" field-name="partyId"> + <if-empty field="partyRole.partyId"> <make-value value-name="partyRole" entity-name="PartyRole"/> <set-pk-fields map-name="lookupPKMap" value-name="partyRole"/> <create-value value-name="partyRole"/> @@ -271,8 +271,8 @@ <if> <condition> <and> - <not><if-empty field-name="quote.partyId"/></not> - <not><if-compare-field field-name="quote.partyId" operator="equals" to-field-name="userLogin.partyId"/></not> + <not><if-empty field="quote.partyId"/></not> + <not><if-compare-field field="quote.partyId" to-field="userLogin.partyId" operator="equals"/></not> <not><if-has-permission permission="ORDERMGR" action="_CREATE"/></not> </and> </condition> @@ -288,7 +288,7 @@ <set from-field="parameters.quoteId" field="newEntity.quoteId"/> <set from-field="parameters.quoteItemSeqId" field="newEntity.quoteItemSeqId"/> - <if-empty field-name="newEntity.quoteItemSeqId"> + <if-empty field="newEntity.quoteItemSeqId"> <!-- create a non existing ID --> <make-next-seq-id value-name="newEntity" seq-field-name="quoteItemSeqId"/> <set from-field="quoteItemSeqId" field="newEntity.quoteItemSeqId"/> @@ -297,12 +297,12 @@ <field-to-result field-name="newEntity.quoteItemSeqId" result-name="quoteItemSeqId"/> <!-- if there is no price and a productItem is supplied fill the price from the product record --> - <if-empty field-name="parameters.quoteUnitPrice"> - <if-not-empty field-name="parameters.productId"> + <if-empty field="parameters.quoteUnitPrice"> + <if-not-empty field="parameters.productId"> <entity-one entity-name="Product" value-name="product"/> <set from-field="product" field="calculateProductPriceMap.product"/> <set from-field="parameters.quantity" field="calculateProductPriceMap.quantity"/> - <if-not-empty field-name="parameters.selectedAmount"> + <if-not-empty field="parameters.selectedAmount"> <set from-field="parameters.selectedAmount" field="calculateProductPriceMap.amount"/> </if-not-empty> <call-service service-name="calculateProductPrice" in-map-name="calculateProductPriceMap"> @@ -353,8 +353,8 @@ <set-service-fields service-name="createQuoteItem" to-map-name="createQuoteItemInMap" map-name="quoteItem"/> <set from-field="parameters.quoteIdTo" field="createQuoteItemInMap.quoteId"/> <set from-field="parameters.quoteItemSeqId" field="createQuoteItemInMap.quoteItemSeqId"/> - <if-empty field-name="parameters.quoteIdTo"> - <if-empty field-name="parameters.quoteItemSeqIdTo"> + <if-empty field="parameters.quoteIdTo"> + <if-empty field="parameters.quoteItemSeqIdTo"> <clear-field field-name="createQuoteItemInMap.quoteItemSeqId"/> </if-empty> </if-empty> @@ -366,7 +366,7 @@ <check-errors/> - <if-compare field-name="parameters.copyQuoteAdjustments" value="Y" operator="equals"> + <if-compare field="parameters.copyQuoteAdjustments" value="Y" operator="equals"> <get-related value-name="quoteItem" relation-name="QuoteAdjustment" list-name="quoteAdjustments"/> <iterate list-name="quoteAdjustments" entry-name="quoteAdjustment"> <clear-field field-name="createQuoteAdjustmentInMap"/> @@ -467,7 +467,7 @@ <entity-one entity-name="CustRequest" value-name="custRequest" auto-field-map="true"/> <entity-one entity-name="CustRequestItem" value-name="custRequestItem" auto-field-map="true"/> - <if-empty field-name="custRequest"> + <if-empty field="custRequest"> <add-error> <fail-property resource="OrderErrorUiLabels" property="OrderErrorCustRequestWithIdDoesntExist"/> </add-error> @@ -478,7 +478,7 @@ <make-value value-name="newQuoteItem" entity-name="QuoteItem"/> <set-nonpk-fields map-name="parameters" value-name="newQuote"/> <set-nonpk-fields map-name="parameters" value-name="newQuoteItem"/> - <if-empty field-name="newQuote.statusId"> + <if-empty field="newQuote.statusId"> <set value="QUO_CREATED" field="newQuote.statusId"/> </if-empty> <set value="PROPOSAL" field="newQuote.quoteTypeId"/> @@ -520,11 +520,11 @@ <check-errors/> <entity-one entity-name="QuoteItem" value-name="quoteItem" auto-field-map="true"/> <check-errors/> - <if-not-empty field-name="parameters.manualQuoteUnitPrice"> + <if-not-empty field="parameters.manualQuoteUnitPrice"> <set from-field="parameters.manualQuoteUnitPrice" field="quoteItem.quoteUnitPrice"/> </if-not-empty> - <if-empty field-name="parameters.manualQuoteUnitPrice"> - <if-not-empty field-name="parameters.defaultQuoteUnitPrice"> + <if-empty field="parameters.manualQuoteUnitPrice"> + <if-not-empty field="parameters.defaultQuoteUnitPrice"> <set from-field="parameters.defaultQuoteUnitPrice" field="quoteItem.quoteUnitPrice"/> </if-not-empty> <!-- @@ -549,7 +549,7 @@ <!-- all existing promo quote items are removed --> <get-related value-name="quote" relation-name="QuoteItem" list-name="quoteItems"/> <iterate list-name="quoteItems" entry-name="quoteItem"> - <if-compare field-name="quoteItem.isPromo" value="Y" operator="equals"> + <if-compare field="quoteItem.isPromo" value="Y" operator="equals"> <clear-field field-name="removeQuoteItemInMap"/> <set-service-fields service-name="removeQuoteItem" to-map-name="removeQuoteItemInMap" map-name="parameters"/> <set from-field="quoteItem.quoteItemSeqId" field="removeQuoteItemInMap.quoteItemSeqId"/> @@ -560,7 +560,7 @@ <get-related value-name="quote" relation-name="QuoteAdjustment" list-name="quoteAdjustments"/> <iterate list-name="quoteAdjustments" entry-name="quoteAdjustment"> <!-- make sure this is not a manual adjustments --> - <if-not-empty field-name="quoteAdjustment.productPromoId"> + <if-not-empty field="quoteAdjustment.productPromoId"> <clear-field field-name="removeQuoteAdjustmentInMap"/> <set-service-fields service-name="removeQuoteAdjustment" to-map-name="removeQuoteAdjustmentInMap" map-name="parameters"/> <set from-field="quoteAdjustment.quoteAdjustmentId" field="removeQuoteAdjustmentInMap.quoteAdjustmentId"/> @@ -576,7 +576,7 @@ <call-object-method obj-field-name="cart" method-name="items" ret-field-name="items"/> <iterate list-name="items" entry-name="item"> <call-object-method obj-field-name="item" method-name="getOrderItemSeqId" ret-field-name="orderItemSeqId"/> - <if-empty field-name="orderItemSeqId"> + <if-empty field="orderItemSeqId"> <!-- this is a new (promo) item --> <!-- a new quote item is created --> <clear-field field-name="createQuoteItemInMap"/> @@ -600,8 +600,8 @@ <if> <condition> <or> - <if-empty field-name="quoteItem.quoteUnitPrice"/> - <if-compare field-name="quoteItem.quoteUnitPrice" value="0" operator="equals" type="Double"/> + <if-empty field="quoteItem.quoteUnitPrice"/> + <if-compare field="quoteItem.quoteUnitPrice" value="0" operator="equals" type="Double"/> </or> </condition> <then> @@ -669,8 +669,8 @@ <if> <condition> <and> - <not><if-empty field-name="createQuoteInMap.partyId"/></not> - <not><if-compare-field field-name="createQuoteInMap.partyId" operator="equals" to-field-name="userLogin.partyId"/></not> + <not><if-empty field="createQuoteInMap.partyId"/></not> + <not><if-compare-field field="createQuoteInMap.partyId" to-field="userLogin.partyId" operator="equals"/></not> <not><if-has-permission permission="ORDERMGR" action="_CREATE"/></not> </and> </condition> @@ -696,19 +696,19 @@ <!-- a new quote item is created --> <clear-field field-name="createQuoteItemInMap"/> <call-object-method obj-field-name="item" method-name="getIsPromo" ret-field-name="isPromo"/> - <if-compare field-name="isPromo" value="true" operator="equals" type="Boolean"> + <if-compare field="isPromo" value="true" operator="equals" type="Boolean"> <set value="Y" field="createQuoteItemInMap.isPromo"/> </if-compare> <call-object-method obj-field-name="item" method-name="getConfigWrapper" ret-field-name="configWrapper"/> - <if-not-empty field-name="configWrapper"> + <if-not-empty field="configWrapper"> <call-object-method obj-field-name="configWrapper" method-name="getConfigId" ret-field-name="configId"/> <set from-field="configId" field="createQuoteItemInMap.configId"/> </if-not-empty> <if> <condition> <or> - <if-compare field-name="parameters.applyStorePromotions" value="N" operator="not-equals" type="String"/> - <if-compare field-name="createQuoteItemInMap.isPromo" value="Y" operator="not-equals" type="String"/> + <if-compare field="parameters.applyStorePromotions" value="N" operator="not-equals" type="String"/> + <if-compare field="createQuoteItemInMap.isPromo" value="Y" operator="not-equals" type="String"/> </or> </condition> <then> @@ -735,7 +735,7 @@ <if> <condition> - <if-compare field-name="parameters.applyStorePromotions" value="N" operator="not-equals" type="String"/> + <if-compare field="parameters.applyStorePromotions" value="N" operator="not-equals" type="String"/> </condition> <then> <call-object-method obj-field-name="parameters.cart" method-name="makeAllQuoteAdjustments" ret-field-name="adjustments"/> @@ -773,8 +773,8 @@ <if> <condition> <and> - <if-compare field-name="custRequest.custRequestTypeId" operator="not-equals" value="RF_QUOTE"/> - <if-compare field-name="custRequest.custRequestTypeId" operator="not-equals" value="RF_PUR_QUOTE"/> + <if-compare field="custRequest.custRequestTypeId" operator="not-equals" value="RF_QUOTE"/> + <if-compare field="custRequest.custRequestTypeId" operator="not-equals" value="RF_PUR_QUOTE"/> </and> </condition> <then> @@ -792,8 +792,8 @@ <set field="createQuoteInMap.statusId" value="QUO_CREATED"/> <set field="createQuoteInMap.quoteTypeId" from-field="parameters.quoteTypeId"/> <!-- set the quoteType (product or purchase) --> - <if-empty field-name="createQuoteInMap.quoteTypeId"> - <if-compare field-name="custRequest.custRequestTypeId" operator="equals" value="RF_QUOTE"> + <if-empty field="createQuoteInMap.quoteTypeId"> + <if-compare field="custRequest.custRequestTypeId" operator="equals" value="RF_QUOTE"> <set field="createQuoteInMap.quoteTypeId" value="PRODUCT_QUOTE"/> <else> <set field="createQuoteInMap.quoteTypeId" value="PURCHASE_QUOTE"/> @@ -826,7 +826,7 @@ <iterate list-name="custRequestRoles" entry-name="custRequestRole"> <clear-field field-name="createQuoteRoleInMap"/> <!-- The REQ_TAKER role is automatically added by the createQuote service --> - <if-compare field-name="custRequestRole.roleTypeId" value="REQ_TAKER" operator="not-equals"> + <if-compare field="custRequestRole.roleTypeId" value="REQ_TAKER" operator="not-equals"> <set field="createQuoteRoleInMap.quoteId" from-field="quoteId"/> <set field="createQuoteRoleInMap.partyId" from-field="custRequestRole.partyId"/> <set field="createQuoteRoleInMap.roleTypeId" from-field="custRequestRole.roleTypeId"/> @@ -842,11 +842,11 @@ <make-value entity-name="QuoteWorkEffort" value-name="lookupMap"/> <set-pk-fields map-name="parameters" value-name="lookupMap"/> <find-by-primary-key entity-name="QuoteWorkEffort" map-name="lookupMap" value-name="quoteWorkEffort"/> - <if-not-empty field-name="quoteId" map-name="quoteWorkEffort"> + <if-not-empty field="quoteWorkEffort.quoteId"> <add-error><fail-message message="ERROR: QuoteWorkEffort [${parameters.quoteId}][${parameters.workEffortId}] already exists."/></add-error> <check-errors/> </if-not-empty> - <if-empty field-name="quoteId" map-name="quoteWorkEffort"> + <if-empty field="quoteWorkEffort.quoteId"> <set-nonpk-fields map-name="parameters" value-name="lookupMap"/> <create-value value-name="lookupMap"/> <field-to-result field-name="quoteId" map-name="lookupMap"/> @@ -857,12 +857,12 @@ <make-value entity-name="QuoteWorkEffort" value-name="lookupMap"/> <set-pk-fields map-name="parameters" value-name="lookupMap"/> <find-by-primary-key entity-name="QuoteWorkEffort" map-name="lookupMap" value-name="quoteWorkEffort"/> - <if-empty field-name="quoteId" map-name="quoteWorkEffort"> + <if-empty field="quoteWorkEffort.quoteId"> <add-error><fail-message message="ERROR: QuoteWorkEffort [${parameters.quoteId}][${parameters.workEffortId}] does not exist."/></add-error> <check-errors/> </if-empty> - <if-not-empty field-name="quoteId" map-name="quoteWorkEffort"> + <if-not-empty field="quoteWorkEffort.quoteId"> <remove-value value-name="quoteWorkEffort"/> </if-not-empty> </simple-method> -</simple-methods> \ No newline at end of file +</simple-methods> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml Fri Jun 13 23:03:12 2008 @@ -24,8 +24,8 @@ <if> <condition> <and> - <not><if-empty field-name="parameters.fromPartyId"/></not> - <not><if-compare-field field-name="parameters.fromPartyId" operator="equals" to-field-name="userLogin.partyId"/></not> + <not><if-empty field="parameters.fromPartyId"/></not> + <not><if-compare-field field="parameters.fromPartyId" to-field="userLogin.partyId" operator="equals"/></not> <not><if-has-permission permission="ORDERMGR" action="_CRQ_CREATE"/></not> </and> </condition> @@ -43,7 +43,7 @@ <set from-field="userLogin.userLoginId" field="newEntity.lastModifiedByUserLogin"/> <set from-field="userLogin.userLoginId" field="newEntity.createdByUserLogin"/> - <if-empty field-name="statusId" map-name="parameters"> + <if-empty field="parameters.statusId"> <set value="CRQ_SUBMITTED" field="newEntity.statusId"/> </if-empty> @@ -57,8 +57,8 @@ then we associate it to the request as the request taker. This is not done if they are the same e.g. a logged in customer that is creating a request for its own sake. --> - <if-not-empty field-name="userLogin.partyId"> <!-- just in case the service is called by the "system" userLogin --> - <if-compare-field field-name="parameters.fromPartyId" operator="not-equals" to-field-name="userLogin.partyId"> + <if-not-empty field="userLogin.partyId"> <!-- just in case the service is called by the "system" userLogin --> + <if-compare-field field="parameters.fromPartyId" to-field="userLogin.partyId" operator="not-equals"> <set from-field="newEntity.custRequestId" field="takerMap.custRequestId"/> <set from-field="userLogin.partyId" field="takerMap.partyId"/> <set value="REQ_TAKER" field="takerMap.roleTypeId"/> @@ -74,7 +74,7 @@ There is now the fromPartyId field in the CustRequest entity for this. --> <!-- <field-to-field field-name="custRequestId" map-name="newEntity" to-map-name="requesterMap"/> - <if-not-empty field-name="requestPartyId" map-name="parameters"> + <if-not-empty field="parameters.requestPartyId"> <field-to-field field-name="requestPartyId" map-name="parameters" to-map-name="requesterMap" to-field-name="partyId"/> <else> <field-to-field field-name="partyId" map-name="userLogin" to-map-name="requesterMap"/> @@ -87,7 +87,7 @@ <simple-method method-name="updateCustRequest" short-description="Update Customer Request"> <set from-field="parameters.custRequestId" field="lookupPKMap.custRequestId"/> <find-by-primary-key entity-name="CustRequest" map-name="lookupPKMap" value-name="custRequest"/> - <if-compare-field field-name="custRequest.statusId" operator="not-equals" to-field-name="parameters.statusId"> + <if-compare-field field="custRequest.statusId" to-field="parameters.statusId" operator="not-equals"> <!-- save the changed status in the history --> <set field="custRequest.statusId" from-field="parameters.statusId"/> <set-service-fields to-map-name="statusMap" service-name="createCustRequestStatus" map-name="custRequest"/> @@ -118,10 +118,10 @@ <make-value value-name="newEntity" entity-name="CustRequestItem"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="custRequestItemSeqId" map-name="parameters"> + <if-empty field="parameters.custRequestItemSeqId"> <make-next-seq-id value-name="newEntity" seq-field-name="custRequestItemSeqId"/> </if-empty> - <if-empty field-name="statusId" map-name="parameters"> + <if-empty field="parameters.statusId"> <set value="CRQ_SUBMITTED" field="newEntity.statusId"/> </if-empty> <create-value value-name="newEntity"/> @@ -140,7 +140,7 @@ <set from-field="parameters.partyId" field="lookupPKMap.partyId"/> <set from-field="parameters.roleTypeId" field="lookupPKMap.roleTypeId"/> <find-by-primary-key entity-name="PartyRole" map-name="lookupPKMap" value-name="partyRole"/> - <if-empty map-name="partyRole" field-name="partyId"> + <if-empty field="partyRole.partyId"> <make-value value-name="partyRole" entity-name="PartyRole"/> <set-pk-fields map-name="lookupPKMap" value-name="partyRole"/> <create-value value-name="partyRole"/> @@ -212,12 +212,12 @@ <!-- a new request item is created --> <clear-field field-name="createCustRequestItemInMap"/> <call-object-method obj-field-name="item" method-name="getConfigWrapper" ret-field-name="configWrapper"/> - <if-not-empty field-name="configWrapper"> + <if-not-empty field="configWrapper"> <call-object-method obj-field-name="configWrapper" method-name="getConfigId" ret-field-name="configId"/> <set from-field="configId" field="createCustRequestItemInMap.configId"/> </if-not-empty> <call-object-method obj-field-name="item" method-name="getIsPromo" ret-field-name="isPromo"/> - <if-compare field-name="isPromo" value="false" operator="equals" type="Boolean"> + <if-compare field="isPromo" value="false" operator="equals" type="Boolean"> <set from-field="custRequest.custRequestId" field="createCustRequestItemInMap.custRequestId"/> <call-object-method obj-field-name="item" method-name="getProductId" ret-field-name="createCustRequestItemInMap.productId"/> <call-object-method obj-field-name="item" method-name="getQuantity" ret-field-name="createCustRequestItemInMap.quantity"/> @@ -261,8 +261,8 @@ <set-service-fields service-name="createCustRequestItem" to-map-name="createCustRequestItemInMap" map-name="custRequestItem"/> <set field="createCustRequestItemInMap.custRequestId" from-field="parameters.custRequestIdTo"/> <set field="createCustRequestItemInMap.custRequestItemSeqId" from-field="parameters.custRequestItemSeqId"/> - <if-empty field-name="parameters.custRequestIdTo"> - <if-empty field-name="parameters.custRequestItemSeqIdTo"> + <if-empty field="parameters.custRequestIdTo"> + <if-empty field="parameters.custRequestItemSeqIdTo"> <clear-field field-name="createCustRequestItemInMap.custRequestItemSeqId"/> </if-empty> </if-empty> @@ -274,7 +274,7 @@ <check-errors/> - <if-compare field-name="parameters.copyLinkedQuotes" value="Y" operator="equals"> + <if-compare field="parameters.copyLinkedQuotes" value="Y" operator="equals"> <get-related value-name="custRequestItem" relation-name="QuoteItem" list-name="quoteItems"/> <iterate list-name="quoteItems" entry-name="quoteItem"> <clear-field field-name="createQuoteItemInMap"/> @@ -293,7 +293,7 @@ <make-value value-name="newEntity" entity-name="CustRequestStatus"/> <make-next-seq-id value-name="newEntity" seq-field-name="custRequestStatusId"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="newEntity.statusDatetime"> + <if-empty field="newEntity.statusDatetime"> <now-timestamp-to-env env-name="nowTimestamp"/> <set from-field="nowTimestamp" field="newEntity.statusDatetime"/> </if-empty> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml Fri Jun 13 23:03:12 2008 @@ -26,7 +26,7 @@ <to-string field-name="requirementId"/> <set from-field="requirementId" field="newEntity.requirementId"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="statusId" map-name="parameters"> + <if-empty field="parameters.statusId"> <set value="REQ_CREATED" field="newEntity.statusId"/> </if-empty> <now-timestamp-to-env env-name="nowTimestamp"/> @@ -68,8 +68,8 @@ <simple-method method-name="autoAssignRequirementToSupplier" short-description="If the requirement is a product requirement (purchasing) try to assign it to the primary supplier"> <entity-one entity-name="Requirement" value-name="requirement" auto-field-map="true"/> <check-errors/> - <if-compare field-name="requirement.requirementTypeId" operator="equals" value="PRODUCT_REQUIREMENT"> - <if-not-empty field-name="requirement.productId"> + <if-compare field="requirement.requirementTypeId" operator="equals" value="PRODUCT_REQUIREMENT"> + <if-not-empty field="requirement.productId"> <entity-condition entity-name="SupplierProduct" list-name="supplierProducts"> <condition-list> <condition-expr field-name="productId" env-name="requirement.productId"/> @@ -80,7 +80,7 @@ </entity-condition> <filter-list-by-date list-name="supplierProducts" valid-date-name="requirement.requiredByDate" from-field-name="availableFromDate" thru-field-name="availableThruDate"/> <first-from-list list-name="supplierProducts" entry-name="supplierProduct"/> - <if-not-empty field-name="supplierProduct.partyId"> + <if-not-empty field="supplierProduct.partyId"> <make-value value-name="requirementSupplier" entity-name="RequirementRole"/> <set field="requirementSupplier.requirementId" from-field="requirement.requirementId"/> <set field="requirementSupplier.partyId" from-field="supplierProduct.partyId"/> @@ -101,7 +101,7 @@ <set from-field="parameters.partyId" field="lookupPKMap.partyId"/> <set from-field="parameters.roleTypeId" field="lookupPKMap.roleTypeId"/> <find-by-primary-key entity-name="PartyRole" map-name="lookupPKMap" value-name="partyRole"/> - <if-empty map-name="partyRole" field-name="partyId"> + <if-empty field="partyRole.partyId"> <make-value value-name="partyRole" entity-name="PartyRole"/> <set-pk-fields map-name="lookupPKMap" value-name="partyRole"/> <create-value value-name="partyRole"/> @@ -110,7 +110,7 @@ <make-value value-name="newEntity" entity-name="RequirementRole"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="newEntity.fromDate"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> <create-value value-name="newEntity"/> @@ -158,7 +158,7 @@ <result-to-field field-name="quantityNotTransferred" result-name="quantityNotTransferred"/> </call-service> <check-errors/> - <if-compare field-name="quantityNotTransferred" value="0.0" operator="greater" type="Double"> + <if-compare field="quantityNotTransferred" value="0.0" operator="greater" type="Double"> <!-- we create a new requirement for the quantity not trasferred (because not available) --> <clear-field field-name="inputMap"/> <set-service-fields service-name="createRequirement" map-name="requirement" to-map-name="inputMap"/> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml Fri Jun 13 23:03:12 2008 @@ -24,8 +24,8 @@ <if> <condition> <and> - <not><if-empty field-name="partyId" map-name="parameters"/></not> - <not><if-compare-field field-name="partyId" map-name="parameters" operator="equals" to-map-name="userLogin"/></not> + <not><if-empty field="parameters.partyId"/></not> + <not><if-compare-field to-field="userLogin." field="parameters.partyId" operator="equals"/></not> <not><if-has-permission permission="PARTYMGR" action="_CREATE"/></not> </and> </condition> @@ -38,25 +38,25 @@ <make-value value-name="newEntity" entity-name="ShoppingList"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="newEntity.partyId"> + <if-empty field="newEntity.partyId"> <set from-field="userLogin.partyId" field="newEntity.partyId"/> </if-empty> - <if-empty field-name="newEntity.shoppingListTypeId"> + <if-empty field="newEntity.shoppingListTypeId"> <set value="SLT_WISH_LIST" field="newEntity.shoppingListTypeId"/> </if-empty> - <if-empty field-name="listName" map-name="newEntity"> + <if-empty field="newEntity.listName"> <property-to-field field-name="newEntity.listName" resource="OrderUiLabels" property="OrderNewShoppingList" default="New Shopping List"/> </if-empty> - <if-empty field-name="isPublic" map-name="newEntity"> + <if-empty field="newEntity.isPublic"> <set value="N" field="newEntity.isPublic"/> </if-empty> - <if-empty field-name="isActive" map-name="newEntity"> - <if-compare field-name="newEntity.shoppingListTypeId" operator="equals" value="SLT_AUTO_REODR"> + <if-empty field="newEntity.isActive"> + <if-compare field="newEntity.shoppingListTypeId" operator="equals" value="SLT_AUTO_REODR"> <set value="N" field="newEntity.isActive"/> <else> <set value="Y" field="newEntity.isActive"/> @@ -83,12 +83,12 @@ <if> <condition> <and> - <if-compare field-name="shoppingList.shoppingListTypeId" operator="equals" value="SLT_AUTO_REODR"/> + <if-compare field="shoppingList.shoppingListTypeId" operator="equals" value="SLT_AUTO_REODR"/> <or> - <if-empty field-name="shoppingList.recurrenceInfoId"/> - <if-empty field-name="shoppingList.paymentMethodId"/> - <if-empty field-name="shoppingList.contactMechId"/> - <if-empty field-name="shoppingList.shipmentMethodTypeId"/> + <if-empty field="shoppingList.recurrenceInfoId"/> + <if-empty field="shoppingList.paymentMethodId"/> + <if-empty field="shoppingList.contactMechId"/> + <if-empty field="shoppingList.shipmentMethodTypeId"/> </or> </and> </condition> @@ -119,7 +119,7 @@ <entity-one entity-name="ShoppingList" value-name="shoppingList"/> <entity-one entity-name="Product" value-name="product"/> - <if-empty field-name="product"> + <if-empty field="product"> <add-error> <fail-property property="ProductErrorProductNotFound" resource="OrderUiLabels"/> </add-error> <check-errors/> </if-empty> @@ -132,7 +132,7 @@ <field-to-result field-name="newEntity.shoppingListId" result-name="shoppingListId"/> <create-value value-name="newEntity"/> - <if-compare-field field-name="shoppingList.partyId" operator="not-equals" to-field-name="userLogin.partyId"> + <if-compare-field field="shoppingList.partyId" to-field="userLogin.partyId" operator="not-equals"> <now-timestamp-to-env env-name="shoppingList.lastAdminModified"/> <store-value value-name="shoppingList"/> </if-compare-field> @@ -147,7 +147,7 @@ <entity-one entity-name="ShoppingList" value-name="shoppingList"/> <entity-one entity-name="ShoppingListItem" value-name="shoppingListItem"/> - <if-compare field-name="parameters.quantity" operator="equals" value="0" type="Double"> + <if-compare field="parameters.quantity" operator="equals" value="0" type="Double"> <!-- if we're setting quantity to 0.0 then remove the item --> <set-service-fields service-name="removeShoppingListItem" map-name="parameters" to-map-name="removeParams"/> <call-service service-name="removeShoppingListItem" in-map-name="removeParams"/> @@ -158,7 +158,7 @@ </else> </if-compare> - <if-compare-field field-name="shoppingList.partyId" operator="not-equals" to-field-name="userLogin.partyId"> + <if-compare-field field="shoppingList.partyId" to-field="userLogin.partyId" operator="not-equals"> <now-timestamp-to-env env-name="shoppingList.lastAdminModified"/> <store-value value-name="shoppingList"/> </if-compare-field> @@ -174,7 +174,7 @@ <entity-one entity-name="ShoppingListItem" value-name="shoppingListItem"/> <remove-value value-name="shoppingListItem"/> - <if-compare-field field-name="shoppingList.partyId" operator="not-equals" to-field-name="userLogin.partyId"> + <if-compare-field field="shoppingList.partyId" to-field="userLogin.partyId" operator="not-equals"> <now-timestamp-to-env env-name="shoppingList.lastAdminModified"/> <store-value value-name="shoppingList"/> </if-compare-field> @@ -187,7 +187,7 @@ </entity-condition> <iterate list-name="shoppingListItemList" entry-name="shoppingListItem"> - <if-compare-field field-name="parameters.productId" operator="equals" to-field-name="shoppingListItem.productId"> + <if-compare-field field="parameters.productId" to-field="shoppingListItem.productId" operator="equals"> <field-to-result field-name="shoppingListItem.shoppingListItemSeqId" result-name="shoppingListItemSeqId" /> <return /> </if-compare-field> @@ -261,7 +261,7 @@ <if> <condition> <and> - <not><if-compare-field field-name="partyId" map-name="userLogin" operator="equals" to-map-name="shoppingList"/></not> + <not><if-compare-field to-field="shoppingList." field="userLogin.partyId" operator="equals"/></not> <not><if-has-permission permission="PARTYMGR" action="_${permissionAction}"/></not> </and> </condition> @@ -275,7 +275,7 @@ <if> <condition> <and> - <not><if-compare-field field-name="userLogin.partyId" operator="equals" to-field-name="shoppingList.partyId"/></not> + <not><if-compare-field field="userLogin.partyId" to-field="shoppingList.partyId" operator="equals"/></not> <not><if-has-permission permission="PARTYMGR" action="_${permissionAction}"/></not> </and> </condition> @@ -287,12 +287,12 @@ <simple-method method-name="addSuggestionsToShoppingList" short-description="Add suggestions to a shopping list"> <!-- first check the ProductStore.enableAutoSuggestionList indicator --> <entity-one entity-name="OrderHeader" value-name="orderHeader"/> - <if-empty field-name="orderHeader.productStoreId"><return/></if-empty> + <if-empty field="orderHeader.productStoreId"><return/></if-empty> <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.enableAutoSuggestionList" operator="not-equals" value="Y"><return/></if-compare> + <if-compare field="productStore.enableAutoSuggestionList" operator="not-equals" value="Y"><return/></if-compare> <entity-condition entity-name="OrderRole" list-name="orderRoleList"> <condition-list combine="and"> @@ -309,7 +309,7 @@ </condition-list> </entity-condition> <first-from-list list-name="shoppingListList" entry-name="shoppingList" /> - <if-empty field-name="shoppingList"> + <if-empty field="shoppingList"> <set field="createShoppingListInMap.partyId" from-field="orderRole.partyId" /> <set field="createShoppingListInMap.listName" value="Auto Suggestions" /> <set field="createShoppingListInMap.shoppingListTypeId" value="SLT_WISH_LIST" /> @@ -326,7 +326,7 @@ <order-by field-name="orderItemSeqId" /> </entity-condition> <iterate list-name="orderItemList" entry-name="orderItem"> - <if-not-empty field-name="orderItem.productId"> + <if-not-empty field="orderItem.productId"> <entity-condition entity-name="ProductAssoc" list-name="compProductAssocList" filter-by-date="true"> <condition-list combine="and"> <condition-expr field-name="productId" env-name="orderItem.productId" /> @@ -343,7 +343,7 @@ <entity-one entity-name="Product" value-name="product" auto-field-map="false" > <field-map field-name="productId" env-name="orderItem.productId" /> </entity-one> - <if-compare field-name="product.isVariant" operator="equals" value="Y"> + <if-compare field="product.isVariant" operator="equals" value="Y"> <entity-condition entity-name="ProductAssoc" list-name="virtualProductAssocList" filter-by-date="true"> <condition-list combine="and"> <condition-expr field-name="productIdTo" env-name="orderItem.productId" /> @@ -351,7 +351,7 @@ </condition-list> </entity-condition> <first-from-list list-name="virtualProductAssocList" entry-name="virtualProductAssoc" /> - <if-not-empty field-name="virtualProductAssoc"> + <if-not-empty field="virtualProductAssoc"> <entity-condition entity-name="ProductAssoc" list-name="compProductAssocList" filter-by-date="true"> <condition-list combine="and"> <condition-expr field-name="productId" env-name="virtualProductAssoc.productId" /> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml Fri Jun 13 23:03:12 2008 @@ -22,14 +22,14 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd"> <simple-method method-name="createCommunicationEvent" short-description="Create a CommunicationEvent"> - <if-empty field-name="parameters.statusId"> + <if-empty field="parameters.statusId"> <set value="COM_ENTERED" field="parameters.statusId"/> </if-empty> <make-value value-name="newEntity" entity-name="CommunicationEvent"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="parameters.communicationEventId"> + <if-empty field="parameters.communicationEventId"> <sequenced-id-to-env sequence-name="CommunicationEvent" env-name="newEntity.communicationEventId"/> <else> <set field="newEntity.communicationEventId" from-field="parameters.communicationEventId"/> @@ -41,13 +41,13 @@ <create-value value-name="newEntity"/> - <if-not-empty field-name="parameters.productId"> + <if-not-empty field="parameters.productId"> <make-value value-name="eventProduct" entity-name="CommunicationEventProduct"/> <set from-field="parameters.productId" field="eventProduct.productId"/> <set from-field="newEntity.communicationEventId" field="eventProduct.communicationEventId"/> <create-value value-name="eventProduct"/> </if-not-empty> - <if-not-empty field-name="parameters.orderId"> + <if-not-empty field="parameters.orderId"> <make-value value-name="eventOrder" entity-name="CommunicationEventOrder"/> <set from-field="parameters.orderId" field="eventOrder.orderId"/> <set from-field="newEntity.communicationEventId" field="eventOrder.communicationEventId"/> @@ -65,24 +65,24 @@ <entity-one entity-name="CommunicationEvent" value-name="event"/> <!-- remove related links to content --> <get-related value-name="event" relation-name="CommEventContentAssoc" list-name="contentAssocs"/> - <if-not-empty field-name="contentAssocs"> + <if-not-empty field="contentAssocs"> <iterate entry-name="contentAssoc" list-name="contentAssocs"> <remove-value value-name="contentAssoc"/> <!-- delete content and dataresource too if requested --> - <if-compare field-name="parameters.delContentDataResource" value="Y" operator="equals"> + <if-compare field="parameters.delContentDataResource" value="Y" operator="equals"> <get-related value-name="contentAssoc" relation-name="FromContent" list-name="contents"/> - <if-not-empty field-name="contents"> + <if-not-empty field="contents"> <iterate entry-name="content" list-name="contents"> <remove-related value-name="content" relation-name="ContentRole"/> <remove-value value-name="content"/> <get-related-one value-name="content" relation-name="DataResource" to-value-name="dataResource"/> - <if-not-empty field-name="dataResource"> + <if-not-empty field="dataResource"> <get-related-one value-name="dataResource" relation-name="ImageDataResource" to-value-name="imageDataResource"/> - <if-not-empty field-name="imageDataResource"> + <if-not-empty field="imageDataResource"> <remove-value value-name="imageDataResource"/> </if-not-empty> <get-related-one value-name="dataResource" relation-name="ElectronicText" to-value-name="electronicText"/> - <if-not-empty field-name="electronicText"> + <if-not-empty field="electronicText"> <remove-value value-name="electronicText"/> </if-not-empty> <remove-related value-name="dataResource" relation-name="DataResourceRole"/> @@ -102,12 +102,12 @@ <entity-one entity-name="CommunicationEvent" value-name="event"/> <!-- remove related workeffort when this is the only communicationevent connected to it --> <get-related value-name="event" relation-name="CommunicationEventWorkEff" list-name="workEffortComs"/> - <if-not-empty field-name="workEffortComs"> + <if-not-empty field="workEffortComs"> <iterate entry-name="workEffortCom" list-name="workEffortComs"> <remove-value value-name="workEffortCom"/> <get-related-one value-name="workEffortCom" relation-name="WorkEffort" to-value-name="workEffort"/> <get-related value-name="workEffort" relation-name="CommunicationEventWorkEff" list-name="otherComs"/> - <if-empty field-name="otherComs"> + <if-empty field="otherComs"> <log level="info" message="remove workeffort ${workEffort.workEffortId} and related parties and status"/> <remove-related value-name="workEffort" relation-name="WorkEffortPartyAssignment"/> <remove-related value-name="workEffort" relation-name="WorkEffortPartyAssignment"/> @@ -148,7 +148,7 @@ </simple-method> <simple-method method-name="markEventRead" short-description="Marks a Communication Event as Read"> - <if-empty field-name="parameters.communicationEventId"> + <if-empty field="parameters.communicationEventId"> <set from-field="parameters.messageId" field="parameters.communicationEventId"/> </if-empty> <entity-one entity-name="CommunicationEvent" value-name="event"/> @@ -156,7 +156,7 @@ <if> <condition> <or> - <if-compare-field field-name="partyIdTo" map-name="event" to-map-name="userLogin" to-field-name="partyId" operator="equals"/> + <if-compare-field field="event.partyIdTo" to-field="userLogin.partyId" operator="equals"/> <if-has-permission permission="PARTYMGR" action="_CME_UPDATE"/> </or> </condition> @@ -164,8 +164,8 @@ <if> <condition> <or> - <if-compare field-name="statusId" map-name="event" operator="equals" value="COM_ENTERED"/> - <if-compare field-name="statusId" map-name="event" operator="equals" value="COM_PENDING"/> + <if-compare field="event.statusId" operator="equals" value="COM_ENTERED"/> + <if-compare field="event.statusId" operator="equals" value="COM_PENDING"/> </or> </condition> <then> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |