svn commit: r739028 [1/2] - in /ofbiz/trunk/applications/orde
Locked
 
|
Author: mrisaliti
Date: Thu Jan 29 21:38:21 2009 New Revision: 739028 URL: http://svn.apache.org/viewvc?rev=739028&view=rev Log: Artifact cleaning on order component after recent changes on xsd files (OFBIZ-2137) Modified: ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderHeaderScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml Modified: ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml?rev=739028&r1=739027&r2=739028&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml Thu Jan 29 21:38:21 2009 @@ -63,8 +63,8 @@ <form name="listLookupOrderHeader" title="" type="list" list-name="listIt" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupOrderHeader"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="OrderHeader"/> </service> </actions> @@ -118,8 +118,8 @@ <form name="listLookupOrderHeaderAndShipInfo" list-name="listIt" title="" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupOrderHeaderAndShipInfo"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="OrderHeaderAndShipGroups"/> </service> </actions> @@ -225,8 +225,8 @@ <form name="listLookupCustRequest" list-name="listIt" title="" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupCustRequest"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="CustRequest"/> </service> </actions> @@ -268,8 +268,8 @@ <form name="listLookupCustRequestItem" list-name="listIt" title="" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupCustRequestItem"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="CustRequestItem"/> </service> </actions> @@ -327,8 +327,8 @@ <form name="listLookupQuote" list-name="listIt" title="" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupQuote"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="Quote"/> </service> </actions> @@ -392,8 +392,8 @@ <form name="listLookupQuoteItem" list-name="listIt" title="" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupQuoteItem"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="QuoteItem"/> </service> </actions> @@ -459,8 +459,8 @@ <form name="listLookupRequirement" list-name="listIt" title="" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupRequirement"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="Requirement"/> </service> </actions> @@ -495,8 +495,8 @@ <form name="listLookupShoppingList" list-name="listIt" title="" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupShoppingList"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="ShoppingList"/> </service> </actions> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml?rev=739028&r1=739027&r2=739028&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml Thu Jan 29 21:38:21 2009 @@ -23,8 +23,8 @@ <form name="EditOrderHeader" type="single" target="updateOrderHeader" title="" header-row-style="header-row" default-table-style="basic-table"> <actions> - <entity-one entity-name="StatusItem" value-name="currentStatus" auto-field-map="false"> - <field-map field-name="statusId" env-name="orderHeader.statusId"/> + <entity-one entity-name="StatusItem" value-field="currentStatus" auto-field-map="false"> + <field-map field-name="statusId" from-field="orderHeader.statusId"/> </entity-one> </actions> <alt-target target="createOrderHeader" use-when="orderHeader==null"/> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml?rev=739028&r1=739027&r2=739028&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml Thu Jan 29 21:38:21 2009 @@ -76,8 +76,8 @@ <form name="ListQuotes" list-name="listIt" target="" title="" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="FindQuote"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="Quote"/> </service> </actions> @@ -99,8 +99,8 @@ <form name="EditQuote" type="single" target="updateQuote" title="" default-map-name="quote" header-row-style="header-row" default-table-style="basic-table"> <actions> - <entity-one entity-name="StatusItem" value-name="currentStatus" auto-field-map="false"> - <field-map field-name="statusId" env-name="quote.statusId"/> + <entity-one entity-name="StatusItem" value-field="currentStatus" auto-field-map="false"> + <field-map field-name="statusId" from-field="quote.statusId"/> </entity-one> </actions> <alt-target use-when="quote==null" target="createQuote"/> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml?rev=739028&r1=739027&r2=739028&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml Thu Jan 29 21:38:21 2009 @@ -73,9 +73,9 @@ <form name="ListRequests" type="list" extends="ListRequestList" list-name="listIt"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> - <field-map field-name="entityName" env-name="entityName"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> + <field-map field-name="entityName" from-field="entityName"/> <field-map field-name="orderBy" value="-lastModifiedDate"/> </service> </actions> @@ -449,9 +449,9 @@ <form name="requestInfo" type="single" title="request information" default-map-name="custRequest" header-row-style="header-row" default-table-style="basic-table"> <actions> - <service service-name="getPartyNameForDate" result-map-name="partyNameResultTo"> - <field-map field-name="partyId" env-name="custRequest.fromPartyId"/> - <field-map field-name="compareDate" env-name="custRequest.custRequestDate"/> + <service service-name="getPartyNameForDate" result-map="partyNameResultTo"> + <field-map field-name="partyId" from-field="custRequest.fromPartyId"/> + <field-map field-name="compareDate" from-field="custRequest.custRequestDate"/> <field-map field-name="lastNameFirst" value="Y"/> </service> </actions> @@ -474,11 +474,11 @@ focus-field-name="contentId" header-row-style="header-row" default-table-style="basic-table" target="createCustRequestContent?custRequestId=${parameters.custRequestId}"> <actions> <set field="custRequestId" from-field="parameters.custRequestId"/> - <entity-one entity-name="StatusItem" value-name="currentStatus" auto-field-map="false"> - <field-map field-name="statusId" env-name="content.statusId"/> + <entity-one entity-name="StatusItem" value-field="currentStatus" auto-field-map="false"> + <field-map field-name="statusId" from-field="content.statusId"/> </entity-one> - <entity-one entity-name="DataResource" value-name="dataResource" auto-field-map="false"> - <field-map field-name="dataResourceId" env-name="content.dataResourceId"/> + <entity-one entity-name="DataResource" value-field="dataResource" auto-field-map="false"> + <field-map field-name="dataResourceId" from-field="content.dataResourceId"/> </entity-one> </actions> <field name="custRequestId" map-name="parameters"><hidden/></field> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml?rev=739028&r1=739027&r2=739028&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml Thu Jan 29 21:38:21 2009 @@ -56,8 +56,8 @@ <form name="ListRequirements" type="list" target="" title="" list-name="listIt" paginate-target="FindRequirements" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="requestParameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="requestParameters"/> <field-map field-name="entityName" value="Requirement"/> <field-map field-name="orderBy" value="statusId"/> </service> @@ -65,12 +65,12 @@ <row-actions> <set field="lookupProductId" value="${bsh: (productId == null? "_NA_": productId);}" type="String"/> <set field="lookupFacilityId" value="${bsh: (facilityIdId == null? "_NA_": facilityId);}" type="String"/> - <service service-name="getInventoryAvailableByFacility" result-map-name="resultQoh"> - <field-map field-name="productId" env-name="lookupProductId"/> - <field-map field-name="facilityId" env-name="lookupFacilityId"/> + <service service-name="getInventoryAvailableByFacility" result-map="resultQoh"> + <field-map field-name="productId" from-field="lookupProductId"/> + <field-map field-name="facilityId" from-field="lookupFacilityId"/> </service> - <service service-name="getProductInventoryAvailable" result-map-name="resultQohTotal"> - <field-map field-name="productId" env-name="lookupProductId"/> + <service service-name="getProductInventoryAvailable" result-map="resultQohTotal"> + <field-map field-name="productId" from-field="lookupProductId"/> </service> <set field="facilityQuantityOnHandTotal" from-field="resultQoh.quantityOnHandTotal"/> <set field="quantityOnHandTotal" from-field="resultQohTotal.quantityOnHandTotal"/> @@ -259,15 +259,15 @@ <form name="ApprovedProductRequirementsList" type="list" title="" list-name="requirementsForSupplier" paginate-target="RequirementsForSupplier" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service service-name="prepareFind" result-map-name="resultConditions"> - <field-map field-name="inputFields" env-name="requestParameters"/> + <service service-name="prepareFind" result-map="resultConditions"> + <field-map field-name="inputFields" from-field="requestParameters"/> <field-map field-name="entityName" value="Requirement"/> </service> - <service service-name="getRequirementsForSupplier" result-map-name="result" result-map-list-name="requirementsForSupplier"> - <!--<field-map field-name="orderByList" env-name="resultConditions.orderByList"/>--> - <field-map field-name="requirementConditions" env-name="resultConditions.entityConditionList"/> - <field-map field-name="partyId" env-name="parameters.partyId"/> - <field-map field-name="unassignedRequirements" env-name="parameters.unassignedRequirements"/> + <service service-name="getRequirementsForSupplier" result-map="result" result-map-list="requirementsForSupplier"> + <!--<field-map field-name="orderByList" from-field="resultConditions.orderByList"/>--> + <field-map field-name="requirementConditions" from-field="resultConditions.entityConditionList"/> + <field-map field-name="partyId" from-field="parameters.partyId"/> + <field-map field-name="unassignedRequirements" from-field="parameters.unassignedRequirements"/> </service> </actions> <field name="requirementId" widget-style="buttontext"> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml?rev=739028&r1=739027&r2=739028&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml Thu Jan 29 21:38:21 2009 @@ -23,8 +23,8 @@ <form name="EditReturn" type="single" target="updateReturn" default-map-name="returnHeader" id="editReturn" header-row-style="header-row" default-table-style="basic-table"> <actions> - <entity-one entity-name="StatusItem" value-name="currentStatus" auto-field-map="false"> - <field-map field-name="statusId" env-name="returnHeader.statusId"/> + <entity-one entity-name="StatusItem" value-field="currentStatus" auto-field-map="false"> + <field-map field-name="statusId" from-field="returnHeader.statusId"/> </entity-one> </actions> <alt-target use-when="returnHeader==null" target="createReturn"/> @@ -146,8 +146,8 @@ <form name="ListReturns" type="list" target="findreturn" title="" list-name="listIt" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="findreturn"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="requestParameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="requestParameters"/> <field-map field-name="entityName" value="ReturnHeader"/> <field-map field-name="orderBy" value="entryDate DESC"/> </service> Modified: ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml?rev=739028&r1=739027&r2=739028&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml Thu Jan 29 21:38:21 2009 @@ -59,14 +59,14 @@ <section> <actions> <set field="custRequestId" from-field="parameters.custRequestId"/> - <entity-one entity-name="CustRequest" value-name="custRequest"/> + <entity-one entity-name="CustRequest" value-field="custRequest"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <section> <condition> - <not><if-empty field-name="custRequest"/></not> + <not><if-empty field="custRequest"/></not> </condition> <widgets> <include-menu name="RequestTabBar" location="component://order/widget/ordermgr/RequestMenus.xml"/> @@ -99,7 +99,7 @@ <widgets> <section> <condition> - <not><if-empty field-name="quote"/></not> + <not><if-empty field="quote"/></not> </condition> <widgets> <include-menu name="QuoteTabBar" location="component://order/widget/ordermgr/Menus.xml"/> @@ -135,7 +135,7 @@ <widgets> <section> <condition> - <not><if-empty field-name="quote"/></not> + <not><if-empty field="quote"/></not> </condition> <widgets> <include-menu name="QuoteTabBar" location="component://order/widget/ordermgr/Menus.xml"/> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml?rev=739028&r1=739027&r2=739028&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml Thu Jan 29 21:38:21 2009 @@ -68,10 +68,10 @@ <set field="promoUseDetailsInlineScreen" value="component://order/widget/ordermgr/OrderEntryCartScreens.xml#promoUseDetailsInline"/> <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/ShowCart.groovy"/> <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/ShowPromoText.groovy"/> - <entity-condition entity-name="ProductStorePromoAndAppl" list-name="allProductPromos" filter-by-date="true"> + <entity-condition entity-name="ProductStorePromoAndAppl" list="allProductPromos" filter-by-date="true"> <condition-list combine="and"> <condition-expr field-name="manualOnly" value="Y"/> - <condition-expr field-name="productStoreId" env-name="productStoreId"/> + <condition-expr field-name="productStoreId" from-field="productStoreId"/> </condition-list> <order-by field-name="productPromoId"/> </entity-condition> @@ -152,7 +152,7 @@ <screen name="promotion"> <section> <condition> - <not><if-empty field-name="productPromo"/></not> + <not><if-empty field="productPromo"/></not> </condition> <widgets> <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/promotiondetails.ftl"/></html></platform-specific> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml?rev=739028&r1=739027&r2=739028&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml Thu Jan 29 21:38:21 2009 @@ -102,7 +102,7 @@ <widgets> <section> <condition> - <not><if-empty field-name="productCategory"/></not> + <not><if-empty field="productCategory"/></not> </condition> <widgets> <include-screen name="${detailScreen}"/> @@ -141,7 +141,7 @@ <decorator-section name="body"> <section> <condition> - <not><if-empty field-name="product"/></not> + <not><if-empty field="product"/></not> </condition> <widgets> <include-screen name="${detailScreen}"/> @@ -228,7 +228,7 @@ <set field="headerItem" value="Advanced Search"/> <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/AdvancedSearchOptions.groovy"/> - <entity-condition entity-name="PartyRoleAndPartyDetail" list-name="supplerPartyRoleAndPartyDetails"> + <entity-condition entity-name="PartyRoleAndPartyDetail" list="supplerPartyRoleAndPartyDetails"> <condition-expr field-name="roleTypeId" value="SUPPLIER"/> <order-by field-name="groupName"/> <order-by field-name="lastName"/> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml?rev=739028&r1=739027&r2=739028&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml Thu Jan 29 21:38:21 2009 @@ -31,14 +31,14 @@ default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext" paginate-target="RequirementsForSupplier"> <actions> - <service service-name="prepareFind" result-map-name="resultConditions"> - <field-map field-name="inputFields" env-name="requestParameters"/> - <field-map field-name="entityName" env-name="entityName"/> + <service service-name="prepareFind" result-map="resultConditions"> + <field-map field-name="inputFields" from-field="requestParameters"/> + <field-map field-name="entityName" from-field="entityName"/> </service> - <service service-name="getRequirementsForSupplier" result-map-name="result" result-map-list-name="requirementsForSupplier"> - <!--<field-map field-name="orderByList" env-name="resultConditions.orderByList"/>--> - <field-map field-name="requirementConditions" env-name="resultConditions.entityConditionList"/> - <field-map field-name="partyId" env-name="parameters.partyId"/> + <service service-name="getRequirementsForSupplier" result-map="result" result-map-list="requirementsForSupplier"> + <!--<field-map field-name="orderByList" from-field="resultConditions.orderByList"/>--> + <field-map field-name="requirementConditions" from-field="resultConditions.entityConditionList"/> + <field-map field-name="partyId" from-field="parameters.partyId"/> </service> </actions> <field name="requirementId"><display/></field> @@ -79,9 +79,9 @@ paginate-target="FindQuoteForCart"> <actions> <set field="entityName" value="Quote"/> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="requestParameters"/> - <field-map field-name="entityName" env-name="entityName"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="requestParameters"/> + <field-map field-name="entityName" from-field="entityName"/> </service> </actions> <auto-fields-entity entity-name="Quote" default-field-type="display"/> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml?rev=739028&r1=739027&r2=739028&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml Thu Jan 29 21:38:21 2009 @@ -264,12 +264,12 @@ <section> <actions> <set field="partyId" from-field="userLogin.partyId"/> - <entity-condition entity-name="PartyTaxAuthInfoAndDetail" list-name="partyTaxAuthInfoAndDetailList"> - <condition-expr field-name="partyId" env-name="partyId"/> + <entity-condition entity-name="PartyTaxAuthInfoAndDetail" list="partyTaxAuthInfoAndDetailList"> + <condition-expr field-name="partyId" from-field="partyId"/> <order-by field-name="geoCode"/> <order-by field-name="groupName"/> </entity-condition> - <entity-condition entity-name="TaxAuthorityAndDetail" list-name="taxAuthorityAndDetailList"> + <entity-condition entity-name="TaxAuthorityAndDetail" list="taxAuthorityAndDetailList"> <order-by field-name="geoCode"/> <order-by field-name="groupName"/> </entity-condition> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml?rev=739028&r1=739027&r2=739028&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml Thu Jan 29 21:38:21 2009 @@ -72,7 +72,7 @@ <include-form name="FindRequirements" location="component://order/widget/ordermgr/OrderEntryForms.xml"/> <section> <condition> - <not><if-empty field-name="parameters.showList"/></not> + <not><if-empty field="parameters.showList"/></not> </condition> <widgets> <container> @@ -119,8 +119,8 @@ <actions> <set field="title" value="${uiLabelMap.PageTitleShoppingList}"/> <set field="partyId" from-field="requestParameters.partyId"/> - <entity-and entity-name="ShoppingList" list-name="customershoppinglists"> - <field-map env-name="partyId" field-name="partyId"/> + <entity-and entity-name="ShoppingList" list="customershoppinglists"> + <field-map from-field="partyId" field-name="partyId"/> </entity-and> </actions> <widgets> @@ -139,8 +139,8 @@ <actions> <set field="title" value="${uiLabelMap.PageTitleShoppingListItem}"/> <set field="shoppingListId" from-field="requestParameters.shoppingListId"/> - <entity-and entity-name="ShoppingListItem" list-name="shoppinglistitems"> - <field-map env-name="shoppingListId" field-name="shoppingListId"/> + <entity-and entity-name="ShoppingListItem" list="shoppinglistitems"> + <field-map from-field="shoppingListId" field-name="shoppingListId"/> </entity-and> </actions> <widgets> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderHeaderScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderHeaderScreens.xml?rev=739028&r1=739027&r2=739028&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderHeaderScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderHeaderScreens.xml Thu Jan 29 21:38:21 2009 @@ -55,7 +55,7 @@ <set field="tabButtonItem" value="EditOrderHeader"/> <set field="orderId" from-field="parameters.orderId"/> - <entity-one entity-name="OrderHeader" value-name="orderHeader"/> + <entity-one entity-name="OrderHeader" value-field="orderHeader"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap"/> </actions> <widgets> @@ -84,7 +84,7 @@ <set field="tabButtonItem" value="EditOrderHeader"/> <set field="orderId" from-field="parameters.orderId"/> - <entity-one entity-name="OrderHeader" value-name="OrderHeader"/> + <entity-one entity-name="OrderHeader" value-field="OrderHeader"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap"/> </actions> <widgets> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml?rev=739028&r1=739027&r2=739028&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml Thu Jan 29 21:38:21 2009 @@ -133,7 +133,7 @@ <actions> <set field="titleProperty" value="PageTitleReturnList"/> <set field="headerItem" value="return"/> - <entity-condition list-name="returnList" entity-name="ReturnHeader"/> + <entity-condition list="returnList" entity-name="ReturnHeader"/> </actions> <widgets> <decorator-screen name="CommonOrderReturnDecorator"> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml?rev=739028&r1=739027&r2=739028&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml Thu Jan 29 21:38:21 2009 @@ -63,7 +63,7 @@ <screen name="orderHeader"> <section> <condition> - <not><if-empty field-name="orderHeader"/></not> + <not><if-empty field="orderHeader"/></not> </condition> <widgets> <container style="lefthalf"> @@ -298,8 +298,8 @@ <actions> <set field="titleProperty" value="OrderOrderTerms"/> <set field="headerItem" value="findorders"/> - <entity-and entity-name="OrderTerm" list-name="orderTerms"> - <field-map field-name="orderId" env-name="parameters.orderId"/> + <entity-and entity-name="OrderTerm" list="orderTerms"> + <field-map field-name="orderId" from-field="parameters.orderId"/> </entity-and> </actions> <widgets> Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml?rev=739028&r1=739027&r2=739028&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml Thu Jan 29 21:38:21 2009 @@ -64,17 +64,17 @@ <set field="showQuoteManagementLinks" value="Y"/> <set field="quoteId" from-field="parameters.quoteId"/> - <entity-one entity-name="Quote" value-name="quote"/> - <get-related-one value-name="quote" relation-name="QuoteType" to-value-name="quoteType"/> - <get-related-one value-name="quote" relation-name="StatusItem" to-value-name="statusItem"/> - <get-related-one value-name="quote" relation-name="SalesChannelEnumeration" to-value-name="salesChannel"/> - <get-related-one value-name="quote" relation-name="Uom" to-value-name="currency"/> - <get-related-one value-name="quote" relation-name="ProductStore" to-value-name="store"/> + <entity-one entity-name="Quote" value-field="quote"/> + <get-related-one value-field="quote" relation-name="QuoteType" to-value-field="quoteType"/> + <get-related-one value-field="quote" relation-name="StatusItem" to-value-field="statusItem"/> + <get-related-one value-field="quote" relation-name="SalesChannelEnumeration" to-value-field="salesChannel"/> + <get-related-one value-field="quote" relation-name="Uom" to-value-field="currency"/> + <get-related-one value-field="quote" relation-name="ProductStore" to-value-field="store"/> <set field="listOrderBy[]" value="quoteItemSeqId"/> - <get-related value-name="quote" relation-name="QuoteItem" list-name="quoteItems" order-by-list-name="listOrderBy"/> - <get-related value-name="quote" relation-name="QuoteAdjustment" list-name="quoteAdjustments"/> - <get-related value-name="quote" relation-name="QuoteRole" list-name="quoteRoles"/> + <get-related value-field="quote" relation-name="QuoteItem" list="quoteItems" order-by-list="listOrderBy"/> + <get-related value-field="quote" relation-name="QuoteAdjustment" list="quoteAdjustments"/> + <get-related value-field="quote" relation-name="QuoteRole" list="quoteRoles"/> <!-- <get-related value-name="quote" relation-name="QuoteAttribute" list-name="quoteAttributes"/> <get-related value-name="quote" relation-name="QuoteCoefficient" list-name="quoteCoefficients"/> @@ -118,15 +118,15 @@ <actions> <set field="showQuoteManagementLinks" value="N"/> <set field="quoteId" from-field="parameters.quoteId"/> - <entity-one entity-name="Quote" value-name="quote"/> - <get-related-one value-name="quote" relation-name="QuoteType" to-value-name="quoteType"/> - <get-related-one value-name="quote" relation-name="StatusItem" to-value-name="statusItem"/> - <get-related-one value-name="quote" relation-name="Uom" to-value-name="currency"/> - <get-related-one value-name="quote" relation-name="ProductStore" to-value-name="store"/> - - <get-related value-name="quote" relation-name="QuoteItem" list-name="quoteItems"/> - <get-related value-name="quote" relation-name="QuoteAdjustment" list-name="quoteAdjustments"/> - <get-related value-name="quote" relation-name="QuoteRole" list-name="quoteRoles"/> + <entity-one entity-name="Quote" value-field="quote"/> + <get-related-one value-field="quote" relation-name="QuoteType" to-value-field="quoteType"/> + <get-related-one value-field="quote" relation-name="StatusItem" to-value-field="statusItem"/> + <get-related-one value-field="quote" relation-name="Uom" to-value-field="currency"/> + <get-related-one value-field="quote" relation-name="ProductStore" to-value-field="store"/> + + <get-related value-field="quote" relation-name="QuoteItem" list="quoteItems"/> + <get-related value-field="quote" relation-name="QuoteAdjustment" list="quoteAdjustments"/> + <get-related value-field="quote" relation-name="QuoteRole" list="quoteRoles"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> @@ -150,16 +150,16 @@ <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <set field="quoteId" from-field="parameters.quoteId"/> - <entity-one entity-name="Quote" value-name="quote"/> - <get-related-one value-name="quote" relation-name="QuoteType" to-value-name="quoteType"/> - <get-related-one value-name="quote" relation-name="StatusItem" to-value-name="statusItem"/> - <get-related-one value-name="quote" relation-name="Uom" to-value-name="currency"/> - <get-related-one value-name="quote" relation-name="ProductStore" to-value-name="store"/> - <get-related-one value-name="quote" relation-name="Party" to-value-name="party"/> + <entity-one entity-name="Quote" value-field="quote"/> + <get-related-one value-field="quote" relation-name="QuoteType" to-value-field="quoteType"/> + <get-related-one value-field="quote" relation-name="StatusItem" to-value-field="statusItem"/> + <get-related-one value-field="quote" relation-name="Uom" to-value-field="currency"/> + <get-related-one value-field="quote" relation-name="ProductStore" to-value-field="store"/> + <get-related-one value-field="quote" relation-name="Party" to-value-field="party"/> <set field="listOrderBy[]" value="quoteItemSeqId"/> - <get-related value-name="quote" relation-name="QuoteItem" list-name="quoteItems" order-by-list-name="listOrderBy"/> - <get-related value-name="quote" relation-name="QuoteAdjustment" list-name="quoteAdjustments"/> + <get-related value-field="quote" relation-name="QuoteItem" list="quoteItems" order-by-list="listOrderBy"/> + <get-related value-field="quote" relation-name="QuoteAdjustment" list="quoteAdjustments"/> <script location="component://order/webapp/ordermgr/WEB-INF/actions/quote/GetPartyAddress.groovy"/> <!-- @@ -215,7 +215,7 @@ <set field="tabButtonItem" value="EditQuote"/> <set field="quoteId" from-field="parameters.quoteId"/> - <entity-one entity-name="Quote" value-name="quote"/> + <entity-one entity-name="Quote" value-field="quote"/> <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> </actions> @@ -248,9 +248,9 @@ <set field="headerItem" value="quote"/> <set field="tabButtonItem" value="ListQuoteRoles"/> - <entity-one entity-name="Quote" value-name="quote" auto-field-map="true"/> - <entity-and entity-name="QuoteRole" list-name="quoteRoles"> - <field-map env-name="quote.quoteId" field-name="quoteId"/> + <entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/> + <entity-and entity-name="QuoteRole" list="quoteRoles"> + <field-map from-field="quote.quoteId" field-name="quoteId"/> </entity-and> </actions> @@ -289,8 +289,8 @@ <set field="quoteId" from-field="parameters.quoteId"/> <set field="quoteItemSeqId" from-field="parameters.quoteItemSeqId"/> - <entity-one entity-name="Quote" value-name="quote" auto-field-map="true"/> - <entity-one entity-name="QuoteRole" value-name="quoteRole"/> + <entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/> + <entity-one entity-name="QuoteRole" value-field="quoteRole"/> </actions> <widgets> <decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}"> @@ -326,9 +326,9 @@ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/> - <entity-one entity-name="Quote" value-name="quote" auto-field-map="true"/> - <entity-and entity-name="QuoteItem" list-name="quoteItems"> - <field-map env-name="quote.quoteId" field-name="quoteId"/> + <entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/> + <entity-and entity-name="QuoteItem" list="quoteItems"> + <field-map from-field="quote.quoteId" field-name="quoteId"/> <order-by field-name="quoteItemSeqId"/> </entity-and> @@ -368,8 +368,8 @@ <set field="quoteId" from-field="parameters.quoteId"/> <set field="quoteItemSeqId" from-field="parameters.quoteItemSeqId"/> - <entity-one entity-name="Quote" value-name="quote" auto-field-map="true"/> - <entity-one entity-name="QuoteItem" value-name="quoteItem"/> + <entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/> + <entity-one entity-name="QuoteItem" value-field="quoteItem"/> </actions> <widgets> <decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}"> @@ -403,9 +403,9 @@ <set field="headerItem" value="quote"/> <set field="tabButtonItem" value="ListQuoteAttributes"/> - <entity-one entity-name="Quote" value-name="quote" auto-field-map="true"/> - <entity-and entity-name="QuoteAttribute" list-name="quoteAttributes"> - <field-map env-name="quote.quoteId" field-name="quoteId"/> + <entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/> + <entity-and entity-name="QuoteAttribute" list="quoteAttributes"> + <field-map from-field="quote.quoteId" field-name="quoteId"/> </entity-and> </actions> <widgets> @@ -443,8 +443,8 @@ <set field="quoteId" from-field="parameters.quoteId"/> <set field="attrName" from-field="parameters.attrName"/> - <entity-one entity-name="Quote" value-name="quote" auto-field-map="true"/> - <entity-one entity-name="QuoteAttribute" value-name="quoteAttribute"/> + <entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/> + <entity-one entity-name="QuoteAttribute" value-field="quoteAttribute"/> </actions> <widgets> <decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}"> @@ -478,9 +478,9 @@ <set field="headerItem" value="quote"/> <set field="tabButtonItem" value="ListQuoteCoefficients"/> - <entity-one entity-name="Quote" value-name="quote" auto-field-map="true"/> - <entity-and entity-name="QuoteCoefficient" list-name="quoteCoefficients"> - <field-map env-name="quote.quoteId" field-name="quoteId"/> + <entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/> + <entity-and entity-name="QuoteCoefficient" list="quoteCoefficients"> + <field-map from-field="quote.quoteId" field-name="quoteId"/> </entity-and> </actions> <widgets> @@ -518,8 +518,8 @@ <set field="quoteId" from-field="parameters.quoteId"/> <set field="attrName" from-field="parameters.coeffName"/> - <entity-one entity-name="Quote" value-name="quote" auto-field-map="true"/> - <entity-one entity-name="QuoteCoefficient" value-name="quoteCoefficient"/> + <entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/> + <entity-one entity-name="QuoteCoefficient" value-field="quoteCoefficient"/> </actions> <widgets> <decorator-screen name="CommonQuotePriceDecorator" location="${parameters.mainDecoratorLocation}"> @@ -555,15 +555,15 @@ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/> - <entity-one entity-name="Quote" value-name="quote" auto-field-map="true"/> - <entity-and entity-name="QuoteItem" list-name="quoteItems"> - <field-map env-name="quote.quoteId" field-name="quoteId"/> + <entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/> + <entity-and entity-name="QuoteItem" list="quoteItems"> + <field-map from-field="quote.quoteId" field-name="quoteId"/> <order-by field-name="custRequestId"/> <order-by field-name="custRequestItemSeqId"/> <order-by field-name="quoteItemSeqId"/> </entity-and> - <entity-and entity-name="QuoteCoefficient" list-name="quoteCoefficients"> - <field-map env-name="quote.quoteId" field-name="quoteId"/> + <entity-and entity-name="QuoteCoefficient" list="quoteCoefficients"> + <field-map from-field="quote.quoteId" field-name="quoteId"/> </entity-and> <set from-field="quote.quoteId" field="quoteId"/> @@ -620,9 +620,9 @@ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/> <set field="quoteId" from-field="parameters.quoteId"/> - <entity-one entity-name="Quote" value-name="quote" auto-field-map="true"/> - <entity-and entity-name="QuoteAdjustment" list-name="quoteAdjustments"> - <field-map env-name="quote.quoteId" field-name="quoteId"/> + <entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/> + <entity-and entity-name="QuoteAdjustment" list="quoteAdjustments"> + <field-map from-field="quote.quoteId" field-name="quoteId"/> </entity-and> </actions> <widgets> @@ -661,8 +661,8 @@ <set field="quoteId" from-field="parameters.quoteId"/> <set field="quoteAdjustmentId" from-field="parameters.quoteAdjustmentId"/> - <entity-one entity-name="Quote" value-name="quote" auto-field-map="true"/> - <entity-one entity-name="QuoteAdjustment" value-name="quoteAdjustment"/> + <entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/> + <entity-one entity-name="QuoteAdjustment" value-field="quoteAdjustment"/> </actions> <widgets> <decorator-screen name="CommonQuotePriceDecorator" location="${parameters.mainDecoratorLocation}"> @@ -698,15 +698,15 @@ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/> - <entity-one entity-name="Quote" value-name="quote" auto-field-map="true"/> - <entity-and entity-name="QuoteItem" list-name="quoteItems"> - <field-map env-name="quote.quoteId" field-name="quoteId"/> + <entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/> + <entity-and entity-name="QuoteItem" list="quoteItems"> + <field-map from-field="quote.quoteId" field-name="quoteId"/> <order-by field-name="custRequestId"/> <order-by field-name="custRequestItemSeqId"/> <order-by field-name="quoteItemSeqId"/> </entity-and> - <entity-and entity-name="QuoteCoefficient" list-name="quoteCoefficients"> - <field-map env-name="quote.quoteId" field-name="quoteId"/> + <entity-and entity-name="QuoteCoefficient" list="quoteCoefficients"> + <field-map from-field="quote.quoteId" field-name="quoteId"/> </entity-and> <set from-field="quote.quoteId" field="quoteId"/> @@ -745,8 +745,8 @@ <set field="tabButtonItem" value="ViewQuote"/> <set field="quoteId" from-field="parameters.quoteId"/> - <entity-one entity-name="Quote" value-name="quote"/> - <get-related-one value-name="quote" relation-name="Party" to-value-name="party"/> + <entity-one entity-name="Quote" value-field="quote"/> + <get-related-one value-field="quote" relation-name="Party" to-value-field="party"/> <script location="component://order/webapp/ordermgr/WEB-INF/actions/quote/GetPartyEmailAddress.groovy"/> </actions> <widgets> @@ -774,7 +774,7 @@ <screen name="ViewQuoteTemplate"> <section> <condition> - <not><if-empty field-name="quote"/></not> + <not><if-empty field="quote"/></not> </condition> <widgets> <label text="${note}" style="tabletext"/> @@ -831,7 +831,7 @@ <screen name="ViewQuoteItemInfo"> <section> <condition> - <not><if-empty field-name="quoteItems"/></not> + <not><if-empty field="quoteItems"/></not> </condition> <widgets> <platform-specific> Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml?rev=739028&r1=739027&r2=739028&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml Thu Jan 29 21:38:21 2009 @@ -62,8 +62,8 @@ <form name="EditQuoteWorkEffort" target="updateQuoteWorkEffort" title="" type="single" extends="EditWorkEffort" extends-resource="component://workeffort/widget/WorkEffortForms.xml" header-row-style="header-row" default-table-style="basic-table"> <actions> - <entity-one entity-name="StatusItem" value-name="currentStatus" auto-field-map="false"> - <field-map field-name="statusId" env-name="quote.statusId"/> + <entity-one entity-name="StatusItem" value-field="currentStatus" auto-field-map="false"> + <field-map field-name="statusId" from-field="quote.statusId"/> </entity-one> </actions> <field name="quoteId" field-name="quoteId" map-name="parameters"> Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml?rev=739028&r1=739027&r2=739028&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml Thu Jan 29 21:38:21 2009 @@ -29,9 +29,9 @@ <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/ListWorkEfforts"/> <set field="quoteId" from-field="parameters.quoteId"/> - <entity-one entity-name="QuoteWorkEffort" value-name="quoteWorkEffort"/> - <entity-one entity-name="WorkEffort" value-name="workEffort"/> - <entity-one entity-name="Quote" value-name="quote"/> + <entity-one entity-name="QuoteWorkEffort" value-field="quoteWorkEffort"/> + <entity-one entity-name="WorkEffort" value-field="workEffort"/> + <entity-one entity-name="Quote" value-field="quote"/> </actions> <widgets> <decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}"> @@ -66,8 +66,8 @@ <set field="donePage" from-field="parameters.DONE_PAGE" /> <set field="quoteId" from-field="parameters.quoteId"/> <set field="workEffortId" from-field="parameters.workEffortId"/> - <entity-one entity-name="Quote" value-name="quote"/> - <entity-one entity-name="WorkEffort" value-name="workEffort"/> + <entity-one entity-name="Quote" value-field="quote"/> + <entity-one entity-name="WorkEffort" value-field="workEffort"/> </actions> <widgets> <decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}"> @@ -101,7 +101,7 @@ <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/ListWorkEfforts"/> <set field="quoteId" from-field="parameters.quoteId"/> - <entity-one entity-name="Quote" value-name="quote"/> + <entity-one entity-name="Quote" value-field="quote"/> </actions> <widgets> <decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml?rev=739028&r1=739027&r2=739028&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml Thu Jan 29 21:38:21 2009 @@ -104,14 +104,14 @@ <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> - <entity-condition entity-name="OrderPurchasePaymentSummary" list-name="orderPurchasePaymentSummaryList"> + <entity-condition entity-name="OrderPurchasePaymentSummary" list="orderPurchasePaymentSummaryList"> <condition-list combine="and"> - <condition-expr field-name="productStoreId" operator="equals" env-name="parameters.productStoreId" ignore-if-empty="true"/> - <condition-expr field-name="originFacilityId" operator="equals" env-name="parameters.originFacilityId" ignore-if-empty="true"/> - <condition-expr field-name="terminalId" operator="equals" env-name="parameters.terminalId" ignore-if-empty="true"/> - <condition-expr field-name="statusId" operator="equals" env-name="parameters.statusId" ignore-if-empty="true"/> - <condition-expr field-name="orderDate" operator="greater-equals" env-name="parameters.fromOrderDate" ignore-if-null="true"/> - <condition-expr field-name="orderDate" operator="less" env-name="parameters.thruOrderDate" ignore-if-null="true"/> + <condition-expr field-name="productStoreId" operator="equals" from-field="parameters.productStoreId" ignore-if-empty="true"/> + <condition-expr field-name="originFacilityId" operator="equals" from-field="parameters.originFacilityId" ignore-if-empty="true"/> + <condition-expr field-name="terminalId" operator="equals" from-field="parameters.terminalId" ignore-if-empty="true"/> + <condition-expr field-name="statusId" operator="equals" from-field="parameters.statusId" ignore-if-empty="true"/> + <condition-expr field-name="orderDate" operator="greater-equals" from-field="parameters.fromOrderDate" ignore-if-null="true"/> + <condition-expr field-name="orderDate" operator="less" from-field="parameters.thruOrderDate" ignore-if-null="true"/> </condition-list> <select-field field-name="productStoreId"/> <select-field field-name="originFacilityId"/> @@ -141,15 +141,15 @@ <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> - <entity-condition entity-name="OrderPurchaseProductSummary" list-name="orderPurchaseProductSummaryList"> + <entity-condition entity-name="OrderPurchaseProductSummary" list="orderPurchaseProductSummaryList"> <condition-list combine="and"> - <condition-expr field-name="productStoreId" operator="equals" env-name="parameters.productStoreId" ignore-if-empty="true"/> - <condition-expr field-name="orderTypeId" operator="equals" env-name="parameters.orderTypeId" ignore-if-empty="true"/> - <condition-expr field-name="originFacilityId" operator="equals" env-name="parameters.originFacilityId" ignore-if-empty="true"/> - <condition-expr field-name="terminalId" operator="equals" env-name="parameters.terminalId" ignore-if-empty="true"/> - <condition-expr field-name="statusId" operator="equals" env-name="parameters.statusId" ignore-if-empty="true"/> - <condition-expr field-name="orderDate" operator="greater-equals" env-name="parameters.fromOrderDate" ignore-if-null="true"/> - <condition-expr field-name="orderDate" operator="less" env-name="parameters.thruOrderDate" ignore-if-null="true"/> + <condition-expr field-name="productStoreId" operator="equals" from-field="parameters.productStoreId" ignore-if-empty="true"/> + <condition-expr field-name="orderTypeId" operator="equals" from-field="parameters.orderTypeId" ignore-if-empty="true"/> + <condition-expr field-name="originFacilityId" operator="equals" from-field="parameters.originFacilityId" ignore-if-empty="true"/> + <condition-expr field-name="terminalId" operator="equals" from-field="parameters.terminalId" ignore-if-empty="true"/> + <condition-expr field-name="statusId" operator="equals" from-field="parameters.statusId" ignore-if-empty="true"/> + <condition-expr field-name="orderDate" operator="greater-equals" from-field="parameters.fromOrderDate" ignore-if-null="true"/> + <condition-expr field-name="orderDate" operator="less" from-field="parameters.thruOrderDate" ignore-if-null="true"/> </condition-list> <select-field field-name="productStoreId"/> <select-field field-name="originFacilityId"/> @@ -183,17 +183,17 @@ <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> - <entity-condition entity-name="OrderReportSalesGroupByProduct" list-name="productReportList"> + <entity-condition entity-name="OrderReportSalesGroupByProduct" list="productReportList"> <condition-list combine="and"> <!-- this can use the other view, so long as the filter is by SALES_ORDER and fromPartyId = ProductStore.payToPartyId if provided --> - <condition-expr field-name="productStoreId" operator="equals" env-name="parameters.productStoreId" ignore-if-empty="true"/> - <condition-expr field-name="partyId" operator="equals" env-name="parameters.toPartyId" ignore-if-empty="true"/> + <condition-expr field-name="productStoreId" operator="equals" from-field="parameters.productStoreId" ignore-if-empty="true"/> + <condition-expr field-name="partyId" operator="equals" from-field="parameters.toPartyId" ignore-if-empty="true"/> <condition-expr field-name="roleTypeId" operator="equals" value="BILL_TO_CUSTOMER"/> <condition-expr field-name="orderTypeId" operator="equals" value="SALES_ORDER"/> - <!-- possible bug: using env-name="parameters.orderStatusId" did not work for the following line --> + <!-- possible bug: using from-field="parameters.orderStatusId" did not work for the following line --> <condition-expr field-name="orderStatusId" operator="equals" value="${parameters.orderStatusId}" ignore-if-empty="true"/> - <condition-expr field-name="orderDate" operator="greater-equals" env-name="parameters.fromOrderDate" ignore-if-null="true"/> - <condition-expr field-name="orderDate" operator="less" env-name="parameters.thruOrderDate" ignore-if-null="true"/> + <condition-expr field-name="orderDate" operator="greater-equals" from-field="parameters.fromOrderDate" ignore-if-null="true"/> + <condition-expr field-name="orderDate" operator="less" from-field="parameters.thruOrderDate" ignore-if-null="true"/> </condition-list> <!-- note that we need to explicitly identify the fields to select, otherwise the query will include fields that can't logically be grouped --> <select-field field-name="productStoreId"/> @@ -274,16 +274,16 @@ <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> - <entity-condition entity-name="OrderReportPurchasesGroupByProduct" list-name="productReportList"> + <entity-condition entity-name="OrderReportPurchasesGroupByProduct" list="productReportList"> <condition-list combine="and"> - <condition-expr field-name="toPartyId" operator="equals" env-name="parameters.toPartyId" ignore-if-empty="true"/> + <condition-expr field-name="toPartyId" operator="equals" from-field="parameters.toPartyId" ignore-if-empty="true"/> <condition-expr field-name="toRoleTypeId" operator="equals" value="BILL_TO_CUSTOMER"/> - <condition-expr field-name="fromPartyId" operator="equals" env-name="parameters.fromPartyId" ignore-if-empty="true"/> + <condition-expr field-name="fromPartyId" operator="equals" from-field="parameters.fromPartyId" ignore-if-empty="true"/> <condition-expr field-name="fromRoleTypeId" operator="equals" value="BILL_FROM_VENDOR"/> <condition-expr field-name="orderTypeId" operator="equals" value="PURCHASE_ORDER"/> <condition-expr field-name="orderStatusId" operator="equals" value="${parameters.orderStatusId}" ignore-if-empty="true"/> - <condition-expr field-name="orderDate" operator="greater-equals" env-name="parameters.fromOrderDate" ignore-if-null="true"/> - <condition-expr field-name="orderDate" operator="less" env-name="parameters.thruOrderDate" ignore-if-null="true"/> + <condition-expr field-name="orderDate" operator="greater-equals" from-field="parameters.fromOrderDate" ignore-if-null="true"/> + <condition-expr field-name="orderDate" operator="less" from-field="parameters.thruOrderDate" ignore-if-null="true"/> </condition-list> <!-- note that we need to explicitly identify the fields to select, otherwise the query will include fields that can't logically be grouped --> <select-field field-name="productId"/> Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml?rev=739028&r1=739027&r2=739028&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml Thu Jan 29 21:38:21 2009 @@ -37,9 +37,9 @@ <menu-item name="custRequestContent" title="${uiLabelMap.OrderRequestContent}"> <condition> <and> - <not><if-empty field-name="custRequest"/></not> - <if-compare field-name="custRequest.statusId" operator="not-equals" value="CRQ_CANCELLED"/> - <if-compare field-name="custRequest.statusId" operator="not-equals" value="CRQ_COMPLETED"/> + <not><if-empty field="custRequest"/></not> + <if-compare field="custRequest.statusId" operator="not-equals" value="CRQ_CANCELLED"/> + <if-compare field="custRequest.statusId" operator="not-equals" value="CRQ_COMPLETED"/> </and> </condition> <link target="EditCustRequestContent?custRequestId=${custRequest.custRequestId}"/> Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml?rev=739028&r1=739027&r2=739028&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml Thu Jan 29 21:38:21 2009 @@ -52,30 +52,30 @@ <!--<set field="headerItem" value="Shopping List"/>--> <set field="showRequestManagementLinks" value="Y"/> <set field="custRequestId" from-field="parameters.custRequestId"/> - <entity-one entity-name="CustRequest" value-name="custRequest"/> - <get-related-one value-name="custRequest" relation-name="CustRequestType" to-value-name="custRequestType"/> - <get-related-one value-name="custRequest" relation-name="StatusItem" to-value-name="statusItem"/> - <get-related-one value-name="custRequest" relation-name="CurrencyUom" to-value-name="currency"/> - <get-related-one value-name="custRequest" relation-name="ProductStore" to-value-name="store"/> - <get-related-one value-name="custRequest" relation-name="FulfillContactMech" to-value-name="fulfillContactMech"/> - <entity-and list-name="requestWorkEfforts" entity-name="CustRequestAndWorkEffort"> - <field-map field-name="custRequestId" env-name="parameters.custRequestId"/> + <entity-one entity-name="CustRequest" value-field="custRequest"/> + <get-related-one value-field="custRequest" relation-name="CustRequestType" to-value-field="custRequestType"/> + <get-related-one value-field="custRequest" relation-name="StatusItem" to-value-field="statusItem"/> + <get-related-one value-field="custRequest" relation-name="CurrencyUom" to-value-field="currency"/> + <get-related-one value-field="custRequest" relation-name="ProductStore" to-value-field="store"/> + <get-related-one value-field="custRequest" relation-name="FulfillContactMech" to-value-field="fulfillContactMech"/> + <entity-and list="requestWorkEfforts" entity-name="CustRequestAndWorkEffort"> + <field-map field-name="custRequestId" from-field="parameters.custRequestId"/> </entity-and> - <get-related value-name="custRequest" relation-name="CustRequestParty" list-name="requestParties"/> + <get-related value-field="custRequest" relation-name="CustRequestParty" list="requestParties"/> <set field="orderBy[]" value="sequenceNum"/> - <get-related value-name="custRequest" relation-name="CustRequestItem" list-name="custRequestItems" order-by-list-name="orderBy"/> - <entity-and list-name="commEvents" entity-name="CommunicationEventAndCustRequest"> - <field-map field-name="custRequestId" env-name="parameters.custRequestId"/> + <get-related value-field="custRequest" relation-name="CustRequestItem" list="custRequestItems" order-by-list="orderBy"/> + <entity-and list="commEvents" entity-name="CommunicationEventAndCustRequest"> + <field-map field-name="custRequestId" from-field="parameters.custRequestId"/> </entity-and> - <entity-and list-name="notes" entity-name="CustRequestItemNoteView"> - <field-map field-name="custRequestId" env-name="parameters.custRequestId"/> + <entity-and list="notes" entity-name="CustRequestItemNoteView"> + <field-map field-name="custRequestId" from-field="parameters.custRequestId"/> <order-by field-name="custRequestItemSeqId"/> </entity-and> - <entity-and entity-name="CustRequestContent" list-name="custRequestContents" filter-by-date="true"> - <field-map field-name="custRequestId" env-name="custRequestId"/> + <entity-and entity-name="CustRequestContent" list="custRequestContents" filter-by-date="true"> + <field-map field-name="custRequestId" from-field="custRequestId"/> </entity-and> - <entity-and entity-name="CustRequestAndContent" list-name="custRequestAndContents"> - <field-map field-name="custRequestId" env-name="custRequestId"/> + <entity-and entity-name="CustRequestAndContent" list="custRequestAndContents"> + <field-map field-name="custRequestId" from-field="custRequestId"/> </entity-and> </actions> <widgets> @@ -121,9 +121,9 @@ <set field="tabButtonItem" value="request"/> <set field="headerItem" value="request"/> <set field="custRequestId" from-field="parameters.custRequestId"/> - <entity-one entity-name="CustRequest" value-name="custRequest"/> + <entity-one entity-name="CustRequest" value-field="custRequest"/> <set field="statusId" from-field="custRequest.statusId"/> - <entity-one entity-name="StatusItem" value-name="currentStatus"/> + <entity-one entity-name="StatusItem" value-field="currentStatus"/> </actions> <widgets> <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}"> @@ -143,9 +143,9 @@ <set field="tabButtonItem" value="requestroles"/> <set field="headerItem" value="request"/> <set field="custRequestId" from-field="parameters.custRequestId"/> - <entity-one entity-name="CustRequest" value-name="custRequest"/> - <entity-and entity-name="CustRequestParty" list-name="custRequestParties"> - <field-map env-name="custRequestId" field-name="custRequestId"/> + <entity-one entity-name="CustRequest" value-field="custRequest"/> + <entity-and entity-name="CustRequestParty" list="custRequestParties"> + <field-map from-field="custRequestId" field-name="custRequestId"/> </entity-and> </actions> <widgets> @@ -169,9 +169,9 @@ <set field="custRequestId" from-field="parameters.custRequestId"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/> - <entity-one entity-name="CustRequest" value-name="custRequest"/> - <entity-and entity-name="CustRequestItem" list-name="custRequestItems"> - <field-map env-name="custRequestId" field-name="custRequestId"/> + <entity-one entity-name="CustRequest" value-field="custRequest"/> + <entity-and entity-name="CustRequestItem" list="custRequestItems"> + <field-map from-field="custRequestId" field-name="custRequestId"/> <order-by field-name="sequenceNum"/> <order-by field-name="custRequestItemSeqId"/> </entity-and> @@ -196,10 +196,10 @@ <set field="headerItem" value="request"/> <set field="custRequestId" from-field="parameters.custRequestId"/> <set field="custRequestItemSeqId" from-field="parameters.custRequestItemSeqId"/> - <entity-one entity-name="CustRequest" value-name="custRequest"/> - <entity-one entity-name="CustRequestItem" value-name="custRequestItem"/> + <entity-one entity-name="CustRequest" value-field="custRequest"/> + <entity-one entity-name="CustRequestItem" value-field="custRequestItem"/> <set field="statusId" from-field="custRequestItem.statusId"/> - <entity-one entity-name="StatusItem" value-name="currentStatus"/> + <entity-one entity-name="StatusItem" value-field="currentStatus"/> <script location="component://order/webapp/ordermgr/WEB-INF/actions/request/GetNextSequenceNum.groovy"/> </actions> <widgets> @@ -239,8 +239,8 @@ <set field="headerItem" value="request"/> <set field="custRequestId" from-field="parameters.custRequestId"/> <set field="custRequestItemSeqId" from-field="parameters.custRequestItemSeqId"/> - <entity-one entity-name="CustRequest" value-name="custRequest"/> - <entity-one entity-name="CustRequestItem" value-name="custRequestItem"/> + <entity-one entity-name="CustRequest" value-field="custRequest"/> + <entity-one entity-name="CustRequestItem" value-field="custRequestItem"/> <script location="component://order/webapp/ordermgr/WEB-INF/actions/request/RequestItemNotes.groovy"/> </actions> <widgets> @@ -277,11 +277,11 @@ <set field="headerItem" value="request"/> <set field="custRequestId" from-field="parameters.custRequestId"/> <set field="custRequestItemSeqId" from-field="parameters.custRequestItemSeqId"/> - <entity-one entity-name="CustRequest" value-name="custRequest"/> - <entity-one entity-name="CustRequestItem" value-name="custRequestItem"/> - <entity-and entity-name="RequirementCustRequestView" list-name="custRequestRequirements"> - <field-map env-name="custRequestItem.custRequestId" field-name="custRequestId"/> - <field-map env-name="custRequestItem.custRequestItemSeqId" field-name="custRequestItemSeqId"/> + <entity-one entity-name="CustRequest" value-field="custRequest"/> + <entity-one entity-name="CustRequestItem" value-field="custRequestItem"/> + <entity-and entity-name="RequirementCustRequestView" list="custRequestRequirements"> + <field-map from-field="custRequestItem.custRequestId" field-name="custRequestId"/> + <field-map from-field="custRequestItem.custRequestItemSeqId" field-name="custRequestItemSeqId"/> </entity-and> </actions> <widgets> @@ -317,11 +317,11 @@ <set field="headerItem" value="request"/> <set field="custRequestId" from-field="parameters.custRequestId"/> <set field="custRequestItemSeqId" from-field="parameters.custRequestItemSeqId"/> - <entity-one entity-name="CustRequest" value-name="custRequest"/> - <entity-one entity-name="CustRequestItem" value-name="custRequestItem"/> - <entity-and entity-name="QuoteItem" list-name="quotes"> - <field-map env-name="custRequestItem.custRequestId" field-name="custRequestId"/> - <field-map env-name="custRequestItem.custRequestItemSeqId" field-name="custRequestItemSeqId"/> + <entity-one entity-name="CustRequest" value-field="custRequest"/> + <entity-one entity-name="CustRequestItem" value-field="custRequestItem"/> + <entity-and entity-name="QuoteItem" list="quotes"> + <field-map from-field="custRequestItem.custRequestId" field-name="custRequestId"/> + <field-map from-field="custRequestItem.custRequestItemSeqId" field-name="custRequestItemSeqId"/> </entity-and> <script location="component://order/webapp/ordermgr/WEB-INF/actions/request/SetRequestQuote.groovy"/> </actions> @@ -361,9 +361,9 @@ <set field="custRequestItemSeqId" from-field="parameters.custRequestItemSeqId"/> <set field="quoteId" from-field="parameters.quoteId"/> <set field="quoteItemSeqId" from-field="parameters.quoteItemSeqId"/> - <entity-one entity-name="CustRequest" value-name="custRequest"/> - <entity-one entity-name="CustRequestItem" value-name="custRequestItem"/> - <entity-one entity-name="QuoteItem" value-name="quoteItem"/> + <entity-one entity-name="CustRequest" value-field="custRequest"/> + <entity-one entity-name="CustRequestItem" value-field="custRequestItem"/> + <entity-one entity-name="QuoteItem" value-field="quoteItem"/> <set field="parameters.quantity" from-field="custRequestItem.quantity"/> <set field="parameters.selectedAmount" from-field="custRequestItem.selectedAmount"/> <set field="parameters.comments" from-field="custRequestItem.story"/> @@ -401,9 +401,9 @@ <set field="custRequestItemSeqId" from-field="parameters.custRequestItemSeqId"/> <set field="quoteId" from-field="parameters.quoteId"/> <set field="quoteItemSeqId" from-field="parameters.quoteItemSeqId"/> - <entity-one entity-name="CustRequest" value-name="custRequest"/> - <entity-one entity-name="CustRequestItem" value-name="custRequestItem"/> - <entity-one entity-name="QuoteItem" value-name="quoteItem"/> + <entity-one entity-name="CustRequest" value-field="custRequest"/> + <entity-one entity-name="CustRequestItem" value-field="custRequestItem"/> + <entity-one entity-name="QuoteItem" value-field="quoteItem"/> <set field="parameters.quantity" from-field="custRequestItem.quantity"/> <set field="parameters.selectedAmount" from-field="custRequestItem.selectedAmount"/> </actions> @@ -440,9 +440,9 @@ <set field="custRequestId" from-field="parameters.custRequestId"/> <set field="custRequestItemSeqId" from-field="parameters.custRequestItemSeqId"/> - <entity-one entity-name="CustRequest" value-name="custRequest"/> - <entity-one entity-name="CustRequestItem" value-name="custRequestItem"/> - <entity-and entity-name="CustRequestItemWorkEffort" list-name="custRequestItemWorkEffortList"> + <entity-one entity-name="CustRequest" value-field="custRequest"/> + <entity-one entity-name="CustRequestItem" value-field="custRequestItem"/> + <entity-and entity-name="CustRequestItemWorkEffort" list="custRequestItemWorkEffortList"> <field-map field-name="custRequestId"/> <field-map field-name="custRequestItemSeqId"/> <order-by field-name="workEffortId"/> @@ -464,7 +464,7 @@ <screen name="ViewRequestItemInfo"> <section> <condition> - <not><if-empty field-name="requestItems"/></not> + <not><if-empty field="requestItems"/></not> </condition> <widgets> <platform-specific> @@ -480,8 +480,8 @@ <set field="tabButtonItem" value="custRequestContent"/> <set field="headerItem" value="request"/> <set field="custRequestId" from-field="parameters.custRequestId"/> - <entity-and entity-name="CustRequestAndContent" list-name="custRequstAndContents"> - <field-map field-name="custRequestId" env-name="custRequestId"/> + <entity-and entity-name="CustRequestAndContent" list="custRequstAndContents"> + <field-map field-name="custRequestId" from-field="custRequestId"/> </entity-and> </actions> <widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |