OFBiz › OFBiz - Commits

svn commit: r829418 [4/4] - in /ofbiz/trunk: applications/accounting/widget/ applications/commonext/widget/ofbizsetup/ applications/party/webapp/partymgr/contactlist/ applications/party/webapp/partymgr/lookup/ applications/party/webapp/partymgr/party/ ...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

buscob

svn commit: r829418 [4/4] - in /ofbiz/trunk: applications/accounting/widget/ applications/commonext/widget/ofbizsetup/ applications/party/webapp/partymgr/contactlist/ applications/party/webapp/partymgr/lookup/ applications/party/webapp/partymgr/party/ ...

Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=829418&r1=829417&r2=829418&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Sat Oct 24 17:41:31 2009
@@ -91,7 +91,7 @@
<container style="button-bar"><link target="EditFacility" text="${uiLabelMap.ProductCreateNewFacility}" style="buttontext"/></container>
</widgets>
</section>
- <include-form name="FindFacility10" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="FindFacility10" location="component://product/widget/facility/FacilityForms.xml"/>
</widgets>
</section>
<section>
@@ -111,7 +111,7 @@
</section>
</decorator-section>
<decorator-section name="search-options">
- <include-form name="FindFacilityOptions" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="FindFacilityOptions" location="component://product/widget/facility/FacilityForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
<include-screen name="FacilitySearchResults"/>
@@ -140,7 +140,7 @@
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
</actions>
<widgets>
- <include-form name="FindFacility" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="FindFacility" location="component://product/widget/facility/FacilityForms.xml"/>
</widgets>
</section>
</screen>
@@ -269,7 +269,7 @@
</link>
</container>
<screenlet title="${uiLabelMap.ProductInventoryTransfersFor} ${facility.facilityName} [${uiLabelMap.CommonId}: ${facilityId}] ${uiLabelMap.CommonTo}: ${facility.facilityName} [${uiLabelMap.CommonId}: ${facilityId}]}">
- <include-form name="ToFacilityTransfers" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="ToFacilityTransfers" location="component://product/widget/facility/FacilityForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.CommonFrom}: ${facility.facilityName} [${uiLabelMap.CommonId}: ${facilityId}]">
<section>
@@ -277,10 +277,10 @@
<if-compare field="parameters.completeRequested" operator="equals" value="true"/>
</condition>
<widgets>
- <include-form name="FromFacilityTransfersComplete" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="FromFacilityTransfersComplete" location="component://product/widget/facility/FacilityForms.xml"/>
</widgets>
<fail-widgets>
- <include-form name="FromFacilityTransfers" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="FromFacilityTransfers" location="component://product/widget/facility/FacilityForms.xml"/>
</fail-widgets>
</section>
</screenlet>
@@ -366,10 +366,10 @@
</container>
</decorator-section>
<decorator-section name="search-options">
- <include-form name="SearchInventoryItemsParams" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="SearchInventoryItemsParams" location="component://product/widget/facility/FacilityForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="ListFacilityInventoryItems" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="ListFacilityInventoryItems" location="component://product/widget/facility/FacilityForms.xml"/>
</decorator-section>
</decorator-screen>
</decorator-section>
@@ -411,7 +411,7 @@
<platform-specific>
<html><html-template location="component://product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl"/></html>
</platform-specific>
- <include-form name="ListFacilityInventoryItemsNoLocations" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="ListFacilityInventoryItemsNoLocations" location="component://product/widget/facility/FacilityForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -448,10 +448,10 @@
<include-menu name="ViewFacilityInventoryByProductTabBar" location="component://product/widget/facility/FacilityMenus.xml"/>
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="FindFacilityInventoryByProduct" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="FindFacilityInventoryByProduct" location="component://product/widget/facility/FacilityForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="ListFacilityInventoryByProduct" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="ListFacilityInventoryByProduct" location="component://product/widget/facility/FacilityForms.xml"/>
</decorator-section>
</decorator-screen>
</decorator-section>
@@ -502,8 +502,8 @@
</link>
</container>

