svn commit: r730092 [1/3] - in /ofbiz/trunk: applications/accounting/script
Locked
svn commit: r730092 [1/3] - in /ofbiz/trunk: applications/accounting/script
 
|
Author: jleroux
Date: Tue Dec 30 03:11:15 2008 New Revision: 730092 URL: http://svn.apache.org/viewvc?rev=730092&view=rev Log: <field-map(.*)env-name => <field-map$1from-field Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/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/PaymentServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.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/humanres/script/org/ofbiz/humanres/HumanResServices.xml ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.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/CustRequestServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.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/product/CustomerDigitalDownloadServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml ofbiz/trunk/framework/common/script/org/ofbiz/common/olap/CommonDimensionServices.xml ofbiz/trunk/framework/example/script/org/ofbiz/example/example/ExampleServices.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/ProjectPermissionServices.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/ManagerEvents.xml Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml Tue Dec 30 03:11:15 2008 @@ -58,7 +58,7 @@ <clear-field field-name="entityKey"/> <clear-field field-name="entityValue"/> <entity-one entity-name="PartyAcctgPreference" value-name="currentPartyAcctgPref"> - <field-map field-name="partyId" env-name="currentOrganizationPartyId"/> + <field-map field-name="partyId" from-field="currentOrganizationPartyId"/> </entity-one> <set field="containsEmptyFields" type="Boolean" value="false"/> @@ -79,7 +79,7 @@ </if-not-empty> <entity-and entity-name="PartyRelationship" list-name="parentPartyRelationships" filter-by-date="true"> - <field-map field-name="partyIdTo" env-name="currentOrganizationPartyId"/> + <field-map field-name="partyIdTo" from-field="currentOrganizationPartyId"/> <field-map field-name="partyRelationshipTypeId" value="GROUP_ROLLUP"/> <field-map field-name="roleTypeIdFrom" value="_NA_"/> <field-map field-name="roleTypeIdTo" value="_NA_"/> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml Tue Dec 30 03:11:15 2008 @@ -41,7 +41,7 @@ <else> <entity-one entity-name="FinAccountTypeGlAccount" value-name="finAccountTypeGlAccount" auto-field-map="false"> <field-map field-name="organizationPartyId"/> - <field-map field-name="finAccountTypeId" env-name="finAccount.finAccountTypeId"/> + <field-map field-name="finAccountTypeId" from-field="finAccount.finAccountTypeId"/> </entity-one> <if-not-empty field="finAccountTypeGlAccount"> <set field="glAccountId" from-field="finAccountTypeGlAccount.glAccountId"/> 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=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml Tue Dec 30 03:11:15 2008 @@ -55,7 +55,7 @@ <!-- set the refundable flag from the type; if not set --> <if-empty field="newEntity.isRefundable"> <entity-one entity-name="FinAccountType" value-name="finAccountType"> - <field-map field-name="finAccountTypeId" env-name="parameters.finAccountTypeId"/> + <field-map field-name="finAccountTypeId" from-field="parameters.finAccountTypeId"/> </entity-one> <if> <condition> @@ -104,8 +104,8 @@ <if-not-empty field="lookedUpValue.statusId"> <!-- if statusId change is not in the StatusValidChange list, complain... --> <entity-one entity-name="StatusValidChange" value-name="statusValidChange" auto-field-map="false"> - <field-map field-name="statusId" env-name="lookedUpValue.statusId"/> - <field-map field-name="statusIdTo" env-name="parameters.statusId"/> + <field-map field-name="statusId" from-field="lookedUpValue.statusId"/> + <field-map field-name="statusIdTo" from-field="parameters.statusId"/> </entity-one> <if-empty field="statusValidChange"> <!-- no valid change record found? return an error... --> @@ -142,7 +142,7 @@ <!-- find the most recent status record and set the statusEndDate --> <entity-and entity-name="FinAccountStatus" list-name="oldFinAccountStatusList"> - <field-map field-name="finAccountId" env-name="parameters.finAccountId"/> + <field-map field-name="finAccountId" from-field="parameters.finAccountId"/> <order-by field-name="-statusDate"/> </entity-and> <first-from-list entry-name="oldFinAccountStatus" list-name="oldFinAccountStatusList"/> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml Tue Dec 30 03:11:15 2008 @@ -193,8 +193,8 @@ <if-not-empty field="parameters.productMaintSeqId"> <entity-one entity-name="FixedAsset" value-name="fixedAsset"/> <entity-one entity-name="ProductMaint" value-name="productMaint"> - <field-map field-name="productId" env-name="fixedAsset.instanceOfProductId"/> - <field-map field-name="productMaintSeqId" env-name="parameters.productMaintSeqId"/> + <field-map field-name="productId" from-field="fixedAsset.instanceOfProductId"/> + <field-map field-name="productMaintSeqId" from-field="parameters.productMaintSeqId"/> </entity-one> <set field="newEntity.productMaintTypeId" from-field="productMaint.productMaintTypeId"/> </if-not-empty > @@ -250,8 +250,8 @@ <if-not-empty field="parameters.productMaintSeqId"> <entity-one entity-name="FixedAsset" value-name="fixedAsset"/> <entity-one entity-name="ProductMaint" value-name="productMaint"> - <field-map field-name="productId" env-name="fixedAsset.instanceOfProductId"/> - <field-map field-name="productMaintSeqId" env-name="parameters.productMaintSeqId"/> + <field-map field-name="productId" from-field="fixedAsset.instanceOfProductId"/> + <field-map field-name="productMaintSeqId" from-field="parameters.productMaintSeqId"/> </entity-one> <set field="lookedUpValue.productMaintTypeId" from-field="productMaint.productMaintTypeId"/> </if-not-empty> @@ -334,8 +334,8 @@ <return/> </if-empty> <entity-and list="productMaintList" entity-name="ProductMaint"> - <field-map field-name="productId" env-name="fixedAssetValue.instanceOfProductId"/> - <field-map field-name="intervalMeterTypeId" env-name="meterValue.productMeterTypeId"/> + <field-map field-name="productId" from-field="fixedAssetValue.instanceOfProductId"/> + <field-map field-name="intervalMeterTypeId" from-field="meterValue.productMeterTypeId"/> </entity-and> <iterate list-name="productMaintList" entry-name="productMaintValue"> <set field="repeatCount" from-field="productMaintValue.repeatCount" default-value="0" type="Long"/> @@ -461,9 +461,9 @@ <set-nonpk-fields map-name="maintMeter" value-name="newEntity"/> <set field="newEntity.readingDate" from-field="maintMeter.createdStamp"/> <entity-one entity-name="FixedAssetMeter" value-name="lookedUpValue" auto-field-map="false"> - <field-map field-name="fixedAssetId" env-name="newEntity.fixedAssetId"/> - <field-map field-name="productMeterTypeId" env-name="newEntity.productMeterTypeId"/> - <field-map field-name="readingDate" env-name="newEntity.readingDate"/> + <field-map field-name="fixedAssetId" from-field="newEntity.fixedAssetId"/> + <field-map field-name="productMeterTypeId" from-field="newEntity.productMeterTypeId"/> + <field-map field-name="readingDate" from-field="newEntity.readingDate"/> </entity-one> <if-empty field="lookedUpValue"> <create-value value-name="newEntity"/> @@ -485,7 +485,7 @@ <!-- Check if user has not passed in orderItemSeqId then get list of OrderItems from database and default to first item --> <if-empty field="parameters.orderItemSeqId"> <entity-and entity-name="OrderItem" list-name="orderItems"> - <field-map field-name="orderId" env-name="parameters.orderId"/> + <field-map field-name="orderId" from-field="parameters.orderId"/> </entity-and> <if-not-empty field="orderItems"> <set field="orderItem" from-field="orderItems[0]"/> @@ -551,7 +551,7 @@ <set field="workEffortId" from-field="maintValue.scheduleWorkEffortId"/> </if-empty> <entity-and list="assignedParties" entity-name="PartyFixedAssetAssignAndRole" filter-by-date="true"> - <field-map field-name="fixedAssetId" env-name="fixedAssetId"/> + <field-map field-name="fixedAssetId" from-field="fixedAssetId"/> <field-map field-name="parentTypeId" value="FAM_ASSIGNEE"/> </entity-and> <iterate list-name="assignedParties" entry-name="assignedParty"> @@ -710,7 +710,7 @@ </calculate> <entity-and entity-name="FixedAssetDepMethod" list-name="fixedAssetDepMethods" filter-by-date="true"> - <field-map field-name="fixedAssetId" env-name="parameters.fixedAssetId"/> + <field-map field-name="fixedAssetId" from-field="parameters.fixedAssetId"/> </entity-and> <if-not-empty field="fixedAssetDepMethods"> <first-from-list list-name="fixedAssetDepMethods" entry-name="fixedAssetDepMethod"/> 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=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml Tue Dec 30 03:11:15 2008 @@ -24,7 +24,7 @@ <simple-method method-name="getNextInvoiceId" short-description="Get Next invoiceId"> <!-- try to find PartyAcctgPreference for parameters.partyId, see if we need any special invoice number sequencing --> <entity-one entity-name="PartyAcctgPreference" value-name="partyAcctgPreference" auto-field-map="false"> - <field-map field-name="partyId" env-name="parameters.partyId"/> + <field-map field-name="partyId" from-field="parameters.partyId"/> </entity-one> <log level="info" message="In getNextInvoiceId partyId is [${parameters.partyId}], partyAcctgPreference: ${partyAcctgPreference}"/> @@ -403,7 +403,7 @@ <field-to-result field-name="paymentApplication.billingAccountId" result-name="billingAccountId"/> <property-to-field resource="AccountingUiLabels" property="AccountingPaymentApplToBillingAccount" field-name="toMessage"/> <entity-one entity-name="BillingAccount" value-name="billingAccount"> - <field-map field-name="billingAccountId" env-name="paymentApplication.billingAccountId"/> + <field-map field-name="billingAccountId" from-field="paymentApplication.billingAccountId"/> </entity-one> <set field="currencyUomId" from-field="billingAccount.accountCurrencyUomId"/> </if-not-empty> @@ -438,8 +438,8 @@ <field-to-result field-name="invoice.statusId" result-name="oldStatusId"/> <if-compare-field field="invoice.statusId" to-field="parameters.statusId" operator="not-equals"> <entity-one entity-name="StatusValidChange" value-name="statusChange" auto-field-map="false"> - <field-map field-name="statusId" env-name="invoice.statusId"/> - <field-map field-name="statusIdTo" env-name="parameters.statusId"/> + <field-map field-name="statusId" from-field="invoice.statusId"/> + <field-map field-name="statusIdTo" from-field="parameters.statusId"/> </entity-one> <if-empty field="statusChange"> <add-error><fail-message message="Status is not a valid change"/></add-error> @@ -487,7 +487,7 @@ <set field="removePaymentApplicationMap.invoiceId" from-field="parameters.invoiceId"/> <remove-by-and entity-name="PaymentApplication" map-name="removePaymentApplicationMap"/> <entity-and entity-name="TimeEntry" list-name="entries"> - <field-map field-name="invoiceId" env-name="parameters.invoiceId"/> + <field-map field-name="invoiceId" from-field="parameters.invoiceId"/> </entity-and> <iterate entry="entry" list-name="entries"> <clear-field field-name="entry.invoiceId"/> @@ -554,7 +554,7 @@ <simple-method method-name="autoGenerateInvoiceFromExistingInvoice" short-description="Scheduled service to generate Invoice from an existing Invoice"> <entity-and entity-name="Invoice" list-name="invoices"> - <field-map field-name="recurrenceInfoId" env-name="parameters.recurrenceInfoId"/> + <field-map field-name="recurrenceInfoId" from-field="parameters.recurrenceInfoId"/> </entity-and> <iterate list-name="invoices" entry-name="invoice"> <set-service-fields service-name="copyInvoice" map-name="invoice" to-map-name="copyInvoiceCtx"/> 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=730092&r1=730091&r2=730092&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 03:11:15 2008 @@ -26,7 +26,7 @@ <!-- find affiliate or commission partner for payment.partyIdFrom; will be relationship from CUSTOMER to AFFILIATE, type SALES_AFFILIATE --> <entity-and entity-name="PartyRelationship" list-name="affiliatePartyRelationshipList" filter-by-date="true"> - <field-map field-name="partyIdFrom" env-name="payment.partyIdFrom"/> + <field-map field-name="partyIdFrom" from-field="payment.partyIdFrom"/> <field-map field-name="roleTypeIdFrom" value="CUSTOMER"/> <field-map field-name="partyRelationshipTypeId" value="SALES_AFFILIATE"/><!-- this constraint could be optional if not being set in company data --> </entity-and> 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=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml Tue Dec 30 03:11:15 2008 @@ -319,11 +319,11 @@ <clear-field field-name="glAccountHistoryList"/> <entity-one entity-name="GlAccount" value-name="glAccount"> - <field-map field-name="glAccountId" env-name="acctgTransEntry.glAccountId"/> + <field-map field-name="glAccountId" from-field="acctgTransEntry.glAccountId"/> </entity-one> <entity-one entity-name="GlAccountOrganization" value-name="glAccountOrganization"> - <field-map field-name="glAccountId" env-name="acctgTransEntry.glAccountId"/> - <field-map field-name="organizationPartyId" env-name="acctgTransEntry.organizationPartyId"/> + <field-map field-name="glAccountId" from-field="acctgTransEntry.glAccountId"/> + <field-map field-name="organizationPartyId" from-field="acctgTransEntry.organizationPartyId"/> </entity-one> <!-- update the GlAccount's posted balance. This depends on whether the GlAccount is a debit or credit account and the @@ -385,9 +385,9 @@ <set from-field="customTimePeriodListByOrganizationPartyIdMap.${acctgTransEntry.organizationPartyId}" field="customTimePeriodList"/> <iterate entry="customTimePeriod" list-name="customTimePeriodList"> <entity-one entity-name="GlAccountHistory" value-name="glAccountHistory"> - <field-map field-name="glAccountId" env-name="acctgTransEntry.glAccountId"/> - <field-map field-name="organizationPartyId" env-name="acctgTransEntry.organizationPartyId"/> - <field-map field-name="customTimePeriodId" env-name="customTimePeriod.customTimePeriodId"/> + <field-map field-name="glAccountId" from-field="acctgTransEntry.glAccountId"/> + <field-map field-name="organizationPartyId" from-field="acctgTransEntry.organizationPartyId"/> + <field-map field-name="customTimePeriodId" from-field="customTimePeriod.customTimePeriodId"/> </entity-one> <!-- if no glAccountHistory create a new empty one --> <if-empty field="glAccountHistory"> 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=730092&r1=730091&r2=730092&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 03:11:15 2008 @@ -57,8 +57,8 @@ <if-compare field="invoice.invoiceTypeId" operator="equals" value="SALES_INVOICE"> <entity-one entity-name="SalesInvoiceItemFact" value-name="fact" auto-field-map="false"> - <field-map field-name="invoiceId" env-name="invoiceItem.invoiceId"/> - <field-map field-name="invoiceItemSeqId" env-name="invoiceItem.invoiceItemSeqId"/> + <field-map field-name="invoiceId" from-field="invoiceItem.invoiceId"/> + <field-map field-name="invoiceItemSeqId" from-field="invoiceItem.invoiceItemSeqId"/> </entity-one> <!-- key handling --> <if-empty field="fact"> 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=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Tue Dec 30 03:11:15 2008 @@ -46,7 +46,7 @@ <if-not-empty field="parameters.paymentMethodId"> <entity-one entity-name="PaymentMethod" value-name="paymentMethod"> - <field-map field-name="paymentMethodId" env-name="parameters.paymentMethodId"/> + <field-map field-name="paymentMethodId" from-field="parameters.paymentMethodId"/> </entity-one> <log level="info" message="Replacing passed payment method type [${parameters.paymentMethodTypeId}] with payment method type [${paymentMethod.paymentMethodTypeId}] for payment method [${parameters.paymentMethodId}]"/> <set field="parameters.paymentMethodTypeId" from-field="paymentMethod.paymentMethodTypeId"/> @@ -108,7 +108,7 @@ </if-empty> <if-not-empty field="payment.paymentMethodId"> <entity-one entity-name="PaymentMethod" value-name="paymentMethod"> - <field-map field-name="paymentMethodId" env-name="payment.paymentMethodId"/> + <field-map field-name="paymentMethodId" from-field="payment.paymentMethodId"/> </entity-one> <if-compare-field field="payment.paymentMethodTypeId" to-field="paymentMethod.paymentMethodTypeId" operator="not-equals"> <log level="info" message="Replacing passed payment method type [${payment.paymentMethodTypeId}] with payment method type [${paymentMethod.paymentMethodTypeId}] for payment method [${payment.paymentMethodId}]"/> @@ -175,8 +175,8 @@ <if-compare-field field="payment.statusId" to-field="parameters.statusId" operator="not-equals"> <entity-one entity-name="StatusValidChange" value-name="statusChange" auto-field-map="false"> - <field-map field-name="statusId" env-name="payment.statusId"/> - <field-map field-name="statusIdTo" env-name="parameters.statusId"/> + <field-map field-name="statusId" from-field="payment.statusId"/> + <field-map field-name="statusIdTo" from-field="parameters.statusId"/> </entity-one> <if-empty field="statusChange"> <add-error><fail-property resource="AccountingUiLabels" property="AccountingPSInvalidStatusChange"/></add-error> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml Tue Dec 30 03:11:15 2008 @@ -45,12 +45,12 @@ <!-- try to find existing value --> <entity-and entity-name="RateAmount" list-name="rateAmounts" filter-by-date="true"> - <field-map field-name="rateTypeId" env-name="parameters.rateTypeId"/> - <field-map field-name="workEffortId" env-name="parameters.workEffortId"/> - <field-map field-name="rateCurrencyUomId" env-name="parameters.rateCurrencyUomId"/> - <field-map field-name="emplPositionTypeId" env-name="parameters.emplPositionTypeId"/> - <field-map field-name="partyId" env-name="parameters.partyId"/> - <field-map field-name="periodTypeId" env-name="parameters.periodTypeId"/> + <field-map field-name="rateTypeId" from-field="parameters.rateTypeId"/> + <field-map field-name="workEffortId" from-field="parameters.workEffortId"/> + <field-map field-name="rateCurrencyUomId" from-field="parameters.rateCurrencyUomId"/> + <field-map field-name="emplPositionTypeId" from-field="parameters.emplPositionTypeId"/> + <field-map field-name="partyId" from-field="parameters.partyId"/> + <field-map field-name="periodTypeId" from-field="parameters.periodTypeId"/> </entity-and> <!-- end existing value --> @@ -135,8 +135,8 @@ </condition> <then> <entity-and entity-name="RateAmount" list-name="amounts" filter-by-date="true"> - <field-map field-name="rateTypeId" env-name="parameters.rateTypeId"/> - <field-map field-name="workEffortId" env-name="parameters.workEffortId"/> + <field-map field-name="rateTypeId" from-field="parameters.rateTypeId"/> + <field-map field-name="workEffortId" from-field="parameters.workEffortId"/> </entity-and> <if-not-empty field="amounts"> <first-from-list entry-name="amount" list-name="amounts"/> @@ -157,8 +157,8 @@ </condition> <then> <entity-and entity-name="RateAmount" list-name="amounts" filter-by-date="true"> - <field-map field-name="rateTypeId" env-name="parameters.rateTypeId"/> - <field-map field-name="partyId" env-name="parameters.partyId"/> + <field-map field-name="rateTypeId" from-field="parameters.rateTypeId"/> + <field-map field-name="partyId" from-field="parameters.partyId"/> </entity-and> <if-not-empty field="amounts"> <first-from-list entry-name="amount" list-name="amounts"/> @@ -179,8 +179,8 @@ </condition> <then> <entity-and entity-name="RateAmount" list-name="amounts" filter-by-date="true"> - <field-map field-name="rateTypeId" env-name="parameters.rateTypeId"/> - <field-map field-name="emplPositionTypeId" env-name="parameters.emplPositionTypeId"/> + <field-map field-name="rateTypeId" from-field="parameters.rateTypeId"/> + <field-map field-name="emplPositionTypeId" from-field="parameters.emplPositionTypeId"/> </entity-and> <if-not-empty field="amounts"> <first-from-list entry-name="amount" list-name="amounts"/> @@ -193,7 +193,7 @@ <if-empty field="level"> <entity-and entity-name="RateAmount" list-name="amounts" filter-by-date="true"> - <field-map field-name="rateTypeId" env-name="parameters.rateTypeId"/> + <field-map field-name="rateTypeId" from-field="parameters.rateTypeId"/> </entity-and> <set field="level" value="rateType"/> </if-empty> @@ -204,15 +204,15 @@ </if-empty> <if-compare field="level" value="workEffort" operator="equals"> <entity-and entity-name="RateAmount" list-name="amounts" filter-by-date="true"> - <field-map field-name="rateTypeId" env-name="parameters.rateTypeId"/> - <field-map field-name="partyId" env-name="parameters.partyId"/> - <field-map field-name="workEffortId" env-name="parameters.workEffortId"/> - <field-map field-name="periodTypeId" env-name="parameters.periodTypeId"/> - <field-map field-name="rateCurrencyUomId" env-name="parameters.rateCurrencyUomId"/> + <field-map field-name="rateTypeId" from-field="parameters.rateTypeId"/> + <field-map field-name="partyId" from-field="parameters.partyId"/> + <field-map field-name="workEffortId" from-field="parameters.workEffortId"/> + <field-map field-name="periodTypeId" from-field="parameters.periodTypeId"/> + <field-map field-name="rateCurrencyUomId" from-field="parameters.rateCurrencyUomId"/> </entity-and> <if-empty field="amounts"> <entity-one entity-name="Uom" value-name="currencyUomId"> - <field-map field-name="uomId" env-name="parameters.rateCurrencyUomId"/> + <field-map field-name="uomId" from-field="parameters.rateCurrencyUomId"/> </entity-one> <entity-one entity-name="PeriodType" value-name="periodType"/> <entity-one entity-name="RateType" value-name="rateType"/> @@ -224,14 +224,14 @@ <if-compare field="level" value="party" operator="equals"> <entity-and entity-name="RateAmount" list-name="amounts" filter-by-date="true"> - <field-map field-name="rateTypeId" env-name="parameters.rateTypeId"/> - <field-map field-name="partyId" env-name="parameters.partyId"/> - <field-map field-name="periodTypeId" env-name="parameters.periodTypeId"/> - <field-map field-name="rateCurrencyUomId" env-name="parameters.rateCurrencyUomId"/> + <field-map field-name="rateTypeId" from-field="parameters.rateTypeId"/> + <field-map field-name="partyId" from-field="parameters.partyId"/> + <field-map field-name="periodTypeId" from-field="parameters.periodTypeId"/> + <field-map field-name="rateCurrencyUomId" from-field="parameters.rateCurrencyUomId"/> </entity-and> <if-empty field="amounts"> <entity-one entity-name="Uom" value-name="currencyUomId"> - <field-map field-name="uomId" env-name="parameters.rateCurrencyUomId"/> + <field-map field-name="uomId" from-field="parameters.rateCurrencyUomId"/> </entity-one> <entity-one entity-name="PeriodType" value-name="periodType"/> <entity-one entity-name="RateType" value-name="rateType"/> @@ -242,14 +242,14 @@ <if-compare field="level" value="emplPositionType" operator="equals"> <entity-and entity-name="RateAmount" list-name="amounts" filter-by-date="true"> - <field-map field-name="rateTypeId" env-name="parameters.rateTypeId"/> - <field-map field-name="emplPositionTypeId" env-name="parameters.emplPositionTypeId"/> - <field-map field-name="periodTypeId" env-name="parameters.periodTypeId"/> - <field-map field-name="rateCurrencyUomId" env-name="parameters.rateCurrencyUomId"/> + <field-map field-name="rateTypeId" from-field="parameters.rateTypeId"/> + <field-map field-name="emplPositionTypeId" from-field="parameters.emplPositionTypeId"/> + <field-map field-name="periodTypeId" from-field="parameters.periodTypeId"/> + <field-map field-name="rateCurrencyUomId" from-field="parameters.rateCurrencyUomId"/> </entity-and> <if-empty field="amounts"> <entity-one entity-name="Uom" value-name="currencyUomId"> - <field-map field-name="uomId" env-name="parameters.rateCurrencyUomId"/> + <field-map field-name="uomId" from-field="parameters.rateCurrencyUomId"/> </entity-one> <entity-one entity-name="PeriodType" value-name="periodType"/> <entity-one entity-name="RateType" value-name="rateType"/> @@ -261,13 +261,13 @@ <if-compare field="level" value="rateType" operator="equals"> <entity-and entity-name="RateAmount" list-name="amounts" filter-by-date="true"> - <field-map field-name="rateTypeId" env-name="parameters.rateTypeId"/> - <field-map field-name="periodTypeId" env-name="parameters.periodTypeId"/> - <field-map field-name="rateCurrencyUomId" env-name="parameters.rateCurrencyUomId"/> + <field-map field-name="rateTypeId" from-field="parameters.rateTypeId"/> + <field-map field-name="periodTypeId" from-field="parameters.periodTypeId"/> + <field-map field-name="rateCurrencyUomId" from-field="parameters.rateCurrencyUomId"/> </entity-and> <if-empty field="amounts"> <entity-one entity-name="Uom" value-name="currencyUomId"> - <field-map field-name="uomId" env-name="parameters.rateCurrencyUomId"/> + <field-map field-name="uomId" from-field="parameters.rateCurrencyUomId"/> </entity-one> <entity-one entity-name="PeriodType" value-name="periodType"/> <entity-one entity-name="RateType" value-name="rateType"/> @@ -298,8 +298,8 @@ <!-- check if already exist is so expire current record --> <entity-and entity-name="PartyRate" list-name="partyRates" filter-by-date="true"> - <field-map field-name="partyId" env-name="parameters.partyId"/> - <field-map field-name="rateTypeId" env-name="parameters.rateTypeId"/> + <field-map field-name="partyId" from-field="parameters.partyId"/> + <field-map field-name="rateTypeId" from-field="parameters.rateTypeId"/> </entity-and> <if-not-empty field="partyRates"> <first-from-list entry-name="partyRate" list-name="partyRates"/> @@ -326,7 +326,7 @@ <check-errors/> <if-compare field="newEntity.defaultRate" value="Y" operator="equals"> <entity-and entity-name="PartyRate" list-name="rates" filter-by-date="true"> - <field-map field-name="partyId" env-name="newEntity.partyId"/> + <field-map field-name="partyId" from-field="newEntity.partyId"/> <field-map field-name="defaultRate" value="Y"/> </entity-and> <if-not-empty field="rates"> 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=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml Tue Dec 30 03:11:15 2008 @@ -23,7 +23,7 @@ <simple-method method-name="genCompDocInstance" short-description="Create CompDoc"> <entity-one entity-name="Content" value-name="rootTemplateContent"> - <field-map field-name="contentId" env-name="parameters.instanceOfContentId"/> + <field-map field-name="contentId" from-field="parameters.instanceOfContentId"/> </entity-one> <log message="genCompDocInstance> rootTemplateContent: ${rootTemplateContent}" level="info"/> @@ -54,7 +54,7 @@ <else> <!-- check to see if it already exists, error if so --> <entity-one entity-name="Content" value-name="existingContent"> - <field-map field-name="contentId" env-name="parameters.rootInstanceContentId"/> + <field-map field-name="contentId" from-field="parameters.rootInstanceContentId"/> </entity-one> <if-not-empty field="existingContent"> <add-error> @@ -454,11 +454,11 @@ <if-not-empty field="contentRevisionItems"> <set field="contentRevisionItem" from-field="contentRevisionItems[0]"/> <entity-one entity-name="Content" value-name="content" use-cache="true"> - <field-map field-name="contentId" env-name="contentRevisionItem.itemContentId"/> + <field-map field-name="contentId" from-field="contentRevisionItem.itemContentId"/> </entity-one> <if-not-empty field="content"> <entity-one entity-name="DataResource" value-name="dataResource" use-cache="true"> - <field-map field-name="dataResourceId" env-name="content.dataResourceId"/> + <field-map field-name="dataResourceId" from-field="content.dataResourceId"/> </entity-one> <field-to-result field-name="dataResource" result-name="dataResource"/> </if-not-empty> @@ -466,16 +466,16 @@ </simple-method> <simple-method method-name="getRevisionItemDataResource" short-description="Get version of DataResource that fits overall revision"> <entity-one entity-name="ContentRevisionItem" value-name="contentRevisionItem" use-cache="true"> - <field-map field-name="contentId" env-name="parameters.contentId"/> - <field-map field-name="itemContentId" env-name="parameters.itemContentId"/> - <field-map field-name="contentRevisionSeqId" env-name="parameters.contentRevisionSeqId"/> + <field-map field-name="contentId" from-field="parameters.contentId"/> + <field-map field-name="itemContentId" from-field="parameters.itemContentId"/> + <field-map field-name="contentRevisionSeqId" from-field="parameters.contentRevisionSeqId"/> </entity-one> <entity-one entity-name="Content" value-name="content" use-cache="true"> - <field-map field-name="contentId" env-name="contentRevisionItem.itemContentId"/> + <field-map field-name="contentId" from-field="contentRevisionItem.itemContentId"/> </entity-one> <if-not-empty field="content"> <entity-one entity-name="DataResource" value-name="dataResource" use-cache="true"> - <field-map field-name="dataResourceId" env-name="content.dataResourceId"/> + <field-map field-name="dataResourceId" from-field="content.dataResourceId"/> </entity-one> <field-to-result field-name="dataResource" result-name="dataResource"/> </if-not-empty> @@ -588,8 +588,8 @@ <set from-field="maxContentApprovalList[0].maxContentRevisionSeqId" field="latestContentRevisionSeqId"/> <log level="info" message="latestContentRevisionSeqId 0aa: ${latestContentRevisionSeqId}"/> <entity-and entity-name="ContentApproval" list-name="templateContentApprovalList"> - <field-map field-name="contentId" env-name="parameters.contentId"/> - <field-map field-name="contentRevisionSeqId" env-name="latestContentRevisionSeqId"/> + <field-map field-name="contentId" from-field="parameters.contentId"/> + <field-map field-name="contentRevisionSeqId" from-field="latestContentRevisionSeqId"/> </entity-and> <log level="info" message="templateContentApprovalList 0aa: ${templateContentApprovalList}"/> <iterate list-name="templateContentApprovalList" entry-name="templateContentApproval"> @@ -605,7 +605,7 @@ </simple-method> <simple-method method-name="cloneInstanceContentApprovals" short-description="Bump the previous ContentApproval approvals up to current CDI"> <entity-one entity-name="Content" value-name="content"> - <field-map field-name="contentId" env-name="parameters.contentId"/> + <field-map field-name="contentId" from-field="parameters.contentId"/> </entity-one> <set from-field="parameters.contentId" field="thisContentId"/> <set from-field="parameters.contentRevisionSeqId" field="thisContentRevisionSeqId"/> @@ -642,8 +642,8 @@ <set from-field="templateContentRevisionList[0].contentRevisionSeqId" field="latestContentRevisionSeqId"/> <log level="info" message="latestContentRevisionSeqId 0aa: ${latestContentRevisionSeqId}"/> <entity-and entity-name="ContentApproval" list-name="templateContentApprovalList"> - <field-map field-name="contentId" env-name="rootTemplateContentId"/> - <field-map field-name="contentRevisionSeqId" env-name="latestContentRevisionSeqId"/> + <field-map field-name="contentId" from-field="rootTemplateContentId"/> + <field-map field-name="contentRevisionSeqId" from-field="latestContentRevisionSeqId"/> </entity-and> <log level="info" message="templateContentApprovalList 0aa: ${templateContentApprovalList}"/> <iterate list-name="templateContentApprovalList" entry-name="templateContentApproval"> @@ -734,8 +734,8 @@ <set from-field="templateContentRevisionList[0].contentRevisionSeqId" field="latestContentRevisionSeqId"/> <log level="info" message="latestContentRevisionSeqId 0aa: ${latestContentRevisionSeqId}"/> <entity-and entity-name="ContentApproval" list-name="templateContentApprovalList"> - <field-map field-name="contentId" env-name="rootTemplateContentId"/> - <field-map field-name="contentRevisionSeqId" env-name="latestContentRevisionSeqId"/> + <field-map field-name="contentId" from-field="rootTemplateContentId"/> + <field-map field-name="contentRevisionSeqId" from-field="latestContentRevisionSeqId"/> </entity-and> <log level="info" message="templateContentApprovalList 0aa: ${templateContentApprovalList}"/> <iterate list-name="templateContentApprovalList" entry-name="templateContentApproval"> @@ -821,8 +821,8 @@ <simple-method method-name="getFinalApprovalStatus" short-description="Check to see if any open approval conditions exist"> <!-- iterate thru most recent ContentApproval list and determine its ending status --> <entity-and entity-name="ContentApproval" list-name="contentApprovalList"> - <field-map field-name="contentId" env-name="parameters.contentId"/> - <field-map field-name="contentRevisionSeqId" env-name="parameters.contentRevisionSeqId"/> + <field-map field-name="contentId" from-field="parameters.contentId"/> + <field-map field-name="contentRevisionSeqId" from-field="parameters.contentRevisionSeqId"/> <order-by field-name="sequenceNum"/> </entity-and> <if> @@ -877,7 +877,7 @@ <simple-method method-name="checkForWaitingApprovals" short-description="Check to see if any approval conditions exist for the passed in user"> <set from-field="userLogin.partyId" field="partyId"/> <entity-and entity-name="PartyRole" list-name="partyRoleList"> - <field-map field-name="partyId" env-name="partyId"/> + <field-map field-name="partyId" from-field="partyId"/> </entity-and> <log level="info" message="userLogin.partyId: ${partyId}"/> <iterate list-name="partyRoleList" entry-name="partyRole"> 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=730092&r1=730091&r2=730092&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 03:11:15 2008 @@ -119,8 +119,8 @@ <if-compare-field field="content.statusId" to-field="parameters.statusId" operator="not-equals"> <entity-one entity-name="StatusValidChange" value-name="statusChange" auto-field-map="false"> - <field-map field-name="statusId" env-name="content.statusId"/> - <field-map field-name="statusIdTo" env-name="parameters.statusId"/> + <field-map field-name="statusId" from-field="content.statusId"/> + <field-map field-name="statusIdTo" from-field="parameters.statusId"/> </entity-one> <if-empty field="statusChange"> @@ -163,7 +163,7 @@ </call-service> <entity-and entity-name="ContentAssoc" list-name="assocs"> - <field-map field-name="contentId" env-name="parameters.contentId"/> + <field-map field-name="contentId" from-field="parameters.contentId"/> </entity-and> <iterate entry="assoc" list-name="assocs"> <set field="assoc.contentId" from-field="newContentId"/> @@ -172,7 +172,7 @@ </iterate> <entity-and entity-name="ContentAssoc" list-name="assocsTo"> - <field-map field-name="contentIdTo" env-name="parameters.contentId"/> + <field-map field-name="contentIdTo" from-field="parameters.contentId"/> </entity-and> <iterate entry="assocTo" list-name="assocsTo"> <set field="assocTo.contentIdTo" from-field="newContentId"/> @@ -732,7 +732,7 @@ <!-- This method will create a skeleton content record from a data resource --> <simple-method method-name="createContentFromDataResource" short-description="Create Content from DataResource Object"> <entity-one entity-name="DataResource" value-name="dataResource"> - <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/> + <field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/> </entity-one> <if-empty field="dataResource"> <add-error><fail-message message="No data resource found for ID: [$parameters.dataResourceId}]"/></add-error> @@ -896,7 +896,7 @@ <!-- retrieve Data resource information --> <simple-method method-name="getDataResource" short-description="get the content and relasted resource information" login-required="false"> <entity-one entity-name="DataResource" value-name="resultData.dataResource"> - <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/> + <field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/> </entity-one> <if-not-empty field="resultData.dataResource"> <if-compare field="resultData.dataResource.dataResourceTypeId" value="ELECTRONIC_TEXT" operator="equals"> @@ -913,7 +913,7 @@ <simple-method method-name="getContentAndDataResource" short-description="get the content and related resource information" login-required="false"> <entity-one entity-name="Content" value-name="resultDataContent.content"> - <field-map field-name="contentId" env-name="parameters.contentId"/> + <field-map field-name="contentId" from-field="parameters.contentId"/> </entity-one> <if-not-empty field="resultDataContent.content"> <if-not-empty field="resultDataContent.content.dataResourceId"> @@ -1217,7 +1217,7 @@ <set field="map.contentName" from-field="view2.contentName"/> <set field="map.description" from-field="view2.description"/> <entity-one entity-name="ElectronicText" value-name="electronicText"> - <field-map field-name="dataResourceId" env-name="view2.dataResourceId"/> + <field-map field-name="dataResourceId" from-field="view2.dataResourceId"/> </entity-one> <set field="map.textData" from-field="electronicText.textData"/> <set field="contentViewList[]" from-field="map"/> Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml Tue Dec 30 03:11:15 2008 @@ -601,7 +601,7 @@ <if-compare field="parameters.dataResourceTypeId" value="IMAGE_OBJECT" operator="equals"> <entity-one entity-name="ImageDataResource" value-name="dataResObj"> - <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/> + <field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/> </entity-one> <if-not-empty field="dataResObj"> <set field="isUpdate" value="true"/> @@ -612,7 +612,7 @@ <if-compare field="parameters.dataResourceTypeId" value="VIDEO_OBJECT" operator="equals"> <entity-one entity-name="VideoDataResource" value-name="dataResObj"> - <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/> + <field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/> </entity-one> <if-not-empty field="dataResObj"> <set field="isUpdate" value="true"/> @@ -623,7 +623,7 @@ <if-compare field="parameters.dataResourceTypeId" value="AUDIO_OBJECT" operator="equals"> <entity-one entity-name="AudioDataResource" value-name="dataResObj"> - <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/> + <field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/> </entity-one> <if-not-empty field="dataResObj"> <set field="isUpdate" value="true"/> @@ -634,7 +634,7 @@ <if-compare field="parameters.dataResourceTypeId" value="OTHER_OBJECT" operator="equals"> <entity-one entity-name="OtherDataResource" value-name="dataResObj"> - <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/> + <field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/> </entity-one> <if-not-empty field="dataResObj"> <set field="isUpdate" value="true"/> @@ -650,7 +650,7 @@ <!-- save LOCAL_FILE data --> <simple-method method-name="saveLocalFileDateResource" short-description="Attach an uploaded file to a data resource as LOCAL_FILE"> <entity-one entity-name="DataResource" value-name="dataResource"> - <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/> + <field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/> </entity-one> <if-empty field="dataResource"> <add-error><fail-message message="No data resource found for ID: [$parameters.dataResourceId}]"/></add-error> @@ -710,7 +710,7 @@ <!-- save OTHER_OBJECT data --> <simple-method method-name="saveOtherObjectDateResource" short-description="Attach an uploaded file to a data resource as OTHER_OBJECT"> <entity-one entity-name="DataResource" value-name="dataResource"> - <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/> + <field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/> </entity-one> <if-empty field="dataResource"> <add-error><fail-message message="No data resource found for ID: [$parameters.dataResourceId}]"/></add-error> @@ -766,7 +766,7 @@ <!-- save IMAGE_OBJECT data --> <simple-method method-name="saveImageObjectDateResource" short-description="Attach an uploaded file to a data resource as IMAGE_OBJECT"> <entity-one entity-name="DataResource" value-name="dataResource"> - <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/> + <field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/> </entity-one> <if-empty field="dataResource"> <add-error><fail-message message="No data resource found for ID: [$parameters.dataResourceId}]"/></add-error> @@ -822,7 +822,7 @@ <!-- save VIDEO_OBJECT data --> <simple-method method-name="saveVideoObjectDateResource" short-description="Attach an uploaded file to a data resource as VIDEO_OBJECT"> <entity-one entity-name="DataResource" value-name="dataResource"> - <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/> + <field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/> </entity-one> <if-empty field="dataResource"> <add-error><fail-message message="No data resource found for ID: [$parameters.dataResourceId}]"/></add-error> @@ -878,7 +878,7 @@ <!-- save AUDIO_OBJECT data --> <simple-method method-name="saveAudioObjectDateResource" short-description="Attach an uploaded file to a data resource as AUDIO_OBJECT"> <entity-one entity-name="DataResource" value-name="dataResource"> - <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/> + <field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/> </entity-one> <if-empty field="dataResource"> <add-error><fail-message message="No data resource found for ID: [$parameters.dataResourceId}]"/></add-error> 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=730092&r1=730091&r2=730092&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 03:11:15 2008 @@ -142,7 +142,7 @@ <!-- grab the current requested content record --> <entity-one entity-name="Content" value-name="content"> - <field-map field-name="contentId" env-name="contentId"/> + <field-map field-name="contentId" from-field="contentId"/> </entity-one> <!-- check the operation security --> @@ -242,7 +242,7 @@ </condition> <then> <entity-one entity-name="Content" value-name="currentContent"> - <field-map field-name="contentId" env-name="checkId"/> + <field-map field-name="contentId" from-field="checkId"/> </entity-one> <if> <condition> @@ -387,7 +387,7 @@ </condition> <then> <entity-one entity-name="Content" value-name="currentContent"> - <field-map field-name="contentId" env-name="checkId"/> + <field-map field-name="contentId" from-field="checkId"/> </entity-one> <if> <condition> @@ -435,7 +435,7 @@ </if-empty> <entity-one entity-name="Content" value-name="checkContent"> - <field-map field-name="contentId" env-name="checkId"/> + <field-map field-name="contentId" from-field="checkId"/> </entity-one> <set field="statusId" from-field="checkContent.statusId"/> @@ -587,7 +587,7 @@ </condition> <then> <entity-one entity-name="Content" value-name="currentContent"> - <field-map field-name="contentId" env-name="checkId"/> + <field-map field-name="contentId" from-field="checkId"/> </entity-one> <if> <condition> @@ -715,9 +715,9 @@ <find-by-and entity-name="${roleEntity}" map-name="lookup" list-name="foundRoles"/> <!-- <entity-and entity-name="${roleEntity}" list-name="foundRoles"> - <field-map env-name="${roleEntityField}"/> - <field-map field-name="roleTypeId" env-name="checkRoleTypeId"/> - <field-map field-name="partyId" env-name="checkPartyId"/> + <field-map from-field="${roleEntityField}"/> + <field-map field-name="roleTypeId" from-field="checkRoleTypeId"/> + <field-map field-name="partyId" from-field="checkPartyId"/> </entity-and> --> </then> @@ -729,8 +729,8 @@ <find-by-and entity-name="${roleEntity}" map-name="lookup" list-name="foundRoles"/> <!-- <entity-and entity-name="${roleEntity}" list-name="foundRoles"> - <field-map env-name="${roleEntityField}"/> - <field-map field-name="partyId" env-name="checkPartyId"/> + <field-map from-field="${roleEntityField}"/> + <field-map field-name="partyId" from-field="checkPartyId"/> </entity-and> --> </else> @@ -784,7 +784,7 @@ <check-errors/> <entity-and entity-name="ContentAssoc" list-name="assocs" filter-by-date="true"> - <field-map field-name="contentIdTo" env-name="contentId"/> + <field-map field-name="contentIdTo" from-field="contentId"/> </entity-and> <field-to-result field-name="assocs" result-name="contentAssocList"/> </simple-method> Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml Tue Dec 30 03:11:15 2008 @@ -149,7 +149,7 @@ <!-- quick create website CMS content --> <simple-method method-name="quickCreateWebSiteContent" short-description="Auto-Create WebSite CMS Content"> <entity-one entity-name="WebSite" value-name="webSite"> - <field-map field-name="webSiteId" env-name="parameters.webSiteId"/> + <field-map field-name="webSiteId" from-field="parameters.webSiteId"/> </entity-one> <now-timestamp-to-env env-name="now"/> <log level="always" message="Parameters: ${parameters}"/> @@ -157,7 +157,7 @@ <if-instance-of field-name="parameters.webSiteContentTypeId" class="String"> <!-- just one checked --> <entity-one entity-name="WebSiteContentType" value-name="wct"> - <field-map field-name="webSiteContentTypeId" env-name="parameters.webSiteContentTypeId"/> + <field-map field-name="webSiteContentTypeId" from-field="parameters.webSiteContentTypeId"/> </entity-one> <set field="cnt.contentName" value="${webSite.siteName} ${wct.description}"/> @@ -175,7 +175,7 @@ <!-- multi-checked --> <iterate entry="thisType" list-name="parameters.webSiteContentTypeId"> <entity-one entity-name="WebSiteContentType" value-name="wct"> - <field-map field-name="webSiteContentTypeId" env-name="thisType"/> + <field-map field-name="webSiteContentTypeId" from-field="thisType"/> </entity-one> <set field="cnt.contentName" value="${webSite.siteName} ${wct.description}"/> Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original) +++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Tue Dec 30 03:11:15 2008 @@ -980,7 +980,7 @@ <call-service service-name="createUserLogin" in-map-name="userLoginCtx"/> <entity-one entity-name="UserLogin" value-name="userLogin"> - <field-map field-name="userLoginId" env-name="userLoginMap.userLoginId"/> + <field-map field-name="userLoginId" from-field="userLoginMap.userLoginId"/> </entity-one> <!-- now finished, log in the user and set the cart's partyId --> @@ -1104,8 +1104,8 @@ <log level="info" message=" productStoreShipMethId is ${productStoreShipMethId}"/> <entity-one entity-name="CarrierAndShipmentMethod" value-name="shipmentMethod"> - <field-map field-name="shipmentMethodTypeId" env-name="shipmentMethodTypeId"/> - <field-map field-name="partyId" env-name="carrierPartyId"/> + <field-map field-name="shipmentMethodTypeId" from-field="shipmentMethodTypeId"/> + <field-map field-name="partyId" from-field="carrierPartyId"/> <field-map field-name="roleTypeId" value="CARRIER"/> </entity-one> <field-to-request field-name="shipmentMethod.description" request-name="shippingDescription"/> Modified: ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml (original) +++ ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml Tue Dec 30 03:11:15 2008 @@ -609,8 +609,8 @@ <entity-one entity-name="EmplPositionTypeRate" value-name="lookedUpValue"/> <!-- check if already exist is so expire current record --> <entity-and entity-name="EmplPositionTypeRate" list-name="emplPositionTypeRates" filter-by-date="true"> - <field-map field-name="emplPositionTypeId" env-name="parameters.emplPositionTypeId"/> - <field-map field-name="rateTypeId" env-name="parameters.rateTypeId"/> + <field-map field-name="emplPositionTypeId" from-field="parameters.emplPositionTypeId"/> + <field-map field-name="rateTypeId" from-field="parameters.rateTypeId"/> </entity-and> <if-not-empty field="emplPositionTypeRates"> <first-from-list entry-name="emplPositionTypeRate" list-name="emplPositionTypeRates"/> Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml (original) +++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml Tue Dec 30 03:11:15 2008 @@ -61,9 +61,9 @@ <set from-field="parameters.quantity" field="estimatedQuantity" default-value="0.0" type="Double"/> <else> <entity-one entity-name="WorkEffortGoodStandard" value-name="workEffortGoodStandard" auto-field-map="false"> - <field-map field-name="workEffortId" env-name="parameters.workEffortId"/> - <field-map field-name="productId" env-name="parameters.productId"/> - <field-map field-name="fromDate" env-name="parameters.fromDate"/> + <field-map field-name="workEffortId" from-field="parameters.workEffortId"/> + <field-map field-name="productId" from-field="parameters.productId"/> + <field-map field-name="fromDate" from-field="parameters.fromDate"/> <field-map field-name="workEffortGoodStdTypeId" value="PRUNT_PROD_NEEDED"/> </entity-one> <set from-field="workEffortGoodStandard.productId" field="productId"/> @@ -223,8 +223,8 @@ </if-compare> <if-not-empty field="workEffortGoodStandard"> <entity-and list="issuances" entity-name="WorkEffortAndInventoryAssign"> - <field-map field-name="workEffortId" env-name="workEffortGoodStandard.workEffortId"/> - <field-map field-name="productId" env-name="workEffortGoodStandard.productId"/> + <field-map field-name="workEffortId" from-field="workEffortGoodStandard.workEffortId"/> + <field-map field-name="productId" from-field="workEffortGoodStandard.productId"/> </entity-and> <iterate list-name="issuances" entry-name="issuance"> <calculate field-name="totalIssuance"> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml Tue Dec 30 03:11:15 2008 @@ -57,14 +57,14 @@ <!-- check the preferredContactMechId, make sure it is the right type --> <if-not-empty field="parameters.preferredContactMechId"> <entity-one entity-name="ContactMech" value-name="preferredContactMech" auto-field-map="false"> - <field-map field-name="contactMechId" env-name="parameters.preferredContactMechId"/> + <field-map field-name="contactMechId" from-field="parameters.preferredContactMechId"/> </entity-one> <if-compare-field field="preferredContactMech.contactMechTypeId" to-field="contactList.contactMechTypeId" operator="not-equals"> <entity-one entity-name="ContactMechType" value-name="preferredContactMechType" auto-field-map="false"> - <field-map field-name="contactMechTypeId" env-name="preferredContactMech.contactMechTypeId"/> + <field-map field-name="contactMechTypeId" from-field="preferredContactMech.contactMechTypeId"/> </entity-one> <entity-one entity-name="ContactMechType" value-name="listContactMechType" auto-field-map="false"> - <field-map field-name="contactMechTypeId" env-name="contactList.contactMechTypeId"/> + <field-map field-name="contactMechTypeId" from-field="contactList.contactMechTypeId"/> </entity-one> <add-error><fail-message message="The preferred contact mechanism [${preferredContactMechType.description}] was not of the right type for the list [${listContactMechType.description}]."/></add-error> </if-compare-field> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml Tue Dec 30 03:11:15 2008 @@ -123,7 +123,7 @@ <set field="createPartyRoleCtx.roleTypeId" value="CONTACT"/> <call-service service-name="createPartyRole" in-map-name="createPartyRoleCtx"/> <entity-and entity-name="PartyRelationship" list-name="partyRelationships" filter-by-date="true"> - <field-map field-name="partyIdTo" env-name="parameters.partyId"/> + <field-map field-name="partyIdTo" from-field="parameters.partyId"/> <field-map field-name="roleTypeIdTo" value="LEAD"/> <field-map field-name="roleTypeIdFrom" value="ACCOUNT_LEAD"/> <order-by field-name="-fromDate"/> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml Tue Dec 30 03:11:15 2008 @@ -40,7 +40,7 @@ <if-compare field="returnHeaderTypeId" operator="equals" value="CUSTOMER_RETURN"> <if-not-empty field="parameters.destinationFacilityId"> <entity-one entity-name="Facility" value-name="destinationFacility" auto-field-map="false"> - <field-map field-name="facilityId" env-name="parameters.destinationFacilityId"/> + <field-map field-name="facilityId" from-field="parameters.destinationFacilityId"/> </entity-one> <set from-field="destinationFacility.ownerPartyId" field="parameters.toPartyId"/> </if-not-empty> @@ -49,7 +49,7 @@ <!-- make sure that the party to return to is an INTERNAL_ORGANIZATIO for customer return and SUPPLIER for vendor return else stop --> <if-compare field="returnHeaderTypeId" operator="equals" value="CUSTOMER_RETURN"> <entity-one entity-name="PartyRole" value-name="partyRole" use-cache="true" auto-field-map="false"> - <field-map field-name="partyId" env-name="parameters.toPartyId"/> + <field-map field-name="partyId" from-field="parameters.toPartyId"/> <field-map field-name="roleTypeId" value="INTERNAL_ORGANIZATIO"/> </entity-one> <if-empty field="partyRole"> @@ -57,7 +57,7 @@ </if-empty> <else> <entity-one entity-name="PartyRole" value-name="partyRole" use-cache="true" auto-field-map="false"> - <field-map field-name="partyId" env-name="parameters.toPartyId"/> + <field-map field-name="partyId" from-field="parameters.toPartyId"/> <field-map field-name="roleTypeId" value="SUPPLIER"/> </entity-one> <if-empty field="partyRole"> @@ -230,7 +230,7 @@ </then> </if> <entity-and entity-name="ReturnAdjustment" list-name="returnAdjustments"> - <field-map field-name="returnId" env-name="returnHeader.returnId"/> + <field-map field-name="returnId" from-field="returnHeader.returnId"/> </entity-and> <iterate entry="returnAdjustment" list-name="returnAdjustments"> <calculate field-name="returnTotalAmount"> @@ -444,8 +444,8 @@ <!-- now update all return adjustments associated with this return item --> <entity-and entity-name="ReturnAdjustment" list-name="returnAdjustments"> - <field-map field-name="returnId" env-name="returnItem.returnId"/> - <field-map field-name="returnItemSeqId" env-name="returnItem.returnItemSeqId"/> + <field-map field-name="returnId" from-field="returnItem.returnId"/> + <field-map field-name="returnItemSeqId" from-field="returnItem.returnItemSeqId"/> </entity-and> <iterate entry="returnAdjustment" list-name="returnAdjustments"> <log level="info" message="updating returnAdjustment with Id:[${returnAdjustment.returnAdjustmentId}]"/> @@ -490,8 +490,8 @@ <find-by-primary-key entity-name="ReturnItem" map-name="lookupPKMap" value-name="returnItem"/> <!--remove related adjustments--> <entity-and entity-name="ReturnAdjustment" list-name="returnAdjustments"> - <field-map field-name="returnItemSeqId" env-name="returnItem.returnItemSeqId"/> - <field-map field-name="returnId" env-name="returnItem.returnId"/> + <field-map field-name="returnItemSeqId" from-field="returnItem.returnItemSeqId"/> + <field-map field-name="returnId" from-field="returnItem.returnId"/> </entity-and> <iterate entry="returnAdjustment" list-name="returnAdjustments"> <set field="removeCtx.returnAdjustmentId" from-field="returnAdjustment.returnAdjustmentId"/> @@ -551,8 +551,8 @@ </calculate> <entity-one entity-name="ReturnItem" value-name="returnItem"> - <field-map field-name="returnId" env-name="receipt.returnId"/> - <field-map field-name="returnItemSeqId" env-name="receipt.returnItemSeqId"/> + <field-map field-name="returnId" from-field="receipt.returnId"/> + <field-map field-name="returnItemSeqId" from-field="receipt.returnItemSeqId"/> </entity-one> <set field="returnItem.receivedQuantity" from-field="totalsMap.${receipt.returnItemSeqId}"/> @@ -651,7 +651,7 @@ <!-- get primary information from the order header --> <entity-one entity-name="OrderHeader" value-name="orderHeader"> - <field-map env-name="parameters.orderId" field-name="orderId"/> + <field-map from-field="parameters.orderId" field-name="orderId"/> </entity-one> <set field="returnHeaderTypeId" from-field="parameters.returnHeaderTypeId"/> <if-compare field="returnHeaderTypeId" operator="equals" value="CUSTOMER_RETURN"> @@ -736,19 +736,19 @@ <if-compare field="orderItemTypeId" value="PRODUCT_ORDER_ITEM" operator="equals"> <!-- Check if orderItemTypeId equals PRODUCT_ORDER_ITEM, if so, use ProductType and ReturnItemTypeMap to get ReturnItemType--> <entity-one entity-name="Product" value-name="product"> - <field-map field-name="productId" env-name="orderItem.productId"/> + <field-map field-name="productId" from-field="orderItem.productId"/> <select-field field-name="productTypeId"/> </entity-one> <entity-one entity-name="ReturnItemTypeMap" value-name="returnItemTypeMapping"> - <field-map env-name="product.productTypeId" field-name="returnItemMapKey"/> - <field-map env-name="returnHeaderTypeId" field-name="returnHeaderTypeId"/> + <field-map from-field="product.productTypeId" field-name="returnItemMapKey"/> + <field-map from-field="returnHeaderTypeId" field-name="returnHeaderTypeId"/> </entity-one> <else> <!-- if not, try the ReturnItemTypeMap, but this may not actually work, so log a warning --> <log level="warning" message="Trying to find returnItemtype from ReturnItemTypeMap with orderItemtypeId [${orderItem.orderItemTypeId}] for order item [${orderItem}]"/> <entity-one entity-name="ReturnItemTypeMap" value-name="returnItemTypeMapping"> - <field-map env-name="orderItemTypeId" field-name="returnItemMapKey"/> - <field-map env-name="returnHeaderTypeId" field-name="returnHeaderTypeId"/> + <field-map from-field="orderItemTypeId" field-name="returnItemMapKey"/> + <field-map from-field="returnHeaderTypeId" field-name="returnHeaderTypeId"/> </entity-one> </else> </if-compare> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |