Author: ashish
Date: Sat Aug 27 11:59:49 2016
New Revision: 1757999
URL: http://svn.apache.org/viewvc?rev=1757999&view=rev
Log:
Applied patch from jira issue - OFBIZ-7894 - Clean up commented out code in
Free Marker Template for Manufacturing.
Thanks Aman for the contribution.
Modified:
ofbiz/trunk/applications/manufacturing/template/bom/BomSimulation.ftl
ofbiz/trunk/applications/manufacturing/template/bom/EditProductBom.ftl
ofbiz/trunk/applications/manufacturing/template/jobshopmgt/CuttingListReport.fo.ftl
ofbiz/trunk/applications/manufacturing/template/reports/PRunsComponentsByFeature.fo.ftl
ofbiz/trunk/applications/manufacturing/template/reports/PRunsInfoAndOrder.fo.ftl
ofbiz/trunk/applications/manufacturing/template/reports/PRunsProductsByFeature.fo.ftl
ofbiz/trunk/applications/manufacturing/template/reports/PackageContentsAndOrder.fo.ftl
Modified: ofbiz/trunk/applications/manufacturing/template/bom/BomSimulation.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/template/bom/BomSimulation.ftl?rev=1757999&r1=1757998&r2=1757999&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/template/bom/BomSimulation.ftl
(original)
+++ ofbiz/trunk/applications/manufacturing/template/bom/BomSimulation.ftl Sat
Aug 27 11:59:49 2016
@@ -125,13 +125,6 @@ under the License.
<#-- toggle the row color -->
<#assign alt_row = !alt_row>
</#list>
- <#--
- <#if grandTotalCost??>
- <tr>
- <td colspan="6" align="right">${grandTotalCost}</td>
- </tr>
- </#if>
- -->
<#else>
<tr>
<td colspan="6">${uiLabelMap.CommonNoElementFound}.</td>
Modified: ofbiz/trunk/applications/manufacturing/template/bom/EditProductBom.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/template/bom/EditProductBom.ftl?rev=1757999&r1=1757998&r2=1757999&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/template/bom/EditProductBom.ftl
(original)
+++ ofbiz/trunk/applications/manufacturing/template/bom/EditProductBom.ftl Sat
Aug 27 11:59:49 2016
@@ -315,7 +315,6 @@ function lookupBom() {
<#assign curProductAssocType =
assocToProduct.getRelatedOne("ProductAssocType", true)>
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
<td><a
href="<@ofbizUrl>EditProductBom?productId=${(assocToProduct.productId)!}&productAssocTypeId=${(assocToProduct.productAssocTypeId)!}#components</@ofbizUrl>"
class="buttontext">${(assocToProduct.productId)!}</a></td>
-<!-- <td><#if listToProduct??><a
href="<@ofbizUrl>EditProduct?productId=${(assocToProduct.productId)!}</@ofbizUrl>"
class="buttontext">${(listToProduct.internalName)!}</a></#if></td> -->
<td><#if listToProduct??><a
href="<@ofbizUrl>EditProductBom?productId=${(assocToProduct.productId)!}&productAssocTypeId=${(assocToProduct.productAssocTypeId)!}#components</@ofbizUrl>"
class="buttontext">${(listToProduct.internalName)!}</a></#if></td>
<td>${(assocToProduct.getTimestamp("fromDate"))!} </td>
<td>${(assocToProduct.getTimestamp("thruDate"))!} </td>
Modified:
ofbiz/trunk/applications/manufacturing/template/jobshopmgt/CuttingListReport.fo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/template/jobshopmgt/CuttingListReport.fo.ftl?rev=1757999&r1=1757998&r2=1757999&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/template/jobshopmgt/CuttingListReport.fo.ftl
(original)
+++
ofbiz/trunk/applications/manufacturing/template/jobshopmgt/CuttingListReport.fo.ftl
Sat Aug 27 11:59:49 2016
@@ -20,7 +20,6 @@ under the License.
<#escape x as x?xml>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";>
<#-- do not display columns associated with values specified in the request,
ie constraint values -->
-<#--<#assign showProductStore = !parameters.productStoreId?has_content>-->
<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="0.5in"
margin-right="0.5in">
Modified:
ofbiz/trunk/applications/manufacturing/template/reports/PRunsComponentsByFeature.fo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/template/reports/PRunsComponentsByFeature.fo.ftl?rev=1757999&r1=1757998&r2=1757999&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/template/reports/PRunsComponentsByFeature.fo.ftl
(original)
+++
ofbiz/trunk/applications/manufacturing/template/reports/PRunsComponentsByFeature.fo.ftl
Sat Aug 27 11:59:49 2016
@@ -213,10 +213,6 @@ under the License.
</#list>
</fo:table-body>
</fo:table>
-<!--
-<fo:block space-before.optimum="1.5pt" space-after.optimum="1.5pt"
keep-together="always" id="LastPage" line-height="1pt" font-size="1pt">
-</fo:block>
--->
</fo:block>
</fo:flow>
Modified:
ofbiz/trunk/applications/manufacturing/template/reports/PRunsInfoAndOrder.fo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/template/reports/PRunsInfoAndOrder.fo.ftl?rev=1757999&r1=1757998&r2=1757999&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/template/reports/PRunsInfoAndOrder.fo.ftl
(original)
+++
ofbiz/trunk/applications/manufacturing/template/reports/PRunsInfoAndOrder.fo.ftl
Sat Aug 27 11:59:49 2016
@@ -127,9 +127,6 @@ under the License.
<fo:table-column column-width="1.50cm"/>
<fo:table-column column-width="1.50cm"/>
<fo:table-column column-width="6.00cm"/>
-<!--
-<fo:table-column column-width="4.00cm"/>
--->
<fo:table-body>
<fo:table-row>
<fo:table-cell border-style="solid" border-color="black"
border-width="1pt">
@@ -162,13 +159,6 @@ under the License.
${uiLabelMap.ManufacturingReleased}
</fo:block>
</fo:table-cell>
-<!--
- <fo:table-cell border-style="solid" border-color="black"
border-width="1pt">
- <fo:block line-height="12pt" font-size="8pt"
space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always"
text-align="center">
- ${uiLabelMap.ManufacturingReleasedNote}
- </fo:block>
- </fo:table-cell>
--->
</fo:table-row>
<#assign row = 0>
@@ -205,13 +195,6 @@ under the License.
</fo:block>
</fo:table-cell>
-<!--
- <fo:table-cell border-style="solid" border-color="black"
border-width="1pt">
- <fo:block line-height="12pt" font-size="10pt"
space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always"
text-align="end">
- {Rel}
- </fo:block>
- </fo:table-cell>
--->
</fo:table-row>
</#list>
</fo:table-body>
Modified:
ofbiz/trunk/applications/manufacturing/template/reports/PRunsProductsByFeature.fo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/template/reports/PRunsProductsByFeature.fo.ftl?rev=1757999&r1=1757998&r2=1757999&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/template/reports/PRunsProductsByFeature.fo.ftl
(original)
+++
ofbiz/trunk/applications/manufacturing/template/reports/PRunsProductsByFeature.fo.ftl
Sat Aug 27 11:59:49 2016
@@ -228,10 +228,6 @@ under the License.
</#list>
</fo:table-body>
</fo:table>
-<!--
-<fo:block space-before.optimum="1.5pt" space-after.optimum="1.5pt"
keep-together="always" id="LastPage" line-height="1pt" font-size="1pt">
-</fo:block>
--->
</fo:block>
</fo:flow>
Modified:
ofbiz/trunk/applications/manufacturing/template/reports/PackageContentsAndOrder.fo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/template/reports/PackageContentsAndOrder.fo.ftl?rev=1757999&r1=1757998&r2=1757999&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/template/reports/PackageContentsAndOrder.fo.ftl
(original)
+++
ofbiz/trunk/applications/manufacturing/template/reports/PackageContentsAndOrder.fo.ftl
Sat Aug 27 11:59:49 2016
@@ -44,13 +44,7 @@ Doc.B
<fo:flow flow-name="xsl-region-body">
<!-- nota: titolo -->
-<!-- <fo:block line-height="12pt" space-before.optimum="1.5pt"
space-after.optimum="1.5pt" keep-together="always"> -->
-<!--
- <fo:block line-height="20pt" font-weight="bold" font-size="18pt"
space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always"
text-align="center">
- ${uiLabelMap.ManufacturingProductionRun}
- </fo:block>
--->
<!-- inizio riquadro -->
<fo:table table-layout="fixed">
<fo:table-column column-width="18.00cm"/>
