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 15:02:55 UTC
svn commit: r1674498 - in /ofbiz/branches/release14.12: ./
applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl
applications/manufacturing/widget/manufacturing/ReportScreens.xml
Author: deepak
Date: Sat Apr 18 13:02:55 2015
New Revision: 1674498
URL: http://svn.apache.org/r1674498
Log:
Applied fix from trunk r#r1674496
============================================================
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/branches/release14.12/ (props changed)
ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl
ofbiz/branches/release14.12/applications/manufacturing/widget/manufacturing/ReportScreens.xml
Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 18 13:02:55 2015
@@ -8,4 +8,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491
+/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496
Modified: ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl?rev=1674498&r1=1674497&r2=1674498&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl (original)
+++ ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl Sat Apr 18 13:02:55 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/branches/release14.12/applications/manufacturing/widget/manufacturing/ReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/manufacturing/widget/manufacturing/ReportScreens.xml?rev=1674498&r1=1674497&r2=1674498&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/manufacturing/widget/manufacturing/ReportScreens.xml (original)
+++ ofbiz/branches/release14.12/applications/manufacturing/widget/manufacturing/ReportScreens.xml Sat Apr 18 13:02:55 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>