You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2015/04/18 14:57:48 UTC
svn commit: r1674496 - in /ofbiz/trunk/applications/manufacturing:
webapp/manufacturing/reports/ShipmentLabel.fo.ftl
widget/manufacturing/ReportScreens.xml
Author: deepak
Date: Sat Apr 18 12:57:47 2015
New Revision: 1674496
URL: http://svn.apache.org/r1674496
Log:
Applied patch from jira issue OFBIZ-6196 - Package Labels Report error for Manufacturing Shipment Plan
Thanks Christian Carlow for reporting the issue and thanks Amardeep Jhajj for verifying it the patch.
Modified:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl
ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl?rev=1674496&r1=1674495&r2=1674496&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl Sat Apr 18 12:57:47 2015
@@ -36,7 +36,7 @@ under the License.
<#if index == 1>
<fo:table border="0.5pt solid black">
<fo:table-column column-width="252pt"/>
- <fo:table-header>
+ <fo:table-body>
<fo:table-row>
<fo:table-cell padding="2pt">
<fo:block>${uiLabelMap.ManufacturingShipTo}:</fo:block>
@@ -44,21 +44,20 @@ under the License.
</fo:table-row>
<fo:table-row>
<fo:table-cell padding="2pt">
- <fo:block font-size="18pt">${record.get("shippingAddressName")}</fo:block>
+ <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")}</fo:block>
+ <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")}</fo:block>
+ <fo:block>${record.get("shippingAddressCity")?if_exists}</fo:block>
</fo:table-cell>
</fo:table-row>
- </fo:table-header>
- <fo:table-body/>
+ </fo:table-body>
</fo:table>
<fo:block space-after.optimum="10pt" font-size="10pt"/>
<fo:table>
@@ -66,7 +65,7 @@ under the License.
<fo:table-column column-width="63pt"/>
<fo:table-column column-width="93pt"/>
<fo:table-column column-width="33pt"/>
- <fo:table-header border="0.5pt solid black">
+ <fo:table-body border="0.5pt solid black">
<fo:table-row>
<fo:table-cell padding="2pt">
<fo:block>${uiLabelMap.OrderOrderId}</fo:block>
@@ -81,8 +80,7 @@ under the License.
<fo:block>${uiLabelMap.CommonQuantity}</fo:block>
</fo:table-cell>
</fo:table-row>
- </fo:table-header>
- <fo:table-body/>
+ </fo:table-body>
</fo:table>
</#if>
<fo:table>
@@ -90,27 +88,26 @@ under the License.
<fo:table-column column-width="63pt"/>
<fo:table-column column-width="93pt"/>
<fo:table-column column-width="33pt"/>
- <fo:table-header/>
<fo:table-body>
<fo:table-row>
<fo:table-cell padding="2pt">
<fo:block>
- ${record.get("orderId")} ${record.get("orderItemSeqId")}
+ ${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")}
+ ${record.get("productId")?if_exists}
</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt">
<fo:block>
- ${record.get("productName")}
+ ${record.get("productName")?if_exists}
</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt">
<fo:block text-align="right">
- ${record.get("quantity")}
+ ${record.get("quantity")?if_exists}
</fo:block>
</fo:table-cell>
</fo:table-row>
@@ -141,17 +138,17 @@ under the License.
<fo:table-row>
<fo:table-cell padding="2pt">
<fo:block>
- ${shipmentIdPar}/${shipmentPackageSeqId}
+ ${shipmentIdPar?if_exists}/${shipmentPackageSeqId?if_exists}
</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt">
<fo:block>
- ${shipmentIdPar}
+ ${shipmentIdPar?if_exists}
</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt">
<fo:block>
- <#if shipDate?has_content>${shipDate}</#if>
+ <#if shipDate?has_content>${shipDate?if_exists}</#if>
</fo:block>
</fo:table-cell>
</fo:table-row>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml?rev=1674496&r1=1674495&r2=1674496&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml Sat Apr 18 12:57:47 2015
@@ -297,6 +297,7 @@ under the License.
<property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
<script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.groovy"/>
</actions>