svn commit: r730116 [2/4] - in /ofbiz/trunk: applications/accounting/script
Locked
svn commit: r730116 [2/4] - in /ofbiz/trunk: applications/accounting/script
 
|
Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml?rev=730116&r1=730115&r2=730116&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml Tue Dec 30 04:14:23 2008 @@ -33,7 +33,7 @@ <create-value value-field="newEntity"/> - <field-to-result field-name="newEntity.marketingCampaignId" result-name="marketingCampaignId"/> + <field-to-result field="newEntity.marketingCampaignId" result-name="marketingCampaignId"/> </simple-method> <simple-method method-name="updateMarketingCampaign" short-description="Update an MarketingCampaign"> <check-permission permission="MARKETING" action="_UPDATE"><fail-message message="Security Error: to run updateMarketingCampaign you must have the MARKETING_UPDATE or MARKETING_ADMIN permission"/></check-permission> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml?rev=730116&r1=730115&r2=730116&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml Tue Dec 30 04:14:23 2008 @@ -32,7 +32,7 @@ <set field="newEntity.contactListId" from-field="parameters.contactListId"/> </else> </if-empty> - <field-to-result field-name="newEntity.contactListId" result-name="contactListId"/> + <field-to-result field="newEntity.contactListId" result-name="contactListId"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> </simple-method> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml?rev=730116&r1=730115&r2=730116&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml Tue Dec 30 04:14:23 2008 @@ -30,7 +30,7 @@ <make-value value-field="newEntity" entity-name="SegmentGroup"/> <sequenced-id-to-env sequence-name="SegmentGroup" env-name="newEntity.segmentGroupId"/> - <field-to-result field-name="newEntity.segmentGroupId" result-name="segmentGroupId"/> + <field-to-result field="newEntity.segmentGroupId" result-name="segmentGroupId"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> @@ -122,7 +122,7 @@ <check-permission permission="MARKETING" action="_DELETE"><fail-property resource="MarketingUiLabels" property="SegmentGroupRemoveSegmentGroupRolePermissionError"/></check-permission> <check-errors/> <entity-one entity-name="SegmentGroupRole" value-field="lookedUpValue"/> -<!-- <field-to-result field-name="lookedUpValue.partyId" result-name="partyId"/> --> +<!-- <field-to-result field="lookedUpValue.partyId" result-name="partyId"/> --> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -192,11 +192,11 @@ </condition> <then> <set field="areRelated" value="N" /> - <field-to-result field-name="areRelated"/> + <field-to-result field="areRelated"/> </then> <else> <set field="areRelated" value="Y"/> - <field-to-result field-name="areRelated"/> + <field-to-result field="areRelated"/> </else> </if> </simple-method> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/contact/ContactServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/contact/ContactServices.xml?rev=730116&r1=730115&r2=730116&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/contact/ContactServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/contact/ContactServices.xml Tue Dec 30 04:14:23 2008 @@ -61,7 +61,7 @@ <set field="partyRelationCtx.roleTypeIdFrom" value="_NA_"/> <set field="partyRelationCtx.partyRelationshipTypeId" value="CONTACT_REL"/> <call-service service-name="createPartyRelationship" in-map-name="partyRelationCtx"/> - <field-to-result field-name="partyId"/> + <field-to-result field="partyId"/> </simple-method> <simple-method method-name="mergeContacts" short-description="Merge two Contacts"> @@ -129,7 +129,7 @@ <set field="updatePartyCtx.statusId" value="PARTY_DISABLED"/> <call-service service-name="setPartyStatus" in-map-name="updatePartyCtx"/> - <field-to-result field-name="partyIdTo" result-name="partyId"/> + <field-to-result field="partyIdTo" result-name="partyId"/> <field-to-request field-name="partyIdTo" request-name="partyId"/> </if-compare-field> </simple-method> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml?rev=730116&r1=730115&r2=730116&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml Tue Dec 30 04:14:23 2008 @@ -114,8 +114,8 @@ <set field="partyDataSource.isCreate" value="Y"/> <create-value value-field="partyDataSource"/> </if-not-empty> - <field-to-result field-name="partyId"/> - <field-to-result field-name="parameters.roleTypeId" result-name="roleTypeId"/> + <field-to-result field="partyId"/> + <field-to-result field="parameters.roleTypeId" result-name="roleTypeId"/> </simple-method> <simple-method method-name="convertLeadToContact" short-description="Convert a lead person into a contact and associated lead group to an account"> @@ -164,8 +164,8 @@ <set field="updatePartyCtx.partyId" from-field="parameters.partyId"/> <set field="updatePartyCtx.statusId" value="LEAD_CONVERTED"/> <call-service service-name="setPartyStatus" in-map-name="updatePartyCtx"/> - <field-to-result field-name="parameters.partyId" result-name="partyId"/> - <field-to-result field-name="partyGroupId"/> + <field-to-result field="parameters.partyId" result-name="partyId"/> + <field-to-result field="partyGroupId"/> <set field="successMessage" value="Lead ${parameters.partyId} succesfully converted to contact"/> </simple-method> </simple-methods> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml?rev=730116&r1=730115&r2=730116&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml Tue Dec 30 04:14:23 2008 @@ -29,7 +29,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set from-field="userLogin.userLoginId" field="newEntity.createdByUserLogin"/> - <field-to-result field-name="parameters.salesOpportunityId" result-name="salesOpportunityId"/> + <field-to-result field="parameters.salesOpportunityId" result-name="salesOpportunityId"/> <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateOpportunity" short-description="Update an opportunity"> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml?rev=730116&r1=730115&r2=730116&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml Tue Dec 30 04:14:23 2008 @@ -44,7 +44,7 @@ <call-simple-method method-name="saveSalesForecastHistory"/> <!-- return the ID --> - <field-to-result result-name="salesForecastId" field-name="salesForecastId"/> + <field-to-result result-name="salesForecastId" field="salesForecastId"/> </simple-method> <simple-method method-name="updateSalesForecast" short-description="Updates a sales forecast and stores a copy in sales forecast history."> @@ -86,7 +86,7 @@ <simple-method method-name="createSalesForecastDetail" short-description="Creates a sales forecast detail"> <make-value entity-name="SalesForecastDetail" value-field="newEntity"/> <sequenced-id-to-env sequence-name="SalesForecastDetail" env-name="newEntity.salesForecastDetailId"/> - <field-to-result field-name="newEntity.salesForecastDetailId" result-name="salesForecastDetailId"/> + <field-to-result field="newEntity.salesForecastDetailId" result-name="salesForecastDetailId"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml?rev=730116&r1=730115&r2=730116&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml Tue Dec 30 04:14:23 2008 @@ -138,7 +138,7 @@ <set field="checkAction" from-field="parameters.checkAction"/> <set field="callingMethodName" from-field="parameters.callingMethodName"/> <call-simple-method method-name="checkSupplierRelatedPermission"/> - <field-to-result field-name="hasSupplierRelatedPermission"/> + <field-to-result field="hasSupplierRelatedPermission"/> </simple-method> <!-- Should be called in-line to use its out parameter indicating whether the user has permission or not. --> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml?rev=730116&r1=730115&r2=730116&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml Tue Dec 30 04:14:23 2008 @@ -95,7 +95,7 @@ <sequenced-id-to-env sequence-name="ReturnHeader" env-name="newEntity.returnId"/> </else> </if-compare> - <field-to-result field-name="newEntity.returnId" result-name="returnId"/> + <field-to-result field="newEntity.returnId" result-name="returnId"/> <if> <condition> @@ -128,7 +128,7 @@ <create-value value-field="newEntity"/> <set field="responseMessage" value="Return Request #${newEntity.returnId} was created successfully."/> - <field-to-result field-name="responseMessage" result-name="successMessage"/> + <field-to-result field="responseMessage" result-name="successMessage"/> </simple-method> <simple-method method-name="updateReturnHeader" short-description="Update a ReturnHeader"> <check-permission permission="ORDERMGR" action="_UPDATE"><fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunUpdateReturnHeader"/></check-permission> @@ -245,7 +245,7 @@ <check-errors/> </if-compare> - <field-to-result field-name="returnHeader.statusId" result-name="currentStatusId"/> + <field-to-result field="returnHeader.statusId" result-name="currentStatusId"/> <set-nonpk-fields map="parameters" value-field="returnHeader"/> <store-value value-name="returnHeader"/> </simple-method> @@ -399,7 +399,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set field="newEntity.statusId" value="RETURN_REQUESTED"/> <!-- default status for new return items --> - <field-to-result field-name="returnItemSeqId" map-name="newEntity" result-name="returnItemSeqId"/> + <field-to-result field="returnItemSeqId" map-name="newEntity" result-name="returnItemSeqId"/> <log level="info" message="Return Item Seq ID: ${newEntity.returnItemSeqId}"/> <create-value value-field="newEntity"/> <refresh-value value-name="newEntity"/> @@ -436,7 +436,7 @@ <find-by-primary-key entity-name="ReturnItem" map="lookupPKMap" value-field="returnItem"/> <set field="originalReturnPrice" from-field="returnItem.returnPrice"/> <set field="originalReturnQuantity" from-field="returnItem.returnQuantity"/> - <field-to-result field-name="returnItem.statusId" result-name="currentStatusId"/> + <field-to-result field="returnItem.statusId" result-name="currentStatusId"/> <set-nonpk-fields map="parameters" value-field="returnItem"/> <store-value value-name="returnItem"/> @@ -514,10 +514,10 @@ <make-value value-field="newEntity" entity-name="ReturnAdjustment"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id-to-env sequence-name="ReturnAdjustment" env-name="newEntity.returnAdjustmentId"/> - <field-to-result field-name="newEntity.returnAdjustmentId" result-name="returnAdjustmentId"/> + <field-to-result field="newEntity.returnAdjustmentId" result-name="returnAdjustmentId"/> <create-value value-field="newEntity"/> <set field="responseMessage" value="Return Adjustment #${newEntity.returnAdjustmentId} was created successfully."/> - <field-to-result field-name="responseMessage" result-name="successMessage"/> + <field-to-result field="responseMessage" result-name="successMessage"/> </simple-method> <simple-method method-name="removeReturnAdjustment" short-description="Remove Return Adjustment"> <check-permission permission="ORDERMGR" action="_DELETE"><fail-message message="Order security ErrorToRunUpdateReturnAdjustment"/></check-permission> @@ -625,14 +625,14 @@ </if-compare> <!-- return the current return header status --> - <field-to-result field-name="statusId" map-name="returnHeader" result-name="returnHeaderStatus"/> + <field-to-result field="statusId" map-name="returnHeader" result-name="returnHeaderStatus"/> </simple-method> <simple-method method-name="createReturnItemResponse" short-description="Create a ReturnItemResponse"> <make-value value-field="newEntity" entity-name="ReturnItemResponse"/> <sequenced-id-to-env sequence-name="ReturnItemResponse" env-name="newEntity.returnItemResponseId"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> - <field-to-result field-name="newEntity.returnItemResponseId" result-name="returnItemResponseId"/> + <field-to-result field="newEntity.returnItemResponseId" result-name="returnItemResponseId"/> </simple-method> <simple-method method-name="quickReturnFromOrder" short-description="Create Quick Return From Order"> @@ -839,7 +839,7 @@ </else> </if-compare> </if-compare> - <field-to-result field-name="returnId"/> + <field-to-result field="returnId"/> </simple-method> <simple-method method-name="createReturnAndItemOrAdjustment" short-description="If returnId is null, create a return; then create Return Item or Adjustment based on the parameters passed in"> @@ -850,7 +850,7 @@ </call-service> <check-errors/> <set field="parameters.returnId" from-field="returnId"/> - <field-to-result field-name="returnId" result-name="returnId"/> + <field-to-result field="returnId" result-name="returnId"/> </if-empty> <set-service-fields service-name="createReturnItemOrAdjustment" map-name="parameters" to-map-name="createReturnItemOrAdjustmentInMap"/> <call-service service-name="createReturnItemOrAdjustment" in-map-name="createReturnItemOrAdjustmentInMap"> @@ -858,8 +858,8 @@ <result-to-field result-name="returnItemSeqId" field-name="returnItemSeqId"/> </call-service> <check-errors/> - <field-to-result field-name="returnAdjustmentId" result-name="returnAdjustmentId"/> - <field-to-result field-name="returnItemSeqId" result-name="returnItemSeqId"/> + <field-to-result field="returnAdjustmentId" result-name="returnAdjustmentId"/> + <field-to-result field="returnItemSeqId" result-name="returnItemSeqId"/> </simple-method> <simple-method method-name="createReturnItemBilling" short-description="Create a ReturnItemBilling"> @@ -940,12 +940,12 @@ <entity-and entity-name="StatusItem" list="statusItems"> <field-map field-name="statusTypeId" value="ORDER_RETURN_STTS"/> </entity-and> - <field-to-result field-name="statusItems"/> + <field-to-result field="statusItems"/> <else> <entity-and entity-name="StatusItem" list="statusItems"> <field-map field-name="statusTypeId" value="PORDER_RETURN_STTS"/> </entity-and> - <field-to-result field-name="statusItems"/> + <field-to-result field="statusItems"/> </else> </if-compare> </simple-method> 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=730116&r1=730115&r2=730116&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 Tue Dec 30 04:14:23 2008 @@ -74,16 +74,16 @@ <!-- first set the required OUT fields to zero --> <calculate field-name="plainDoubleZero" type="Double"><number value="0.0"/></calculate> <calculate field-name="plainLongZero" type="Long"><number value="0"/></calculate> - <field-to-result field-name="plainDoubleZero" result-name="totalGrandAmount"/> - <field-to-result field-name="plainDoubleZero" result-name="totalSubRemainingAmount"/> - <field-to-result field-name="plainLongZero" result-name="totalOrders"/> + <field-to-result field="plainDoubleZero" result-name="totalGrandAmount"/> + <field-to-result field="plainDoubleZero" result-name="totalSubRemainingAmount"/> + <field-to-result field="plainLongZero" result-name="totalOrders"/> <!-- because we specified the partyId and the roleTypeId, should only be one item in list returned --> <first-from-list list="orderInfoList" entry="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"/> + <field-to-result field="orderInfo.totalGrandAmount" result-name="totalGrandAmount"/> + <field-to-result field="orderInfo.totalSubRemainingAmount" result-name="totalSubRemainingAmount"/> + <field-to-result field="orderInfo.totalOrders" result-name="totalOrders"/> </if-not-empty> </simple-method> <simple-method method-name="createOrderShipment" short-description="Create OrderShipment"> @@ -154,7 +154,7 @@ <set-service-fields to-map-name="orderReqCommitParams" service-name="createOrderRequirementCommitment" map-name="parameters"/> <call-service service-name="createOrderRequirementCommitment" in-map-name="orderReqCommitParams"/> - <field-to-result field-name="parameters.requirementId" result-name="requirementId"/> + <field-to-result field="parameters.requirementId" result-name="requirementId"/> </simple-method> <simple-method method-name="getProductFacilityAndQuantities" short-description="finds ProductFacility and QOH, ATP inventory for an inventoryItem"> @@ -262,7 +262,7 @@ <call-service service-name="createRequirement" in-map-name="inputMap"> <result-to-field field-name="parameters.requirementId" result-name="requirementId"/> </call-service> - <field-to-result field-name="parameters.requirementId" result-name="requirementId"/> + <field-to-result field="parameters.requirementId" result-name="requirementId"/> </if-compare-field> </if-compare-field> </if-not-empty> @@ -309,7 +309,7 @@ <call-service service-name="createRequirement" in-map-name="inputMap"> <result-to-field field-name="parameters.requirementId" result-name="requirementId"/> </call-service> - <field-to-result field-name="parameters.requirementId" result-name="requirementId"/> + <field-to-result field="parameters.requirementId" result-name="requirementId"/> </if-compare-field> </if-compare-field> </if-not-empty> @@ -514,7 +514,7 @@ <!-- use orderIdTemp along with the orderIdPrefix to create the real ID --> <set field="orderId" value="${productStore.orderNumberPrefix}${partyAcctgPreference.orderIdPrefix}${str:toString(orderIdTemp)}"/> - <field-to-result field-name="orderId" result-name="orderId"/> + <field-to-result field="orderId" result-name="orderId"/> </simple-method> <simple-method method-name="createOrderHeader" short-description="Create OrderHeader"> @@ -531,7 +531,7 @@ <sequenced-id-to-env sequence-name="OrderHeader" env-name="newEntity.orderId"/> </else> </if-not-empty> - <field-to-result field-name="newEntity.orderId" result-name="orderId"/> + <field-to-result field="newEntity.orderId" result-name="orderId"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> @@ -772,7 +772,7 @@ </if-compare> <get-related value-name="orderItemShipGroup" relation-name="OrderItemShipGrpInvRes" list-name="orderItemShipGroupInvResList" order-by-list-name="orderByList"/> <first-from-list entry="orderItemShipGroupInvRes" list="orderItemShipGroupInvResList"/> - <field-to-result field-name="orderItemShipGroupInvRes.promisedDatetime" result-name="estimatedShipDate"/> + <field-to-result field="orderItemShipGroupInvRes.promisedDatetime" result-name="estimatedShipDate"/> </simple-method> <simple-method method-name="createOrderContactMech" short-description="Create OrderContactMech"> @@ -853,7 +853,7 @@ <call-service service-name="createOrderPaymentPreference" in-map-name="inputMap" include-user-login="true"> <result-to-field field-name="parameters.orderPaymentPreferenceId" result-name="orderPaymentPreferenceId"/> </call-service> - <field-to-result field-name="parameters.orderPaymentPreferenceId" result-name="orderPaymentPreferenceId"/> + <field-to-result field="parameters.orderPaymentPreferenceId" result-name="orderPaymentPreferenceId"/> </simple-method> <simple-method method-name="getOrderStatus" short-description="Gets an order status" login-required="false"> @@ -862,7 +862,7 @@ <add-error><fail-message message="Order not found [{parameters.orderId}]"/></add-error> <check-errors/> </if-empty> - <field-to-result field-name="statusId" map-name="order" result-name="statusId"/> + <field-to-result field="statusId" map-name="order" result-name="statusId"/> </simple-method> <simple-method method-name="checkOrderIsOnBackOrder" short-description="Check if an Order is on Back Order" login-required="false"> @@ -880,7 +880,7 @@ <set field="isBackOrder" value="true" type="Boolean"/> </else> </if-empty> - <field-to-result field-name="isBackOrder" result-name="isBackOrder"/> + <field-to-result field="isBackOrder" result-name="isBackOrder"/> </simple-method> <simple-method method-name="createOrderItemChange" short-description="Creates a new Order Item Change record"> @@ -895,7 +895,7 @@ </if-empty> <sequenced-id-to-env sequence-name="OrderItemChange" env-name="newEntity.orderItemChangeId"/> <create-value value-field="newEntity"/> - <field-to-result field-name="newEntity.orderItemChangeId" result-name="orderItemChangeId"/> + <field-to-result field="newEntity.orderItemChangeId" result-name="orderItemChangeId"/> </simple-method> <simple-method method-name="createUpdateShippingAddress" short-description="create and update Shipping address" login-required="false"> @@ -991,7 +991,7 @@ </if-compare> </else> </if-empty> - <field-to-result field-name="parameters.shipToContactMechId" result-name="contactMechId"/> + <field-to-result field="parameters.shipToContactMechId" result-name="contactMechId"/> </simple-method> <simple-method method-name="createUpdateBillingAddress" short-description="create and update billing address"> @@ -1103,7 +1103,7 @@ </else> </if-empty> </if-compare> - <field-to-result field-name="parameters.billToContactMechId" result-name="contactMechId"/> + <field-to-result field="parameters.billToContactMechId" result-name="contactMechId"/> </simple-method> <simple-method method-name="createUpdateCreditCard" short-description="create and update credit card"> <set-service-fields service-name="createCreditCard" map-name="parameters" to-map-name="creditCardContext"/> @@ -1128,7 +1128,7 @@ </else> </if-empty> <set field="paymentMethodId" from-field="parameters.paymentMethodId"/> - <field-to-result field-name="parameters.paymentMethodId" result-name="paymentMethodId"/> + <field-to-result field="parameters.paymentMethodId" result-name="paymentMethodId"/> </simple-method> </simple-methods> 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=730116&r1=730115&r2=730116&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 Tue Dec 30 04:14:23 2008 @@ -66,7 +66,7 @@ <!-- use quoteIdTemp along with the quoteIdPrefix to create the real ID --> <set field="quoteId" value="${partyAcctgPreference.quoteIdPrefix}${quoteIdTemp}"/> - <field-to-result field-name="quoteId" result-name="quoteId"/> + <field-to-result field="quoteId" result-name="quoteId"/> </simple-method> <!-- create a new Quote --> @@ -102,7 +102,7 @@ <sequenced-id-to-env sequence-name="Quote" env-name="newEntity.quoteId"/> </else> </if-not-empty> - <field-to-result field-name="newEntity.quoteId" result-name="quoteId"/> + <field-to-result field="newEntity.quoteId" result-name="quoteId"/> <!-- finally create the record (should not exist already)--> <create-value value-field="newEntity"/> @@ -293,8 +293,8 @@ <make-next-seq-id value-name="newEntity" seq-field-name="quoteItemSeqId"/> <set from-field="quoteItemSeqId" field="newEntity.quoteItemSeqId"/> </if-empty> - <field-to-result field-name="newEntity.quoteId" result-name="quoteId"/> - <field-to-result field-name="newEntity.quoteItemSeqId" result-name="quoteItemSeqId"/> + <field-to-result field="newEntity.quoteId" result-name="quoteId"/> + <field-to-result field="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="parameters.quoteUnitPrice"> @@ -514,8 +514,8 @@ <set from-field="quoteId" field="newQuote.quoteId"/> <set from-field="quoteId" field="newQuoteItem.quoteId"/> <make-next-seq-id value-name="newQuoteItem" seq-field-name="quoteItemSeqId"/> - <field-to-result field-name="quoteId" result-name="quoteId"/> - <field-to-result field-name="newQuoteItem.quoteItemSeqId" result-name="quoteItemSeqId"/> + <field-to-result field="quoteId" result-name="quoteId"/> + <field-to-result field="newQuoteItem.quoteItemSeqId" result-name="quoteItemSeqId"/> <set from-field="custRequest.fromPartyId" field="newQuote.partyId"/> <set from-field="custRequest.custRequestName" field="newQuote.quoteName"/> @@ -664,7 +664,7 @@ <now-timestamp-to-env env-name="newEntity.createdDate"/> <set from-field="quoteAdjustmentId" field="newEntity.quoteAdjustmentId"/> <set from-field="userLogin.userLoginId" field="newEntity.createdByUserLogin"/> - <field-to-result field-name="quoteAdjustmentId" result-name="quoteAdjustmentId"/> + <field-to-result field="quoteAdjustmentId" result-name="quoteAdjustmentId"/> <create-value value-field="newEntity"/> </simple-method> @@ -773,7 +773,7 @@ </then> </if> - <field-to-result field-name="quote.quoteId" result-name="quoteId"/> + <field-to-result field="quote.quoteId" result-name="quoteId"/> </simple-method> <simple-method method-name="createQuoteFromShoppingList" short-description="Create a Quote from a Shopping List"> @@ -786,7 +786,7 @@ <result-to-field result-name="quoteId" field-name="quoteId"/> </call-service> - <field-to-result field-name="quoteId" result-name="quoteId"/> + <field-to-result field="quoteId" result-name="quoteId"/> </simple-method> <simple-method method-name="createQuoteFromCustRequest" short-description="Create a Quote from a CustRequest"> @@ -860,7 +860,7 @@ </if-compare> </iterate> - <field-to-result field-name="quoteId" result-name="quoteId"/> + <field-to-result field="quoteId" result-name="quoteId"/> </simple-method> <!--Quote workeffort --> @@ -875,8 +875,8 @@ <if-empty field="quoteWorkEffort.quoteId"> <set-nonpk-fields map="parameters" value-field="lookupMap"/> <create-value value-field="lookupMap"/> - <field-to-result field-name="quoteId" map-name="lookupMap"/> - <field-to-result field-name="workEffortId" map-name="lookupMap"/> + <field-to-result field="quoteId" map-name="lookupMap"/> + <field-to-result field="workEffortId" map-name="lookupMap"/> </if-empty> </simple-method> <simple-method method-name="deleteQuoteWorkEffort" short-description="Delete a QuoteWorkEffort"> 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=730116&r1=730115&r2=730116&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 Tue Dec 30 04:14:23 2008 @@ -38,14 +38,14 @@ </if-empty> <property-to-field resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunCreateCustRequest" field-name="failMessage"/> <set field="hasPermission" type="Boolean" value="false"/> - <field-to-result field-name="failMessage"/> + <field-to-result field="failMessage"/> </if-compare> </then> <else> <set field="hasPermission" type="Boolean" value="true"/> </else> </if> - <field-to-result field-name="hasPermission"/> + <field-to-result field="hasPermission"/> </simple-method> <simple-method method-name="createCustRequest" short-description="Create Customer Request"> @@ -70,7 +70,7 @@ <to-string field-name="custRequestId"/> <set from-field="custRequestId" field="newEntity.custRequestId"/> <create-value value-field="newEntity"/> - <field-to-result field-name="custRequestId" map-name="newEntity"/> + <field-to-result field="custRequestId" map-name="newEntity"/> <!-- jacopoc: Commented out the following code because it is too specific and not valid as a general rule: a user may enter the request from a customer even if he will not work @@ -128,7 +128,7 @@ </simple-method> <simple-method method-name="updateCustRequest" short-description="Update Customer Request"> <entity-one entity-name="CustRequest" value-field="custRequest"/> - <field-to-result field-name="custRequest.statusId" result-name="oldStatusId"/> + <field-to-result field="custRequest.statusId" result-name="oldStatusId"/> <if-compare-field field="custRequest.statusId" to-field="parameters.statusId" operator="not-equals"> <if-compare field="parameters.statusId" value="CRQ_CANCELLED" operator="equals"> <!-- check for related workefforts ...and when no time recorded cancel these too --> @@ -159,7 +159,7 @@ <else> <set field="parameters.statusId" from-field="custRequest.statusId"/> <property-to-field resource="ProjectMgrUiLabels" property="cannotCancelledRequest" field-name="errorMessage"/> - <field-to-result field-name="errorMessage"/> + <field-to-result field="errorMessage"/> <set field="isShowEvent" value="N"/> </else> </if-empty> @@ -208,8 +208,8 @@ <set value="CRQ_SUBMITTED" field="newEntity.statusId"/> </if-empty> <create-value value-field="newEntity"/> - <field-to-result field-name="newEntity.custRequestId" result-name="custRequestId"/> - <field-to-result field-name="newEntity.custRequestItemSeqId" result-name="custRequestItemSeqId"/> + <field-to-result field="newEntity.custRequestId" result-name="custRequestId"/> + <field-to-result field="newEntity.custRequestItemSeqId" result-name="custRequestItemSeqId"/> </simple-method> <simple-method method-name="updateCustRequestItem" short-description="Update Customer Request Item"> <set from-field="parameters.custRequestId" field="lookupPKMap.custRequestId"/> @@ -255,7 +255,7 @@ <result-to-field result-name="noteId" map-name="newEntity"/> </call-service> <create-value value-field="newEntity"/> - <field-to-result field-name="newEntity.noteId" result-name="noteId"/> + <field-to-result field="newEntity.noteId" result-name="noteId"/> </simple-method> <simple-method method-name="updateCustRequestNote" short-description="Update CustRequest Note"> <entity-one entity-name="CustRequestNote" value-field="lookedUpValue"/> @@ -274,7 +274,7 @@ <result-to-field result-name="noteId" map-name="newEntity"/> </call-service> <create-value value-field="newEntity"/> - <field-to-result field-name="newEntity.noteId" result-name="noteId"/> + <field-to-result field="newEntity.noteId" result-name="noteId"/> </simple-method> <simple-method method-name="getCustRequestsByRole" short-description="Create Customer RequestItem Note"> @@ -287,7 +287,7 @@ <string-to-list string="-createdDate" list-name="orderByList"/> <find-by-and entity-name="CustRequestAndRole" list-name="custRequestAndRoles" map-name="lookupMap" order-by-list-name="orderByList"/> - <field-to-result field-name="custRequestAndRoles" result-name="custRequestAndRoles"/> + <field-to-result field="custRequestAndRoles" result-name="custRequestAndRoles"/> </simple-method> <simple-method method-name="createCustRequestFromCart" short-description="Create a CustRequest from a ShoppingCart"> @@ -330,7 +330,7 @@ </if-compare> </iterate> - <field-to-result field-name="custRequest.custRequestId" result-name="custRequestId"/> + <field-to-result field="custRequest.custRequestId" result-name="custRequestId"/> </simple-method> <simple-method method-name="createCustRequestFromShoppingList" short-description="Create a CustRequest from a Shopping List"> @@ -344,7 +344,7 @@ <result-to-field result-name="custRequestId" field-name="custRequestId"/> </call-service> <check-errors/> - <field-to-result field-name="custRequestId" result-name="custRequestId"/> + <field-to-result field="custRequestId" result-name="custRequestId"/> </simple-method> <!-- copy an existing CustRequestItem --> @@ -396,12 +396,12 @@ <set from-field="nowTimestamp" field="newEntity.statusDatetime"/> </if-empty> <create-value value-field="newEntity"/> - <field-to-result field-name="newEntity.custRequestStatusId" result-name="custRequestStatusId"/> + <field-to-result field="newEntity.custRequestStatusId" result-name="custRequestStatusId"/> </simple-method> <simple-method method-name="setCustRequestStatus" short-description="change the customer request Status"> <entity-one entity-name="CustRequest" value-field="custRequest"/> - <field-to-result field-name="custRequest.statusId" result-name="oldStatusId"/> + <field-to-result field="custRequest.statusId" result-name="oldStatusId"/> <if-compare-field field="custRequest.statusId" to-field="parameters.statusId" operator="not-equals"> <entity-one entity-name="StatusValidChange" value-field="statusChange"> <field-map field-name="statusId" from-field="custRequest.statusId"/> @@ -467,7 +467,7 @@ <set field="updStat.statusId" value="COM_COMPLETE"/> <call-service service-name="setCommunicationEventStatus" in-map-name="updStat"/> - <field-to-result field-name="parameters.custRequestId" result-name="custRequestId"/> + <field-to-result field="parameters.custRequestId" result-name="custRequestId"/> </simple-method> <!-- Create/Delete CustRequest Content --> 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=730116&r1=730115&r2=730116&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 Tue Dec 30 04:14:23 2008 @@ -32,7 +32,7 @@ <now-timestamp-to-env env-name="nowTimestamp"/> <set from-field="nowTimestamp" field="newEntity.createdDate"/> <create-value value-field="newEntity"/> - <field-to-result field-name="requirementId" result-name="requirementId"/> + <field-to-result field="requirementId" result-name="requirementId"/> </simple-method> <simple-method method-name="updateRequirement" short-description="Update a requirement"> @@ -40,7 +40,7 @@ <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="Requirement" map="lookupPKMap" value-field="lookedUpValue"/> <clone-value value-name="lookedUpValue" new-value-name="savedValue"/> - <field-to-result field-name="lookedUpValue.statusId" result-name="oldStatusId"/> + <field-to-result field="lookedUpValue.statusId" result-name="oldStatusId"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> 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=730116&r1=730115&r2=730116&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 Tue Dec 30 04:14:23 2008 @@ -65,7 +65,7 @@ </if-empty> <sequenced-id-to-env sequence-name="ShoppingList" env-name="newEntity.shoppingListId"/> - <field-to-result field-name="newEntity.shoppingListId" result-name="shoppingListId"/> + <field-to-result field="newEntity.shoppingListId" result-name="shoppingListId"/> <create-value value-field="newEntity"/> </simple-method> @@ -128,8 +128,8 @@ <make-next-seq-id value-name="newEntity" seq-field-name="shoppingListItemSeqId" numeric-padding="5"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <field-to-result field-name="newEntity.shoppingListItemSeqId" result-name="shoppingListItemSeqId"/> - <field-to-result field-name="newEntity.shoppingListId" result-name="shoppingListId"/> + <field-to-result field="newEntity.shoppingListItemSeqId" result-name="shoppingListItemSeqId"/> + <field-to-result field="newEntity.shoppingListId" result-name="shoppingListId"/> <create-value value-field="newEntity"/> <if-compare-field field="shoppingList.partyId" to-field="userLogin.partyId" operator="not-equals"> @@ -188,7 +188,7 @@ <iterate list="shoppingListItemList" entry="shoppingListItem"> <if-compare-field field="parameters.productId" to-field="shoppingListItem.productId" operator="equals"> - <field-to-result field-name="shoppingListItem.shoppingListItemSeqId" result-name="shoppingListItemSeqId" /> + <field-to-result field="shoppingListItem.shoppingListItemSeqId" result-name="shoppingListItemSeqId" /> <return /> </if-compare-field> </iterate> @@ -254,7 +254,7 @@ <clear-field field="calcChildPriceInMap"/> </iterate> - <field-to-result field-name="totalPrice" result-name="totalPrice"/> + <field-to-result field="totalPrice" result-name="totalPrice"/> </simple-method> <simple-method method-name="checkShoppingListSecurity" short-description="Checks security on a ShoppingList"> 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=730116&r1=730115&r2=730116&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 Tue Dec 30 04:14:23 2008 @@ -61,7 +61,7 @@ <set field="newEntity.communicationEventId" from-field="parameters.communicationEventId"/> </else> </if-empty> - <field-to-result field-name="newEntity.communicationEventId" result-name="communicationEventId"/> + <field-to-result field="newEntity.communicationEventId" result-name="communicationEventId"/> <!-- if only contactMechId and no partyIdTo is provided for creation email address find the related party --> <if-empty field="parameters.partyIdTo"> @@ -431,7 +431,7 @@ <simple-method method-name="setCommunicationEventStatus" short-description="Set The Communication Event Status"> <entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/> - <field-to-result field-name="communicationEvent.statusId" result-name="oldStatusId"/> + <field-to-result field="communicationEvent.statusId" result-name="oldStatusId"/> <if-compare-field field="communicationEvent.statusId" to-field="parameters.statusId" operator="not-equals"> <entity-one entity-name="StatusValidChange" value-field="statusChange"> <field-map field-name="statusId" from-field="communicationEvent.statusId"/> @@ -458,7 +458,7 @@ </simple-method> <simple-method method-name="setCommunicationEventRoleStatus" short-description="Set The Communication Event Status for a specific role"> <entity-one entity-name="CommunicationEventRole" value-field="communicationEventRole"/> - <field-to-result field-name="communicationEventRole.statusId" result-name="oldStatusId"/> + <field-to-result field="communicationEventRole.statusId" result-name="oldStatusId"/> <if-compare-field field="communicationEventRole.statusId" to-field="parameters.statusId" operator="not-equals"> <entity-one entity-name="StatusValidChange" value-field="statusChange"> <field-map field-name="statusId" from-field="communicationEventRole.statusId"/> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml?rev=730116&r1=730115&r2=730116&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml Tue Dec 30 04:14:23 2008 @@ -30,7 +30,7 @@ </if-empty> <set-nonpk-fields map="parameters" value-field="newValue"/> <create-value value-field="newValue"/> - <field-to-result map-name="newValue" field-name="contactMechId"/> + <field-to-result map-name="newValue" field="contactMechId"/> <field-to-request map-name="newValue" field-name="contactMechId"/> <log level="info" message="Contact mech created with id ${newValue.contactMechId}"/> </simple-method> @@ -74,11 +74,11 @@ <default-message resource="PartyUiLabels" property="${successMessageProperty}"/> <result-to-field result-name="contactMechId" map-name="newValue"/> </call-service> - <field-to-result map-name="newValue" field-name="contactMechId"/> + <field-to-result map-name="newValue" field="contactMechId"/> <field-to-request map-name="newValue" field-name="contactMechId"/> <else> <log level="info" message="Contact mech not changed"/> - <field-to-result map-name="oldValue" field-name="contactMechId"/> + <field-to-result map-name="oldValue" field="contactMechId"/> <field-to-request map-name="oldValue" field-name="contactMechId"/> </else> </if-compare-field> @@ -108,7 +108,7 @@ </call-service> <set-nonpk-fields map="parameters" value-field="newValue"/> <create-value value-field="newValue"/> - <field-to-result map-name="newValue" field-name="contactMechId"/> + <field-to-result map-name="newValue" field="contactMechId"/> <field-to-request map-name="newValue" field-name="contactMechId"/> </simple-method> @@ -158,8 +158,8 @@ </else> </if-compare-field> <field-to-request map-name="newValue" field-name="contactMechId" request-name="contactMechId"/> - <field-to-result map-name="parameters" field-name="contactMechId" result-name="oldContactMechId"/> - <field-to-result map-name="newValue" field-name="contactMechId" result-name="contactMechId"/> + <field-to-result map-name="parameters" field="contactMechId" result-name="oldContactMechId"/> + <field-to-result map-name="newValue" field="contactMechId" result-name="contactMechId"/> </simple-method> <simple-method method-name="createTelecomNumber" short-description="Create Contact Mechanism with Telecom Number"> @@ -171,7 +171,7 @@ </call-service> <set-nonpk-fields map="parameters" value-field="newValue"/> <create-value value-field="newValue"/> - <field-to-result map-name="newValue" field-name="contactMechId"/> + <field-to-result map-name="newValue" field="contactMechId"/> <field-to-request map-name="newValue" field-name="contactMechId"/> </simple-method> @@ -204,8 +204,8 @@ </if-compare-field> </else> </if-compare-field> - <field-to-result map-name="newValue" field-name="contactMechId" result-name="contactMechId"/> - <field-to-result map-name="parameters" field-name="contactMechId" result-name="oldContactMechId"/> + <field-to-result map-name="newValue" field="contactMechId" result-name="contactMechId"/> + <field-to-result map-name="parameters" field="contactMechId" result-name="oldContactMechId"/> </simple-method> <simple-method method-name="createEmailAddress" short-description="Create an email address contact mechanism"> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml?rev=730116&r1=730115&r2=730116&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml Tue Dec 30 04:14:23 2008 @@ -61,7 +61,7 @@ </if-empty> <log level="info" message="Creating a PartyContactMech with id: ${parameters.contactMechId}"/> <set field="newValue.partyId" from-field="parameters.partyId"/> - <field-to-result field-name="contactMechId" map-name="newValue"/> + <field-to-result field="contactMechId" map-name="newValue"/> <field-to-request field-name="contactMechId" map-name="newValue"/> <set-nonpk-fields map="parameters" value-field="newValue"/> <now-timestamp-to-env env-name="newValue.fromDate"/> @@ -128,7 +128,7 @@ </if-compare-field> <log level="info" message="Setting id to result: ${newPartyContactMech.contactMechId}"/> - <field-to-result field-name="newPartyContactMech.contactMechId" result-name="contactMechId"/> + <field-to-result field="newPartyContactMech.contactMechId" result-name="contactMechId"/> <field-to-request field-name="newPartyContactMech.contactMechId" request-name="contactMechId"/> </simple-method> @@ -173,7 +173,7 @@ <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyCreated"/> </call-service> <field-to-request field-name="contactMechId" map-name="newPartyContactMech"/> - <field-to-result field-name="contactMechId" map-name="newPartyContactMech"/> + <field-to-result field="contactMechId" map-name="newPartyContactMech"/> </simple-method> <simple-method method-name="updatePartyPostalAddress" short-description="Update a PostalAddress for party"> @@ -196,7 +196,7 @@ <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyUpdated"/> </call-service> <field-to-request field-name="contactMechId" map-name="newPartyContactMech"/> - <field-to-result field-name="contactMechId" map-name="newPartyContactMech"/> + <field-to-result field="contactMechId" map-name="newPartyContactMech"/> </simple-method> <simple-method method-name="createPartyTelecomNumber" short-description="Create a TelecomNumber for party"> @@ -220,7 +220,7 @@ <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyCreated"/> </call-service> <field-to-request field-name="contactMechId" map-name="newPartyContactMech"/> - <field-to-result field-name="contactMechId" map-name="newPartyContactMech"/> + <field-to-result field="contactMechId" map-name="newPartyContactMech"/> </simple-method> <simple-method method-name="updatePartyTelecomNumber" short-description="Update a TelecomNumber for party"> @@ -245,7 +245,7 @@ </call-service> <log level="info" message="Setting result id: ${newPartyContactMech.contactMechId}"/> <field-to-request field-name="contactMechId" map-name="newPartyContactMech"/> - <field-to-result field-name="contactMechId" map-name="newPartyContactMech"/> + <field-to-result field="contactMechId" map-name="newPartyContactMech"/> </simple-method> <simple-method method-name="createPartyEmailAddress" short-description="Create an email address for party"> @@ -286,7 +286,7 @@ <result-to-result result-name="contactMechId"/> <result-to-request result-name="contactMechId"/> </call-service> - <field-to-result map-name="parameters" field-name="contactMechId" result-name="oldContactMechId"/> + <field-to-result map-name="parameters" field="contactMechId" result-name="oldContactMechId"/> </simple-method> <simple-method method-name="findPartyFromEmailAddress" short-description="Find partyId from email address"> @@ -314,8 +314,8 @@ </call-service> <if-not-empty field="results.item"> - <field-to-result field-name="results.item.partyId" result-name="partyId"/> - <field-to-result field-name="results.item.contactMechId" result-name="contactMechId"/> + <field-to-result field="results.item.partyId" result-name="partyId"/> + <field-to-result field="results.item.contactMechId" result-name="contactMechId"/> </if-not-empty> </simple-method> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml?rev=730116&r1=730115&r2=730116&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml Tue Dec 30 04:14:23 2008 @@ -25,7 +25,7 @@ <simple-method method-name="createPartyInvitation" short-description="Create a PartyInvitation"> <make-value entity-name="PartyInvitation" value-field="newEntity"/> <sequenced-id-to-env sequence-name="PartyInvitation" env-name="newEntity.partyInvitationId"/> - <field-to-result field-name="newEntity.partyInvitationId" result-name="partyInvitationId"/> + <field-to-result field="newEntity.partyInvitationId" result-name="partyInvitationId"/> <if-not-empty field="parameters.partyId"> <entity-one entity-name="Person" value-field="person" auto-field-map="false"> <field-map field-name="partyId" from-field="parameters.partyId"/> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyPermissionServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyPermissionServices.xml?rev=730116&r1=730115&r2=730116&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyPermissionServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyPermissionServices.xml Tue Dec 30 04:14:23 2008 @@ -52,10 +52,10 @@ </if-empty> <property-to-field resource="PartyUiLabels" property="PartyPermissionErrorPartyId" field-name="failMessage"/> <set field="hasPermission" type="Boolean" value="false"/> - <field-to-result field-name="failMessage"/> + <field-to-result field="failMessage"/> </else> </if> - <field-to-result field-name="hasPermission"/> + <field-to-result field="hasPermission"/> </simple-method> <!-- Returns hasPermission=true if userLogin party equals partyId parameter OR @@ -76,7 +76,7 @@ <if-not-empty field="parameters.partyId"> <if-compare-field field="parameters.partyId" to-field="userLogin.partyId" operator="equals"> <set field="hasPermission" type="Boolean" value="true"/> - <field-to-result field-name="hasPermission"/> + <field-to-result field="hasPermission"/> </if-compare-field> </if-not-empty> <if-compare field="hasPermission" operator="not-equals" value="true"> @@ -109,7 +109,7 @@ <if-empty field="parameters.partyIdFrom"> <set field="parameters.partyIdFrom" from-field="userLogin.partyId"/> <set field="hasPermission" type="Boolean" value="true"/> - <field-to-result field-name="hasPermission"/> + <field-to-result field="hasPermission"/> <else> <set field="altPermission" value="PARTYMGR_REL"/> <call-simple-method method-name="basePermissionCheck"/> @@ -125,7 +125,7 @@ </if-empty> <if-compare-field to-field="userLogin.partyId" field="parameters.partyId" operator="equals"> <set field="hasPermission" type="Boolean" value="true"/> - <field-to-result field-name="hasPermission"/> + <field-to-result field="hasPermission"/> <else> <set field="altPermission" value="PARTYMGR_PCM"/> @@ -139,7 +139,7 @@ <set field="hasPermission" type="Boolean" value="false"/> <if-has-permission permission="PARTYMGR_UPDATE" action="_UPDATE"> <set field="hasPermission" type="Boolean" value="true"/> - <field-to-result field-name="hasPermission"/> + <field-to-result field="hasPermission"/> </if-has-permission> <if-compare field="hasPermission" operator="not-equals" value="true"> <entity-one entity-name="PartyInvitation" value-field="partyInvitation"/> @@ -156,7 +156,7 @@ <if-not-empty field="partyId"> <if-compare-field field="partyId" to-field="userLogin.partyId" operator="equals"> <set field="hasPermission" type="Boolean" value="true"/> - <field-to-result field-name="hasPermission"/> + <field-to-result field="hasPermission"/> </if-compare-field> <else> <add-error> @@ -169,7 +169,7 @@ <else> <if-compare-field field="partyInvitation.partyId" to-field="userLogin.partyId" operator="equals"> <set field="hasPermission" type="Boolean" value="true"/> - <field-to-result field-name="hasPermission"/> + <field-to-result field="hasPermission"/> </if-compare-field> </else> </if-empty> @@ -177,22 +177,22 @@ </if-compare> <if-compare field="hasPermission" operator="not-equals" value="true"> <property-to-field property="PartyInvitationAccAndDecPermissionError" field-name="failMessage" resource="PartyUiLabels"/> - <field-to-result field-name="hasPermission"/> - <field-to-result field-name="failMessage"/> + <field-to-result field="hasPermission"/> + <field-to-result field="failMessage"/> </if-compare> </simple-method> <simple-method method-name="cancelPartyInvitationPermissionCheck" short-description="Cancel PartyInvitation Permission Logic"> <set field="hasPermission" type="Boolean" value="false"/> <if-has-permission permission="PARTYMGR_UPDATE" action="_UPDATE"> <set field="hasPermission" type="Boolean" value="true"/> - <field-to-result field-name="hasPermission"/> + <field-to-result field="hasPermission"/> </if-has-permission> <if-compare field="hasPermission" operator="not-equals" value="true"> <entity-one entity-name="PartyInvitation" value-field="partyInvitation"/> <if-not-empty field="partyInvitation.partyIdFrom"> <if-compare-field field="partyInvitation.partyIdFrom" to-field="userLogin.partyId" operator="equals"> <set field="hasPermission" type="Boolean" value="true"/> - <field-to-result field-name="hasPermission"/> + <field-to-result field="hasPermission"/> </if-compare-field> </if-not-empty> <if-compare field="hasPermission" operator="not-equals" value="true"> @@ -209,7 +209,7 @@ <if-not-empty field="partyId"> <if-compare-field field="partyId" to-field="userLogin.partyId" operator="equals"> <set field="hasPermission" type="Boolean" value="true"/> - <field-to-result field-name="hasPermission"/> + <field-to-result field="hasPermission"/> </if-compare-field> <else> <add-error> @@ -222,7 +222,7 @@ <else> <if-compare-field field="partyInvitation.partyId" to-field="userLogin.partyId" operator="equals"> <set field="hasPermission" type="Boolean" value="true"/> - <field-to-result field-name="hasPermission"/> + <field-to-result field="hasPermission"/> </if-compare-field> </else> </if-empty> @@ -231,8 +231,8 @@ </if-compare> <if-compare field="hasPermission" operator="not-equals" value="true"> <property-to-field property="PartyInvitationCancelPermissionError" field-name="failMessage" resource="PartyUiLabels"/> - <field-to-result field-name="hasPermission"/> - <field-to-result field-name="failMessage"/> + <field-to-result field="hasPermission"/> + <field-to-result field="failMessage"/> </if-compare> </simple-method> @@ -277,7 +277,7 @@ </else-if> <else> <set field="hasPermission" type="Boolean" value="true"/> - <field-to-result field-name="hasPermission"/> + <field-to-result field="hasPermission"/> </else> </if> </simple-method> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=730116&r1=730115&r2=730116&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml Tue Dec 30 04:14:23 2008 @@ -109,16 +109,16 @@ <if-empty field="partyNameHistoryCurrent"> <if-not-empty field="person"> - <field-to-result field-name="person.firstName" result-name="firstName"/> + <field-to-result field="person.firstName" result-name="firstName"/> <if-not-empty field="person.middleName"> - <field-to-result field-name="person.middleName" result-name="middleName"/> + <field-to-result field="person.middleName" result-name="middleName"/> </if-not-empty> - <field-to-result field-name="person.lastName" result-name="lastName"/> + <field-to-result field="person.lastName" result-name="lastName"/> <if-not-empty field="person.personalTitle"> - <field-to-result field-name="person.personalTitle" result-name="personalTitle"/> + <field-to-result field="person.personalTitle" result-name="personalTitle"/> </if-not-empty> <if-not-empty field="person.suffix"> - <field-to-result field-name="person.suffix" result-name="suffix"/> + <field-to-result field="person.suffix" result-name="suffix"/> </if-not-empty> @@ -128,28 +128,28 @@ <set field="fullName" value="${person.personalTitle} ${person.firstName} ${person.middleName} ${person.lastName} ${person.suffix}"/> </else> </if-compare> - <field-to-result field-name="fullName"/> + <field-to-result field="fullName"/> <else> <if-not-empty field="partyGroup"> - <field-to-result field-name="partyGroup.groupName" result-name="groupName"/> - <field-to-result field-name="partyGroup.groupName" result-name="fullName"/> + <field-to-result field="partyGroup.groupName" result-name="groupName"/> + <field-to-result field="partyGroup.groupName" result-name="fullName"/> </if-not-empty> </else> </if-not-empty> <else> <!-- partyNameHistoryCurrent has a value --> <if-not-empty field="person"> - <field-to-result field-name="partyNameHistoryCurrent.firstName" result-name="firstName"/> + <field-to-result field="partyNameHistoryCurrent.firstName" result-name="firstName"/> <if-not-empty field="partyNameHistoryCurrent.middleName"> - <field-to-result field-name="partyNameHistoryCurrent.middleName" result-name="middleName"/> + <field-to-result field="partyNameHistoryCurrent.middleName" result-name="middleName"/> </if-not-empty> - <field-to-result field-name="partyNameHistoryCurrent.lastName" result-name="lastName"/> + <field-to-result field="partyNameHistoryCurrent.lastName" result-name="lastName"/> <if-not-empty field="partyNameHistoryCurrent.personalTitle"> - <field-to-result field-name="partyNameHistoryCurrent.personalTitle" result-name="personalTitle"/> + <field-to-result field="partyNameHistoryCurrent.personalTitle" result-name="personalTitle"/> </if-not-empty> <if-not-empty field="partyNameHistoryCurrent.suffix"> - <field-to-result field-name="partyNameHistoryCurrent.suffix" result-name="suffix"/> + <field-to-result field="partyNameHistoryCurrent.suffix" result-name="suffix"/> </if-not-empty> @@ -159,12 +159,12 @@ <set field="fullName" value="${partyNameHistoryCurrent.personalTitle} ${partyNameHistoryCurrent.firstName} ${partyNameHistoryCurrent.middleName} ${partyNameHistoryCurrent.lastName} ${partyNameHistoryCurrent.suffix}"/> </else> </if-compare> - <field-to-result field-name="fullName"/> + <field-to-result field="fullName"/> <else> <if-not-empty field="partyGroup"> - <field-to-result field-name="partyNameHistoryCurrent.groupName" result-name="groupName"/> - <field-to-result field-name="partyNameHistoryCurrent.groupName" result-name="fullName"/> + <field-to-result field="partyNameHistoryCurrent.groupName" result-name="groupName"/> + <field-to-result field="partyNameHistoryCurrent.groupName" result-name="fullName"/> </if-not-empty> </else> </if-not-empty> @@ -190,7 +190,7 @@ <get-related-one value-name="postalAddressBoundary" to-value-name="geo" relation-name="Geo"/> <field-to-list field-name="geo" list-name="geos"/> </iterate> - <field-to-result field-name="geos"/> + <field-to-result field="geos"/> </simple-method> <!-- PartyClassification methods --> @@ -215,7 +215,7 @@ <log level="verbose" message="in newEntity" /> <make-value entity-name="PartyClassificationGroup" value-field="newEntity"/> <sequenced-id-to-env sequence-name="PartyClassificationGroup" env-name="newEntity.partyClassificationGroupId"/> - <field-to-result field-name="newEntity.partyClassificationGroupId" result-name="partyClassificationGroupId"/> + <field-to-result field="newEntity.partyClassificationGroupId" result-name="partyClassificationGroupId"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <log level="verbose" message="newEntity:${newEntity}" /> <create-value value-field="newEntity"/> @@ -360,7 +360,7 @@ <set from-field="dataResourceMap" field="fileCtx.dataResource"/> <call-service service-name="createAnonFile" in-map-name="fileCtx" include-user-login="true"/> </if-not-empty> - <field-to-result field-name="contentId" /> + <field-to-result field="contentId" /> </simple-method> <!-- Update party content --> @@ -434,7 +434,7 @@ <set from-field="dataResourceMap" field="fileCtx.dataResource"/> <call-service service-name="createAnonFile" in-map-name="fileCtx" include-user-login="true"/> </if-not-empty> - <field-to-result map-name="parameters" field-name="contentId" result-name="contentId" /> + <field-to-result map-name="parameters" field="contentId" result-name="contentId" /> </simple-method> <!-- get parties based on PartyRelationship --> @@ -454,7 +454,7 @@ <field-to-list field-name="party" list-name="parties"/> </iterate> <if-not-empty field="parties"> - <field-to-result field-name="parties"/> + <field-to-result field="parties"/> </if-not-empty> </simple-method> @@ -472,7 +472,7 @@ <call-simple-method method-name="followPartyRelationshipsInline"/> - <field-to-result field-name="relatedPartyIdList" result-name="parentOrganizationPartyIdList"/> + <field-to-result field="relatedPartyIdList" result-name="parentOrganizationPartyIdList"/> </simple-method> <simple-method method-name="getRelatedParties" short-description="Get Parties Related to a Party"> @@ -488,7 +488,7 @@ <call-simple-method method-name="followPartyRelationshipsInline"/> - <field-to-result field-name="relatedPartyIdList"/> + <field-to-result field="relatedPartyIdList"/> </simple-method> <simple-method method-name="followPartyRelationshipsInline" short-description="followPartyRelationshipsInline"> @@ -617,7 +617,7 @@ <field-to-list field-name="roleTypeId" list-name="childRoleTypeIdList"/> <set value="childRoleTypeIdList" field="roleTypeIdListName"/> <call-simple-method method-name="getChildRoleTypesInline"/> - <field-to-result field-name="childRoleTypeIdList"/> + <field-to-result field="childRoleTypeIdList"/> </simple-method> <simple-method method-name="getChildRoleTypesInline" short-description="getChildRoleTypes"> <clear-field field="_inline_NewRoleTypeIdList"/> @@ -668,7 +668,7 @@ <now-date-to-env env-name="fromDate"/> <filter-list-by-date list-name="emailAddressesAll" from-field-name="fromDate" to-list-name="emailAddresses"/> <first-from-list entry="emailAddress" list="emailAddresses"/> - <field-to-result field-name="emailAddress.infoString" result-name="emailAddress"/> + <field-to-result field="emailAddress.infoString" result-name="emailAddress"/> </simple-method> <simple-method method-name="getPartyTelephone" short-description="Get the telephone number of the party"> @@ -698,18 +698,18 @@ <if-compare-field field="telephone.contactMechPurposeTypeId" to-field="type" operator="equals"> <set field="found" value="notImportant"/> <if-not-empty field="telephone.countryCode"> - <field-to-result map-name="telephone" field-name="countryCode"/> + <field-to-result map-name="telephone" field="countryCode"/> </if-not-empty> <if-not-empty field="telephone.areaCode"> - <field-to-result map-name="telephone" field-name="areaCode"/> + <field-to-result map-name="telephone" field="areaCode"/> </if-not-empty> <if-not-empty field="telephone.contactNumber"> - <field-to-result map-name="telephone" field-name="contactNumber"/> + <field-to-result map-name="telephone" field="contactNumber"/> </if-not-empty> <if-not-empty field="telephone.extension"> - <field-to-result map-name="telephone" field-name="extension"/> + <field-to-result map-name="telephone" field="extension"/> </if-not-empty> - <field-to-result map-name="telephone" field-name="contactMechPurposeTypeId"/> + <field-to-result map-name="telephone" field="contactMechPurposeTypeId"/> </if-compare-field> </if-empty> </iterate> @@ -719,16 +719,16 @@ <filter-list-by-date list-name="telephoneAll1" to-list-name="telephoneAll2"/> <first-from-list entry="telephone" list="telephoneAll2"/> <if-not-empty field="telephone.tnCountryCode"> - <field-to-result map-name="telephone" field-name="tnCountryCode" result-name="countryCode"/> + <field-to-result map-name="telephone" field="tnCountryCode" result-name="countryCode"/> </if-not-empty> <if-not-empty field="telephone.tnAreaCode"> - <field-to-result map-name="telephone" field-name="tnAreaCode" result-name="areaCode"/> + <field-to-result map-name="telephone" field="tnAreaCode" result-name="areaCode"/> </if-not-empty> <if-not-empty field="telephone.tnContactNumber"> - <field-to-result map-name="telephone" field-name="tnContactNumber" result-name="contactNumber"/> + <field-to-result map-name="telephone" field="tnContactNumber" result-name="contactNumber"/> </if-not-empty> <if-not-empty field="telephone.extension"> - <field-to-result map-name="telephone" field-name="extension"/> + <field-to-result map-name="telephone" field="extension"/> </if-not-empty> </else> </if-not-empty> @@ -902,7 +902,7 @@ <set field="countryName" value="${countryGeo.geoName}: ${countryGeo.geoId}"/> <field-to-list list-name="countryList" field-name="countryName"/> </iterate> - <field-to-result field-name="countryList"/> + <field-to-result field="countryList"/> </simple-method> <simple-method method-name="getAssociatedStateList" short-description="set the state options for selected country" login-required="false"> @@ -919,7 +919,7 @@ <set field="noOption" value="No States/Provinces exist: _NA_"/> <field-to-list list-name="stateList" field-name="noOption"/> </if-empty> - <field-to-result field-name="stateList"/> + <field-to-result field="stateList"/> </simple-method> <simple-method method-name="createUpdatePerson" short-description="Create and update a person" login-required="false"> @@ -939,7 +939,7 @@ <log level="info" message="Party Updated partyId is ${partyId}"/> </else> </if-empty> - <field-to-result field-name="partyId"/> + <field-to-result field="partyId"/> </simple-method> <simple-method method-name="createUpdateTelecomNumber" short-description="Create and update phone number" login-required="false"> @@ -957,7 +957,7 @@ <log level="info" message="Phone Contact updated phoneContactMechId is ${contactMechId}"/> </else> </if-empty> - <field-to-result field-name="contactMechId"/> + <field-to-result field="contactMechId"/> </simple-method> <simple-method method-name="createUpdateEmailAddress" short-description="Create and update email address" login-required="false"> @@ -977,8 +977,8 @@ </else> </if-empty> <entity-one entity-name="ContactMech" value-field="contactMech"/> - <field-to-result field-name="contactMech.infoString" result-name="emailAddress"/> - <field-to-result field-name="contactMechId"/> + <field-to-result field="contactMech.infoString" result-name="emailAddress"/> + <field-to-result field="contactMechId"/> </simple-method> </simple-methods> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml?rev=730116&r1=730115&r2=730116&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml Tue Dec 30 04:14:23 2008 @@ -32,7 +32,7 @@ <check-errors/> </else> </if-empty> - <field-to-result field-name="newEntity.prodCatalogId" result-name="prodCatalogId"/> + <field-to-result field="newEntity.prodCatalogId" result-name="prodCatalogId"/> <create-value value-field="newEntity"/> </simple-method> @@ -122,7 +122,7 @@ <call-service service-name="getRelatedCategories" in-map-name="relatedCategoryContext"> <result-to-field result-name="categories" field-name="resCategories"/> </call-service> - <field-to-result field-name="resCategories" result-name="categories"/> + <field-to-result field="resCategories" result-name="categories"/> <!-- iterate entry-name="category" list-name="resCategories"> <log level="info" message="=========${category.productCategoryId}" /> </iterate --> @@ -162,7 +162,7 @@ <list-to-list list-name="relCategories" to-list-name="categories"/> </else> </if-not-empty> - <field-to-result field-name="categories" result-name="categories"/> + <field-to-result field="categories" result-name="categories"/> <!-- iterate entry-name="category" list-name="categories"> <log level="info" message="Category ${category.productCategoryId}" /> </iterate --> @@ -174,13 +174,13 @@ <set field="productCategoryContext.productCategoryId" from-field="parameters.parentProductCategoryId"/> <find-by-primary-key entity-name="ProductCategory" value-field="productCategory" map="productCategoryContext"/> <field-to-list list-name="categories" field-name="productCategory"/> - <field-to-result field-name="categories" result-name="categories"/> + <field-to-result field="categories" result-name="categories"/> </else> </if-not-empty> <!-- iterate entry-name="category" list-name="categories"> <log level="info" message="Category ${category.productCategoryId}" /> </iterate --> - <field-to-result result-name="categories" field-name="categories"/> + <field-to-result result-name="categories" field="categories"/> </simple-method> <simple-method method-name="checkImageUrlForAllCategories" short-description="Check for image url exists or not for All categories" login-required="false"> <!-- Get all the categories from top category --> @@ -199,7 +199,7 @@ <set field="categoryId" from-field="category.productCategoryId"/> <set field="categoriesMap.${categoryId}" from-field="fileStatusMap" /> </iterate> - <field-to-result field-name="categoriesMap" result-name="categoriesMap"/> + <field-to-result field="categoriesMap" result-name="categoriesMap"/> </if-not-empty> </simple-method> @@ -342,8 +342,8 @@ </if-not-empty> </if-compare> </iterate> - <field-to-result field-name="fileExists" result-name="fileExists"/> - <field-to-result field-name="fileNotExists" result-name="fileNotExists"/> + <field-to-result field="fileExists" result-name="fileExists"/> + <field-to-result field="fileNotExists" result-name="fileNotExists"/> </if-not-empty> </simple-method> @@ -397,7 +397,7 @@ <!-- set-service-fields service-name="updateProductCategory" map-name="category" to-map-name="updateProductCategoryContext"/> <call-service service-name="updateProductCategory" in-map-name="updateProductCategoryContext" / --> <store-value value-name="category"/> - <field-to-result field-name="filesImageMap" result-name="filesImageMap"/> + <field-to-result field="filesImageMap" result-name="filesImageMap"/> </if-not-empty> </simple-method> <simple-method method-name="checkImageUrlForProduct" short-description="Check for image url exists or not for product" login-required="false"> @@ -460,7 +460,7 @@ <clear-field field="detailImageUrl" map-name="product"></clear-field> </if-compare> </if-not-empty> - <field-to-result field-name="filesImageMap" result-name="filesImageMap"/> + <field-to-result field="filesImageMap" result-name="filesImageMap"/> <store-value value-name="product"/> <!-- set-service-fields service-name="updateProduct" map-name="product" to-map-name="updateProductContext"/> <call-service service-name="updateProduct" in-map-name="updateProductContext" / --> @@ -506,7 +506,7 @@ <set field="isExists" value="N"/> </else> </if-not-empty> - <field-to-result result-name="isExists" field-name="isExists"/> + <field-to-result result-name="isExists" field="isExists"/> </simple-method> <simple-method method-name="catalogPermissionCheck" short-description="Catalog permission logic"> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml?rev=730116&r1=730115&r2=730116&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml Tue Dec 30 04:14:23 2008 @@ -36,9 +36,9 @@ <set-service-fields service-name="updateContent" map-name="parameters" to-map-name="updateContent"/> <call-service service-name="updateContent" in-map-name="updateContent"/> - <field-to-result map-name="newEntity" field-name="contentId"/> - <field-to-result map-name="newEntity" field-name="productCategoryId"/> - <field-to-result map-name="newEntity" field-name="prodCatContentTypeId"/> + <field-to-result map-name="newEntity" field="contentId"/> + <field-to-result map-name="newEntity" field="productCategoryId"/> + <field-to-result map-name="newEntity" field="prodCatContentTypeId"/> </simple-method> <simple-method method-name="updateCategoryContent" short-description="Update Content For Category"> <make-value value-field="lookupPKMap" entity-name="ProductCategoryContent"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |