Author: deepak
Date: Sat May 21 11:22:03 2016
New Revision: 1744906
URL: http://svn.apache.org/viewvc?rev=1744906&view=rev
Log:
(OFBIZ-7090) Manually merge r#1744902.
=======================================================
Return Pdf is throwing exception
=======================================================
Thanks Nameet Jain for reporting the issue and Renuka for providing the patch.
Modified:
ofbiz/branches/release14.12/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl
ofbiz/branches/release14.12/applications/order/webapp/ordermgr/return/returnReportContactMechs.fo.ftl
Modified:
ofbiz/branches/release14.12/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl?rev=1744906&r1=1744905&r2=1744906&view=diff
==============================================================================
---
ofbiz/branches/release14.12/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl
(original)
+++
ofbiz/branches/release14.12/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl
Sat May 21 11:22:03 2016
@@ -108,11 +108,11 @@ under the License.
<fo:table-column column-width="0.875in"/>
<fo:table-body>
<fo:table-row>
- <fo:table-cell/>
- <fo:table-cell/>
- <fo:table-cell/>
- <fo:table-cell/>
- <fo:table-cell/>
+ <fo:table-cell><fo:block/></fo:table-cell>
+ <fo:table-cell><fo:block/></fo:table-cell>
+ <fo:table-cell><fo:block/></fo:table-cell>
+ <fo:table-cell><fo:block/></fo:table-cell>
+ <fo:table-cell><fo:block/></fo:table-cell>
<fo:table-cell padding="1mm" border-style="solid"
border-width="0.2pt">
<fo:block font-weight="bold"
text-align="center">${uiLabelMap.CommonTotal}</fo:block>
</fo:table-cell>
Modified:
ofbiz/branches/release14.12/applications/order/webapp/ordermgr/return/returnReportContactMechs.fo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/webapp/ordermgr/return/returnReportContactMechs.fo.ftl?rev=1744906&r1=1744905&r2=1744906&view=diff
==============================================================================
---
ofbiz/branches/release14.12/applications/order/webapp/ordermgr/return/returnReportContactMechs.fo.ftl
(original)
+++
ofbiz/branches/release14.12/applications/order/webapp/ordermgr/return/returnReportContactMechs.fo.ftl
Sat May 21 11:22:03 2016
@@ -46,7 +46,7 @@ ${postalAddressFrom.city}<#if (postalAdd
</fo:table>
</fo:table-cell>
- <fo:table-cell/>
+ <fo:table-cell><fo:block/></fo:table-cell>
<fo:table-cell>
<fo:table border-style="solid" border-width="0.2pt" height="1in">
