You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/12/30 13:04:26 UTC
svn commit: r730109 [1/3] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/agreement/
applications/accounting/script/org/ofbiz/accounting/invoice/
applications/accounting/script/org/ofbiz/accounting/ledger/
applications/accounting...
Author: jleroux
Date: Tue Dec 30 04:04:24 2008
New Revision: 730109
URL: http://svn.apache.org/viewvc?rev=730109&view=rev
Log:
<clear-field(.*)field-name => <clear-field$1field
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/ContentPermissionServices.xml
ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/contact/ContactServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
ofbiz/trunk/framework/bi/script/org/ofbiz/bi/DimensionServices.xml
ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml
ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml
ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml?rev=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml Tue Dec 30 04:04:24 2008
@@ -76,7 +76,7 @@
<get-related value-name="agreement" relation-name="AgreementItem" list-name="agreementItems"/>
<iterate list="agreementItems" entry="agreementItem">
- <clear-field field-name="createAgreementItemInMap"/>
+ <clear-field field="createAgreementItemInMap"/>
<set-service-fields service-name="createAgreementItem" to-map-name="createAgreementItemInMap" map-name="agreementItem"/>
<set from-field="agreementIdTo" field="createAgreementItemInMap.agreementId"/>
<call-service service-name="createAgreementItem" in-map-name="createAgreementItemInMap"/>
@@ -84,7 +84,7 @@
<if-compare field="parameters.copyAgreementTerms" value="Y" operator="equals">
<get-related value-name="agreement" relation-name="AgreementTerm" list-name="agreementTerms"/>
<iterate list="agreementTerms" entry="agreementTerm">
- <clear-field field-name="createAgreementTermInMap"/>
+ <clear-field field="createAgreementTermInMap"/>
<set-service-fields service-name="createAgreementTerm" to-map-name="createAgreementTermInMap" map-name="agreementTerm"/>
<set from-field="agreementIdTo" field="createAgreementTermInMap.agreementId"/>
<call-service service-name="createAgreementTerm" in-map-name="createAgreementTermInMap"/>
@@ -93,7 +93,7 @@
<if-compare field="parameters.copyAgreementProducts" value="Y" operator="equals">
<get-related value-name="agreement" relation-name="AgreementProductAppl" list-name="agreementProductAppls"/>
<iterate list="agreementProductAppls" entry="agreementProductAppl">
- <clear-field field-name="createAgreementProductApplInMap"/>
+ <clear-field field="createAgreementProductApplInMap"/>
<set-service-fields service-name="createAgreementProductAppl" to-map-name="createAgreementProductApplInMap" map-name="agreementProductAppl"/>
<set from-field="agreementIdTo" field="createAgreementProductApplInMap.agreementId"/>
<call-service service-name="createAgreementProductAppl" in-map-name="createAgreementProductApplInMap"/>
@@ -102,7 +102,7 @@
<if-compare field="parameters.copyAgreementParties" value="Y" operator="equals">
<get-related value-name="agreement" relation-name="AgreementPartyApplic" list-name="agreementPartyApplic"/>
<iterate list="agreementPartyApplics" entry="agreementPartyApplic">
- <clear-field field-name="createAgreementPartyApplicInMap"/>
+ <clear-field field="createAgreementPartyApplicInMap"/>
<set-service-fields service-name="createAgreementPartyApplic" to-map-name="createAgreementPartyApplicInMap" map-name="agreementPartyApplic"/>
<set from-field="agreementIdTo" field="createAgreementPartyApplicInMap.agreementId"/>
<call-service service-name="createAgreementPartyApplic" in-map-name="createAgreementPartyApplicInMap"/>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml?rev=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml Tue Dec 30 04:04:24 2008
@@ -176,7 +176,7 @@
<set field="invoice.invoiceTypeId" from-field="parameters.invoiceTypeId"/>
</if-not-empty>
<set-service-fields service-name="createInvoice" map-name="invoice" to-map-name="newInvoice"/>
- <clear-field field-name="newInvoice.invoiceId"/>
+ <clear-field field="newInvoice.invoiceId"/>
<call-service service-name="createInvoice" in-map-name="newInvoice">
<result-to-field result-name="invoiceId" field-name="invoiceId"/>
</call-service>
@@ -466,7 +466,7 @@
<if-not-empty field="invoice.paidDate">
<if-compare field="parameters.statusId" operator="equals" value="INVOICE_READY">
- <clear-field field-name="invoice.paidDate" />
+ <clear-field field="invoice.paidDate" />
</if-compare>
</if-not-empty>
@@ -490,8 +490,8 @@
<field-map field-name="invoiceId" from-field="parameters.invoiceId"/>
</entity-and>
<iterate entry="entry" list="entries">
- <clear-field field-name="entry.invoiceId"/>
- <clear-field field-name="entry.invoiceItemSeqId"/>
+ <clear-field field="entry.invoiceId"/>
+ <clear-field field="entry.invoiceItemSeqId"/>
<store-value value-name="entry"/>
</iterate>
</if-compare>
@@ -570,9 +570,9 @@
<if-compare field="updateInvoiceCtx.invoiceTypeId" operator="equals" value="PUR_INV_TEMPLATE">
<set field="updateInvoiceCtx.invoiceTypeId" value="PURCHASE_INVOICE"/>
</if-compare>
- <clear-field field-name="invoice"/>
- <clear-field field-name="invoiceIdToCopyFrom" map-name="parameters"/>
- <clear-field field-name="recurrenceInfoId" map-name="updateInvoiceCtx"/>
+ <clear-field field="invoice"/>
+ <clear-field field="invoiceIdToCopyFrom" map-name="parameters"/>
+ <clear-field field="recurrenceInfoId" map-name="updateInvoiceCtx"/>
<call-service service-name="updateInvoice" in-map-name="updateInvoiceCtx"/>
</iterate>
</simple-method>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml?rev=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml Tue Dec 30 04:04:24 2008
@@ -92,7 +92,7 @@
<set field="newEntity.origCurrencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
</if-empty>
<if-compare-field field="newEntity.origCurrencyUomId" to-field="newEntity.currencyUomId" operator="not-equals">
- <clear-field field-name="convertUomInMap"/>
+ <clear-field field="convertUomInMap"/>
<set field="convertUomInMap.originalValue" from-field="newEntity.origAmount" type="Double"/>
<set field="convertUomInMap.uomId" from-field="newEntity.origCurrencyUomId"/>
<set field="convertUomInMap.uomIdTo" from-field="newEntity.currencyUomId"/>
@@ -244,8 +244,8 @@
<iterate entry="acctgTransEntry" list="acctgTransEntryList">
<!-- we want to do this for each organizationPartyId, so only do this if we haven't already found the list for the current org -->
<if-empty field="customTimePeriodListByOrganizationPartyIdMap.${acctgTransEntry.organizationPartyId}">
- <clear-field field-name="findCustomTimePeriodCallMap"/>
- <clear-field field-name="customTimePeriodList"/>
+ <clear-field field="findCustomTimePeriodCallMap"/>
+ <clear-field field="customTimePeriodList"/>
<set from-field="acctgTrans.transactionDate" field="findCustomTimePeriodCallMap.findDate"/>
<set from-field="acctgTransEntry.organizationPartyId" field="findCustomTimePeriodCallMap.organizationPartyId"/>
@@ -314,9 +314,9 @@
<!-- TODO: for each entry: lookup GlAccount, update posted balance -->
<iterate entry="acctgTransEntry" list="acctgTransEntryList">
<!-- Get all data to operate on: GlAccount, GlAccountOrganization, GlAccountHistory -->
- <clear-field field-name="glAccount"/>
- <clear-field field-name="glAccountOrganization"/>
- <clear-field field-name="glAccountHistoryList"/>
+ <clear-field field="glAccount"/>
+ <clear-field field="glAccountOrganization"/>
+ <clear-field field="glAccountHistoryList"/>
<entity-one entity-name="GlAccount" value-name="glAccount">
<field-map field-name="glAccountId" from-field="acctgTransEntry.glAccountId"/>
@@ -330,7 +330,7 @@
debitCreditFlag of the acctgTransEntry. Debits add to debit accounts and subtract from credit accounts. Credits add to
credit accounts and subtract from debit accounts -->
<!-- we do this by first calculating a postingAmount (positive or negative) then adding to the postingBalance -->
- <clear-field field-name="postingAmount"/>
+ <clear-field field="postingAmount"/>
<!-- use the parent of the GlAccountClass, which should either be DEBIT or CREDIT -->
<get-related-one relation-name="GlAccountClass" value-name="glAccount" to-value-name="glAccountClass"/>
<get-related-one relation-name="ParentGlAccountClass" value-name="glAccountClass" to-value-name="parentGlAccountClass"/>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml?rev=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml Tue Dec 30 04:04:24 2008
@@ -31,7 +31,7 @@
<set field="andConditions.invoiceItemTypeId" value="INV_FPROD_ITEM"/>
<get-related relation-name="InvoiceItem" value-name="invoice" list-name="invoiceItems" map-name="andConditions"/>
<iterate list="invoiceItems" entry="invoiceItem">
- <clear-field field-name="inMap"/>
+ <clear-field field="inMap"/>
<set field="inMap.invoice" from-field="invoice"/>
<set field="inMap.invoiceItem" from-field="invoiceItem"/>
<call-service service-name="loadSalesInvoiceItemFact" in-map-name="inMap"/>
@@ -67,7 +67,7 @@
<set field="fact.invoiceItemSeqId" from-field="invoiceItem.invoiceItemSeqId"/>
<!-- conversion of the invoice date -->
<if-not-empty field="invoice.invoiceDate">
- <clear-field field-name="inMap"/>
+ <clear-field field="inMap"/>
<set field="inMap.dimensionEntityName" value="DateDimension"/>
<set field="inMap.naturalKeyFields.dateValue" from-field="invoice.invoiceDate"/>
<call-service service-name="getDimensionIdFromNaturalKey" in-map-name="inMap">
@@ -82,7 +82,7 @@
</if-not-empty>
<!-- conversion of the product id -->
<if-not-empty field="invoiceItem.productId">
- <clear-field field-name="inMap"/>
+ <clear-field field="inMap"/>
<set field="inMap.dimensionEntityName" value="ProductDimension"/>
<set field="inMap.naturalKeyFields.productId" from-field="invoiceItem.productId"/>
<call-service service-name="getDimensionIdFromNaturalKey" in-map-name="inMap">
@@ -97,7 +97,7 @@
</if-not-empty>
<!-- conversion of the invoice currency -->
<if-not-empty field="invoice.currencyUomId">
- <clear-field field-name="inMap"/>
+ <clear-field field="inMap"/>
<set field="inMap.dimensionEntityName" value="CurrencyDimension"/>
<set field="inMap.naturalKeyFields.currencyId" from-field="invoice.currencyUomId"/>
<call-service service-name="getDimensionIdFromNaturalKey" in-map-name="inMap">
@@ -129,7 +129,7 @@
</calcop>
</calculate>
<!-- taxes -->
- <clear-field field-name="andConditions"/>
+ <clear-field field="andConditions"/>
<set field="andConditions.invoiceItemTypeId" value="ITM_SALES_TAX"/>
<get-related relation-name="ChildrenInvoiceItem" value-name="invoiceItem" list-name="taxes" map-name="andConditions"/>
<iterate list="taxes" entry="tax">
@@ -140,7 +140,7 @@
</calculate>
</iterate>
<!-- discounts -->
- <clear-field field-name="andConditions"/>
+ <clear-field field="andConditions"/>
<set field="andConditions.invoiceItemTypeId" value="ITM_PROMOTION_ADJ"/>
<get-related relation-name="ChildrenInvoiceItem" value-name="invoiceItem" list-name="discounts" map-name="andConditions"/>
<iterate list="discounts" entry="discount">
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Tue Dec 30 04:04:24 2008
@@ -262,7 +262,7 @@
<iterate list="invoiceTerms" entry="invoiceTerm">
<get-related-one relation-name="TermType" value-name="invoiceTerm" to-value-name="termType" use-cache="true"/>
<if-compare field="termType.parentTypeId" operator="equals" value="FIN_PAYMENT_TERM">
- <clear-field field-name="invoicePaymentInfo"/>
+ <clear-field field="invoicePaymentInfo"/>
<set field="invoicePaymentInfo.invoiceId" from-field="invoice.invoiceId"/>
<set field="invoicePaymentInfo.invoiceTermId" from-field="invoiceTerm.invoiceTermId"/>
<set field="invoicePaymentInfo.termTypeId" from-field="invoiceTerm.termTypeId"/>
@@ -315,7 +315,7 @@
</or>
</condition>
<then>
- <clear-field field-name="invoicePaymentInfo"/>
+ <clear-field field="invoicePaymentInfo"/>
<set field="andMap.termTypeId" value="FIN_PAYMENT_TERM"/>
<filter-list-by-and list-name="invoiceTerms" map-name="andMap"/>
<first-from-list list="invoiceTerms" entry="invoiceTerm"/>
@@ -366,7 +366,7 @@
<order-by field-name="invoiceDate"/>
</entity-condition>
<iterate list="invoices" entry="invoice">
- <clear-field field-name="getInvoicePaymentInfoListInMap"/>
+ <clear-field field="getInvoicePaymentInfoListInMap"/>
<set field="getInvoicePaymentInfoListInMap.invoice" from-field="invoice"/>
<call-service service-name="getInvoicePaymentInfoList" in-map-name="getInvoicePaymentInfoListInMap">
<result-to-field field-name="invoicePaymentInfoList" result-name="invoicePaymentInfoList"/>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml?rev=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml Tue Dec 30 04:04:24 2008
@@ -66,7 +66,7 @@
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<now-timestamp-to-env env-name="newEntity.fromDate"/>
- <clear-field field-name="newEntity.thruDate"/>
+ <clear-field field="newEntity.thruDate"/>
<create-value value-field="newEntity"/>
</simple-method>
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml?rev=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml Tue Dec 30 04:04:24 2008
@@ -266,8 +266,8 @@
<log level="info" message="persistCompDocContent(0).content : ${content}"/>
<set-service-fields service-name="persistDataResourceAndData" map-name="parameters" to-map-name="persistMap"/>
- <clear-field field-name="persistMap.dataResourceId"/>
- <clear-field field-name="persistMap.drDataResourceId"/>
+ <clear-field field="persistMap.dataResourceId"/>
+ <clear-field field="persistMap.drDataResourceId"/>
<log level="info" message="persistCompDocContent(0.2).persistMap : ${persistMap}"/>
<call-service service-name="persistDataResourceAndData" in-map-name="persistMap">
@@ -316,9 +316,9 @@
<set-service-fields service-name="persistCompDocContent" map-name="parameters" to-map-name="persistMap"/>
<set field="persistMap.relatedDetailId" from-field="surveyId"/>
<set field="persistMap.mimeTypeId" value="application/vnd.ofbiz.survey"/>
- <clear-field field-name="persistMap._imageData_contentType"/>
- <clear-field field-name="persistMap._imageData_fileName"/>
- <clear-field field-name="persistMap.imageData"/>
+ <clear-field field="persistMap._imageData_contentType"/>
+ <clear-field field="persistMap._imageData_fileName"/>
+ <clear-field field="persistMap.imageData"/>
<log level="info" message="persistCompDocPdf2Survey(4)persistMap : ${persistMap}"/>
<call-service service-name="persistCompDocContent" in-map-name="persistMap"></call-service>
@@ -598,7 +598,7 @@
<set from-field="parameters.contentId" field="contentApproval.contentId"/>
<sequenced-id-to-env sequence-name="ContentApproval" env-name="contentApproval.contentApprovalId"/>
- <clear-field field-name="contentApproval.approvalStatusId"/>
+ <clear-field field="contentApproval.approvalStatusId"/>
<log level="info" message="contentApproval 2b: ${contentApproval}"/>
<create-value value-field="contentApproval"/>
</iterate>
@@ -685,7 +685,7 @@
</or>
</condition>
<then>
- <clear-field field-name="contentApproval.approvalStatusId"/>
+ <clear-field field="contentApproval.approvalStatusId"/>
</then>
<else-if>
<!-- soft rejected, reset rejected (shouldn't be any) and soft rejected entities to ready -->
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml?rev=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml Tue Dec 30 04:04:24 2008
@@ -155,8 +155,8 @@
</if-not-empty>
- <clear-field field-name="content.contentId"/><!-- force new value -->
- <clear-field field-name="content.statusId"/><!-- force new value -->
+ <clear-field field="content.contentId"/><!-- force new value -->
+ <clear-field field="content.statusId"/><!-- force new value -->
<set-service-fields service-name="createContent" map-name="content" to-map-name="createContent"/>
<call-service service-name="createContent" in-map-name="createContent">
<result-to-field result-name="contentId" field-name="newContentId"/>
@@ -1208,9 +1208,9 @@
<condition-expr field-name="caMapKey" env-name="parameters.subMapKey" ignore-if-empty="true"/>
</condition-list>
</entity-condition>
- <clear-field field-name="view2"/>
+ <clear-field field="view2"/>
<first-from-list entry="view2" list="viewList"/>
- <clear-field field-name="map"/>
+ <clear-field field="map"/>
<set field="map.contentIdFrom" from-field="view.contentId"/>
<set field="map.dataResourceIdFrom" from-field="view.dataResourceId"/>
<set field="map.contentId" from-field="view2.contentId"/>
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml?rev=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml Tue Dec 30 04:04:24 2008
@@ -184,7 +184,7 @@
<field field-name="formInput" type="java.util.Map"/>
</call-class-method>
- <clear-field map-name="formInput" field-name="imageData"/>
+ <clear-field map-name="formInput" field="imageData"/>
<log level="always" message="formInput: ${formInput}"/>
<log level="always" message="byteWrap: ${byteWrap}"/>
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/ContentPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/ContentPermissionServices.xml?rev=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/ContentPermissionServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/ContentPermissionServices.xml Tue Dec 30 04:04:24 2008
@@ -258,7 +258,7 @@
<!-- no parent record found; time to stop recursion -->
<else>
- <clear-field field-name="checkId"/>
+ <clear-field field="checkId"/>
</else>
</if>
</then>
@@ -402,7 +402,7 @@
<!-- no parent record found; time to stop recursion -->
<else>
- <clear-field field-name="checkId"/>
+ <clear-field field="checkId"/>
</else>
</if>
</then>
@@ -602,7 +602,7 @@
<!-- no parent record found; time to stop recursion -->
<else>
- <clear-field field-name="checkId"/>
+ <clear-field field="checkId"/>
</else>
</if>
</then>
Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original)
+++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Tue Dec 30 04:04:24 2008
@@ -1074,7 +1074,7 @@
<set field="shippingOptionMap.productStoreShipMethId" from-field="carrierShipmentMethod.productStoreShipMethId"/>
</if-not-empty>
<field-to-list field-name="shippingOptionMap" list-name="shippingOptions"/>
- <clear-field field-name="shippingOptionMap"/>
+ <clear-field field="shippingOptionMap"/>
</iterate>
<set field="parameters.shippingOptions" from-field="shippingOptions"/>
<field-to-request field-name="parameters.shippingOptions" request-name="shippingOptions"/>
Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml?rev=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml (original)
+++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml Tue Dec 30 04:04:24 2008
@@ -42,7 +42,7 @@
<!-- now go through each work effort good standard and call a service to issue the inventory -->
<iterate list="components" entry="component">
<if-not-empty field="component.productId">
- <clear-field field-name="callSvcMap"/>
+ <clear-field field="callSvcMap"/>
<set-service-fields to-map-name="callSvcMap" service-name="issueProductionRunTaskComponent" map-name="component"/>
<set from-field="reserveOrderEnumId" field="callSvcMap.reserveOrderEnumId"/>
<set field="callSvcMap.description" value="BOM Part"/>
@@ -183,13 +183,13 @@
<set field="createDetailMap.reasonEnumId" from-field="parameters.reasonEnumId"/>
<set field="createDetailMap.description" from-field="parameters.description"/>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
- <clear-field field-name="createDetailMap"/>
+ <clear-field field="createDetailMap"/>
<set field="balanceInventoryItemsInMap.inventoryItemId" from-field="lastNonSerInventoryItem.inventoryItemId"/>
<call-service service-name="balanceInventoryItems" in-map-name="balanceInventoryItemsInMap"/>
<else>
<!-- no non-ser inv item, create a non-ser InventoryItem with availableToPromise = -quantityNotIssued -->
- <clear-field field-name="createInvItemInMap"/>
- <clear-field field-name="createInvItemOutMap"/>
+ <clear-field field="createInvItemInMap"/>
+ <clear-field field="createInvItemOutMap"/>
<set field="createInvItemInMap.productId" from-field="productId"/>
<set field="createInvItemInMap.facilityId" from-field="workEffort.facilityId"/>
<set field="createInvItemInMap.inventoryItemTypeId" value="NON_SERIAL_INV_ITEM"/>
@@ -216,7 +216,7 @@
<set field="createDetailMap.reasonEnumId" from-field="parameters.reasonEnumId"/>
<set field="createDetailMap.description" from-field="parameters.description"/>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
- <clear-field field-name="createDetailMap"/>
+ <clear-field field="createDetailMap"/>
</else>
</if-not-empty>
<calculate field-name="quantityNotIssued" map-name="parameters"><number value="0"/></calculate>
@@ -255,7 +255,7 @@
<set from-field="inventoryItem.inventoryItemId" field="issuanceCreateMap.inventoryItemId"/>
<calculate field-name="quantity" map-name="issuanceCreateMap"><number value="1"/></calculate>
<call-service service-name="assignInventoryToWorkEffort" in-map-name="issuanceCreateMap"/>
- <clear-field field-name="issuanceCreateMap"/>
+ <clear-field field="issuanceCreateMap"/>
<calculate field-name="parameters.quantityNotIssued">
<calcop field-name="parameters.quantityNotIssued" operator="subtract"><number value="1.0"/></calcop>
@@ -310,7 +310,7 @@
<set field="createDetailMap.reasonEnumId" from-field="parameters.reasonEnumId"/>
<set field="createDetailMap.description" from-field="parameters.description"/>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
- <clear-field field-name="createDetailMap"/>
+ <clear-field field="createDetailMap"/>
<calculate field-name="quantityNotIssued" map-name="parameters">
<calcop operator="subtract" field-name="parameters.quantityNotIssued">
@@ -320,7 +320,7 @@
<set field="balanceInventoryItemsInMap.inventoryItemId" from-field="inventoryItem.inventoryItemId"/>
<call-service service-name="balanceInventoryItems" in-map-name="balanceInventoryItemsInMap"/>
- <clear-field field-name="issuanceCreateMap"/>
+ <clear-field field="issuanceCreateMap"/>
</if-compare>
</if-not-empty>
Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml?rev=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml (original)
+++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml Tue Dec 30 04:04:24 2008
@@ -86,7 +86,7 @@
</else>
</if-not-empty>
<if-not-empty field="routingGS">
- <clear-field field-name="lookupRouting"/>
+ <clear-field field="lookupRouting"/>
<set from-field="routingGS.workEffortId" field="lookupRouting.workEffortId"/>
<find-by-primary-key entity-name="WorkEffort" value-field="routing" map="lookupRouting"/>
<else>
@@ -100,7 +100,7 @@
</or>
</condition>
<then>
- <clear-field field-name="lookupRouting"/>
+ <clear-field field="lookupRouting"/>
<set value="DEFAULT_ROUTING" field="lookupRouting.workEffortId"/>
<find-by-primary-key entity-name="WorkEffort" value-field="routing" map="lookupRouting"/>
</then>
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=730109&r1=730108&r2=730109&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:04:24 2008
@@ -85,11 +85,11 @@
<set field="updatePartyContactMechCtx.contactMechPurposeTypeId" value="GENERAL_LOCATION"/>
<call-service service-name="updatePartyContactMech" in-map-name="updatePartyContactMechCtx"/>
</if-not-empty>
- <clear-field field-name="updatePartyContactMechCtx"/>
+ <clear-field field="updatePartyContactMechCtx"/>
<set field="deletePartyContactMechCtx.partyId" from-field="partyId"/>
<set field="deletePartyContactMechCtx.contactMechId" from-field="addrContactMechId"/>
<call-service service-name="deletePartyContactMech" in-map-name="deletePartyContactMechCtx"/>
- <clear-field field-name="deletePartyContactMechCtx"/>
+ <clear-field field="deletePartyContactMechCtx"/>
</if-not-empty>
</if-compare>
<if-compare field="parameters.useContactNum2" operator="equals" value="Y">
@@ -102,11 +102,11 @@
<set field="updatePartyContactMechCtx.contactMechPurposeTypeId" value="PRIMARY_PHONE"/>
<call-service service-name="updatePartyContactMech" in-map-name="updatePartyContactMechCtx"/>
</if-not-empty>
- <clear-field field-name="updatePartyContactMechCtx"/>
+ <clear-field field="updatePartyContactMechCtx"/>
<set field="deletePartyContactMechCtx.partyId" from-field="partyId"/>
<set field="deletePartyContactMechCtx.contactMechId" from-field="phoneContactMechId"/>
<call-service service-name="deletePartyContactMech" in-map-name="deletePartyContactMechCtx"/>
- <clear-field field-name="deletePartyContactMechCtx"/>
+ <clear-field field="deletePartyContactMechCtx"/>
</if-not-empty>
</if-compare>
<if-compare field="parameters.useEmail2" operator="equals" value="Y">
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=730109&r1=730108&r2=730109&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:04:24 2008
@@ -416,7 +416,7 @@
<if-not-empty field="orderItem">
<get-related value-name="orderItem" relation-name="OrderAdjustment" list-name="orderAdjustments"/>
<iterate entry="orderAdjustment" list="orderAdjustments">
- <clear-field field-name="returnAdjCtx"/>
+ <clear-field field="returnAdjCtx"/>
<set field="returnAdjCtx.returnId" from-field="parameters.returnId"/>
<set field="returnAdjCtx.returnItemSeqId" from-field="newEntity.returnItemSeqId"/>
<set field="returnAdjCtx.returnTypeId" from-field="newEntity.returnTypeId"/>
@@ -764,7 +764,7 @@
<!-- create the return item -->
<if-not-empty field="newItemCtx.orderAdjustmentId">
<log level="info" message="Found unexpected orderAdjustment:${newItemCtx.orderAdjustmentId}"/>
- <clear-field field-name="newItemCtx.orderAdjustmentId"/>
+ <clear-field field="newItemCtx.orderAdjustmentId"/>
</if-not-empty>
<if-compare field="newItemCtx.returnQuantity" value="0" operator="greater" type="Double">
<!-- otherwise, items which have been fully returned would still get passed in and then come back with an error -->
@@ -783,7 +783,7 @@
</condition-list>
</entity-condition>
<iterate entry="orderAdjustment" list="orderAdjustments">
- <clear-field field-name="returnAdjCtx"/>
+ <clear-field field="returnAdjCtx"/>
<set from-field="orderAdjustment.orderAdjustmentId" field="returnAdjCtx.orderAdjustmentId"/>
<set from-field="returnId" field="returnAdjCtx.returnId"/>
<!--filter out orderAdjustment that have been returned-->
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=730109&r1=730108&r2=730109&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:04:24 2008
@@ -171,7 +171,7 @@
<result-to-field field-name="quantityOnHandTotal" result-name="quantityOnHandTotal"/>
<result-to-field field-name="availableToPromiseTotal" result-name="availableToPromiseTotal"/>
</call-service>
- <clear-field field-name="inputMap"/>
+ <clear-field field="inputMap"/>
</simple-method>
<simple-method method-name="getProductRequirementMethod" short-description="finds the requirement method for the product">
@@ -403,7 +403,7 @@
<iterate list="products" entry="productFacility">
<set from-field="productFacility.productId" field="parameters.productId"/>
- <clear-field field-name="requirementMethodId"/>
+ <clear-field field="requirementMethodId"/>
<call-simple-method method-name="getProductRequirementMethod"/>
<if-empty field="requirementMethodId">
<set field="requirementMethodId" from-field="parameters.defaultRequirementMethodId"/>
@@ -421,7 +421,7 @@
<if-not-empty field="productFacility.minimumStock">
<!-- Get the product's total quantityOnHand in the facility -->
- <clear-field field-name="inputMap"/>
+ <clear-field field="inputMap"/>
<set from-field="productFacility.productId" field="inputMap.productId"/>
<set from-field="productFacility.facilityId" field="inputMap.facilityId"/>
<call-service service-name="getInventoryAvailableByFacility" in-map-name="inputMap">
@@ -438,7 +438,7 @@
<!-- No requirements are created if we are already under stock -->
<if-compare-field field="currentQuantity" to-field="productFacility.minimumStock" operator="less" type="Double">
- <clear-field field-name="inputMap"/>
+ <clear-field field="inputMap"/>
<set from-field="productFacility.productId" field="inputMap.productId"/>
<if-not-empty field="productFacility.reorderQuantity">
<set from-field="productFacility.reorderQuantity" field="inputMap.quantity" type="Double"/>
@@ -569,7 +569,7 @@
</and>
</condition>
<then>
- <clear-field field-name="cancelOrderItemInMap"/>
+ <clear-field field="cancelOrderItemInMap"/>
<set-service-fields service-name="cancelOrderItemNoActions" to-map-name="cancelOrderItemInMap" map-name="parameters"/>
<set from-field="orderItem.orderItemSeqId" field="cancelOrderItemInMap.orderItemSeqId"/>
<call-service service-name="cancelOrderItemNoActions" in-map-name="cancelOrderItemInMap"/>
@@ -940,14 +940,14 @@
<first-from-list list="pcmpList" entry="pcmp"/>
<set-service-fields service-name="deletePartyContactMechPurposeIfExists" map-name="pcmp" to-map-name="serviceInMap"/>
<call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/>
- <clear-field field-name="serviceInMap"/>
+ <clear-field field="serviceInMap"/>
</if-not-empty>
<set field="serviceContext.partyId" from-field="userLogin.partyId"/>
<set field="serviceContext.contactMechId" from-field="parameters.shipToContactMechId"/>
<set field="serviceContext.contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
<call-service service-name="createPartyContactMechPurpose" in-map-name="serviceContext"/>
- <clear-field field-name="pcmpList"/>
- <clear-field field-name="serviceContext"/>
+ <clear-field field="pcmpList"/>
+ <clear-field field="serviceContext"/>
</if-empty>
<if-compare field="parameters.setDefaultShipping" operator="equals" value="Y">
<set-service-fields service-name="setPartyProfileDefaults" map-name="parameters" to-map-name="partyProfileDefaultsCtx"/>
@@ -1021,11 +1021,11 @@
<first-from-list entry="pcmp" list="pcmpList"/>
<set-service-fields service-name="deletePartyContactMechPurposeIfExists" map-name="pcmp" to-map-name="serviceInMap"/>
<call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/>
- <clear-field field-name="serviceInMap"/>
+ <clear-field field="serviceInMap"/>
<if-compare field="keepAddressBook" operator="equals" value="N">
<set-service-fields service-name="deletePartyContactMech" map-name="pcmp" to-map-name="serviceInMap"/>
<call-service service-name="deletePartyContactMech" in-map-name="serviceInMap"/>
- <clear-field field-name="serviceInMap"/>
+ <clear-field field="serviceInMap"/>
</if-compare>
<set field="billToAddressCtx.contactMechPurposeTypeId" value="BILLING_LOCATION"/>
<set-service-fields service-name="createPartyContactMechPurpose" map-name="billToAddressCtx" to-map-name="serviceInMap"/>
@@ -1084,14 +1084,14 @@
<first-from-list list="pcmpList" entry="pcmp"/>
<set-service-fields service-name="deletePartyContactMechPurposeIfExists" map-name="pcmp" to-map-name="serviceInMap"/>
<call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/>
- <clear-field field-name="serviceInMap"/>
+ <clear-field field="serviceInMap"/>
</if-not-empty>
<set field="serviceContext.partyId" from-field="userLogin.partyId"/>
<set field="serviceContext.contactMechId" from-field="parameters.billToContactMechId"/>
<set field="serviceContext.contactMechPurposeTypeId" value="BILLING_LOCATION"/>
<call-service service-name="createPartyContactMechPurpose" in-map-name="serviceContext"/>
- <clear-field field-name="pcmpList"/>
- <clear-field field-name="serviceContext"/>
+ <clear-field field="pcmpList"/>
+ <clear-field field="serviceContext"/>
</if-empty>
<if-compare field="parameters.setDefaultBilling" operator="equals" value="Y">
<set-service-fields service-name="setPartyProfileDefaults" map-name="parameters" to-map-name="partyProfileDefaultsCtx"/>
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=730109&r1=730108&r2=730109&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:04:24 2008
@@ -159,14 +159,14 @@
<entity-one entity-name="Quote" value-name="quote" auto-field-map="true"/>
<check-errors/>
<set-service-fields service-name="createQuote" to-map-name="createQuoteInMap" map-name="quote"/>
- <clear-field field-name="createQuoteInMap.statusId"/>
+ <clear-field field="createQuoteInMap.statusId"/>
<call-service service-name="createQuote" in-map-name="createQuoteInMap">
<result-to-field result-name="quoteId" field-name="quoteIdTo"/>
</call-service>
<if-compare field="parameters.copyQuoteItems" value="Y" operator="equals">
<get-related value-name="quote" relation-name="QuoteItem" list-name="quoteItems"/>
<iterate list="quoteItems" entry="quoteItem">
- <clear-field field-name="createQuoteItemInMap"/>
+ <clear-field field="createQuoteItemInMap"/>
<set-service-fields service-name="createQuoteItem" to-map-name="createQuoteItemInMap" map-name="quoteItem"/>
<set from-field="quoteIdTo" field="createQuoteItemInMap.quoteIdTo"/>
<set from-field="parameters.copyQuoteAdjustments" field="createQuoteItemInMap.copyQuoteAdjustments"/>
@@ -178,7 +178,7 @@
<get-related value-name="quote" relation-name="QuoteAdjustment" list-name="quoteAdjustments"/>
<iterate list="quoteAdjustments" entry="quoteAdjustment">
<if-empty field="quoteAdjustment.quoteItemSeqId">
- <clear-field field-name="createQuoteAdjustmentInMap"/>
+ <clear-field field="createQuoteAdjustmentInMap"/>
<set-service-fields service-name="createQuoteAdjustment" to-map-name="createQuoteAdjustmentInMap" map-name="quoteAdjustment"/>
<set from-field="quoteIdTo" field="createQuoteAdjustmentInMap.quoteId"/>
<call-service service-name="createQuoteAdjustment" in-map-name="createQuoteAdjustmentInMap"/>
@@ -190,7 +190,7 @@
<get-related value-name="quote" relation-name="QuoteRole" list-name="quoteRoles"/>
<iterate list="quoteRoles" entry="quoteRole">
<if-compare field="quoteRole.roleTypeId" value="REQ_TAKER" operator="not-equals">
- <clear-field field-name="createQuoteRoleInMap"/>
+ <clear-field field="createQuoteRoleInMap"/>
<set-service-fields service-name="createQuoteRole" to-map-name="createQuoteRoleInMap" map-name="quoteRole"/>
<set from-field="quoteIdTo" field="createQuoteRoleInMap.quoteId"/>
<call-service service-name="createQuoteRole" in-map-name="createQuoteRoleInMap"/>
@@ -201,7 +201,7 @@
<if-compare field="parameters.copyQuoteAttributes" value="Y" operator="equals">
<get-related value-name="quote" relation-name="QuoteAttribute" list-name="quoteAttributes"/>
<iterate list="quoteAttributes" entry="quoteAttribute">
- <clear-field field-name="createQuoteAttributeInMap"/>
+ <clear-field field="createQuoteAttributeInMap"/>
<set-service-fields service-name="createQuoteAttribute" to-map-name="createQuoteAttributeInMap" map-name="quoteAttribute"/>
<set from-field="quoteIdTo" field="createQuoteAttributeInMap.quoteId"/>
<call-service service-name="createQuoteAttribute" in-map-name="createQuoteAttributeInMap"/>
@@ -211,7 +211,7 @@
<if-compare field="parameters.copyQuoteCoefficients" value="Y" operator="equals">
<get-related value-name="quote" relation-name="QuoteCoefficient" list-name="quoteCoefficients"/>
<iterate list="quoteCoefficients" entry="quoteCoefficient">
- <clear-field field-name="createQuoteCoefficientInMap"/>
+ <clear-field field="createQuoteCoefficientInMap"/>
<set-service-fields service-name="createQuoteCoefficient" to-map-name="createQuoteCoefficientInMap" map-name="quoteCoefficient"/>
<set from-field="quoteIdTo" field="createQuoteCoefficientInMap.quoteId"/>
<call-service service-name="createQuoteCoefficient" in-map-name="createQuoteCoefficientInMap"/>
@@ -381,7 +381,7 @@
<set from-field="parameters.quoteItemSeqId" field="createQuoteItemInMap.quoteItemSeqId"/>
<if-empty field="parameters.quoteIdTo">
<if-empty field="parameters.quoteItemSeqIdTo">
- <clear-field field-name="createQuoteItemInMap.quoteItemSeqId"/>
+ <clear-field field="createQuoteItemInMap.quoteItemSeqId"/>
</if-empty>
</if-empty>
@@ -395,7 +395,7 @@
<if-compare field="parameters.copyQuoteAdjustments" value="Y" operator="equals">
<get-related value-name="quoteItem" relation-name="QuoteAdjustment" list-name="quoteAdjustments"/>
<iterate list="quoteAdjustments" entry="quoteAdjustment">
- <clear-field field-name="createQuoteAdjustmentInMap"/>
+ <clear-field field="createQuoteAdjustmentInMap"/>
<set-service-fields service-name="createQuoteAdjustment" to-map-name="createQuoteAdjustmentInMap" map-name="quoteAdjustment"/>
<set from-field="quoteIdTo" field="createQuoteAdjustmentInMap.quoteId"/>
<set from-field="quoteItemSeqId" field="createQuoteAdjustmentInMap.quoteItemSeqId"/>
@@ -531,7 +531,7 @@
<set from-field="parameters.custRequestId" field="lookupRequestRole.custRequestId"/>
<find-by-and entity-name="CustRequestParty" map-name="lookupRequestRole" list-name="roles"/>
<iterate entry="role" list="roles">
- <clear-field field-name="cqrContext"/>
+ <clear-field field="cqrContext"/>
<set from-field="quoteId" field="cqrContext.quoteId"/>
<set from-field="role.partyId" field="cqrContext.partyId"/>
<set from-field="role.roleTypeId" field="cqrContext.roleTypeId"/>
@@ -576,7 +576,7 @@
<get-related value-name="quote" relation-name="QuoteItem" list-name="quoteItems"/>
<iterate list="quoteItems" entry="quoteItem">
<if-compare field="quoteItem.isPromo" value="Y" operator="equals">
- <clear-field field-name="removeQuoteItemInMap"/>
+ <clear-field field="removeQuoteItemInMap"/>
<set-service-fields service-name="removeQuoteItem" to-map-name="removeQuoteItemInMap" map-name="parameters"/>
<set from-field="quoteItem.quoteItemSeqId" field="removeQuoteItemInMap.quoteItemSeqId"/>
<call-service service-name="removeQuoteItem" in-map-name="removeQuoteItemInMap"/>
@@ -587,7 +587,7 @@
<iterate list="quoteAdjustments" entry="quoteAdjustment">
<!-- make sure this is not a manual adjustments -->
<if-not-empty field="quoteAdjustment.productPromoId">
- <clear-field field-name="removeQuoteAdjustmentInMap"/>
+ <clear-field field="removeQuoteAdjustmentInMap"/>
<set-service-fields service-name="removeQuoteAdjustment" to-map-name="removeQuoteAdjustmentInMap" map-name="parameters"/>
<set from-field="quoteAdjustment.quoteAdjustmentId" field="removeQuoteAdjustmentInMap.quoteAdjustmentId"/>
<call-service service-name="removeQuoteAdjustment" in-map-name="removeQuoteAdjustmentInMap"/>
@@ -605,7 +605,7 @@
<if-empty field="orderItemSeqId">
<!-- this is a new (promo) item -->
<!-- a new quote item is created -->
- <clear-field field-name="createQuoteItemInMap"/>
+ <clear-field field="createQuoteItemInMap"/>
<set-service-fields service-name="createQuoteItem" to-map-name="createQuoteItemInMap" map-name="parameters"/>
<call-object-method obj-field-name="item" method-name="getProductId" ret-field-name="createQuoteItemInMap.productId"/>
<call-object-method obj-field-name="item" method-name="getQuantity" ret-field-name="createQuoteItemInMap.quantity"/>
@@ -634,7 +634,7 @@
<call-object-method obj-field-name="cart" method-name="findCartItem" ret-field-name="item">
<field field-name="quoteItem.quoteItemSeqId" type="String"/>
</call-object-method>
- <clear-field field-name="updateQuoteItemInMap"/>
+ <clear-field field="updateQuoteItemInMap"/>
<set from-field="quoteItem.quoteId" field="updateQuoteItemInMap.quoteId"/>
<set from-field="quoteItem.quoteItemSeqId" field="updateQuoteItemInMap.quoteItemSeqId"/>
<call-object-method obj-field-name="item" method-name="getBasePrice" ret-field-name="updateQuoteItemInMap.quoteUnitPrice"/>
@@ -720,7 +720,7 @@
<call-object-method obj-field-name="parameters.cart" method-name="items" ret-field-name="items"/>
<iterate list="items" entry="item">
<!-- a new quote item is created -->
- <clear-field field-name="createQuoteItemInMap"/>
+ <clear-field field="createQuoteItemInMap"/>
<call-object-method obj-field-name="item" method-name="getIsPromo" ret-field-name="isPromo"/>
<if-compare field="isPromo" value="true" operator="equals" type="Boolean">
<set value="Y" field="createQuoteItemInMap.isPromo"/>
@@ -834,7 +834,7 @@
<get-related value-name="custRequest" relation-name="CustRequestItem" list-name="custRequestItems"/>
<iterate list="custRequestItems" entry="custRequestItem">
- <clear-field field-name="createQuoteItemInMap"/>
+ <clear-field field="createQuoteItemInMap"/>
<set field="createQuoteItemInMap.quoteId" from-field="quoteId"/>
<set field="createQuoteItemInMap.custRequestId" from-field="custRequestItem.custRequestId"/>
<set field="createQuoteItemInMap.custRequestItemSeqId" from-field="custRequestItem.custRequestItemSeqId"/>
@@ -850,7 +850,7 @@
<!-- roles -->
<get-related value-name="custRequest" relation-name="CustRequestParty" list-name="custRequestParties"/>
<iterate list="custRequestParties" entry="custRequestParty">
- <clear-field field-name="createQuoteRoleInMap"/>
+ <clear-field field="createQuoteRoleInMap"/>
<!-- The REQ_TAKER role is automatically added by the createQuote service -->
<if-compare field="custRequestParty.roleTypeId" value="REQ_TAKER" operator="not-equals">
<set field="createQuoteRoleInMap.quoteId" from-field="quoteId"/>
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=730109&r1=730108&r2=730109&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:04:24 2008
@@ -173,7 +173,7 @@
<set-service-fields to-map-name="statusMap" service-name="createCustRequestStatus" map-name="custRequest"/>
<call-service service-name="createCustRequestStatus" in-map-name="statusMap"/>
<if-not-empty field="isShowEvent">
- <clear-field field-name="successMessage"/>
+ <clear-field field="successMessage"/>
</if-not-empty>
</if-compare-field>
<now-timestamp-to-env env-name="nowTimestamp"/>
@@ -308,7 +308,7 @@
<call-object-method obj-field-name="parameters.cart" method-name="items" ret-field-name="items"/>
<iterate list="items" entry="item">
<!-- a new request item is created -->
- <clear-field field-name="createCustRequestItemInMap"/>
+ <clear-field field="createCustRequestItemInMap"/>
<call-object-method obj-field-name="item" method-name="getConfigWrapper" ret-field-name="configWrapper"/>
<if-not-empty field="configWrapper">
<call-object-method obj-field-name="configWrapper" method-name="getConfigId" ret-field-name="configId"/>
@@ -361,7 +361,7 @@
<set field="createCustRequestItemInMap.custRequestItemSeqId" from-field="parameters.custRequestItemSeqId"/>
<if-empty field="parameters.custRequestIdTo">
<if-empty field="parameters.custRequestItemSeqIdTo">
- <clear-field field-name="createCustRequestItemInMap.custRequestItemSeqId"/>
+ <clear-field field="createCustRequestItemInMap.custRequestItemSeqId"/>
</if-empty>
</if-empty>
@@ -375,11 +375,11 @@
<if-compare field="parameters.copyLinkedQuotes" value="Y" operator="equals">
<get-related value-name="custRequestItem" relation-name="QuoteItem" list-name="quoteItems"/>
<iterate list="quoteItems" entry="quoteItem">
- <clear-field field-name="createQuoteItemInMap"/>
+ <clear-field field="createQuoteItemInMap"/>
<set-service-fields service-name="createQuoteItem" to-map-name="createQuoteItemInMap" map-name="quoteItem"/>
<set field="createQuoteItemInMap.custRequestId" from-field="custRequestIdTo"/>
<set field="createQuoteItemInMap.custRequestItemSeqId" from-field="custRequestItemSeqId"/>
- <clear-field field-name="createQuoteItemInMap.quoteItemSeqId"/>
+ <clear-field field="createQuoteItemInMap.quoteItemSeqId"/>
<call-service service-name="createQuoteItem" in-map-name="createQuoteItemInMap"/>
</iterate>
</if-compare>
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=730109&r1=730108&r2=730109&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:04:24 2008
@@ -160,14 +160,14 @@
<check-errors/>
<if-compare field="quantityNotTransferred" value="0.0" operator="greater" type="Double">
<!-- we create a new requirement for the quantity not trasferred (because not available) -->
- <clear-field field-name="inputMap"/>
+ <clear-field field="inputMap"/>
<set-service-fields service-name="createRequirement" map-name="requirement" to-map-name="inputMap"/>
<set field="inputMap.quantity" from-field="quantityNotTransferred"/>
<call-service service-name="createRequirement" in-map-name="inputMap"/>
<check-errors/>
</if-compare>
<check-errors/>
- <clear-field field-name="inputMap"/>
+ <clear-field field="inputMap"/>
<set field="inputMap.requirementId" from-field="requirement.requirementId"/>
<set field="inputMap.statusId" value="REQ_ORDERED"/>
<call-service service-name="updateRequirement" in-map-name="inputMap"/>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml?rev=730109&r1=730108&r2=730109&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:04:24 2008
@@ -234,7 +234,7 @@
<calcop operator="get" field-name="shoppingListItem.quantity"/>
</calcop>
</calculate>
- <clear-field field-name="calcPriceInMap"/>
+ <clear-field field="calcPriceInMap"/>
</iterate>
<entity-and entity-name="ShoppingList" list-name="childshoppingLists" use-cache="true">
@@ -251,7 +251,7 @@
<calcop field-name="totalPrice" operator="get"/>
<calcop field-name="calcPriceOutMap.totalPrice" operator="get"/>
</calculate>
- <clear-field field-name="calcChildPriceInMap"/>
+ <clear-field field="calcChildPriceInMap"/>
</iterate>
<field-to-result field-name="totalPrice" result-name="totalPrice"/>
@@ -334,7 +334,7 @@
</condition-list>
</entity-condition>
<iterate list="compProductAssocList" entry="compProductAssoc">
- <clear-field field-name="shoppingListParameters" />
+ <clear-field field="shoppingListParameters" />
<set field="shoppingListParameters.productId" from-field="compProductAssoc.productIdTo" />
<set field="shoppingListParameters.shoppingListId" from-field="shoppingListId" />
<set field="shoppingListParameters.quantity" value="1" type="Double" />
@@ -359,7 +359,7 @@
</condition-list>
</entity-condition>
<iterate list="compProductAssocList" entry="compProductAssoc">
- <clear-field field-name="shoppingListParameters" />
+ <clear-field field="shoppingListParameters" />
<set field="shoppingListParameters.productId" from-field="compProductAssoc.productIdTo" />
<set field="shoppingListParameters.shoppingListId" from-field="shoppingListId" />
<set field="shoppingListParameters.quantity" value="1" type="Double" />
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=730109&r1=730108&r2=730109&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:04:24 2008
@@ -344,7 +344,7 @@
<first-from-list entry="pcmp" list="pcmpList"/>
<set-service-fields service-name="deletePartyContactMechPurposeIfExists" map-name="pcmp" to-map-name="serviceInMap"/>
<call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/>
- <clear-field field-name="serviceInMap"/>
+ <clear-field field="serviceInMap"/>
</if-not-empty>
<set field="serviceContext.contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
<call-service service-name="createPartyContactMechPurpose" in-map-name="serviceContext"/>
@@ -449,12 +449,12 @@
<first-from-list list="pcmpList" entry="pcmp"/>
<set-service-fields service-name="deletePartyContactMechPurposeIfExists" map-name="pcmp" to-map-name="serviceInMap"/>
<call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/>
- <clear-field field-name="serviceInMap"/>
+ <clear-field field="serviceInMap"/>
</if-not-empty>
<set field="serviceContext.contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
<call-service service-name="createPartyContactMechPurpose" in-map-name="serviceContext"/>
- <clear-field field-name="pcmpList"/>
- <clear-field field-name="serviceContext"/>
+ <clear-field field="pcmpList"/>
+ <clear-field field="serviceContext"/>
</if-empty>
<set-service-fields service-name="setPartyProfileDefaults" map-name="parameters" to-map-name="partyProfileDefaultsCtx"/>
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=730109&r1=730108&r2=730109&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:04:24 2008
@@ -526,7 +526,7 @@
<call-simple-method method-name="followPartyRelationshipsInlineRecurse"/>
</simple-method>
<simple-method method-name="followPartyRelationshipsInlineRecurse" short-description="followPartyRelationshipsInlineRecurse">
- <clear-field field-name="_inline_NewRelatedPartyIdList"/>
+ <clear-field field="_inline_NewRelatedPartyIdList"/>
<iterate entry="relatedPartyId" list="relatedPartyIdList">
<if>
@@ -534,7 +534,7 @@
<then>
<field-to-list field-name="relatedPartyId" list-name="_inline_relatedPartyIdAlreadySearchedList"/>
- <clear-field field-name="_inline_PartyRelationshipList"/>
+ <clear-field field="_inline_PartyRelationshipList"/>
<entity-condition entity-name="PartyRelationship" list-name="_inline_PartyRelationshipList" use-cache="${useCache}">
<condition-list combine="and">
<condition-expr field-name="partyIdFrom" env-name="relatedPartyId"/>
@@ -567,7 +567,7 @@
</iterate>
<if-compare field="includeFromToSwitched" operator="equals" value="Y">
- <clear-field field-name="_inline_PartyRelationshipList"/>
+ <clear-field field="_inline_PartyRelationshipList"/>
<entity-condition entity-name="PartyRelationship" list-name="_inline_PartyRelationshipList" use-cache="${useCache}">
<condition-list combine="and">
<condition-expr field-name="partyIdTo" env-name="relatedPartyId"/>
@@ -620,7 +620,7 @@
<field-to-result field-name="childRoleTypeIdList"/>
</simple-method>
<simple-method method-name="getChildRoleTypesInline" short-description="getChildRoleTypes">
- <clear-field field-name="_inline_NewRoleTypeIdList"/>
+ <clear-field field="_inline_NewRoleTypeIdList"/>
<iterate entry="roleTypeId" list="${roleTypeIdListName}">
<if>
@@ -628,7 +628,7 @@
<then>
<field-to-list field-name="roleTypeId" list-name="_inline_roleTypeIdAlreadySearchedList"/>
- <clear-field field-name="_inline_RoleTypeList"/>
+ <clear-field field="_inline_RoleTypeList"/>
<entity-condition entity-name="RoleType" list-name="_inline_RoleTypeList" use-cache="true">
<condition-expr field-name="parentTypeId" operator="equals" env-name="roleTypeId"/>
</entity-condition>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml?rev=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml Tue Dec 30 04:04:24 2008
@@ -111,7 +111,7 @@
</assert>
<check-errors/>
- <clear-field field-name="contactMech"/>
+ <clear-field field="contactMech"/>
<!-- now update with changing the email address, a new record will be created in ContactMech entity this time -->
<set field="serviceCtx.emailAddress" value="ofbiz-test@yahoo.com"/>
<call-service service-name="updatePartyEmailAddress" in-map-name="serviceCtx">
@@ -165,7 +165,7 @@
<not><if-empty field="contactMech"/></not>
<if-compare-field field="contactMechId" to-field="serviceCtx.contactMechId" operator="equals"/>
</assert>
- <clear-field field-name="telecomNumber"/>
+ <clear-field field="telecomNumber"/>
<get-related-one value-name="contactMech" relation-name="TelecomNumber" to-value-name="telecomNumber"/>
<assert>
<not><if-empty field="telecomNumber"/></not>
@@ -174,8 +174,8 @@
</assert>
<check-errors/>
- <clear-field field-name="contactMech"/>
- <clear-field field-name="telecomNumber"/>
+ <clear-field field="contactMech"/>
+ <clear-field field="telecomNumber"/>
<!-- try now with changing the telecom number, a new record will be created in ContactMech, TelecomNumber entity this time -->
<set field="serviceCtx.contactNumber" value="444-4444"/>
@@ -234,7 +234,7 @@
<not><if-empty field="contactMech"/></not>
<if-compare-field field="contactMechId" to-field="serviceCtx.contactMechId" operator="equals"/>
</assert>
- <clear-field field-name="postalAddress"/>
+ <clear-field field="postalAddress"/>
<get-related-one value-name="contactMech" relation-name="PostalAddress" to-value-name="postalAddress"/>
<assert>
<not><if-empty field="postalAddress"/></not>
@@ -244,8 +244,8 @@
</assert>
<check-errors/>
- <clear-field field-name="contactMech"/>
- <clear-field field-name="postalAddress"/>
+ <clear-field field="contactMech"/>
+ <clear-field field="postalAddress"/>
<!-- try now with changing the postal address fields, a new record will be created in ContactMech, PostalAddress entity this time -->
<set field="serviceCtx.stateProvinceGeoId" value="VA"/>
@@ -300,7 +300,7 @@
<result-to-field result-name="oldPaymentMethodId"/>
</call-service>
<log level="info" message="====== paymentMethodId [${paymentMethodId}] ======"/>
- <clear-field field-name="paymentMethodAndCreditCard"/>
+ <clear-field field="paymentMethodAndCreditCard"/>
<entity-one entity-name="PaymentMethodAndCreditCard" value-name="paymentMethodAndCreditCard"/>
<assert>
<not><if-empty field="paymentMethodAndCreditCard"/></not>
@@ -310,9 +310,9 @@
</assert>
<check-errors/>
- <clear-field field-name="paymentMethodAndCreditCard"/>
- <clear-field field-name="paymentMethodId"/>
- <clear-field field-name="oldPaymentMethodId"/>
+ <clear-field field="paymentMethodAndCreditCard"/>
+ <clear-field field="paymentMethodId"/>
+ <clear-field field="oldPaymentMethodId"/>
<!-- try now with few changes (cardType, cardNumber in this case), a new record will be created in PaymentMethod, CreditCard entity -->
<set field="serviceCtx.cardType" value="MasterCard"/>
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=730109&r1=730108&r2=730109&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:04:24 2008
@@ -363,12 +363,12 @@
<set field="categoryImageUrlMap.isExists" from-field="isExists"/>
<set field="filesImageMap.categoryImageUrlMap" from-field="categoryImageUrlMap" />
<if-compare value="N" field="isExists" operator="equals">
- <clear-field field-name="categoryImageUrl" map-name="category"></clear-field>
+ <clear-field field="categoryImageUrl" map-name="category"></clear-field>
</if-compare>
</if-not-empty>
<!-- check for link image url -->
<if-not-empty field="category.linkOneImageUrl">
- <clear-field field-name="checkImageUrlContext.imageUrl"/>
+ <clear-field field="checkImageUrlContext.imageUrl"/>
<set field="checkImageUrlContext.imageUrl" from-field="category.linkOneImageUrl"/>
<call-service service-name="checkImageUrl" in-map-name="checkImageUrlContext">
<result-to-field result-name="isExists" field-name="isExists"/>
@@ -377,12 +377,12 @@
<set field="linkOneImageUrlMap.isExists" from-field="isExists"/>
<set field="filesImageMap.linkOneImageUrlMap" from-field="linkOneImageUrlMap" />
<if-compare value="N" field="isExists" operator="equals">
- <clear-field field-name="linkOneImageUrl" map-name="category"></clear-field>
+ <clear-field field="linkOneImageUrl" map-name="category"></clear-field>
</if-compare>
</if-not-empty>
<!-- check for link two image url -->
<if-not-empty field="category.linkTwoImageUrl">
- <clear-field field-name="checkImageUrlContext.imageUrl"/>
+ <clear-field field="checkImageUrlContext.imageUrl"/>
<set field="checkImageUrlContext.imageUrl" from-field="category.linkTwoImageUrl"/>
<call-service service-name="checkImageUrl" in-map-name="checkImageUrlContext">
<result-to-field result-name="isExists" field-name="isExists"/>
@@ -391,7 +391,7 @@
<set field="linkTwoImageUrlMap.isExists" from-field="isExists"/>
<set field="filesImageMap.linkTwoImageUrlMap" from-field="linkTwoImageUrlMap" />
<if-compare value="N" field="isExists" operator="equals">
- <clear-field field-name="linkTwoImageUrl" map-name="category"></clear-field>
+ <clear-field field="linkTwoImageUrl" map-name="category"></clear-field>
</if-compare>
</if-not-empty>
<!-- set-service-fields service-name="updateProductCategory" map-name="category" to-map-name="updateProductCategoryContext"/>
@@ -415,12 +415,12 @@
<set field="filesImageMap.smallImageUrlMap" from-field="smallImageUrlMap" />
<if-compare value="N" field="isExists" operator="equals">
<log level="info" message="Update SmallImage for product Id ${parameters.productId}" />
- <clear-field field-name="smallImageUrl" map-name="product"></clear-field>
+ <clear-field field="smallImageUrl" map-name="product"></clear-field>
</if-compare>
</if-not-empty>
<!-- check for medium image url -->
<if-not-empty field="product.mediumImageUrl">
- <clear-field field-name="checkImageUrlContext.imageUrl"/>
+ <clear-field field="checkImageUrlContext.imageUrl"/>
<set field="checkImageUrlContext.imageUrl" from-field="product.mediumImageUrl"/>
<call-service service-name="checkImageUrl" in-map-name="checkImageUrlContext">
<result-to-field result-name="isExists" field-name="isExists"/>
@@ -429,12 +429,12 @@
<set field="mediumImageUrlMap.isExists" from-field="isExists"/>
<set field="filesImageMap.mediumImageUrlMap" from-field="mediumImageUrlMap" />
<if-compare value="N" field="isExists" operator="equals">
- <clear-field field-name="mediumImageUrl" map-name="product"></clear-field>
+ <clear-field field="mediumImageUrl" map-name="product"></clear-field>
</if-compare>
</if-not-empty>
<!-- check for large image url -->
<if-not-empty field="product.largeImageUrl">
- <clear-field field-name="checkImageUrlContext.imageUrl"/>
+ <clear-field field="checkImageUrlContext.imageUrl"/>
<set field="checkImageUrlContext.imageUrl" from-field="product.largeImageUrl"/>
<call-service service-name="checkImageUrl" in-map-name="checkImageUrlContext">
<result-to-field result-name="isExists" field-name="isExists"/>
@@ -443,12 +443,12 @@
<set field="largeImageUrlMap.isExists" from-field="isExists"/>
<set field="filesImageMap.largeImageUrlMap" from-field="largeImageUrlMap" />
<if-compare value="N" field="isExists" operator="equals">
- <clear-field field-name="largeImageUrl" map-name="product"></clear-field>
+ <clear-field field="largeImageUrl" map-name="product"></clear-field>
</if-compare>
</if-not-empty>
<!-- check for detail image url -->
<if-not-empty field="product.detailImageUrl">
- <clear-field field-name="checkImageUrlContext.imageUrl"/>
+ <clear-field field="checkImageUrlContext.imageUrl"/>
<set field="checkImageUrlContext.imageUrl" from-field="product.detailImageUrl"/>
<call-service service-name="checkImageUrl" in-map-name="checkImageUrlContext">
<result-to-field result-name="isExists" field-name="isExists"/>
@@ -457,7 +457,7 @@
<set field="detailImageUrlMap.isExists" from-field="isExists"/>
<set field="filesImageMap.detailImageUrlMap" from-field="detailImageUrlMap" />
<if-compare value="N" field="isExists" operator="equals">
- <clear-field field-name="detailImageUrl" map-name="product"></clear-field>
+ <clear-field field="detailImageUrl" map-name="product"></clear-field>
</if-compare>
</if-not-empty>
<field-to-result field-name="filesImageMap" result-name="filesImageMap"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml?rev=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml Tue Dec 30 04:04:24 2008
@@ -202,7 +202,7 @@
<!-- If the associated category was the primary category for the product, clear that field -->
<entity-one entity-name="Product" value-name="product" auto-field-map="true"/>
<if-compare-field field="product.primaryProductCategoryId" to-field="parameters.productCategoryId" operator="equals">
- <clear-field field-name="product.primaryProductCategoryId"/>
+ <clear-field field="product.primaryProductCategoryId"/>
<store-value value-name="product"/>
</if-compare-field>
@@ -540,7 +540,7 @@
</else>
</if-compare>
<call-service service-name="applyFeatureToProduct" in-map-name="createPfaMap"/>
- <clear-field field-name="createPfaMap"/>
+ <clear-field field="createPfaMap"/>
</iterate-map>
<!-- set isVirtual based on hasSelectableFeatures -->