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 18:12:17 UTC
svn commit: r730183 [1/6] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/agreement/
applications/accounting/script/org/ofbiz/accounting/finaccount/
applications/accounting/script/org/ofbiz/accounting/invoice/
applications/accoun...
Author: jleroux
Date: Tue Dec 30 09:12:15 2008
New Revision: 730183
URL: http://svn.apache.org/viewvc?rev=730183&view=rev
Log:
<get-related(.*)value-name => <get-related$1value-field
<get-related(.*)list-name => <get-related$1list
<get-related(.*)\R(.*)list-name => <get-related$1\R$2list-name
<get-related(.*)\R(.*)value-name => <get-related$1\R$2value-field
<calculate field-name => <calculate field
<calcop(.*)field-name => <calcop$1field
<result-to-field(.*)field-name => <result-to-field(.*)field
<result-to-field(.*)field="(.*)"(.*) map-name="(.*)" => <result-to-field$1field="$4.$2"$3
<field-to-request field-name => <field-to-request field
(I had a connection break that's while I put all of them in one sole commit)
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.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/invoice/SampleCommissionServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodEvents.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.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/layout/LayoutEvents.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/ContentPermissionServices.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/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.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/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/CustRequestEvents.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/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/party/PartySimpleEvents.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.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/cost/CostServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.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/subscription/SubscriptionServices.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/product/script/org/ofbiz/shipment/test/TestServices.xml
ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/login/LoginSimpleEvents.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/example/script/org/ofbiz/example/example/ExampleServices.xml
ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml
ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml
ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml
ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml
ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml
ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml
ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PaymentEvents.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=730183&r1=730182&r2=730183&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 09:12:15 2008
@@ -71,10 +71,10 @@
<check-errors/>
<set-service-fields service-name="createAgreement" to-map="createAgreementInMap" map="agreement"/>
<call-service service-name="createAgreement" in-map="createAgreementInMap">
- <result-to-field result-name="agreementId" field-name="agreementIdTo"/>
+ <result-to-field result-name="agreementId" field="agreementIdTo"/>
</call-service>
- <get-related value-name="agreement" relation-name="AgreementItem" list-name="agreementItems"/>
+ <get-related value-field="agreement" relation-name="AgreementItem" list="agreementItems"/>
<iterate list="agreementItems" entry="agreementItem">
<clear-field field="createAgreementItemInMap"/>
<set-service-fields service-name="createAgreementItem" to-map="createAgreementItemInMap" map="agreementItem"/>
@@ -82,7 +82,7 @@
<call-service service-name="createAgreementItem" in-map-name="createAgreementItemInMap"/>
</iterate>
<if-compare field="parameters.copyAgreementTerms" value="Y" operator="equals">
- <get-related value-name="agreement" relation-name="AgreementTerm" list-name="agreementTerms"/>
+ <get-related value-field="agreement" relation-name="AgreementTerm" list="agreementTerms"/>
<iterate list="agreementTerms" entry="agreementTerm">
<clear-field field="createAgreementTermInMap"/>
<set-service-fields service-name="createAgreementTerm" to-map="createAgreementTermInMap" map="agreementTerm"/>
@@ -91,7 +91,7 @@
</iterate>
</if-compare>
<if-compare field="parameters.copyAgreementProducts" value="Y" operator="equals">
- <get-related value-name="agreement" relation-name="AgreementProductAppl" list-name="agreementProductAppls"/>
+ <get-related value-field="agreement" relation-name="AgreementProductAppl" list="agreementProductAppls"/>
<iterate list="agreementProductAppls" entry="agreementProductAppl">
<clear-field field="createAgreementProductApplInMap"/>
<set-service-fields service-name="createAgreementProductAppl" to-map="createAgreementProductApplInMap" map="agreementProductAppl"/>
@@ -100,7 +100,7 @@
</iterate>
</if-compare>
<if-compare field="parameters.copyAgreementParties" value="Y" operator="equals">
- <get-related value-name="agreement" relation-name="AgreementPartyApplic" list-name="agreementPartyApplic"/>
+ <get-related value-field="agreement" relation-name="AgreementPartyApplic" list="agreementPartyApplic"/>
<iterate list="agreementPartyApplics" entry="agreementPartyApplic">
<clear-field field="createAgreementPartyApplicInMap"/>
<set-service-fields service-name="createAgreementPartyApplic" to-map="createAgreementPartyApplicInMap" map="agreementPartyApplic"/>
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=730183&r1=730182&r2=730183&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 09:12:15 2008
@@ -73,8 +73,8 @@
</if-empty>
<!-- make sure the replenishLevel is a sane number -->
- <calculate field-name="newEntity.replenishLevel" decimal-scale="${roundingDecimals}" rounding-mode="${roundingMode}">
- <calcop operator="get" field-name="newEntity.replenishLevel"/>
+ <calculate field="newEntity.replenishLevel" decimal-scale="${roundingDecimals}" rounding-mode="${roundingMode}">
+ <calcop operator="get" field="newEntity.replenishLevel"/>
</calculate>
<create-value value-field="newEntity"/>
@@ -123,8 +123,8 @@
<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}">
- <calcop operator="get" field-name="lookedUpValue.replenishLevel"/>
+ <calculate field="lookedUpValue.replenishLevel" decimal-scale="${roundingDecimals}" rounding-mode="${roundingMode}">
+ <calcop operator="get" field="lookedUpValue.replenishLevel"/>
</calculate>
<store-value value-name="lookedUpValue"/>
@@ -178,8 +178,8 @@
<!-- make sure the amount is a sane number -->
<set field="originalAmount" from-field="newEntity.amount"/>
- <calculate field-name="newEntity.amount" decimal-scale="${roundingDecimals}" rounding-mode="${roundingMode}">
- <calcop operator="get" field-name="newEntity.amount"/>
+ <calculate field="newEntity.amount" decimal-scale="${roundingDecimals}" rounding-mode="${roundingMode}">
+ <calcop operator="get" field="newEntity.amount"/>
</calculate>
<if-compare-field field="newEntity.amount" to-field="originalAmount" operator="not-equals" type="BigDecimal">
<log level="warning" message="In createFinAccountTrans had to round the amount from [${originalAmount}] to [${newEntity.amount}]"></log>
@@ -230,8 +230,8 @@
<!-- make sure the amount is a sane number -->
<set field="originalAmount" from-field="newEntity.amount"/>
- <calculate field-name="newEntity.amount" decimal-scale="${roundingDecimals}" rounding-mode="${roundingMode}">
- <calcop operator="get" field-name="newEntity.amount"/>
+ <calculate field="newEntity.amount" decimal-scale="${roundingDecimals}" rounding-mode="${roundingMode}">
+ <calcop operator="get" field="newEntity.amount"/>
</calculate>
<if-compare-field field="newEntity.amount" to-field="originalAmount" operator="not-equals" type="BigDecimal">
<log level="warning" message="In createFinAccountAuth had to round the amount from [${originalAmount}] to [${newEntity.amount}]"></log>
@@ -290,16 +290,16 @@
<then><set field="amountForCalc" from-field="finAccountTrans.amount"/></then>
<else-if>
<condition><if-compare field="finAccountTrans.finAccountTransTypeId" operator="equals" value="WITHDRAWAL"/></condition>
- <then><calculate field-name="amountForCalc"><calcop operator="negative" field-name="finAccountTrans.amount"/></calculate></then>
+ <then><calculate field="amountForCalc"><calcop operator="negative" field="finAccountTrans.amount"/></calculate></then>
</else-if>
<else-if>
<condition><if-compare field="finAccountTrans.finAccountTransTypeId" operator="equals" value="ADJUSTMENT"/></condition>
<then><set field="amountForCalc" from-field="finAccountTrans.amount"/></then>
</else-if>
</if>
- <calculate field-name="actualBalanceSum" type="BigDecimal" decimal-scale="${roundingDecimals}" rounding-mode="${roundingMode}">
- <calcop operator="add" field-name="actualBalanceSum">
- <calcop operator="get" field-name="amountForCalc"/>
+ <calculate field="actualBalanceSum" type="BigDecimal" decimal-scale="${roundingDecimals}" rounding-mode="${roundingMode}">
+ <calcop operator="add" field="actualBalanceSum">
+ <calcop operator="get" field="amountForCalc"/>
</calcop>
</calculate>
</iterate>
@@ -310,9 +310,9 @@
<condition-expr field-name="finAccountId" from-field="finAccountId"/>
</entity-condition>
<iterate entry="finAccountAuth" list="finAccountAuthList">
- <calculate field-name="availableBalanceSum" type="BigDecimal" decimal-scale="${roundingDecimals}" rounding-mode="${roundingMode}">
- <calcop operator="add" field-name="availableBalanceSum">
- <calcop operator="negative" field-name="finAccountAuth.amount"/>
+ <calculate field="availableBalanceSum" type="BigDecimal" decimal-scale="${roundingDecimals}" rounding-mode="${roundingMode}">
+ <calcop operator="add" field="availableBalanceSum">
+ <calcop operator="negative" field="finAccountAuth.amount"/>
</calcop>
</calculate>
</iterate>
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=730183&r1=730182&r2=730183&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 09:12:15 2008
@@ -36,12 +36,12 @@
<log level="info" message="In createInvoice sequence enum INVSQ_ENF_SEQ"/>
<!-- this is sequential sequencing, we can't skip a number, also it must be a unique sequence per partyIdFrom -->
<if-not-empty field="partyAcctgPreference.lastInvoiceNumber">
- <calculate field-name="partyAcctgPreference.lastInvoiceNumber" type="Long">
- <calcop operator="add" field-name="partyAcctgPreference.lastInvoiceNumber"/>
+ <calculate field="partyAcctgPreference.lastInvoiceNumber" type="Long">
+ <calcop operator="add" field="partyAcctgPreference.lastInvoiceNumber"/>
<number value="1"/>
</calculate>
<else>
- <calculate field-name="partyAcctgPreference.lastInvoiceNumber" type="Long"><number value="1"/></calculate>
+ <calculate field="partyAcctgPreference.lastInvoiceNumber" type="Long"><number value="1"/></calculate>
</else>
</if-not-empty>
<store-value value-name="partyAcctgPreference"/>
@@ -58,11 +58,11 @@
<now-timestamp-to-env env-name="nowTimestamp"/>
<if-empty field="partyAcctgPreference.lastInvoiceRestartDate">
<!-- if no lastInvoiceRestartDate then it's easy, just start now with 1 -->
- <calculate field-name="partyAcctgPreference.lastInvoiceNumber" type="Long"><number value="1"/></calculate>
+ <calculate field="partyAcctgPreference.lastInvoiceNumber" type="Long"><number value="1"/></calculate>
<set from-field="nowTimestamp" field="partyAcctgPreference.lastInvoiceRestartDate"/>
<else>
<!-- first figure out if we need to reset the lastInvoiceNumber; is the lastInvoiceRestartDate after the fiscalYearStartMonth/Day for this year? -->
- <calculate field-name="zeroLong" type="Long"><number value="0"/></calculate>
+ <calculate field="zeroLong" type="Long"><number value="0"/></calculate>
<call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getYearStart" ret-field-name="curYearFiscalStartDate">
<field field-name="nowTimestamp" type="java.sql.Timestamp"/>
<field field-name="partyAcctgPreference.fiscalYearStartDay" type="java.lang.Number"/>
@@ -78,13 +78,13 @@
</condition>
<then>
<!-- less than fiscal year start, we need to reset it -->
- <calculate field-name="partyAcctgPreference.lastInvoiceNumber" type="Long"><number value="1"/></calculate>
+ <calculate field="partyAcctgPreference.lastInvoiceNumber" type="Long"><number value="1"/></calculate>
<set from-field="nowTimestamp" field="partyAcctgPreference.lastInvoiceRestartDate"/>
</then>
<else>
<!-- greater than or equal to fiscal year start or nowTimestamp hasn't yet hit the current year fiscal start date, we're okay, just increment -->
- <calculate field-name="partyAcctgPreference.lastInvoiceNumber" type="Long">
- <calcop operator="add" field-name="partyAcctgPreference.lastInvoiceNumber"/>
+ <calculate field="partyAcctgPreference.lastInvoiceNumber" type="Long">
+ <calcop operator="add" field="partyAcctgPreference.lastInvoiceNumber"/>
<number value="1"/>
</calculate>
</else>
@@ -130,7 +130,7 @@
<if-empty field="parameters.invoiceId">
<set field="getNextInvoiceIdMap.partyId" from-field="parameters.partyIdFrom"/>
<call-service service-name="getNextInvoiceId" in-map-name="getNextInvoiceIdMap">
- <result-to-field result-name="invoiceId" field-name="newEntity.invoiceId"/>
+ <result-to-field result-name="invoiceId" field="newEntity.invoiceId"/>
</call-service>
<else>
<set field="newEntity.invoiceId" from-field="parameters.invoiceId"/>
@@ -165,8 +165,8 @@
<simple-method method-name="copyInvoice" short-description="Create a new Invoice from an existing invoice">
<set field="invoiceLookup.invoiceId" from-field="parameters.invoiceIdToCopyFrom"/>
<call-service service-name="getInvoice" in-map-name="invoiceLookup">
- <result-to-field result-name="invoice" field-name="invoice"/>
- <result-to-field result-name="invoiceItems" field-name="invoiceItems"/>
+ <result-to-field result-name="invoice" field="invoice"/>
+ <result-to-field result-name="invoiceItems" field="invoiceItems"/>
</call-service>
<set field="invoice.invoiceId" from-field="parameters.invoiceId"/>
<now-timestamp-to-env env-name="nowTimestamp"/>
@@ -178,10 +178,10 @@
<set-service-fields service-name="createInvoice" map="invoice" to-map="newInvoice"/>
<clear-field field="newInvoice.invoiceId"/>
<call-service service-name="createInvoice" in-map-name="newInvoice">
- <result-to-field result-name="invoiceId" field-name="invoiceId"/>
+ <result-to-field result-name="invoiceId" field="invoiceId"/>
</call-service>
<field-to-result field="invoiceId" result-name="invoiceId"/>
- <field-to-request field-name="invoiceId" request-name="invoiceId"/>
+ <field-to-request field="invoiceId" request-name="invoiceId"/>
<iterate entry="invoiceItem" list="invoiceItems">
<set-service-fields service-name="createInvoiceItem" map="invoiceItem" to-map="createInvoiceItem"/>
<set field="createInvoiceItem.invoiceId" from-field="invoiceId"/>
@@ -196,7 +196,7 @@
<find-by-primary-key entity-name="Invoice" map="lookupPKMap" value-field="invoiceValue"/>
<field-to-result field="invoiceValue" result-name="invoice"/>
<!-- and the items -->
- <get-related value-name="invoiceValue" relation-name="InvoiceItem" list-name="invoiceItemValues"/>
+ <get-related value-field="invoiceValue" relation-name="InvoiceItem" list="invoiceItemValues"/>
<field-to-result field="invoiceItemValues" result-name="invoiceItems"/>
</simple-method>
@@ -263,7 +263,7 @@
<set from-field="product.description" field="newEntity.description"/>
<set from-field="product" field="calculateProductPriceMap.product"/>
<call-service service-name="calculateProductPrice" in-map-name="calculateProductPriceMap">
- <result-to-field result-name="price" field-name="newEntity.amount"/>
+ <result-to-field result-name="price" field="newEntity.amount"/>
</call-service>
</if-not-empty>
</if-empty>
@@ -299,7 +299,7 @@
<set from-field="product" field="calculateProductPriceMap.product"/>
<call-service service-name="calculateProductPrice" in-map-name="calculateProductPriceMap">
- <result-to-field result-name="price" field-name="lookedUpValue.amount"/>
+ <result-to-field result-name="price" field="lookedUpValue.amount"/>
</call-service>
</if-compare-field>
</if-not-empty>
@@ -560,7 +560,7 @@
<set-service-fields service-name="copyInvoice" map="invoice" to-map="copyInvoiceCtx"/>
<set field="copyInvoiceCtx.invoiceIdToCopyFrom" from-field="invoice.invoiceId"/>
<call-service service-name="copyInvoice" in-map-name="copyInvoiceCtx">
- <result-to-field result-name="invoiceId" field-name="invoiceId"/>
+ <result-to-field result-name="invoiceId" field="invoiceId"/>
</call-service>
<set-service-fields service-name="updateInvoice" map="invoice" to-map="updateInvoiceCtx"/>
<set field="updateInvoiceCtx.invoiceId" from-field="invoiceId"/>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/SampleCommissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/SampleCommissionServices.xml?rev=730183&r1=730182&r2=730183&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/SampleCommissionServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/SampleCommissionServices.xml Tue Dec 30 09:12:15 2008
@@ -37,11 +37,11 @@
<condition><if-compare field="affiliatePartyRelationship.roleTypeIdTo" operator="equals" value="AFFILIATE"/></condition>
<then>
<!-- calculate a simple commission with a base amount + a percentage of the payment -->
- <calculate field-name="commissionAmount" type="Double">
+ <calculate field="commissionAmount" type="Double">
<calcop operator="add">
<number value="10.0"/><!-- base amount -->
<calcop operator="multiply">
- <calcop operator="get" field-name="payment.amount"/>
+ <calcop operator="get" field="payment.amount"/>
<number value="0.15"/><!-- commission percentage -->
</calcop>
</calcop>
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=730183&r1=730182&r2=730183&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 09:12:15 2008
@@ -78,7 +78,7 @@
<!-- if not explicitly provided in the parameters, set the currency of the entry from PartyAcctgPreference -->
<set field="partyAccountingPreferencesCallMap.organizationPartyId" from-field="parameters.organizationPartyId"/>
<call-service service-name="getPartyAccountingPreferences" in-map-name="partyAccountingPreferencesCallMap">
- <result-to-field result-name="partyAccountingPreference" field-name="partyAcctgPreference"/>
+ <result-to-field result-name="partyAccountingPreference" field="partyAcctgPreference"/>
</call-service>
<if-empty field="parameters.currencyUomId">
<set from-field="partyAcctgPreference.baseCurrencyUomId" field="newEntity.currencyUomId"/>
@@ -98,7 +98,7 @@
<set field="convertUomInMap.uomIdTo" from-field="newEntity.currencyUomId"/>
<!-- TODO: set the optional asOfDate input parameter -->
<call-service service-name="convertUom" in-map-name="convertUomInMap">
- <result-to-field result-name="convertedValue" field-name="newEntity.amount"/>
+ <result-to-field result-name="convertedValue" field="newEntity.amount"/>
</call-service>
<else>
<set field="newEntity.amount" from-field="newEntity.origAmount"/>
@@ -156,22 +156,22 @@
<condition-expr field-name="acctgTransId" from-field="parameters.acctgTransId"/>
<order-by field-name="acctgTransEntrySeqId"/>
</entity-condition>
- <calculate field-name="debitTotal" type="BigDecimal"><number value="0"/></calculate>
- <calculate field-name="creditTotal" type="BigDecimal"><number value="0"/></calculate>
+ <calculate field="debitTotal" type="BigDecimal"><number value="0"/></calculate>
+ <calculate field="creditTotal" type="BigDecimal"><number value="0"/></calculate>
<iterate entry="acctgTransEntry" list="acctgTransEntryList">
<if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
- <calculate field-name="debitTotal" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}">
+ <calculate field="debitTotal" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}">
<calcop operator="add">
- <calcop operator="get" field-name="debitTotal"/>
- <calcop operator="get" field-name="acctgTransEntry.amount"/>
+ <calcop operator="get" field="debitTotal"/>
+ <calcop operator="get" field="acctgTransEntry.amount"/>
</calcop>
</calculate>
<else>
<if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
- <calculate field-name="creditTotal" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}">
+ <calculate field="creditTotal" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}">
<calcop operator="add">
- <calcop operator="get" field-name="creditTotal"/>
- <calcop operator="get" field-name="acctgTransEntry.amount"/>
+ <calcop operator="get" field="creditTotal"/>
+ <calcop operator="get" field="acctgTransEntry.amount"/>
</calcop>
</calculate>
<else>
@@ -187,10 +187,10 @@
<check-errors/>
<!-- should now have the debitTotal and creditTotal, calculate the debitCreditDifference -->
- <calculate field-name="debitCreditDifference" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}">
+ <calculate field="debitCreditDifference" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}">
<calcop operator="add">
- <calcop operator="get" field-name="debitTotal"/>
- <calcop operator="negative" field-name="creditTotal"/>
+ <calcop operator="get" field="debitTotal"/>
+ <calcop operator="negative" field="creditTotal"/>
</calcop>
</calculate>
@@ -295,7 +295,7 @@
<iterate list="acctgTransEntryList" entry="acctgTransEntry">
<set field="partyAccountingPreferencesCallMap.organizationPartyId" from-field="acctgTransEntry.organizationPartyId"/>
<call-service service-name="getPartyAccountingPreferences" in-map-name="partyAccountingPreferencesCallMap">
- <result-to-field result-name="partyAccountingPreference" field-name="partyAcctgPreference"/>
+ <result-to-field result-name="partyAccountingPreference" field="partyAcctgPreference"/>
</call-service>
<if-empty field="partyAcctgPreference.errorGlJournalId">
<!-- if no error journal is set, then return the error messages -->
@@ -332,8 +332,8 @@
<!-- we do this by first calculating a postingAmount (positive or negative) then adding to the postingBalance -->
<clear-field field="postingAmount"/>
<!-- use the parent of the GlAccountClass, which should either be DEBIT or CREDIT -->
- <get-related-one relation-name="GlAccountClass" value-name="glAccount" to-value-name="glAccountClass"/>
- <get-related-one relation-name="ParentGlAccountClass" value-name="glAccountClass" to-value-name="parentGlAccountClass"/>
+ <get-related-one relation-name="GlAccountClass" value-name="glAccount" to-value-field="glAccountClass"/>
+ <get-related-one relation-name="ParentGlAccountClass" value-field="glAccountClass" to-value-field="parentGlAccountClass"/>
<!-- test if the account is a DEBIT account -->
<set field="isDebit" value="${bsh:org.ofbiz.accounting.util.UtilAccounting.isDebitAccount(glAccount)}"/>
<if-compare field="isDebit" operator="equals" value="true">
@@ -341,8 +341,8 @@
<set from-field="acctgTransEntry.amount" field="postingAmount"/>
<else>
<if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
- <calculate field-name="postingAmount" type="BigDecimal">
- <calcop field-name="acctgTransEntry.amount" operator="negative"/>
+ <calculate field="postingAmount" type="BigDecimal">
+ <calcop field="acctgTransEntry.amount" operator="negative"/>
</calculate>
</if-compare>
</else>
@@ -355,8 +355,8 @@
<set from-field="acctgTransEntry.amount" field="postingAmount"/>
<else>
<if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
- <calculate field-name="postingAmount" type="BigDecimal">
- <calcop field-name="acctgTransEntry.amount" operator="negative"/>
+ <calculate field="postingAmount" type="BigDecimal">
+ <calcop field="acctgTransEntry.amount" operator="negative"/>
</calculate>
</if-compare>
</else>
@@ -369,9 +369,9 @@
</if-compare>
<log level="verbose" message="GL account: [${acctgTransEntry.glAccountId}] initial balance: [${glAccountOrganization.postedBalance}] ${acctgTransEntry.debitCreditFlag} [${acctgTransEntry.amount}]"/>
<!-- calculate the new posted balance for this gl account -->
- <calculate field-name="postedBalance" type="BigDecimal">
- <calcop operator="get" field-name="glAccountOrganization.postedBalance"/>
- <calcop operator="get" field-name="postingAmount"/>
+ <calculate field="postedBalance" type="BigDecimal">
+ <calcop operator="get" field="glAccountOrganization.postedBalance"/>
+ <calcop operator="get" field="postingAmount"/>
</calculate>
<log level="verbose" message="GL account: [${acctgTransEntry.glAccountId}] final balance: [${postedBalance}]"/>
@@ -402,18 +402,18 @@
<!-- update GlAccountHistory's debit and credit totals -->
<if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
- <calculate field-name="postedDebits" map-name="glAccountHistory" type="BigDecimal">
+ <calculate field="postedDebits" map-name="glAccountHistory" type="BigDecimal">
<calcop operator="add">
- <calcop operator="get" field-name="amount" map-name="acctgTransEntry"/>
- <calcop operator="get" field-name="postedDebits" map-name="glAccountHistory"/>
+ <calcop operator="get" field="amount" map-name="acctgTransEntry"/>
+ <calcop operator="get" field="postedDebits" map-name="glAccountHistory"/>
</calcop>
</calculate>
<else>
<if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
- <calculate field-name="postedCredits" map-name="glAccountHistory" type="BigDecimal">
+ <calculate field="postedCredits" map-name="glAccountHistory" type="BigDecimal">
<calcop operator="add">
- <calcop operator="get" field-name="amount" map-name="acctgTransEntry"/>
- <calcop operator="get" field-name="postedCredits" map-name="glAccountHistory"/>
+ <calcop operator="get" field="amount" map-name="acctgTransEntry"/>
+ <calcop operator="get" field="postedCredits" map-name="glAccountHistory"/>
</calcop>
</calculate>
<else>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml?rev=730183&r1=730182&r2=730183&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml Tue Dec 30 09:12:15 2008
@@ -29,7 +29,7 @@
<check-errors/>
<if-compare field="invoice.invoiceTypeId" operator="equals" value="SALES_INVOICE">
<set field="andConditions.invoiceItemTypeId" value="INV_FPROD_ITEM"/>
- <get-related relation-name="InvoiceItem" value-name="invoice" list-name="invoiceItems" map-name="andConditions"/>
+ <get-related relation-name="InvoiceItem" value-field="invoice" list="invoiceItems" map-name="andConditions"/>
<iterate list="invoiceItems" entry="invoiceItem">
<clear-field field="inMap"/>
<set field="inMap.invoice" from-field="invoice"/>
@@ -71,7 +71,7 @@
<set field="inMap.dimensionEntityName" value="DateDimension"/>
<set field="inMap.naturalKeyFields.dateValue" from-field="invoice.invoiceDate"/>
<call-service service-name="getDimensionIdFromNaturalKey" in-map-name="inMap">
- <result-to-field result-name="dimensionId" field-name="fact.invoiceDateDimId"/>
+ <result-to-field result-name="dimensionId" field="fact.invoiceDateDimId"/>
</call-service>
<if-empty field="fact.invoiceDateDimId">
<set field="fact.invoiceDateDimId" value="_NF_"/>
@@ -86,7 +86,7 @@
<set field="inMap.dimensionEntityName" value="ProductDimension"/>
<set field="inMap.naturalKeyFields.productId" from-field="invoiceItem.productId"/>
<call-service service-name="getDimensionIdFromNaturalKey" in-map-name="inMap">
- <result-to-field result-name="dimensionId" field-name="fact.productDimId"/>
+ <result-to-field result-name="dimensionId" field="fact.productDimId"/>
</call-service>
<if-empty field="fact.productDimId">
<set field="fact.productDimId" value="_NF_"/>
@@ -101,7 +101,7 @@
<set field="inMap.dimensionEntityName" value="CurrencyDimension"/>
<set field="inMap.naturalKeyFields.currencyId" from-field="invoice.currencyUomId"/>
<call-service service-name="getDimensionIdFromNaturalKey" in-map-name="inMap">
- <result-to-field result-name="dimensionId" field-name="fact.origCurrencyDimId"/>
+ <result-to-field result-name="dimensionId" field="fact.origCurrencyDimId"/>
</call-service>
<if-empty field="fact.origCurrencyDimId">
<set field="fact.origCurrencyDimId" value="_NF_"/>
@@ -123,37 +123,37 @@
<set field="fact.extDiscountAmount" value="0.0" type="BigDecimal"/>
<set field="fact.extTaxAmount" value="0.0" type="BigDecimal"/>
<set field="fact.extNetAmount" value="0.0" type="BigDecimal"/>
- <calculate field-name="fact.extGrossAmount" type="BigDecimal">
- <calcop field-name="invoiceItem.quantity" operator="multiply">
- <calcop field-name="invoiceItem.amount" operator="get"/>
+ <calculate field="fact.extGrossAmount" type="BigDecimal">
+ <calcop field="invoiceItem.quantity" operator="multiply">
+ <calcop field="invoiceItem.amount" operator="get"/>
</calcop>
</calculate>
<!-- taxes -->
<clear-field field="andConditions"/>
<set field="andConditions.invoiceItemTypeId" value="ITM_SALES_TAX"/>
- <get-related relation-name="ChildrenInvoiceItem" value-name="invoiceItem" list-name="taxes" map-name="andConditions"/>
+ <get-related relation-name="ChildrenInvoiceItem" value-field="invoiceItem" list="taxes" map-name="andConditions"/>
<iterate list="taxes" entry="tax">
- <calculate field-name="fact.extTaxAmount" type="BigDecimal">
- <calcop field-name="fact.extTaxAmount" operator="add">
- <calcop field-name="tax.amount" operator="get"/>
+ <calculate field="fact.extTaxAmount" type="BigDecimal">
+ <calcop field="fact.extTaxAmount" operator="add">
+ <calcop field="tax.amount" operator="get"/>
</calcop>
</calculate>
</iterate>
<!-- discounts -->
<clear-field field="andConditions"/>
<set field="andConditions.invoiceItemTypeId" value="ITM_PROMOTION_ADJ"/>
- <get-related relation-name="ChildrenInvoiceItem" value-name="invoiceItem" list-name="discounts" map-name="andConditions"/>
+ <get-related relation-name="ChildrenInvoiceItem" value-field="invoiceItem" list="discounts" map-name="andConditions"/>
<iterate list="discounts" entry="discount">
- <calculate field-name="fact.extDiscountAmount" type="BigDecimal">
- <calcop field-name="fact.extDiscountAmount" operator="add">
- <calcop field-name="discount.amount" operator="negative"/>
+ <calculate field="fact.extDiscountAmount" type="BigDecimal">
+ <calcop field="fact.extDiscountAmount" operator="add">
+ <calcop field="discount.amount" operator="negative"/>
</calcop>
</calculate>
</iterate>
- <calculate field-name="fact.extNetAmount" type="BigDecimal">
- <calcop field-name="fact.extGrossAmount" operator="subtract">
- <calcop field-name="fact.extDiscountAmount" operator="get"/>
+ <calculate field="fact.extNetAmount" type="BigDecimal">
+ <calcop field="fact.extGrossAmount" operator="subtract">
+ <calcop field="fact.extDiscountAmount" operator="get"/>
</calcop>
</calculate>
<!-- TODO: prorate invoice header discounts and shipping charges -->
@@ -163,12 +163,12 @@
<set field="fact.extStorageCost" value="0.0" type="BigDecimal"/>
<set field="fact.extDistributionCost" value="0.0" type="BigDecimal"/>
- <calculate field-name="fact.contributionAmount" type="BigDecimal">
- <calcop field-name="fact.extNetAmount" operator="subtract">
- <calcop field-name="fact.extManFixedCost" operator="get"/>
- <calcop field-name="fact.extManVarCost" operator="get"/>
- <calcop field-name="fact.extStorageCost" operator="get"/>
- <calcop field-name="fact.extDistributionCost" operator="get"/>
+ <calculate field="fact.contributionAmount" type="BigDecimal">
+ <calcop field="fact.extNetAmount" operator="subtract">
+ <calcop field="fact.extManFixedCost" operator="get"/>
+ <calcop field="fact.extManVarCost" operator="get"/>
+ <calcop field="fact.extStorageCost" operator="get"/>
+ <calcop field="fact.extDistributionCost" operator="get"/>
</calcop>
</calculate>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodEvents.xml?rev=730183&r1=730182&r2=730183&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodEvents.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodEvents.xml Tue Dec 30 09:12:15 2008
@@ -42,9 +42,9 @@
<set value="address" field="_response_code_"/>
<set value="POSTAL_ADDRESS" field="preContactMechTypeId"/>
<set value="BILLING_LOCATION" field="contactMechPurposeTypeId"/>
- <field-to-request field-name="DONE_PAGE"/>
- <field-to-request field-name="preContactMechTypeId"/>
- <field-to-request field-name="contactMechPurposeTypeId"/>
+ <field-to-request field="DONE_PAGE"/>
+ <field-to-request field="preContactMechTypeId"/>
+ <field-to-request field="contactMechPurposeTypeId"/>
</if-compare>
</simple-method>
<simple-method method-name="updateCreditCard" short-description="Update Credit Card">
@@ -62,9 +62,9 @@
<set value="address" field="_response_code_"/>
<set value="POSTAL_ADDRESS" field="preContactMechTypeId"/>
<set value="BILLING_LOCATION" field="contactMechPurposeTypeId"/>
- <field-to-request field-name="DONE_PAGE"/>
- <field-to-request field-name="preContactMechTypeId"/>
- <field-to-request field-name="contactMechPurposeTypeId"/>
+ <field-to-request field="DONE_PAGE"/>
+ <field-to-request field="preContactMechTypeId"/>
+ <field-to-request field="contactMechPurposeTypeId"/>
</if-compare>
</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=730183&r1=730182&r2=730183&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 09:12:15 2008
@@ -196,13 +196,13 @@
<if-compare field="parameters.statusId" operator="equals" value="PMNT_CANCELLED">
<!-- if new status is cancelled delete existing payment applications. -->
- <get-related value-name="payment" relation-name="PaymentApplication" list-name="paymentApplications"/>
+ <get-related value-field="payment" relation-name="PaymentApplication" list="paymentApplications"/>
<iterate list="paymentApplications" entry="paymentApplication">
<set field="removePaymentApplicationMap.paymentApplicationId" from-field="paymentApplication.paymentApplicationId"/>
<call-service service-name="removePaymentApplication" in-map-name="removePaymentApplicationMap"/>
</iterate>
<!-- if new status is cancelled and the payment is associated to an OrderPaymentPreference, update the status of that record too. -->
- <get-related-one value-name="payment" relation-name="OrderPaymentPreference" to-value-name="orderPaymentPreference"/>
+ <get-related-one value-name="payment" relation-name="OrderPaymentPreference" to-value-field="orderPaymentPreference"/>
<if-not-empty field="orderPaymentPreference">
<set field="updateOrderPaymentPreferenceMap.orderPaymentPreferenceId" from-field="orderPaymentPreference.orderPaymentPreferenceId"/>
<set field="updateOrderPaymentPreferenceMap.cancelThis" value="true"/>
@@ -229,14 +229,14 @@
<simple-method method-name="createPaymentAndApplication" short-description="Create a payment and a payment application for the full amount">
<set-service-fields service-name="createPayment" map="parameters" to-map="createPaymentInMap"/>
<call-service service-name="createPayment" in-map="createPaymentInMap">
- <result-to-field field-name="paymentId" result-name="paymentId"/>
+ <result-to-field field="paymentId" result-name="paymentId"/>
</call-service>
<check-errors/>
<set-service-fields service-name="createPaymentApplication" map="parameters" to-map="createPaymentAppInMap"/>
<set field="createPaymentAppInMap.paymentId" from-field="paymentId"/>
<set field="createPaymentAppInMap.amountApplied" from-field="parameters.amount"/>
<call-service service-name="createPaymentApplication" in-map-name="createPaymentAppInMap">
- <result-to-field field-name="paymentApplicationId" result-name="paymentApplicationId"/>
+ <result-to-field field="paymentApplicationId" result-name="paymentApplicationId"/>
</call-service>
<check-errors/>
<field-to-result field="paymentId" result-name="paymentId"/>
@@ -256,11 +256,11 @@
<call-class-method class-name="org.ofbiz.accounting.invoice.InvoiceWorker" method-name="getInvoiceAppliedBd" ret-field-name="invoiceTotalAmountPaid">
<field field-name="invoice" type="org.ofbiz.entity.GenericValue"/>
</call-class-method>
- <get-related relation-name="InvoiceTerm" value-name="invoice" list-name="invoiceTerms"/>
+ <get-related relation-name="InvoiceTerm" value-field="invoice" list="invoiceTerms"/>
<set field="remainingAppliedAmount" from-field="invoiceTotalAmountPaid" type="BigDecimal"/>
<set field="computedTotalAmount" value="0.0" type="BigDecimal"/>
<iterate list="invoiceTerms" entry="invoiceTerm">
- <get-related-one relation-name="TermType" value-name="invoiceTerm" to-value-name="termType" use-cache="true"/>
+ <get-related-one relation-name="TermType" value-name="invoiceTerm" to-value-field="termType" use-cache="true"/>
<if-compare field="termType.parentTypeId" operator="equals" value="FIN_PAYMENT_TERM">
<clear-field field="invoicePaymentInfo"/>
<set field="invoicePaymentInfo.invoiceId" from-field="invoice.invoiceId"/>
@@ -270,27 +270,27 @@
<field field-name="invoice.invoiceDate" type="Timestamp"/>
<field field-name="invoiceTerm.termDays" type="Long"/>
</call-class-method>
- <calculate field-name="invoiceTermAmount" type="BigDecimal">
- <calcop field-name="invoiceTotalAmount" operator="multiply">
- <calcop field-name="invoiceTerm.termValue" operator="get"/>
+ <calculate field="invoiceTermAmount" type="BigDecimal">
+ <calcop field="invoiceTotalAmount" operator="multiply">
+ <calcop field="invoiceTerm.termValue" operator="get"/>
</calcop>
</calculate>
- <calculate field-name="invoiceTermAmount" type="BigDecimal">
- <calcop field-name="invoiceTermAmount" operator="divide">
+ <calculate field="invoiceTermAmount" type="BigDecimal">
+ <calcop field="invoiceTermAmount" operator="divide">
<number value="100"/>
</calcop>
</calculate>
<set field="invoicePaymentInfo.amount" from-field="invoiceTermAmount"/>
- <calculate field-name="computedTotalAmount" type="BigDecimal">
- <calcop field-name="computedTotalAmount" operator="add">
- <calcop field-name="invoicePaymentInfo.amount" operator="get"/>
+ <calculate field="computedTotalAmount" type="BigDecimal">
+ <calcop field="computedTotalAmount" operator="add">
+ <calcop field="invoicePaymentInfo.amount" operator="get"/>
</calcop>
</calculate>
<if-compare-field field="remainingAppliedAmount" to-field="invoiceTermAmount" operator="greater-equals" type="BigDecimal">
<set field="invoicePaymentInfo.paidAmount" from-field="invoiceTermAmount" type="BigDecimal"/>
- <calculate field-name="remainingAppliedAmount" type="BigDecimal">
- <calcop field-name="remainingAppliedAmount" operator="subtract">
- <calcop field-name="invoiceTermAmount" operator="get"/>
+ <calculate field="remainingAppliedAmount" type="BigDecimal">
+ <calcop field="remainingAppliedAmount" operator="subtract">
+ <calcop field="invoiceTermAmount" operator="get"/>
</calcop>
</calculate>
<else>
@@ -298,9 +298,9 @@
<set field="remainingAppliedAmount" value="0.0" type="BigDecimal"/>
</else>
</if-compare-field>
- <calculate field-name="invoicePaymentInfo.outstandingAmount" type="BigDecimal">
- <calcop field-name="invoicePaymentInfo.amount" operator="subtract">
- <calcop field-name="invoicePaymentInfo.paidAmount" operator="get"/>
+ <calculate field="invoicePaymentInfo.outstandingAmount" type="BigDecimal">
+ <calcop field="invoicePaymentInfo.amount" operator="subtract">
+ <calcop field="invoicePaymentInfo.paidAmount" operator="get"/>
</calcop>
</calculate>
<set field="invoicePaymentInfoList[]" from-field="invoicePaymentInfo"/>
@@ -332,15 +332,15 @@
</else>
</if-not-empty>
<set field="invoicePaymentInfo.invoiceId" from-field="invoice.invoiceId"/>
- <calculate field-name="invoicePaymentInfo.amount" type="BigDecimal">
- <calcop field-name="invoiceTotalAmount" operator="subtract">
- <calcop field-name="computedTotalAmount" operator="get"/>
+ <calculate field="invoicePaymentInfo.amount" type="BigDecimal">
+ <calcop field="invoiceTotalAmount" operator="subtract">
+ <calcop field="computedTotalAmount" operator="get"/>
</calcop>
</calculate>
<set field="invoicePaymentInfo.paidAmount" from-field="remainingAppliedAmount" type="BigDecimal"/>
- <calculate field-name="invoicePaymentInfo.outstandingAmount" type="BigDecimal">
- <calcop field-name="invoicePaymentInfo.amount" operator="subtract">
- <calcop field-name="invoicePaymentInfo.paidAmount" operator="get"/>
+ <calculate field="invoicePaymentInfo.outstandingAmount" type="BigDecimal">
+ <calcop field="invoicePaymentInfo.amount" operator="subtract">
+ <calcop field="invoicePaymentInfo.paidAmount" operator="get"/>
</calcop>
</calculate>
<set field="invoicePaymentInfoList[]" from-field="invoicePaymentInfo"/>
@@ -369,7 +369,7 @@
<clear-field field="getInvoicePaymentInfoListInMap"/>
<set field="getInvoicePaymentInfoListInMap.invoice" from-field="invoice"/>
<call-service service-name="getInvoicePaymentInfoList" in-map-name="getInvoicePaymentInfoListInMap">
- <result-to-field field-name="invoicePaymentInfoList" result-name="invoicePaymentInfoList"/>
+ <result-to-field field="invoicePaymentInfoList" result-name="invoicePaymentInfoList"/>
</call-service>
<iterate list="invoicePaymentInfoList" entry="invoicePaymentInfo">
<if>
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=730183&r1=730182&r2=730183&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 09:12:15 2008
@@ -51,7 +51,7 @@
<set field="createMain.mapKey" value="MAIN"/>
<call-service service-name="createContent" in-map-name="createMain">
- <result-to-field result-name="contentId" field-name="contentId"/>
+ <result-to-field result-name="contentId" field="contentId"/>
</call-service>
<!-- reset contentIdFrom to new contentId -->
@@ -84,7 +84,7 @@
<set field="createImage._uploadedFile_contentType" from-field="parameters._uploadedFile_contentType"/>
<call-service service-name="createContentFromUploadedFile" in-map-name="createImage">
- <result-to-field result-name="contentId" field-name="imageContentId"/>
+ <result-to-field result-name="contentId" field="imageContentId"/>
</call-service>
<if-empty field="contentId">
@@ -118,7 +118,7 @@
<log level="always" message="calling createTextContent with map: ${createText}"/>
<call-service service-name="createTextContent" in-map-name="createText">
- <result-to-field result-name="contentId" field-name="textContentId"/>
+ <result-to-field result-name="contentId" field="textContentId"/>
</call-service>
<if-empty field="contentId">
@@ -186,7 +186,7 @@
<set field="mapIn.currentContent" from-field="content"/>
<log level="info" message="mapIn: ${mapIn}"/>
<call-service service-name="checkContentPermission" in-map-name="mapIn">
- <result-to-field result-name="permissionStatus" field-name="permissionStatus"/>
+ <result-to-field result-name="permissionStatus" field="permissionStatus"/>
</call-service>
<log level="info" message="permissionStatus: ${permissionStatus}"/>
<if-compare operator="equals" field="permissionStatus" value="granted">
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=730183&r1=730182&r2=730183&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 09:12:15 2008
@@ -271,7 +271,7 @@
<log level="info" message="persistCompDocContent(0.2).persistMap : ${persistMap}"/>
<call-service service-name="persistDataResourceAndData" in-map-name="persistMap">
- <result-to-field result-name="dataResourceId" field-name="newDataResourceId"/>
+ <result-to-field result-name="dataResourceId" field="newDataResourceId"/>
</call-service>
<log level="info" message="persistCompDocContent(1).newDataResourceId : ${newDataResourceId}"/>
@@ -303,13 +303,13 @@
<log level="info" message="persistCompDocPdf2Survey(1).pdfMap : ${pdfMap}"/>
<call-service service-name="persistContentAndAssoc" in-map-name="pdfMap">
- <result-to-field result-name="contentId" field-name="acroFormContentId"/>
+ <result-to-field result-name="contentId" field="acroFormContentId"/>
</call-service>
<log level="info" message="persistCompDocPdf2Survey(2).acroFormContentId : ${acroFormContentId}"/>
<set field="acroMap.contentId" from-field="acroFormContentId"/>
<call-service service-name="buildSurveyFromPdf" in-map-name="acroMap">
- <result-to-field result-name="surveyId" field-name="surveyId"/>
+ <result-to-field result-name="surveyId" field="surveyId"/>
</call-service>
<log level="info" message="persistCompDocPdf2Survey(3).surveyId : ${surveyId}"/>
@@ -407,9 +407,9 @@
<log level="info" message="incrementedSeq(0): ${incrementedSeq}"/>
<log level="info" message="ContentRevision(0): ${newEntity}"/>
<if-not-empty field="incrementedSeq">
- <calculate field-name="incrementedSeq" type="Long">
+ <calculate field="incrementedSeq" type="Long">
<calcop operator="add">
- <calcop operator="get" field-name="incrementedSeq"/>
+ <calcop operator="get" field="incrementedSeq"/>
<number value="1"/>
</calcop>
</calculate>
@@ -417,7 +417,7 @@
<set field="incrementedSeq" value="1" type="Long"/>
</else>
</if-not-empty>
- <calculate field-name="numericPadding" type="Integer">
+ <calculate field="numericPadding" type="Integer">
<number value="6"/>
</calculate>
<call-class-method method-name="padNumberWithLeadingZeros" class-name="org.ofbiz.content.compdoc.CompDocEvents" ret-field-name="paddedSeqId">
@@ -662,8 +662,8 @@
<set from-field="thisContentId" field="map.contentId"/>
<set from-field="thisContentRevisionSeqId" field="map.contentRevisionSeqId"/>
<call-service service-name="getFinalApprovalStatus" in-map-name="map">
- <result-to-field field-name="finalApprovalStatusId" result-name="approvalStatusId"/>
- <result-to-field field-name="contentApprovalList" result-name="contentApprovalList"/>
+ <result-to-field field="finalApprovalStatusId" result-name="approvalStatusId"/>
+ <result-to-field field="contentApprovalList" result-name="contentApprovalList"/>
</call-service>
<!-- determine status of previous approvals --><!-- finalApprovalStatusId is the applicable status from previous approvals -->
<log level="info" message="cloneContentApprovals(2)- finalApprovalStatusId : ${finalApprovalStatusId} "/>
@@ -808,7 +808,7 @@
<!-- bump CDI up one for new approval -->
<set field="context2.contentId" from-field="parameters.rootContentId"/>
<call-service service-name="persistContentRevisionAndItem" in-map-name="context2">
- <result-to-field result-name="contentRevisionSeqId" field-name="contentRevisionSeqId"/>
+ <result-to-field result-name="contentRevisionSeqId" field="contentRevisionSeqId"/>
<result-to-result result-name="contentRevisionSeqId" service-result-name="rootContentRevisionSeqId"/>
</call-service>
<log level="info" message="got into prepForApproval- contentRevisionSeqId: ${contentRevisionSeqId}"/>
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=730183&r1=730182&r2=730183&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 09:12:15 2008
@@ -52,7 +52,7 @@
<session-to-field field-name="userLogin" map-name="context" session-name="userLogin"/>
<call-service in-map-name="context" service-name="createContent">
- <result-to-field field-name="contentId" result-name="contentId"/>
+ <result-to-field field="contentId" result-name="contentId"/>
<result-to-request request-name="contentId" result-name="contentId"/>
</call-service>
<if-empty field="contentId">
@@ -107,13 +107,13 @@
</call-map-processor>
<log level="always" message="datesConverted: ${datesConverted}"/>
<map-to-map map-name="currentContent" to-map-name="context"/>
- <get-related value-name="currentContent" relation-name="ContentPurpose" list-name="contentPurposeList"/>
+ <get-related value-field="currentContent" relation-name="ContentPurpose" list="contentPurposeList"/>
<set field="context.contentPurposeList" from-field="contentPurposeList"/>
<string-to-list list-name="targetOperationList" string="CONTENT_UPDATE"/>
<set field="context.targetOperationList" from-field="targetOperationList"/>
<session-to-field field-name="userLogin" map-name="context" session-name="userLogin"/>
<call-service in-map-name="context" service-name="updateContent">
- <result-to-field field-name="contentId" result-name="contentId"/>
+ <result-to-field field="contentId" result-name="contentId"/>
</call-service>
<check-errors/>
</simple-method>
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=730183&r1=730182&r2=730183&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 09:12:15 2008
@@ -40,7 +40,7 @@
<session-to-field field-name="userLogin" map-name="context" session-name="userLogin"/>
<call-service in-map-name="context" service-name="checkContentPermission">
- <result-to-field field-name="permissionStatus" result-name="permissionStatus"/>
+ <result-to-field field="permissionStatus" result-name="permissionStatus"/>
</call-service>
<log level="always" message="permissionStatus:${permissionStatus}"/>
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=730183&r1=730182&r2=730183&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 09:12:15 2008
@@ -138,16 +138,16 @@
<simple-method method-name="copyContentAndElectronicTextandAssoc" short-description="copy a content, electronic text and assocs and set status in progress">
<set-service-fields service-name="getContent" map="parameters" to-map="getC"/>
<call-service service-name="getContent" in-map="getC">
- <result-to-field result-name="view" field-name="content"/>
+ <result-to-field result-name="view" field="content"/>
</call-service>
<if-not-empty field="content.dataResourceId">
<set-service-fields service-name="getElectronicText" map="content" to-map="getEt"/>
<call-service service-name="getElectronicText" in-map="getEt">
- <result-to-field result-name="textData" field-name="et.textData"/>
+ <result-to-field result-name="textData" field="et.textData"/>
</call-service>
<set field="dataResource.dataResourceTypeId" value="ELECTRONIC_TEXT"/>
<call-service service-name="createDataResource" in-map-name="dataResource">
- <result-to-field result-name="dataResourceId" field-name="et.dataResourceId"/>
+ <result-to-field result-name="dataResourceId" field="et.dataResourceId"/>
</call-service>
<call-service service-name="createElectronicText" in-map-name="et"/>
@@ -159,7 +159,7 @@
<clear-field field="content.statusId"/><!-- force new value -->
<set-service-fields service-name="createContent" map="content" to-map="createContent"/>
<call-service service-name="createContent" in-map="createContent">
- <result-to-field result-name="contentId" field-name="newContentId"/>
+ <result-to-field result-name="contentId" field="newContentId"/>
</call-service>
<entity-and entity-name="ContentAssoc" list="assocs">
@@ -189,8 +189,8 @@
<log level="always" message="assocContent, parameters:${parameters}"/>
<log level="always" message="assocContent, context:${context}"/>
<call-service in-map-name="parameters" service-name="checkAssocPermission">
- <result-to-field field-name="permissionStatus" result-name="permissionStatus"/>
- <result-to-field field-name="rolesOut" result-name="rolesOut"/>
+ <result-to-field field="permissionStatus" result-name="permissionStatus"/>
+ <result-to-field field="rolesOut" result-name="rolesOut"/>
</call-service>
<log level="always" message="permissionStatus:${permissionStatus}"/>
@@ -537,7 +537,7 @@
<simple-method method-name="createTextAndUploadedContent" short-description="Creates Text and Optionally Uploaded (sub) Content records">
<set-service-fields service-name="createTextContent" map="parameters" to-map="textContext"/>
<call-service service-name="createTextContent" in-map="textContext">
- <result-to-field result-name="contentId" field-name="parentContentId" map-name="parameters"/>
+ <result-to-field result-name="contentId" field="parameters.parentContentId"/>
</call-service>
<log level="always" message="${parameters}"/>
@@ -604,7 +604,7 @@
<result-to-field result-name="dataResourceId" map-name="createPlainBodyContent"/>
</call-service>
<call-service service-name="createContent" in-map-name="createPlainBodyContent">
- <result-to-field result-name="contentId" map-name="createBodyAssoc" field-name="contentIdTo"/>
+ <result-to-field result-name="contentId" map-name="createBodyAssoc" field="contentIdTo"/>
</call-service>
<!-- Create content assoc between subject and plain body -->
<set value="TREE_CHILD" field="createBodyAssoc.contentAssocTypeId"/>
@@ -617,7 +617,7 @@
<result-to-field result-name="dataResourceId" map-name="createHtmlBodyContent"/>
</call-service>
<call-service service-name="createContent" in-map-name="createHtmlBodyContent">
- <result-to-field result-name="contentId" map-name="createBodyAssoc" field-name="contentIdTo"/>
+ <result-to-field result-name="contentId" map-name="createBodyAssoc" field="contentIdTo"/>
</call-service>
<!-- Create content assoc between subject and html body -->
<set value="htmlBody" field="createBodyAssoc.mapKey"/>
@@ -758,7 +758,7 @@
</if-empty>
<call-service service-name="createContent" in-map-name="createContentMap" break-on-error="false">
- <result-to-field result-name="contentId" field-name="contentId"/>
+ <result-to-field result-name="contentId" field="contentId"/>
</call-service>
<field-to-result field="contentId" />
@@ -880,7 +880,7 @@
<simple-method method-name="createContentAndAssoc" short-description="Create content and associate with other content">
<set-service-fields service-name="createContent" map="parameters" to-map="contentData"/>
<call-service service-name="createContent" in-map="contentData">
- <result-to-field result-name="contentId" field-name="newContentId"/>
+ <result-to-field result-name="contentId" field="newContentId"/>
</call-service>
<if-not-empty field="newContentId">
<set-service-fields service-name="createContentAssoc" map="parameters" to-map="assocData"/>
@@ -900,12 +900,12 @@
</entity-one>
<if-not-empty field="resultData.dataResource">
<if-compare field="resultData.dataResource.dataResourceTypeId" value="ELECTRONIC_TEXT" operator="equals">
- <get-related-one value-name="resultData.dataResource" relation-name="ElectronicText"
- to-value-name="resultData.electronicText"/>
+ <get-related-one value-field="resultData.dataResource" relation-name="ElectronicText"
+ to-value-field="resultData.electronicText"/>
</if-compare>
<if-compare field="resultData.dataResource.dataResourceTypeId" value="IMAGE_OBJECT" operator="equals">
- <get-related-one value-name="resultData.dataResource" relation-name="ImageDataResource"
- to-value-name="resultData.imageDataResource"/>
+ <get-related-one value-field="resultData.dataResource" relation-name="ImageDataResource"
+ to-value-field="resultData.imageDataResource"/>
</if-compare>
</if-not-empty>
<field-to-result field="resultData" result-name="resultData"/>
@@ -1027,7 +1027,7 @@
<set field="createMain.mapKey" value="MAIN"/>
<call-service service-name="createContent" in-map-name="createMain">
- <result-to-field result-name="contentId" field-name="contentId"/>
+ <result-to-field result-name="contentId" field="contentId"/>
</call-service>
<!-- reset contentIdFrom to new contentId -->
@@ -1060,7 +1060,7 @@
<set field="createImage._uploadedFile_contentType" from-field="parameters._uploadedFile_contentType"/>
<call-service service-name="createContentFromUploadedFile" in-map-name="createImage">
- <result-to-field result-name="contentId" field-name="imageContentId"/>
+ <result-to-field result-name="contentId" field="imageContentId"/>
</call-service>
<if-empty field="contentId">
@@ -1094,7 +1094,7 @@
<log level="always" message="calling createTextContent with map: ${createText}"/>
<call-service service-name="createTextContent" in-map-name="createText">
- <result-to-field result-name="contentId" field-name="textContentId"/>
+ <result-to-field result-name="contentId" field="textContentId"/>
</call-service>
<if-empty field="contentId">
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml?rev=730183&r1=730182&r2=730183&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml Tue Dec 30 09:12:15 2008
@@ -37,8 +37,8 @@
<set field="context.objectInfo" from-field="parameters.drObjectInfo"/>
<set field="context.dataResourceTypeId" value="LOCAL_FILE"/>
<call-service in-map-name="context" service-name="persistContentAndAssoc">
- <result-to-field field-name="contentId" result-name="contentId"/>
- <result-to-field field-name="dataResourceId" result-name="dataResourceId"/>
+ <result-to-field field="contentId" result-name="contentId"/>
+ <result-to-field field="dataResourceId" result-name="dataResourceId"/>
</call-service>
<if-empty field="contentId">
<add-error>
@@ -46,8 +46,8 @@
</add-error>
</if-empty>
<check-errors/>
- <field-to-request field-name="contentId" request-name="contentId"/>
- <field-to-request field-name="dataResourceId" request-name="drDataResourceId"/>
+ <field-to-request field="contentId" request-name="contentId"/>
+ <field-to-request field="dataResourceId" request-name="drDataResourceId"/>
</simple-method>
@@ -64,7 +64,7 @@
<set field="context.targetOperationList" from-field="targetOperationList"/>
<session-to-field field-name="userLogin" map-name="context" session-name="userLogin"/>
<call-service in-map-name="context" service-name="checkContentPermission">
- <result-to-field field-name="permissionStatus" result-name="permissionStatus"/>
+ <result-to-field field="permissionStatus" result-name="permissionStatus"/>
</call-service>
<if-compare field="permissionStatus" operator="not-equals" value="granted" type="String">
<add-error>
@@ -113,23 +113,23 @@
<set field="context.contentTypeId" value="DOCUMENT"/>
<call-service in-map-name="context" service-name="persistContentAndAssoc">
- <result-to-field map-name="context2" field-name="activeContentId" result-name="contentId"/>
- <result-to-field field-name="dataResourceId" result-name="dataResourceId"/>
- <result-to-field map-name="context2" field-name="contentAssocTypeId" result-name="contentAssocTypeId"/>
- <result-to-field map-name="context2" field-name="fromDate" result-name="fromDate"/>
+ <result-to-field map-name="context2" field="activeContentId" result-name="contentId"/>
+ <result-to-field field="dataResourceId" result-name="dataResourceId"/>
+ <result-to-field map-name="context2" field="contentAssocTypeId" result-name="contentAssocTypeId"/>
+ <result-to-field map-name="context2" field="fromDate" result-name="fromDate"/>
</call-service>
<check-errors/>
<field-to-request map-name="context2" field-name="activeContentId" request-name="contentId"/>
- <field-to-request field-name="dataResourceId" request-name="drDataResourceId"/>
+ <field-to-request field="dataResourceId" request-name="drDataResourceId"/>
<set field="currentEntityName" value="SubContentDataResourceView"/>
- <field-to-request field-name="currentEntityName" request-name="currentEntityName"/>
+ <field-to-request field="currentEntityName" request-name="currentEntityName"/>
<set field="context2.contentIdTo" from-field="parameters.contentIdTo"/>
<set field="context2.mapKey" from-field="parameters.mapKey"/>
<if-not-empty field="context2.activeContentId">
<call-service in-map-name="context2" service-name="deactivateAssocs">
- <result-to-field field-name="deactivateList" result-name="deactivateList"/>
+ <result-to-field field="deactivateList" result-name="deactivateList"/>
</call-service>
</if-not-empty>
@@ -166,8 +166,8 @@
<session-to-field field-name="userLogin" map-name="context" session-name="userLogin"/>
<call-service in-map-name="context" service-name="persistContentAndAssoc">
- <result-to-field result-name="contentId" field-name="contentId"/>
- <result-to-field result-name="dataResourceId" field-name="dataResourceId"/>
+ <result-to-field result-name="contentId" field="contentId"/>
+ <result-to-field result-name="dataResourceId" field="dataResourceId"/>
</call-service>
<check-errors/>
</simple-method>
@@ -209,23 +209,23 @@
<set field="context.contentTypeId" value="DOCUMENT"/>
<call-service in-map-name="context" service-name="persistContentAndAssoc">
- <result-to-field map-name="context2" field-name="activeContentId" result-name="contentId"/>
- <result-to-field field-name="dataResourceId" result-name="dataResourceId"/>
- <result-to-field map-name="context2" field-name="contentAssocTypeId" result-name="contentAssocTypeId"/>
- <result-to-field map-name="context2" field-name="fromDate" result-name="fromDate"/>
+ <result-to-field map-name="context2" field="activeContentId" result-name="contentId"/>
+ <result-to-field field="dataResourceId" result-name="dataResourceId"/>
+ <result-to-field map-name="context2" field="contentAssocTypeId" result-name="contentAssocTypeId"/>
+ <result-to-field map-name="context2" field="fromDate" result-name="fromDate"/>
</call-service>
<check-errors/>
<field-to-request map-name="context2" field-name="activeContentId" request-name="contentId"/>
- <field-to-request field-name="dataResourceId" request-name="drDataResourceId"/>
+ <field-to-request field="dataResourceId" request-name="drDataResourceId"/>
<set field="currentEntityName" value="SubContentDataResourceView"/>
- <field-to-request field-name="currentEntityName" request-name="currentEntityName"/>
+ <field-to-request field="currentEntityName" request-name="currentEntityName"/>
<set field="context2.contentIdTo" from-field="formInput.contentIdTo"/>
<set field="context2.mapKey" from-field="formInput.mapKey"/>
<if-not-empty field="context2.activeContentId">
<call-service in-map-name="context2" service-name="deactivateAssocs">
- <result-to-field field-name="deactivateList" result-name="deactivateList"/>
+ <result-to-field field="deactivateList" result-name="deactivateList"/>
</call-service>
</if-not-empty>
@@ -267,23 +267,23 @@
<set field="context.contentTypeId" value="DOCUMENT"/>
<call-service in-map-name="context" service-name="persistContentAndAssoc">
- <result-to-field map-name="context2" field-name="activeContentId" result-name="contentId"/>
- <result-to-field field-name="dataResourceId" result-name="dataResourceId"/>
- <result-to-field map-name="context2" field-name="contentAssocTypeId" result-name="contentAssocTypeId"/>
- <result-to-field map-name="context2" field-name="fromDate" result-name="fromDate"/>
+ <result-to-field map-name="context2" field="activeContentId" result-name="contentId"/>
+ <result-to-field field="dataResourceId" result-name="dataResourceId"/>
+ <result-to-field map-name="context2" field="contentAssocTypeId" result-name="contentAssocTypeId"/>
+ <result-to-field map-name="context2" field="fromDate" result-name="fromDate"/>
</call-service>
<check-errors/>
<field-to-request map-name="context2" field-name="activeContentId" request-name="contentId"/>
- <field-to-request field-name="dataResourceId" request-name="drDataResourceId"/>
+ <field-to-request field="dataResourceId" request-name="drDataResourceId"/>
<set field="currentEntityName" value="SubContentDataResourceView"/>
- <field-to-request field-name="currentEntityName" request-name="currentEntityName"/>
+ <field-to-request field="currentEntityName" request-name="currentEntityName"/>
<set field="context2.contentIdTo" from-field="parameters.contentIdTo"/>
<set field="context2.mapKey" from-field="parameters.mapKey"/>
<if-not-empty field="context2.activeContentId">
<call-service in-map-name="context2" service-name="deactivateAssocs">
- <result-to-field field-name="deactivateList" result-name="deactivateList"/>
+ <result-to-field field="deactivateList" result-name="deactivateList"/>
</call-service>
</if-not-empty>
@@ -319,8 +319,8 @@
<session-to-field field-name="userLogin" map-name="context" session-name="userLogin"/>
<call-service in-map-name="context" service-name="persistContentAndAssoc">
- <result-to-field result-name="contentId" field-name="contentId"/>
- <result-to-field result-name="dataResourceId" field-name="dataResourceId"/>
+ <result-to-field result-name="contentId" field="contentId"/>
+ <result-to-field result-name="dataResourceId" field="dataResourceId"/>
</call-service>
<check-errors/>
</simple-method>
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=730183&r1=730182&r2=730183&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 09:12:15 2008
@@ -771,7 +771,7 @@
<set field="lookupMap.partyRelationshipTypeId" value="GROUP_ROLLUP"/>
<set field="lookupMap.includeFromToSwitched" value="Y"/>
<call-service service-name="getRelatedParties" include-user-login="true" in-map-name="lookupMap">
- <result-to-field result-name="relatedPartyIdList" field-name="partyIdList"/>
+ <result-to-field result-name="relatedPartyIdList" field="partyIdList"/>
</call-service>
<log level="verbose" message="Got list of associated parties: ${partyIdList}"/>
</simple-method>