Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml?rev=730120&r1=730119&r2=730120&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml Tue Dec 30 04:18:38 2008 @@ -198,7 +198,7 @@ <if-compare field="returnHeader.needsInventoryReceive" operator="equals" value="Y"> <!-- before receiving inventory, check to see if there is inventory information in this database --> <entity-count entity-name="InventoryItem" count-name="iiCount"> - <condition-expr field-name="facilityId" operator="equals" env-name="returnHeader.destinationFacilityId"/> + <condition-expr field-name="facilityId" operator="equals" from-field="returnHeader.destinationFacilityId"/> </entity-count> <if-compare field="iiCount" operator="greater" value="0" type="Double"> @@ -210,7 +210,7 @@ <log level="info" message="Created new shipment ${shipmentId}"/> <entity-condition entity-name="ReturnItem" list="returnItems"> - <condition-expr field-name="returnId" operator="equals" env-name="returnHeader.returnId"/> + <condition-expr field-name="returnId" operator="equals" from-field="returnHeader.returnId"/> </entity-condition> <!-- if no inventory item type specified, get default from facility --> @@ -222,7 +222,7 @@ <now-timestamp-to-env env-name="nowTimestamp"/> <entity-count entity-name="ReturnItem" count-name="returnItemCount"> - <condition-expr field-name="returnId" operator="equals" env-name="returnHeader.returnId"/> + <condition-expr field-name="returnId" operator="equals" from-field="returnHeader.returnId"/> </entity-count> <set field="nonProductItems" type="Long" value="0"/> @@ -253,8 +253,8 @@ <!--check if the items already have SERIALIZED inventory. If so, it still puts them back as SERIALIZED with status "Accepted."--> <entity-count entity-name="InventoryItem" count-name="serializedItemCount"> <condition-list combine="and"> - <condition-expr field-name="productId" operator="equals" env-name="returnItem.productId"/> - <condition-expr field-name="facilityId" operator="equals" env-name="returnHeader.destinationFacilityId"/> + <condition-expr field-name="productId" operator="equals" from-field="returnItem.productId"/> + <condition-expr field-name="facilityId" operator="equals" from-field="returnHeader.destinationFacilityId"/> <condition-expr field-name="inventoryItemTypeId" operator="equals" value="SERIALIZED_INV_ITEM"/> </condition-list> </entity-count> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=730120&r1=730119&r2=730120&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Tue Dec 30 04:18:38 2008 @@ -308,7 +308,7 @@ <log level="info" message="Created new shipment ${shipmentId}"/> <entity-condition entity-name="ReturnItem" list="returnItems"> - <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"> <clear-field field="shipItemCtx"/> @@ -340,7 +340,7 @@ <log level="info" message="Created new shipment ${shipmentId}"/> <entity-condition entity-name="ReturnItem" list="returnItems"> - <condition-expr field-name="returnId" operator="equals" env-name="parameters.primaryReturnId"/> + <condition-expr field-name="returnId" operator="equals" from-field="parameters.primaryReturnId"/> </entity-condition> <iterate entry="returnItem" list="returnItems"> <clear-field field="shipItemCtx"/> @@ -1324,7 +1324,7 @@ <!-- locate shipping facilities associated with order item rez's --> <entity-condition entity-name="OrderItemAndShipGrpInvResAndItem" list="orderItemAndShipGrpInvResAndItemList"> <condition-list> - <condition-expr field-name="orderId" env-name="orderHeader.orderId"/> + <condition-expr field-name="orderId" from-field="orderHeader.orderId"/> <condition-expr field-name="statusId" value="ITEM_APPROVED"/> </condition-list> </entity-condition> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml?rev=730120&r1=730119&r2=730120&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml Tue Dec 30 04:18:38 2008 @@ -173,7 +173,7 @@ <entity-one entity-name="InventoryItem" value-field="inventoryItem"/> <get-related value-name="inventoryItem" relation-name="InventoryItemDetail" list-name="inventoryItemDetails"/> <entity-condition entity-name="ShipmentReceipt" list="shipmentReceipts"> - <condition-expr field-name="inventoryItemId" env-name="inventoryItemId"/> + <condition-expr field-name="inventoryItemId" from-field="inventoryItemId"/> <order-by field-name="datetimeReceived"/> </entity-condition> <first-from-list list="shipmentReceipts" entry="shipmentReceipt"/> Modified: ofbiz/trunk/framework/bi/script/org/ofbiz/bi/DimensionServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/bi/script/org/ofbiz/bi/DimensionServices.xml?rev=730120&r1=730119&r2=730120&view=diff ============================================================================== --- ofbiz/trunk/framework/bi/script/org/ofbiz/bi/DimensionServices.xml (original) +++ ofbiz/trunk/framework/bi/script/org/ofbiz/bi/DimensionServices.xml Tue Dec 30 04:18:38 2008 @@ -39,8 +39,8 @@ <entity-condition entity-name="Invoice" list="invoices"> <condition-list> <condition-expr field-name="invoiceTypeId" value="SALES_INVOICE"/> - <condition-expr field-name="invoiceDate" operator="greater-equals" env-name="parameters.fromDate"/> - <condition-expr field-name="invoiceDate" operator="less-equals" env-name="parameters.thruDate"/> + <condition-expr field-name="invoiceDate" operator="greater-equals" from-field="parameters.fromDate"/> + <condition-expr field-name="invoiceDate" operator="less-equals" from-field="parameters.thruDate"/> </condition-list> </entity-condition> <iterate list="invoices" entry="invoice"> Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/CdyneServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/CdyneServices.xml?rev=730120&r1=730119&r2=730120&view=diff ============================================================================== --- ofbiz/trunk/framework/common/script/org/ofbiz/common/CdyneServices.xml (original) +++ ofbiz/trunk/framework/common/script/org/ofbiz/common/CdyneServices.xml Tue Dec 30 04:18:38 2008 @@ -44,12 +44,12 @@ <condition-list combine="and"> <!-- Make sure that we find the county within the proper state to avoid name conflicts --> <!-- In the USA the 2 letter state abbreviation is the geoId --> - <condition-expr field-name="geoIdFrom" env-name="cdyneResultMap.StateAbbrev"/> + <condition-expr field-name="geoIdFrom" from-field="cdyneResultMap.StateAbbrev"/> <condition-expr field-name="geoAssocTypeId" value="REGIONS"/> <condition-expr field-name="geoTypeId" value="COUNTY"/> <condition-list combine="or"> - <condition-expr field-name="abbreviation" env-name="cdyneResultMap.County"/> - <condition-expr field-name="geoName" env-name="cdyneResultMap.County" ignore-case="true"/> + <condition-expr field-name="abbreviation" from-field="cdyneResultMap.County"/> + <condition-expr field-name="geoName" from-field="cdyneResultMap.County" ignore-case="true"/> </condition-list> </condition-list> </entity-condition> Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml?rev=730120&r1=730119&r2=730120&view=diff ============================================================================== --- ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml (original) +++ ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml Tue Dec 30 04:18:38 2008 @@ -81,13 +81,13 @@ <if-empty field="uomConversion"> <entity-condition entity-name="UomConversionDated" list="uomConversions" use-cache="true"> <condition-list combine="and"> - <condition-expr field-name="uomId" env-name="parameters.uomId"/> - <condition-expr field-name="uomIdTo" env-name="parameters.uomIdTo"/> - <condition-expr field-name="purposeEnumId" operator="equals" env-name="parameters.purposeEnumId" ignore-if-empty="true"/> - <condition-expr field-name="fromDate" operator="less-equals" env-name="asOfDate"/> + <condition-expr field-name="uomId" from-field="parameters.uomId"/> + <condition-expr field-name="uomIdTo" from-field="parameters.uomIdTo"/> + <condition-expr field-name="purposeEnumId" operator="equals" from-field="parameters.purposeEnumId" ignore-if-empty="true"/> + <condition-expr field-name="fromDate" operator="less-equals" from-field="asOfDate"/> <condition-list combine="or"> - <condition-expr field-name="thruDate" operator="greater-equals" env-name="asOfDate"/> - <condition-expr field-name="thruDate" operator="equals" env-name="nullField"/> + <condition-expr field-name="thruDate" operator="greater-equals" from-field="asOfDate"/> + <condition-expr field-name="thruDate" operator="equals" from-field="nullField"/> </condition-list> </condition-list> <!-- sort by descending fromDate to get newest (biggest) first --> @@ -100,12 +100,12 @@ <if-not-empty field="parameters.purposeEnumId"> <entity-condition entity-name="UomConversionDated" list="uomConversions" use-cache="true"> <condition-list combine="and"> - <condition-expr field-name="uomId" env-name="parameters.uomId"/> - <condition-expr field-name="uomIdTo" env-name="parameters.uomIdTo"/> - <condition-expr field-name="fromDate" operator="less-equals" env-name="asOfDate"/> + <condition-expr field-name="uomId" from-field="parameters.uomId"/> + <condition-expr field-name="uomIdTo" from-field="parameters.uomIdTo"/> + <condition-expr field-name="fromDate" operator="less-equals" from-field="asOfDate"/> <condition-list combine="or"> - <condition-expr field-name="thruDate" operator="greater-equals" env-name="asOfDate"/> - <condition-expr field-name="thruDate" operator="equals" env-name="nullField"/> + <condition-expr field-name="thruDate" operator="greater-equals" from-field="asOfDate"/> + <condition-expr field-name="thruDate" operator="equals" from-field="nullField"/> </condition-list> </condition-list> <order-by field-name="-fromDate"/> @@ -203,7 +203,7 @@ </if-empty> <set field="themeResources" from-field="parameters.themeResources"/> <entity-condition list="resourceList" entity-name="VisualThemeResource" use-cache="true"> - <condition-expr field-name="visualThemeId" env-name="visualThemeId"/> + <condition-expr field-name="visualThemeId" from-field="visualThemeId"/> <order-by field-name="resourceTypeEnumId"/> <order-by field-name="sequenceId"/> </entity-condition> Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml?rev=730120&r1=730119&r2=730120&view=diff ============================================================================== --- ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml (original) +++ ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml Tue Dec 30 04:18:38 2008 @@ -154,10 +154,10 @@ <entity-condition entity-name="PortalPage" list="PortalPageList"> <condition-list combine="and"> <condition-list combine="or"> - <condition-expr field-name="originalPortalPageId" operator="equals" env-name="parameters.originalPortalPageId"/> + <condition-expr field-name="originalPortalPageId" operator="equals" from-field="parameters.originalPortalPageId"/> </condition-list> <condition-list combine="or"> - <condition-expr field-name="ownerUserLoginId" operator="equals" env-name="userLogin.userLoginId"/> + <condition-expr field-name="ownerUserLoginId" operator="equals" from-field="userLogin.userLoginId"/> <condition-expr field-name="ownerUserLoginId" operator="equals" value="_NA_"/> </condition-list> </condition-list> @@ -168,11 +168,11 @@ <entity-condition entity-name="PortalPage" list="PortalPageList"> <condition-list combine="and"> <condition-list combine="or"> - <condition-expr field-name="originalPortalPageId" operator="equals" env-name="parameters.originalPortalPageId"/> - <condition-expr field-name="originalPortalPageId" operator="equals" env-name="mainPortalPageId"/> + <condition-expr field-name="originalPortalPageId" operator="equals" from-field="parameters.originalPortalPageId"/> + <condition-expr field-name="originalPortalPageId" operator="equals" from-field="mainPortalPageId"/> </condition-list> <condition-list combine="or"> - <condition-expr field-name="ownerUserLoginId" operator="equals" env-name="userLogin.userLoginId"/> + <condition-expr field-name="ownerUserLoginId" operator="equals" from-field="userLogin.userLoginId"/> </condition-list> </condition-list> <order-by field-name="createdStamp"/> Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml?rev=730120&r1=730119&r2=730120&view=diff ============================================================================== --- ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml (original) +++ ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml Tue Dec 30 04:18:38 2008 @@ -67,14 +67,14 @@ <entity-condition entity-name="CustomTimePeriod" list="orgTimePeriodList"> <condition-list combine="and"> <condition-list combine="or"> - <condition-expr field-name="organizationPartyId" operator="equals" env-name="curOrganizationPartyId"/> + <condition-expr field-name="organizationPartyId" operator="equals" from-field="curOrganizationPartyId"/> </condition-list> - <condition-expr field-name="fromDate" operator="less-equals" env-name="parameters.findDate"/> + <condition-expr field-name="fromDate" operator="less-equals" from-field="parameters.findDate"/> <condition-list combine="or"> - <condition-expr field-name="thruDate" operator="greater-equals" env-name="parameters.findDate"/> - <condition-expr field-name="thruDate" operator="equals" env-name="nullField"/> + <condition-expr field-name="thruDate" operator="greater-equals" from-field="parameters.findDate"/> + <condition-expr field-name="thruDate" operator="equals" from-field="nullField"/> </condition-list> - <condition-expr field-name="periodTypeId" operator="in" env-name="parameters.onlyIncludePeriodTypeIdList" ignore-if-empty="true"/> + <condition-expr field-name="periodTypeId" operator="in" from-field="parameters.onlyIncludePeriodTypeIdList" ignore-if-empty="true"/> </condition-list> </entity-condition> <list-to-list list-name="orgTimePeriodList" to-list-name="listSoFar"/> @@ -85,15 +85,15 @@ <entity-condition entity-name="CustomTimePeriod" list="generalCustomTimePeriodList"> <condition-list combine="and"> <condition-list combine="or"> - <condition-expr field-name="organizationPartyId" operator="equals" env-name="nullField"/> + <condition-expr field-name="organizationPartyId" operator="equals" from-field="nullField"/> <condition-expr field-name="organizationPartyId" operator="equals" value="_NA_"/> </condition-list> - <condition-expr field-name="fromDate" operator="less-equals" env-name="parameters.findDate"/> + <condition-expr field-name="fromDate" operator="less-equals" from-field="parameters.findDate"/> <condition-list combine="or"> - <condition-expr field-name="thruDate" operator="greater" env-name="parameters.findDate"/> - <condition-expr field-name="thruDate" operator="equals" env-name="nullField"/> + <condition-expr field-name="thruDate" operator="greater" from-field="parameters.findDate"/> + <condition-expr field-name="thruDate" operator="equals" from-field="nullField"/> </condition-list> - <condition-expr field-name="periodTypeId" operator="in" env-name="parameters.onlyIncludePeriodTypeIdList" ignore-if-empty="true"/> + <condition-expr field-name="periodTypeId" operator="in" from-field="parameters.onlyIncludePeriodTypeIdList" ignore-if-empty="true"/> </condition-list> </entity-condition> <list-to-list list-name="generalCustomTimePeriodList" to-list-name="listSoFar"/> Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=730120&r1=730119&r2=730120&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Tue Dec 30 04:18:38 2008 @@ -243,7 +243,7 @@ <!-- find a starting point being either the estimated start date of a project or the earliest actual start date. --> <entity-condition entity-name="ProjectAndPhaseAndTask" list="tasks"> - <condition-expr field-name="actualStartDate" operator="not-equals" env-name="null"/> + <condition-expr field-name="actualStartDate" operator="not-equals" from-field="null"/> <order-by field-name="-actualStartDate"/> </entity-condition> @@ -787,9 +787,9 @@ <simple-method method-name="getProjectsByParties" short-description="get Project information by party member" login-required="true"> <entity-condition entity-name="ProjectAndPhaseAndTaskParty" list="tasks"> <condition-list combine="and"> - <condition-expr field-name="projectId" operator="equals" env-name="parameters.projectId" ignore-if-empty="true"/> - <condition-expr field-name="partyId" operator="equals" env-name="parameters.partyId" ignore-if-empty="true"/> - <condition-expr field-name="partyId" operator="not-equals" env-name="null"/> + <condition-expr field-name="projectId" operator="equals" from-field="parameters.projectId" ignore-if-empty="true"/> + <condition-expr field-name="partyId" operator="equals" from-field="parameters.partyId" ignore-if-empty="true"/> + <condition-expr field-name="partyId" operator="not-equals" from-field="null"/> </condition-list> <order-by field-name="projectId"/> <order-by field-name="partyId"/> @@ -850,8 +850,8 @@ </if-empty> <entity-condition entity-name="WorkEffortPartyAssignment" list="tasks" filter-by-date="true"> <condition-list combine="and"> - <condition-expr field-name="partyId" operator="like" env-name="parameters.partyId"/> - <condition-expr field-name="workEffortId" operator="like" env-name="parameters.workEffortId"/> + <condition-expr field-name="partyId" operator="like" from-field="parameters.partyId"/> + <condition-expr field-name="workEffortId" operator="like" from-field="parameters.workEffortId"/> </condition-list> <order-by field-name="workEffortId"/> <order-by field-name="partyId"/> @@ -1040,12 +1040,12 @@ <set field="originalActualHours" from-field="actual.hours"/> <entity-condition entity-name="PartyRate" list="partyRates"> <condition-list combine="and"> - <condition-expr field-name="partyId" env-name="timesheet.partyId"/> - <condition-expr field-name="rateTypeId" env-name="actual.rateTypeId"/> - <condition-expr field-name="fromDate" operator="less-equals" env-name="actual.fromDate"/> + <condition-expr field-name="partyId" from-field="timesheet.partyId"/> + <condition-expr field-name="rateTypeId" from-field="actual.rateTypeId"/> + <condition-expr field-name="fromDate" operator="less-equals" from-field="actual.fromDate"/> <condition-list combine="or"> - <condition-expr field-name="thruDate" operator="equals" env-name="nullField"/> - <condition-expr field-name="thruDate" operator="greater-equals" env-name="actual.fromDate"/> + <condition-expr field-name="thruDate" operator="equals" from-field="nullField"/> + <condition-expr field-name="thruDate" operator="greater-equals" from-field="actual.fromDate"/> </condition-list> </condition-list> </entity-condition> @@ -1189,9 +1189,9 @@ <if-empty field="parameters.timesheetId"> <entity-condition entity-name="Timesheet" list="timesheets"> <condition-list combine="and"> - <condition-expr field-name="fromDate" operator="less-equals" env-name="parameters.fromDate"/> - <condition-expr field-name="thruDate" operator="greater-equals" env-name="parameters.fromDate"/> - <condition-expr field-name="partyId" operator="equals" env-name="parameters.partyId"/> + <condition-expr field-name="fromDate" operator="less-equals" from-field="parameters.fromDate"/> + <condition-expr field-name="thruDate" operator="greater-equals" from-field="parameters.fromDate"/> + <condition-expr field-name="partyId" operator="equals" from-field="parameters.partyId"/> </condition-list> </entity-condition> <if-not-empty field="timesheets"> @@ -1253,10 +1253,10 @@ </if-compare> <entity-condition entity-name="ProjectPhaseTaskAndTimeEntryTimeSheet" list="tasks"> <condition-list combine="and"> - <condition-expr field-name="projectId" operator="equals" env-name="parameters.projectId"/> - <condition-expr field-name="invoiceId" operator="equals" env-name="nullField"/> + <condition-expr field-name="projectId" operator="equals" from-field="parameters.projectId"/> + <condition-expr field-name="invoiceId" operator="equals" from-field="nullField"/> <condition-expr field-name="timesheetStatusId" operator="equals" value="TIMESHEET_COMPLETED"/> - <condition-expr field-name="fromDate" operator="less" env-name="parameters.thruDate" ignore-if-empty="true"/> + <condition-expr field-name="fromDate" operator="less" from-field="parameters.thruDate" ignore-if-empty="true"/> </condition-list> <order-by field-name="workEffortId"/> </entity-condition> @@ -1306,9 +1306,9 @@ <!-- check if this is the last party which completed his task --> <entity-condition entity-name="WorkEffortPartyAssignment" list="openTasks" filter-by-date="true"> <condition-list combine="and"> - <condition-expr field-name="workEffortId" operator="equals" env-name="parameters.workEffortId"/> + <condition-expr field-name="workEffortId" operator="equals" from-field="parameters.workEffortId"/> <condition-expr field-name="statusId" operator="not-equals" value="PAS_COMPLETED"/> - <condition-expr field-name="partyId" operator="not-equals" env-name="parameters.partyId"/> + <condition-expr field-name="partyId" operator="not-equals" from-field="parameters.partyId"/> </condition-list> </entity-condition> <if-empty field="openTasks"> @@ -1319,8 +1319,8 @@ <!-- see who is reponsible for testing/validation in this project --> <entity-condition entity-name="WorkEffortPartyAssignment" list="assigns" filter-by-date="true"> <condition-list combine="and"> - <condition-expr field-name="workEffortId" operator="equals" env-name="projectId"/> - <condition-expr field-name="partyId" operator="not-equals" env-name="parameters.partyId"/><!-- should not test/val own work --> + <condition-expr field-name="workEffortId" operator="equals" from-field="projectId"/> + <condition-expr field-name="partyId" operator="not-equals" from-field="parameters.partyId"/><!-- should not test/val own work --> <condition-list combine="or"> <condition-expr field-name="roleTypeId" operator="equals" value="PROVIDER_VALIDATOR"/> <condition-expr field-name="roleTypeId" operator="equals" value="PROVIDER_TESTER"/> |
Free forum by Nabble | Edit this page |