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 13:18:39 UTC
svn commit: r730120 [1/2] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/finaccount/
applications/accounting/script/org/ofbiz/accounting/fixedasset/
applications/accounting/script/org/ofbiz/accounting/ledger/
applications/accoun...
Author: jleroux
Date: Tue Dec 30 04:18:38 2008
New Revision: 730120
URL: http://svn.apache.org/viewvc?rev=730120&view=rev
Log:
<condition-expr(.*)env-name => <condition-expr$1from-field
Modified:
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/ledger/AcctgTransServices.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/ContentServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/ContentPermissionServices.xml
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml
ofbiz/trunk/applications/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/requirement/RequirementServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.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/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/framework/bi/script/org/ofbiz/bi/DimensionServices.xml
ofbiz/trunk/framework/common/script/org/ofbiz/common/CdyneServices.xml
ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml
ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml
ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
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=730120&r1=730119&r2=730120&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml Tue Dec 30 04:18:38 2008
@@ -281,7 +281,7 @@
<!-- Get all of the records for the account from the database and sum everything up again, make sure we don't have any errors propagated over time -->
<entity-condition entity-name="FinAccountTrans" list="finAccountTransList">
- <condition-expr field-name="finAccountId" env-name="finAccountId"/>
+ <condition-expr field-name="finAccountId" from-field="finAccountId"/>
</entity-condition>
<set field="actualBalanceSum" value="0" type="BigDecimal"/>
<iterate entry="finAccountTrans" list="finAccountTransList">
@@ -307,7 +307,7 @@
<!-- start with the actual balance, and subtract off FinAccountAuth.amount -->
<set field="availableBalanceSum" from-field="actualBalanceSum"/>
<entity-condition entity-name="FinAccountAuth" list="finAccountAuthList" filter-by-date="true">
- <condition-expr field-name="finAccountId" env-name="finAccountId"/>
+ <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}">
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=730120&r1=730119&r2=730120&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml Tue Dec 30 04:18:38 2008
@@ -286,7 +286,7 @@
<call-service service-name="updateWorkEffort" in-map-name="updateWorkEffortCtx"/>
<check-errors/>
<entity-condition list="wepas" entity-name="WorkEffortPartyAssignment" filter-by-date="true">
- <condition-expr field-name="workEffortId" env-name="workEffortId" operator="equals"/>
+ <condition-expr field-name="workEffortId" from-field="workEffortId" operator="equals"/>
</entity-condition>
<iterate list="wepas" entry="wepa">
<set field="wepa.thruDate" from-field="nowTimestamp"/>
@@ -341,9 +341,9 @@
<set field="repeatCount" from-field="productMaintValue.repeatCount" default-value="0" type="Long"/>
<entity-condition list="maintList" entity-name="FixedAssetMaint">
<condition-list combine="and">
- <condition-expr field-name="fixedAssetId" operator="equals" env-name="fixedAssetValue.fixedAssetId"/>
- <condition-expr field-name="productMaintTypeId" operator="equals" env-name="productMaintValue.productMaintTypeId"/>
- <condition-expr field-name="intervalMeterTypeId" operator="equals" env-name="productMaintValue.intervalMeterTypeId"/>
+ <condition-expr field-name="fixedAssetId" operator="equals" from-field="fixedAssetValue.fixedAssetId"/>
+ <condition-expr field-name="productMaintTypeId" operator="equals" from-field="productMaintValue.productMaintTypeId"/>
+ <condition-expr field-name="intervalMeterTypeId" operator="equals" from-field="productMaintValue.intervalMeterTypeId"/>
<condition-expr field-name="statusId" operator="not-equals" value="FAM_CANCELLED"/>
</condition-list>
</entity-condition>
@@ -383,14 +383,14 @@
<now-timestamp-to-env env-name="nowTimestamp"/>
<entity-condition list="fixedAssets" entity-name="FixedAsset">
<condition-list combine="and">
- <condition-expr field-name="instanceOfProductId" operator="not-equals" env-name="null"/>
- <condition-expr field-name="actualEndOfLife" operator="equals" env-name="null"/>
+ <condition-expr field-name="instanceOfProductId" operator="not-equals" from-field="null"/>
+ <condition-expr field-name="actualEndOfLife" operator="equals" from-field="null"/>
</condition-list>
</entity-condition>
<iterate list="fixedAssets" entry="fixedAsset">
<entity-condition list="productMaints" entity-name="ProductMaint">
<condition-list combine="and">
- <condition-expr field-name="productId" env-name="fixedAsset.instanceOfProductId"/>
+ <condition-expr field-name="productId" from-field="fixedAsset.instanceOfProductId"/>
<condition-expr field-name="intervalUomId" operator="like" value="TF_%"/>
</condition-list>
</entity-condition>
@@ -398,9 +398,9 @@
<set field="repeatCount" from-field="productMaint.repeatCount" default-value="0" type="Long"/>
<entity-condition list="maintList" entity-name="FixedAssetMaintWorkEffort">
<condition-list combine="and">
- <condition-expr field-name="fixedAssetId" operator="equals" env-name="fixedAsset.fixedAssetId"/>
- <condition-expr field-name="productMaintTypeId" operator="equals" env-name="productMaint.productMaintTypeId"/>
- <condition-expr field-name="intervalUomId" operator="equals" env-name="productMaint.intervalUomId"/>
+ <condition-expr field-name="fixedAssetId" operator="equals" from-field="fixedAsset.fixedAssetId"/>
+ <condition-expr field-name="productMaintTypeId" operator="equals" from-field="productMaint.productMaintTypeId"/>
+ <condition-expr field-name="intervalUomId" operator="equals" from-field="productMaint.intervalUomId"/>
<condition-expr field-name="statusId" operator="not-equals" value="FAM_CANCELLED"/>
</condition-list>
<order-by field-name="maintHistSeqId"/>
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=730120&r1=730119&r2=730120&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml Tue Dec 30 04:18:38 2008
@@ -153,7 +153,7 @@
<!-- get all AcctgTransEntry for this trans, for each if debit add to debits total if credit add to credits total -->
<entity-condition entity-name="AcctgTransEntry" list="acctgTransEntryList">
- <condition-expr field-name="acctgTransId" env-name="parameters.acctgTransId"/>
+ <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>
@@ -219,7 +219,7 @@
</if-compare>
<entity-condition entity-name="AcctgTransEntry" list="acctgTransEntryList">
- <condition-expr field-name="acctgTransId" env-name="parameters.acctgTransId"/>
+ <condition-expr field-name="acctgTransId" from-field="parameters.acctgTransId"/>
<order-by field-name="acctgTransEntrySeqId"/>
</entity-condition>
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=730120&r1=730119&r2=730120&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Tue Dec 30 04:18:38 2008
@@ -357,9 +357,9 @@
</call-class-method>
<entity-condition entity-name="Invoice" list="invoices">
<condition-list combine="and">
- <condition-expr field-name="invoiceTypeId" operator="equals" env-name="parameters.invoiceTypeId"/>
- <condition-expr field-name="partyId" operator="equals" env-name="parameters.partyId" ignore-if-empty="true"/>
- <condition-expr field-name="partyIdFrom" operator="equals" env-name="parameters.partyIdFrom" ignore-if-empty="true"/>
+ <condition-expr field-name="invoiceTypeId" operator="equals" from-field="parameters.invoiceTypeId"/>
+ <condition-expr field-name="partyId" operator="equals" from-field="parameters.partyId" ignore-if-empty="true"/>
+ <condition-expr field-name="partyIdFrom" operator="equals" from-field="parameters.partyIdFrom" ignore-if-empty="true"/>
<condition-expr field-name="statusId" operator="not-equals" value="INVOICE_CANCELLED"/>
<condition-expr field-name="statusId" operator="not-equals" value="INVOICE_PAID"/>
</condition-list>
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=730120&r1=730119&r2=730120&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml Tue Dec 30 04:18:38 2008
@@ -167,7 +167,7 @@
<log level="info" message="parameters: ${parameters}"/>
<entity-condition entity-name="ContentAssocViewTo" use-cache="false" list="unfilteredList">
<condition-list combine="and">
- <condition-expr field-name="contentIdStart" operator="equals" env-name="parameters.contentId"/>
+ <condition-expr field-name="contentIdStart" operator="equals" from-field="parameters.contentId"/>
<condition-expr field-name="caContentAssocTypeId" operator="equals" value="PUBLISH_LINK"/>
<condition-expr field-name="caThruDate" operator="equals" value=""/>
</condition-list>
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=730120&r1=730119&r2=730120&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml Tue Dec 30 04:18:38 2008
@@ -31,7 +31,7 @@
<if-empty field="parameters.contentRevisionSeqId">
<entity-condition entity-name="ContentRevision" list="contentRevisionList">
<condition-list>
- <condition-expr field-name="contentId" operator="equals" env-name="parameters.instanceOfContentId"/>
+ <condition-expr field-name="contentId" operator="equals" from-field="parameters.instanceOfContentId"/>
</condition-list>
<order-by field-name="-contentRevisionSeqId"/>
</entity-condition>
@@ -111,10 +111,10 @@
<log message="genInstanceChildCompDocs 1> thisInstanceContentId: ${thisInstanceContentId}" level="info"/>
<entity-condition entity-name="ContentAssoc" list="contentAssocList">
<condition-list combine="and">
- <condition-expr field-name="contentIdTo" operator="equals" env-name="thisTemplateContentId"/>
+ <condition-expr field-name="contentIdTo" operator="equals" from-field="thisTemplateContentId"/>
<condition-expr field-name="contentAssocTypeId" operator="equals" value="COMPDOC_PART"/>
<condition-list combine="or">
- <condition-expr field-name="thruDate" operator="greater" env-name="nowTimestamp"/>
+ <condition-expr field-name="thruDate" operator="greater" from-field="nowTimestamp"/>
<condition-expr field-name="thruDate" operator="equals" value=""/>
</condition-list>
</condition-list>
@@ -393,7 +393,7 @@
<!-- Methods for ContentRevision and ContentRevisionItem -->
<simple-method method-name="persistContentRevisionAndItem" short-description="Update ContentRevision and ContentRevisionItem">
<entity-condition entity-name="ContentRevision" list="contentRevisionList">
- <condition-expr field-name="contentId" operator="equals" env-name="parameters.contentId"/>
+ <condition-expr field-name="contentId" operator="equals" from-field="parameters.contentId"/>
<order-by field-name="contentRevisionSeqId DESC"/>
</entity-condition>
<log level="info" message="contentRevisionList: ${contentRevisionList}"/>
@@ -445,9 +445,9 @@
<simple-method method-name="getRevisionDataResource" short-description="Get version of DataResource that fits overall revision">
<entity-condition entity-name="ContentRevisionItem" list="contentRevisionItems" use-cache="true">
<condition-list combine="and">
- <condition-expr field-name="contentId" env-name="parameters.contentId" operator="equals"/>
- <condition-expr field-name="itemContentId" env-name="parameters.itemContentId" operator="equals"/>
- <condition-expr field-name="contentRevisionSeqId" env-name="parameters.contentRevisionSeqId" operator="less-equals"/>
+ <condition-expr field-name="contentId" from-field="parameters.contentId" operator="equals"/>
+ <condition-expr field-name="itemContentId" from-field="parameters.itemContentId" operator="equals"/>
+ <condition-expr field-name="contentRevisionSeqId" from-field="parameters.contentRevisionSeqId" operator="less-equals"/>
</condition-list>
<order-by field-name="-contentRevisionSeqId"/>
</entity-condition>
@@ -530,8 +530,8 @@
-->
<entity-condition entity-name="MaxContentApprovalView" list="instanceApprovalList" use-cache="false">
<condition-list>
- <condition-expr field-name="contentId" env-name="parameters.rootContentId" operator="equals"/>
- <condition-expr field-name="contentRevisionSeqId" env-name="parameters.contentRevisionSeqId" operator="less-equals"/>
+ <condition-expr field-name="contentId" from-field="parameters.rootContentId" operator="equals"/>
+ <condition-expr field-name="contentRevisionSeqId" from-field="parameters.contentRevisionSeqId" operator="less-equals"/>
</condition-list>
<select-field field-name="contentId"/>
<select-field field-name="partyId"/>
@@ -547,10 +547,10 @@
<log level="info" message="maxContentApproval: ${maxContentApproval}"/>
<entity-condition entity-name="ContentApproval" list="contentApprovalList2" use-cache="false">
<condition-list>
- <condition-expr field-name="contentId" env-name="maxContentApproval.contentId" operator="equals"/>
- <condition-expr field-name="contentRevisionSeqId" env-name="maxContentApproval.maxContentRevisionSeqId" operator="equals"/>
- <condition-expr field-name="partyId" env-name="maxContentApproval.partyId" operator="equals" ignore-if-empty="true"/>
- <condition-expr field-name="roleTypeId" env-name="maxContentApproval.roleTypeId" operator="equals" ignore-if-empty="true"/>
+ <condition-expr field-name="contentId" from-field="maxContentApproval.contentId" operator="equals"/>
+ <condition-expr field-name="contentRevisionSeqId" from-field="maxContentApproval.maxContentRevisionSeqId" operator="equals"/>
+ <condition-expr field-name="partyId" from-field="maxContentApproval.partyId" operator="equals" ignore-if-empty="true"/>
+ <condition-expr field-name="roleTypeId" from-field="maxContentApproval.roleTypeId" operator="equals" ignore-if-empty="true"/>
</condition-list>
<order-by field-name="-sequenceNum"/>
</entity-condition>
@@ -577,7 +577,7 @@
<log level="info" message="cloneTemplateContentApprovals-parameters: ${parameters}"/>
<entity-condition entity-name="MaxContentApprovalView" list="maxContentApprovalList">
<condition-list combine="and">
- <condition-expr field-name="contentId" operator="equals" env-name="parameters.contentId"/>
+ <condition-expr field-name="contentId" operator="equals" from-field="parameters.contentId"/>
</condition-list>
<select-field field-name="maxContentRevisionSeqId"/>
<select-field field-name="contentId"/>
@@ -615,8 +615,8 @@
<!-- get previous list of ContentApproval -->
<entity-condition entity-name="MaxContentApprovalView" list="maxContentApprovalList">
<condition-list combine="and">
- <condition-expr field-name="contentId" operator="equals" env-name="thisContentId"/>
- <condition-expr field-name="contentRevisionSeqId" operator="less" env-name="thisContentRevisionSeqId" ignore-if-null="true"/>
+ <condition-expr field-name="contentId" operator="equals" from-field="thisContentId"/>
+ <condition-expr field-name="contentRevisionSeqId" operator="less" from-field="thisContentRevisionSeqId" ignore-if-null="true"/>
</condition-list>
<select-field field-name="maxContentRevisionSeqId"/>
<select-field field-name="contentId"/>
@@ -635,7 +635,7 @@
<log level="info" message="rootTemplateContentId 0aa: ${rootTemplateContentId}"/>
<entity-condition entity-name="ContentRevision" list="templateContentRevisionList" use-cache="true">
<condition-list>
- <condition-expr field-name="contentId" env-name="rootTemplateContentId" operator="equals"/>
+ <condition-expr field-name="contentId" from-field="rootTemplateContentId" operator="equals"/>
</condition-list>
<order-by field-name="-contentRevisionSeqId"/>
</entity-condition>
@@ -727,7 +727,7 @@
<log level="info" message="rootTemplateContentId 0aa: ${rootTemplateContentId}"/>
<entity-condition entity-name="ContentRevision" list="templateContentRevisionList" use-cache="true">
<condition-list>
- <condition-expr field-name="contentId" env-name="rootTemplateContentId" operator="equals"/>
+ <condition-expr field-name="contentId" from-field="rootTemplateContentId" operator="equals"/>
</condition-list>
<order-by field-name="-contentRevisionSeqId"/>
</entity-condition>
@@ -742,10 +742,10 @@
<!-- look for this entity in newly created entities -->
<entity-condition entity-name="ContentApproval" list="newContentApprovalList">
<condition-list combine="and">
- <condition-expr field-name="contentId" operator="equals" env-name="thisContentId"/>
- <condition-expr field-name="contentRevisionSeqId" operator="equals" env-name="thisContentRevisionSeqId"/>
- <condition-expr field-name="partyId" operator="equals" env-name="templateContentApproval.partyId" ignore-if-empty="true"/>
- <condition-expr field-name="roleTypeId" operator="equals" env-name="templateContentApproval.roleTypeId" ignore-if-empty="true"/>
+ <condition-expr field-name="contentId" operator="equals" from-field="thisContentId"/>
+ <condition-expr field-name="contentRevisionSeqId" operator="equals" from-field="thisContentRevisionSeqId"/>
+ <condition-expr field-name="partyId" operator="equals" from-field="templateContentApproval.partyId" ignore-if-empty="true"/>
+ <condition-expr field-name="roleTypeId" operator="equals" from-field="templateContentApproval.roleTypeId" ignore-if-empty="true"/>
</condition-list>
</entity-condition>
<if-empty field="newContentApprovalList">
@@ -779,11 +779,11 @@
<now-timestamp-to-env env-name="nowTimestamp"/>
<entity-condition entity-name="ContentRole" list="contentRoleList">
<condition-list combine="and">
- <condition-expr field-name="contentId" env-name="contentId" operator="equals"/>
- <condition-expr field-name="partyId" env-name="partyId" operator="equals"/>
- <condition-expr field-name="fromDate" env-name="nowTimestamp" operator="less-equals"/>
+ <condition-expr field-name="contentId" from-field="contentId" operator="equals"/>
+ <condition-expr field-name="partyId" from-field="partyId" operator="equals"/>
+ <condition-expr field-name="fromDate" from-field="nowTimestamp" operator="less-equals"/>
<condition-list combine="or">
- <condition-expr field-name="thruDate" env-name="nowTimestamp" operator="greater"/>
+ <condition-expr field-name="thruDate" from-field="nowTimestamp" operator="greater"/>
<condition-expr field-name="thruDate" value="" operator="equals"/>
</condition-list>
</condition-list>
@@ -887,11 +887,11 @@
<!-- find approvals belonging to roles that the user has or to the user -->
<entity-condition entity-name="MaxContentApprovalView" list="compdocApprovalList" use-cache="false">
<condition-list>
- <condition-expr field-name="contentRevisionSeqId" env-name="parameters.contentRevisionSeqId" operator="less-equals" ignore-if-empty="true"/>
+ <condition-expr field-name="contentRevisionSeqId" from-field="parameters.contentRevisionSeqId" operator="less-equals" ignore-if-empty="true"/>
<condition-expr field-name="contentTypeId" operator="equals" value="COMPDOC_INSTANCE"/>
<condition-list combine="or">
- <condition-expr field-name="partyId" operator="equals" env-name="partyId"/>
- <condition-expr field-name="roleTypeId" operator="in" env-name="roles"/>
+ <condition-expr field-name="partyId" operator="equals" from-field="partyId"/>
+ <condition-expr field-name="roleTypeId" operator="in" from-field="roles"/>
</condition-list>
</condition-list>
<select-field field-name="contentId"/>
@@ -906,10 +906,10 @@
<log level="info" message="maxContentApproval: ${maxContentApproval}"/>
<entity-condition entity-name="ContentApproval" list="contentApprovalList2" use-cache="false">
<condition-list>
- <condition-expr field-name="contentId" env-name="maxContentApproval.contentId" operator="equals"/>
- <condition-expr field-name="contentRevisionSeqId" env-name="maxContentApproval.maxContentRevisionSeqId" operator="equals"/>
- <condition-expr field-name="partyId" env-name="maxContentApproval.partyId" operator="equals" ignore-if-empty="true"/>
- <condition-expr field-name="roleTypeId" env-name="maxContentApproval.roleTypeId" operator="equals" ignore-if-empty="true"/>
+ <condition-expr field-name="contentId" from-field="maxContentApproval.contentId" operator="equals"/>
+ <condition-expr field-name="contentRevisionSeqId" from-field="maxContentApproval.maxContentRevisionSeqId" operator="equals"/>
+ <condition-expr field-name="partyId" from-field="maxContentApproval.partyId" operator="equals" ignore-if-empty="true"/>
+ <condition-expr field-name="roleTypeId" from-field="maxContentApproval.roleTypeId" operator="equals" ignore-if-empty="true"/>
</condition-list>
<order-by field-name="-sequenceNum"/>
</entity-condition>
@@ -924,7 +924,7 @@
<!-- find the entries that match the user's partyId or associated roleTypes -->
<entity-condition entity-name="ContentApproval" list="contentApprovalList">
<condition-list combine="and">
- <condition-expr field-name="contentApprovalId" operator="in" env-name="contentApprovalIdList"/>
+ <condition-expr field-name="contentApprovalId" operator="in" from-field="contentApprovalIdList"/>
<condition-expr field-name="approvalStatusId" operator="equals" value="CNTAP_READY"/>
</condition-list>
</entity-condition>
@@ -934,7 +934,7 @@
<simple-method method-name="getMostRecentRevision" short-description="Look for most recent revision for contentId">
<entity-condition entity-name="ContentRevision" list="contentRevisions" use-cache="true">
<condition-list combine="and">
- <condition-expr field-name="contentId" env-name="parameters.contentId" operator="equals"/>
+ <condition-expr field-name="contentId" from-field="parameters.contentId" operator="equals"/>
</condition-list>
<order-by field-name="-contentRevisionSeqId"/>
</entity-condition>
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=730120&r1=730119&r2=730120&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml Tue Dec 30 04:18:38 2008
@@ -1155,9 +1155,9 @@
<set field="useCache" from-field="parameters.useCache" default-value="true" type="Boolean" />
<entity-condition list="viewList" entity-name="ContentAssocViewTo" filter-by-date="${filterByDate}" use-cache="${useCache}">
<condition-list combine="and">
- <condition-expr field-name="contentIdStart" env-name="parameters.contentId"/>
- <condition-expr field-name="caContentAssocTypeId" env-name="parameters.contentAssocTypeId" ignore-if-empty="true"/>
- <condition-expr field-name="caMapKey" env-name="parameters.mapKey" ignore-if-empty="true"/>
+ <condition-expr field-name="contentIdStart" from-field="parameters.contentId"/>
+ <condition-expr field-name="caContentAssocTypeId" from-field="parameters.contentAssocTypeId" ignore-if-empty="true"/>
+ <condition-expr field-name="caMapKey" from-field="parameters.mapKey" ignore-if-empty="true"/>
</condition-list>
</entity-condition>
@@ -1203,9 +1203,9 @@
<iterate entry="view" list="subContentList">
<entity-condition list="viewList" entity-name="ContentAssocViewTo" filter-by-date="true" use-cache="${useCache}">
<condition-list combine="and">
- <condition-expr field-name="contentIdStart" env-name="view.caContentIdTo"/>
- <condition-expr field-name="caContentAssocTypeId" env-name="parameters.subContentAssocTypeId" ignore-if-empty="true"/>
- <condition-expr field-name="caMapKey" env-name="parameters.subMapKey" ignore-if-empty="true"/>
+ <condition-expr field-name="contentIdStart" from-field="view.caContentIdTo"/>
+ <condition-expr field-name="caContentAssocTypeId" from-field="parameters.subContentAssocTypeId" ignore-if-empty="true"/>
+ <condition-expr field-name="caMapKey" from-field="parameters.subMapKey" ignore-if-empty="true"/>
</condition-list>
</entity-condition>
<clear-field field="view2"/>
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=730120&r1=730119&r2=730120&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/ContentPermissionServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/ContentPermissionServices.xml Tue Dec 30 04:18:38 2008
@@ -454,8 +454,8 @@
<!-- find defined purpose/operation mappings -->
<entity-condition entity-name="ContentPurposeOperation" list="operations">
<condition-list combine="and">
- <condition-expr field-name="contentPurposeTypeId" operator="equals" env-name="contentPurposeTypeId"/>
- <condition-expr field-name="contentOperationId" operator="equals" env-name="contentOperationId"/>
+ <condition-expr field-name="contentPurposeTypeId" operator="equals" from-field="contentPurposeTypeId"/>
+ <condition-expr field-name="contentOperationId" operator="equals" from-field="contentOperationId"/>
</condition-list>
</entity-condition>
</then>
@@ -467,8 +467,8 @@
<iterate entry="currentPurpose" list="contentPurposes">
<entity-condition entity-name="ContentPurposeOperation" list="currentOperations">
<condition-list combine="and">
- <condition-expr field-name="contentPurposeTypeId" operator="equals" env-name="currentPurpose.contentPurposeTypeId"/>
- <condition-expr field-name="contentOperationId" operator="equals" env-name="contentOperationId"/>
+ <condition-expr field-name="contentPurposeTypeId" operator="equals" from-field="currentPurpose.contentPurposeTypeId"/>
+ <condition-expr field-name="contentOperationId" operator="equals" from-field="contentOperationId"/>
</condition-list>
<order-by field-name="contentPurposeTypeId"/>
</entity-condition>
@@ -480,7 +480,7 @@
<entity-condition entity-name="ContentPurposeOperation" list="operations">
<condition-list combine="and">
<condition-expr field-name="contentPurposeTypeId" operator="equals" value="_NA_"/>
- <condition-expr field-name="contentOperationId" operator="equals" env-name="contentOperationId"/>
+ <condition-expr field-name="contentOperationId" operator="equals" from-field="contentOperationId"/>
</condition-list>
<order-by field-name="contentPurposeTypeId"/>
</entity-condition>
Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml?rev=730120&r1=730119&r2=730120&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml (original)
+++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml Tue Dec 30 04:18:38 2008
@@ -42,7 +42,7 @@
<if-empty field="routingGS">
<entity-condition entity-name="ProductAssoc" list="virtualProductAssocList" filter-by-date="true">
<condition-list combine="and">
- <condition-expr field-name="productIdTo" env-name="parameters.productId" />
+ <condition-expr field-name="productIdTo" from-field="parameters.productId" />
<condition-expr field-name="productAssocTypeId" value="PRODUCT_VARIANT" />
</condition-list>
</entity-condition>
@@ -67,7 +67,7 @@
<if-empty field="routingGS">
<entity-condition entity-name="ProductAssoc" list="virtualProductAssocList">
<condition-list combine="and">
- <condition-expr field-name="productIdTo" env-name="parameters.productId" />
+ <condition-expr field-name="productIdTo" from-field="parameters.productId" />
<condition-expr field-name="productAssocTypeId" value="PRODUCT_VARIANT" />
</condition-list>
</entity-condition>
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=730120&r1=730119&r2=730120&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 04:18:38 2008
@@ -191,9 +191,9 @@
<!-- look up the last ContactListPartyStatus with statusId=CLPT_PENDING -->
<entity-condition entity-name="ContactListPartyStatus" list="lastContactListPartyStatusList">
<condition-list combine="and">
- <condition-expr field-name="contactListId" env-name="parameters.contactListId"/>
- <condition-expr field-name="partyId" env-name="parameters.partyId"/>
- <condition-expr field-name="fromDate" env-name="parameters.fromDate"/>
+ <condition-expr field-name="contactListId" from-field="parameters.contactListId"/>
+ <condition-expr field-name="partyId" from-field="parameters.partyId"/>
+ <condition-expr field-name="fromDate" from-field="parameters.fromDate"/>
<condition-expr field-name="statusId" value="CLPT_PENDING"/>
</condition-list>
<order-by field-name="-statusDate"/>
@@ -250,9 +250,9 @@
<!-- look up the last ContactListPartyStatus with statusId=CLPT_PENDING -->
<entity-condition entity-name="ContactListPartyStatus" list="lastContactListPartyStatusList">
<condition-list combine="and">
- <condition-expr field-name="contactListId" env-name="parameters.contactListId"/>
- <condition-expr field-name="partyId" env-name="parameters.partyId"/>
- <condition-expr field-name="fromDate" env-name="parameters.fromDate"/>
+ <condition-expr field-name="contactListId" from-field="parameters.contactListId"/>
+ <condition-expr field-name="partyId" from-field="parameters.partyId"/>
+ <condition-expr field-name="fromDate" from-field="parameters.fromDate"/>
<condition-expr field-name="statusId" value="CLPT_PENDING"/>
</condition-list>
<order-by field-name="-statusDate"/>
Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml?rev=730120&r1=730119&r2=730120&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml Tue Dec 30 04:18:38 2008
@@ -163,22 +163,22 @@
<now-timestamp-to-env env-name="nowTimestamp"/>
<entity-condition entity-name="SegmentGroupViewRelatedParties" list="segmentGroupViewRelatedPartiesList">
<condition-list combine="and">
- <condition-expr field-name="partyId" env-name="parameters.partyId"/>
- <condition-expr field-name="roleTypeId" env-name="parameters.roleTypeId" ignore-if-empty="true"/>
- <condition-expr field-name="toPartyId" env-name="parameters.toPartyId"/>
- <condition-expr field-name="toRoleTypeId" env-name="parameters.toRoleTypeId" ignore-if-empty="true"/>
+ <condition-expr field-name="partyId" from-field="parameters.partyId"/>
+ <condition-expr field-name="roleTypeId" from-field="parameters.roleTypeId" ignore-if-empty="true"/>
+ <condition-expr field-name="toPartyId" from-field="parameters.toPartyId"/>
+ <condition-expr field-name="toRoleTypeId" from-field="parameters.toRoleTypeId" ignore-if-empty="true"/>
</condition-list>
</entity-condition>
<!--
<entity-condition entity-name="SegmentGroupViewRelatedPartiesClass" list="segmentGroupViewRelatedPartiesClassList">
<condition-list combine="and">
- <condition-expr field-name="partyId" env-name="parameters.partyId"/>
- <condition-expr field-name="roleTypeId" env-name="parameters.roleTypeId" ignore-if-empty="true"/>
- <condition-expr field-name="toPartyId" env-name="parameters.toPartyId"/>
- <condition-expr field-name="toFromDate" operator="less-equals" env-name="nowTimestamp"/>
+ <condition-expr field-name="partyId" from-field="parameters.partyId"/>
+ <condition-expr field-name="roleTypeId" from-field="parameters.roleTypeId" ignore-if-empty="true"/>
+ <condition-expr field-name="toPartyId" from-field="parameters.toPartyId"/>
+ <condition-expr field-name="toFromDate" operator="less-equals" from-field="nowTimestamp"/>
<condition-list combine="or">
- <condition-expr field-name="toThruDate" operator="equals" env-name="nullField"/>
- <condition-expr field-name="toThruDate" operator="greater-equals" env-name="nowTimestamp"/>
+ <condition-expr field-name="toThruDate" operator="equals" from-field="nullField"/>
+ <condition-expr field-name="toThruDate" operator="greater-equals" from-field="nowTimestamp"/>
</condition-list>
</condition-list>
</entity-condition>
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=730120&r1=730119&r2=730120&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 04:18:38 2008
@@ -140,14 +140,14 @@
<if-compare field="parameters.statusId" value="RETURN_ACCEPTED" operator="equals">
<!-- get the list of ReturnItems. Note: return may be associated with many different orders -->
<entity-condition entity-name="ReturnItem" list="returnItems" distinct="true">
- <condition-expr field-name="returnId" env-name="returnHeader.returnId"/>
+ <condition-expr field-name="returnId" from-field="returnHeader.returnId"/>
</entity-condition>
<!-- this block is for debugging and can be removed later -->
<!--
<log level="verbose" message="Items and adjustments for return ${returnHeader.returnId}"/>
<entity-condition entity-name="ReturnAdjustment" list="returnAdjustments" distinct="true">
- <condition-expr field-name="returnId" operator="equals" env-name="returnHeader.returnId"/>
+ <condition-expr field-name="returnId" operator="equals" from-field="returnHeader.returnId"/>
</entity-condition>
<iterate entry="returnItem" list="returnItems">
<log level="verbose" message="item: ${returnItem.returnItemSeqId} ${returnItem.returnItemTypeId} [${returnItem.description}] ${returnItem.productId} ${returnItem.returnQuantity} ${returnItem.returnPrice}"/>
@@ -664,8 +664,8 @@
<!-- find the bill to customer; for return's fromPartyId -->
<entity-condition entity-name="OrderRole" list="orderRoles">
<condition-list combine="and">
- <condition-expr field-name="orderId" operator="equals" env-name="orderHeader.orderId"/>
- <condition-expr field-name="roleTypeId" operator="equals" env-name="roleTypeId"/>
+ <condition-expr field-name="orderId" operator="equals" from-field="orderHeader.orderId"/>
+ <condition-expr field-name="roleTypeId" operator="equals" from-field="roleTypeId"/>
</condition-list>
</entity-condition>
<first-from-list entry="orderRole" list="orderRoles"/>
@@ -697,7 +697,7 @@
<!-- get the available to return order items -->
<entity-condition entity-name="OrderItem" list="orderItems">
<condition-list combine="and">
- <condition-expr field-name="orderId" operator="equals" env-name="orderHeader.orderId"/>
+ <condition-expr field-name="orderId" operator="equals" from-field="orderHeader.orderId"/>
<condition-expr field-name="statusId" operator="equals" value="ITEM_COMPLETED"/>
</condition-list>
</entity-condition>
@@ -778,7 +778,7 @@
<!-- create a return adjustment for all order adjustments not attached to a particular orderItem (orderItemSeqId = "_NA_") -->
<entity-condition entity-name="OrderAdjustment" list="orderAdjustments">
<condition-list combine="and">
- <condition-expr field-name="orderId" operator="equals" env-name="orderHeader.orderId"/>
+ <condition-expr field-name="orderId" operator="equals" from-field="orderHeader.orderId"/>
<condition-expr field-name="orderItemSeqId" operator="equals" value="_NA_"/>
</condition-list>
</entity-condition>
@@ -788,7 +788,7 @@
<set from-field="returnId" field="returnAdjCtx.returnId"/>
<!--filter out orderAdjustment that have been returned-->
<entity-count entity-name="ReturnAdjustment" count-name="returnCount">
- <condition-expr field-name="orderAdjustmentId" operator="equals" env-name="orderAdjustment.orderAdjustmentId"/>
+ <condition-expr field-name="orderAdjustmentId" operator="equals" from-field="orderAdjustment.orderAdjustmentId"/>
</entity-count>
<if-compare field="returnCount" value="0" operator="equals">
<log level="info" message="Create new return adjustment: ${returnAdjCtx}"/>
@@ -873,7 +873,7 @@
<check-permission permission="ORDERMGR" action="_UPDATE"><fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunCancelReturnItems"/></check-permission>
<check-errors/>
<entity-condition entity-name="ReturnItem" list="returnItems" distinct="true">
- <condition-expr field-name="returnId" operator="equals" env-name="parameters.returnId"/>
+ <condition-expr field-name="returnId" operator="equals" from-field="parameters.returnId"/>
</entity-condition>
<iterate entry="returnItem" list="returnItems">
<set field="returnItemMap.returnId" from-field="parameters.returnId"/>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=730120&r1=730119&r2=730120&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml Tue Dec 30 04:18:38 2008
@@ -57,12 +57,12 @@
<entity-condition entity-name="OrderHeaderAndRoleSummary" list="orderInfoList">
<condition-list combine="and">
- <condition-expr field-name="partyId" operator="equals" env-name="parameters.partyId"/>
- <condition-expr field-name="roleTypeId" operator="equals" env-name="parameters.roleTypeId"/>
- <condition-expr field-name="orderTypeId" operator="equals" env-name="parameters.orderTypeId"/>
- <condition-expr field-name="statusId" operator="equals" env-name="parameters.statusId"/>
- <condition-expr field-name="orderDate" operator="greater-equals" env-name="parameters.fromDate" ignore-if-null="true"/>
- <condition-expr field-name="orderDate" operator="less-equals" env-name="parameters.thruDate" ignore-if-null="true"/>
+ <condition-expr field-name="partyId" operator="equals" from-field="parameters.partyId"/>
+ <condition-expr field-name="roleTypeId" operator="equals" from-field="parameters.roleTypeId"/>
+ <condition-expr field-name="orderTypeId" operator="equals" from-field="parameters.orderTypeId"/>
+ <condition-expr field-name="statusId" operator="equals" from-field="parameters.statusId"/>
+ <condition-expr field-name="orderDate" operator="greater-equals" from-field="parameters.fromDate" ignore-if-null="true"/>
+ <condition-expr field-name="orderDate" operator="less-equals" from-field="parameters.thruDate" ignore-if-null="true"/>
</condition-list>
<select-field field-name="partyId"/>
<select-field field-name="roleTypeId"/>
@@ -358,9 +358,9 @@
<!-- Retrieve and total the quantities of existing requirements for the product/facility -->
<entity-condition entity-name="Requirement" list="requirements">
<condition-list combine="and">
- <condition-expr field-name="productId" operator="equals" env-name="parameters.productId"/>
+ <condition-expr field-name="productId" operator="equals" from-field="parameters.productId"/>
<condition-expr field-name="requirementTypeId" operator="equals" value="PRODUCT_REQUIREMENT"/>
- <condition-expr field-name="facilityId" operator="equals" env-name="productFacility.facilityId"/>
+ <condition-expr field-name="facilityId" operator="equals" from-field="productFacility.facilityId"/>
<condition-expr field-name="statusId" operator="not-equals" value="REQ_ORDERED"/>
<condition-expr field-name="statusId" operator="not-equals" value="REQ_REJECTED"/>
</condition-list>
@@ -869,9 +869,9 @@
<set field="zeroEnv" value="0" type="Double"/>
<entity-condition entity-name="OrderItemShipGrpInvRes" list="orderItemShipGrpInvResList">
<condition-list combine="and">
- <condition-expr field-name="orderId" env-name="parameters.orderId"/>
- <condition-expr field-name="quantityNotAvailable" operator="not-equals" env-name="nullField"/>
- <condition-expr field-name="quantityNotAvailable" operator="greater" env-name="zeroEnv"/>
+ <condition-expr field-name="orderId" from-field="parameters.orderId"/>
+ <condition-expr field-name="quantityNotAvailable" operator="not-equals" from-field="nullField"/>
+ <condition-expr field-name="quantityNotAvailable" operator="greater" from-field="zeroEnv"/>
</condition-list>
</entity-condition>
<if-empty field="orderItemShipGrpInvResList">
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml?rev=730120&r1=730119&r2=730120&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml Tue Dec 30 04:18:38 2008
@@ -72,8 +72,8 @@
<if-not-empty field="requirement.productId">
<entity-condition entity-name="SupplierProduct" list="supplierProducts">
<condition-list>
- <condition-expr field-name="productId" env-name="requirement.productId"/>
- <condition-expr field-name="minimumOrderQuantity" env-name="requirement.quantity" operator="less-equals"/>
+ <condition-expr field-name="productId" from-field="requirement.productId"/>
+ <condition-expr field-name="minimumOrderQuantity" from-field="requirement.quantity" operator="less-equals"/>
</condition-list>
<order-by field-name="lastPrice"/>
<order-by field-name="supplierPrefOrderId"/>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml?rev=730120&r1=730119&r2=730120&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml Tue Dec 30 04:18:38 2008
@@ -183,7 +183,7 @@
<simple-method method-name="addDistinctShoppingListItem"
short-description="Adds a shopping list item if one with the same productId does not exist">
<entity-condition entity-name="ShoppingListItem" list="shoppingListItemList">
- <condition-expr field-name="shoppingListId" env-name="parameters.shoppingListId" />
+ <condition-expr field-name="shoppingListId" from-field="parameters.shoppingListId" />
</entity-condition>
<iterate list="shoppingListItemList" entry="shoppingListItem">
@@ -296,7 +296,7 @@
<entity-condition entity-name="OrderRole" list="orderRoleList">
<condition-list combine="and">
- <condition-expr field-name="orderId" env-name="parameters.orderId" />
+ <condition-expr field-name="orderId" from-field="parameters.orderId" />
<condition-expr field-name="roleTypeId" value="PLACING_CUSTOMER" />
</condition-list>
</entity-condition>
@@ -304,7 +304,7 @@
<entity-condition entity-name="ShoppingList" list="shoppingListList">
<condition-list combine="and">
- <condition-expr field-name="partyId" env-name="orderRole.partyId" />
+ <condition-expr field-name="partyId" from-field="orderRole.partyId" />
<condition-expr field-name="listName" value="Auto Suggestions" />
</condition-list>
</entity-condition>
@@ -322,14 +322,14 @@
</if-empty>
<entity-condition entity-name="OrderItem" list="orderItemList">
- <condition-expr field-name="orderId" env-name="parameters.orderId" />
+ <condition-expr field-name="orderId" from-field="parameters.orderId" />
<order-by field-name="orderItemSeqId" />
</entity-condition>
<iterate list="orderItemList" entry="orderItem">
<if-not-empty field="orderItem.productId">
<entity-condition entity-name="ProductAssoc" list="compProductAssocList" filter-by-date="true">
<condition-list combine="and">
- <condition-expr field-name="productId" env-name="orderItem.productId" />
+ <condition-expr field-name="productId" from-field="orderItem.productId" />
<condition-expr field-name="productAssocTypeId" value="PRODUCT_COMPLEMENT" />
</condition-list>
</entity-condition>
@@ -346,7 +346,7 @@
<if-compare field="product.isVariant" operator="equals" value="Y">
<entity-condition entity-name="ProductAssoc" list="virtualProductAssocList" filter-by-date="true">
<condition-list combine="and">
- <condition-expr field-name="productIdTo" env-name="orderItem.productId" />
+ <condition-expr field-name="productIdTo" from-field="orderItem.productId" />
<condition-expr field-name="productAssocTypeId" value="PRODUCT_VARIANT" />
</condition-list>
</entity-condition>
@@ -354,7 +354,7 @@
<if-not-empty field="virtualProductAssoc">
<entity-condition entity-name="ProductAssoc" list="compProductAssocList" filter-by-date="true">
<condition-list combine="and">
- <condition-expr field-name="productId" env-name="virtualProductAssoc.productId" />
+ <condition-expr field-name="productId" from-field="virtualProductAssoc.productId" />
<condition-expr field-name="productAssocTypeId" value="PRODUCT_COMPLEMENT" />
</condition-list>
</entity-condition>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml?rev=730120&r1=730119&r2=730120&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml Tue Dec 30 04:18:38 2008
@@ -351,8 +351,8 @@
</condition-list>
<condition-expr field-name="statusId" operator="equals" value="COM_IN_PROGRESS" />
<condition-list combine="or">
- <condition-expr field-name="datetimeStarted" operator="less" env-name="nowDate"/>
- <condition-expr field-name="datetimeStarted" operator="equals" env-name="nullField" />
+ <condition-expr field-name="datetimeStarted" operator="less" from-field="nowDate"/>
+ <condition-expr field-name="datetimeStarted" operator="equals" from-field="nullField" />
</condition-list>
</condition-list>
</entity-condition>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=730120&r1=730119&r2=730120&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml Tue Dec 30 04:18:38 2008
@@ -537,15 +537,15 @@
<clear-field field="_inline_PartyRelationshipList"/>
<entity-condition entity-name="PartyRelationship" list="_inline_PartyRelationshipList" use-cache="${useCache}">
<condition-list combine="and">
- <condition-expr field-name="partyIdFrom" env-name="relatedPartyId"/>
- <condition-expr field-name="roleTypeIdFrom" operator="in" env-name="_inline_roleTypeIdFromList" ignore-if-empty="true"/>
- <condition-expr field-name="roleTypeIdTo" operator="in" env-name="_inline_roleTypeIdToList" ignore-if-empty="true"/>
- <condition-expr field-name="partyRelationshipTypeId" env-name="partyRelationshipTypeId" ignore-if-empty="true"/>
+ <condition-expr field-name="partyIdFrom" from-field="relatedPartyId"/>
+ <condition-expr field-name="roleTypeIdFrom" operator="in" from-field="_inline_roleTypeIdFromList" ignore-if-empty="true"/>
+ <condition-expr field-name="roleTypeIdTo" operator="in" from-field="_inline_roleTypeIdToList" ignore-if-empty="true"/>
+ <condition-expr field-name="partyRelationshipTypeId" from-field="partyRelationshipTypeId" ignore-if-empty="true"/>
- <condition-expr field-name="fromDate" operator="less-equals" env-name="nowTimestamp"/>
+ <condition-expr field-name="fromDate" operator="less-equals" from-field="nowTimestamp"/>
<condition-list combine="or">
- <condition-expr field-name="thruDate" operator="equals" env-name="nullField"/>
- <condition-expr field-name="thruDate" operator="greater" env-name="nowTimestamp"/>
+ <condition-expr field-name="thruDate" operator="equals" from-field="nullField"/>
+ <condition-expr field-name="thruDate" operator="greater" from-field="nowTimestamp"/>
</condition-list>
</condition-list>
@@ -570,15 +570,15 @@
<clear-field field="_inline_PartyRelationshipList"/>
<entity-condition entity-name="PartyRelationship" list="_inline_PartyRelationshipList" use-cache="${useCache}">
<condition-list combine="and">
- <condition-expr field-name="partyIdTo" env-name="relatedPartyId"/>
- <condition-expr field-name="roleTypeIdTo" operator="in" env-name="_inline_roleTypeIdFromList" ignore-if-empty="true"/>
- <condition-expr field-name="roleTypeIdFrom" operator="in" env-name="_inline_roleTypeIdToList" ignore-if-empty="true"/>
- <condition-expr field-name="partyRelationshipTypeId" env-name="partyRelationshipTypeId" ignore-if-empty="true"/>
+ <condition-expr field-name="partyIdTo" from-field="relatedPartyId"/>
+ <condition-expr field-name="roleTypeIdTo" operator="in" from-field="_inline_roleTypeIdFromList" ignore-if-empty="true"/>
+ <condition-expr field-name="roleTypeIdFrom" operator="in" from-field="_inline_roleTypeIdToList" ignore-if-empty="true"/>
+ <condition-expr field-name="partyRelationshipTypeId" from-field="partyRelationshipTypeId" ignore-if-empty="true"/>
- <condition-expr field-name="fromDate" operator="less-equals" env-name="nowTimestamp"/>
+ <condition-expr field-name="fromDate" operator="less-equals" from-field="nowTimestamp"/>
<condition-list combine="or">
- <condition-expr field-name="thruDate" operator="equals" env-name="nullField"/>
- <condition-expr field-name="thruDate" operator="greater" env-name="nowTimestamp"/>
+ <condition-expr field-name="thruDate" operator="equals" from-field="nullField"/>
+ <condition-expr field-name="thruDate" operator="greater" from-field="nowTimestamp"/>
</condition-list>
</condition-list>
@@ -630,7 +630,7 @@
<clear-field field="_inline_RoleTypeList"/>
<entity-condition entity-name="RoleType" list="_inline_RoleTypeList" use-cache="true">
- <condition-expr field-name="parentTypeId" operator="equals" env-name="roleTypeId"/>
+ <condition-expr field-name="parentTypeId" operator="equals" from-field="roleTypeId"/>
</entity-condition>
<iterate entry="newRoleType" list="_inline_RoleTypeList">
<if>
@@ -867,7 +867,7 @@
<entity-condition entity-name="PartyContactDetailByPurpose" list="partyContactDetailByPurposes" filter-by-date="true">
<condition-list>
<condition-expr field-name="contactMechPurposeTypeId" operator="equals" value="PRIMARY_EMAIL"/>
- <condition-expr field-name="partyId" operator="equals" env-name="partyId"/>
+ <condition-expr field-name="partyId" operator="equals" from-field="partyId"/>
</condition-list>
</entity-condition>
<first-from-list entry="partyContactDetailByPurpose" list="partyContactDetailByPurposes"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml?rev=730120&r1=730119&r2=730120&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml Tue Dec 30 04:18:38 2008
@@ -795,7 +795,7 @@
<entity-condition list="prodCatalogCategoryList" entity-name="ProdCatalogCategory" filter-by-date="true">
<condition-list combine="and">
- <condition-expr field-name="productCategoryId" env-name="parameters.productCategoryId"/>
+ <condition-expr field-name="productCategoryId" from-field="parameters.productCategoryId"/>
<condition-list combine="or">
<condition-expr field-name="prodCatalogCategoryTypeId" value="PCCT_VIEW_ALLW"/>
<condition-expr field-name="prodCatalogCategoryTypeId" value="PCCT_PURCH_ALLW"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml?rev=730120&r1=730119&r2=730120&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml Tue Dec 30 04:18:38 2008
@@ -332,8 +332,8 @@
<if-empty field="newEntity.fromDate">
<entity-condition entity-name="ProductFeatureAppl" list="productFeatureAppls" filter-by-date="true">
<condition-list combine="and">
- <condition-expr field-name="productId" env-name="newEntity.productId"/>
- <condition-expr field-name="productFeatureId" env-name="newEntity.productFeatureId"/>
+ <condition-expr field-name="productId" from-field="newEntity.productId"/>
+ <condition-expr field-name="productFeatureId" from-field="newEntity.productFeatureId"/>
</condition-list>
<order-by field-name="-fromDate"/>
</entity-condition>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml?rev=730120&r1=730119&r2=730120&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml Tue Dec 30 04:18:38 2008
@@ -34,7 +34,7 @@
<!-- before issuing inventory, check to see if there is inventory information in this database -->
<!-- if inventory info is not available for all of the products, then don't do the issuance, ie there has to be at least SOME inventory info in the database to facilitate inventory-less POS terminals -->
<entity-count entity-name="InventoryItem" count-name="iiCount">
- <condition-expr field-name="facilityId" operator="equals" env-name="orderHeader.originFacilityId"/>
+ <condition-expr field-name="facilityId" operator="equals" from-field="orderHeader.originFacilityId"/>
</entity-count>
<!-- now go through each order item and call a service to issue the inventory -->
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml?rev=730120&r1=730119&r2=730120&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml Tue Dec 30 04:18:38 2008
@@ -83,9 +83,9 @@
<!-- first reserve against InventoryItems in FLT_PICKLOC type locations, then FLT_BULK locations, then InventoryItems with no locations -->
<entity-condition entity-name="InventoryItemAndLocation" list="inventoryItemAndLocations">
<condition-list combine="and">
- <condition-expr field-name="productId" env-name="parameters.productId"/>
- <condition-expr field-name="facilityId" env-name="parameters.facilityId" ignore-if-empty="true" ignore-if-null="true"/>
- <condition-expr field-name="containerId" env-name="parameters.containerId" ignore-if-empty="true" ignore-if-null="true"/>
+ <condition-expr field-name="productId" from-field="parameters.productId"/>
+ <condition-expr field-name="facilityId" from-field="parameters.facilityId" ignore-if-empty="true" ignore-if-null="true"/>
+ <condition-expr field-name="containerId" from-field="parameters.containerId" ignore-if-empty="true" ignore-if-null="true"/>
<condition-expr field-name="quantityOnHandTotal" operator="greater" value="0.0"/>
<condition-expr field-name="locationTypeEnumId" operator="equals" value="FLT_PICKLOC"/>
</condition-list>
@@ -103,9 +103,9 @@
<if-compare field="parameters.quantityNotReserved" operator="greater" value="0" type="Double">
<entity-condition entity-name="InventoryItemAndLocation" list="inventoryItemAndLocations">
<condition-list combine="and">
- <condition-expr field-name="productId" env-name="parameters.productId"/>
- <condition-expr field-name="facilityId" env-name="parameters.facilityId" ignore-if-empty="true" ignore-if-null="true"/>
- <condition-expr field-name="containerId" env-name="parameters.containerId" ignore-if-empty="true" ignore-if-null="true"/>
+ <condition-expr field-name="productId" from-field="parameters.productId"/>
+ <condition-expr field-name="facilityId" from-field="parameters.facilityId" ignore-if-empty="true" ignore-if-null="true"/>
+ <condition-expr field-name="containerId" from-field="parameters.containerId" ignore-if-empty="true" ignore-if-null="true"/>
<condition-expr field-name="quantityOnHandTotal" operator="greater" value="0.0"/>
<condition-expr field-name="locationTypeEnumId" operator="equals" value="FLT_BULK"/>
</condition-list>
@@ -124,11 +124,11 @@
<if-compare field="parameters.quantityNotReserved" operator="greater" value="0" type="Double">
<entity-condition entity-name="InventoryItem" list="inventoryItems">
<condition-list combine="and">
- <condition-expr field-name="productId" env-name="parameters.productId"/>
- <condition-expr field-name="facilityId" env-name="parameters.facilityId" ignore-if-empty="true" ignore-if-null="true"/>
- <condition-expr field-name="containerId" env-name="parameters.containerId" ignore-if-empty="true" ignore-if-null="true"/>
+ <condition-expr field-name="productId" from-field="parameters.productId"/>
+ <condition-expr field-name="facilityId" from-field="parameters.facilityId" ignore-if-empty="true" ignore-if-null="true"/>
+ <condition-expr field-name="containerId" from-field="parameters.containerId" ignore-if-empty="true" ignore-if-null="true"/>
<condition-expr field-name="quantityOnHandTotal" operator="greater" value="0.0"/>
- <condition-expr field-name="locationSeqId" operator="equals" env-name="nullField"/>
+ <condition-expr field-name="locationSeqId" operator="equals" from-field="nullField"/>
</condition-list>
<order-by field-name="${orderByString}"/>
</entity-condition>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml?rev=730120&r1=730119&r2=730120&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml Tue Dec 30 04:18:38 2008
@@ -712,18 +712,18 @@
<entity-condition entity-name="BalanceInventoryItemsView" list="inventoryItems">
<condition-list combine="or">
<condition-list combine="and">
- <condition-expr field-name="productId" operator="equals" env-name="inventoryItem.productId"/>
- <condition-expr field-name="facilityId" operator="equals" env-name="inventoryItem.facilityId"/>
+ <condition-expr field-name="productId" operator="equals" from-field="inventoryItem.productId"/>
+ <condition-expr field-name="facilityId" operator="equals" from-field="inventoryItem.facilityId"/>
<condition-expr field-name="inventoryItemTypeId" operator="equals" value="NON_SERIAL_INV_ITEM"/>
<condition-list combine="or">
- <condition-expr field-name="availableToPromiseTotal" operator="equals" env-name="nullField"/>
+ <condition-expr field-name="availableToPromiseTotal" operator="equals" from-field="nullField"/>
<condition-expr field-name="availableToPromiseTotal" operator="equals" value=""/>
<condition-expr field-name="availableToPromiseTotal" operator="less" value="0"/>
</condition-list>
</condition-list>
<!-- the current item is added to the list, even if its atp is greater than zero, because there could be
negative reservations (backorders) on it, if the atp has been increased by an inventory variance -->
- <condition-expr field-name="inventoryItemId" operator="equals" env-name="inventoryItem.inventoryItemId"/>
+ <condition-expr field-name="inventoryItemId" operator="equals" from-field="inventoryItem.inventoryItemId"/>
</condition-list>
<order-by field-name="reservedDatetime"/>
<order-by field-name="sequenceId"/>
@@ -749,10 +749,10 @@
<then>
<entity-condition entity-name="PicklistAndBinAndItem" list="picklistItemList">
<condition-list combine="and">
- <condition-expr field-name="orderId" env-name="item.orderId"/>
- <condition-expr field-name="shipGroupSeqId" env-name="item.shipGroupSeqId"/>
- <condition-expr field-name="orderItemSeqId" env-name="item.orderItemSeqId"/>
- <condition-expr field-name="inventoryItemId" env-name="item.inventoryItemId"/>
+ <condition-expr field-name="orderId" from-field="item.orderId"/>
+ <condition-expr field-name="shipGroupSeqId" from-field="item.shipGroupSeqId"/>
+ <condition-expr field-name="orderItemSeqId" from-field="item.orderItemSeqId"/>
+ <condition-expr field-name="inventoryItemId" from-field="item.inventoryItemId"/>
<condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_CANCELLED"/>
<condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_PICKED"/>
</condition-list>
@@ -841,14 +841,14 @@
<simple-method method-name="reassignInventoryReservations" short-description="Balances available-to-promise on inventory items">
<entity-condition entity-name="OrderItemShipGrpInvResAndItem" list="relatedRes">
<condition-list combine="and">
- <condition-expr field-name="productId" operator="equals" env-name="parameters.productId"/>
- <condition-expr field-name="facilityId" operator="equals" env-name="parameters.facilityId"/>
+ <condition-expr field-name="productId" operator="equals" from-field="parameters.productId"/>
+ <condition-expr field-name="facilityId" operator="equals" from-field="parameters.facilityId"/>
<condition-expr field-name="inventoryItemTypeId" operator="equals" value="NON_SERIAL_INV_ITEM"/>
<condition-list combine="or">
- <condition-expr field-name="currentPromisedDate" operator="greater" env-name="parameters.fromDate" ignore-if-null="true"/>
+ <condition-expr field-name="currentPromisedDate" operator="greater" from-field="parameters.fromDate" ignore-if-null="true"/>
<condition-list combine="or">
<condition-expr field-name="quantityNotAvailable" operator="greater" value="0"/>
- <condition-expr field-name="availableToPromiseTotal" operator="equals" env-name="nullField"/>
+ <condition-expr field-name="availableToPromiseTotal" operator="equals" from-field="nullField"/>
<condition-expr field-name="availableToPromiseTotal" operator="equals" value=""/>
<condition-expr field-name="availableToPromiseTotal" operator="less" value="0"/>
</condition-list>
@@ -862,10 +862,10 @@
<iterate list="relatedRes" entry="oneRelatedRes">
<entity-condition entity-name="PicklistAndBinAndItem" list="picklistItemList">
<condition-list combine="and">
- <condition-expr field-name="orderId" env-name="oneRelatedRes.orderId"/>
- <condition-expr field-name="shipGroupSeqId" env-name="oneRelatedRes.shipGroupSeqId"/>
- <condition-expr field-name="orderItemSeqId" env-name="oneRelatedRes.orderItemSeqId"/>
- <condition-expr field-name="inventoryItemId" env-name="oneRelatedRes.inventoryItemId"/>
+ <condition-expr field-name="orderId" from-field="oneRelatedRes.orderId"/>
+ <condition-expr field-name="shipGroupSeqId" from-field="oneRelatedRes.shipGroupSeqId"/>
+ <condition-expr field-name="orderItemSeqId" from-field="oneRelatedRes.orderItemSeqId"/>
+ <condition-expr field-name="inventoryItemId" from-field="oneRelatedRes.inventoryItemId"/>
<condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_CANCELLED"/>
<condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_PICKED"/>
</condition-list>
@@ -955,10 +955,10 @@
<if-compare field="productStore.balanceResOnOrderCreation" operator="equals" value="Y">
<entity-condition entity-name="OrderItemAndShipGrpInvResAndItem" list="oisgirais">
<condition-list combine="and">
- <condition-expr field-name="orderId" operator="equals" env-name="parameters.orderId"/>
+ <condition-expr field-name="orderId" operator="equals" from-field="parameters.orderId"/>
<condition-expr field-name="quantityNotAvailable" operator="greater" value="0"/>
<condition-expr field-name="quantityNotAvailable" operator="not-equals" value=""/>
- <condition-expr field-name="quantityNotAvailable" operator="not-equals" env-name="nullField"/>
+ <condition-expr field-name="quantityNotAvailable" operator="not-equals" from-field="nullField"/>
</condition-list>
</entity-condition>
<iterate list="oisgirais" entry="oisgir">
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml?rev=730120&r1=730119&r2=730120&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml Tue Dec 30 04:18:38 2008
@@ -277,9 +277,9 @@
<if-not-empty field="orderItem.productId">
<entity-condition entity-name="ShipmentItem" list="shipmentItems">
<condition-list combine="and">
- <condition-expr field-name="productId" env-name="orderItem.productId"/>
- <condition-expr field-name="shipmentId" env-name="parameters.shipmentId"/>
- <condition-expr field-name="shipmentItemSeqId" env-name="parameters.shipmentItemSeqId" ignore-if-empty="true"/>
+ <condition-expr field-name="productId" from-field="orderItem.productId"/>
+ <condition-expr field-name="shipmentId" from-field="parameters.shipmentId"/>
+ <condition-expr field-name="shipmentItemSeqId" from-field="parameters.shipmentItemSeqId" ignore-if-empty="true"/>
</condition-list>
<order-by field-name="shipmentItemSeqId"/>
</entity-condition>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml?rev=730120&r1=730119&r2=730120&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml Tue Dec 30 04:18:38 2008
@@ -72,7 +72,7 @@
<condition-list combine="and">
<condition-expr field-name="orderTypeId" value="SALES_ORDER"/>
<condition-expr field-name="statusId" value="ORDER_APPROVED"/>
- <condition-expr field-name="isRushOrder" env-name="parameters.isRushOrder" ignore-if-empty="true"/>
+ <condition-expr field-name="isRushOrder" from-field="parameters.isRushOrder" ignore-if-empty="true"/>
</condition-list>
<order-by field-name="+orderDate"/><!-- oldest first -->
</entity-condition>
@@ -144,10 +144,10 @@
We are using entity-condition instead of get-related because we want to exclude some picklists by status -->
<entity-condition entity-name="PicklistAndBinAndItem" list="picklistItemList">
<condition-list combine="and">
- <condition-expr field-name="orderId" env-name="orderItemShipGrpInvRes.orderId"/>
- <condition-expr field-name="shipGroupSeqId" env-name="orderItemShipGrpInvRes.shipGroupSeqId"/>
- <condition-expr field-name="orderItemSeqId" env-name="orderItemShipGrpInvRes.orderItemSeqId"/>
- <condition-expr field-name="inventoryItemId" env-name="orderItemShipGrpInvRes.inventoryItemId"/>
+ <condition-expr field-name="orderId" from-field="orderItemShipGrpInvRes.orderId"/>
+ <condition-expr field-name="shipGroupSeqId" from-field="orderItemShipGrpInvRes.shipGroupSeqId"/>
+ <condition-expr field-name="orderItemSeqId" from-field="orderItemShipGrpInvRes.orderItemSeqId"/>
+ <condition-expr field-name="inventoryItemId" from-field="orderItemShipGrpInvRes.inventoryItemId"/>
<condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_CANCELLED"/>
<condition-expr field-name="itemStatusId" operator="not-equals" value="PICKITEM_CANCELLED"/>
</condition-list>
@@ -814,7 +814,7 @@
<entity-condition entity-name="Picklist" list="picklistList">
<condition-list combine="and">
- <condition-expr field-name="facilityId" operator="equals" env-name="parameters.facilityId"/>
+ <condition-expr field-name="facilityId" operator="equals" from-field="parameters.facilityId"/>
<condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_PICKED"/>
<condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_CANCELLED"/>
</condition-list>