svn commit: r829377 - in /ofbiz/trunk/applications: order/data/ order/webapp/ordermgr/entry/ order/webapp/ordermgr/lookup/ order/webapp/ordermgr/order/ order/webapp/ordermgr/quote/ order/webapp/ordermgr/requirem
Locked
svn commit: r829377 - in /ofbiz/trunk/applications: order/data/ order/webapp/ordermgr/entry/ order/webapp/ordermgr/lookup/ order/webapp/ordermgr/order/ order/webapp/ordermgr/quote/ order/webapp/ordermgr/requirem
 
|
Author: buscob
Date: Sat Oct 24 14:29:27 2009 New Revision: 829377 URL: http://svn.apache.org/viewvc?rev=829377&view=rev Log: Part of OFBIZ-3067 - Menus and form widget files location Order component Moved forms from webapp to widget folder Removed empty folders Added: ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml - copied unchanged from r829330, ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderDeliveryScheduleForms.xml - copied unchanged from r829330, ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderDeliveryScheduleForms.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderForms.xml - copied unchanged from r829330, ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderShopListForms.xml - copied unchanged from r829330, ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderShopListForms.xml ofbiz/trunk/applications/order/widget/ordermgr/PartySettingsForm.xml - copied unchanged from r829330, ofbiz/trunk/applications/order/webapp/ordermgr/entry/PartySettingsForm.xml ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml - copied unchanged from r829330, ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml ofbiz/trunk/applications/order/widget/ordermgr/RequirementForms.xml - copied unchanged from r829330, ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml ofbiz/trunk/applications/order/widget/ordermgr/ReturnForms.xml - copied unchanged from r829330, ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml Removed: ofbiz/trunk/applications/order/webapp/ordermgr/entry/PartySettingsForm.xml ofbiz/trunk/applications/order/webapp/ordermgr/lookup/ ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderDeliveryScheduleForms.xml ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderShopListForms.xml ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml ofbiz/trunk/applications/order/webapp/ordermgr/requirement/ ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml Modified: ofbiz/trunk/applications/order/data/OrderPortletData.xml ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.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/RequirementScreens.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml Modified: ofbiz/trunk/applications/order/data/OrderPortletData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/OrderPortletData.xml?rev=829377&r1=829376&r2=829377&view=diff ============================================================================== --- ofbiz/trunk/applications/order/data/OrderPortletData.xml (original) +++ ofbiz/trunk/applications/order/data/OrderPortletData.xml Sat Oct 24 14:29:27 2009 @@ -53,7 +53,7 @@ screenLocation="component://order/widget/ordermgr/OrderViewScreens.xml" description="List Orders placed by customer" securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW" editFormName="EditOrderByCustomer" - editFormLocation="component://order/webapp/ordermgr/order/OrderForms.xml"/> + editFormLocation="component://order/widget/ordermgr/OrderForms.xml"/> <PortletPortletCategory portalPortletId="ListCustomerOrders" portletCategoryId="ORDERMGR"/> <!-- List Todays Order --> Modified: ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml?rev=829377&r1=829376&r2=829377&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml Sat Oct 24 14:29:27 2009 @@ -40,10 +40,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupOrderHeader" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/> + <include-form name="lookupOrderHeader" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupOrderHeader" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/> + <include-form name="listLookupOrderHeader" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -67,10 +67,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupOrderHeaderAndShipInfo" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/> + <include-form name="lookupOrderHeaderAndShipInfo" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupOrderHeaderAndShipInfo" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/> + <include-form name="listLookupOrderHeaderAndShipInfo" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -95,10 +95,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupPurchaseOrderHeaderAndShipInfo" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/> + <include-form name="lookupPurchaseOrderHeaderAndShipInfo" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupOrderHeaderAndShipInfo" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/> + <include-form name="listLookupOrderHeaderAndShipInfo" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -122,10 +122,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupCustRequest" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/> + <include-form name="lookupCustRequest" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupCustRequest" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/> + <include-form name="listLookupCustRequest" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -149,10 +149,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupCustRequestItem" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/> + <include-form name="lookupCustRequestItem" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupCustRequestItem" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/> + <include-form name="listLookupCustRequestItem" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -175,10 +175,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupQuote" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/> + <include-form name="lookupQuote" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupQuote" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/> + <include-form name="listLookupQuote" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -202,10 +202,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupQuoteItem" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/> + <include-form name="lookupQuoteItem" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupQuoteItem" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/> + <include-form name="listLookupQuoteItem" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -228,10 +228,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupRequirement" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/> + <include-form name="lookupRequirement" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupRequirement" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/> + <include-form name="listLookupRequirement" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -254,10 +254,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupShoppingList" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/> + <include-form name="lookupShoppingList" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupShoppingList" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/> + <include-form name="listLookupShoppingList" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml?rev=829377&r1=829376&r2=829377&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml Sat Oct 24 14:29:27 2009 @@ -297,7 +297,7 @@ <platform-specific> <html><html-template location="component://order/webapp/ordermgr/entry/OrderEntryCatalogTabBar.ftl"/></html> </platform-specific> - <include-form location="component://order/webapp/ordermgr/order/OrderForms.xml" name="LookupBulkAddSupplierProductsInApprovedOrder"></include-form> + <include-form location="component://order/widget/ordermgr/OrderForms.xml" name="LookupBulkAddSupplierProductsInApprovedOrder"></include-form> </screenlet> </widgets> </section> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderHeaderScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderHeaderScreens.xml?rev=829377&r1=829376&r2=829377&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderHeaderScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderHeaderScreens.xml Sat Oct 24 14:29:27 2009 @@ -62,7 +62,7 @@ <decorator-screen name="CommonOrderHeaderDecorator"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditOrderHeader}"> - <include-form name="EditOrderHeader" location="component://order/webapp/ordermgr/order/OrderForms.xml"/> + <include-form name="EditOrderHeader" location="component://order/widget/ordermgr/OrderForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -84,7 +84,7 @@ <decorator-screen name="CommonOrderHeaderDecorator"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleListOrderHeaders}"> - <include-form name="ListOrderHeaders" location="component://order/webapp/ordermgr/order/OrderForms.xml"/> + <include-form name="ListOrderHeaders" location="component://order/widget/ordermgr/OrderForms.xml"/> </screenlet> </decorator-section> </decorator-screen> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml?rev=829377&r1=829376&r2=829377&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml Sat Oct 24 14:29:27 2009 @@ -53,8 +53,8 @@ <container> <link style="buttontext" target="returnMain" text="${uiLabelMap.OrderCreateNewReturn}"/> </container> - <include-form name="FindReturns" location="component://order/webapp/ordermgr/return/ReturnForms.xml"/> - <include-form name="ListReturns" location="component://order/webapp/ordermgr/return/ReturnForms.xml"/> + <include-form name="FindReturns" location="component://order/widget/ordermgr/ReturnForms.xml"/> + <include-form name="ListReturns" location="component://order/widget/ordermgr/ReturnForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -96,7 +96,7 @@ <decorator-section name="body"> <section> <widgets> - <include-form name="EditReturn" location="component://order/webapp/ordermgr/return/ReturnForms.xml"/> + <include-form name="EditReturn" location="component://order/widget/ordermgr/ReturnForms.xml"/> </widgets> </section> </decorator-section> @@ -190,7 +190,7 @@ </condition> <widgets> <screenlet id="ReturnStatusHistoryPanel" title="${uiLabelMap.OrderOrderReturn} ${uiLabelMap.CommonStatusHistory}" collapsible="true"> - <include-form location="component://order/webapp/ordermgr/return/ReturnForms.xml" name="ReturnStatusHistory"/> + <include-form location="component://order/widget/ordermgr/ReturnForms.xml" name="ReturnStatusHistory"/> </screenlet> </widgets> <fail-widgets> @@ -218,7 +218,7 @@ </condition> <widgets> <screenlet id="ReturnTypeHistoryPanel" title="${uiLabelMap.OrderReturnTypeHistory}" collapsible="true"> - <include-form location="component://order/webapp/ordermgr/return/ReturnForms.xml" name="ReturnTypeHistory"/> + <include-form location="component://order/widget/ordermgr/ReturnForms.xml" name="ReturnTypeHistory"/> </screenlet> </widgets> <fail-widgets> @@ -246,7 +246,7 @@ </condition> <widgets> <screenlet id="ReturnReasonHistoryPanel" title="${uiLabelMap.OrderReturnReasonHistory}" collapsible="true"> - <include-form location="component://order/webapp/ordermgr/return/ReturnForms.xml" name="ReturnReasonHistory"/> + <include-form location="component://order/widget/ordermgr/ReturnForms.xml" name="ReturnReasonHistory"/> </screenlet> </widgets> <fail-widgets> @@ -274,7 +274,7 @@ </condition> <widgets> <screenlet id="ReturnQuantityHistoryPanel" title="${uiLabelMap.OrderReturnQtyHistory}" collapsible="true"> - <include-form location="component://order/webapp/ordermgr/return/ReturnForms.xml" name="ReturnAndReceivedQuantityHistory"/> + <include-form location="component://order/widget/ordermgr/ReturnForms.xml" name="ReturnAndReceivedQuantityHistory"/> </screenlet> </widgets> <fail-widgets> @@ -302,7 +302,7 @@ </condition> <widgets> <screenlet id="ReceivedQuantityHistoryPanel" title="${uiLabelMap.OrderReceivedQtyHistory}" collapsible="true"> - <include-form location="component://order/webapp/ordermgr/return/ReturnForms.xml" name="ReturnAndReceivedQuantityHistory"/> + <include-form location="component://order/widget/ordermgr/ReturnForms.xml" name="ReturnAndReceivedQuantityHistory"/> </screenlet> </widgets> <fail-widgets> @@ -330,7 +330,7 @@ </condition> <widgets> <screenlet id="ReturnPriceHistoryPanel" title="${uiLabelMap.OrderReturnPriceHistory}" collapsible="true"> - <include-form location="component://order/webapp/ordermgr/return/ReturnForms.xml" name="ReturnPriceHistory"/> + <include-form location="component://order/widget/ordermgr/ReturnForms.xml" name="ReturnPriceHistory"/> </screenlet> </widgets> <fail-widgets> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml?rev=829377&r1=829376&r2=829377&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml Sat Oct 24 14:29:27 2009 @@ -375,9 +375,9 @@ <decorator-screen name="CommonOrderViewDecorator"> <decorator-section name="body"> <screenlet id="AddOrderTermPanel" title="${uiLabelMap.CommonAdd} ${uiLabelMap.OrderOrderTerms}" collapsible="true"> - <include-form name="AddOrderTerm" location="component://order/webapp/ordermgr/order/OrderForms.xml"/> + <include-form name="AddOrderTerm" location="component://order/widget/ordermgr/OrderForms.xml"/> </screenlet> - <include-form name="ListOrderTerms" location="component://order/webapp/ordermgr/order/OrderForms.xml"/> + <include-form name="ListOrderTerms" location="component://order/widget/ordermgr/OrderForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -416,7 +416,7 @@ </condition> <widgets> <screenlet title="${uiLabelMap.OrderShipmentMethodHistory}"> - <include-form location="component://order/webapp/ordermgr/order/OrderForms.xml" name="OrderShipmentMethodHistory"/> + <include-form location="component://order/widget/ordermgr/OrderForms.xml" name="OrderShipmentMethodHistory"/> </screenlet> </widgets> <fail-widgets> @@ -436,7 +436,7 @@ </condition> <widgets> <screenlet title="${uiLabelMap.OrderUnitPriceHistory}"> - <include-form location="component://order/webapp/ordermgr/order/OrderForms.xml" name="OrderUnitPriceHistory"/> + <include-form location="component://order/widget/ordermgr/OrderForms.xml" name="OrderUnitPriceHistory"/> </screenlet> </widgets> <fail-widgets> @@ -456,7 +456,7 @@ </condition> <widgets> <screenlet title="${uiLabelMap.OrderQuantityHistory}"> - <include-form location="component://order/webapp/ordermgr/order/OrderForms.xml" name="OrderQuantityHistory"/> + <include-form location="component://order/widget/ordermgr/OrderForms.xml" name="OrderQuantityHistory"/> </screenlet> </widgets> <fail-widgets> @@ -480,7 +480,7 @@ </actions> <widgets> <screenlet title="${screenletTitle} ${partyId} ${statusId}" navigation-form-name="ListCustomerOrders" > - <include-form name="ListCustomerOrders" location="component://order/webapp/ordermgr/order/OrderForms.xml"/> + <include-form name="ListCustomerOrders" location="component://order/widget/ordermgr/OrderForms.xml"/> </screenlet> </widgets> </section> Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml?rev=829377&r1=829376&r2=829377&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml Sat Oct 24 14:29:27 2009 @@ -36,8 +36,8 @@ <container> <link target="EditQuote" text="${uiLabelMap.OrderCreateOrderQuote}" style="buttontext"/> </container> - <include-form name="FindQuotes" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/> - <include-form name="ListQuotes" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/> + <include-form name="FindQuotes" location="component://order/widget/ordermgr/QuoteForms.xml"/> + <include-form name="ListQuotes" location="component://order/widget/ordermgr/QuoteForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -206,7 +206,7 @@ <decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.OrderOrderQuoteEdit}"> - <include-form name="EditQuote" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/> + <include-form name="EditQuote" location="component://order/widget/ordermgr/QuoteForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -235,7 +235,7 @@ <parameter param-name="quoteId" from-field="quote.quoteId"/> </link> </container> - <include-form name="ListQuoteRoles" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/> + <include-form name="ListQuoteRoles" location="component://order/widget/ordermgr/QuoteForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -264,7 +264,7 @@ <parameter param-name="quoteId" from-field="quote.quoteId"/> </link> </container> - <include-form name="EditQuoteRole" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/> + <include-form name="EditQuoteRole" location="component://order/widget/ordermgr/QuoteForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -296,7 +296,7 @@ <parameter param-name="quoteId" from-field="quote.quoteId"/> </link> </container> - <include-form name="ListQuoteItems" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/> + <include-form name="ListQuoteItems" location="component://order/widget/ordermgr/QuoteForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -325,7 +325,7 @@ <parameter param-name="quoteId" from-field="quote.quoteId"/> </link> </container> - <include-form name="EditQuoteItem" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/> + <include-form name="EditQuoteItem" location="component://order/widget/ordermgr/QuoteForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -353,7 +353,7 @@ <parameter param-name="quoteId" from-field="quote.quoteId"/> </link> </container> - <include-form name="ListQuoteAttributes" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/> + <include-form name="ListQuoteAttributes" location="component://order/widget/ordermgr/QuoteForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -382,7 +382,7 @@ <parameter param-name="quoteId" from-field="quote.quoteId"/> </link> </container> - <include-form name="EditQuoteAttribute" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/> + <include-form name="EditQuoteAttribute" location="component://order/widget/ordermgr/QuoteForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -410,7 +410,7 @@ <parameter param-name="quoteId" from-field="quote.quoteId"/> </link> </container> - <include-form name="ListQuoteCoefficients" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/> + <include-form name="ListQuoteCoefficients" location="component://order/widget/ordermgr/QuoteForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -439,7 +439,7 @@ <parameter param-name="quoteId" from-field="quote.quoteId"/> </link> </container> - <include-form name="EditQuoteCoefficient" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/> + <include-form name="EditQuoteCoefficient" location="component://order/widget/ordermgr/QuoteForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -478,7 +478,7 @@ </platform-specific> </screenlet> <screenlet title="${uiLabelMap.OrderOrderQuotePrices}"> - <include-form name="ManageQuotePrices" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/> + <include-form name="ManageQuotePrices" location="component://order/widget/ordermgr/QuoteForms.xml"/> <platform-specific> <html><html-template location="component://order/webapp/ordermgr/quote/ManageQuotePricesTotals.ftl"/></html> </platform-specific> @@ -515,7 +515,7 @@ <parameter param-name="quoteId" from-field="quote.quoteId"/> </link> </container> - <include-form name="ListQuoteAdjustments" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/> + <include-form name="ListQuoteAdjustments" location="component://order/widget/ordermgr/QuoteForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -544,7 +544,7 @@ <parameter param-name="quoteId" from-field="quote.quoteId"/> </link> </container> - <include-form name="EditQuoteAdjustment" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/> + <include-form name="EditQuoteAdjustment" location="component://order/widget/ordermgr/QuoteForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -581,7 +581,7 @@ <platform-specific> <html><html-template location="component://order/webapp/ordermgr/quote/ViewQuoteProfit.ftl"/></html> </platform-specific> - <include-form name="ViewQuoteProfit" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/> + <include-form name="ViewQuoteProfit" location="component://order/widget/ordermgr/QuoteForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -604,7 +604,7 @@ <decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.OrderOrderQuoteEditReportMail}"> - <include-form name="EditQuoteReportMail" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/> + <include-form name="EditQuoteReportMail" location="component://order/widget/ordermgr/QuoteForms.xml"/> </screenlet> </decorator-section> </decorator-screen> Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml?rev=829377&r1=829376&r2=829377&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml Sat Oct 24 14:29:27 2009 @@ -93,10 +93,10 @@ <decorator-section name="body"> <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="FindRequirements" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/> + <include-form name="FindRequirements" location="component://order/widget/ordermgr/RequirementForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="ListRequirements" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/> + <include-form name="ListRequirements" location="component://order/widget/ordermgr/RequirementForms.xml"/> </decorator-section> </decorator-screen> </decorator-section> @@ -119,10 +119,10 @@ <decorator-section name="body"> <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="FindNotApprovedRequirements" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/> + <include-form name="FindNotApprovedRequirements" location="component://order/widget/ordermgr/RequirementForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="ApproveRequirements" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/> + <include-form name="ApproveRequirements" location="component://order/widget/ordermgr/RequirementForms.xml"/> </decorator-section> </decorator-screen> </decorator-section> @@ -145,7 +145,7 @@ <decorator-screen name="CommonRequirementsDecorator"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleFindApprovedProductRequirements}"> - <include-form name="FindApprovedProductRequirements" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/> + <include-form name="FindApprovedProductRequirements" location="component://order/widget/ordermgr/RequirementForms.xml"/> </screenlet> <section> <actions> @@ -165,16 +165,16 @@ </condition> <widgets> <screenlet title="${uiLabelMap.OrderRequirementsList}"> - <include-form name="ApprovedProductRequirements" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/> + <include-form name="ApprovedProductRequirements" location="component://order/widget/ordermgr/RequirementForms.xml"/> <screenlet> - <include-form name="ApprovedProductRequirementsSummary" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/> + <include-form name="ApprovedProductRequirementsSummary" location="component://order/widget/ordermgr/RequirementForms.xml"/> </screenlet> - <include-form name="ApprovedProductRequirementsSubmit" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/> + <include-form name="ApprovedProductRequirementsSubmit" location="component://order/widget/ordermgr/RequirementForms.xml"/> </screenlet> </widgets> <fail-widgets> <screenlet title="${uiLabelMap.PageTitleFindApprovedProductRequirements}"> - <include-form name="ApprovedProductRequirementsList" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/> + <include-form name="ApprovedProductRequirementsList" location="component://order/widget/ordermgr/RequirementForms.xml"/> </screenlet> </fail-widgets> </section> @@ -196,7 +196,7 @@ <widgets> <decorator-screen name="SimpleDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="body"> - <include-form name="ApprovedProductRequirementsList" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/> + <include-form name="ApprovedProductRequirementsList" location="component://order/widget/ordermgr/RequirementForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -216,7 +216,7 @@ <decorator-screen name="CommonRequirementsDecorator"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleFindApprovedRequirementsBySupplier}"> - <include-form name="ApprovedProductRequirementsByVendor" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/> + <include-form name="ApprovedProductRequirementsByVendor" location="component://order/widget/ordermgr/RequirementForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -236,7 +236,7 @@ <widgets> <decorator-screen name="SimpleDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="body"> - <include-form name="ApprovedProductRequirementsByVendor" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/> + <include-form name="ApprovedProductRequirementsByVendor" location="component://order/widget/ordermgr/RequirementForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -257,7 +257,7 @@ <decorator-screen name="CommonRequirementDecorator"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditRequirement}"> - <include-form name="EditRequirement" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/> + <include-form name="EditRequirement" location="component://order/widget/ordermgr/RequirementForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -282,7 +282,7 @@ <decorator-screen name="CommonRequirementDecorator"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleListRequirementCustRequests}"> - <include-form name="ListRequirementCustRequests" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/> + <include-form name="ListRequirementCustRequests" location="component://order/widget/ordermgr/RequirementForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -308,7 +308,7 @@ <decorator-screen name="CommonRequirementDecorator"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleListRequirementOrders}"> - <include-form name="ListRequirementOrders" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/> + <include-form name="ListRequirementOrders" location="component://order/widget/ordermgr/RequirementForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -342,7 +342,7 @@ <parameter param-name="requirementId"/> </link> </container> - <include-form name="ListRequirementRoles" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/> + <include-form name="ListRequirementRoles" location="component://order/widget/ordermgr/RequirementForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -363,7 +363,7 @@ <decorator-screen name="CommonRequirementDecorator"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditRequirementRole}"> - <include-form name="EditRequirementRole" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/> + <include-form name="EditRequirementRole" location="component://order/widget/ordermgr/RequirementForms.xml"/> </screenlet> </decorator-section> </decorator-screen> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml?rev=829377&r1=829376&r2=829377&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml Sat Oct 24 14:29:27 2009 @@ -45,7 +45,7 @@ </field> </form> <form name="AddWorkEffortRequirement" default-map-name="workRequirementFulfillment" target="createWorkEffortRequirement" title="" type="single" extends="EditRequirement" - extends-resource="component://order/webapp/ordermgr/requirement/RequirementForms.xml" header-row-style="header-row" default-table-style="basic-table"> + extends-resource="component://order/widget/ordermgr/RequirementForms.xml" header-row-style="header-row" default-table-style="basic-table"> <field name="workEffortId"><hidden/></field> <field name="requirementId"><lookup target-form-name="/ordermgr/control/LookupRequirement"/></field> <field name="workReqFulfTypeId"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |