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 2009/12/12 17:51:05 UTC
svn commit: r889947 - in
/ofbiz/trunk/applications/order/webapp/ordermgr/order:
orderReportBody.fo.ftl orderReportConditions.fo.ftl
Author: jacopoc
Date: Sat Dec 12 16:51:04 2009
New Revision: 889947
URL: http://svn.apache.org/viewvc?rev=889947&view=rev
Log:
For orders with more than one ship group, at the bottom of the order a table shwoing the product units assigned to each group is shown.
Misc layout enhancements.
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl?rev=889947&r1=889946&r2=889947&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl Sat Dec 12 16:51:04 2009
@@ -63,7 +63,7 @@
</fo:table-row>
<#if itemAdjustment != 0>
<fo:table-row>
- <fo:table-cell number-columns-spanned="2"><fo:block><fo:inline font-style="italic">${uiLabelMap.OrderAdjustments}</fo:inline>: <@ofbizCurrency amount=itemAdjustment isoCode=currencyUomId/></fo:block></fo:table-cell>
+ <fo:table-cell number-columns-spanned="2"><fo:block text-indent="0.2in"><fo:inline font-style="italic">${uiLabelMap.OrderAdjustments}</fo:inline>: <@ofbizCurrency amount=itemAdjustment isoCode=currencyUomId/></fo:block></fo:table-cell>
</fo:table-row>
</#if>
</#list>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl?rev=889947&r1=889946&r2=889947&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl Sat Dec 12 16:51:04 2009
@@ -17,6 +17,38 @@
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-column column-width="1in"/>
+ <fo:table-column column-width="1in"/>
+ <fo:table-column column-width="0.5in"/>
+ <fo:table-header>
+ <fo:table-row font-weight="bold">
+ <fo:table-cell><fo:block>${uiLabelMap.OrderShipGroup}</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>${uiLabelMap.OrderProduct}</fo:block></fo:table-cell>
+ <fo:table-cell text-align="right"><fo:block>${uiLabelMap.OrderQuantity}</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-body>
+ <#list shipGroups as shipGroup>
+ <#assign orderItemShipGroupAssocs = shipGroup.getRelated("OrderItemShipGroupAssoc")?if_exists>
+ <#if orderItemShipGroupAssocs?has_content>
+ <#list orderItemShipGroupAssocs as shipGroupAssoc>
+ <#assign orderItem = shipGroupAssoc.getRelatedOne("OrderItem")?if_exists>
+ <fo:table-row>
+ <fo:table-cell><fo:block>${shipGroup.shipGroupSeqId}</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>${orderItem.productId?if_exists}</fo:block></fo:table-cell>
+ <fo:table-cell text-align="right"><fo:block>${shipGroupAssoc.quantity?string.number}</fo:block></fo:table-cell>
+ </fo:table-row>
+ </#list>
+ </#if>
+ </#list>
+ </fo:table-body>
+ </fo:table>
+</#if>
+
+
<fo:block space-after="40pt"/>
<#if orderHeader.getString("orderTypeId") == "SALES_ORDER">
<fo:block font-size="14pt" font-weight="bold" text-align="center">THANK YOU FOR YOUR PATRONAGE!</fo:block>