You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2016/11/08 11:27:13 UTC
svn commit: r1768662 - in /ofbiz/trunk:
applications/accounting/minilang/agreement/
applications/accounting/minilang/fixedasset/
applications/accounting/minilang/invoice/
applications/accounting/minilang/ledger/
applications/accounting/minilang/payment...
Author: deepak
Date: Tue Nov 8 11:27:13 2016
New Revision: 1768662
URL: http://svn.apache.org/viewvc?rev=1768662&view=rev
Log:
Fixed: Fixed typo introduced in r1768219
Thanks Suraj Khurana for reporting the issue.
Modified:
ofbiz/trunk/applications/accounting/minilang/agreement/AgreementServices.xml
ofbiz/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml
ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml
ofbiz/trunk/applications/accounting/minilang/ledger/GeneralLedgerServices.xml
ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml
ofbiz/trunk/applications/accounting/minilang/test/InvoicePerShipmentTests.xml
ofbiz/trunk/applications/content/minilang/data/DataServices.xml
ofbiz/trunk/applications/humanres/minilang/HumanResEvents.xml
ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml
ofbiz/trunk/applications/order/minilang/order/OrderServices.xml
ofbiz/trunk/applications/order/minilang/quote/QuoteServices.xml
ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml
ofbiz/trunk/applications/party/minilang/communication/CommunicationEventServices.xml
ofbiz/trunk/applications/party/minilang/party/PartySimpleMethods.xml
ofbiz/trunk/applications/product/minilang/product/category/CategoryServices.xml
ofbiz/trunk/applications/product/minilang/product/inventory/InventoryReserveServices.xml
ofbiz/trunk/applications/product/minilang/product/inventory/InventoryServices.xml
ofbiz/trunk/applications/product/minilang/product/product/ProductContentServices.xml
ofbiz/trunk/applications/product/minilang/product/store/ProductStoreServices.xml
ofbiz/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml
ofbiz/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml
ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
ofbiz/trunk/framework/common/minilang/CommonServices.xml
ofbiz/trunk/framework/common/minilang/PortalPageServices.xml
ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayServices.xml
ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayStoreEvents.xml
ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml
ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectServices.xml
ofbiz/trunk/specialpurpose/scrum/minilang/ScrumEvents.xml
ofbiz/trunk/specialpurpose/scrum/minilang/ScrumServices.xml
ofbiz/trunk/specialpurpose/scrum/minilang/test/SprintTests.xml
Modified: ofbiz/trunk/applications/accounting/minilang/agreement/AgreementServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/agreement/AgreementServices.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/minilang/agreement/AgreementServices.xml (original)
+++ ofbiz/trunk/applications/accounting/minilang/agreement/AgreementServices.xml Tue Nov 8 11:27:13 2016
@@ -39,7 +39,7 @@ under the License.
<simple-method method-name="copyAgreement" short-description="Copy an existing Agreement">
<entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>
<check-errors/>
- <set-service-fields service-name="createAgreement" map="agreement" to-map="createAgreementInMap"/>/>
+ <set-service-fields service-name="createAgreement" map="agreement" to-map="createAgreementInMap"/>
<call-service service-name="createAgreement" in-map-name="createAgreementInMap">
<result-to-field result-name="agreementId" field="agreementIdTo"/>
</call-service>
@@ -47,7 +47,7 @@ under the License.
<get-related value-field="agreement" relation-name="AgreementItem" list="agreementItems"/>
<iterate list="agreementItems" entry="agreementItem">
<clear-field field="createAgreementItemInMap"/>
- <set-service-fields service-name="createAgreementItem" map="agreementItem" to-map="createAgreementItemInMap"/>/>
+ <set-service-fields service-name="createAgreementItem" map="agreementItem" to-map="createAgreementItemInMap"/>
<set from-field="agreementIdTo" field="createAgreementItemInMap.agreementId"/>
<call-service service-name="createAgreementItem" in-map-name="createAgreementItemInMap"/>
</iterate>
@@ -55,7 +55,7 @@ under the License.
<get-related value-field="agreement" relation-name="AgreementTerm" list="agreementTerms"/>
<iterate list="agreementTerms" entry="agreementTerm">
<clear-field field="createAgreementTermInMap"/>
- <set-service-fields service-name="createAgreementTerm" map="agreementTerm" to-map="createAgreementTermInMap"/>/>
+ <set-service-fields service-name="createAgreementTerm" map="agreementTerm" to-map="createAgreementTermInMap"/>
<set from-field="agreementIdTo" field="createAgreementTermInMap.agreementId"/>
<call-service service-name="createAgreementTerm" in-map-name="createAgreementTermInMap"/>
</iterate>
@@ -64,7 +64,7 @@ under the License.
<get-related value-field="agreement" relation-name="AgreementProductAppl" list="agreementProductAppls"/>
<iterate list="agreementProductAppls" entry="agreementProductAppl">
<clear-field field="createAgreementProductApplInMap"/>
- <set-service-fields service-name="createAgreementProductAppl" map="agreementProductAppl" to-map="createAgreementProductApplInMap"/>/>
+ <set-service-fields service-name="createAgreementProductAppl" map="agreementProductAppl" to-map="createAgreementProductApplInMap"/>
<set from-field="agreementIdTo" field="createAgreementProductApplInMap.agreementId"/>
<call-service service-name="createAgreementProductAppl" in-map-name="createAgreementProductApplInMap"/>
</iterate>
@@ -73,7 +73,7 @@ under the License.
<get-related value-field="agreement" relation-name="AgreementFacilityAppl" list="agreementFacilityAppls"/>
<iterate list="agreementFacilityAppls" entry="agreementFacilityAppl">
<clear-field field="createAgreementFacilityApplInMap"/>
- <set-service-fields service-name="createAgreementFacilityAppl" map="agreementFacilityAppl" to-map="createAgreementFacilityApplInMap"/>/>
+ <set-service-fields service-name="createAgreementFacilityAppl" map="agreementFacilityAppl" to-map="createAgreementFacilityApplInMap"/>
<set from-field="agreementIdTo" field="createAgreementFacilityApplInMap.agreementId"/>
<call-service service-name="createAgreementFacilityAppl" in-map-name="createAgreementFacilityApplInMap"/>
</iterate>
@@ -82,7 +82,7 @@ under the License.
<get-related value-field="agreement" relation-name="AgreementPartyApplic" list="agreementPartyApplic"/>
<iterate list="agreementPartyApplics" entry="agreementPartyApplic">
<clear-field field="createAgreementPartyApplicInMap"/>
- <set-service-fields service-name="createAgreementPartyApplic" map="agreementPartyApplic" to-map="createAgreementPartyApplicInMap"/>/>
+ <set-service-fields service-name="createAgreementPartyApplic" map="agreementPartyApplic" to-map="createAgreementPartyApplicInMap"/>
<set from-field="agreementIdTo" field="createAgreementPartyApplicInMap.agreementId"/>
<call-service service-name="createAgreementPartyApplic" in-map-name="createAgreementPartyApplicInMap"/>
</iterate>
Modified: ofbiz/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml (original)
+++ ofbiz/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml Tue Nov 8 11:27:13 2016
@@ -209,7 +209,7 @@ under the License.
</else>
</if-compare>
<if-compare field="maintDue" operator="equals" value="true">
- <set-service-fields service-name="createFixedAssetMaint" map="productMaintValue" to-map="createMaintCxt"/>/>
+ <set-service-fields service-name="createFixedAssetMaint" map="productMaintValue" to-map="createMaintCxt"/>
<set field="createMaintCxt.fixedAssetId" from-field="fixedAssetValue.fixedAssetId"/>
<set field="createMaintCxt.intervalQuantity" from-field="meterValue.meterValue"/>
<set field="createMaintCxt.statusId" value="FAM_CREATED"/>
@@ -282,7 +282,7 @@ under the License.
</else>
</if-compare>
<if-compare field="maintDue" operator="equals" value="true">
- <set-service-fields service-name="createFixedAssetMaint" map="productMaint" to-map="createMaintCxt"/>/>
+ <set-service-fields service-name="createFixedAssetMaint" map="productMaint" to-map="createMaintCxt"/>
<set field="createMaintCxt.fixedAssetId" from-field="fixedAsset.fixedAssetId"/>
<set field="createMaintCxt.statusId" value="FAM_CREATED"/>
<call-service service-name="createFixedAssetMaint" in-map-name="createMaintCxt"/>
Modified: ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml (original)
+++ ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml Tue Nov 8 11:27:13 2016
@@ -150,7 +150,7 @@ under the License.
<!-- call getNextInvoiceId service with the parameters.partyIdFrom when invoice Id is not suplied
else use it from the input -->
<if-empty field="parameters.invoiceId">
- <set-service-fields service-name="getNextInvoiceId" map="parameters" to-map="getNextInvoiceIdMap"/>/>
+ <set-service-fields service-name="getNextInvoiceId" map="parameters" to-map="getNextInvoiceIdMap"/>
<set field="getNextInvoiceIdMap.partyId" from-field="parameters.partyIdFrom"/>
<call-service service-name="getNextInvoiceId" in-map-name="getNextInvoiceIdMap">
<result-to-field result-name="invoiceId" field="parameters.invoiceId"/>
Modified: ofbiz/trunk/applications/accounting/minilang/ledger/GeneralLedgerServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/ledger/GeneralLedgerServices.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/minilang/ledger/GeneralLedgerServices.xml (original)
+++ ofbiz/trunk/applications/accounting/minilang/ledger/GeneralLedgerServices.xml Tue Nov 8 11:27:13 2016
@@ -26,7 +26,7 @@ under the License.
<!-- TODO: Do we need to create a GlJournal record here? -->
<!-- first, create the AcctgTrans -->
- <set-service-fields service-name="createAcctgTrans" map="parameters" to-map="createAcctgTransParams"/>/>
+ <set-service-fields service-name="createAcctgTrans" map="parameters" to-map="createAcctgTransParams"/>
<if-empty field="createAcctgTransParams.transactionDate">
<now-timestamp field="createAcctgTransParams.transactionDate"/>
</if-empty>
@@ -2690,7 +2690,7 @@ under the License.
<call-service service-name="createGlAccountCategoryMember" in-map-name="createGlAccountCategoryMemberMap"/>
<log level="info" message="GlAccountCategoryMember created for [${glAccountCategoryId}] and [${glAccountId}]"/>
<else>
- <set-service-fields service-name="updateGlAccountCategoryMember" map="glAccountCategoryMember" to-map="updateGlAccountCategoryMemberMap"/>/>
+ <set-service-fields service-name="updateGlAccountCategoryMember" map="glAccountCategoryMember" to-map="updateGlAccountCategoryMemberMap"/>
<set field="updateGlAccountCategoryMemberMap.amountPercentage" from-field="amountPercentage" type="BigDecimal"/>
<call-service service-name="updateGlAccountCategoryMember" in-map-name="updateGlAccountCategoryMemberMap"/>
</else>
Modified: ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml (original)
+++ ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml Tue Nov 8 11:27:13 2016
@@ -1006,18 +1006,18 @@ under the License.
<set field="parameters.partyIdTo" from-field="orderRoleTo.partyId"/>
<set field="parameters.paymentMethodTypeId" value="COMPANY_ACCOUNT"/>
<set field="parameters.statusId" value="PMNT_NOT_PAID"/>
- <set-service-fields service-name="createPayment" map="parameters" to-map="createPayment"/>/>
+ <set-service-fields service-name="createPayment" map="parameters" to-map="createPayment"/>
<call-service service-name="createPayment" in-map-name="createPayment">
<result-to-field result-name="paymentId" field="parameters.paymentId"/>
</call-service>
<set field="parameters.orderId" from-field="orderHeader.orderId"/>
<set field="parameters.maxAmount" from-field="orderHeader.grandTotal"/>
- <set-service-fields service-name="createOrderPaymentPreference" map="parameters" to-map="newOrderPaymentPreference"/>/>
+ <set-service-fields service-name="createOrderPaymentPreference" map="parameters" to-map="newOrderPaymentPreference"/>
<call-service service-name="createOrderPaymentPreference" in-map-name="newOrderPaymentPreference">
<result-to-field result-name="orderPaymentPreferenceId" field="parameters.paymentPreferenceId"/>
</call-service>
- <set-service-fields service-name="updatePayment" map="parameters" to-map="updatePayment"/>/>
+ <set-service-fields service-name="updatePayment" map="parameters" to-map="updatePayment"/>
<call-service service-name="updatePayment" in-map-name="updatePayment"/>
<field-to-result field="parameters.paymentId" result-name="paymentId"/>
<log level="info" message="payment ${parameters.paymentId} with the not-paid status automatically created from order: ${parameters.orderId} (can be disabled in accounting.properties)"/>
Modified: ofbiz/trunk/applications/accounting/minilang/test/InvoicePerShipmentTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/test/InvoicePerShipmentTests.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/minilang/test/InvoicePerShipmentTests.xml (original)
+++ ofbiz/trunk/applications/accounting/minilang/test/InvoicePerShipmentTests.xml Tue Nov 8 11:27:13 2016
@@ -133,7 +133,7 @@ under the License.
<result-to-field result-name="responseMessage"/>
</call-service>
<log level="info" message="===== >>> Service: packBulkItems, Response = ${responseMessage}"/>
- <set-service-fields service-name="completePack" map="packInput" to-map="completePackInput"/>/>
+ <set-service-fields service-name="completePack" map="packInput" to-map="completePackInput"/>
<call-service service-name="completePack" in-map-name="completePackInput">
<result-to-field result-name="shipmentId"/>
</call-service>
@@ -259,7 +259,7 @@ under the License.
<result-to-field result-name="responseMessage"/>
</call-service>
<log level="info" message="===== >>> Service: packBulkItems, Response = ${responseMessage}"/>
- <set-service-fields service-name="completePack" map="packInput" to-map="completePackInput"/>/>
+ <set-service-fields service-name="completePack" map="packInput" to-map="completePackInput"/>
<call-service service-name="completePack" in-map-name="completePackInput">
<result-to-field result-name="shipmentId"/>
</call-service>
@@ -384,7 +384,7 @@ under the License.
<result-to-field result-name="responseMessage"/>
</call-service>
<log level="info" message="===== >>> Service: packBulkItems, Response = ${responseMessage}"/>
- <set-service-fields service-name="completePack" map="packInput" to-map="completePackInput"/>/>
+ <set-service-fields service-name="completePack" map="packInput" to-map="completePackInput"/>
<call-service service-name="completePack" in-map-name="completePackInput">
<result-to-field result-name="shipmentId"/>
</call-service>
@@ -509,7 +509,7 @@ under the License.
<result-to-field result-name="responseMessage"/>
</call-service>
<log level="info" message="===== >>> Service: packBulkItems, Response = ${responseMessage}"/>
- <set-service-fields service-name="completePack" map="packInput" to-map="completePackInput"/>/>
+ <set-service-fields service-name="completePack" map="packInput" to-map="completePackInput"/>
<call-service service-name="completePack" in-map-name="completePackInput">
<result-to-field result-name="shipmentId"/>
</call-service>
Modified: ofbiz/trunk/applications/content/minilang/data/DataServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/minilang/data/DataServices.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/minilang/data/DataServices.xml (original)
+++ ofbiz/trunk/applications/content/minilang/data/DataServices.xml Tue Nov 8 11:27:13 2016
@@ -72,7 +72,7 @@ under the License.
<check-errors/>
</if-empty>
- <set-service-fields service-name="createDataResource" map="parameters" to-map="dataResourceCtx"/>/>
+ <set-service-fields service-name="createDataResource" map="parameters" to-map="dataResourceCtx"/>
<call-service service-name="createDataResource" in-map-name="dataResourceCtx">
<result-to-field result-name="dataResource"/>
</call-service>
Modified: ofbiz/trunk/applications/humanres/minilang/HumanResEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/minilang/HumanResEvents.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/minilang/HumanResEvents.xml (original)
+++ ofbiz/trunk/applications/humanres/minilang/HumanResEvents.xml Tue Nov 8 11:27:13 2016
@@ -35,11 +35,11 @@
</entity-and>
<if-not-empty field="emplPositionFulfillment">
<set field="parameters.fromDate" from-field="emplPositionFulfillment[0].fromDate"/>
- <set-service-fields service-name="deleteEmplPositionFulfillment" map="parameters" to-map="delFullfillCtx"/>/>
+ <set-service-fields service-name="deleteEmplPositionFulfillment" map="parameters" to-map="delFullfillCtx"/>
<call-service service-name="deleteEmplPositionFulfillment" in-map-name="delFullfillCtx"></call-service>
</if-not-empty>
- <set-service-fields service-name="deleteEmplPosition" map="parameters" to-map="delEmlpCtx"/>/>
+ <set-service-fields service-name="deleteEmplPosition" map="parameters" to-map="delEmlpCtx"/>
<call-service service-name="deleteEmplPosition" in-map-name="delEmlpCtx"></call-service>
</simple-method>
<simple-method method-name="removeInternalOrg" short-description="">
Modified: ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml (original)
+++ ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml Tue Nov 8 11:27:13 2016
@@ -245,7 +245,7 @@ under the License.
</entity-and>
<first-from-list list="partyContactWithPurposes" entry="partyContactWithPurpose"/>
<set field="email" from-field="partyContactWithPurpose.infoString"/>
- <set-service-fields service-name="unsubscribeContactListParty" map="parameters" to-map="unsubscribeContactListPartyCtx"/>/>
+ <set-service-fields service-name="unsubscribeContactListParty" map="parameters" to-map="unsubscribeContactListPartyCtx"/>
<set field="unsubscribeContactListPartyCtx.email" from-field="email"/>
<call-service service-name="unsubscribeContactListParty" in-map-name="unsubscribeContactListPartyCtx"/>
</simple-method>
Modified: ofbiz/trunk/applications/order/minilang/order/OrderServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/order/OrderServices.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/minilang/order/OrderServices.xml (original)
+++ ofbiz/trunk/applications/order/minilang/order/OrderServices.xml Tue Nov 8 11:27:13 2016
@@ -563,7 +563,7 @@ under the License.
</condition>
<then>
<clear-field field="cancelOrderItemInMap"/>
- <set-service-fields service-name="cancelOrderItemNoActions" map="parameters" to-map="cancelOrderItemInMap"/>/>
+ <set-service-fields service-name="cancelOrderItemNoActions" map="parameters" to-map="cancelOrderItemInMap"/>
<set from-field="orderItem.orderItemSeqId" field="cancelOrderItemInMap.orderItemSeqId"/>
<call-service service-name="cancelOrderItemNoActions" in-map-name="cancelOrderItemInMap"/>
</then>
@@ -594,7 +594,7 @@ under the License.
</iterate>
<!-- Recalculate the promotions for the order -->
- <set-service-fields service-name="loadCartFromOrder" map="parameters" to-map="loadCartFromOrderInMap"/>/>
+ <set-service-fields service-name="loadCartFromOrder" map="parameters" to-map="loadCartFromOrderInMap"/>
<set value="true" field="loadCartFromOrderInMap.skipInventoryChecks" type="Boolean"/>
<set value="true" field="loadCartFromOrderInMap.skipProductChecks" type="Boolean"/>
<call-service service-name="loadCartFromOrder" in-map-name="loadCartFromOrderInMap">
@@ -1292,26 +1292,26 @@ under the License.
</else>
</if-compare-field>
<if-compare-field field="diffPercentage" operator="greater" to-field="percentAllowed" type="BigDecimal">
- <set-service-fields service-name="updateOrderItemShipGroup" map="parameters" to-map="updateOrderItemShipGroupContext"/>/>
+ <set-service-fields service-name="updateOrderItemShipGroup" map="parameters" to-map="updateOrderItemShipGroupContext"/>
<call-service service-name="updateOrderItemShipGroup" in-map-name="updateOrderItemShipGroupContext"/>
- <set-service-fields service-name="updateOrderAdjustment" map="parameters" to-map="updateOrderAdjustmentContext"/>/>
+ <set-service-fields service-name="updateOrderAdjustment" map="parameters" to-map="updateOrderAdjustmentContext"/>
<call-service service-name="updateOrderAdjustment" in-map-name="updateOrderAdjustmentContext"/>
- <set-service-fields service-name="updateShipmentRouteSegment" map="parameters" to-map="updateShipmentRouteSegmentContext"/>/>
+ <set-service-fields service-name="updateShipmentRouteSegment" map="parameters" to-map="updateShipmentRouteSegmentContext"/>
<clear-field field="updateShipmentRouteSegmentContext.trackingIdNumber"/>
<clear-field field="updateShipmentRouteSegmentContext.trackingDigest"/>
<clear-field field="updateShipmentRouteSegmentContext.carrierServiceStatusId"/>
<call-service service-name="updateShipmentRouteSegment" in-map-name="updateShipmentRouteSegmentContext"/>
- <set-service-fields service-name="upsShipmentConfirm" map="parameters" to-map="upsShipmentConfirmContext"/>/>
+ <set-service-fields service-name="upsShipmentConfirm" map="parameters" to-map="upsShipmentConfirmContext"/>
<call-service service-name="upsShipmentConfirm" in-map-name="upsShipmentConfirmContext"/>
<else>
- <set-service-fields service-name="updateOrderItemShipGroup" map="parameters" to-map="updateOrderItemShipGroupContext"/>/>
+ <set-service-fields service-name="updateOrderItemShipGroup" map="parameters" to-map="updateOrderItemShipGroupContext"/>
<call-service service-name="updateOrderItemShipGroup" in-map-name="updateOrderItemShipGroupContext"/>
- <set-service-fields service-name="updateShipmentRouteSegment" map="parameters" to-map="updateShipmentRouteSegmentContext"/>/>
+ <set-service-fields service-name="updateShipmentRouteSegment" map="parameters" to-map="updateShipmentRouteSegmentContext"/>
<clear-field field="updateShipmentRouteSegmentContext.trackingIdNumber"/>
<clear-field field="updateShipmentRouteSegmentContext.trackingDigest"/>
<clear-field field="updateShipmentRouteSegmentContext.carrierServiceStatusId"/>
<call-service service-name="updateShipmentRouteSegment" in-map-name="updateShipmentRouteSegmentContext"/>
- <set-service-fields service-name="upsShipmentConfirm" map="parameters" to-map="upsShipmentConfirmContext"/>/>
+ <set-service-fields service-name="upsShipmentConfirm" map="parameters" to-map="upsShipmentConfirmContext"/>
<call-service service-name="upsShipmentConfirm" in-map-name="upsShipmentConfirmContext"/>
</else>
</if-compare-field>
Modified: ofbiz/trunk/applications/order/minilang/quote/QuoteServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/quote/QuoteServices.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/minilang/quote/QuoteServices.xml (original)
+++ ofbiz/trunk/applications/order/minilang/quote/QuoteServices.xml Tue Nov 8 11:27:13 2016
@@ -121,7 +121,7 @@ under the License.
<!-- 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-field="productStore"/>
<if-not-empty field="productStore.payToPartyId">
- <set-service-fields service-name="getNextQuoteId" map="parameters" to-map="getNextQuoteIdContext"/>/>
+ <set-service-fields service-name="getNextQuoteId" map="parameters" to-map="getNextQuoteIdContext"/>
<set field="getNextQuoteIdContext.partyId" from-field="productStore.payToPartyId"/>
<call-service service-name="getNextQuoteId" in-map-name="getNextQuoteIdContext">
<result-to-field result-name="quoteId" field="newEntity.quoteId"/>
@@ -197,7 +197,7 @@ under the License.
<check-errors/>
<entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/>
<check-errors/>
- <set-service-fields service-name="createQuote" map="quote" to-map="createQuoteInMap"/>/>
+ <set-service-fields service-name="createQuote" map="quote" to-map="createQuoteInMap"/>
<clear-field field="createQuoteInMap.statusId"/>
<call-service service-name="createQuote" in-map-name="createQuoteInMap">
<result-to-field result-name="quoteId" field="quoteIdTo"/>
@@ -207,7 +207,7 @@ under the License.
<get-related value-field="quote" relation-name="QuoteItem" list="quoteItems"/>
<iterate list="quoteItems" entry="quoteItem">
<clear-field field="createQuoteItemInMap"/>
- <set-service-fields service-name="createQuoteItem" map="quoteItem" to-map="createQuoteItemInMap"/>/>
+ <set-service-fields service-name="createQuoteItem" map="quoteItem" to-map="createQuoteItemInMap"/>
<set from-field="quoteIdTo" field="createQuoteItemInMap.quoteIdTo"/>
<set from-field="parameters.copyQuoteAdjustments" field="createQuoteItemInMap.copyQuoteAdjustments"/>
<call-service service-name="copyQuoteItem" in-map-name="createQuoteItemInMap"/>
@@ -219,7 +219,7 @@ under the License.
<iterate list="quoteAdjustments" entry="quoteAdjustment">
<if-empty field="quoteAdjustment.quoteItemSeqId">
<clear-field field="createQuoteAdjustmentInMap"/>
- <set-service-fields service-name="createQuoteAdjustment" map="quoteAdjustment" to-map="createQuoteAdjustmentInMap"/>/>
+ <set-service-fields service-name="createQuoteAdjustment" map="quoteAdjustment" to-map="createQuoteAdjustmentInMap"/>
<set from-field="quoteIdTo" field="createQuoteAdjustmentInMap.quoteId"/>
<call-service service-name="createQuoteAdjustment" in-map-name="createQuoteAdjustmentInMap"/>
</if-empty>
@@ -231,7 +231,7 @@ under the License.
<iterate list="quoteRoles" entry="quoteRole">
<if-compare field="quoteRole.roleTypeId" value="REQ_TAKER" operator="not-equals">
<clear-field field="createQuoteRoleInMap"/>
- <set-service-fields service-name="createQuoteRole" map="quoteRole" to-map="createQuoteRoleInMap"/>/>
+ <set-service-fields service-name="createQuoteRole" map="quoteRole" to-map="createQuoteRoleInMap"/>
<set from-field="quoteIdTo" field="createQuoteRoleInMap.quoteId"/>
<call-service service-name="createQuoteRole" in-map-name="createQuoteRoleInMap"/>
</if-compare>
@@ -242,7 +242,7 @@ under the License.
<get-related value-field="quote" relation-name="QuoteAttribute" list="quoteAttributes"/>
<iterate list="quoteAttributes" entry="quoteAttribute">
<clear-field field="createQuoteAttributeInMap"/>
- <set-service-fields service-name="createQuoteAttribute" map="quoteAttribute" to-map="createQuoteAttributeInMap"/>/>
+ <set-service-fields service-name="createQuoteAttribute" map="quoteAttribute" to-map="createQuoteAttributeInMap"/>
<set from-field="quoteIdTo" field="createQuoteAttributeInMap.quoteId"/>
<call-service service-name="createQuoteAttribute" in-map-name="createQuoteAttributeInMap"/>
</iterate>
@@ -252,7 +252,7 @@ under the License.
<get-related value-field="quote" relation-name="QuoteCoefficient" list="quoteCoefficients"/>
<iterate list="quoteCoefficients" entry="quoteCoefficient">
<clear-field field="createQuoteCoefficientInMap"/>
- <set-service-fields service-name="createQuoteCoefficient" map="quoteCoefficient" to-map="createQuoteCoefficientInMap"/>/>
+ <set-service-fields service-name="createQuoteCoefficient" map="quoteCoefficient" to-map="createQuoteCoefficientInMap"/>
<set from-field="quoteIdTo" field="createQuoteCoefficientInMap.quoteId"/>
<call-service service-name="createQuoteCoefficient" in-map-name="createQuoteCoefficientInMap"/>
</iterate>
@@ -261,7 +261,7 @@ under the License.
<get-related value-field="quote" relation-name="QuoteTerm" list="quoteTerms"/>
<iterate list="quoteTerms" entry="quoteTerm">
<clear-field field="createQuoteTermInMap"/>
- <set-service-fields service-name="createQuoteTerm" map="quoteTerm" to-map="createQuoteTermInMap"/>/>
+ <set-service-fields service-name="createQuoteTerm" map="quoteTerm" to-map="createQuoteTermInMap"/>
<set from-field="quoteIdTo" field="createQuoteTermInMap.quoteId"/>
<call-service service-name="createQuoteTerm" in-map-name="createQuoteTermInMap"/>
</iterate>
@@ -450,7 +450,7 @@ under the License.
<entity-one entity-name="QuoteItem" value-field="quoteItem" auto-field-map="true"/>
<check-errors/>
- <set-service-fields service-name="createQuoteItem" map="quoteItem" to-map="createQuoteItemInMap"/>/>
+ <set-service-fields service-name="createQuoteItem" map="quoteItem" to-map="createQuoteItemInMap"/>
<set from-field="parameters.quoteIdTo" field="createQuoteItemInMap.quoteId"/>
<set from-field="parameters.quoteItemSeqId" field="createQuoteItemInMap.quoteItemSeqId"/>
<if-empty field="parameters.quoteIdTo">
@@ -470,7 +470,7 @@ under the License.
<get-related value-field="quoteItem" relation-name="QuoteAdjustment" list="quoteAdjustments"/>
<iterate list="quoteAdjustments" entry="quoteAdjustment">
<clear-field field="createQuoteAdjustmentInMap"/>
- <set-service-fields service-name="createQuoteAdjustment" map="quoteAdjustment" to-map="createQuoteAdjustmentInMap"/>/>
+ <set-service-fields service-name="createQuoteAdjustment" map="quoteAdjustment" to-map="createQuoteAdjustmentInMap"/>
<set from-field="quoteIdTo" field="createQuoteAdjustmentInMap.quoteId"/>
<set from-field="quoteItemSeqId" field="createQuoteAdjustmentInMap.quoteItemSeqId"/>
<call-service service-name="createQuoteAdjustment" in-map-name="createQuoteAdjustmentInMap"/>
@@ -651,7 +651,7 @@ under the License.
<iterate list="quoteItems" entry="quoteItem">
<if-compare field="quoteItem.isPromo" value="Y" operator="equals">
<clear-field field="removeQuoteItemInMap"/>
- <set-service-fields service-name="removeQuoteItem" map="parameters" to-map="removeQuoteItemInMap"/>/>
+ <set-service-fields service-name="removeQuoteItem" map="parameters" to-map="removeQuoteItemInMap"/>
<set from-field="quoteItem.quoteItemSeqId" field="removeQuoteItemInMap.quoteItemSeqId"/>
<call-service service-name="removeQuoteItem" in-map-name="removeQuoteItemInMap"/>
</if-compare>
@@ -662,12 +662,12 @@ under the License.
<!-- make sure this is not a manual adjustments -->
<if-not-empty field="quoteAdjustment.productPromoId">
<clear-field field="removeQuoteAdjustmentInMap"/>
- <set-service-fields service-name="removeQuoteAdjustment" map="parameters" to-map="removeQuoteAdjustmentInMap"/>/>
+ <set-service-fields service-name="removeQuoteAdjustment" map="parameters" to-map="removeQuoteAdjustmentInMap"/>
<set from-field="quoteAdjustment.quoteAdjustmentId" field="removeQuoteAdjustmentInMap.quoteAdjustmentId"/>
<call-service service-name="removeQuoteAdjustment" in-map-name="removeQuoteAdjustmentInMap"/>
</if-not-empty>
</iterate>
- <set-service-fields service-name="loadCartFromQuote" map="parameters" to-map="loadCartFromQuoteInMap"/>/>
+ <set-service-fields service-name="loadCartFromQuote" map="parameters" to-map="loadCartFromQuoteInMap"/>
<set value="false" field="loadCartFromQuoteInMap.applyQuoteAdjustments"/>
<call-service service-name="loadCartFromQuote" in-map-name="loadCartFromQuoteInMap">
<result-to-field result-name="shoppingCart" field="cart"/>
@@ -680,7 +680,7 @@ under the License.
<!-- this is a new (promo) item -->
<!-- a new quote item is created -->
<clear-field field="createQuoteItemInMap"/>
- <set-service-fields service-name="createQuoteItem" map="parameters" to-map="createQuoteItemInMap"/>/>
+ <set-service-fields service-name="createQuoteItem" map="parameters" to-map="createQuoteItemInMap"/>
<call-object-method obj-field="item" method-name="getProductId" ret-field="createQuoteItemInMap.productId"/>
<call-object-method obj-field="item" method-name="getQuantity" ret-field="createQuoteItemInMap.quantity"/>
<set value="Y" field="createQuoteItemInMap.isPromo"/>
Modified: ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml (original)
+++ ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml Tue Nov 8 11:27:13 2016
@@ -420,7 +420,7 @@ under the License.
<entity-one entity-name="CustRequestItem" value-field="custRequestItem" auto-field-map="true"/>
<check-errors/>
- <set-service-fields service-name="createCustRequestItem" map="custRequestItem" to-map="createCustRequestItemInMap"/>/>
+ <set-service-fields service-name="createCustRequestItem" map="custRequestItem" to-map="createCustRequestItemInMap"/>
<set field="createCustRequestItemInMap.custRequestId" from-field="parameters.custRequestIdTo"/>
<set field="createCustRequestItemInMap.custRequestItemSeqId" from-field="parameters.custRequestItemSeqId"/>
<if-empty field="parameters.custRequestIdTo">
@@ -440,7 +440,7 @@ under the License.
<get-related value-field="custRequestItem" relation-name="QuoteItem" list="quoteItems"/>
<iterate list="quoteItems" entry="quoteItem">
<clear-field field="createQuoteItemInMap"/>
- <set-service-fields service-name="createQuoteItem" map="quoteItem" to-map="createQuoteItemInMap"/>/>
+ <set-service-fields service-name="createQuoteItem" map="quoteItem" to-map="createQuoteItemInMap"/>
<set field="createQuoteItemInMap.custRequestId" from-field="custRequestIdTo"/>
<set field="createQuoteItemInMap.custRequestItemSeqId" from-field="custRequestItemSeqId"/>
<clear-field field="createQuoteItemInMap.quoteItemSeqId"/>
Modified: ofbiz/trunk/applications/party/minilang/communication/CommunicationEventServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/minilang/communication/CommunicationEventServices.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/minilang/communication/CommunicationEventServices.xml (original)
+++ ofbiz/trunk/applications/party/minilang/communication/CommunicationEventServices.xml Tue Nov 8 11:27:13 2016
@@ -558,7 +558,7 @@ under the License.
</entity-one>
<if-not-empty field="communicationEventRole">
<if-compare operator="not-equals" value="COM_ROLE_COMPLETED" field="comunnicationEventRole.statusId">
- <set-service-fields service-name="updateCommunicationEventRole" map="communicationEventRole" to-map="updateRole"/>/>
+ <set-service-fields service-name="updateCommunicationEventRole" map="communicationEventRole" to-map="updateRole"/>
<set field="updateRole.statusId" value="COM_ROLE_COMPLETED"/>
<call-service service-name="updateCommunicationEventRole" in-map-name="updateRole"/>
Modified: ofbiz/trunk/applications/party/minilang/party/PartySimpleMethods.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/minilang/party/PartySimpleMethods.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/minilang/party/PartySimpleMethods.xml (original)
+++ ofbiz/trunk/applications/party/minilang/party/PartySimpleMethods.xml Tue Nov 8 11:27:13 2016
@@ -236,7 +236,7 @@ under the License.
<simple-method method-name="deleteBillingAccount" short-description="delete billing account">
<now-timestamp field="nowTimestamp"/>
<set field="parameters.thruDate" from-field="nowTimestamp"/>
- <set-service-fields service-name="updateBillingAccount" map="parameters" to-map="deleteBillingAccountCtx"/>/>
+ <set-service-fields service-name="updateBillingAccount" map="parameters" to-map="deleteBillingAccountCtx"/>
<call-service service-name="updateBillingAccount" in-map-name="deleteBillingAccountCtx"/>
</simple-method>
</simple-methods>
Modified: ofbiz/trunk/applications/product/minilang/product/category/CategoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/category/CategoryServices.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/category/CategoryServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/category/CategoryServices.xml Tue Nov 8 11:27:13 2016
@@ -107,7 +107,7 @@ under the License.
<!-- ================================================================ -->
<simple-method method-name="addProductToCategories" short-description="Add Product to Multiple Categories">
- <set-service-fields service-name="addProductToCategory" map="parameters" to-map="addProductToCategoryMap"/>/>
+ <set-service-fields service-name="addProductToCategory" map="parameters" to-map="addProductToCategoryMap"/>
<if-instance-of field="parameters.categories" class="java.util.List">
<iterate list="parameters.categories" entry="category">
<set field="addProductToCategoryMap.productCategoryId" from-field="category"/>
Modified: ofbiz/trunk/applications/product/minilang/product/inventory/InventoryReserveServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/inventory/InventoryReserveServices.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/inventory/InventoryReserveServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/inventory/InventoryReserveServices.xml Tue Nov 8 11:27:13 2016
@@ -315,7 +315,7 @@ under the License.
<set field="createDetailMap.availableToPromiseDiff" value="-1" type="BigDecimal"/>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
</if-compare>
- <set-service-fields service-name="cancelOrderItemShipGrpInvRes" map="parameters" to-map="cancelOrderItemShipGrpInvResMap"/>/>
+ <set-service-fields service-name="cancelOrderItemShipGrpInvRes" map="parameters" to-map="cancelOrderItemShipGrpInvResMap"/>
<set field="cancelOrderItemShipGrpInvResMap.cancelQuantity" from-field="parameters.quantity"/>
<!-- Step 1 cancel our reservation, we'll later reserve Inventory we want-->
<call-service service-name="cancelOrderItemShipGrpInvRes" in-map-name="cancelOrderItemShipGrpInvResMap"/>
@@ -345,7 +345,7 @@ under the License.
<find-by-and map="inventoryReservationLookUp" list="invReservations" entity-name="OrderItemShipGrpInvRes"/>
<first-from-list list="invReservations" entry="inventoryItemReservation"/>
<if-not-empty field="inventoryItemReservation">
- <set-service-fields service-name="cancelOrderItemShipGrpInvRes" map="inventoryItemReservation" to-map="cancelOrderItemShipGrpInvResMap"/>/>
+ <set-service-fields service-name="cancelOrderItemShipGrpInvRes" map="inventoryItemReservation" to-map="cancelOrderItemShipGrpInvResMap"/>
<call-service service-name="cancelOrderItemShipGrpInvRes" in-map-name="cancelOrderItemShipGrpInvResMap"/>
<!-- Hold our inventoryItem -->
<refresh-value value-field="inventoryItem"/>
Modified: ofbiz/trunk/applications/product/minilang/product/inventory/InventoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/inventory/InventoryServices.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/inventory/InventoryServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/inventory/InventoryServices.xml Tue Nov 8 11:27:13 2016
@@ -1140,7 +1140,7 @@ under the License.
</simple-method>
<simple-method method-name="createUpdateFacilityGeoPoint" short-description="Create or update GeoPoint assigned to facility">
<if-empty field="parameters.geoPointId">
- <set-service-fields service-name="createGeoPoint" map="parameters" to-map="createGeoPointMap"/>/>
+ <set-service-fields service-name="createGeoPoint" map="parameters" to-map="createGeoPointMap"/>
<call-service service-name="createGeoPoint" in-map-name="createGeoPointMap">
<result-to-field result-name="geoPointId" field="geoPointId"/>
</call-service>
@@ -1148,7 +1148,7 @@ under the License.
<set field="facility.geoPointId" from-field="geoPointId"/>
<store-value value-field="facility"/>
<else>
- <set-service-fields service-name="updateGeoPoint" map="parameters" to-map="updateGeoPointMap"/>/>
+ <set-service-fields service-name="updateGeoPoint" map="parameters" to-map="updateGeoPointMap"/>
<call-service service-name="updateGeoPoint" in-map-name="updateGeoPointMap"/>
</else>
</if-empty>
Modified: ofbiz/trunk/applications/product/minilang/product/product/ProductContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/product/ProductContentServices.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/product/ProductContentServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/product/ProductContentServices.xml Tue Nov 8 11:27:13 2016
@@ -159,7 +159,7 @@ under the License.
<!-- ProductPromoContent -->
<simple-method method-name="removeProductPromoContent" short-description="Remove Content From Product Promo">
- <set-service-fields service-name="updateProductPromoContent" map="parameters" to-map="updateProductPromoContentMap"/>/>
+ <set-service-fields service-name="updateProductPromoContent" map="parameters" to-map="updateProductPromoContentMap"/>
<if-empty field="updateProductPromoContentMap.thruDate">
<now-timestamp field="updateProductPromoContentMap.thruDate"/>
</if-empty>
Modified: ofbiz/trunk/applications/product/minilang/product/store/ProductStoreServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/store/ProductStoreServices.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/store/ProductStoreServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/store/ProductStoreServices.xml Tue Nov 8 11:27:13 2016
@@ -159,7 +159,7 @@ under the License.
</add-error>
<check-errors/>
</if-empty>
- <set-service-fields service-name="reserveProductInventoryByFacility" map="parameters" to-map="callServiceMap"/>/>
+ <set-service-fields service-name="reserveProductInventoryByFacility" map="parameters" to-map="callServiceMap"/>
<set from-field="productStore.inventoryFacilityId" field="callServiceMap.facilityId"/>
<set from-field="requireInventory" field="callServiceMap.requireInventory"/>
<set from-field="productStore.reserveOrderEnumId" field="callServiceMap.reserveOrderEnumId"/>
@@ -203,7 +203,7 @@ under the License.
<first-from-list list="productStoreFacilities" entry="storeFound"/>
</if-empty>
<set from-field="storeFound.facilityId" field="facilityId" default-value=""/>
- <set-service-fields service-name="reserveProductInventoryByFacility" map="parameters" to-map="callServiceMap"/>/>
+ <set-service-fields service-name="reserveProductInventoryByFacility" map="parameters" to-map="callServiceMap"/>
<set from-field="facilityId" field="callServiceMap.facilityId"/>
<set from-field="requireInventory" field="callServiceMap.requireInventory"/>
<set from-field="productStore.reserveOrderEnumId" field="callServiceMap.reserveOrderEnumId"/>
@@ -230,7 +230,7 @@ under the License.
</add-error>
<check-errors/>
</if-empty>
- <set-service-fields service-name="reserveProductInventoryByFacility" map="parameters" to-map="callServiceMap"/>/>
+ <set-service-fields service-name="reserveProductInventoryByFacility" map="parameters" to-map="callServiceMap"/>
<set from-field="facilityId" field="callServiceMap.facilityId"/>
<set from-field="requireInventory" field="callServiceMap.requireInventory"/>
<set from-field="productStore.reserveOrderEnumId" field="callServiceMap.reserveOrderEnumId"/>
@@ -420,7 +420,7 @@ under the License.
<set value="Y" field="availableOrNotRequired"/>
<field-to-result field="availableOrNotRequired"/>
<else>
- <set-service-fields service-name="isStoreInventoryAvailable" map="parameters" to-map="callServiceMap"/>/>
+ <set-service-fields service-name="isStoreInventoryAvailable" map="parameters" to-map="callServiceMap"/>
<call-service service-name="isStoreInventoryAvailable" in-map-name="callServiceMap">
<result-to-result result-name="available" service-result-name="availableOrNotRequired"/>
</call-service>
@@ -517,7 +517,7 @@ under the License.
<entity-one entity-name="ProductStoreGroupRollup" value-field="productStoreGroupRollup"/>
<if-not-empty field="productStoreGroupRollup">
<set field="productStoreGroup.primaryParentGroupId"/>
- <set-service-fields service-name="updateProductStoreGroup" map="productStoreGroup" to-map="productStoreGroupMap"/>/>
+ <set-service-fields service-name="updateProductStoreGroup" map="productStoreGroup" to-map="productStoreGroupMap"/>
<call-service service-name="updateProductStoreGroup" in-map-name="productStoreGroupMap"/>
</if-not-empty>
<else>
Modified: ofbiz/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml Tue Nov 8 11:27:13 2016
@@ -969,7 +969,7 @@ under the License.
<remove-value value-field="picklistItem"/>
<!-- ... and its OrderItemShipGrpInvRes -->
- <set-service-fields service-name="cancelOrderItemShipGrpInvRes" map="parameters" to-map="cancelOrderItemShipGrpInvResMap"/>/>
+ <set-service-fields service-name="cancelOrderItemShipGrpInvRes" map="parameters" to-map="cancelOrderItemShipGrpInvResMap"/>
<call-service service-name="cancelOrderItemShipGrpInvRes" in-map-name="cancelOrderItemShipGrpInvResMap"/>
<clear-field field="inputMap"/>
Modified: ofbiz/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml Tue Nov 8 11:27:13 2016
@@ -1644,7 +1644,7 @@ under the License.
<get-related-one to-value-field="inventoryItem" relation-name="InventoryItem" value-field="orderItemShipGrpInvRes"/>
<if-compare-field field="inventoryItem.serialNumber" operator="not-equals" to-field="parameters.serialNumber">
<!-- The inventory that we have reserved is not what we shipped. Lets reReserve, this time we'll get what we want -->
- <set-service-fields service-name="reserveAnInventoryItem" map="parameters" to-map="reserveAnInventoryItemCtx"/>/>
+ <set-service-fields service-name="reserveAnInventoryItem" map="parameters" to-map="reserveAnInventoryItemCtx"/>
<call-service service-name="reserveAnInventoryItem" in-map-name="reserveAnInventoryItemCtx">
<result-to-field result-name="inventoryItemId" field="parameters.inventoryItemId"/>
</call-service>
Modified: ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml Tue Nov 8 11:27:13 2016
@@ -995,7 +995,7 @@ under the License.
</if-empty>
<!-- Create the new WorkEffort from the old one and the status -->
- <set-service-fields service-name="createWorkEffort" map="oldWorkEffort" to-map="createWorkEffortCtx"/>/>
+ <set-service-fields service-name="createWorkEffort" map="oldWorkEffort" to-map="createWorkEffortCtx"/>
<set field="createWorkEffortCtx.workEffortId" from-field="workEffortId"/>
<set field="createWorkEffortCtx.userLogin" from-field="parameters.userLogin"/>
<call-service service-name="createWorkEffort" in-map-name="createWorkEffortCtx"/>
Modified: ofbiz/trunk/framework/common/minilang/CommonServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/minilang/CommonServices.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/minilang/CommonServices.xml (original)
+++ ofbiz/trunk/framework/common/minilang/CommonServices.xml Tue Nov 8 11:27:13 2016
@@ -130,7 +130,7 @@ under the License.
<!-- Do custom conversion, if we have customMethodId -->
<if-not-empty field="uomConversion.customMethodId"> <!-- custom conversion? -->
<log level="verbose" message="using custom conversion customMethodId=${uomConversion.customMethodId}"/>
- <set-service-fields service-name="convertUomCustom" map="parameters" to-map="customParms"/>/>
+ <set-service-fields service-name="convertUomCustom" map="parameters" to-map="customParms"/>
<set field="customParms.uomConversion" from-field="uomConversion"/>
<call-service service-name="convertUomCustom" in-map-name="customParms">
<result-to-field result-name="convertedValue"/>
Modified: ofbiz/trunk/framework/common/minilang/PortalPageServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/minilang/PortalPageServices.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/minilang/PortalPageServices.xml (original)
+++ ofbiz/trunk/framework/common/minilang/PortalPageServices.xml Tue Nov 8 11:27:13 2016
@@ -57,7 +57,7 @@ under the License.
<field-map field-name="columnSeqId" from-field="column.columnSeqId"/>
</entity-and>
<iterate list="portalPortletList" entry="portalPortlet">
- <set-service-fields service-name="deletePortalPagePortlet" map="portalPortlet" to-map="deletePortalPagePortletInMap"/>/>
+ <set-service-fields service-name="deletePortalPagePortlet" map="portalPortlet" to-map="deletePortalPagePortletInMap"/>
<call-service service-name="deletePortalPagePortlet" in-map-name="deletePortalPagePortletInMap"/>
</iterate>
<remove-value value-field="column"/>
Modified: ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayServices.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayServices.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayServices.xml Tue Nov 8 11:27:13 2016
@@ -22,26 +22,26 @@
xmlns="http://ofbiz.apache.org/Simple-Method" xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="createEbayAccount" short-description="Create Ebay Account">
- <set-service-fields service-name="createPersonAndUserLogin" map="parameters" to-map="newPerson"/>/>
+ <set-service-fields service-name="createPersonAndUserLogin" map="parameters" to-map="newPerson"/>
<call-service service-name="createPersonAndUserLogin" in-map-name="newPerson">
<result-to-field result-name="partyId" field="parameters.partyId"/>
</call-service>
<set field="parameters.roleTypeId" value="VENDOR" />
- <set-service-fields service-name="createPartyRole" map="parameters" to-map="newPartyRole"/>/>
+ <set-service-fields service-name="createPartyRole" map="parameters" to-map="newPartyRole"/>
<call-service service-name="createPartyRole" in-map-name="newPartyRole"/>
<set field="parameters.storeName" value="${parameters.userLoginId}_store"/>
- <set-service-fields service-name="createProductStore" map="parameters" to-map="newProductStore"/>/>
+ <set-service-fields service-name="createProductStore" map="parameters" to-map="newProductStore"/>
<call-service service-name="createProductStore" in-map-name="newProductStore">
<result-to-field result-name="productStoreId" field="parameters.productStoreId"/>
</call-service>
<set field="parameters.roleTypeId" value="EBAY_ACCOUNT"/>
- <set-service-fields service-name="createPartyRole" map="parameters" to-map="newPartyRole"/>/>
+ <set-service-fields service-name="createPartyRole" map="parameters" to-map="newPartyRole"/>
<call-service service-name="createPartyRole" in-map-name="newPartyRole"/>
- <set-service-fields service-name="createProductStoreRole" map="parameters" to-map="newProductStoreRole"/>/>
+ <set-service-fields service-name="createProductStoreRole" map="parameters" to-map="newProductStoreRole"/>
<call-service service-name="createProductStoreRole" in-map-name="newProductStoreRole"/>
<field-to-result field="parameters.productStoreId" result-name="productStoreId"/>
@@ -105,7 +105,7 @@
<check-errors/>
</if-empty>
- <set-service-fields service-name="reserveEbayProductInventoryByStoreFacility" map="parameters" to-map="callServiceMap"/>/>
+ <set-service-fields service-name="reserveEbayProductInventoryByStoreFacility" map="parameters" to-map="callServiceMap"/>
<set from-field="facilityId" field="callServiceMap.facilityId"/>
<set from-field="requireInventory" field="callServiceMap.requireInventory"/>
<set from-field="productStore.reserveOrderEnumId" field="callServiceMap.reserveOrderEnumId"/>
Modified: ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayStoreEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayStoreEvents.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayStoreEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayStoreEvents.xml Tue Nov 8 11:27:13 2016
@@ -251,7 +251,7 @@
<simple-method method-name="createEmailTemplate" short-description="Create Email Template">
<!-- create content -->
<set field="parameters.dataTemplateTypeId" value="FTL"/>
- <set-service-fields service-name="createElectronicText" map="parameters" to-map="newElectronicText"/>/>
+ <set-service-fields service-name="createElectronicText" map="parameters" to-map="newElectronicText"/>
<call-service service-name="createElectronicText" in-map-name="newElectronicText">
<result-to-field result-name="dataResourceId" field="parameters.dataResourceId"/>
</call-service>
@@ -259,7 +259,7 @@
<set field="parameters.roleTypeId" value="OWNER"/>
<set field="parameters.contentTypeId" value="DOCUMENT"/>
<set field="parameters.ownerContentId" from-field="parameters.emailType"/>
- <set-service-fields service-name="createContent" map="parameters" to-map="newContent"/>/>
+ <set-service-fields service-name="createContent" map="parameters" to-map="newContent"/>
<call-service service-name="createContent" in-map-name="newContent" >
<result-to-field result-name="contentId"/>
</call-service>
@@ -271,7 +271,7 @@
<if-not-empty field="parameters.includeCrossPromotions">
<set field="parameters.subject" value="${parameters.includeCrossPromotions} INCLUDE_CROSS_PROMOTIONS"/>
</if-not-empty>
- <set-service-fields service-name="createProductStoreEmailSetting" map="parameters" to-map="newEmailSetting"/>/>
+ <set-service-fields service-name="createProductStoreEmailSetting" map="parameters" to-map="newEmailSetting"/>
<call-service service-name="createProductStoreEmailSetting" in-map-name="newEmailSetting" >
<result-to-field result-name="contentId"/>
</call-service>
@@ -279,7 +279,7 @@
<simple-method method-name="updateEmailTemplate" short-description="Create Email Template">
<!-- update content -->
- <set-service-fields service-name="updateElectronicText" map="parameters" to-map="updateElectronicText"/>/>
+ <set-service-fields service-name="updateElectronicText" map="parameters" to-map="updateElectronicText"/>
<call-service service-name="updateElectronicText" in-map-name="updateElectronicText">
<result-to-field result-name="dataResourceId" field="parameters.dataResourceId"/>
</call-service>
@@ -291,7 +291,7 @@
<if-not-empty field="parameters.includeCrossPromotions">
<set field="parameters.subject" value="${parameters.subject} INCLUDE_CROSS_PROMOTIONS"/>
</if-not-empty-->
- <set-service-fields service-name="updateProductStoreEmailSetting" map="parameters" to-map="updateEmailSetting"/>/>
+ <set-service-fields service-name="updateProductStoreEmailSetting" map="parameters" to-map="updateEmailSetting"/>
<call-service service-name="updateProductStoreEmailSetting" in-map-name="updateEmailSetting" >
<result-to-field result-name="contentId"/>
</call-service>
Modified: ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml Tue Nov 8 11:27:13 2016
@@ -1295,11 +1295,11 @@ under the License.
</if-compare-field>
<check-errors/>
<if-empty field="parameters.partyId">
- <set-service-fields service-name="createPerson" map="parameters" to-map="newPerson"/>/>
+ <set-service-fields service-name="createPerson" map="parameters" to-map="newPerson"/>
<call-service service-name="createPerson" in-map-name="newPerson">
<result-to-field result-name="partyId" field="parameters.partyId"/>
</call-service>
- <set-service-fields service-name="createPartyContactMech" map="parameters" to-map="newContact"/>/>
+ <set-service-fields service-name="createPartyContactMech" map="parameters" to-map="newContact"/>
<set field="newContact.infoString" from-field="parameters.emailAddress"/>
<set field="newContact.contactMechTypeId" value="EMAIL_ADDRESS"/>
<set field="newContact.contactMechPurposeTypeId" value="PRIMARY_EMAIL"/>
@@ -1310,7 +1310,7 @@ under the License.
<set field="parameters.contactMechIdFrom" from-field="contact.contactMechId"/>
</else>
</if-empty>
- <set-service-fields service-name="sendContactUsEmailToCompany" map="parameters" to-map="newComm"/>/>
+ <set-service-fields service-name="sendContactUsEmailToCompany" map="parameters" to-map="newComm"/>
<set field="newComm.emailType" value="CONT_NOTI_EMAIL"/>
<call-service service-name="sendContactUsEmailToCompany" in-map-name="newComm">
<default-message property="ThankYouForContactingUs" resource="EcommerceUiLabels"></default-message>
Modified: ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectServices.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectServices.xml Tue Nov 8 11:27:13 2016
@@ -180,10 +180,10 @@
</simple-method>
<simple-method method-name="updateTaskAndRelatedInfo" short-description="Update the task and when info is provided update the related information too">
- <set-service-fields service-name="updateWorkEffort" map="parameters" to-map="updateWorkeffort"/>/>
+ <set-service-fields service-name="updateWorkEffort" map="parameters" to-map="updateWorkeffort"/>
<call-service service-name="updateWorkEffort" in-map-name="updateWorkeffort"/>
<if-not-empty field="parameters.estimatedDuration">
- <set-service-fields service-name="updateWorkEffortSkillStandard" map="parameters" to-map="updateWorkEffortSkillStandard"/>/>
+ <set-service-fields service-name="updateWorkEffortSkillStandard" map="parameters" to-map="updateWorkEffortSkillStandard"/>
<if-empty field="parameters.skillTypeId">
<entity-and entity-name="WorkEffortSkillStandard" list="workEffortSkillStandards">
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
Modified: ofbiz/trunk/specialpurpose/scrum/minilang/ScrumEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/minilang/ScrumEvents.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/minilang/ScrumEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/minilang/ScrumEvents.xml Tue Nov 8 11:27:13 2016
@@ -148,7 +148,7 @@
</call-service>
<set field="parameters.custRequestId" from-field="custRequestId"/>
<set field="parameters.workEffortId" from-field="workEffortId"/>
- <set-service-fields service-name="createWorkEffortRequest" map="parameters" to-map="createWorkEffortRequest"/>/>
+ <set-service-fields service-name="createWorkEffortRequest" map="parameters" to-map="createWorkEffortRequest"/>
<call-service service-name="createWorkEffortRequest" in-map-name="createWorkEffortRequest">
<result-to-field result-name="workEffortId" field="workEffort"/>
</call-service>
@@ -163,7 +163,7 @@
</call-service>
<set field="parameters.custRequestId" from-field="custRequestId"/>
<set field="parameters.workEffortId" from-field="workEffortId"/>
- <set-service-fields service-name="createWorkEffortRequest" map="parameters" to-map="createWorkEffortRequest"/>/>
+ <set-service-fields service-name="createWorkEffortRequest" map="parameters" to-map="createWorkEffortRequest"/>
<call-service service-name="createWorkEffortRequest" in-map-name="createWorkEffortRequest">
<result-to-field result-name="workEffortId" field="workEffortId"/>
</call-service>
@@ -178,7 +178,7 @@
</call-service>
<set field="parameters.custRequestId" from-field="custRequestId"/>
<set field="parameters.workEffortId" from-field="workEffortId"/>
- <set-service-fields service-name="createWorkEffortRequest" map="parameters" to-map="createWorkEffortRequest"/>/>
+ <set-service-fields service-name="createWorkEffortRequest" map="parameters" to-map="createWorkEffortRequest"/>
<call-service service-name="createWorkEffortRequest" in-map-name="createWorkEffortRequest">
<result-to-field result-name="workEffortId" field="workEffortId"/>
</call-service>
@@ -450,7 +450,7 @@
<entity-one entity-name="UserLogin" value-field="sysUserLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
- <set-service-fields service-name="createWorkEffort" map="parameters" to-map="createProject"/>/>
+ <set-service-fields service-name="createWorkEffort" map="parameters" to-map="createProject"/>
<set field="createProject.workEffortTypeId" value="SCRUM_PROJECT"/>
<set field="createProject.currentStatusId" value="SPJ_ACTIVE"/>
<set field="createProject.userLogin" from-field="sysUserLogin"/>
@@ -519,7 +519,7 @@
</condition>
<then>
<now-timestamp field="now"/>
- <set-service-fields service-name="updateWorkEffort" map="parameters" to-map="updateProject"/>/>
+ <set-service-fields service-name="updateWorkEffort" map="parameters" to-map="updateProject"/>
<call-service service-name="updateWorkEffort" in-map-name="updateProject"/>
<!-- remove old workeffort associate with product -->
<entity-and entity-name="WorkEffortGoodStandard" list="workEffGSDList">
@@ -1041,7 +1041,7 @@
<number value="3600000"/>
</calcop>
</calculate>
- <set-service-fields service-name="updateCustRequest" map="parameters" to-map="inMap"/>/>
+ <set-service-fields service-name="updateCustRequest" map="parameters" to-map="inMap"/>
<call-service service-name="updateCustRequest" in-map-name="inMap"/>
</simple-method>
@@ -1252,7 +1252,7 @@
<set field="parameters.roleTypeId" value="STAKEHOLDER"/>
</if-compare>
- <set-service-fields service-name="ensurePartyRole" map="parameters" to-map="ensurePartyRole"/>/>
+ <set-service-fields service-name="ensurePartyRole" map="parameters" to-map="ensurePartyRole"/>
<set field="ensurePartyRole.userLogin" from-field="sysUserLogin"/>
<call-service service-name="ensurePartyRole" in-map-name="ensurePartyRole"/>
<entity-one entity-name="UserLogin" value-field="sysUserLogin">
@@ -1265,7 +1265,7 @@
</entity-and>
<if-empty field="listGroupId">
<set field="parameters.userLoginId" from-field="userLoginId"/>
- <set-service-fields service-name="addUserLoginToSecurityGroup" map="parameters" to-map="inMap"/>/>
+ <set-service-fields service-name="addUserLoginToSecurityGroup" map="parameters" to-map="inMap"/>
<set field="inMap.userLogin" from-field="sysUserLogin"/>
<call-service service-name="addUserLoginToSecurityGroup" in-map-name="inMap"/>
<else>
@@ -1370,7 +1370,7 @@
<if-compare field="formInput.formInput.workEffortTypeId" operator="equals" value="SCRUM_TASK_INST">
<set field="formInput.formInput.priority" value="4"/>
</if-compare>
- <set-service-fields service-name="createWorkEffort" map="formInput.formInput" to-map="createWorkEffort"/>/>
+ <set-service-fields service-name="createWorkEffort" map="formInput.formInput" to-map="createWorkEffort"/>
<entity-one entity-name="UserLogin" value-field="sysUserLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
@@ -1381,7 +1381,7 @@
<result-to-field result-name="workEffortId" field="formInput.formInput.workEffortId"/>
</call-service>
<set field="formInput.formInput.custRequestId" from-field="custRequestId"/>
- <set-service-fields service-name="createWorkEffortRequest" map="formInput.formInput" to-map="createWorkEffortRequest"/>/>
+ <set-service-fields service-name="createWorkEffortRequest" map="formInput.formInput" to-map="createWorkEffortRequest"/>
<call-service service-name="createWorkEffortRequest" in-map-name="createWorkEffortRequest"/>
<!--if plan hours(from task) more than first plan hours -->
@@ -1527,11 +1527,11 @@
<field-map field-name="userLoginId" value="system"/>
</entity-one>
- <set-service-fields service-name="ensurePartyRole" map="parameters" to-map="ensurePartyRole"/>/>
+ <set-service-fields service-name="ensurePartyRole" map="parameters" to-map="ensurePartyRole"/>
<set field="ensurePartyRole.userLogin" from-field="sysUserLogin"/>
<set field="ensurePartyRole.roleTypeId" from-field="parameters.roleTypeId"/>
<call-service service-name="ensurePartyRole" in-map-name="ensurePartyRole"/>
- <set-service-fields service-name="assignPartyToWorkEffort" map="parameters" to-map="assignPartyToWorkEffort"/>/>
+ <set-service-fields service-name="assignPartyToWorkEffort" map="parameters" to-map="assignPartyToWorkEffort"/>
<set field="assignPartyToWorkEffort.userLogin" from-field="sysUserLogin"/>
<call-service service-name="assignPartyToWorkEffort" in-map-name="assignPartyToWorkEffort"/>
</simple-method>
@@ -2068,7 +2068,7 @@
</if-not-empty>
</if-empty>
- <set-service-fields service-name="updateWorkEffort" map="parameters" to-map="inMap"/>/>
+ <set-service-fields service-name="updateWorkEffort" map="parameters" to-map="inMap"/>
<call-service service-name="updateWorkEffort" in-map-name="inMap"/>
<if-not-empty field="parameters.partyId">
<!-- Assigned -->
@@ -2218,7 +2218,7 @@
<field-map field-name="roleTypeId" from-field="parameters.roleTypeId"/>
</entity-and>
<if-not-empty field="partyRoles">
- <set-service-fields service-name="deletePartyRole" map="parameters" to-map="deletePartyRoleMap"/>/>
+ <set-service-fields service-name="deletePartyRole" map="parameters" to-map="deletePartyRoleMap"/>
<set field="deletePartyRoleMap.userLogin" from-field="sysUserLogin"/>
<call-service service-name="deletePartyRole" in-map-name="deletePartyRoleMap"/>
</if-not-empty>
@@ -2285,7 +2285,7 @@
</call-service>
<field-to-request field="workEffortId"/>
<set field="formInput.formInput.workEffortId" from-field="workEffortId"/>
- <set-service-fields service-name="createWorkEffortRequest" map="formInput.formInput" to-map="workEffortRequestCtx"/>/>
+ <set-service-fields service-name="createWorkEffortRequest" map="formInput.formInput" to-map="workEffortRequestCtx"/>
<call-service service-name="createWorkEffortRequest" in-map-name="workEffortRequestCtx"/>
<!-- createWorkEffortRequest not provide to add the workEffortParentId into WorkEffort entity. -->
@@ -2647,7 +2647,7 @@
<now-timestamp field="now"/>
<!-- calculate estimatedMilliSeconds from initail planned hours -->
<set field="plannedHours" from-field="parameters.plannedHours" default-value="0" type="Integer"/>
- <set-service-fields service-name="createWorkEffort" map="parameters" to-map="workEffortMap"/>/>
+ <set-service-fields service-name="createWorkEffort" map="parameters" to-map="workEffortMap"/>
<set field="parameters.estimatedMilliSeconds" value="${groovy:plannedHours*60*60*1000}"/>
<call-service service-name="createWorkEffort" in-map-name="workEffortMap">
<result-to-field result-name="workEffortId"/>
@@ -3483,7 +3483,7 @@
<if-not-empty field="workEffGSDList">
<remove-list list="workEffGSDList"/>
</if-not-empty>
- <set-service-fields service-name="deleteWorkEffort" map="workEffortMap" to-map="serviceMap"/>/>
+ <set-service-fields service-name="deleteWorkEffort" map="workEffortMap" to-map="serviceMap"/>
<call-service service-name="deleteWorkEffort" in-map-name="serviceMap">
<default-message>The Default Task record successfully deleted.</default-message>
</call-service>
@@ -4133,7 +4133,7 @@
<entity-one entity-name="UserLogin" value-field="systemUserLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
- <set-service-fields service-name="updatePartyRate" map="parameters" to-map="partyRateMap"/>/>
+ <set-service-fields service-name="updatePartyRate" map="parameters" to-map="partyRateMap"/>
<set field="partyRateMap.userLogin" from-field="systemUserLogin"/>
<call-service service-name="updatePartyRate" in-map-name="partyRateMap"/>
<field-to-request field="parameters.partyId" request-name="partyId"/>
@@ -4143,7 +4143,7 @@
<entity-one entity-name="UserLogin" value-field="systemUserLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
- <set-service-fields service-name="deletePartyRate" map="parameters" to-map="partyRateMap"/>/>
+ <set-service-fields service-name="deletePartyRate" map="parameters" to-map="partyRateMap"/>
<set field="partyRateMap.userLogin" from-field="systemUserLogin"/>
<call-service service-name="deletePartyRate" in-map-name="partyRateMap"/>
<field-to-request field="parameters.partyId" request-name="partyId"/>
@@ -4153,7 +4153,7 @@
<entity-one entity-name="UserLogin" value-field="systemUserLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
- <set-service-fields service-name="createPartyRelationshipContactAccount" map="parameters" to-map="partyRelationshipMap"/>/>
+ <set-service-fields service-name="createPartyRelationshipContactAccount" map="parameters" to-map="partyRelationshipMap"/>
<set field="partyRelationshipMap.userLogin" from-field="systemUserLogin"/>
<call-service service-name="createPartyRelationshipContactAccount" in-map-name="partyRelationshipMap">
<default-message>Successfully created party relationship.</default-message>
Modified: ofbiz/trunk/specialpurpose/scrum/minilang/ScrumServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/minilang/ScrumServices.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/minilang/ScrumServices.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/minilang/ScrumServices.xml Tue Nov 8 11:27:13 2016
@@ -2313,7 +2313,7 @@
<set field="custRequest.fromPartyId" from-field="productRole[0].partyId"/>
</if-compare>
</if-empty>
- <set-service-fields service-name="updateCustRequest" map="custRequest" to-map="updateCustRequest"/>/>
+ <set-service-fields service-name="updateCustRequest" map="custRequest" to-map="updateCustRequest"/>
<set field="updateCustRequest.webSiteId" from-field="parameters.webSiteId"/>
<call-service service-name="updateCustRequest" in-map-name="updateCustRequest"/>
<log level="info" message="Completed Sprint Backlog # ${custRequestId}"/>
@@ -2562,7 +2562,7 @@
<set field="parameters.objectInfo" from-field="parameters.revisionLink"/>
<set field="parameters.mimeTypeId" value="text/plain"/>
- <set-service-fields service-name="createDataResource" map="parameters" to-map="newDataResource"/>/>
+ <set-service-fields service-name="createDataResource" map="parameters" to-map="newDataResource"/>
<call-service service-name="createDataResource" in-map-name="newDataResource">
<result-to-field result-name="dataResourceId" field="parameters.dataResourceId"/>
</call-service>
@@ -2571,14 +2571,14 @@
<set field="parameters.partyId" from-field="user.partyId"/>
<set field="parameters.contentName" value="R${parameters.revisionNumber}"/>
<set field="parameters.description" from-field="parameters.revisionDescription"/>
- <set-service-fields service-name="createContent" map="parameters" to-map="newContent"/>/>
+ <set-service-fields service-name="createContent" map="parameters" to-map="newContent"/>
<call-service service-name="createContent" in-map-name="newContent">
<result-to-field result-name="contentId" field="parameters.contentId"/>
</call-service>
<set field="parameters.workEffortContentTypeId" value="TASK_SUB_INFO"/>
<set field="parameters.workEffortId" from-field="task.workEffortId"/>
- <set-service-fields service-name="createWorkEffortContent" map="parameters" to-map="newWorkEffortContent"/>/>
+ <set-service-fields service-name="createWorkEffortContent" map="parameters" to-map="newWorkEffortContent"/>
<call-service service-name="createWorkEffortContent" in-map-name="newWorkEffortContent"/>
<!-- check if party assigned to task-->
Modified: ofbiz/trunk/specialpurpose/scrum/minilang/test/SprintTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/minilang/test/SprintTests.xml?rev=1768662&r1=1768661&r2=1768662&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/minilang/test/SprintTests.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/minilang/test/SprintTests.xml Tue Nov 8 11:27:13 2016
@@ -28,7 +28,7 @@ under the License.
<set field="parameters.custRequestId" value="TEST9"/>
<set field="parameters.estimatedMilliSeconds" value="36000000"/>
<set field="parameters.userLogin" from-field="userLogin"/>
- <set-service-fields service-name="updateCustRequest" map="parameters" to-map="inMap"/>/>
+ <set-service-fields service-name="updateCustRequest" map="parameters" to-map="inMap"/>
<call-service service-name="updateCustRequest" in-map-name="inMap"/>
</simple-method>