- <include-form name="FindFacilityInventoryByProduct" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
- <include-form name="ListFacilityInventoryByProduct" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="FindFacilityInventoryByProduct" location="component://product/widget/facility/FacilityForms.xml"/>
+ <include-form name="ListFacilityInventoryByProduct" location="component://product/widget/facility/FacilityForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -534,8 +534,8 @@
<widgets>
<decorator-screen name="SimpleDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-form name="FindFacilityInventoryByProduct" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
- <include-form name="ListFacilityInventoryByProduct" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="FindFacilityInventoryByProduct" location="component://product/widget/facility/FacilityForms.xml"/>
+ <include-form name="ListFacilityInventoryByProduct" location="component://product/widget/facility/FacilityForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -565,7 +565,7 @@
<link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext"/>
</container>
<screenlet title="${uiLabelMap.PageTitleViewFacilityInventoryItemsDetails}">
- <include-form name="SearchInventoryItemsDetailsParams" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="SearchInventoryItemsDetailsParams" location="component://product/widget/facility/FacilityForms.xml"/>
</screenlet>
<section>
<condition>
@@ -573,7 +573,7 @@
</condition>
<widgets>
<screenlet title="${uiLabelMap.PageTitleViewFacilityInventoryItemsDetails}">
- <include-form name="ListFacilityInventoryItemsDetailsByItem" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="ListFacilityInventoryItemsDetailsByItem" location="component://product/widget/facility/FacilityForms.xml"/>
</screenlet>
</widgets>
</section>
@@ -583,7 +583,7 @@
</condition>
<widgets>
<screenlet title="${uiLabelMap.PageTitleViewFacilityInventoryItemsDetails}">
- <include-form name="ListFacilityInventoryItemsDetailsByProduct" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="ListFacilityInventoryItemsDetailsByProduct" location="component://product/widget/facility/FacilityForms.xml"/>
</screenlet>
</widgets>
</section>
@@ -593,7 +593,7 @@
</condition>
<widgets>
<screenlet title="${uiLabelMap.PageTitleViewFacilityInventoryItemsDetails}">
- <include-form name="ListFacilityInventoryItemsDetailsByDate" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="ListFacilityInventoryItemsDetailsByDate" location="component://product/widget/facility/FacilityForms.xml"/>
</screenlet>
</widgets>
</section>
@@ -622,7 +622,7 @@
<decorator-section name="body">
<include-menu name="ViewFacilityInventoryByProductTabBar" location="component://product/widget/facility/FacilityMenus.xml"/>
<screenlet title="${uiLabelMap.ProductInventoryItemTotals} ${uiLabelMap.CommonFor} ${facility.facilityName}">
- <include-form name="ListInventoryItemTotals" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="ListInventoryItemTotals" location="component://product/widget/facility/FacilityForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -647,7 +647,7 @@
<decorator-section name="body">
<include-menu name="ViewFacilityInventoryByProductTabBar" location="component://product/widget/facility/FacilityMenus.xml"/>
<screenlet title="${title}">
- <include-form name="ListInventoryItemGrandTotals" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="ListInventoryItemGrandTotals" location="component://product/widget/facility/FacilityForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -672,11 +672,11 @@
<container>
<label style="h2" text="${uiLabelMap.ProductInventoryItemTotals} ${uiLabelMap.CommonFor} ${facility.facilityName}"/>
</container>
- <include-form name="InventoryItemTotalsExport" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="InventoryItemTotalsExport" location="component://product/widget/facility/FacilityForms.xml"/>
<container>
<label style="h2" text="${uiLabelMap.ProductInventoryItemGrandTotals} ${uiLabelMap.CommonFor} ${facility.facilityName}"/>
</container>
- <include-form name="InventoryItemGrandTotalsExport" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="InventoryItemGrandTotalsExport" location="component://product/widget/facility/FacilityForms.xml"/>
</widgets>
</section>
</screen>
@@ -698,7 +698,7 @@
<decorator-section name="body">
<include-menu name="ViewFacilityInventoryByProductTabBar" location="component://product/widget/facility/FacilityMenus.xml"/>
<screenlet title="${uiLabelMap.ProductInventoryAverageCosts} ${uiLabelMap.CommonFor} ${facility.facilityName}">
- <include-form name="ListInventoryAverageCosts" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="ListInventoryAverageCosts" location="component://product/widget/facility/FacilityForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -728,9 +728,9 @@
<link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext"/>
</container>
<screenlet id="add-facility-group-member" title="${uiLabelMap.ProductAddFacilityGroupMember}" collapsible="true">
- <include-form name="addGroupToFacility" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="addGroupToFacility" location="component://product/widget/facility/FacilityForms.xml"/>
</screenlet>
- <include-form name="EditFacilityGroups" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="EditFacilityGroups" location="component://product/widget/facility/FacilityForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -760,9 +760,9 @@
<link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext"/>
</container>
<screenlet id="add-facility-party-role" title="${uiLabelMap.ProductAddFacilityPartyRole}" collapsible="true">
- <include-form name="AddPartyToFacility" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="AddPartyToFacility" location="component://product/widget/facility/FacilityForms.xml"/>
</screenlet>
- <include-form name="EditFacilityParties" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="EditFacilityParties" location="component://product/widget/facility/FacilityForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -904,14 +904,14 @@
</container>
</fail-widgets>
</section>
- <include-form name="EditInventoryItem" location="component://product/webapp/facility/inventory/InventoryForms.xml"/>
+ <include-form name="EditInventoryItem" location="component://product/widget/facility/InventoryForms.xml"/>
<section>
<condition>
<not><if-empty field="inventoryItemId"/></not>
</condition>
<widgets>
<screenlet id="inventory-item-reservations" title="${uiLabelMap.ProductInventoryItemReservations}" initially-collapsed="true">
- <include-form name="InventoryItemReservations" location="component://product/webapp/facility/inventory/InventoryForms.xml"/>
+ <include-form name="InventoryItemReservations" location="component://product/widget/facility/InventoryForms.xml"/>
</screenlet>
</widgets>
</section>
@@ -924,8 +924,8 @@
</actions>
<widgets>
<screenlet id="physical-inventory-variances" title="${uiLabelMap.ProductPhysicalInventoryVariances}" initially-collapsed="true">
- <include-form name="CreatePhysicalInventoryAndVariance" location="component://product/webapp/facility/inventory/InventoryForms.xml"/>
- <include-form name="ViewPhysicalInventoryAndVariance" location="component://product/webapp/facility/inventory/InventoryForms.xml"/>
+ <include-form name="CreatePhysicalInventoryAndVariance" location="component://product/widget/facility/InventoryForms.xml"/>
+ <include-form name="ViewPhysicalInventoryAndVariance" location="component://product/widget/facility/InventoryForms.xml"/>
</screenlet>
</widgets>
</section>
@@ -957,10 +957,10 @@
<decorator-section name="body">
<include-menu name="InventoryItemTabBar" location="component://product/widget/facility/FacilityMenus.xml"/>
<screenlet title="${uiLabelMap.ProductInventoryDetails} ${uiLabelMap.CommonFor} [${inventoryItemId}]">
- <include-form name="ListInventoryItemDetail" location="component://product/webapp/facility/inventory/InventoryForms.xml"/>
+ <include-form name="ListInventoryItemDetail" location="component://product/widget/facility/InventoryForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.ProductShipmentReceiptsFor} [${inventoryItemId}]">
- <include-form name="ViewInventoryItemShipmentReceipts" location="component://product/webapp/facility/inventory/InventoryForms.xml"/>
+ <include-form name="ViewInventoryItemShipmentReceipts" location="component://product/widget/facility/InventoryForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -990,9 +990,9 @@
<decorator-section name="body">
<include-menu name="InventoryItemTabBar" location="component://product/widget/facility/FacilityMenus.xml"/>
<screenlet id="AddInventoryItemLabelPanel" title="${uiLabelMap.ProductInventoryItemLabels} ${uiLabelMap.CommonFor} [${inventoryItemId}]" collapsible="true">
- <include-form name="AddInventoryItemLabelAppl" location="component://product/webapp/facility/inventory/InventoryForms.xml"/>
+ <include-form name="AddInventoryItemLabelAppl" location="component://product/widget/facility/InventoryForms.xml"/>
</screenlet>
- <include-form name="UpdateInventoryItemLabelAppls" location="component://product/webapp/facility/inventory/InventoryForms.xml"/>
+ <include-form name="UpdateInventoryItemLabelAppls" location="component://product/widget/facility/InventoryForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -1011,10 +1011,10 @@
<decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleFindFacilityPhysicalInventory}">
- <include-form name="FindPhysicalInventory" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="FindPhysicalInventory" location="component://product/widget/facility/FacilityForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.PageTitleFindFacilityPhysicalInventory}">
- <include-form name="ListPhysicalInventory" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="ListPhysicalInventory" location="component://product/widget/facility/FacilityForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -1355,7 +1355,7 @@
<decorator-screen name="CommonFacilityScheduleDecorator">
<decorator-section name="schedule-body">
<screenlet title="${uiLabelMap.PageTitlePackageShipmentScheduling}">
- <include-form name="SchedulingList" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="SchedulingList" location="component://product/widget/facility/FacilityForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -1385,7 +1385,7 @@
<decorator-screen name="CommonFacilityScheduleDecorator">
<decorator-section name="schedule-body">
<screenlet title="${uiLabelMap.PageTitleLabelPrinting}">
- <include-form name="Labels" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="Labels" location="component://product/widget/facility/FacilityForms.xml"/>
<platform-specific>
<html><html-template location="component://product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl"/></html>
</platform-specific>

Modified: ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml?rev=829418&r1=829417&r2=829418&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml Sat Oct 24 17:41:31 2009
@@ -36,7 +36,7 @@
<link target="EditInventoryItemLabel" text="${uiLabelMap.CommonNew}" style="buttontext"/>
</container>
<screenlet title="${uiLabelMap.PageTitleFindInventoryItemLabels}">
- <include-form name="ListInventoryItemLabels" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/>
+ <include-form name="ListInventoryItemLabels" location="component://product/widget/facility/InventoryItemLabelForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -55,9 +55,9 @@
<decorator-screen name="CommonInventoryItemLabelsDecorator" location="${parameters.commonFacilityDecoratorLocation}">
<decorator-section name="body">
<screenlet id="AddInventoryItemLabelTypePanel" title="${uiLabelMap.PageTitleAddInventoryItemLabelTypes}" collapsible="true">
- <include-form name="AddInventoryItemLabelType" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/>
+ <include-form name="AddInventoryItemLabelType" location="component://product/widget/facility/InventoryItemLabelForms.xml"/>
</screenlet>
- <include-form name="UpdateInventoryItemLabelTypes" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/>
+ <include-form name="UpdateInventoryItemLabelTypes" location="component://product/widget/facility/InventoryItemLabelForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -81,7 +81,7 @@
<decorator-screen name="CommonInventoryItemLabelDecorator" location="${parameters.commonFacilityDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.ProductInventoryItemLabel}">
- <include-form name="EditInventoryItemLabel" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/>
+ <include-form name="EditInventoryItemLabel" location="component://product/widget/facility/InventoryItemLabelForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -93,7 +93,7 @@
<link target="EditInventoryItemLabel" text="${uiLabelMap.CommonNew}" style="buttontext"/>
</container>
<screenlet title="${uiLabelMap.ProductInventoryItemLabel}">
- <include-form name="EditInventoryItemLabel" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/>
+ <include-form name="EditInventoryItemLabel" location="component://product/widget/facility/InventoryItemLabelForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -118,9 +118,9 @@
<decorator-section name="body">
<container><label style="h2">${uiLabelMap.CommonType}: ${inventoryItemLabelType.description} [${inventoryItemLabelType.inventoryItemLabelTypeId}]</label></container>
<screenlet id="AddInventoryItemLabelApplPanel" title="${uiLabelMap.PageTitleAddInventoryItemLabelAppls}" collapsible="true">
- <include-form name="AddInventoryItemLabelAppl" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/>
+ <include-form name="AddInventoryItemLabelAppl" location="component://product/widget/facility/InventoryItemLabelForms.xml"/>
</screenlet>
- <include-form name="UpdateInventoryItemLabelAppls" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/>
+ <include-form name="UpdateInventoryItemLabelAppls" location="component://product/widget/facility/InventoryItemLabelForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>

