You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2014/04/24 08:35:00 UTC
svn commit: r1589604 - in /ofbiz/branches/release12.04: ./
applications/order/webapp/ordermgr/order/
Author: jacopoc
Date: Thu Apr 24 06:35:00 2014
New Revision: 1589604
URL: http://svn.apache.org/r1589604
Log:
Applied fix from trunk for revision: 1589602
===
Fix for FOP warnings reported by Kiran Gawde in OFBIZ-4493: thanks to Deepak Dixit for the patch.
Modified:
ofbiz/branches/release12.04/ (props changed)
ofbiz/branches/release12.04/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl
ofbiz/branches/release12.04/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl
ofbiz/branches/release12.04/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl
Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1589602
Modified: ofbiz/branches/release12.04/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl?rev=1589604&r1=1589603&r2=1589604&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl (original)
+++ ofbiz/branches/release12.04/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl Thu Apr 24 06:35:00 2014
@@ -18,7 +18,7 @@ under the License.
-->
<#escape x as x?xml>
<#if orderHeader?has_content>
- <fo:table border-spacing="3pt">
+ <fo:table table-layout="fixed" border-spacing="3pt">
<fo:table-column column-width="3in"/>
<fo:table-column column-width="1in"/>
<fo:table-column column-width="1in"/>
@@ -29,7 +29,7 @@ under the License.
<fo:table-cell>
<fo:block font-weight="bold">${uiLabelMap.OrderProduct}</fo:block>
</fo:table-cell>
- <fo:table-cell></fo:table-cell>
+ <fo:table-cell><fo:block></fo:block></fo:table-cell>
<fo:table-cell text-align="right">
<fo:block font-weight="bold">${uiLabelMap.OrderQuantity}</fo:block>
</fo:table-cell>
@@ -103,8 +103,8 @@ under the License.
<#assign adjustmentAmount = Static["org.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(orderHeaderAdjustment, orderSubTotal)>
<#if adjustmentAmount != 0>
<fo:table-row>
- <fo:table-cell></fo:table-cell>
- <fo:table-cell></fo:table-cell>
+ <fo:table-cell><fo:block></fo:block></fo:table-cell>
+ <fo:table-cell><fo:block></fo:block></fo:table-cell>
<fo:table-cell number-columns-spanned="2">
<fo:block font-weight="bold">
${adjustmentType.get("description",locale)} :
@@ -121,8 +121,8 @@ under the License.
</#list>
<#-- summary of order amounts -->
<fo:table-row>
- <fo:table-cell></fo:table-cell>
- <fo:table-cell></fo:table-cell>
+ <fo:table-cell><fo:block></fo:block></fo:table-cell>
+ <fo:table-cell><fo:block></fo:block></fo:table-cell>
<fo:table-cell number-columns-spanned="2">
<fo:block font-weight="bold">${uiLabelMap.OrderItemsSubTotal}</fo:block>
</fo:table-cell>
@@ -132,8 +132,8 @@ under the License.
</fo:table-row>
<#if otherAdjAmount != 0>
<fo:table-row>
- <fo:table-cell></fo:table-cell>
- <fo:table-cell></fo:table-cell>
+ <fo:table-cell><fo:block></fo:block></fo:table-cell>
+ <fo:table-cell><fo:block></fo:block></fo:table-cell>
<fo:table-cell number-columns-spanned="2">
<fo:block font-weight="bold">${uiLabelMap.OrderTotalOtherOrderAdjustments}</fo:block>
</fo:table-cell>
@@ -144,8 +144,8 @@ under the License.
</#if>
<#if shippingAmount != 0>
<fo:table-row>
- <fo:table-cell></fo:table-cell>
- <fo:table-cell></fo:table-cell>
+ <fo:table-cell><fo:block></fo:block></fo:table-cell>
+ <fo:table-cell><fo:block></fo:block></fo:table-cell>
<fo:table-cell number-columns-spanned="2">
<fo:block font-weight="bold">${uiLabelMap.OrderTotalShippingAndHandling}</fo:block>
</fo:table-cell>
@@ -156,8 +156,8 @@ under the License.
</#if>
<#if taxAmount != 0>
<fo:table-row>
- <fo:table-cell></fo:table-cell>
- <fo:table-cell></fo:table-cell>
+ <fo:table-cell><fo:block></fo:block></fo:table-cell>
+ <fo:table-cell><fo:block></fo:block></fo:table-cell>
<fo:table-cell number-columns-spanned="2">
<fo:block font-weight="bold">${uiLabelMap.OrderTotalSalesTax}</fo:block>
</fo:table-cell>
@@ -168,8 +168,8 @@ under the License.
</#if>
<#if grandTotal != 0>
<fo:table-row>
- <fo:table-cell></fo:table-cell>
- <fo:table-cell></fo:table-cell>
+ <fo:table-cell><fo:block></fo:block></fo:table-cell>
+ <fo:table-cell><fo:block></fo:block></fo:table-cell>
<fo:table-cell number-columns-spanned="2" background-color="#EEEEEE">
<fo:block font-weight="bold">${uiLabelMap.OrderTotalDue}</fo:block>
</fo:table-cell>
@@ -197,10 +197,12 @@ under the License.
<fo:block>${note.noteInfo?if_exists}</fo:block>
</fo:table-cell>
<fo:table-cell number-columns-spanned="2">
+ <fo:block>
<#if note.noteParty?has_content>
<#assign notePartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", note.noteParty, "compareDate", note.noteDateTime, "lastNameFirst", "Y", "userLogin", userLogin))/>
- <fo:block>${uiLabelMap.CommonBy}: ${notePartyNameResult.fullName?default("${uiLabelMap.OrderPartyNameNotFound}")}</fo:block>
+ ${uiLabelMap.CommonBy}: ${notePartyNameResult.fullName?default("${uiLabelMap.OrderPartyNameNotFound}")}
</#if>
+ </fo:block>
</fo:table-cell>
<fo:table-cell number-columns-spanned="1">
<fo:block>${uiLabelMap.CommonAt}: ${note.noteDateTime?string?if_exists}</fo:block>
Modified: ofbiz/branches/release12.04/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl?rev=1589604&r1=1589603&r2=1589604&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl (original)
+++ ofbiz/branches/release12.04/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl Thu Apr 24 06:35:00 2014
@@ -19,7 +19,7 @@ under the License.
<#escape x as x?xml>
<#if shipGroups?exists && shipGroups.size() gt 1>
- <fo:table border-spacing="3pt" space-before="0.3in" font-size="9pt">
+ <fo:table table-layout="fixed" border-spacing="3pt" space-before="0.3in" font-size="9pt">
<fo:table-column column-width="1in"/>
<fo:table-column column-width="1in"/>
<fo:table-column column-width="0.5in"/>
Modified: ofbiz/branches/release12.04/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl?rev=1589604&r1=1589603&r2=1589604&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl (original)
+++ ofbiz/branches/release12.04/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl Thu Apr 24 06:35:00 2014
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
<#escape x as x?xml>
- <fo:table>
+ <fo:table table-layout="fixed">
<fo:table-column column-width="2.0in"/>
<fo:table-column column-width="2.0in"/>
<fo:table-body>