Author: hansbak
Date: Wed Mar 16 01:18:48 2016
New Revision: 1735178
URL: http://svn.apache.org/viewvc?rev=1735178&view=rev
Log:
Improve the decorator for manufacturing/order/facility component for re-use
https://issues.apache.org/jira/browse/OFBIZ-6923
Modified:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml
Modified:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml?rev=1735178&r1=1735177&r2=1735178&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
(original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
Wed Mar 16 01:18:48 2016
@@ -38,6 +38,11 @@ under the License.
<param-name>mainDecoratorLocation</param-name>
<param-value>component://manufacturing/widget/manufacturing/CommonScreens.xml</param-value>
</context-param>
+ <context-param>
+ <description>The location of the CommonManufacturingDecorator screen
to use for this webapp; referred to as a context variable in screen def XML
files.</description>
+ <param-name>commonManufacturingDecoratorLocation</param-name>
+
<param-value>component://manufacturing/widget/manufacturing/CommonScreens.xml</param-value>
+ </context-param>
<filter>
<display-name>ContextFilter</display-name>
<filter-name>ContextFilter</filter-name>
Modified:
ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml?rev=1735178&r1=1735177&r2=1735178&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml
(original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml
Wed Mar 16 01:18:48 2016
@@ -23,7 +23,7 @@ under the License.
<screen name="CommonBomDecorator">
<section>
<widgets>
- <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonManufacturingDecorator"
location="${parameters.commonManufacturingDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for MANUFACTURING, _VIEW permission
-->
Modified:
ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml?rev=1735178&r1=1735177&r2=1735178&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml
(original)
+++
ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml
Wed Mar 16 01:18:48 2016
@@ -23,20 +23,13 @@ under the License.
<screen name="CommonCalendarDecorator">
<section>
<widgets>
- <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonManufacturingDecorator"
location="${parameters.commonManufacturingDecoratorLocation}">
<decorator-section name="body">
<section>
- <!-- do check for MANUFACTURING, _VIEW permission
-->
- <condition>
- <if-has-permission permission="MANUFACTURING"
action="_VIEW"/>
- </condition>
<widgets>
<include-menu name="CalendarTabBar"
location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/>
<decorator-section-include name="body"/>
</widgets>
- <fail-widgets>
- <label
style="h3">${uiLabelMap.ManufacturingViewPermissionError}</label>
- </fail-widgets>
</section>
</decorator-section>
</decorator-screen>
Modified:
ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml?rev=1735178&r1=1735177&r2=1735178&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml
(original)
+++
ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml
Wed Mar 16 01:18:48 2016
@@ -49,5 +49,27 @@ under the License.
</widgets>
</section>
</screen>
+
+ <screen name="CommonManufacturingDecorator">
+ <section>
+ <widgets>
+ <decorator-screen name="main-decorator">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <if-has-permission permission="MANUFACTURING"
action="_VIEW"/>
+ </condition>
+ <widgets>
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label
style="h3">${uiLabelMap.ManufacturingViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
Modified:
ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml?rev=1735178&r1=1735177&r2=1735178&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml
(original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml
Wed Mar 16 01:18:48 2016
@@ -34,7 +34,7 @@ under the License.
<entity-one entity-name="CostComponentCalc"
value-field="costComponentCalc"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonManufacturingDecorator"
location="${parameters.commonManufacturingDecoratorLocation}">
<decorator-section name="body">
<container>
<label
style="h1">${uiLabelMap.ManufacturingManageCostComponentCalc}</label>
Modified:
ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?rev=1735178&r1=1735177&r2=1735178&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
(original)
+++
ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
Wed Mar 16 01:18:48 2016
@@ -23,13 +23,9 @@ under the License.
<screen name="CommonJobshopDecorator">
<section>
<widgets>
- <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonManufacturingDecorator"
location="${parameters.commonManufacturingDecoratorLocation}">
<decorator-section name="body">
<section>
- <!-- do check for MANUFACTURING, _VIEW permission
-->
- <condition>
- <if-has-permission permission="MANUFACTURING"
action="_VIEW"/>
- </condition>
<widgets>
<section>
<condition>
@@ -47,9 +43,6 @@ under the License.
</container>
<decorator-section-include name="body"/>
</widgets>
- <fail-widgets>
- <label
style="h3">${uiLabelMap.ManufacturingViewPermissionError}</label>
- </fail-widgets>
</section>
</decorator-section>
</decorator-screen>
@@ -63,7 +56,7 @@ under the License.
<set field="headerItem" value="jobshop"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonManufacturingDecorator"
location="${parameters.commonManufacturingDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.ManufacturingCreateProductionRun}">
<include-form name="CreateProductionRun"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
@@ -657,7 +650,7 @@ under the License.
<set field="viewSize" from-field="parameters.VIEW_SIZE"
type="Integer" default-value="${viewSizeDefaultValue}"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonManufacturingDecorator"
location="${parameters.commonManufacturingDecoratorLocation}">
<decorator-section name="body">
<section>
<widgets>
@@ -699,7 +692,7 @@ under the License.
<script
location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/WorkWithShipmentPlans.groovy"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonManufacturingDecorator"
location="${parameters.commonManufacturingDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.ManufacturingWorkWithShipmentPlans}">
<include-form name="listShipmentPlans"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
Modified:
ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml?rev=1735178&r1=1735177&r2=1735178&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml
(original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml
Wed Mar 16 01:18:48 2016
@@ -23,20 +23,13 @@ under the License.
<screen name="CommonMrpDecorator">
<section>
<widgets>
- <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonManufacturingDecorator"
location="${parameters.commonManufacturingDecoratorLocation}">
<decorator-section name="body">
<section>
- <!-- do check for MANUFACTURING, _VIEW permission
-->
- <condition>
- <if-has-permission permission="MANUFACTURING"
action="_VIEW"/>
- </condition>
<widgets>
<include-menu name="MrpTabBar"
location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/>
<decorator-section-include name="body"/>
</widgets>
- <fail-widgets>
- <label
style="h3">${uiLabelMap.ManufacturingViewPermissionError}</label>
- </fail-widgets>
</section>
</decorator-section>
</decorator-screen>
Modified:
ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml?rev=1735178&r1=1735177&r2=1735178&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml
(original)
+++
ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml
Wed Mar 16 01:18:48 2016
@@ -29,7 +29,7 @@ under the License.
<set field="mrpName" from-field="parameters.mrpName"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonManufacturingDecorator"
location="${parameters.commonManufacturingDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.ManufacturingReports}">
<include-form name="SelectMrpName"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
Modified:
ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml?rev=1735178&r1=1735177&r2=1735178&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
(original)
+++
ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
Wed Mar 16 01:18:48 2016
@@ -27,13 +27,9 @@ under the License.
<entity-one entity-name="WorkEffort" value-field="routing"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonManufacturingDecorator"
location="${parameters.commonManufacturingDecoratorLocation}">
<decorator-section name="body">
<section>
- <!-- do check for MANUFACTURING, _VIEW permission
-->
- <condition>
- <if-has-permission permission="MANUFACTURING"
action="_VIEW"/>
- </condition>
<widgets>
<section>
<condition>
@@ -48,9 +44,6 @@ under the License.
</container>
<decorator-section-include name="body"/>
</widgets>
- <fail-widgets>
- <label
style="h3">${uiLabelMap.ManufacturingViewPermissionError}</label>
- </fail-widgets>
</section>
</decorator-section>
</decorator-screen>
@@ -64,13 +57,9 @@ under the License.
<entity-one entity-name="WorkEffort"
value-field="routingTask"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonManufacturingDecorator"
location="${parameters.commonManufacturingDecoratorLocation}">
<decorator-section name="body">
<section>
- <!-- do check for MANUFACTURING, _VIEW permission
-->
- <condition>
- <if-has-permission permission="MANUFACTURING"
action="_VIEW"/>
- </condition>
<widgets>
<section>
<condition>
@@ -85,9 +74,6 @@ under the License.
</container>
<decorator-section-include name="body"/>
</widgets>
- <fail-widgets>
- <label
style="h3">${uiLabelMap.ManufacturingViewPermissionError}</label>
- </fail-widgets>
</section>
</decorator-section>
</decorator-screen>
@@ -109,7 +95,7 @@ under the License.
<set field="requestParameters.currentStatusId"
to-scope="screen" default-value="ROU_ACTIVE"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonManufacturingDecorator"
location="${parameters.commonManufacturingDecoratorLocation}">
<decorator-section name="body">
<section>
<widgets>
@@ -168,7 +154,7 @@ under the License.
<set field="requestParameters.currentStatusId"
to-scope="screen" default-value="ROU_ACTIVE"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonManufacturingDecorator"
location="${parameters.commonManufacturingDecoratorLocation}">
<decorator-section name="body">
<section>
<widgets>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml?rev=1735178&r1=1735177&r2=1735178&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
(original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml Wed
Mar 16 01:18:48 2016
@@ -90,7 +90,7 @@ under the License.
<set field="viewSize" from-field="parameters.VIEW_SIZE"
type="Integer" default-value="${viewSizeDefaultValue}"/>
</actions>
<widgets>
- <decorator-screen name="CommonRequirementsDecorator">
+ <decorator-screen name="CommonRequirementsDecorator"
location="${parameters.commonRequirementsDecoratorLocation}">
<decorator-section name="body">
<decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
@@ -117,7 +117,7 @@ under the License.
<script
location="component://order/webapp/ordermgr/WEB-INF/actions/requirement/SelectCreatedProposed.groovy"/>
</actions>
<widgets>
- <decorator-screen name="CommonRequirementsDecorator">
+ <decorator-screen name="CommonRequirementsDecorator"
location="${parameters.commonRequirementsDecoratorLocation}">
<decorator-section name="body">
<decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
@@ -145,7 +145,7 @@ under the License.
<script
location="component://order/webapp/ordermgr/WEB-INF/actions/requirement/ApprovedProductRequirements.groovy"/>
</actions>
<widgets>
- <decorator-screen name="CommonRequirementsDecorator">
+ <decorator-screen name="CommonRequirementsDecorator"
location="${parameters.commonRequirementsDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleFindApprovedProductRequirements}">
<include-form
name="FindApprovedProductRequirements"
location="component://order/widget/ordermgr/RequirementForms.xml"/>
@@ -218,7 +218,7 @@ under the License.
<script
location="component://order/webapp/ordermgr/WEB-INF/actions/requirement/ApprovedProductRequirementsByVendor.groovy"/>
</actions>
<widgets>
- <decorator-screen name="CommonRequirementsDecorator">
+ <decorator-screen name="CommonRequirementsDecorator"
location="${parameters.commonRequirementsDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleFindApprovedRequirementsBySupplier}">
<include-form
name="ApprovedProductRequirementsByVendor"
location="component://order/widget/ordermgr/RequirementForms.xml"/>
@@ -260,7 +260,7 @@ under the License.
</actions>
<widgets>
- <decorator-screen name="CommonRequirementDecorator">
+ <decorator-screen name="CommonRequirementDecorator"
location="${parameters.commonRequirementsDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleEditRequirement}">
<include-form name="EditRequirement"
location="component://order/widget/ordermgr/RequirementForms.xml"/>
@@ -285,7 +285,7 @@ under the License.
</entity-and>
</actions>
<widgets>
- <decorator-screen name="CommonRequirementDecorator">
+ <decorator-screen name="CommonRequirementDecorator"
location="${parameters.commonRequirementsDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleListRequirementCustRequests}">
<include-form name="ListRequirementCustRequests"
location="component://order/widget/ordermgr/RequirementForms.xml"/>
@@ -311,7 +311,7 @@ under the License.
</entity-and>
</actions>
<widgets>
- <decorator-screen name="CommonRequirementDecorator">
+ <decorator-screen name="CommonRequirementDecorator"
location="${parameters.commonRequirementsDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleListRequirementOrders}">
<include-form name="ListRequirementOrders"
location="component://order/widget/ordermgr/RequirementForms.xml"/>
@@ -337,7 +337,7 @@ under the License.
</entity-and>
</actions>
<widgets>
- <decorator-screen name="CommonRequirementDecorator">
+ <decorator-screen name="CommonRequirementDecorator"
location="${parameters.commonRequirementsDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleListRequirementRoles}">
<container>
@@ -366,7 +366,7 @@ under the License.
<entity-one entity-name="RequirementRole"
value-field="requirementRole" auto-field-map="true"/>
</actions>
<widgets>
- <decorator-screen name="CommonRequirementDecorator">
+ <decorator-screen name="CommonRequirementDecorator"
location="${parameters.commonRequirementsDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleEditRequirementRole}">
<include-form name="EditRequirementRole"
location="component://order/widget/ordermgr/RequirementForms.xml"/>
Modified: ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml?rev=1735178&r1=1735177&r2=1735178&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml
(original)
+++ ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml Wed
Mar 16 01:18:48 2016
@@ -20,6 +20,33 @@ under the License.
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd";>
+ <screen name="CommonShipmentMainDecorator">
+ <section>
+ <actions>
+ <set field="titleProperty" value="ProductFindShipment"/>
+ <set field="headerItem" value="shipment"/>
+ <script
location="component://product/webapp/facility/WEB-INF/actions/shipment/FindShipment.groovy"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonShipmentMainDecorator"
location="${parameters.commonShipmentDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <if-has-permission permission="FACILITY"
action="_VIEW"/>
+ </condition>
+ <widgets>
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label
style="h3">${uiLabelMap.ProductFacilityViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
<screen name="FindShipment">
<section>
<actions>
@@ -28,7 +55,7 @@ under the License.
<script
location="component://product/webapp/facility/WEB-INF/actions/shipment/FindShipment.groovy"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonShipmentMainDecorator"
location="${parameters.commonShipmentDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template
location="component://product/webapp/facility/shipment/FindShipment.ftl"/></html>
@@ -48,7 +75,7 @@ under the License.
<get-related-one value-field="shipment"
to-value-field="facility" relation-name="DestinationFacility"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonShipmentMainDecorator"
location="${parameters.commonShipmentDecoratorLocation}">
<decorator-section name="body">
<section>
<condition>
@@ -140,7 +167,7 @@ under the License.
</not>
</condition>
<widgets>
- <decorator-screen name="CommonShipmentDecorator">
+ <decorator-screen name="CommonShipmentDecorator"
location="${parameters.commonShipmentDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template
location="component://product/webapp/facility/shipment/ViewShipmentInfo.ftl"/></html>
@@ -185,7 +212,7 @@ under the License.
<script
location="component://product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy"/>
</actions>
<widgets>
- <decorator-screen name="CommonShipmentDecorator">
+ <decorator-screen name="CommonShipmentDecorator"
location="${parameters.commonShipmentDecoratorLocation}">
<decorator-section name="body">
<include-form name="EditShipment"
location="component://product/widget/facility/ShipmentForms.xml"/>
</decorator-section>
@@ -203,7 +230,7 @@ under the License.
<script
location="component://product/webapp/facility/WEB-INF/actions/shipment/EditShipmentItems.groovy"/>
</actions>
<widgets>
- <decorator-screen name="CommonShipmentDecorator">
+ <decorator-screen name="CommonShipmentDecorator"
location="${parameters.commonShipmentDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template
location="component://product/webapp/facility/shipment/EditShipmentItems.ftl"/></html>
@@ -223,7 +250,7 @@ under the License.
<script
location="component://product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy"/>
</actions>
<widgets>
- <decorator-screen name="CommonShipmentDecorator">
+ <decorator-screen name="CommonShipmentDecorator"
location="${parameters.commonShipmentDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.ProductShipmentPlan}">
<include-form name="findOrderItems"
location="component://product/widget/facility//ShipmentForms.xml"/>
@@ -268,7 +295,7 @@ under the License.
<script
location="component://product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPackages.groovy"/>
</actions>
<widgets>
- <decorator-screen name="CommonShipmentDecorator">
+ <decorator-screen name="CommonShipmentDecorator"
location="${parameters.commonShipmentDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template
location="component://product/webapp/facility/shipment/EditShipmentPackages.ftl"/></html>
@@ -288,7 +315,7 @@ under the License.
<script
location="component://product/webapp/facility/WEB-INF/actions/shipment/EditShipmentRouteSegments.groovy"/>
</actions>
<widgets>
- <decorator-screen name="CommonShipmentDecorator">
+ <decorator-screen name="CommonShipmentDecorator"
location="${parameters.commonShipmentDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template
location="component://product/webapp/facility/shipment/EditShipmentRouteSegments.ftl"/></html>
@@ -308,7 +335,7 @@ under the License.
<script
location="component://product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromOrder.groovy"/>
</actions>
<widgets>
- <decorator-screen name="CommonShipmentDecorator">
+ <decorator-screen name="CommonShipmentDecorator"
location="${parameters.commonShipmentDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template
location="component://product/webapp/facility/shipment/AddItemsFromOrder.ftl"/></html>
@@ -326,7 +353,7 @@ under the License.
<set field="tabButtonItem" value="ViewShipmentReceipts"/>
</actions>
<widgets>
- <decorator-screen name="CommonShipmentDecorator">
+ <decorator-screen name="CommonShipmentDecorator"
location="${parameters.commonShipmentDecoratorLocation}">
<decorator-section name="body">
<include-form name="ShipmentReceipts"
location="component://product/widget/facility/ShipmentForms.xml"/>
</decorator-section>
@@ -346,7 +373,7 @@ under the License.
<script
location="component://product/webapp/facility/WEB-INF/actions/shipment/EditShipmentRouteSegments.groovy"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonShipmentMainDecorator"
location="${parameters.commonShipmentDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template
location="component://product/webapp/facility/shipment/QuickShipOrder.ftl"/></html>
@@ -366,7 +393,7 @@ under the License.
<script
location="component://product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonShipmentMainDecorator"
location="${parameters.commonShipmentDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template
location="component://product/webapp/facility/shipment/VerifyPick.ftl"/></html>
@@ -385,7 +412,7 @@ under the License.
<script
location="component://product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonShipmentMainDecorator"
location="${parameters.commonShipmentDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template
location="component://product/webapp/facility/shipment/PackOrder.ftl"/></html>
@@ -404,7 +431,7 @@ under the License.
<script
location="component://product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonShipmentMainDecorator"
location="${parameters.commonShipmentDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template
location="component://product/webapp/facility/shipment/WeightPackage.ftl"/></html>
@@ -534,7 +561,7 @@ under the License.
<script
location="component://product/webapp/facility/WEB-INF/actions/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy"/>
</actions>
<widgets>
- <decorator-screen name="CommonShipmentDecorator">
+ <decorator-screen name="CommonShipmentDecorator"
location="${parameters.commonShipmentDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template
location="component://product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl"/></html>
@@ -556,7 +583,7 @@ under the License.
<script
location="component://product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromInventory.groovy"/>
</actions>
<widgets>
- <decorator-screen name="CommonShipmentDecorator">
+ <decorator-screen name="CommonShipmentDecorator"
location="${parameters.commonShipmentDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template
location="component://product/webapp/facility/shipment/AddItemsFromInventory.ftl"/></html>
