svn commit: r730116 [1/4] - in /ofbiz/trunk: applications/accounting/script
Locked
svn commit: r730116 [1/4] - in /ofbiz/trunk: applications/accounting/script
 
|
Author: jleroux
Date: Tue Dec 30 04:14:23 2008 New Revision: 730116 URL: http://svn.apache.org/viewvc?rev=730116&view=rev Log: <field-to-result(.*)field-name => <field-to-result$1field Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.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/payment/BillingServices.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/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.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/data/DataServices.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/ContentPermissionServices.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/DataResourcePermissionServices.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.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/marketing/campaign/CampaignServices.xml ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/contact/ContactServices.xml ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.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/communication/CommunicationEventServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyPermissionServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.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/price/PriceServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/rental/RentalServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.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/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml ofbiz/trunk/framework/common/script/org/ofbiz/common/EnumerationServices.xml ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml ofbiz/trunk/framework/common/script/org/ofbiz/common/permission/CommonPermissionServices.xml ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml ofbiz/trunk/framework/example/script/org/ofbiz/example/ExamplePermissionServices.xml ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/WebPosServices.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=730116&r1=730115&r2=730116&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:14:23 2008 @@ -34,7 +34,7 @@ <!-- create a non existing ID --> <sequenced-id-to-env sequence-name="Agreement" env-name="agreementId"/> <set from-field="agreementId" field="newEntity.agreementId"/> - <field-to-result field-name="agreementId" result-name="agreementId"/> + <field-to-result field="agreementId" result-name="agreementId"/> <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="nowTimestamp"/> @@ -108,7 +108,7 @@ <call-service service-name="createAgreementPartyApplic" in-map-name="createAgreementPartyApplicInMap"/> </iterate> </if-compare> - <field-to-result field-name="agreementIdTo" result-name="agreementId"/> + <field-to-result field="agreementIdTo" result-name="agreementId"/> </simple-method> <!-- create a new AgreementItem --> @@ -126,8 +126,8 @@ <set from-field="parameters.agreementItemSeqId" field="newEntity.agreementItemSeqId"/> </else> </if-empty> - <field-to-result field-name="agreementId" result-name="agreementId"/> - <field-to-result field-name="newEntity.agreementItemSeqId" result-name="agreementItemSeqId"/> + <field-to-result field="agreementId" result-name="agreementId"/> + <field-to-result field="newEntity.agreementItemSeqId" result-name="agreementItemSeqId"/> <!-- finally create the record (should not exist already)--> <create-value value-field="newEntity"/> @@ -161,7 +161,7 @@ <set from-field="parameters.agreementId" field="newEntity.agreementId"/> <set from-field="parameters.agreementItemSeqId" field="newEntity.agreementItemSeqId"/> <set from-field="agreementTermId" field="newEntity.agreementTermId"/> - <field-to-result field-name="agreementTermId" result-name="agreementTermId"/> + <field-to-result field="agreementTermId" result-name="agreementTermId"/> <!-- finally create the record (should not exist already)--> <create-value value-field="newEntity"/> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml?rev=730116&r1=730115&r2=730116&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml Tue Dec 30 04:14:23 2008 @@ -25,7 +25,7 @@ <make-value entity-name="CostComponentCalc" value-field="newEntity"/> <sequenced-id-to-env sequence-name="CostComponentCalc" env-name="costComponentCalcId"/> <set from-field="costComponentCalcId" field="newEntity.costComponentCalcId"/> - <field-to-result field-name="costComponentCalcId" result-name="costComponentCalcId"/> + <field-to-result field="costComponentCalcId" result-name="costComponentCalcId"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> </simple-method> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml?rev=730116&r1=730115&r2=730116&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml Tue Dec 30 04:14:23 2008 @@ -78,7 +78,7 @@ </calculate> <create-value value-field="newEntity"/> - <field-to-result field-name="finAccountId" map-name="newEntity" result-name="finAccountId"/> + <field-to-result field="finAccountId" map-name="newEntity" result-name="finAccountId"/> <set-service-fields service-name="createFinAccountStatus" map-name="newEntity" to-map-name="createFinAccountStatusMap"/> <call-service service-name="createFinAccountStatus" in-map-name="createFinAccountStatusMap"/> @@ -87,11 +87,11 @@ <call-simple-method method-name="getArithmeticSettingsInline"/> <entity-one entity-name="FinAccount" value-field="lookedUpValue"/> - <field-to-result field-name="lookedUpValue.replenishPaymentId" result-name="oldReplenishPaymentId"/> - <field-to-result field-name="lookedUpValue.replenishLevel" result-name="oldReplenishLevel"/> + <field-to-result field="lookedUpValue.replenishPaymentId" result-name="oldReplenishPaymentId"/> + <field-to-result field="lookedUpValue.replenishLevel" result-name="oldReplenishLevel"/> <!-- handle statusId change stuff; first put the current statusId in the oldStatusId result --> - <field-to-result field-name="lookedUpValue.statusId" result-name="oldStatusId"/> + <field-to-result field="lookedUpValue.statusId" result-name="oldStatusId"/> <if> <condition> <and> @@ -128,9 +128,9 @@ </calculate> <store-value value-name="lookedUpValue"/> - <field-to-result field-name="lookedUpValue.replenishPaymentId" result-name="replenishPaymentId"/> - <field-to-result field-name="lookedUpValue.replenishLevel" result-name="replenishLevel"/> - <field-to-result field-name="lookedUpValue.finAccountId" result-name="finAccountId"/> + <field-to-result field="lookedUpValue.replenishPaymentId" result-name="replenishPaymentId"/> + <field-to-result field="lookedUpValue.replenishLevel" result-name="replenishLevel"/> + <field-to-result field="lookedUpValue.finAccountId" result-name="finAccountId"/> </simple-method> <simple-method method-name="deleteFinAccount" short-description="Delete a Financial Account"> <entity-one value-field="finAccount" entity-name="FinAccount"/> @@ -186,7 +186,7 @@ </if-compare-field> <create-value value-field="newEntity"/> - <field-to-result field-name="newEntity.finAccountTransId" result-name="finAccountTransId"/> + <field-to-result field="newEntity.finAccountTransId" result-name="finAccountTransId"/> </simple-method> <!-- FinAccountRole Services --> @@ -238,7 +238,7 @@ </if-compare-field> <create-value value-field="newEntity"/> - <field-to-result field-name="newEntity.finAccountAuthId" result-name="finAccountAuthId"/> + <field-to-result field="newEntity.finAccountAuthId" result-name="finAccountAuthId"/> </simple-method> <simple-method method-name="expireFinAccountAuth" short-description="Expire a Financial Account Authorization"> <entity-one entity-name="FinAccountAuth" value-field="finAccountAuth"/> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml?rev=730116&r1=730115&r2=730116&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml Tue Dec 30 04:14:23 2008 @@ -45,7 +45,7 @@ <set from-field="parameters.fixedAssetId" field="newEntity.fixedAssetId"/> </else> </if-empty> - <field-to-result field-name="newEntity.fixedAssetId" result-name="fixedAssetId"/> + <field-to-result field="newEntity.fixedAssetId" result-name="fixedAssetId"/> <!-- finally create the record (should not exist already)--> <create-value value-field="newEntity"/> @@ -188,7 +188,7 @@ <make-value entity-name="FixedAssetMaint" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <make-next-seq-id value-name="newEntity" seq-field-name="maintHistSeqId"/> <!-- this finds the next sub-sequence ID --> - <field-to-result field-name="newEntity.maintHistSeqId" result-name="maintHistSeqId"/> + <field-to-result field="newEntity.maintHistSeqId" result-name="maintHistSeqId"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-not-empty field="parameters.productMaintSeqId"> <entity-one entity-name="FixedAsset" value-field="fixedAsset"/> @@ -245,7 +245,7 @@ <simple-method method-name="updateFixedAssetMaint" short-description="Update an existing FixedAsset Maintenance"> <entity-one entity-name="FixedAssetMaint" value-field="lookedUpValue"/> <set field="oldStatusId" from-field="lookedUpValue.statusId"/> - <field-to-result field-name="oldStatusId"/> + <field-to-result field="oldStatusId"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> <if-not-empty field="parameters.productMaintSeqId"> <entity-one entity-name="FixedAsset" value-field="fixedAsset"/> @@ -598,8 +598,8 @@ </loop> </if-not-empty> <log level="info" message="Using straight line formula depreciation calculated for fixedAsset (${parameters.fixedAssetId}) is ${depreciation}"/> - <field-to-result field-name="assetDepreciationTillDate"/> - <field-to-result field-name="assetNBVAfterDepreciation"/> + <field-to-result field="assetDepreciationTillDate"/> + <field-to-result field="assetNBVAfterDepreciation"/> </simple-method> <simple-method method-name="doubleDecliningBalanceDepreciation" short-description="Calculate double declining balance depreciation to Fixed Asset"> @@ -644,8 +644,8 @@ </loop> </if-not-empty> <log level="info" message="Using double decline formula depreciation calculated for fixedAsset (${parameters.fixedAssetId}) is ${assetDepreciationTillDate}"/> - <field-to-result field-name="assetDepreciationTillDate"/> - <field-to-result field-name="assetNBVAfterDepreciation"/> + <field-to-result field="assetDepreciationTillDate"/> + <field-to-result field="assetNBVAfterDepreciation"/> </simple-method> <simple-method method-name="calculateFixedAssetDepreciation" short-description="Service to calculate the yearly depreciation from dateAcquired year to current financial year"> @@ -729,8 +729,8 @@ </call-service> <log level="info" message="Asset's depreciation calculated till date are ${assetDepreciationTillDate}"/> <log level="info" message="Asset's Net Book Values (NBV) from acquired date after deducting depreciation are ${assetNBVAfterDepreciation}"/> - <field-to-result field-name="assetDepreciationTillDate"/> - <field-to-result field-name="assetNBVAfterDepreciation"/> + <field-to-result field="assetDepreciationTillDate"/> + <field-to-result field="assetNBVAfterDepreciation"/> <else> <add-error><fail-property resource="AccountingUiLabels" property="AccountingFixedAssetDepreciationMethodNotFound"/></add-error> <check-errors/> 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=730116&r1=730115&r2=730116&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:14:23 2008 @@ -115,7 +115,7 @@ <!-- use invoiceIdTemp along with the invoiceIdPrefix to create the real ID --> <set field="invoiceId" value="${partyAcctgPreference.invoiceIdPrefix}${str:toString(invoiceIdTemp)}"/> - <field-to-result field-name="invoiceId" result-name="invoiceId"/> + <field-to-result field="invoiceId" result-name="invoiceId"/> </simple-method> @@ -136,7 +136,7 @@ <set field="newEntity.invoiceId" from-field="parameters.invoiceId"/> </else> </if-empty> - <field-to-result field-name="newEntity.invoiceId" result-name="invoiceId"/> + <field-to-result field="newEntity.invoiceId" result-name="invoiceId"/> <if-empty field="parameters.invoiceDate"> <set from-field="nowTimestamp" field="newEntity.invoiceDate"/> @@ -180,7 +180,7 @@ <call-service service-name="createInvoice" in-map-name="newInvoice"> <result-to-field result-name="invoiceId" field-name="invoiceId"/> </call-service> - <field-to-result field-name="invoiceId" result-name="invoiceId"/> + <field-to-result field="invoiceId" result-name="invoiceId"/> <field-to-request field-name="invoiceId" request-name="invoiceId"/> <iterate entry="invoiceItem" list="invoiceItems"> <set-service-fields service-name="createInvoiceItem" map-name="invoiceItem" to-map-name="createInvoiceItem"/> @@ -194,10 +194,10 @@ <make-value value-field="lookupPKMap" entity-name="Invoice"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="Invoice" map="lookupPKMap" value-field="invoiceValue"/> - <field-to-result field-name="invoiceValue" result-name="invoice"/> + <field-to-result field="invoiceValue" result-name="invoice"/> <!-- and the items --> <get-related value-name="invoiceValue" relation-name="InvoiceItem" list-name="invoiceItemValues"/> - <field-to-result field-name="invoiceItemValues" result-name="invoiceItems"/> + <field-to-result field="invoiceItemValues" result-name="invoiceItems"/> </simple-method> <simple-method method-name="updateInvoice" short-description="Update the header of an existing Invoice"> @@ -253,7 +253,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.invoiceItemSeqId"> <make-next-seq-id value-name="newEntity" seq-field-name="invoiceItemSeqId"/> <!-- this finds the next sub-sequence ID --> - <field-to-result field-name="newEntity.invoiceItemSeqId" result-name="invoiceItemSeqId"/> + <field-to-result field="newEntity.invoiceItemSeqId" result-name="invoiceItemSeqId"/> </if-empty> <!-- if there is no amount and a productItem is supplied fill the amount(price) and description from the product record TODO: there are return adjustments now that make this code very broken. The check for price was added as a quick fix. --> @@ -353,7 +353,7 @@ </if-compare> <check-errors/> </if-not-empty> - <field-to-result field-name="paymentApplication.paymentId" result-name="paymentId"/> + <field-to-result field="paymentApplication.paymentId" result-name="paymentId"/> <set field="currencyUomId" from-field="paymentId.currencyUomId"/> </if-not-empty> <!-- check invoice --> @@ -376,12 +376,12 @@ <call-service service-name="setInvoiceStatus" in-map-name="invoiceStatusMap" /> </if-compare> <check-errors/> - <field-to-result field-name="paymentApplication.invoiceId" result-name="invoiceId"/> + <field-to-result field="paymentApplication.invoiceId" result-name="invoiceId"/> <property-to-field resource="AccountingUiLabels" property="AccountingPaymentApplToInvoice" field-name="toMessage"/> </if-not-empty> <!-- invoice item --> <if-not-empty field="paymentApplication.invoiceItemSeqId"> - <field-to-result field-name="paymentApplication.invoiceItemSeqId" result-name="invoiceItemSeqId"/> + <field-to-result field="paymentApplication.invoiceItemSeqId" result-name="invoiceItemSeqId"/> <property-to-field resource="AccountingUiLabels" property="AccountingApplicationToInvoiceItem" field-name="toMessage"/> </if-not-empty> <!-- toPayment --> @@ -396,11 +396,11 @@ <check-errors/> </if-not-empty> <property-to-field resource="AccountingUiLabels" property="AccountingPaymentApplToPayment" field-name="toMessage"/> - <field-to-result field-name="paymentApplication.toPaymentId" result-name="toPaymentId"/> + <field-to-result field="paymentApplication.toPaymentId" result-name="toPaymentId"/> </if-not-empty> <!-- billing account --> <if-not-empty field="paymentApplication.billingAccountId"> - <field-to-result field-name="paymentApplication.billingAccountId" result-name="billingAccountId"/> + <field-to-result field="paymentApplication.billingAccountId" result-name="billingAccountId"/> <property-to-field resource="AccountingUiLabels" property="AccountingPaymentApplToBillingAccount" field-name="toMessage"/> <entity-one entity-name="BillingAccount" value-field="billingAccount"> <field-map field-name="billingAccountId" from-field="paymentApplication.billingAccountId"/> @@ -409,7 +409,7 @@ </if-not-empty> <!-- tax authority --> <if-not-empty field="paymentApplication.taxAuthGeoId"> - <field-to-result field-name="paymentApplication.taxAuthGeoId" result-name="taxAuthGeoId"/> + <field-to-result field="paymentApplication.taxAuthGeoId" result-name="taxAuthGeoId"/> <property-to-field resource="AccountingUiLabels" property="AccountingPaymentApplToTaxAuth" field-name="toMessage"/> </if-not-empty> <!-- finally delete application --> @@ -435,7 +435,7 @@ <simple-method method-name="setInvoiceStatus" short-description="Set The Invoice Status"> <entity-one entity-name="Invoice" value-field="invoice"/> - <field-to-result field-name="invoice.statusId" result-name="oldStatusId"/> + <field-to-result field="invoice.statusId" result-name="oldStatusId"/> <if-compare-field field="invoice.statusId" to-field="parameters.statusId" operator="not-equals"> <entity-one entity-name="StatusValidChange" value-field="statusChange" auto-field-map="false"> <field-map field-name="statusId" from-field="invoice.statusId"/> @@ -507,7 +507,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id-to-env sequence-name="InvoiceTerm" env-name="newEntity.invoiceTermId"/> - <field-to-result field-name="newEntity.invoiceTermId" result-name="invoiceTermId"/> + <field-to-result field="newEntity.invoiceTermId" result-name="invoiceTermId"/> <create-value value-field="newEntity"/> </simple-method> @@ -543,7 +543,7 @@ <make-value value-field="invoiceContactMech" entity-name="InvoiceContactMech"/> <set-pk-fields map="parameters" value-field="invoiceContactMech"/> <create-value value-field="invoiceContactMech"/> - <field-to-result field-name="contactMechId" map-name="invoiceContactMech"/> + <field-to-result field="contactMechId" map-name="invoiceContactMech"/> </simple-method> <simple-method method-name="updateInvoiceItemType" short-description="Updates a InvoiceItemType Record"> 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=730116&r1=730115&r2=730116&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:14:23 2008 @@ -28,7 +28,7 @@ <!-- AcctgTrans uses a sequenced id, so get the next one now and set it... --> <sequenced-id-to-env sequence-name="AcctgTrans" env-name="newEntity.acctgTransId"/> - <field-to-result field-name="newEntity.acctgTransId" result-name="acctgTransId"/> + <field-to-result field="newEntity.acctgTransId" result-name="acctgTransId"/> <set from-field="userLogin.userLoginId" field="newEntity.lastModifiedByUserLogin"/> <set from-field="userLogin.userLoginId" field="newEntity.createdByUserLogin"/> @@ -73,7 +73,7 @@ <check-errors/> </if-compare> <make-next-seq-id value-name="newEntity" seq-field-name="acctgTransEntrySeqId" numeric-padding="5"/> - <field-to-result field-name="newEntity.acctgTransEntrySeqId" result-name="acctgTransEntrySeqId"/> + <field-to-result field="newEntity.acctgTransEntrySeqId" result-name="acctgTransEntrySeqId"/> <!-- if not explicitly provided in the parameters, set the currency of the entry from PartyAcctgPreference --> <set field="partyAccountingPreferencesCallMap.organizationPartyId" from-field="parameters.organizationPartyId"/> @@ -194,9 +194,9 @@ </calcop> </calculate> - <field-to-result field-name="debitTotal"/> - <field-to-result field-name="creditTotal"/> - <field-to-result field-name="debitCreditDifference"/> + <field-to-result field="debitTotal"/> + <field-to-result field="creditTotal"/> + <field-to-result field="debitCreditDifference"/> </simple-method> <simple-method method-name="postAcctgTrans" short-description="Post a AcctgTrans"> <!-- make sure the AcctgTrans has not already been posted --> @@ -286,7 +286,7 @@ <if-compare field="parameters.verifyOnly" operator="equals" value="Y"> <if-not-empty field="error_list"> - <field-to-result field-name="error_list" result-name="successMessageList"/> + <field-to-result field="error_list" result-name="successMessageList"/> </if-not-empty> <return/> <else> @@ -305,7 +305,7 @@ <set field="acctgTrans.glJournalId" from-field="partyAcctgPreference.errorGlJournalId"/> <store-value value-name="acctgTrans"/> <set field="warningMessage[]" value="The accounting transaction [${acctgTrans.acctgTransId}] has been posted to the Error Journal [${partyAcctgPreference.errorGlJournalId}]."/> - <field-to-result field-name="warningMessage" result-name="successMessageList"/> + <field-to-result field="warningMessage" result-name="successMessageList"/> <return/> </else> </if-empty> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml?rev=730116&r1=730115&r2=730116&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml Tue Dec 30 04:14:23 2008 @@ -27,7 +27,7 @@ <sequenced-id-to-env sequence-name="BillingAccount" env-name="billingAccountId"/> <to-string field-name="billingAccountId"/> <set from-field="billingAccountId" field="newEntity.billingAccountId"/> - <field-to-result field-name="billingAccountId" result-name="billingAccountId"/> + <field-to-result field="billingAccountId" result-name="billingAccountId"/> <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="nowTimestamp"/> @@ -73,7 +73,7 @@ <sequenced-id-to-env sequence-name="BillingAccountTerm" env-name="billingAccountTermId"/> <to-string field-name="billingAccountTermId"/> <set from-field="billingAccountTermId" field="newEntity.billingAccountTermId"/> - <field-to-result field-name="billingAccountTermId" result-name="billingAccountTermId"/> + <field-to-result field="billingAccountTermId" result-name="billingAccountTermId"/> <create-value value-field="newEntity"/> </simple-method> 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=730116&r1=730115&r2=730116&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:14:23 2008 @@ -42,7 +42,7 @@ <set field="payment.paymentId" from-field="parameters.paymentId"/> </else> </if-empty> - <field-to-result field-name="payment.paymentId" result-name="paymentId"/> + <field-to-result field="payment.paymentId" result-name="paymentId"/> <if-not-empty field="parameters.paymentMethodId"> <entity-one entity-name="PaymentMethod" value-field="paymentMethod"> @@ -159,7 +159,7 @@ </if-not-empty> <sequenced-id-to-env sequence-name="PaymentApplication" env-name="paymentAppl.paymentApplicationId"/> - <field-to-result field-name="paymentAppl.paymentApplicationId" result-name="paymentApplicationId"/> + <field-to-result field="paymentAppl.paymentApplicationId" result-name="paymentApplicationId"/> <create-value value-field="paymentAppl"/> </simple-method> @@ -171,7 +171,7 @@ </check-permission> <entity-one entity-name="Payment" value-field="payment"/> - <field-to-result field-name="payment.paymentId" result-name="oldStatusId"/> + <field-to-result field="payment.paymentId" result-name="oldStatusId"/> <if-compare-field field="payment.statusId" to-field="parameters.statusId" operator="not-equals"> <entity-one entity-name="StatusValidChange" value-field="statusChange" auto-field-map="false"> @@ -239,8 +239,8 @@ <result-to-field field-name="paymentApplicationId" result-name="paymentApplicationId"/> </call-service> <check-errors/> - <field-to-result field-name="paymentId" result-name="paymentId"/> - <field-to-result field-name="paymentApplicationId" result-name="paymentApplicationId"/> + <field-to-result field="paymentId" result-name="paymentId"/> + <field-to-result field="paymentApplicationId" result-name="paymentApplicationId"/> </simple-method> <simple-method method-name="getInvoicePaymentInfoList" short-description="Create a list with information on payment due dates and amounts for the invoice"> @@ -346,7 +346,7 @@ <set field="invoicePaymentInfoList[]" from-field="invoicePaymentInfo"/> </then> </if> - <field-to-result field-name="invoicePaymentInfoList" result-name="invoicePaymentInfoList"/> + <field-to-result field="invoicePaymentInfoList" result-name="invoicePaymentInfoList"/> </simple-method> <simple-method method-name="getInvoicePaymentInfoListByDueDateOffset" short-description="Select a list with information on payment due dates and amounts for invoices."> @@ -385,7 +385,7 @@ </if> </iterate> </iterate> - <field-to-result field-name="selectedInvoicePaymentInfoList" result-name="invoicePaymentInfoList"/> + <field-to-result field="selectedInvoicePaymentInfoList" result-name="invoicePaymentInfoList"/> </simple-method> </simple-methods> 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=730116&r1=730115&r2=730116&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:14:23 2008 @@ -281,11 +281,11 @@ <if-empty field="amount.rateAmount"> <set field="amount.rateAmount" value="0" type="Double"/> </if-empty> - <field-to-result field-name="amount.rateAmount" result-name="rateAmount"/> - <field-to-result field-name="amount.periodTypeId" result-name="periodTypeId"/> - <field-to-result field-name="amount.rateCurrencyUomId" result-name="rateCurrencyUomId"/> - <field-to-result field-name="level"/> - <field-to-result field-name="amount.fromDate" result-name="fromDate"/> + <field-to-result field="amount.rateAmount" result-name="rateAmount"/> + <field-to-result field="amount.periodTypeId" result-name="periodTypeId"/> + <field-to-result field="amount.rateCurrencyUomId" result-name="rateCurrencyUomId"/> + <field-to-result field="level"/> + <field-to-result field="amount.fromDate" result-name="fromDate"/> </if-not-empty> </simple-method> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml?rev=730116&r1=730115&r2=730116&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml Tue Dec 30 04:14:23 2008 @@ -158,7 +158,7 @@ <make-value entity-name="TaxAuthorityRateProduct" value-field="newEntity"/> <sequenced-id-to-env sequence-name="TaxAuthorityRateProduct" env-name="newEntity.taxAuthorityRateSeqId"/> - <field-to-result field-name="newEntity.taxAuthorityRateSeqId" result-name="taxAuthorityRateSeqId"/> + <field-to-result field="newEntity.taxAuthorityRateSeqId" result-name="taxAuthorityRateSeqId"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml?rev=730116&r1=730115&r2=730116&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml Tue Dec 30 04:14:23 2008 @@ -160,7 +160,7 @@ </then> </if> - <field-to-result field-name="contentId"/> + <field-to-result field="contentId"/> </simple-method> <simple-method method-name="getOwnedOrPublishedBlogEntries" short-description="Get blog entries that the user owns or are published"> @@ -195,6 +195,6 @@ </iterate> <log level="info" message="blogList: ${blogList}"/> - <field-to-result field-name="blogList" result-name="blogList"/> + <field-to-result field="blogList" result-name="blogList"/> </simple-method> </simple-methods> 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=730116&r1=730115&r2=730116&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:14:23 2008 @@ -78,7 +78,7 @@ <create-value value-field="rootInstanceContent"/> <log message="genCompDocInstance 3> rootInstanceContent: ${rootInstanceContent}" level="info"/> - <field-to-result result-name="contentId" field-name="rootInstanceContent.contentId"/> + <field-to-result result-name="contentId" field="rootInstanceContent.contentId"/> <set from-field="parameters.instanceOfContentId" field="parentTemplateContentId"/> <set from-field="rootInstanceContent.contentId" field="parentInstanceContentId"/> <log message="genCompDocInstance 4> parentTemplateContentId: ${parentTemplateContentId}" level="info"/> @@ -198,7 +198,7 @@ </call-service> <!-- put all the result fields in this service's result --> <iterate-map map="pResults" key="key" value="val"> - <field-to-result field-name="val" result-name="${key}"/> + <field-to-result field="val" result-name="${key}"/> </iterate-map> <log level="info" message="pResults : ${pResults}"/> @@ -439,7 +439,7 @@ <create-value value-field="newEntity"/> <log level="info" message="ContentRevisionItem(1): ${newEntity}"/> </if-not-empty> - <field-to-result field-name="paddedSeqId" result-name="contentRevisionSeqId"/> + <field-to-result field="paddedSeqId" result-name="contentRevisionSeqId"/> <log level="info" message="paddedSeqId: ${paddedSeqId}"/> </simple-method> <simple-method method-name="getRevisionDataResource" short-description="Get version of DataResource that fits overall revision"> @@ -460,7 +460,7 @@ <entity-one entity-name="DataResource" value-field="dataResource" use-cache="true"> <field-map field-name="dataResourceId" from-field="content.dataResourceId"/> </entity-one> - <field-to-result field-name="dataResource" result-name="dataResource"/> + <field-to-result field="dataResource" result-name="dataResource"/> </if-not-empty> </if-not-empty> </simple-method> @@ -477,7 +477,7 @@ <entity-one entity-name="DataResource" value-field="dataResource" use-cache="true"> <field-map field-name="dataResourceId" from-field="content.dataResourceId"/> </entity-one> - <field-to-result field-name="dataResource" result-name="dataResource"/> + <field-to-result field="dataResource" result-name="dataResource"/> </if-not-empty> </simple-method> @@ -498,7 +498,7 @@ </if-empty> <create-value value-field="newEntity"/> <check-errors/> - <field-to-result result-name="contentApprovalId" field-name="newEntity.contentApprovalId"/> + <field-to-result result-name="contentApprovalId" field="newEntity.contentApprovalId"/> </simple-method> <simple-method method-name="updateContentApproval" short-description="Update ContentApproval"> <log level="always" message="got into updateContentApproval(4)"/> @@ -571,7 +571,7 @@ <set field="contentApprovalList[]" from-field="gvAndPerm"/> --> </iterate> - <field-to-result field-name="contentApprovalList"/> + <field-to-result field="contentApprovalList"/> </simple-method> <simple-method method-name="cloneTemplateContentApprovals" short-description="Bump the previous ContentApproval approvals up to current CDI"> <log level="info" message="cloneTemplateContentApprovals-parameters: ${parameters}"/> @@ -772,7 +772,7 @@ <if-compare field="contentApproval.partyId" value="${partyId}" operator="equals"> <set field="approvalPermExists" value="true"/> <log level="info" message="approvalPermExists: ${approvalPermExists}"/> - <field-to-result result-name="approvalPermExists" field-name="approvalPermExists"/> + <field-to-result result-name="approvalPermExists" field="approvalPermExists"/> <return/> </if-compare> <if-not-empty field="contentApproval.roleTypeId"> @@ -790,12 +790,12 @@ </entity-condition> <if-not-empty field="contentRoleList"> <set field="approvalPermExists" value="true"/> - <field-to-result field-name="approvalPermExists" result-name="approvalPermExists"/> + <field-to-result field="approvalPermExists" result-name="approvalPermExists"/> <return/> </if-not-empty> </if-not-empty> <set field="approvalPermExists" value="false"/> - <field-to-result field-name="approvalPermExists" result-name="approvalPermExists"/> + <field-to-result field="approvalPermExists" result-name="approvalPermExists"/> <return/> </simple-method> <simple-method method-name="prepForApproval" short-description="Set ContentApprovals for approval process"> @@ -865,12 +865,12 @@ </else-if> </if> </iterate> - <field-to-result field-name="finalApprovalStatusId" result-name="approvalStatusId"/> - <field-to-result field-name="contentApprovalList" result-name="contentApprovalList"/> + <field-to-result field="finalApprovalStatusId" result-name="approvalStatusId"/> + <field-to-result field="contentApprovalList" result-name="contentApprovalList"/> </then> <else> <set value="CNTAP_NOT_READY" field="finalApprovalStatusId"/> - <field-to-result field-name="finalApprovalStatusId" result-name="approvalStatusId"/> + <field-to-result field="finalApprovalStatusId" result-name="approvalStatusId"/> </else> </if> </simple-method> @@ -929,7 +929,7 @@ </condition-list> </entity-condition> <log level="info" message="contentApprovalList: ${contentApprovalList}"/> - <field-to-result field-name="contentApprovalList" result-name="contentApprovalList"/> + <field-to-result field="contentApprovalList" result-name="contentApprovalList"/> </simple-method> <simple-method method-name="getMostRecentRevision" short-description="Look for most recent revision for contentId"> <entity-condition entity-name="ContentRevision" list-name="contentRevisions" use-cache="true"> @@ -942,6 +942,6 @@ <if-not-empty field="contentRevisions"> <set from-field="contentRevisions[0].contentRevisionSeqId" field="mostRecentRevisionSeqId"/> </if-not-empty> - <field-to-result field-name="mostRecentRevisionSeqId" result-name="mostRecentRevisionSeqId"/> + <field-to-result field="mostRecentRevisionSeqId" result-name="mostRecentRevisionSeqId"/> </simple-method> </simple-methods> 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=730116&r1=730115&r2=730116&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:14:23 2008 @@ -50,7 +50,7 @@ <create-value value-field="content"/> - <field-to-result field-name="content.contentId" result-name="contentId"/> + <field-to-result field="content.contentId" result-name="contentId"/> </simple-method> <simple-method method-name="updateContent" short-description="Update a Content Record"> <entity-one entity-name="Content" value-field="content" auto-field-map="true"/> @@ -61,7 +61,7 @@ <set field="content.lastModifiedDate" from-field="nowTimestamp"/> <store-value value-name="content"/> - <field-to-result field-name="content.contentId" result-name="contentId"/> + <field-to-result field="content.contentId" result-name="contentId"/> </simple-method> <simple-method method-name="removeContent" short-description="Remove a Content Record"> <make-value entity-name="Content" value-field="lookupKeyValue"/> @@ -90,7 +90,7 @@ <create-value value-field="assoc"/> <log level="info" message="assoc: ${assoc}"/> - <field-to-result field-name="assoc.fromDate" result-name="fromDate"/> + <field-to-result field="assoc.fromDate" result-name="fromDate"/> </simple-method> <simple-method method-name="updateContentAssoc" short-description="Update a ContentAssoc Record"> <set field="contentId" from-field="parameters.contentIdFrom" default-value="${parameters.contentId}" /> @@ -115,7 +115,7 @@ <simple-method method-name="setContentStatus" short-description="Set The Content Status"> <entity-one entity-name="Content" value-field="content"/> - <field-to-result field-name="content.statusId" result-name="oldStatusId"/> + <field-to-result field="content.statusId" result-name="oldStatusId"/> <if-compare-field field="content.statusId" to-field="parameters.statusId" operator="not-equals"> <entity-one entity-name="StatusValidChange" value-field="statusChange" auto-field-map="false"> @@ -180,7 +180,7 @@ <call-service service-name="createContentAssoc" in-map-name="assocTos"/> </iterate> - <field-to-result field-name="newContentId" result-name="contentId"/> + <field-to-result field="newContentId" result-name="contentId"/> </simple-method> @@ -302,7 +302,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> - <field-to-result map-name="newEntity" field-name="contentTypeId" /> + <field-to-result map-name="newEntity" field="contentTypeId" /> </simple-method> <simple-method method-name="updateContentType" short-description="Update Content Type"> <make-value entity-name="ContentType" value-field="lookupKeyValue"/> @@ -338,7 +338,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> - <field-to-result map-name="newEntity" field-name="contentAssocTypeId" /> + <field-to-result map-name="newEntity" field="contentAssocTypeId" /> </simple-method> <simple-method method-name="updateContentAssocType" short-description="Update Content AssocType"> <make-value entity-name="ContentAssocType" value-field="lookupKeyValue"/> @@ -363,7 +363,7 @@ <make-next-seq-id seq-field-name="contentPurposeTypeId" value-name="newEntity"/> </if-empty> <create-value value-field="newEntity"/> - <field-to-result map-name="newEntity" field-name="contentPurposeTypeId" /> + <field-to-result map-name="newEntity" field="contentPurposeTypeId" /> </simple-method> <simple-method method-name="updateContentPurposeType" short-description="Update Content PurposeType"> <make-value entity-name="ContentPurposeType" value-field="lookupKeyValue"/> @@ -385,7 +385,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> - <field-to-result map-name="newEntity" field-name="contentAssocPredicateId" /> + <field-to-result map-name="newEntity" field="contentAssocPredicateId" /> </simple-method> <simple-method method-name="updateContentAssocPredicate" short-description="Update Content AssocPredicate"> <make-value entity-name="ContentAssocPredicate" value-field="lookupKeyValue"/> @@ -552,7 +552,7 @@ <call-service service-name="createContentFromUploadedFile" in-map-name="uploadContext"/> </if-not-empty> - <field-to-result field-name="parentContentId" map-name="parameters" result-name="contentId"/> + <field-to-result field="parentContentId" map-name="parameters" result-name="contentId"/> </simple-method> <!-- Util --> @@ -573,10 +573,10 @@ <if-empty field="parameters.mapKey"/> </condition> <then> - <field-to-result field-name="result" result-name="contentAssocs"/> + <field-to-result field="result" result-name="contentAssocs"/> </then> <else> - <field-to-result field-name="result" result-name="contentAssoc"/> + <field-to-result field="result" result-name="contentAssoc"/> </else> </if> </simple-method> @@ -623,7 +623,7 @@ <set value="htmlBody" field="createBodyAssoc.mapKey"/> <call-service service-name="createContentAssoc" in-map-name="createBodyAssoc"/> - <field-to-result field-name="contentId" map-name="createBodyAssoc" result-name="contentId"/> + <field-to-result field="contentId" map-name="createBodyAssoc" result-name="contentId"/> </simple-method> <simple-method method-name="updateEmailContent" short-description="Update Email Content"> <check-permission permission="CONTENTMGR" action="_UPDATE"> @@ -761,7 +761,7 @@ <result-to-field result-name="contentId" field-name="contentId"/> </call-service> - <field-to-result field-name="contentId" /> + <field-to-result field="contentId" /> </simple-method> <!-- This method first creates Content, DataResource and ElectronicText, ImageDataResource, etc. entities (if needed) @@ -796,7 +796,7 @@ </call-service> <iterate-map key="key" value="val" map="persistOut"> - <field-to-result field-name="val" result-name="${key}"/> + <field-to-result field="val" result-name="${key}"/> </iterate-map> <set field="mapIn.contentId" from-field="persistOut.contentId"/> @@ -832,7 +832,7 @@ </call-service> <iterate-map key="key" value="val" map="persistOut"> - <field-to-result field-name="val" result-name="${key}"/> + <field-to-result field="val" result-name="${key}"/> </iterate-map> </simple-method> @@ -847,7 +847,7 @@ <now-timestamp-to-env env-name="commEventContentAssoc.fromDate"/> </if-empty> <create-value value-field="commEventContentAssoc" /> - <field-to-result field-name="commEventContentAssoc.fromDate" result-name="fromDate"/> + <field-to-result field="commEventContentAssoc.fromDate" result-name="fromDate"/> </simple-method> <!-- This service would primarily be used to update the thruDate field. @@ -889,7 +889,7 @@ <result-to-result result-name="contentId" service-result-name="contentIdFrom"/> <result-to-result result-name="contentIdTo" service-result-name="contentIdTo"/> </call-service> - <field-to-result field-name="newContentId" result-name="contentId"/> + <field-to-result field="newContentId" result-name="contentId"/> </if-not-empty> </simple-method> @@ -908,7 +908,7 @@ to-value-name="resultData.imageDataResource"/> </if-compare> </if-not-empty> - <field-to-result field-name="resultData" result-name="resultData"/> + <field-to-result field="resultData" result-name="resultData"/> </simple-method> <simple-method method-name="getContentAndDataResource" short-description="get the content and related resource information" login-required="false"> @@ -923,7 +923,7 @@ <set field="resultDataContent.electronicText" from-field="resultData.electronicText"/> <set field="resultDataContent.imageDataResource" from-field="resultData.imageDataResource"/> </if-not-empty> - <field-to-result field-name="resultDataContent" result-name="resultData"/> + <field-to-result field="resultDataContent" result-name="resultData"/> </if-not-empty> </simple-method> @@ -947,8 +947,8 @@ </and> </condition> <then> - <field-to-result field-name="contentIdFrom" map-name="parameters" result-name="contentId"/> - <field-to-result field-name="contentId" map-name="parameters" result-name="contentIdTo"/> + <field-to-result field="contentIdFrom" map-name="parameters" result-name="contentId"/> + <field-to-result field="contentId" map-name="parameters" result-name="contentIdTo"/> <log level="info" message="Converted 'contentId' to 'contentIdTo' and 'contentIdFrom' to 'contentId'"/> </then> <else-if> @@ -958,8 +958,8 @@ </not> </condition> <then> - <field-to-result field-name="contentIdTo" map-name="parameters" result-name="contentIdTo"/> - <field-to-result field-name="contentId" map-name="parameters" result-name="contentId"/> + <field-to-result field="contentIdTo" map-name="parameters" result-name="contentIdTo"/> + <field-to-result field="contentId" map-name="parameters" result-name="contentId"/> <log level="info" message="Returned 'contentId' as 'contentId' and 'contentIdTo' as 'contentIdTo'"/> </then> </else-if> @@ -1146,7 +1146,7 @@ </if-compare> - <field-to-result field-name="contentId"/> + <field-to-result field="contentId"/> </simple-method> <simple-method method-name="getSubContentWithPermCheck" short-description="Get sub content and perform permission check on each record"> @@ -1188,7 +1188,7 @@ <set field="contentViewList[]" from-field="view"/> </if-compare> </iterate> - <field-to-result field-name="contentViewList" result-name="subContentList"/> + <field-to-result field="contentViewList" result-name="subContentList"/> </simple-method> @@ -1222,7 +1222,7 @@ <set field="map.textData" from-field="electronicText.textData"/> <set field="contentViewList[]" from-field="map"/> </iterate> - <field-to-result field-name="subContentList" result-name="subContentList"/> - <field-to-result field-name="contentViewList" result-name="subSubContentList"/> + <field-to-result field="subContentList" result-name="subContentList"/> + <field-to-result field="contentViewList" result-name="subSubContentList"/> </simple-method> </simple-methods> Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml?rev=730116&r1=730115&r2=730116&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml Tue Dec 30 04:14:23 2008 @@ -52,7 +52,7 @@ </if-empty> <create-value value-field="newEntity"/> - <field-to-result field-name="dataResourceId" map-name="newEntity"/> + <field-to-result field="dataResourceId" map-name="newEntity"/> </simple-method> <simple-method method-name="updateDataResource" short-description="Update a Data Resource"> @@ -68,7 +68,7 @@ <set field="lookedUpValue.lastModifiedDate" from-field="nowTimestamp"/> <store-value value-name="lookedUpValue"/> - <field-to-result field-name="dataResourceId" map-name="lookedUpValue"/> + <field-to-result field="dataResourceId" map-name="lookedUpValue"/> </simple-method> <simple-method method-name="deleteDataResource" short-description="Delete a Data Resource"> @@ -85,7 +85,7 @@ <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> - <field-to-result field-name="dataCategoryId" map-name="newEntity"/> + <field-to-result field="dataCategoryId" map-name="newEntity"/> </simple-method> <simple-method method-name="updateDataCategory" short-description="Update a Data Category"> <make-value entity-name="DataCategory" value-field="lookupKeyValue"/> @@ -194,7 +194,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> - <field-to-result field-name="dataCategoryId" map-name="newEntity"/> + <field-to-result field="dataCategoryId" map-name="newEntity"/> </simple-method> <simple-method method-name="updateDataCategory" short-description="Update Data Category"> <make-value entity-name="DataCategory" value-field="lookupKeyValue"/> @@ -216,7 +216,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> - <field-to-result field-name="dataResourceTypeId" map-name="newEntity"/> + <field-to-result field="dataResourceTypeId" map-name="newEntity"/> </simple-method> <simple-method method-name="updateDataResourceType" short-description="Update Data Resource Type"> <make-value entity-name="DataResourceType" value-field="lookupKeyValue"/> @@ -280,7 +280,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> - <field-to-result field-name="characterSetId" map-name="newEntity"/> + <field-to-result field="characterSetId" map-name="newEntity"/> </simple-method> <simple-method method-name="updateCharacterSet" short-description="Update Character Set"> <make-value entity-name="CharacterSet" value-field="lookupKeyValue"/> @@ -302,7 +302,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> - <field-to-result field-name="fileExtensionId" map-name="newEntity"/> + <field-to-result field="fileExtensionId" map-name="newEntity"/> </simple-method> <simple-method method-name="updateFileExtension" short-description="Update Data Resource Role"> <make-value entity-name="FileExtension" value-field="lookupKeyValue"/> @@ -324,7 +324,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> - <field-to-result field-name="metaDataPredicateId" map-name="newEntity"/> + <field-to-result field="metaDataPredicateId" map-name="newEntity"/> </simple-method> <simple-method method-name="updateMetaDataPredicate" short-description="Update Data Resource Role"> <make-value entity-name="MetaDataPredicate" value-field="lookupKeyValue"/> @@ -346,7 +346,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> - <field-to-result field-name="mimeTypeId" map-name="newEntity"/> + <field-to-result field="mimeTypeId" map-name="newEntity"/> </simple-method> <simple-method method-name="updateMimeType" short-description="Update MimeType"> <make-value entity-name="MimeType" value-field="lookupKeyValue"/> @@ -390,7 +390,7 @@ <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> - <field-to-result field-name="dataResourceId" map-name="newEntity"/> + <field-to-result field="dataResourceId" map-name="newEntity"/> </simple-method> <simple-method method-name="updateElectronicText" short-description="Update Electronic Text"> @@ -400,7 +400,7 @@ <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> <store-value value-name="lookedUpValue"/> - <field-to-result field-name="dataResourceId" map-name="lookedUpValue"/> + <field-to-result field="dataResourceId" map-name="lookedUpValue"/> </simple-method> <simple-method method-name="removeElectronicText" short-description="Remove Electronic Text"> <make-value entity-name="ElectronicText" value-field="lookupKeyValue"/> @@ -527,7 +527,7 @@ </add-error> </if-empty> <check-errors/> - <field-to-result field-name="currentContent.dataResourceId" result-name="dataResourceId"/> + <field-to-result field="currentContent.dataResourceId" result-name="dataResourceId"/> <set field="contextB.dataResourceId" from-field="currentContent.dataResourceId" /> <find-by-primary-key value-field="eText" entity-name="ElectronicText" map-name="contextB" use-cache="true" /> @@ -539,7 +539,7 @@ <check-errors/> - <field-to-result map-name="eText" field-name="textData" result-name="textData"/> + <field-to-result map-name="eText" field="textData" result-name="textData"/> <log level="always" message="result:${result}"/> <log level="always" message="parameters:${parameters}"/> </simple-method> @@ -672,8 +672,8 @@ </then> <else> <!-- if not upload is found on an update; its okay, don't do anything just return --> - <field-to-result field-name="dataResourceId" map-name="dataResource"/> - <field-to-result field-name="mimeTypeId" map-name="dataResource"/> + <field-to-result field="dataResourceId" map-name="dataResource"/> + <field-to-result field="mimeTypeId" map-name="dataResource"/> <return/> </else> </if> @@ -703,8 +703,8 @@ <set from-field="dataResource" field="fileCtx.dataResource"/> <call-service service-name="createAnonFile" in-map-name="fileCtx" include-user-login="true"/> - <field-to-result field-name="dataResourceId" map-name="dataResource"/> - <field-to-result field-name="mimeTypeId" map-name="dataResource"/> + <field-to-result field="dataResourceId" map-name="dataResource"/> + <field-to-result field="mimeTypeId" map-name="dataResource"/> </simple-method> <!-- save OTHER_OBJECT data --> @@ -732,8 +732,8 @@ </then> <else> <!-- if not upload is found on an update; its okay, don't do anything just return --> - <field-to-result field-name="dataResourceId" map-name="dataResource"/> - <field-to-result field-name="mimeTypeId" map-name="dataResource"/> + <field-to-result field="dataResourceId" map-name="dataResource"/> + <field-to-result field="mimeTypeId" map-name="dataResource"/> <return/> </else> </if> @@ -759,8 +759,8 @@ </else> </if-compare> - <field-to-result field-name="dataResourceId" map-name="dataResource"/> - <field-to-result field-name="mimeTypeId" map-name="dataResource"/> + <field-to-result field="dataResourceId" map-name="dataResource"/> + <field-to-result field="mimeTypeId" map-name="dataResource"/> </simple-method> <!-- save IMAGE_OBJECT data --> @@ -788,8 +788,8 @@ </then> <else> <!-- if not upload is found on an update; its okay, don't do anything just return --> - <field-to-result field-name="dataResourceId" map-name="dataResource"/> - <field-to-result field-name="mimeTypeId" map-name="dataResource"/> + <field-to-result field="dataResourceId" map-name="dataResource"/> + <field-to-result field="mimeTypeId" map-name="dataResource"/> <return/> </else> </if> @@ -815,8 +815,8 @@ </else> </if-compare> - <field-to-result field-name="dataResourceId" map-name="dataResource"/> - <field-to-result field-name="mimeTypeId" map-name="dataResource"/> + <field-to-result field="dataResourceId" map-name="dataResource"/> + <field-to-result field="mimeTypeId" map-name="dataResource"/> </simple-method> <!-- save VIDEO_OBJECT data --> @@ -844,8 +844,8 @@ </then> <else> <!-- if not upload is found on an update; its okay, don't do anything just return --> - <field-to-result field-name="dataResourceId" map-name="dataResource"/> - <field-to-result field-name="mimeTypeId" map-name="dataResource"/> + <field-to-result field="dataResourceId" map-name="dataResource"/> + <field-to-result field="mimeTypeId" map-name="dataResource"/> <return/> </else> </if> @@ -871,8 +871,8 @@ </else> </if-compare> - <field-to-result field-name="dataResourceId" map-name="dataResource"/> - <field-to-result field-name="mimeTypeId" map-name="dataResource"/> + <field-to-result field="dataResourceId" map-name="dataResource"/> + <field-to-result field="mimeTypeId" map-name="dataResource"/> </simple-method> <!-- save AUDIO_OBJECT data --> @@ -900,8 +900,8 @@ </then> <else> <!-- if not upload is found on an update; its okay, don't do anything just return --> - <field-to-result field-name="dataResourceId" map-name="dataResource"/> - <field-to-result field-name="mimeTypeId" map-name="dataResource"/> + <field-to-result field="dataResourceId" map-name="dataResource"/> + <field-to-result field="mimeTypeId" map-name="dataResource"/> <return/> </else> </if> @@ -927,7 +927,7 @@ </else> </if-compare> - <field-to-result field-name="dataResourceId" map-name="dataResource"/> - <field-to-result field-name="mimeTypeId" map-name="dataResource"/> + <field-to-result field="dataResourceId" map-name="dataResource"/> + <field-to-result field="mimeTypeId" map-name="dataResource"/> </simple-method> </simple-methods> 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=730116&r1=730115&r2=730116&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:14:23 2008 @@ -103,7 +103,7 @@ </if> <log level="info" message="Permission service [${mainAction} / ${parameters.contentId}] completed; returning hasPermission = ${hasPermission}"/> - <field-to-result field-name="hasPermission"/> + <field-to-result field="hasPermission"/> </simple-method> <simple-method method-name="viewContentPermission" short-description="Check user can view content"> @@ -786,6 +786,6 @@ <entity-and entity-name="ContentAssoc" list="assocs" filter-by-date="true"> <field-map field-name="contentIdTo" from-field="contentId"/> </entity-and> - <field-to-result field-name="assocs" result-name="contentAssocList"/> + <field-to-result field="assocs" result-name="contentAssocList"/> </simple-method> </simple-methods> Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/DataResourcePermissionServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/DataResourcePermissionServices.xml?rev=730116&r1=730115&r2=730116&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/DataResourcePermissionServices.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/DataResourcePermissionServices.xml Tue Dec 30 04:14:23 2008 @@ -71,7 +71,7 @@ </if> <log level="info" message="Permission service [${mainAction} / ${parameters.contentId}] completed; returning hasPermission = ${hasPermission}"/> - <field-to-result field-name="hasPermission"/> + <field-to-result field="hasPermission"/> </simple-method> <!-- DataResource View Permission --> Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml?rev=730116&r1=730115&r2=730116&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml Tue Dec 30 04:14:23 2008 @@ -116,7 +116,7 @@ <make-value value-field="lookupPKMap" entity-name="WebSitePathAlias"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="WebSitePathAlias" map="lookupPKMap" value-field="alias" use-cache="true"/> - <field-to-result field-name="alias.pathTo" result-name="pathTo"/> + <field-to-result field="alias.pathTo" result-name="pathTo"/> </simple-method> <!-- WebSite Role Services --> Modified: ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml?rev=730116&r1=730115&r2=730116&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml (original) +++ ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml Tue Dec 30 04:14:23 2008 @@ -30,9 +30,9 @@ <set field="newEntity.fromDate" from-field="nowTimeStamp"/> </if-empty> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <field-to-result field-name="newEntity.partyId" result-name="partyId"/> - <field-to-result field-name="newEntity.partyQualTypeId" result-name="partyQualTypeId"/> - <field-to-result field-name="newEntity.fromDate" result-name="fromDate"/> + <field-to-result field="newEntity.partyId" result-name="partyId"/> + <field-to-result field="newEntity.partyQualTypeId" result-name="partyQualTypeId"/> + <field-to-result field="newEntity.fromDate" result-name="fromDate"/> <create-value value-field="newEntity"/> </simple-method> @@ -52,7 +52,7 @@ <make-value entity-name="PartyResume" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id-to-env sequence-name="PartyResume" env-name="newEntity.resumeId"/> - <field-to-result field-name="resumeId" result-name="resumeId"/> + <field-to-result field="resumeId" result-name="resumeId"/> <create-value value-field="newEntity"/> </simple-method> @@ -107,7 +107,7 @@ <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id-to-env sequence-name="PerfReview" env-name="newEntity.perfReviewId"/> - <field-to-result field-name="perfReviewId" result-name="perfReviewId"/> + <field-to-result field="perfReviewId" result-name="perfReviewId"/> <create-value value-field="newEntity"/> </simple-method> @@ -127,7 +127,7 @@ <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id-to-env sequence-name="PerfReviewItem" env-name="newEntity.perfReviewItemSeqId"/> - <field-to-result field-name="perfReviewItemSeqId" result-name="perfReviewItemSeqId"/> + <field-to-result field="perfReviewItemSeqId" result-name="perfReviewItemSeqId"/> <create-value value-field="newEntity"/> </simple-method> @@ -216,7 +216,7 @@ <make-value entity-name="EmploymentApp" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id-to-env sequence-name="EmploymentApp" env-name="newEntity.applicationId"/> - <field-to-result field-name="newEntity.applicationId" result-name="applicationId"/> + <field-to-result field="newEntity.applicationId" result-name="applicationId"/> <create-value value-field="newEntity"/> </simple-method> @@ -265,7 +265,7 @@ <sequenced-id-to-env sequence-name="PayGrade" env-name="newEntity.payGradeId"/> </else> </if-not-empty> - <field-to-result field-name="newEntity.payGradeId" result-name="payGradeId"/> + <field-to-result field="newEntity.payGradeId" result-name="payGradeId"/> <create-value value-field="newEntity"/> </simple-method> @@ -310,7 +310,7 @@ <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id-to-env sequence-name="PayrollPreference" env-name="newEntity.payrollPreferenceSeqId"/> - <field-to-result field-name="payrollPreferenceSeqId" result-name="payrollPreferenceSeqId"/> + <field-to-result field="payrollPreferenceSeqId" result-name="payrollPreferenceSeqId"/> <create-value value-field="newEntity"/> </simple-method> @@ -330,7 +330,7 @@ <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id-to-env sequence-name="SalaryStep" env-name="newEntity.salaryStepSeqId"/> - <field-to-result field-name="salaryStepSeqId" result-name="salaryStepSeqId"/> + <field-to-result field="salaryStepSeqId" result-name="salaryStepSeqId"/> <create-value value-field="newEntity"/> </simple-method> @@ -349,7 +349,7 @@ <make-value entity-name="TerminationReason" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id-to-env sequence-name="TerminationReason" env-name="newEntity.terminationReasonId"/> - <field-to-result field-name="newEntity.terminationReasonId" result-name="terminationReasonId"/> + <field-to-result field="newEntity.terminationReasonId" result-name="terminationReasonId"/> <create-value value-field="newEntity"/> </simple-method> @@ -368,7 +368,7 @@ <make-value entity-name="UnemploymentClaim" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id-to-env sequence-name="UnemploymentClaim" env-name="newEntity.unemploymentClaimId"/> - <field-to-result field-name="newEntity.unemploymentClaimId" result-name="unemploymentClaimId"/> + <field-to-result field="newEntity.unemploymentClaimId" result-name="unemploymentClaimId"/> <create-value value-field="newEntity"/> </simple-method> @@ -390,7 +390,7 @@ <make-value entity-name="EmplPosition" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id-to-env sequence-name="EmplPosition" env-name="newEntity.emplPositionId"/> - <field-to-result field-name="newEntity.emplPositionId" result-name="emplPositionId"/> + <field-to-result field="newEntity.emplPositionId" result-name="emplPositionId"/> <create-value value-field="newEntity"/> </simple-method> @@ -510,7 +510,7 @@ <make-value entity-name="SkillType" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id-to-env sequence-name="SkillType" env-name="newEntity.skillTypeId"/> - <field-to-result field-name="newEntity.skillTypeId" result-name="skillTypeId"/> + <field-to-result field="newEntity.skillTypeId" result-name="skillTypeId"/> <create-value value-field="newEntity"/> </simple-method> @@ -542,7 +542,7 @@ </if-empty> <call-service service-name="createPartyRelationship" in-map-name="partyRelationshipCtx"/> </if-not-empty> - <field-to-result field-name="partyId"/> + <field-to-result field="partyId"/> </simple-method> <!-- Responsibility Types --> @@ -553,7 +553,7 @@ <if-empty field="newEntity.responsibilityTypeId"> <sequenced-id-to-env sequence-name="ResponsibilityType" env-name="newEntity.responsibilityTypeId"/> </if-empty> - <field-to-result field-name="newEntity.responsibilityTypeId" result-name="responsibilityTypeId"/> + <field-to-result field="newEntity.responsibilityTypeId" result-name="responsibilityTypeId"/> <create-value value-field="newEntity"/> </simple-method> @@ -574,7 +574,7 @@ <if-empty field="newEntity.terminationTypeId"> <sequenced-id-to-env sequence-name="TerminationType" env-name="newEntity.terminationTypeId"/> </if-empty> - <field-to-result field-name="newEntity.terminationTypeId" result-name="terminationTypeId"/> + <field-to-result field="newEntity.terminationTypeId" result-name="terminationTypeId"/> <create-value value-field="newEntity"/> </simple-method> @@ -595,7 +595,7 @@ <if-empty field="newEntity.emplPositionTypeId"> <sequenced-id-to-env sequence-name="EmplPositionType" env-name="newEntity.emplPositionTypeId"/> </if-empty> - <field-to-result field-name="newEntity.emplPositionTypeId" result-name="emplPositionTypeId"/> + <field-to-result field="newEntity.emplPositionTypeId" result-name="emplPositionTypeId"/> <create-value value-field="newEntity"/> </simple-method> @@ -679,7 +679,7 @@ <if-empty field="newEntity.leaveTypeId"> <sequenced-id-to-env sequence-name="EmplLeaveType" env-name="newEntity.leaveTypeId"/> </if-empty> - <field-to-result field-name="newEntity.leaveTypeId" result-name="leaveTypeId"/> + <field-to-result field="newEntity.leaveTypeId" result-name="leaveTypeId"/> <create-value value-field="newEntity"/> </simple-method> 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=730116&r1=730115&r2=730116&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:14:23 2008 @@ -334,7 +334,7 @@ <simple-method method-name="issueInventoryItemToWorkEffort" short-description="Issue one InventoryItem to a WorkEffort"> <set field="inventoryItem" from-field="parameters.inventoryItem"/> - <field-to-result field-name="inventoryItem.productId" result-name="finishedProductId"/> + <field-to-result field="inventoryItem.productId" result-name="finishedProductId"/> <if-compare value="SERIALIZED_INV_ITEM" operator="equals" field="inventoryItem.inventoryItemTypeId"> <if-compare value="INV_AVAILABLE" operator="equals" field="inventoryItem.statusId"> <!-- change status on inventoryItem --> @@ -346,7 +346,7 @@ <set field="issuanceCreateMap.inventoryItemId" from-field="inventoryItem.inventoryItemId"/> <calculate field-name="quantity" map-name="issuanceCreateMap"><number value="1"/></calculate> <call-service service-name="assignInventoryToWorkEffort" in-map-name="issuanceCreateMap"/> - <field-to-result field-name="issuanceCreateMap.quantity" result-name="quantityIssued"/> + <field-to-result field="issuanceCreateMap.quantity" result-name="quantityIssued"/> </if-compare> </if-compare> <if> @@ -390,11 +390,11 @@ <calcop field-name="deductAmount" operator="negative"/> </calculate> <call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/> - <field-to-result field-name="deductAmount" result-name="quantityIssued"/> + <field-to-result field="deductAmount" result-name="quantityIssued"/> </then> <else> <calculate field-name="deductAmount"><number value="0"/></calculate> - <field-to-result field-name="deductAmount" result-name="quantityIssued"/> + <field-to-result field="deductAmount" result-name="quantityIssued"/> </else> </if> </simple-method> 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=730116&r1=730115&r2=730116&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:14:23 2008 @@ -115,8 +115,8 @@ <filter-list-by-date list-name="tasks"/> </if-not-empty> - <field-to-result field-name="routing"/> - <field-to-result field-name="tasks"/> + <field-to-result field="routing"/> + <field-to-result field="tasks"/> </simple-method> <simple-method method-name="getRoutingTaskAssocs" short-description="Get the routing task assocs of a given routing"> <set from-field="parameters.workEffortId" field="lookupTasks.workEffortIdFrom"/> @@ -124,7 +124,7 @@ <set value="ROUTING_COMPONENT" field="lookupTasks.workEffortAssocTypeId"/> <find-by-and entity-name="WorkEffortAssoc" list-name="routingTaskAssocs" map-name="lookupTasks" order-by-list-name="tasksOrder"/> <filter-list-by-date list-name="routingTaskAssocs"/> - <field-to-result field-name="routingTaskAssocs"/> + <field-to-result field="routingTaskAssocs"/> </simple-method> </simple-methods> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |