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 12:59:12 UTC
svn commit: r730107 [1/5] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/agreement/
applications/accounting/script/org/ofbiz/accounting/cost/
applications/accounting/script/org/ofbiz/accounting/finaccount/
applications/accountin...
Author: jleroux
Date: Tue Dec 30 03:59:10 2008
New Revision: 730107
URL: http://svn.apache.org/viewvc?rev=730107&view=rev
Log:
same but with non
<set-pk-fields(.*)map-name => <set-pk-fields$1map
<set-pk-fields(.*)value-name => <set-pk-fields$1value-field
I was not very clever on this one ;)
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/PaymentMethodServices.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/ContentEvents.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.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/layout/LayoutEvents.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/techdata/RoutingSimpleServices.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/marketing/tracking/TrackingCodeServices.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/communication/CommunicationEventServices.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/content/PartyContentServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.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/communication/CommunicationEventServices.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/olap/ProductDimensionServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.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/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/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.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/PortalPageServices.xml
ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceServices.xml
ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceTypeServices.xml
ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml
ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml
ofbiz/trunk/framework/example/script/org/ofbiz/example/example/ExampleServices.xml
ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.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=730107&r1=730106&r2=730107&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 03:59:10 2008
@@ -29,7 +29,7 @@
<simple-method method-name="createAgreement" short-description="Create an Agreement">
<!-- create new entity and create all the fields -->
<make-value value-field="newEntity" entity-name="Agreement"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<!-- create a non existing ID -->
<sequenced-id-to-env sequence-name="Agreement" env-name="agreementId"/>
@@ -50,7 +50,7 @@
<simple-method method-name="updateAgreement" short-description="Update an existing Agreement">
<entity-one entity-name="Agreement" value-name="agreement" auto-field-map="true"/>
<check-errors/>
- <set-nonpk-fields map-name="parameters" value-name="agreement"/>
+ <set-nonpk-fields map="parameters" value-field="agreement"/>
<store-value value-name="agreement"/>
<check-errors/>
</simple-method>
@@ -115,7 +115,7 @@
<simple-method method-name="createAgreementItem" short-description="Create an AgreementItem">
<!-- create new entity and create all the fields -->
<make-value value-field="newEntity" entity-name="AgreementItem"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<set from-field="parameters.agreementId" field="newEntity.agreementId"/>
<!-- create a non existing ID -->
@@ -138,7 +138,7 @@
<simple-method method-name="updateAgreementItem" short-description="Update an existing AgreementItem">
<entity-one entity-name="AgreementItem" value-name="agreementItem" auto-field-map="true"/>
<check-errors/>
- <set-nonpk-fields map-name="parameters" value-name="agreementItem"/>
+ <set-nonpk-fields map="parameters" value-field="agreementItem"/>
<store-value value-name="agreementItem"/>
<check-errors/>
</simple-method>
@@ -154,7 +154,7 @@
<simple-method method-name="createAgreementTerm" short-description="Create an AgreementTerm">
<!-- create new entity and create all the fields -->
<make-value value-field="newEntity" entity-name="AgreementTerm"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<!-- create a non existing ID -->
<sequenced-id-to-env sequence-name="AgreementTerm" env-name="agreementTermId"/>
@@ -172,7 +172,7 @@
<simple-method method-name="updateAgreementTerm" short-description="Update an existing AgreementTerm">
<entity-one entity-name="AgreementTerm" value-name="agreementTerm" auto-field-map="true"/>
<check-errors/>
- <set-nonpk-fields map-name="parameters" value-name="agreementTerm"/>
+ <set-nonpk-fields map="parameters" value-field="agreementTerm"/>
<store-value value-name="agreementTerm"/>
<check-errors/>
</simple-method>
@@ -189,7 +189,7 @@
<simple-method method-name="createAgreementPromoAppl" short-description="Create an AgreementPromoAppl">
<make-value value-field="newEntity" entity-name="AgreementPromoAppl"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
<check-errors/>
</simple-method>
@@ -198,7 +198,7 @@
<simple-method method-name="updateAgreementPromoAppl" short-description="Update an existing AgreementPromoAppl">
<entity-one entity-name="AgreementPromoAppl" value-name="agreementPromoAppl" auto-field-map="true"/>
<check-errors/>
- <set-nonpk-fields map-name="parameters" value-name="agreementPromoAppl"/>
+ <set-nonpk-fields map="parameters" value-field="agreementPromoAppl"/>
<store-value value-name="agreementPromoAppl"/>
<check-errors/>
</simple-method>
@@ -215,7 +215,7 @@
<simple-method method-name="createAgreementProductAppl" short-description="Create an AgreementProductAppl">
<make-value value-field="newEntity" entity-name="AgreementProductAppl"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
<check-errors/>
</simple-method>
@@ -224,7 +224,7 @@
<simple-method method-name="updateAgreementProductAppl" short-description="Update an existing AgreementProductAppl">
<entity-one entity-name="AgreementProductAppl" value-name="agreementProductAppl" auto-field-map="true"/>
<check-errors/>
- <set-nonpk-fields map-name="parameters" value-name="agreementProductAppl"/>
+ <set-nonpk-fields map="parameters" value-field="agreementProductAppl"/>
<store-value value-name="agreementProductAppl"/>
<check-errors/>
</simple-method>
@@ -241,7 +241,7 @@
<simple-method method-name="createAgreementPartyApplic" short-description="Create an AgreementPartyApplic">
<make-value value-field="newEntity" entity-name="AgreementPartyApplic"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
<check-errors/>
</simple-method>
@@ -250,7 +250,7 @@
<simple-method method-name="updateAgreementPartyApplic" short-description="Update an existing AgreementPartyApplic">
<entity-one entity-name="AgreementPartyApplic" value-name="agreementPartyApplic" auto-field-map="true"/>
<check-errors/>
- <set-nonpk-fields map-name="parameters" value-name="agreementPartyApplic"/>
+ <set-nonpk-fields map="parameters" value-field="agreementPartyApplic"/>
<store-value value-name="agreementPartyApplic"/>
<check-errors/>
</simple-method>
@@ -267,7 +267,7 @@
<simple-method method-name="createAgreementGeographicalApplic" short-description="Create an AgreementGeographicalApplic">
<make-value value-field="newEntity" entity-name="AgreementGeographicalApplic"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
<check-errors/>
</simple-method>
@@ -276,7 +276,7 @@
<simple-method method-name="updateAgreementGeographicalApplic" short-description="Update an existing AgreementGeographicalApplic">
<entity-one entity-name="AgreementGeographicalApplic" value-name="agreementGeographicalApplic" auto-field-map="true"/>
<check-errors/>
- <set-nonpk-fields map-name="parameters" value-name="agreementGeographicalApplic"/>
+ <set-nonpk-fields map="parameters" value-field="agreementGeographicalApplic"/>
<store-value value-name="agreementGeographicalApplic"/>
<check-errors/>
</simple-method>
@@ -293,7 +293,7 @@
<simple-method method-name="createAgreementRole" short-description="Create an Agreement Role">
<make-value entity-name="AgreementRole" value-field="newEntity"/>
<set-pk-fields value-field="newEntity" map="parameters"/>
- <set-nonpk-fields value-name="newEntity" map-name="parameters"/>
+ <set-nonpk-fields value-field="newEntity" map="parameters"/>
<create-value value-name="newEntity"/>
</simple-method>
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=730107&r1=730106&r2=730107&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 03:59:10 2008
@@ -26,12 +26,12 @@
<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"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="updateCostComponentCalc" short-description="Update a CostComponentCalc entry">
<entity-one entity-name="CostComponentCalc" value-name="costComponentCalc"/>
- <set-nonpk-fields map-name="parameters" value-name="costComponentCalc"/>
+ <set-nonpk-fields map="parameters" value-field="costComponentCalc"/>
<store-value value-name="costComponentCalc"/>
</simple-method>
<simple-method method-name="removeCostComponentCalc" short-description="Remove a CostComponentCalc entry">
@@ -41,7 +41,7 @@
<simple-method method-name="createWorkEffortCostCalc" short-description="Create a WorkEffortCostCalc entry">
<make-value entity-name="WorkEffortCostCalc" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate">
<now-timestamp-to-env env-name="newEntity.fromDate"/>
</if-empty>
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=730107&r1=730106&r2=730107&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 03:59:10 2008
@@ -37,7 +37,7 @@
<make-value value-field="newEntity" entity-name="FinAccount"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.finAccountId">
<sequenced-id-to-env sequence-name="FinAccount" env-name="finAccountId"/>
@@ -120,7 +120,7 @@
</then>
</if>
- <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+ <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<!-- make sure the replenishLevel is a sane number -->
<calculate field-name="lookedUpValue.replenishLevel" decimal-scale="${roundingDecimals}" rounding-mode="${roundingMode}">
@@ -153,7 +153,7 @@
<make-value entity-name="FinAccountStatus" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<set field="newEntity.statusDate" from-field="nowTimestamp"/>
<create-value value-name="newEntity"/>
</simple-method>
@@ -163,7 +163,7 @@
<call-simple-method method-name="getArithmeticSettingsInline"/>
<make-value value-field="newEntity" entity-name="FinAccountTrans"/>
- <set-nonpk-fields value-name="newEntity" map-name="parameters"/>
+ <set-nonpk-fields value-field="newEntity" map="parameters"/>
<sequenced-id-to-env sequence-name="FinAccountTrans" env-name="newEntity.finAccountTransId"/>
<now-timestamp-to-env env-name="nowTimestamp"/>
@@ -193,7 +193,7 @@
<simple-method method-name="createFinAccountRole" short-description="Create a Financial Account Role">
<make-value value-field="newEntity" entity-name="FinAccountRole"/>
<set-pk-fields value-field="newEntity" map="parameters"/>
- <set-nonpk-fields value-name="newEntity" map-name="parameters"/>
+ <set-nonpk-fields value-field="newEntity" map="parameters"/>
<if-empty field="newEntity.fromDate">
<now-timestamp-to-env env-name="newEntity.fromDate"/>
@@ -203,7 +203,7 @@
</simple-method>
<simple-method method-name="updateFinAccountRole" short-description="Update a Financial Account Role">
<entity-one entity-name="FinAccountRole" value-name="lookedUpValue"/>
- <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+ <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteFinAccountRole" short-description="Delete a Financial Account Role">
@@ -216,7 +216,7 @@
<call-simple-method method-name="getArithmeticSettingsInline"/>
<make-value value-field="newEntity" entity-name="FinAccountAuth"/>
- <set-nonpk-fields value-name="newEntity" map-name="parameters"/>
+ <set-nonpk-fields value-field="newEntity" map="parameters"/>
<sequenced-id-to-env sequence-name="FinAccountAuth" env-name="newEntity.finAccountAuthId"/>
@@ -328,14 +328,14 @@
<!-- FinAccountTypeGlAccount methods -->
<simple-method method-name="createFinAccountTypeGlAccount" short-description="Create an FinAccountTypeGlAccount">
<make-value value-field="newEntity" entity-name="FinAccountTypeGlAccount"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="updateFinAccountTypeGlAccount" short-description="Update an FinAccountTypeGlAccount">
<entity-one entity-name="FinAccountTypeGlAccount" value-name="lookedUpValue"/>
- <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+ <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -347,14 +347,14 @@
<!-- VarianceReasonGlAccount methods -->
<simple-method method-name="createVarianceReasonGlAccount" short-description="Create a Variance Reason Gl Account">
<make-value entity-name="VarianceReasonGlAccount" value-field="newEntity" />
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="updateVarianceReasonGlAccount" short-description="Update an Variance Reason Gl Account">
<entity-one entity-name="VarianceReasonGlAccount" value-name="lookedUpValue"/>
- <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+ <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
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=730107&r1=730106&r2=730107&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 03:59:10 2008
@@ -29,7 +29,7 @@
<simple-method method-name="createFixedAsset" short-description="Create an FixedAsset">
<!-- create new entity and create all the fields -->
<make-value value-field="newEntity" entity-name="FixedAsset"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<!-- create a non existing ID if not supplied -->
<if-empty field="parameters.fixedAssetId">
@@ -54,7 +54,7 @@
<!-- update an existing Fixed Asset header Record -->
<simple-method method-name="updateFixedAsset" short-description="Update an existing FixedAsset">
<entity-one entity-name="FixedAsset" value-name="lookedUpValue"/>
- <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+ <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -66,7 +66,7 @@
<simple-method method-name="addFixedAssetProduct" short-description="Add Product to FixedAsset">
<make-value value-field="newEntity" entity-name="FixedAssetProduct"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate">
<now-timestamp-to-env env-name="newEntity.fromDate"/>
@@ -78,7 +78,7 @@
<!-- update the product to fixed Asset link -->
<simple-method method-name="updateFixedAssetProduct" short-description="Update Products of a FixedAsset">
<entity-one entity-name="FixedAssetProduct" value-name="lookedUpValue"/>
- <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+ <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -105,7 +105,7 @@
<set-pk-fields field-name= "calendarId" map="fixedAsset" value-field="excDayPKMap"/>
<set-pk-fields fieldName= "exceptionDateStartTime" map="parameters" value-field="excDayPKMap"/>
<find-by entity-name="TechDataCalendarExcDay" map-name="excDayPKMap" value-name="lookedUpValue"/>
- <set-nonpk-fields field-name="capacity" map-name="parameters" value-name="lookedUpValue"/>
+ <set-nonpk-fields field-name="capacity" map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -126,7 +126,7 @@
<check-errors/>
<make-value value-field="newEntity" entity-name="FixedAssetStdCost"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<!-- finally create the record (should not exist already)-->
@@ -136,7 +136,7 @@
<!-- update an existing FixedAssetStdCost -->
<simple-method method-name="updateFixedAssetStdCost" short-description="Update an existing FixedAssetStdCost">
<entity-one entity-name="FixedAssetStdCost" value-name="fixedAssetStdCost"/>
- <set-nonpk-fields map-name="parameters" value-name="fixedAssetStdCost"/>
+ <set-nonpk-fields map="parameters" value-field="fixedAssetStdCost"/>
<store-value value-name="fixedAssetStdCost"/>
</simple-method>
<!-- cancel an existing Agreement -->
@@ -149,13 +149,13 @@
<!-- Fixed Asset Identification "FIXED_ASSET_IDENT"-->
<simple-method method-name="createFixedAssetIdent" short-description="Create an FixedAssetIdent">
<make-value value-field="newEntity" entity-name="FixedAssetIdent"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="updateFixedAssetIdent" short-description="Update an existing FixedAssetIdent">
<entity-one entity-name="FixedAssetIdent" value-name="lookedUpValue"/>
- <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+ <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeFixedAssetIdent" short-description="Remove Fixed Assets Idents FixedAssetIdent">
@@ -166,7 +166,7 @@
<!-- FixedAsset Registration Create/Update/Delete"-->
<simple-method method-name="createFixedAssetRegistration" short-description="Create FixedAsset Registration">
<make-value value-field="newEntity" entity-name="FixedAssetRegistration"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate">
<now-timestamp-to-env env-name="newEntity.fromDate"/>
@@ -175,7 +175,7 @@
</simple-method>
<simple-method method-name="updateFixedAssetRegistration" short-description="Update an existing FixedAsset Registration">
<entity-one entity-name="FixedAssetRegistration" value-name="lookedUpValue"/>
- <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+ <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteFixedAssetRegistration" short-description="Delete FixedAsset Registration">
@@ -189,7 +189,7 @@
<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"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-not-empty field="parameters.productMaintSeqId">
<entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
<entity-one entity-name="ProductMaint" value-name="productMaint">
@@ -246,7 +246,7 @@
<entity-one entity-name="FixedAssetMaint" value-name="lookedUpValue"/>
<set field="oldStatusId" from-field="lookedUpValue.statusId"/>
<field-to-result field-name="oldStatusId"/>
- <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+ <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<if-not-empty field="parameters.productMaintSeqId">
<entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
<entity-one entity-name="ProductMaint" value-name="productMaint">
@@ -307,7 +307,7 @@
<simple-method method-name="createFixedAssetMeter" short-description="Create a Fixed Asset Meter Reading">
<make-value entity-name="FixedAssetMeter" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
<check-errors/>
<set field="meterValue" from-field="newEntity"/>
@@ -315,7 +315,7 @@
</simple-method>
<simple-method method-name="updateFixedAssetMeter" short-description="Update a Fixed Asset Meter Reading">
<entity-one entity-name="FixedAssetMeter" value-name="lookedUpValue"/>
- <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+ <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
<check-errors/>
<set field="meterValue" from-field="lookedUpValue"/>
@@ -458,7 +458,7 @@
<iterate list="maintMeterList" entry="maintMeter">
<make-value value-field="newEntity" entity-name="FixedAssetMeter"/>
<set-pk-fields map="maintMeter" value-field="newEntity"/>
- <set-nonpk-fields map-name="maintMeter" value-name="newEntity"/>
+ <set-nonpk-fields map="maintMeter" value-field="newEntity"/>
<set field="newEntity.readingDate" from-field="maintMeter.createdStamp"/>
<entity-one entity-name="FixedAssetMeter" value-name="lookedUpValue" auto-field-map="false">
<field-map field-name="fixedAssetId" from-field="newEntity.fixedAssetId"/>
@@ -507,7 +507,7 @@
<make-value entity-name="FixedAssetMaintOrder" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="deleteFixedAssetMaintOrder" short-description="Delete FixedAsset Maintenance Order">
@@ -519,7 +519,7 @@
<simple-method method-name="createPartyFixedAssetAssignment" short-description="Associate Party to Fixed Asset">
<make-value entity-name="PartyFixedAssetAssignment" value-field="newEntity"/>
<set-pk-fields value-field="newEntity" map="parameters"/>
- <set-nonpk-fields value-name="newEntity" map-name="parameters"/>
+ <set-nonpk-fields value-field="newEntity" map="parameters"/>
<if-empty field="newEntity.fromDate">
<now-timestamp-to-env env-name="nowTimestamp"/>
<set field="newEntity.fromDate" from-field="nowTimestamp"/>
@@ -529,7 +529,7 @@
<simple-method method-name="updatePartyFixedAssetAssignment" short-description="Update Party to Fixed Asset">
<entity-one entity-name="PartyFixedAssetAssignment" value-name="newEntity"/>
- <set-nonpk-fields value-name="newEntity" map-name="parameters"/>
+ <set-nonpk-fields value-field="newEntity" map="parameters"/>
<store-value value-name="newEntity"/>
</simple-method>
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=730107&r1=730106&r2=730107&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 03:59:10 2008
@@ -123,7 +123,7 @@
<now-timestamp-to-env env-name="nowTimestamp"/>
<make-value value-field="newEntity" entity-name="Invoice"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<!-- call getNextInvoiceId service with the parameters.partyIdFrom when invoice Id is not suplied
else use it from the input -->
@@ -210,7 +210,7 @@
<!-- only try to update content if the status is in process.... -->
<if-compare field="lookedUpValue.statusId" operator="equals" value="INVOICE_IN_PROCESS">
<clone-value value-name="lookedUpValue" new-value-name="savedValue"/>
- <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+ <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<!-- only save if something has changed, do not update status here -->
<set from-field="savedValue.statusId" field="lookedUpValue.statusId"/> <!-- get old status back -->
@@ -250,7 +250,7 @@
<call-simple-method method-name="InvoiceStatusInProgress"/>
<make-value value-field="newEntity" entity-name="InvoiceItem"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <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"/>
@@ -289,7 +289,7 @@
<clone-value value-name="lookedUpValue" new-value-name="savedValue"/>
<!-- set all parameters -->
- <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+ <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<!-- check if the productNumber is updated, when yes retrieve product description and price -->
<if-not-empty field="productId">
@@ -421,7 +421,7 @@
<simple-method method-name="createInvoiceRole" short-description="Create a Invoice Role">
<call-simple-method method-name="InvoiceStatusInProgress"/>
<make-value value-field="newEntity" entity-name="InvoiceRole"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.datetimePerformed"><now-timestamp-to-env env-name="newEntity.datetimePerformed"/></if-empty>
<create-value value-name="newEntity"/>
@@ -474,7 +474,7 @@
<store-value value-name="invoice"/>
<make-value value-field="newEntity" entity-name="InvoiceStatus"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.statusDate">
@@ -504,7 +504,7 @@
<call-simple-method method-name="InvoiceStatusInProgress"/>
<make-value value-field="newEntity" entity-name="InvoiceTerm"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <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"/>
@@ -548,7 +548,7 @@
<simple-method method-name="updateInvoiceItemType" short-description="Updates a InvoiceItemType Record">
<entity-one entity-name="InvoiceItemType" value-name="lookedUpValue"/>
- <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+ <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</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=730107&r1=730106&r2=730107&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 03:59:10 2008
@@ -23,7 +23,7 @@
<!-- ========= AcctgTrans methods ========= -->
<simple-method method-name="createAcctgTrans" short-description="Create an AcctgTrans">
<make-value entity-name="AcctgTrans" value-field="newEntity"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<set field="newEntity.isPosted" value="N"/>
<!-- AcctgTrans uses a sequenced id, so get the next one now and set it... -->
@@ -41,7 +41,7 @@
<add-error><fail-property resource="AccountingUiLabels" property="AccountingTransactionHasBeenAlreadyPosted"/></add-error>
<check-errors/>
</if-compare>
- <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+ <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<set from-field="userLogin.userLoginId" field="lookedUpValue.lastModifiedByUserLogin"/>
@@ -65,7 +65,7 @@
<!-- ========= AcctgTransEntry methods ========= -->
<simple-method method-name="createAcctgTransEntry" short-description="Add Entry To AcctgTrans">
<make-value entity-name="AcctgTransEntry" value-field="newEntity"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<entity-one entity-name="AcctgTrans" value-name="acctgTrans"/>
<if-compare field="acctgTrans.isPosted" operator="equals" value="Y">
@@ -125,7 +125,7 @@
<check-errors/>
</if-compare>
<entity-one entity-name="AcctgTransEntry" value-name="lookedUpValue"/>
- <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+ <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
<!-- when changing entries, also update the last modified info for the AcctgTrans -->
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=730107&r1=730106&r2=730107&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 03:59:10 2008
@@ -22,7 +22,7 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="createBillingAccount" short-description="Create Billing Account">
<make-value value-field="newEntity" entity-name="BillingAccount"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<sequenced-id-to-env sequence-name="BillingAccount" env-name="billingAccountId"/>
<to-string field-name="billingAccountId"/>
@@ -40,12 +40,12 @@
<make-value value-field="lookupPKMap" entity-name="BillingAccount"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="BillingAccount" map="lookupPKMap" value-field="lookedUpValue"/>
- <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+ <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="createBillingAccountRole" short-description="Create Billing Account Role">
<make-value value-field="newEntity" entity-name="BillingAccountRole"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate">
<now-timestamp-to-env env-name="nowTimestamp"/>
@@ -57,7 +57,7 @@
<make-value value-field="lookupPKMap" entity-name="BillingAccountRole"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="BillingAccountRole" map="lookupPKMap" value-field="lookedUpValue"/>
- <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+ <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeBillingAccountRole" short-description="Remove Billing Account Role">
@@ -68,7 +68,7 @@
</simple-method>
<simple-method method-name="createBillingAccountTerm" short-description="Create Billing Account Term">
<make-value value-field="newEntity" entity-name="BillingAccountTerm"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<sequenced-id-to-env sequence-name="BillingAccountTerm" env-name="billingAccountTermId"/>
<to-string field-name="billingAccountTermId"/>
@@ -81,7 +81,7 @@
<make-value value-field="lookupPKMap" entity-name="BillingAccountTerm"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="BillingAccountTerm" map="lookupPKMap" value-field="lookedUpValue"/>
- <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+ <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeBillingAccountTerm" short-description="Remove Billing Account Term">
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml Tue Dec 30 03:59:10 2008
@@ -59,7 +59,7 @@
<if-compare field="lookedUpValue.paymentMethodTypeId" operator="equals" value="CREDIT_CARD">
<find-by-primary-key entity-name="CreditCard" map="lookupPKMap" value-field="mainValue"/>
<clone-value value-name="mainValue" new-value-name="savedValue"/>
- <set-nonpk-fields map-name="parameters" value-name="mainValue"/>
+ <set-nonpk-fields map="parameters" value-field="mainValue"/>
<if-compare-field field="mainValue" to-field="savedValue" operator="not-equals" type="Object">
<store-value value-name="mainValue"/>
</if-compare-field>
@@ -67,7 +67,7 @@
<if-compare field="lookedUpValue.paymentMethodTypeId" operator="equals" value="EFT_ACCOUNT">
<find-by-primary-key entity-name="CreditCard" map="lookupPKMap" value-field="mainValue"/>
<clone-value value-name="mainValue" new-value-name="savedValue"/>
- <set-nonpk-fields map-name="parameters" value-name="mainValue"/>
+ <set-nonpk-fields map="parameters" value-field="mainValue"/>
<if-compare-field field="mainValue" to-field="savedValue" operator="not-equals" type="Object">
<store-value value-name="mainValue"/>
</if-compare-field>
@@ -105,13 +105,13 @@
<simple-method method-name="createCreditCardTypeGlAccount" short-description="Create a Credit Card Gl Account">
<make-value entity-name="CreditCardTypeGlAccount" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="updateCreditCardTypeGlAccount" short-description="Update a Credit Card Gl Account">
<entity-one entity-name="CreditCardTypeGlAccount" value-name="lookedUpValue"/>
- <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+ <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -123,7 +123,7 @@
<!-- Updates a Payment Method Type default glAccountId -->
<simple-method method-name="updatePaymentMethodType" short-description="Updates a Payment Method Type default glAccountId">
<entity-one entity-name="PaymentMethodType" value-name="lookedUpValue"/>
- <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+ <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
</simple-methods>
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=730107&r1=730106&r2=730107&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 03:59:10 2008
@@ -57,7 +57,7 @@
</add-error>
</if-empty>
- <set-nonpk-fields map-name="parameters" value-name="payment"/>
+ <set-nonpk-fields map="parameters" value-field="payment"/>
<if-empty field="payment.effectiveDate">
<now-timestamp-to-env env-name="payment.effectiveDate"/>
</if-empty>
@@ -86,9 +86,9 @@
<!-- check if only status change -->
<make-value value-field="newPayment" entity-name="Payment"/>
<make-value value-field="oldPayment" entity-name="Payment"/>
- <set-nonpk-fields value-name="newPayment" map-name="payment"/>
- <set-nonpk-fields value-name="oldPayment" map-name="payment"/>
- <set-nonpk-fields value-name="newPayment" map-name="parameters"/>
+ <set-nonpk-fields value-field="newPayment" map="payment"/>
+ <set-nonpk-fields value-field="oldPayment" map="payment"/>
+ <set-nonpk-fields value-field="newPayment" map="parameters"/>
<set field="newPayment.statusId" from-field="oldPayment.statusId"/>
<if-compare-field field="oldPayment" to-field="newPayment" operator="not-equals">
<log level="always" message="=========Old: ${oldPayment} ============New: ${newPayment}"></log>
@@ -100,7 +100,7 @@
<check-errors/>
<set field="statusIdSave" from-field="payment.statusId"/> <!-- do not allow status change here -->
- <set-nonpk-fields map-name="parameters" value-name="payment"/>
+ <set-nonpk-fields map="parameters" value-field="payment"/>
<set field="payment.statusId" from-field="statusIdSave"/> <!-- do not allow status change here -->
<if-empty field="payment.effectiveDate">
@@ -138,7 +138,7 @@
</if-empty>
<make-value entity-name="PaymentApplication" value-field="paymentAppl"/>
- <set-nonpk-fields map-name="parameters" value-name="paymentAppl"/>
+ <set-nonpk-fields map="parameters" value-field="paymentAppl"/>
<!-- get the invoice and do some further validation against it -->
<if-not-empty field="parameters.invoiceId">
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=730107&r1=730106&r2=730107&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 03:59:10 2008
@@ -64,7 +64,7 @@
<make-value entity-name="RateAmount" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<now-timestamp-to-env env-name="newEntity.fromDate"/>
<clear-field field-name="newEntity.thruDate"/>
<create-value value-name="newEntity"/>
@@ -310,7 +310,7 @@
<make-value value-field="newEntity" entity-name="PartyRate"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<call-simple-method method-name="checkOtherDefaultRate"/>
<create-value value-name="newEntity"/>
@@ -356,11 +356,11 @@
<iterate entry="posRate" list="posRates">
<make-value value-field="emplPositionTypeRate" entity-name="EmplPositionTypeRate"/>
<set-pk-fields value-field="posRate" map="emplPositionTypeRate"/>
- <set-nonpk-fields value-name="posRate" map-name="emplPositionTypeRate"/>
+ <set-nonpk-fields value-field="posRate" map="emplPositionTypeRate"/>
<create-value value-name="emplPositionTypeRate"/>
<make-value value-field="rateAmount" entity-name="RateAmount"/>
<set-pk-fields value-field="posRate" map="rateAmount"/>
- <set-nonpk-fields value-name="posRate" map-name="rateAmount"/>
+ <set-nonpk-fields value-field="posRate" map="rateAmount"/>
<set field="rateAmount.workeffortId" value="_NA_"/>
<set field="rateAmount.partyId" value="_NA_"/>
<property-to-field resource="general.properties" property="currency.uom.id.default" field-name="rateAmount.rateCurrencyUomId"/>
@@ -370,11 +370,11 @@
<iterate entry="oldPartyRate" list="oldPartyRates">
<make-value value-field="partyRate" entity-name="PartyRate"/>
<set-pk-fields value-field="oldPartyRate" map="partyRate"/>
- <set-nonpk-fields value-name="oldPartyRate" map-name="partyRate"/>
+ <set-nonpk-fields value-field="oldPartyRate" map="partyRate"/>
<create-value value-name="partyRate"/>
<make-value value-field="rateAmount" entity-name="RateAmount"/>
<set-pk-fields value-field="oldPartyRate" map="rateAmount"/>
- <set-nonpk-fields value-name="oldPartyRate" map-name="rateAmount"/>
+ <set-nonpk-fields value-field="oldPartyRate" map="rateAmount"/>
<set field="rateAmount.workeffortId" value="_NA_"/>
<set field="rateAmount.emplPositionTypeId" value="_NA_"/>
<set field="rateAmount.periodTypeId" value="RATE_HOUR"/>
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=730107&r1=730106&r2=730107&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 03:59:10 2008
@@ -29,7 +29,7 @@
<make-value entity-name="TaxAuthority" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="updateTaxAuthority" short-description="update a TaxAuthority">
@@ -38,7 +38,7 @@
<check-errors/>
<entity-one entity-name="TaxAuthority" value-name="lookedUpValue"/>
- <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+ <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteTaxAuthority" short-description="delete a TaxAuthority">
@@ -59,7 +59,7 @@
<make-value entity-name="TaxAuthorityAssoc" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="updateTaxAuthorityAssoc" short-description="update a TaxAuthorityAssoc">
@@ -68,7 +68,7 @@
<check-errors/>
<entity-one entity-name="TaxAuthorityAssoc" value-name="lookedUpValue"/>
- <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+ <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteTaxAuthorityAssoc" short-description="delete a TaxAuthorityAssoc">
@@ -88,7 +88,7 @@
<make-value entity-name="TaxAuthorityCategory" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="updateTaxAuthorityCategory" short-description="update a TaxAuthorityCategory">
@@ -97,7 +97,7 @@
<check-errors/>
<entity-one entity-name="TaxAuthorityCategory" value-name="lookedUpValue"/>
- <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+ <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteTaxAuthorityCategory" short-description="delete a TaxAuthorityCategory">
@@ -129,7 +129,7 @@
<make-value entity-name="TaxAuthorityGlAccount" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="updateTaxAuthorityGlAccount" short-description="update a TaxAuthorityGlAccount">
@@ -138,7 +138,7 @@
<check-errors/>
<entity-one entity-name="TaxAuthorityGlAccount" value-name="lookedUpValue"/>
- <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+ <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteTaxAuthorityGlAccount" short-description="delete a TaxAuthorityGlAccount">
@@ -160,7 +160,7 @@
<sequenced-id-to-env sequence-name="TaxAuthorityRateProduct" env-name="newEntity.taxAuthorityRateSeqId"/>
<field-to-result field-name="newEntity.taxAuthorityRateSeqId" result-name="taxAuthorityRateSeqId"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="updateTaxAuthorityRateProduct" short-description="update a TaxAuthorityRateProduct">
@@ -169,7 +169,7 @@
<check-errors/>
<entity-one entity-name="TaxAuthorityRateProduct" value-name="lookedUpValue"/>
- <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+ <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteTaxAuthorityRateProduct" short-description="delete a TaxAuthorityRateProduct">
@@ -195,7 +195,7 @@
<make-value entity-name="PartyTaxAuthInfo" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
@@ -209,7 +209,7 @@
<check-errors/>
<entity-one entity-name="PartyTaxAuthInfo" value-name="lookedUpValue"/>
- <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+ <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="validatePartyTaxIdInline" short-description="validatePartyTaxIdInline">
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=730107&r1=730106&r2=730107&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 03:59:10 2008
@@ -181,7 +181,7 @@
<set field="blogList[]"/>
<iterate entry="view" list="unfilteredList">
<make-value entity-name="Content" value-field="content"/>
- <set-nonpk-fields value-name="content" map-name="view"/>
+ <set-nonpk-fields value-field="content" map="view"/>
<set-pk-fields value-field="content" map="view"/>
<set field="mapIn.currentContent" from-field="content"/>
<log level="info" message="mapIn: ${mapIn}"/>
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=730107&r1=730106&r2=730107&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 03:59:10 2008
@@ -333,7 +333,7 @@
</check-permission>
<check-errors/>
<make-value entity-name="ContentRevision" value-field="newEntity"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
@@ -345,7 +345,7 @@
<make-value entity-name="ContentRevision" value-field="lookupKeyValue"/>
<set-pk-fields map="parameters" value-field="lookupKeyValue"/>
<find-by-primary-key entity-name="ContentRevision" map="lookupKeyValue" value-field="lookedUpValue"/>
- <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+ <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeContentRevision" short-description="Remove ContentRevision">
@@ -365,7 +365,7 @@
</check-permission>
<check-errors/>
<make-value entity-name="ContentRevisionItem" value-field="newEntity"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
@@ -377,7 +377,7 @@
<make-value entity-name="ContentRevisionItem" value-field="lookupKeyValue"/>
<set-pk-fields map="parameters" value-field="lookupKeyValue"/>
<find-by-primary-key entity-name="ContentRevisionItem" map="lookupKeyValue" value-field="lookedUpValue"/>
- <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+ <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeContentRevisionItem" short-description="Remove ContentRevisionItem">
@@ -427,7 +427,7 @@
<log level="info" message="incrementedSeq(1): ${incrementedSeq}"/>
<log level="info" message="numericPadding(1): ${numericPadding}"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<set field="newEntity.contentRevisionSeqId" from-field="paddedSeqId"/>
<log level="info" message="ContentRevision(1): ${newEntity}"/>
<create-value value-name="newEntity"/>
@@ -435,7 +435,7 @@
<make-value entity-name="ContentRevisionItem" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set field="newEntity.contentRevisionSeqId" from-field="paddedSeqId"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
<log level="info" message="ContentRevisionItem(1): ${newEntity}"/>
</if-not-empty>
@@ -491,7 +491,7 @@
</check-permission>
<check-errors/>
<make-value entity-name="ContentApproval" value-field="newEntity"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.contentApprovalId">
<sequenced-id-to-env sequence-name="ContentApproval" env-name="newEntity.contentApprovalId"/>
@@ -509,7 +509,7 @@
<make-value entity-name="ContentApproval" value-field="lookupKeyValue"/>
<set-pk-fields map="parameters" value-field="lookupKeyValue"/>
<find-by-primary-key entity-name="ContentApproval" map="lookupKeyValue" value-field="lookedUpValue"/>
- <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+ <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeContentApproval" short-description="Remove ContentApproval">
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml Tue Dec 30 03:59:10 2008
@@ -26,7 +26,7 @@
<make-value entity-name="Content" value-field="currentContent"/>
<set-pk-fields map="parameters" value-field="currentContent"/>
- <set-nonpk-fields map-name="parameters" value-name="currentContent"/>
+ <set-nonpk-fields map="parameters" value-field="currentContent"/>
<call-map-processor in-map-name="currentContent" out-map-name="currentContent">
<simple-map-processor name="newDateContent">
<process field="createdDate">
@@ -90,7 +90,7 @@
<make-value entity-name="Content" value-field="currentContent"/>
<set-pk-fields map="parameters" value-field="currentContent"/>
- <set-nonpk-fields map-name="parameters" value-name="currentContent"/>
+ <set-nonpk-fields map="parameters" value-field="currentContent"/>
<call-map-processor in-map-name="currentContent" out-map-name="currentContent">
<simple-map-processor name="newDateContent">
<process field="createdDate">
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml Tue Dec 30 03:59:10 2008
@@ -22,7 +22,7 @@
<simple-method method-name="createContentAndPurpose" short-description="Create Content And Purpose" login-required="false">
<make-value entity-name="Content" value-field="currentContent"/>
<set-pk-fields map="parameters" value-field="currentContent"/>
- <set-nonpk-fields map-name="parameters" value-name="currentContent"/>
+ <set-nonpk-fields map="parameters" value-field="currentContent"/>
<if-empty field="currentContent.contentId">
<make-next-seq-id seq-field-name="contentId" value-name="currentContent"/>
<sequenced-id-to-env env-name="id" sequence-name="Content"/>