Modified: ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml?rev=829418&r1=829417&r2=829418&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml Sat Oct 24 17:41:31 2009
@@ -35,10 +35,10 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupFacility" location="component://product/webapp/facility/lookup/FieldLookupForms.xml"/>
+ <include-form name="lookupFacility" location="component://product/widget/facility/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupFacility" location="component://product/webapp/facility/lookup/FieldLookupForms.xml"/>
+ <include-form name="listLookupFacility" location="component://product/widget/facility/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -59,10 +59,10 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupFacilityLocation" location="component://product/webapp/facility/lookup/FieldLookupForms.xml"/>
+ <include-form name="lookupFacilityLocation" location="component://product/widget/facility/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupFacilityLocation" location="component://product/webapp/facility/lookup/FieldLookupForms.xml"/>
+ <include-form name="listLookupFacilityLocation" location="component://product/widget/facility/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -82,10 +82,10 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupShipment" location="component://product/webapp/facility/lookup/FieldLookupForms.xml"/>
+ <include-form name="lookupShipment" location="component://product/widget/facility/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listShipment" location="component://product/webapp/facility/lookup/FieldLookupForms.xml"/>
+ <include-form name="listShipment" location="component://product/widget/facility/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -133,7 +133,7 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-results">
- <include-form name="ListProductInventoryLocation" location="component://product/webapp/facility/lookup/FieldLookupForms.xml"/>
+ <include-form name="ListProductInventoryLocation" location="component://product/widget/facility/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>

