You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2016/03/28 13:10:43 UTC
svn commit: r1736867 [3/3] - in /ofbiz/trunk/applications/manufacturing:
template/ template/bom/ template/jobshopmgt/ template/mrp/
template/reports/ template/routing/ webapp/manufacturing/bom/
webapp/manufacturing/jobshopmgt/ webapp/manufacturing/mrp/...
Added: ofbiz/trunk/applications/manufacturing/template/reports/ShipmentLabel.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/template/reports/ShipmentLabel.fo.ftl?rev=1736867&view=auto
==============================================================================
--- ofbiz/trunk/applications/manufacturing/template/reports/ShipmentLabel.fo.ftl (added)
+++ ofbiz/trunk/applications/manufacturing/template/reports/ShipmentLabel.fo.ftl Mon Mar 28 11:10:43 2016
@@ -0,0 +1,174 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#escape x as x?xml>
+
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="main" page-height="11.694in" page-width="8.264in"
+ margin-top="0.278in" margin-bottom="0.278in" margin-left="0.278in" margin-right="0.278in">
+ <fo:region-body margin-top="1in"/>
+ <fo:region-before extent="1in"/>
+ <fo:region-after extent="1in"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <#if hasPermission>
+ <#if records?has_content>
+ <fo:page-sequence master-reference="main">
+ <fo:flow flow-name="xsl-region-body" font-family="Helvetica">
+ <#assign index = 1>
+ <#list records as record>
+ <#if index == 1>
+ <fo:table table-layout="fixed" border="0.5pt solid black">
+ <fo:table-column column-width="252pt"/>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell padding="2pt">
+ <fo:block>${uiLabelMap.ManufacturingShipTo}:</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell padding="2pt">
+ <fo:block font-size="18pt">${record.get("shippingAddressName")?if_exists}</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell padding="2pt">
+ <fo:block>${record.get("shippingAddressAddress")?if_exists}</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell padding="2pt">
+ <fo:block>${record.get("shippingAddressCity")?if_exists}</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <fo:block space-after.optimum="10pt" font-size="10pt"/>
+ <fo:table>
+ <fo:table-column column-width="63pt"/>
+ <fo:table-column column-width="63pt"/>
+ <fo:table-column column-width="93pt"/>
+ <fo:table-column column-width="33pt"/>
+ <fo:table-body border="0.5pt solid black">
+ <fo:table-row>
+ <fo:table-cell padding="2pt">
+ <fo:block>${uiLabelMap.OrderOrderId}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt">
+ <fo:block>${uiLabelMap.ProductProductId}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt">
+ <fo:block>${uiLabelMap.CommonDescription}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt">
+ <fo:block>${uiLabelMap.CommonQuantity}</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </#if>
+ <fo:table>
+ <fo:table-column column-width="63pt"/>
+ <fo:table-column column-width="63pt"/>
+ <fo:table-column column-width="93pt"/>
+ <fo:table-column column-width="33pt"/>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell padding="2pt">
+ <fo:block>
+ ${record.get("orderId")?if_exists} ${record.get("orderItemSeqId")?if_exists}
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt">
+ <fo:block>
+ ${record.get("productId")?if_exists}
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt">
+ <fo:block>
+ ${record.get("productName")?if_exists}
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt">
+ <fo:block text-align="right">
+ ${record.get("quantity")?if_exists}
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <#assign shipmentPackageSeqId = record.get("shipmentPackageSeqId")>
+ <#if estimatedReadyDatePar?has_content>
+ <#assign shipDate = record.get("shipDate")>
+ </#if>
+ <#assign index = index + 1>
+ </#list>
+ <fo:table table-layout="fixed" border="0.5pt solid black">
+ <fo:table-column column-width="84pt"/>
+ <fo:table-column column-width="84pt"/>
+ <fo:table-column column-width="84pt"/>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell padding="2pt">
+ <fo:block>${uiLabelMap.ManufacturingPackage}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt">
+ <fo:block>${uiLabelMap.ProductShipmentPlan}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt">
+ <fo:block>${uiLabelMap.ManufacturingEstimatedShipDate}</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell padding="2pt">
+ <fo:block>
+ ${shipmentIdPar?if_exists}/${shipmentPackageSeqId?if_exists}
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt">
+ <fo:block>
+ ${shipmentIdPar?if_exists}
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt">
+ <fo:block>
+ <#if shipDate?has_content>${shipDate?if_exists}</#if>
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:flow>
+ </fo:page-sequence>
+ <#else>
+ <fo:page-sequence master-reference="main">
+ <fo:flow flow-name="xsl-region-body" font-family="Helvetica">
+ <fo:block font-size="14pt">
+ ${uiLabelMap.ManufacturingNoDataAvailable}
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </#if>
+ <#else>
+ <fo:block font-size="14pt">
+ ${uiLabelMap.ManufacturingViewPermissionError}
+ </fo:block>
+ </#if>
+</fo:root>
+</#escape>
Propchange: ofbiz/trunk/applications/manufacturing/template/reports/ShipmentLabel.fo.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/manufacturing/template/reports/ShipmentLabel.fo.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/manufacturing/template/reports/ShipmentLabel.fo.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/manufacturing/template/reports/ShipmentPlanStockReport.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/template/reports/ShipmentPlanStockReport.fo.ftl?rev=1736867&view=auto
==============================================================================
--- ofbiz/trunk/applications/manufacturing/template/reports/ShipmentPlanStockReport.fo.ftl (added)
+++ ofbiz/trunk/applications/manufacturing/template/reports/ShipmentPlanStockReport.fo.ftl Mon Mar 28 11:10:43 2016
@@ -0,0 +1,146 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#escape x as x?xml>
+
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="main" page-height="11.694in" page-width="8.264in"
+ margin-top="0.278in" margin-bottom="0.278in" margin-left="0.417in" margin-right="0.417in">
+ <fo:region-body margin-top="1in"/>
+ <fo:region-before extent="1in"/>
+ <fo:region-after extent="1in"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <#if hasPermission>
+ <#if records?has_content>
+ <fo:page-sequence master-reference="main">
+ <fo:static-content flow-name="xsl-region-after">
+ <fo:block text-align="right" line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+ ${uiLabelMap.CommonPage} <fo:page-number/>
+ </fo:block>
+ </fo:static-content>
+ <fo:flow flow-name="xsl-region-body" font-family="Helvetica">
+ <fo:block><fo:leader/></fo:block>
+ <fo:block font-size="14pt">${uiLabelMap.ManufacturingComponentsOfShipmentPlan}</fo:block>
+ <fo:block><fo:leader/></fo:block>
+ <fo:block space-after.optimum="10pt" font-size="10pt"/>
+
+ <fo:block>${uiLabelMap.ManufacturingShipmentId}: ${shipmentIdPar}</fo:block>
+ <fo:block>${uiLabelMap.ManufacturingEstimatedCompletionDate}: <#if estimatedReadyDatePar?has_content>${estimatedReadyDatePar}</#if></fo:block>
+ <fo:block>${uiLabelMap.ManufacturingEstimatedShipDate}: <#if estimatedShipDatePar?has_content>${estimatedShipDatePar}</#if></fo:block>
+
+ <fo:block space-after.optimum="10pt" font-size="10pt"/>
+ <fo:table>
+ <fo:table-column column-width="120pt"/>
+ <fo:table-column column-width="120pt"/>
+ <fo:table-column column-width="120pt"/>
+ <fo:table-column column-width="120pt"/>
+ <fo:table-column column-width="120pt"/>
+ <fo:table-header>
+ <fo:table-row font-weight="bold">
+ <fo:table-cell padding="2pt" background-color="#D4D0C8">
+ <fo:block>${uiLabelMap.OrderOrderId}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt" background-color="#D4D0C8">
+ <fo:block>${uiLabelMap.ManufacturingProductsComponents}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt" background-color="#D4D0C8">
+ <fo:block>${uiLabelMap.CommonDescription}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt" background-color="#D4D0C8">
+ <fo:block>${uiLabelMap.ManufacturingNeedQuantity}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt" background-color="#D4D0C8">
+ <fo:block>${uiLabelMap.ProductQoh}</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-body>
+ <#list records as record>
+ <fo:table-row>
+ <fo:table-cell padding="2pt">
+ <fo:block>
+ ${record.get("ORDER_ID")}/${record.get("ORDER_ITEM_SEQ_ID")}
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt">
+ <fo:block text-align="left">
+ ${record.get("PRODUCT_ID")}
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt">
+ <fo:block text-align="left">
+ ${record.get("PRODUCT_NAME")}
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt">
+ <fo:block text-align="center">
+ ${record.get("QUANTITY")}
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt">
+ <fo:block space-after.optimum="10pt" font-size="10pt"/>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell padding="2pt">
+ <fo:block space-after.optimum="10pt" font-size="10pt"/>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt">
+ <fo:block text-align="left">
+ ${record.get("componentId")}
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt">
+ <fo:block text-align="left">
+ ${record.get("componentName")}
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt">
+ <fo:block text-align="center">
+ ${record.get("componentQuantity")}
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt">
+ <fo:block text-align="center">
+ ${record.get("componentOnHand")}
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </#list>
+ </fo:table-body>
+ </fo:table>
+ </fo:flow>
+ </fo:page-sequence>
+ <#else>
+ <fo:page-sequence master-reference="main">
+ <fo:flow flow-name="xsl-region-body" font-family="Helvetica">
+ <fo:block font-size="14pt">
+ ${uiLabelMap.ManufacturingNoDataAvailable}
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </#if>
+ <#else>
+ <fo:block font-size="14pt">
+ ${uiLabelMap.ManufacturingViewPermissionError}
+ </fo:block>
+ </#if>
+</fo:root>
+</#escape>
Propchange: ofbiz/trunk/applications/manufacturing/template/reports/ShipmentPlanStockReport.fo.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/manufacturing/template/reports/ShipmentPlanStockReport.fo.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/manufacturing/template/reports/ShipmentPlanStockReport.fo.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/manufacturing/template/reports/ShipmentWorkEffortTasks.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/template/reports/ShipmentWorkEffortTasks.fo.ftl?rev=1736867&view=auto
==============================================================================
--- ofbiz/trunk/applications/manufacturing/template/reports/ShipmentWorkEffortTasks.fo.ftl (added)
+++ ofbiz/trunk/applications/manufacturing/template/reports/ShipmentWorkEffortTasks.fo.ftl Mon Mar 28 11:10:43 2016
@@ -0,0 +1,132 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#escape x as x?xml>
+
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="main" page-height="11in" page-width="8.5in"
+ margin-top="0.5in" margin-bottom="1in" margin-left="1in" margin-right="1in">
+ <fo:region-body margin-top="1in"/>
+ <fo:region-before extent="1in"/>
+ <fo:region-after extent="1in"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <#if hasPermission>
+ <#if records?has_content>
+ <fo:page-sequence master-reference="main">
+ <fo:static-content flow-name="xsl-region-after">
+ <fo:block text-align="right" line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
+ ${uiLabelMap.CommonPage} <fo:page-number/>
+ </fo:block>
+ </fo:static-content>
+ <fo:flow flow-name="xsl-region-body" font-family="Helvetica">
+ <fo:block><fo:leader/></fo:block>
+ <fo:block font-size="14pt">${uiLabelMap.ManufacturingOperationRunForShipment}:${shipmentIdPar}</fo:block>
+ <fo:block><fo:leader/></fo:block>
+ <fo:block space-after.optimum="8pt" font-size="8pt"/>
+ <fo:table table-layout="fixed" font-size="8pt" border="0.5pt solid black">
+ <fo:table-column column-width="45pt"/>
+ <fo:table-column column-width="45pt"/>
+ <fo:table-column column-width="60pt"/>
+ <fo:table-column column-width="90pt"/>
+ <fo:table-column column-width="90pt"/>
+ <fo:table-column column-width="60pt"/>
+ <fo:table-column column-width="60pt"/>
+ <fo:table-header>
+ <fo:table-row font-weight="bold">
+ <fo:table-cell padding="2pt">
+ <fo:block>${uiLabelMap.ManufacturingShopOrder}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt">
+ <fo:block>${uiLabelMap.ManufacturingWorkCenter}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt">
+ <fo:block>${uiLabelMap.ProductProductId}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt">
+ <fo:block>${uiLabelMap.CommonDescription}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt">
+ <fo:block>${uiLabelMap.ManufacturingOperationCodeAndDescription}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt" text-align="right">
+ <fo:block>${uiLabelMap.ManufacturingTaskRunTime}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt" text-align="right">
+ <fo:block>${uiLabelMap.ManufacturingTaskSetupTime}</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-body>
+ <#list records as record>
+ <fo:table-row>
+ <fo:table-cell padding="2pt">
+ <fo:block>${record.get("workEffortId")?if_exists}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt">
+ <fo:block><#if estimatedReadyDatePar?has_content>${record.get("fixedAssetId")?if_exists}</#if></fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt">
+ <fo:block>${record.get("productId")?if_exists}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt">
+ <fo:block>${record.get("productName")?if_exists}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt">
+ <fo:block>${record.get("taskName")} ${record.get("taskDescription")?if_exists}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt" text-align="right">
+ <fo:block>${record.get("taskEstimatedTime")?if_exists}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt" text-align="right">
+ <fo:block>${record.get("taskEstimatedSetup")?if_exists}</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </#list>
+ </fo:table-body>
+ </fo:table>
+ <fo:table table-layout="fixed" font-size="8pt">
+ <fo:table-column column-width="450pt"/>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell padding="2pt" text-align="right">
+ <fo:block>${fixedAssetTime?if_exists}</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:flow>
+ </fo:page-sequence>
+
+ <#else>
+ <fo:page-sequence master-reference="main">
+ <fo:flow flow-name="xsl-region-body" font-family="Helvetica">
+ <fo:block font-size="14pt">
+ ${uiLabelMap.ManufacturingNoDataAvailable}
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </#if>
+ <#else>
+ <fo:block font-size="14pt">
+ ${uiLabelMap.ManufacturingViewPermissionError}
+ </fo:block>
+ </#if>
+</fo:root>
+</#escape>
Propchange: ofbiz/trunk/applications/manufacturing/template/reports/ShipmentWorkEffortTasks.fo.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/manufacturing/template/reports/ShipmentWorkEffortTasks.fo.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/manufacturing/template/reports/ShipmentWorkEffortTasks.fo.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/manufacturing/template/routing/EditCalendar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/template/routing/EditCalendar.ftl?rev=1736867&view=auto
==============================================================================
--- ofbiz/trunk/applications/manufacturing/template/routing/EditCalendar.ftl (added)
+++ ofbiz/trunk/applications/manufacturing/template/routing/EditCalendar.ftl Mon Mar 28 11:10:43 2016
@@ -0,0 +1,82 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#if techDataCalendar?has_content>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">${uiLabelMap.ManufacturingUpdateCalendar}</li>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <div class="screenlet-body">
+ <div class="button-bar"><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ManufacturingNewCalendar}</a></div>
+ <form name="calendarform" method="post" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="calendarId" value="${techDataCalendar.calendarId}" />
+<#else>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">${uiLabelMap.ManufacturingCreateCalendar}</li>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <div class="screenlet-body">
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ManufacturingNewCalendar}</a>
+ <form name="calendarform" method="post" action="<@o...@ofbizUrl>">
+</#if>
+ <table class="basic-table" cellspacing="0">
+ <#if techDataCalendar?has_content>
+ <tr>
+ <td width='26%' align='right' valign='top' class="label">${uiLabelMap.ManufacturingCalendarId}</td>
+ <td width="5"> </td>
+ <td width="74%" valign="top"><span class="label">${techDataCalendar.calendarId!}</span> <span class="tooltip">(${uiLabelMap.CommonNotModifRecreat})</span></td>
+ </tr>
+ <#else>
+ <tr>
+ <td width='26%' align='right' valign="top" class="label">${uiLabelMap.ManufacturingCalendarId}</td>
+ <td width="5"> </td>
+ <td width="74%"><input type="text" size="12" name="calendarId" value="${calendarData.calendarId!}" /></td>
+ </tr>
+ </#if>
+ <tr>
+ <td width='26%' align='right' valign='top' class="label">${uiLabelMap.CommonDescription}</td>
+ <td width="5"> </td>
+ <td width="74%"><input type="text" size="40" name="description" value="${calendarData.description!}" /></td>
+ </tr>
+ <tr>
+ <td width='26%' align='right' valign='top' class="label">${uiLabelMap.ManufacturingCalendarWeekId}</td>
+ <td width="5"> </td>
+ <td width="74%">
+ <select name="calendarWeekId">
+ <#list calendarWeeks as calendarWeek>
+ <option value="${calendarWeek.calendarWeekId}" <#if calendarData?has_content && calendarData.calendarWeekId?default("") == calendarWeek.calendarWeekId>SELECTED</#if>>${(calendarWeek.get("description",locale))!}</option>
+ </#list>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="top"></td>
+ <td width="5"> </td>
+ <td width="74%"><input type="submit" value="${uiLabelMap.CommonUpdate}" /></td>
+ </tr>
+ </table>
+ </form>
+ </div>
+</div>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/manufacturing/template/routing/EditCalendar.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/manufacturing/template/routing/EditCalendar.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/manufacturing/template/routing/EditCalendar.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/manufacturing/template/routing/EditCalendarExceptionDay.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/template/routing/EditCalendarExceptionDay.ftl?rev=1736867&view=auto
==============================================================================
--- ofbiz/trunk/applications/manufacturing/template/routing/EditCalendarExceptionDay.ftl (added)
+++ ofbiz/trunk/applications/manufacturing/template/routing/EditCalendarExceptionDay.ftl Mon Mar 28 11:10:43 2016
@@ -0,0 +1,49 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#if techDataCalendar?has_content>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.ManufacturingEditCalendarExceptionDayFor}
+ <#if (techDataCalendar.description)?has_content>"${(techDataCalendar.get("description",locale))}"</#if>
+ [${uiLabelMap.CommonId} ${techDataCalendar.calendarId!}]</h3>
+ </div>
+ <div class="screenlet-body">
+ ${listCalendarExceptionDayWrapper.renderFormString(context)}
+ </div>
+</div>
+<#if calendarExceptionDay?has_content>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.PageTitleEditCalendarExceptionWeek}</h3>
+ </div>
+ <div class="screenlet-body">
+ ${updateCalendarExceptionDayWrapper.renderFormString(context)}
+ </div>
+</div>
+</#if>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.PageTitleAddCalendarExceptionWeek}</h3>
+ </div>
+ <div class="screenlet-body">
+ ${addCalendarExceptionDayWrapper.renderFormString(context)}
+ </div>
+</div>
+</#if>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/manufacturing/template/routing/EditCalendarExceptionDay.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/manufacturing/template/routing/EditCalendarExceptionDay.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/manufacturing/template/routing/EditCalendarExceptionDay.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/manufacturing/template/routing/EditCalendarExceptionWeek.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/template/routing/EditCalendarExceptionWeek.ftl?rev=1736867&view=auto
==============================================================================
--- ofbiz/trunk/applications/manufacturing/template/routing/EditCalendarExceptionWeek.ftl (added)
+++ ofbiz/trunk/applications/manufacturing/template/routing/EditCalendarExceptionWeek.ftl Mon Mar 28 11:10:43 2016
@@ -0,0 +1,49 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#if techDataCalendar?has_content>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.ManufacturingEditCalendarExceptionWeekFor}
+ <#if (techDataCalendar.description)?has_content>"${(techDataCalendar.get("description",locale))}"</#if>
+ [${uiLabelMap.CommonId} ${techDataCalendar.calendarId!}]</h3>
+ </div>
+ <div class="screenlet-body">
+ ${listCalendarExceptionWeekWrapper.renderFormString(context)}
+ </div>
+</div>
+ <#if calendarExceptionWeek?has_content>
+ <div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.PageTitleEditCalendarExceptionWeek}</h3>
+ </div>
+ <div class="screenlet-body">
+ ${updateCalendarExceptionWeekWrapper.renderFormString(context)}
+ </div>
+ </div>
+ </#if>
+ <div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.PageTitleAddCalendarExceptionWeek}</h3>
+ </div>
+ <div class="screenlet-body">
+ ${addCalendarExceptionWeekWrapper.renderFormString(context)}
+ </div>
+ </div>
+</#if>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/manufacturing/template/routing/EditCalendarExceptionWeek.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/manufacturing/template/routing/EditCalendarExceptionWeek.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/manufacturing/template/routing/EditCalendarExceptionWeek.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/manufacturing/template/routing/EditRoutingTaskAssoc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/template/routing/EditRoutingTaskAssoc.ftl?rev=1736867&view=auto
==============================================================================
--- ofbiz/trunk/applications/manufacturing/template/routing/EditRoutingTaskAssoc.ftl (added)
+++ ofbiz/trunk/applications/manufacturing/template/routing/EditRoutingTaskAssoc.ftl Mon Mar 28 11:10:43 2016
@@ -0,0 +1,82 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<script language="JavaScript" type="text/javascript">
+<!-- //
+function copyAndAddRoutingTask() {
+ document.addtaskassocform.copyTask.value = "Y";
+ document.addtaskassocform.submit();
+}
+function addRoutingTask() {
+ document.addtaskassocform.copyTask.value = "N";
+ document.addtaskassocform.submit();
+}
+// -->
+</script>
+
+<#if security.hasEntityPermission("MANUFACTURING", "_CREATE", session)>
+<form method="post" action="<@o...@ofbizUrl>" name="addtaskassocform">
+ <input type="hidden" name="workEffortId" value="${workEffortId}"/>
+ <input type="hidden" name="workEffortIdFrom" value="${workEffortId}"/>
+ <input type="hidden" name="workEffortAssocTypeId" value="ROUTING_COMPONENT"/>
+ <input type="hidden" name="copyTask" value="N"/>
+ <table class="basic-table" cellspacing="0">
+ <tr>
+ <th align="right">
+ ${uiLabelMap.ManufacturingRoutingTaskId}
+ </th>
+ <td>
+ <@htmlTemplate.lookupField formName="addtaskassocform" name="workEffortIdTo" id="workEffortIdTo" fieldFormName="LookupRoutingTask"/>
+ </td>
+ <th align="right">
+ ${uiLabelMap.CommonFromDate}
+ </th>
+ <td>
+ <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ </td>
+ <td align="center" width="40%"> </td>
+ </tr>
+ <tr>
+ <th align="right">
+ ${uiLabelMap.CommonSequenceNum}
+ </th>
+ <td>
+ <input type="text" name="sequenceNum" size="10"/>
+ </td>
+ <th align="right">
+ ${uiLabelMap.CommonThruDate}
+ </th>
+ <td>
+ <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="thruDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ </td>
+ <td> </td>
+ </tr>
+
+ <tr>
+ <td > </td>
+ <td colspan="3">
+ <a href="javascript:addRoutingTask();" class="buttontext">${uiLabelMap.ManufacturingAddExistingRoutingTask}</a>
+ -
+ <a href="javascript:copyAndAddRoutingTask();" class="buttontext">${uiLabelMap.ManufacturingCopyAndAddRoutingTask}</a>
+ </td>
+ <td> </td>
+ </tr>
+ </table>
+</form>
+</#if>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/manufacturing/template/routing/EditRoutingTaskAssoc.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/manufacturing/template/routing/EditRoutingTaskAssoc.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/manufacturing/template/routing/EditRoutingTaskAssoc.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml?rev=1736867&r1=1736866&r2=1736867&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml Mon Mar 28 11:10:43 2016
@@ -58,7 +58,7 @@ under the License.
<decorator-screen name="CommonBomDecorator">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://manufacturing/webapp/manufacturing/bom/EditProductBom.ftl"/></html>
+ <html><html-template location="component://manufacturing/template/bom/EditProductBom.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -122,7 +122,7 @@ under the License.
<include-form name="RunBomSimulation" location="component://manufacturing/widget/manufacturing/BomForms.xml"/>
</screenlet>
<platform-specific>
- <html><html-template location="component://manufacturing/webapp/manufacturing/bom/BomSimulation.ftl"/></html>
+ <html><html-template location="component://manufacturing/template/bom/BomSimulation.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml?rev=1736867&r1=1736866&r2=1736867&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml Mon Mar 28 11:10:43 2016
@@ -52,7 +52,7 @@ under the License.
<section>
<widgets>
<platform-specific>
- <html><html-template location="component://manufacturing/webapp/manufacturing/routing/EditCalendar.ftl"/></html>
+ <html><html-template location="component://manufacturing/template/routing/EditCalendar.ftl"/></html>
</platform-specific>
</widgets>
</section>
@@ -152,7 +152,7 @@ under the License.
<section>
<widgets>
<platform-specific>
- <html><html-template location="component://manufacturing/webapp/manufacturing/routing/EditCalendarExceptionWeek.ftl"/></html>
+ <html><html-template location="component://manufacturing/template/routing/EditCalendarExceptionWeek.ftl"/></html>
</platform-specific>
</widgets>
</section>
@@ -177,7 +177,7 @@ under the License.
<section>
<widgets>
<platform-specific>
- <html><html-template location="component://manufacturing/webapp/manufacturing/routing/EditCalendarExceptionDay.ftl"/></html>
+ <html><html-template location="component://manufacturing/template/routing/EditCalendarExceptionDay.ftl"/></html>
</platform-specific>
</widgets>
</section>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?rev=1736867&r1=1736866&r2=1736867&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml Mon Mar 28 11:10:43 2016
@@ -295,7 +295,7 @@ under the License.
<decorator-screen name="SimpleDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
<platform-specific>
- <xsl-fo><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://manufacturing/template/jobshopmgt/ProductionRun.fo.ftl"/></xsl-fo>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -487,7 +487,7 @@ under the License.
<section>
<widgets>
<platform-specific>
- <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl"/></html>
+ <html><html-template location="component://manufacturing/template/jobshopmgt/ProductionRunTasksInfo.ftl"/></html>
</platform-specific>
</widgets>
</section>
@@ -519,7 +519,7 @@ under the License.
<include-form name="IssueProductionRunComponent" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
</screenlet>
<platform-specific>
- <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl"/></html>
+ <html><html-template location="component://manufacturing/template/jobshopmgt/ProductionRunTasksInfo.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -551,7 +551,7 @@ under the License.
<section>
<widgets>
<platform-specific>
- <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl"/></html>
+ <html><html-template location="component://manufacturing/template/jobshopmgt/ProductionRunTasksInfo.ftl"/></html>
</platform-specific>
</widgets>
</section>
@@ -579,7 +579,7 @@ under the License.
<section>
<widgets>
<platform-specific>
- <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunCosts.ftl"/></html>
+ <html><html-template location="component://manufacturing/template/jobshopmgt/ProductionRunCosts.ftl"/></html>
</platform-specific>
</widgets>
</section>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml?rev=1736867&r1=1736866&r2=1736867&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml Mon Mar 28 11:10:43 2016
@@ -112,7 +112,7 @@ under the License.
</condition>
<widgets>
<platform-specific>
- <html><html-template location="component://manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl"/></html>
+ <html><html-template location="component://manufacturing/template/mrp/findInventoryEventPlan.ftl"/></html>
</platform-specific>
</widgets>
<fail-widgets>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml?rev=1736867&r1=1736866&r2=1736867&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml Mon Mar 28 11:10:43 2016
@@ -34,7 +34,7 @@ under the License.
<screenlet title="${uiLabelMap.ManufacturingReports}">
<include-form name="SelectMrpName" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
<platform-specific>
- <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/MrpReports.ftl"/></html>
+ <html><html-template location="component://manufacturing/template/jobshopmgt/MrpReports.ftl"/></html>
</platform-specific>
</screenlet>
</decorator-section>
@@ -56,7 +56,7 @@ under the License.
</actions>
<widgets>
<platform-specific>
- <xsl-fo><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/CuttingListReport.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://manufacturing/template/jobshopmgt/CuttingListReport.fo.ftl"/></xsl-fo>
</platform-specific>
</widgets>
</section>
@@ -80,7 +80,7 @@ under the License.
</actions>
<widgets>
<platform-specific>
- <xsl-fo><html-template location="component://manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://manufacturing/template/reports/PRunsProductsByFeature.fo.ftl"/></xsl-fo>
</platform-specific>
</widgets>
</section>
@@ -107,7 +107,7 @@ under the License.
</actions>
<widgets>
<platform-specific>
- <xsl-fo><html-template location="component://manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://manufacturing/template/reports/PRunsProductsByFeature.fo.ftl"/></xsl-fo>
</platform-specific>
</widgets>
</section>
@@ -132,7 +132,7 @@ under the License.
</actions>
<widgets>
<platform-specific>
- <xsl-fo><html-template location="component://manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://manufacturing/template/reports/PRunsComponentsByFeature.fo.ftl"/></xsl-fo>
</platform-specific>
</widgets>
</section>
@@ -161,7 +161,7 @@ under the License.
<widgets>
<platform-specific>
<!-- NOTE: this is really generating XSL:FO, but the HTML oriented renderer should do fine, the screen will need to be called differently though to get binary output from it -->
- <html><html-template location="component://manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl"/></html>
+ <html><html-template location="component://manufacturing/template/reports/PRunsComponentsByFeature.fo.ftl"/></html>
</platform-specific>
</widgets>
</section>
@@ -186,7 +186,7 @@ under the License.
</actions>
<widgets>
<platform-specific>
- <xsl-fo><html-template location="component://manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://manufacturing/template/reports/PRunsProductsStacks.fo.ftl"/></xsl-fo>
</platform-specific>
</widgets>
</section>
@@ -213,7 +213,7 @@ under the License.
<widgets>
<platform-specific>
<!-- NOTE: this is really generating XSL:FO, but the HTML oriented renderer should do fine, the screen will need to be called differently though to get binary output from it -->
- <html><html-template location="component://manufacturing/webapp/manufacturing/reports/PackageContentsAndOrder.fo.ftl"/></html>
+ <html><html-template location="component://manufacturing/template/reports/PackageContentsAndOrder.fo.ftl"/></html>
</platform-specific>
</widgets>
</section>
@@ -238,7 +238,7 @@ under the License.
</actions>
<widgets>
<platform-specific>
- <xsl-fo><html-template location="component://manufacturing/webapp/manufacturing/reports/PRunsProductsAndOrder.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://manufacturing/template/reports/PRunsProductsAndOrder.fo.ftl"/></xsl-fo>
</platform-specific>
</widgets>
</section>
@@ -263,7 +263,7 @@ under the License.
</actions>
<widgets>
<platform-specific>
- <xsl-fo><html-template location="component://manufacturing/webapp/manufacturing/reports/PRunsInfoAndOrder.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://manufacturing/template/reports/PRunsInfoAndOrder.fo.ftl"/></xsl-fo>
</platform-specific>
</widgets>
</section>
@@ -282,7 +282,7 @@ under the License.
</actions>
<widgets>
<platform-specific>
- <xsl-fo><html-template location="component://manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://manufacturing/template/reports/ShipmentPlanStockReport.fo.ftl"/></xsl-fo>
</platform-specific>
</widgets>
</section>
@@ -303,7 +303,7 @@ under the License.
</actions>
<widgets>
<platform-specific>
- <xsl-fo><html-template location="component://manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://manufacturing/template/reports/ShipmentLabel.fo.ftl"/></xsl-fo>
</platform-specific>
</widgets>
</section>
@@ -323,7 +323,7 @@ under the License.
</actions>
<widgets>
<platform-specific>
- <xsl-fo><html-template location="component://manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://manufacturing/template/reports/ShipmentWorkEffortTasks.fo.ftl"/></xsl-fo>
</platform-specific>
</widgets>
</section>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml?rev=1736867&r1=1736866&r2=1736867&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml Mon Mar 28 11:10:43 2016
@@ -325,7 +325,7 @@ under the License.
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleEditRoutingTaskAssoc}">
<platform-specific>
- <html><html-template location="component://manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl"/></html>
+ <html><html-template location="component://manufacturing/template/routing/EditRoutingTaskAssoc.ftl"/></html>
</platform-specific>
</screenlet>
<screenlet title="${uiLabelMap.PageTitleListRoutingTaskAssoc}">