Author: eckardjf
Date: Fri Apr 16 18:26:23 2010
New Revision: 935025
URL: http://svn.apache.org/viewvc?rev=935025&view=rev
Log:
reformat
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.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=935025&r1=935024&r2=935025&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl
Fri Apr 16 18:26:23 2010
@@ -19,129 +19,176 @@ under the License.
<#escape x as x?xml>
<#if orderHeader?has_content>
<fo:table border-spacing="3pt">
-
- <fo:table-column column-width="4in"/>
- <fo:table-column column-width="1in"/>
- <fo:table-column column-width="1in"/>
- <fo:table-column column-width="1in"/>
-
- <fo:table-header>
- <fo:table-row>
- <fo:table-cell><fo:block
font-weight="bold">${uiLabelMap.OrderProduct}</fo:block></fo:table-cell>
- <fo:table-cell text-align="right"><fo:block
font-weight="bold">${uiLabelMap.OrderQuantity}</fo:block></fo:table-cell>
- <fo:table-cell text-align="right"><fo:block
font-weight="bold">${uiLabelMap.OrderUnitList}</fo:block></fo:table-cell>
- <fo:table-cell text-align="right"><fo:block
font-weight="bold">${uiLabelMap.OrderSubTotal}</fo:block></fo:table-cell>
- </fo:table-row>
- </fo:table-header>
-
+ <fo:table-column column-width="4in"/>
+ <fo:table-column column-width="1in"/>
+ <fo:table-column column-width="1in"/>
+ <fo:table-column column-width="1in"/>
+ <fo:table-header>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block
font-weight="bold">${uiLabelMap.OrderProduct}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell text-align="right">
+ <fo:block
font-weight="bold">${uiLabelMap.OrderQuantity}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell text-align="right">
+ <fo:block
font-weight="bold">${uiLabelMap.OrderUnitList}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell text-align="right">
+ <fo:block
font-weight="bold">${uiLabelMap.OrderSubTotal}</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
<fo:table-body>
- <#list orderItemList as orderItem>
- <#assign orderItemType =
orderItem.getRelatedOne("OrderItemType")?if_exists>
- <#assign productId = orderItem.productId?if_exists>
+ <#list orderItemList as orderItem>
+ <#assign orderItemType =
orderItem.getRelatedOne("OrderItemType")?if_exists>
+ <#assign productId = orderItem.productId?if_exists>
<#assign remainingQuantity =
(orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0))>
- <#assign itemAdjustment =
Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemAdjustmentsTotal(orderItem,
orderAdjustments, true, false, false)>
- <fo:table-row>
+ <#assign itemAdjustment =
Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemAdjustmentsTotal(orderItem,
orderAdjustments, true, false, false)>
+ <fo:table-row>
<fo:table-cell>
<fo:block>
- <#if productId?exists>
- ${orderItem.productId?default("N/A")} -
${orderItem.itemDescription?if_exists}
- <#elseif orderItemType?exists>
- ${orderItemType.get("description",locale)} -
${orderItem.itemDescription?if_exists}
- <#else>
- ${orderItem.itemDescription?if_exists}
- </#if>
- </fo:block>
- </fo:table-cell>
- <fo:table-cell
text-align="right"><fo:block>${remainingQuantity}</fo:block></fo:table-cell>
- <fo:table-cell
text-align="right"><fo:block><@ofbizCurrency amount=orderItem.unitPrice
isoCode=currencyUomId/></fo:block></fo:table-cell>
- <fo:table-cell text-align="right"><fo:block>
- <#if orderItem.statusId != "ITEM_CANCELLED">
- <@ofbizCurrency
amount=Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemSubTotal(orderItem,
orderAdjustments) isoCode=currencyUomId/>
- <#else>
- <@ofbizCurrency amount=0.00
isoCode=currencyUomId/>
- </#if></fo:block></fo:table-cell>
- </fo:table-row>
- <#if itemAdjustment != 0>
- <fo:table-row>
- <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 productId?exists>
+ ${orderItem.productId?default("N/A")} -
${orderItem.itemDescription?if_exists}
+ <#elseif orderItemType?exists>
+ ${orderItemType.get("description",locale)}
- ${orderItem.itemDescription?if_exists}
+ <#else>
+ ${orderItem.itemDescription?if_exists}
+ </#if>
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell text-align="right">
+ <fo:block>${remainingQuantity}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell text-align="right">
+ <fo:block><@ofbizCurrency
amount=orderItem.unitPrice isoCode=currencyUomId/></fo:block>
+ </fo:table-cell>
+ <fo:table-cell text-align="right">
+ <fo:block>
+ <#if orderItem.statusId != "ITEM_CANCELLED">
+ <@ofbizCurrency
amount=Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemSubTotal(orderItem,
orderAdjustments) isoCode=currencyUomId/>
+ <#else>
+ <@ofbizCurrency amount=0.00
isoCode=currencyUomId/>
+ </#if>
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <#if itemAdjustment != 0>
+ <fo:table-row>
+ <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>
- <#list orderHeaderAdjustments as orderHeaderAdjustment>
- <#assign adjustmentType =
orderHeaderAdjustment.getRelatedOne("OrderAdjustmentType")>
- <#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 number-columns-spanned="2"><fo:block
font-weight="bold">${adjustmentType.get("description",locale)} : <#if
orderHeaderAdjustment.get("description")?has_content>(${orderHeaderAdjustment.get("description")?if_exists})</#if>
</fo:block></fo:table-cell>
- <fo:table-cell text-align="right"><fo:block><@ofbizCurrency
amount=adjustmentAmount isoCode=currencyUomId/></fo:block></fo:table-cell>
- </fo:table-row>
- </#if>
- </#list>
-
- <#-- summary of order amounts -->
- <fo:table-row>
- <fo:table-cell></fo:table-cell>
- <fo:table-cell number-columns-spanned="2"><fo:block
font-weight="bold">${uiLabelMap.OrderItemsSubTotal}</fo:block></fo:table-cell>
- <fo:table-cell
text-align="right"><fo:block><@ofbizCurrency amount=orderSubTotal
isoCode=currencyUomId/></fo:block></fo:table-cell>
- </fo:table-row>
- <#if otherAdjAmount != 0>
+ </#list>
+ <#list orderHeaderAdjustments as orderHeaderAdjustment>
+ <#assign adjustmentType =
orderHeaderAdjustment.getRelatedOne("OrderAdjustmentType")>
+ <#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 number-columns-spanned="2">
+ <fo:block font-weight="bold">
+
${adjustmentType.get("description",locale)} :
+ <#if
orderHeaderAdjustment.get("description")?has_content>
+
(${orderHeaderAdjustment.get("description")?if_exists})
+ </#if>
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell text-align="right">
+ <fo:block><@ofbizCurrency
amount=adjustmentAmount isoCode=currencyUomId/></fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </#if>
+ </#list>
+ <#-- summary of order amounts -->
+ <fo:table-row>
+ <fo:table-cell></fo:table-cell>
+ <fo:table-cell number-columns-spanned="2">
+ <fo:block
font-weight="bold">${uiLabelMap.OrderItemsSubTotal}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell text-align="right">
+ <fo:block><@ofbizCurrency amount=orderSubTotal
isoCode=currencyUomId/></fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <#if otherAdjAmount != 0>
<fo:table-row>
<fo:table-cell></fo:table-cell>
- <fo:table-cell number-columns-spanned="2"><fo:block
font-weight="bold">${uiLabelMap.OrderTotalOtherOrderAdjustments}</fo:block></fo:table-cell>
- <fo:table-cell
text-align="right"><fo:block><@ofbizCurrency amount=otherAdjAmount
isoCode=currencyUomId/></fo:block></fo:table-cell>
+ <fo:table-cell number-columns-spanned="2">
+ <fo:block
font-weight="bold">${uiLabelMap.OrderTotalOtherOrderAdjustments}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell text-align="right">
+ <fo:block><@ofbizCurrency amount=otherAdjAmount
isoCode=currencyUomId/></fo:block>
+ </fo:table-cell>
</fo:table-row>
- </#if>
- <#if shippingAmount != 0>
+ </#if>
+ <#if shippingAmount != 0>
<fo:table-row>
<fo:table-cell></fo:table-cell>
- <fo:table-cell number-columns-spanned="2"><fo:block
font-weight="bold">${uiLabelMap.OrderTotalShippingAndHandling}</fo:block></fo:table-cell>
- <fo:table-cell
text-align="right"><fo:block><@ofbizCurrency amount=shippingAmount
isoCode=currencyUomId/></fo:block></fo:table-cell>
+ <fo:table-cell number-columns-spanned="2">
+ <fo:block
font-weight="bold">${uiLabelMap.OrderTotalShippingAndHandling}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell text-align="right">
+ <fo:block><@ofbizCurrency amount=shippingAmount
isoCode=currencyUomId/></fo:block>
+ </fo:table-cell>
</fo:table-row>
- </#if>
- <#if taxAmount != 0>
+ </#if>
+ <#if taxAmount != 0>
<fo:table-row>
<fo:table-cell></fo:table-cell>
- <fo:table-cell number-columns-spanned="2"><fo:block
font-weight="bold">${uiLabelMap.OrderTotalSalesTax}</fo:block></fo:table-cell>
- <fo:table-cell
text-align="right"><fo:block><@ofbizCurrency amount=taxAmount
isoCode=currencyUomId/></fo:block></fo:table-cell>
+ <fo:table-cell number-columns-spanned="2">
+ <fo:block
font-weight="bold">${uiLabelMap.OrderTotalSalesTax}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell text-align="right">
+ <fo:block><@ofbizCurrency amount=taxAmount
isoCode=currencyUomId/></fo:block>
+ </fo:table-cell>
</fo:table-row>
- </#if>
- <#if grandTotal != 0>
+ </#if>
+ <#if grandTotal != 0>
<fo:table-row>
<fo:table-cell></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>
- <fo:table-cell
text-align="right"><fo:block><@ofbizCurrency amount=grandTotal
isoCode=currencyUomId/></fo:block></fo:table-cell>
- </fo:table-row>
- </#if>
-
- <#-- notes -->
- <#if orderNotes?has_content>
- <#if showNoteHeadingOnPDF>
- <fo:table-row >
- <fo:table-cell number-columns-spanned="3">
- <fo:block
font-weight="bold">${uiLabelMap.OrderNotes}</fo:block>
- <fo:block><fo:leader leader-length="19cm"
leader-pattern="rule"/></fo:block>
- </fo:table-cell>
- </fo:table-row>
- </#if>
- <#list orderNotes as note>
- <#if (note.internalNote?has_content) && (note.internalNote !=
"Y")>
- <fo:table-row>
- <fo:table-cell number-columns-spanned="1">
- <fo:block>${note.noteInfo?if_exists}</fo:block>
- </fo:table-cell>
- <fo:table-cell number-columns-spanned="2">
- <#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>
- </fo:table-cell>
- <fo:table-cell number-columns-spanned="1">
- <fo:block>${uiLabelMap.CommonAt}:
${note.noteDateTime?string?if_exists}</fo:block>
- </fo:table-cell>
- </fo:table-row>
- </#if>
- </#list>
- </#if>
+ <fo:table-cell number-columns-spanned="2"
background-color="#EEEEEE">
+ <fo:block
font-weight="bold">${uiLabelMap.OrderTotalDue}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell text-align="right">
+ <fo:block><@ofbizCurrency amount=grandTotal
isoCode=currencyUomId/></fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </#if>
+ <#-- notes -->
+ <#if orderNotes?has_content>
+ <#if showNoteHeadingOnPDF>
+ <fo:table-row>
+ <fo:table-cell number-columns-spanned="3">
+ <fo:block
font-weight="bold">${uiLabelMap.OrderNotes}</fo:block>
+ <fo:block>
+ <fo:leader leader-length="19cm"
leader-pattern="rule"/>
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </#if>
+ <#list orderNotes as note>
+ <#if (note.internalNote?has_content) &&
(note.internalNote != "Y")>
+ <fo:table-row>
+ <fo:table-cell number-columns-spanned="1">
+
<fo:block>${note.noteInfo?if_exists}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell number-columns-spanned="2">
+ <#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>
+ </fo:table-cell>
+ <fo:table-cell number-columns-spanned="1">
+ <fo:block>${uiLabelMap.CommonAt}:
${note.noteDateTime?string?if_exists}</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </#if>
+ </#list>
+ </#if>
</fo:table-body>
- </fo:table>
+ </fo:table>
</#if>
-</#escape>
\ No newline at end of file
+</#escape>