Modified: ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml?rev=829418&r1=829417&r2=829418&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml Sat Oct 24 17:41:31 2009
@@ -58,10 +58,10 @@
<link target="ViewFacilityInventoryByProductExport?${searchParameterString}" text="${uiLabelMap.CommonExport}" style="buttontext"/>
</container>
<screenlet title="${uiLabelMap.PageTitleFindFacilityInventoryItemsByProduct}">
- <include-form name="FindFacilityInventoryByProduct" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="FindFacilityInventoryByProduct" location="component://product/widget/facility/FacilityForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.PageTitleFindFacilityInventoryItemsByProduct}">
- <include-form name="ListFacilityInventoryByProduct" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="ListFacilityInventoryByProduct" location="component://product/widget/facility/FacilityForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml?rev=829418&r1=829417&r2=829418&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml Sat Oct 24 17:41:31 2009
@@ -63,8 +63,8 @@
<link target="ViewFacilityInventoryByProductExport?${searchParameterString}" text="${uiLabelMap.CommonExport}" style="buttontext"/>
</container>

- <include-form name="FindFacilityInventoryByProduct" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
- <include-form name="ListFacilityInventoryByProduct" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <include-form name="FindFacilityInventoryByProduct" location="component://product/widget/facility/FacilityForms.xml"/>
+ <include-form name="ListFacilityInventoryByProduct" location="component://product/widget/facility/FacilityForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/LookupScreens.xml?rev=829418&r1=829417&r2=829418&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/LookupScreens.xml Sat Oct 24 17:41:31 2009
@@ -43,7 +43,7 @@
<include-form name="lookupPerson" location="component://assetmaint/widget/forms/LookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupPerson" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
+ <include-form name="listLookupPerson" location="component://party/widget/partymgr/LookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml?rev=829418&r1=829417&r2=829418&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml Sat Oct 24 17:41:31 2009
@@ -114,7 +114,7 @@
</field>
</form>

- <form name="AddProductMaint" extends="AddProductMaint" extends-resource="component://product/webapp/catalog/product/ProductForms.xml">
+ <form name="AddProductMaint" extends="AddProductMaint" extends-resource="component://product/widget/catalog/ProductForms.xml">
<field name="fixedAssetId"><hidden value="${parameters.fixedAssetId}"></hidden></field>
</form>

Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml?rev=829418&r1=829417&r2=829418&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml Sat Oct 24 17:41:31 2009
@@ -131,11 +131,11 @@
<decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleEditProduct}">
- <include-form name="EditProduct" location="component://product/webapp/catalog/product/ProductForms.xml"/>
+ <include-form name="EditProduct" location="component://product/widget/catalog/ProductForms.xml"/>
</screenlet>

<screenlet title="${uiLabelMap.ProductDuplicateProduct}">
- <include-form name="EditProductDup" location="component://product/webapp/catalog/product/ProductForms.xml"/>
+ <include-form name="EditProductDup" location="component://product/widget/catalog/ProductForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>

Modified: ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml?rev=829418&r1=829417&r2=829418&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml Sat Oct 24 17:41:31 2009
@@ -99,11 +99,11 @@
<decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleEditProduct}">
- <include-form name="EditProduct" location="component://product/webapp/catalog/product/ProductForms.xml"/>
+ <include-form name="EditProduct" location="component://product/widget/catalog/ProductForms.xml"/>
</screenlet>

