|
Author: jleroux
Date: Wed Dec 31 02:40:29 2008 New Revision: 730369 URL: http://svn.apache.org/viewvc?rev=730369&view=rev Log: <property-to-field(.*)field-name => <property-to-field$1field <store-value value-name => <store-value value-field ... Weird : I have already done this one in r730190 ! Modified: 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/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/content/ContentServices.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.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/opportunity/OpportunityServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.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/request/CustRequestServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.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/party/script/org/ofbiz/party/user/UserEvents.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.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/store/ProductStoreServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml ofbiz/trunk/framework/common/script/org/ofbiz/common/EnumerationServices.xml ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.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 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=730369&r1=730368&r2=730369&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 Wed Dec 31 02:40:29 2008 @@ -32,7 +32,7 @@ <simple-method method-name="updateCostComponentCalc" short-description="Update a CostComponentCalc entry"> <entity-one entity-name="CostComponentCalc" value-field="costComponentCalc"/> <set-nonpk-fields map="parameters" value-field="costComponentCalc"/> - <store-value value-name="costComponentCalc"/> + <store-value value-field="costComponentCalc"/> </simple-method> <simple-method method-name="removeCostComponentCalc" short-description="Remove a CostComponentCalc entry"> <entity-one entity-name="CostComponentCalc" value-field="costComponentCalc"/> 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=730369&r1=730368&r2=730369&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 Wed Dec 31 02:40:29 2008 @@ -22,8 +22,8 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd"> <simple-method method-name="getArithmeticSettingsInline" short-description="getArithmeticSettingsInline"> - <property-to-field resource="arithmetic" property="finaccount.decimals" field-name="roundingDecimals" default="2"/> - <property-to-field resource="arithmetic" property="finaccount.roundingSimpleMethod" field-name="roundingMode" default="HalfUp"/> + <property-to-field resource="arithmetic" property="finaccount.decimals" field="roundingDecimals" default="2"/> + <property-to-field resource="arithmetic" property="finaccount.roundingSimpleMethod" field="roundingMode" default="HalfUp"/> <log level="info" message="Got settings from arithmetic.properties: roundingDecimals=${roundingDecimals}, roundingMode=${roundingMode}"/> </simple-method> @@ -48,7 +48,7 @@ <!-- set the currency if none is already set --> <if-empty field="newEntity.currencyUomId"> - <property-to-field resource="general" property="currency.uom.id.default" field-name="defaultCurrency"/> + <property-to-field resource="general" property="currency.uom.id.default" field="defaultCurrency"/> <set field="newEntity.currencyUomId" from-field="defaultCurrency"/> </if-empty> 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=730369&r1=730368&r2=730369&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 Wed Dec 31 02:40:29 2008 @@ -242,7 +242,7 @@ <set field="emailParams.bodyParameters.userLogin" from-field="parameters.userLogin"/> <set field="emailParams.bodyParameters.other" from-field="parameters.other"/><!-- to to print in 'other currency' --> <call-service-asynch service-name="sendMailFromScreen" in-map-name="emailParams"/> - <property-to-field resource="AccountingUiLabels" property="AccountingEmailScheduledToSend" field-name="successMessage"/> + <property-to-field resource="AccountingUiLabels" property="AccountingEmailScheduledToSend" field="successMessage"/> </simple-method> <simple-method method-name="createInvoiceItem" short-description="Create a new Invoice Item"> @@ -377,12 +377,12 @@ </if-compare> <check-errors/> <field-to-result field="paymentApplication.invoiceId" result-name="invoiceId"/> - <property-to-field resource="AccountingUiLabels" property="AccountingPaymentApplToInvoice" field-name="toMessage"/> + <property-to-field resource="AccountingUiLabels" property="AccountingPaymentApplToInvoice" field="toMessage"/> </if-not-empty> <!-- invoice item --> <if-not-empty field="paymentApplication.invoiceItemSeqId"> <field-to-result field="paymentApplication.invoiceItemSeqId" result-name="invoiceItemSeqId"/> - <property-to-field resource="AccountingUiLabels" property="AccountingApplicationToInvoiceItem" field-name="toMessage"/> + <property-to-field resource="AccountingUiLabels" property="AccountingApplicationToInvoiceItem" field="toMessage"/> </if-not-empty> <!-- toPayment --> <if-not-empty field="paymentApplication.toPaymentId"> @@ -395,13 +395,13 @@ </if-compare> <check-errors/> </if-not-empty> - <property-to-field resource="AccountingUiLabels" property="AccountingPaymentApplToPayment" field-name="toMessage"/> + <property-to-field resource="AccountingUiLabels" property="AccountingPaymentApplToPayment" field="toMessage"/> <field-to-result field="paymentApplication.toPaymentId" result-name="toPaymentId"/> </if-not-empty> <!-- billing account --> <if-not-empty field="paymentApplication.billingAccountId"> <field-to-result field="paymentApplication.billingAccountId" result-name="billingAccountId"/> - <property-to-field resource="AccountingUiLabels" property="AccountingPaymentApplToBillingAccount" field-name="toMessage"/> + <property-to-field resource="AccountingUiLabels" property="AccountingPaymentApplToBillingAccount" field="toMessage"/> <entity-one entity-name="BillingAccount" value-field="billingAccount"> <field-map field-name="billingAccountId" from-field="paymentApplication.billingAccountId"/> </entity-one> @@ -410,10 +410,10 @@ <!-- tax authority --> <if-not-empty field="paymentApplication.taxAuthGeoId"> <field-to-result field="paymentApplication.taxAuthGeoId" result-name="taxAuthGeoId"/> - <property-to-field resource="AccountingUiLabels" property="AccountingPaymentApplToTaxAuth" field-name="toMessage"/> + <property-to-field resource="AccountingUiLabels" property="AccountingPaymentApplToTaxAuth" field="toMessage"/> </if-not-empty> <!-- finally delete application --> - <property-to-field resource="AccountingUiLabels" property="AccountingPaymentApplRemoved" field-name="successMessage"/> + <property-to-field resource="AccountingUiLabels" property="AccountingPaymentApplRemoved" field="successMessage"/> <string-append field-name="successMessage" string=" ${toMessage}"/> <remove-value value-field="paymentApplication"/> </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=730369&r1=730368&r2=730369&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 Wed Dec 31 02:40:29 2008 @@ -45,7 +45,7 @@ <set from-field="userLogin.userLoginId" field="lookedUpValue.lastModifiedByUserLogin"/> - <store-value value-name="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteAcctgTrans" short-description="Delete an AcctgTrans"> <entity-one entity-name="AcctgTrans" value-field="lookedUpValue"/> @@ -59,7 +59,7 @@ <!-- this is just a little method that is meant to be called as an inline call-simple-method target with the context already setup --> <entity-one entity-name="AcctgTrans" value-field="lookedUpACTX"/> <set from-field="userLogin.userLoginId" field="lookedUpACTX.lastModifiedByUserLogin"/> - <store-value value-name="lookedUpACTX"/> + <store-value value-field="lookedUpACTX"/> </simple-method> <!-- ========= AcctgTransEntry methods ========= --> @@ -126,7 +126,7 @@ </if-compare> <entity-one entity-name="AcctgTransEntry" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> <!-- when changing entries, also update the last modified info for the AcctgTrans --> <call-simple-method method-name="updateAcctgTransLastModified"/> @@ -146,8 +146,8 @@ <!-- AcctgTrans Trial Balance and Post routines --> <simple-method method-name="calculateAcctgTransTrialBalance" short-description="Calculate Trial Balance for a AcctgTrans"> - <property-to-field resource="arithmetic" property="ledger.decimals" field-name="ledgerDecimals"/> - <property-to-field resource="arithmetic" property="ledger.rounding" field-name="roundingMode"/> + <property-to-field resource="arithmetic" property="ledger.decimals" field="ledgerDecimals"/> + <property-to-field resource="arithmetic" property="ledger.rounding" field="roundingMode"/> <log level="info" message="Using ledger decimals [${ledgerDecimals}] and rounding [${roundingMode}]"/> @@ -303,7 +303,7 @@ <else> <!-- assign the transaction to the error journal --> <set field="acctgTrans.glJournalId" from-field="partyAcctgPreference.errorGlJournalId"/> - <store-value value-name="acctgTrans"/> + <store-value value-field="acctgTrans"/> <set field="warningMessage[]" value="The accounting transaction [${acctgTrans.acctgTransId}] has been posted to the Error Journal [${partyAcctgPreference.errorGlJournalId}]."/> <field-to-result field="warningMessage" result-name="successMessageList"/> <return/> @@ -422,7 +422,7 @@ </if-compare> </else> </if-compare> - <store-value value-name="glAccountHistory"/> + <store-value value-field="glAccountHistory"/> </iterate> </iterate> 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=730369&r1=730368&r2=730369&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 Wed Dec 31 02:40:29 2008 @@ -41,7 +41,7 @@ <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="BillingAccount" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="createBillingAccountRole" short-description="Create Billing Account Role"> <make-value value-field="newEntity" entity-name="BillingAccountRole"/> @@ -58,7 +58,7 @@ <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="BillingAccountRole" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="removeBillingAccountRole" short-description="Remove Billing Account Role"> <make-value value-field="lookupPKMap" entity-name="BillingAccountRole"/> @@ -82,7 +82,7 @@ <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="BillingAccountTerm" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="removeBillingAccountTerm" short-description="Remove Billing Account Term"> <make-value entity-name="BillingAccountTerm" value-field="lookupPKMap"/> 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=730369&r1=730368&r2=730369&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 Wed Dec 31 02:40:29 2008 @@ -39,10 +39,10 @@ <if-not-empty field="badOrders"> <string-to-field string="mail.smtp.host" field-name="sendType" map-name="emailParams" /> - <property-to-field resource="payment" property="mailhost" field-name="sendVia" map-name="emailParams"/> - <property-to-field resource="payment" property="sendTo" field-name="sendTo" map-name="emailParams"/> - <property-to-field resource="payment" property="sendFrom" field-name="sendFrom" map-name="emailParams"/> - <property-to-field resource="payment" property="subject" field-name="subject" map-name="emailParams"/> + <property-to-field resource="payment" property="mailhost" field="sendVia" map-name="emailParams"/> + <property-to-field resource="payment" property="sendTo" field="sendTo" map-name="emailParams"/> + <property-to-field resource="payment" property="sendFrom" field="sendFrom" map-name="emailParams"/> + <property-to-field resource="payment" property="subject" field="subject" map-name="emailParams"/> <call-bsh><