<screenlet title="${uiLabelMap.ProductDuplicateProduct}">
- <include-form name="EditProductDup" location="component://product/webapp/catalog/product/ProductForms.xml"/>
+ <include-form name="EditProductDup" location="component://product/widget/catalog/ProductForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>

Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=829418&r1=829417&r2=829418&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Sat Oct 24 17:41:31 2009
@@ -173,7 +173,7 @@
<widgets>
<label style="h2" text="${uiLabelMap.MyPortalRegisterComplete}"/><link target="main" style="h2" text="${uiLabelMap.CommonBeLogged}"/>
<screenlet title="${uiLabelMap.PartyPersonalInformation}">
- <include-form name="ViewPartyPerson" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <include-form name="ViewPartyPerson" location="component://party/widget/partymgr/PartyForms.xml"/>
</screenlet>
</widgets>
<fail-widgets>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=829418&r1=829417&r2=829418&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Sat Oct 24 17:41:31 2009
@@ -648,7 +648,7 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="EditPerson" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <include-form name="EditPerson" location="component://party/widget/partymgr/PartyForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -669,7 +669,7 @@
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container><label text="${uiLabelMap.PageTitleNewPartyNote}" style="h2"/></container>
- <include-form name="AddPartyNote" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <include-form name="AddPartyNote" location="component://party/widget/partymgr/PartyForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -826,7 +826,7 @@
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container><label text="${uiLabelMap.PartyCreateUserLogin}" style="h2"/></container>
- <include-form name="AddUserLogin" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <include-form name="AddUserLogin" location="component://party/widget/partymgr/PartyForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -912,9 +912,9 @@
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container><label text="${uiLabelMap.PartyUserLoginChangePassword}" style="h2"/></container>
- <include-form name="updatePassword" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <include-form name="updatePassword" location="component://party/widget/partymgr/PartyForms.xml"/>
<container><label text="${uiLabelMap.PartyUserLoginUpdateSecuritySettings}" style="h2"/></container>
- <include-form name="updateUserLoginSecurity" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <include-form name="updateUserLoginSecurity" location="component://party/widget/partymgr/PartyForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -960,7 +960,7 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="EditPartyGroup" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <include-form name="EditPartyGroup" location="component://party/widget/partymgr/PartyForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml?rev=829418&r1=829417&r2=829418&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml Sat Oct 24 17:41:31 2009
@@ -105,7 +105,7 @@
<include-screen name="Contact" location="component://party/widget/partymgr/ProfileScreens.xml"/>
<include-screen name="contactsAndAccounts" location="component://party/widget/partymgr/ProfileScreens.xml"/>
<screenlet title="${uiLabelMap.PartyMemberRoles}" navigation-form-name="ViewPartyRoles">
- <include-form name="ViewPartyRoles" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <include-form name="ViewPartyRoles" location="component://party/widget/partymgr/PartyForms.xml"/>
</screenlet>
</container>
<container style="righthalf">
@@ -136,9 +136,9 @@
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet id="AddPartyRatePanel" title="${uiLabelMap.PageTitleEditPartyRates}" collapsible="true">
- <include-form name="AddPartyRate" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <include-form name="AddPartyRate" location="component://party/widget/partymgr/PartyForms.xml"/>
</screenlet>
- <include-form name="ListPartyRates" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <include-form name="ListPartyRates" location="component://party/widget/partymgr/PartyForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -164,7 +164,7 @@
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PartyMemberRoles}" navigation-form-name="ViewPartyRoles">
- <include-form name="ViewPartyRoles" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <include-form name="ViewPartyRoles" location="component://party/widget/partymgr/PartyForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.PartyAddToRole}">
<include-form name="AddPartyRole" location="component://projectmgr/widget/forms/ResourceForms.xml"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml?rev=829418&r1=829417&r2=829418&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml Sat Oct 24 17:41:31 2009
@@ -79,7 +79,7 @@
</field>
<field name="addButton" ><submit/></field>
</form>
- <form name="AddPartyRole" extends="AddPartyRole" extends-resource="component://party/webapp/partymgr/party/PartyForms.xml">
+ <form name="AddPartyRole" extends="AddPartyRole" extends-resource="component://party/widget/partymgr/PartyForms.xml">
<field name="roleTypeId">
<drop-down allow-empty="false">
<entity-options entity-name="RoleType" description="${description}">