svn commit: r1736868 [15/20] - in /ofbiz/trunk/applications/order: template/ template/entry/ template/entry/cart/ template/entry/catalog/ template/entry/order/ template/order/ template/product/ template/quote/ template/reports/ template/request/ templa...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1736868 [15/20] - in /ofbiz/trunk/applications/order: template/ template/entry/ template/entry/cart/ template/entry/catalog/ template/entry/order/ template/order/ template/product/ template/quote/ template/reports/ template/request/ templa...

jleroux@apache.org
Added: ofbiz/trunk/applications/order/template/quote/quoteReportBody.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/quote/quoteReportBody.fo.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/quote/quoteReportBody.fo.ftl (added)
+++ ofbiz/trunk/applications/order/template/quote/quoteReportBody.fo.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,163 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#escape x as x?xml>
+        <fo:block>
+            <fo:table table-layout="fixed" font-size="9pt">
+                <fo:table-column column-width="40pt"/>
+                <fo:table-column column-width="160pt"/>
+                <fo:table-column column-width="58pt"/>
+                <fo:table-column column-width="58pt"/>
+                <fo:table-column column-width="58pt"/>
+                <fo:table-column column-width="58pt"/>
+                <fo:table-column column-width="58pt"/>
+                <fo:table-header>
+                    <fo:table-row>
+                        <fo:table-cell border-bottom="thin solid grey"><fo:block font-weight="bold">${uiLabelMap.ProductItem}</fo:block></fo:table-cell>
+                        <fo:table-cell border-bottom="thin solid grey"><fo:block font-weight="bold">${uiLabelMap.ProductProduct}</fo:block></fo:table-cell>
+                        <fo:table-cell border-bottom="thin solid grey"><fo:block font-weight="bold" text-align="right">${uiLabelMap.ProductQuantity}</fo:block></fo:table-cell>
+                        <fo:table-cell border-bottom="thin solid grey"><fo:block font-weight="bold" text-align="right">${uiLabelMap.OrderAmount}</fo:block></fo:table-cell>
+                        <fo:table-cell border-bottom="thin solid grey"><fo:block font-weight="bold" text-align="right">${uiLabelMap.OrderOrderQuoteUnitPrice}</fo:block></fo:table-cell>
+                        <fo:table-cell border-bottom="thin solid grey"><fo:block font-weight="bold" text-align="right">${uiLabelMap.OrderAdjustments}</fo:block></fo:table-cell>
+                        <fo:table-cell border-bottom="thin solid grey"><fo:block font-weight="bold" text-align="right">${uiLabelMap.CommonSubtotal}</fo:block></fo:table-cell>
+                    </fo:table-row>
+                </fo:table-header>
+                <fo:table-body>
+                    <#assign rowColor = "white">
+                    <#assign totalQuoteAmount = 0.0>
+                    <#if quoteItems?has_content>
+                    <#list quoteItems as quoteItem>
+                        <#if quoteItem.productId??>
+                            <#assign product = quoteItem.getRelatedOne("Product", false)>
+                        </#if>
+                        <#assign quoteItemAmount = quoteItem.quoteUnitPrice?default(0) * quoteItem.quantity?default(0)>
+                        <#assign quoteItemAdjustments = quoteItem.getRelated("QuoteAdjustment", null, null, false)>
+                        <#assign totalQuoteItemAdjustmentAmount = 0.0>
+                        <#list quoteItemAdjustments as quoteItemAdjustment>
+                            <#assign totalQuoteItemAdjustmentAmount = quoteItemAdjustment.amount?default(0) + totalQuoteItemAdjustmentAmount>
+                        </#list>
+                        <#assign totalQuoteItemAmount = quoteItemAmount + totalQuoteItemAdjustmentAmount>
+                        <#assign totalQuoteAmount = totalQuoteAmount + totalQuoteItemAmount>
+
+                        <fo:table-row>
+                            <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                <fo:block>${quoteItem.quoteItemSeqId}</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                <fo:block>${(product.internalName)!} [${quoteItem.productId!}]</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                <fo:block text-align="right">${quoteItem.quantity!}</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                <fo:block text-align="right">${quoteItem.selectedAmount!}</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                <fo:block text-align="right"><@ofbizCurrency amount=quoteItem.quoteUnitPrice isoCode=quote.currencyUomId/></fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                <fo:block text-align="right"><@ofbizCurrency amount=totalQuoteItemAdjustmentAmount isoCode=quote.currencyUomId/></fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                <fo:block text-align="right"><@ofbizCurrency amount=totalQuoteItemAmount isoCode=quote.currencyUomId/></fo:block>
+                            </fo:table-cell>
+
+                        </fo:table-row>
+                        <#list quoteItemAdjustments as quoteItemAdjustment>
+                            <#assign adjustmentType = quoteItemAdjustment.getRelatedOne("OrderAdjustmentType", false)>
+                            <fo:table-row>
+                                <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                </fo:table-cell>
+                                <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                </fo:table-cell>
+                                <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                </fo:table-cell>
+                                <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                </fo:table-cell>
+                                <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                    <fo:block font-size="7pt" text-align="right">${adjustmentType.get("description",locale)!}</fo:block>
+                                </fo:table-cell>
+                                <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                    <fo:block font-size="7pt" text-align="right"><@ofbizCurrency amount=quoteItemAdjustment.amount isoCode=quote.currencyUomId/></fo:block>
+                                </fo:table-cell>
+                                <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                </fo:table-cell>
+                            </fo:table-row>
+                        </#list>
+
+                        <#if rowColor == "white">
+                            <#assign rowColor = "#D4D0C8">
+                        <#else>
+                            <#assign rowColor = "white">
+                        </#if>
+                    </#list>
+                    <#else>
+                      <fo:table-row>
+                         <fo:table-cell number-columns-spanned="7" padding="2pt" background-color="${rowColor}">
+                             <fo:block>${uiLabelMap.OrderNoItemsQuote}</fo:block>
+                         </fo:table-cell>
+                      </fo:table-row>
+                    </#if>
+                </fo:table-body>
+            </fo:table>
+
+
+
+
+            <fo:block text-align="right">
+                <fo:table>
+                    <fo:table-column column-width="100pt"/>
+                    <fo:table-column column-width="100pt"/>
+                    <fo:table-body>
+                        <fo:table-row>
+                            <fo:table-cell padding="2pt">
+                                <fo:block font-weight="bold" text-align="right">${uiLabelMap.CommonSubtotal}</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell padding="2pt">
+                                <fo:block text-align="right"><@ofbizCurrency amount=totalQuoteAmount isoCode=quote.currencyUomId/></fo:block>
+                            </fo:table-cell>
+                        </fo:table-row>
+                        <#assign totalQuoteHeaderAdjustmentAmount = 0.0>
+                        <#list quoteAdjustments as quoteAdjustment>
+                            <#assign adjustmentType = quoteAdjustment.getRelatedOne("OrderAdjustmentType", false)>
+                            <#if !quoteAdjustment.quoteItemSeqId??>
+                                <#assign totalQuoteHeaderAdjustmentAmount = quoteAdjustment.amount?default(0) + totalQuoteHeaderAdjustmentAmount>
+                                <fo:table-row>
+                                    <fo:table-cell padding="2pt">
+                                        <fo:block font-weight="bold" text-align="right">${adjustmentType.get("description", locale)!}</fo:block>
+                                    </fo:table-cell>
+                                    <fo:table-cell padding="2pt">
+                                        <fo:block text-align="right"><@ofbizCurrency amount=quoteAdjustment.amount isoCode=quote.currencyUomId/></fo:block>
+                                    </fo:table-cell>
+                                </fo:table-row>
+                            </#if>
+                        </#list>
+                        <#assign grandTotalQuoteAmount = totalQuoteAmount + totalQuoteHeaderAdjustmentAmount>
+                        <fo:table-row>
+                            <fo:table-cell padding="2pt">
+                                <fo:block font-weight="bold" text-align="right">${uiLabelMap.OrderGrandTotal}</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell padding="2pt">
+                                <fo:block text-align="right"><@ofbizCurrency amount=grandTotalQuoteAmount isoCode=quote.currencyUomId/></fo:block>
+                            </fo:table-cell>
+                        </fo:table-row>
+                    </fo:table-body>
+                </fo:table>
+            </fo:block>
+        </fo:block>
+</#escape>

Propchange: ofbiz/trunk/applications/order/template/quote/quoteReportBody.fo.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/order/template/quote/quoteReportBody.fo.ftl
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/order/template/quote/quoteReportBody.fo.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/trunk/applications/order/template/quote/quoteReportContactMechs.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/quote/quoteReportContactMechs.fo.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/quote/quoteReportContactMechs.fo.ftl (added)
+++ ofbiz/trunk/applications/order/template/quote/quoteReportContactMechs.fo.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,78 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#escape x as x?xml>
+
+        <fo:table table-layout="fixed" border-spacing="3pt">
+            <fo:table-column column-width="3.75in"/>
+            <fo:table-column column-width="3.75in"/>
+            <fo:table-body>
+                <fo:table-row>
+                    <fo:table-cell>
+                        <fo:block>
+                            <fo:block font-weight="bold">${uiLabelMap.OrderAddress}: </fo:block>
+                            <#if quote.partyId??>
+                                <#assign quotePartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", quote.partyId, "compareDate", quote.issueDate, "userLogin", userLogin))/>
+                                <fo:block>${quotePartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")}</fo:block>
+                            <#else>
+                                <fo:block>[${uiLabelMap.OrderPartyNameNotFound}]</fo:block>
+                            </#if>
+                        </fo:block>
+                    </fo:table-cell>
+                </fo:table-row>
+                <fo:table-row>
+                    <fo:table-cell>
+                        <fo:block>
+                            <#if toPostalAddress??>
+                                ${setContextField("postalAddress", toPostalAddress)}
+                                ${screens.render("component://party/widget/partymgr/PartyScreens.xml#postalAddressPdfFormatter")}
+                            </#if>
+                        </fo:block>
+                    </fo:table-cell>
+                </fo:table-row>
+            </fo:table-body>
+        </fo:table>
+
+
+        <fo:table table-layout="fixed" border-spacing="3pt" space-before="0.5in" space-after="0.5in">
+            <fo:table-column column-width="1.5in"/>
+            <fo:table-column column-width="3.75in"/>
+            <fo:table-body>
+                <fo:table-row>
+                    <fo:table-cell><fo:block>${uiLabelMap.OrderOrderQuoteName}:</fo:block></fo:table-cell>
+                    <fo:table-cell><fo:block>${quote.quoteName!}</fo:block></fo:table-cell>
+                </fo:table-row>
+                <fo:table-row>
+                    <fo:table-cell><fo:block>${uiLabelMap.CommonDescription}:</fo:block></fo:table-cell>
+                    <fo:table-cell><fo:block>${quote.description!}</fo:block></fo:table-cell>
+                </fo:table-row>
+                <fo:table-row>
+                    <fo:table-cell><fo:block>${uiLabelMap.CommonCurrency}:</fo:block></fo:table-cell>
+                    <fo:table-cell><fo:block><#if currency??>${currency.get("description",locale)?default(quote.currencyUomId!)}</#if></fo:block></fo:table-cell>
+                </fo:table-row>
+                <fo:table-row>
+                    <fo:table-cell><fo:block>${uiLabelMap.CommonValidFromDate}:</fo:block></fo:table-cell>
+                    <fo:table-cell><fo:block>${(quote.validFromDate.toString())!}</fo:block></fo:table-cell>
+                </fo:table-row>
+                <fo:table-row>
+                    <fo:table-cell><fo:block>${uiLabelMap.CommonValidThruDate}:</fo:block></fo:table-cell>
+                    <fo:table-cell><fo:block>${(quote.validThruDate.toString())!}</fo:block></fo:table-cell>
+                </fo:table-row>
+            </fo:table-body>
+        </fo:table>
+</#escape>

Propchange: ofbiz/trunk/applications/order/template/quote/quoteReportContactMechs.fo.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/order/template/quote/quoteReportContactMechs.fo.ftl
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/order/template/quote/quoteReportContactMechs.fo.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/trunk/applications/order/template/quote/quoteReportHeaderInfo.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/quote/quoteReportHeaderInfo.fo.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/quote/quoteReportHeaderInfo.fo.ftl (added)
+++ ofbiz/trunk/applications/order/template/quote/quoteReportHeaderInfo.fo.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,55 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#escape x as x?xml>
+
+<fo:list-block provisional-distance-between-starts="35mm" font-size="10pt">
+    <fo:list-item>
+        <fo:list-item-label>
+            <fo:block font-weight="bold">${uiLabelMap.OrderOrderQuoteType}</fo:block>
+        </fo:list-item-label>
+        <fo:list-item-body start-indent="body-start()">
+            <fo:block font-weight="bold">${(quoteType.get("description",locale))?default(quote.quoteTypeId!)}</fo:block>
+        </fo:list-item-body>
+    </fo:list-item>
+    <fo:list-item>
+        <fo:list-item-label>
+            <fo:block>${uiLabelMap.OrderOrderQuoteIssueDate}</fo:block>
+        </fo:list-item-label>
+        <fo:list-item-body start-indent="body-start()">
+            <fo:block>${(quote.issueDate.toString())!}</fo:block>
+        </fo:list-item-body>
+    </fo:list-item>
+    <fo:list-item>
+        <fo:list-item-label>
+            <fo:block>${uiLabelMap.OrderOrderQuoteId}</fo:block>
+        </fo:list-item-label>
+        <fo:list-item-body start-indent="body-start()">
+            <fo:block>${quote.quoteId}</fo:block>
+        </fo:list-item-body>
+    </fo:list-item>
+    <fo:list-item>
+        <fo:list-item-label>
+            <fo:block>${uiLabelMap.CommonStatus}</fo:block>
+        </fo:list-item-label>
+        <fo:list-item-body start-indent="body-start()">
+            <fo:block font-weight="bold">${(statusItem.get("description", locale))?default(quote.statusId!)}</fo:block>
+        </fo:list-item-body>
+    </fo:list-item>
+</fo:list-block>
+</#escape>

Propchange: ofbiz/trunk/applications/order/template/quote/quoteReportHeaderInfo.fo.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/order/template/quote/quoteReportHeaderInfo.fo.ftl
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/order/template/quote/quoteReportHeaderInfo.fo.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/trunk/applications/order/template/quote/quoteRoles.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/quote/quoteRoles.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/quote/quoteRoles.ftl (added)
+++ ofbiz/trunk/applications/order/template/quote/quoteRoles.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,50 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<div class="screenlet">
+    <div class="screenlet-title-bar">
+        <div class="h3">${uiLabelMap.OrderOrderQuoteRoles}</div>
+    </div>
+    <div class="screenlet-body">
+      <#if quoteRoles?has_content>
+        <table cellspacing="0" class="basic-table">
+            <#assign row = 1>
+            <#list quoteRoles as quoteRole>
+                <#assign roleType = quoteRole.getRelatedOne("RoleType", false)>
+                <#assign party = quoteRole.getRelatedOne("Party", false)>
+                <#assign rolePartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", quoteRole.partyId, "compareDate", quote.issueDate, "userLogin", userLogin))/>
+                <tr>
+                    <td align="right" valign="top" width="15%" class="label">
+                        &nbsp;${roleType.get("description",locale)!}
+                    </td>
+                    <td width="5%">&nbsp;</td>
+                    <td valign="top" width="80%">
+                        ${rolePartyNameResult.fullName?default("Name Not Found")}
+                    </td>
+                </tr>
+            <#if quoteRoles.size() != row>
+                <tr><td colspan="3"><hr /></td></tr>
+            </#if>
+            <#assign row = row + 1>
+            </#list>
+        </table>
+      <#else>
+        &nbsp;
+      </#if>
+    </div>
+</div>

Propchange: ofbiz/trunk/applications/order/template/quote/quoteRoles.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/order/template/quote/quoteRoles.ftl
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/order/template/quote/quoteRoles.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportPayment.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportPayment.fo.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportPayment.fo.ftl (added)
+++ ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportPayment.fo.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,127 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#escape x as x?xml>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+<#-- do not display columns associated with values specified in the request, ie constraint values -->
+<#assign showProductStore = !parameters.productStoreId?has_content>
+<#assign showOriginFacility = !parameters.originFacilityId?has_content>
+<#assign showTerminal = !parameters.terminalId?has_content>
+<#assign showStatus = !parameters.statusId?has_content>
+
+<fo:layout-master-set>
+    <fo:simple-page-master master-name="main" page-height="11in" page-width="8.5in"
+            margin-top="0.5in" margin-bottom="1in" margin-left="0.5in" margin-right="0.5in">
+        <fo:region-body margin-top="1in"/>
+        <fo:region-before extent="1in"/>
+        <fo:region-after extent="1in"/>
+    </fo:simple-page-master>
+</fo:layout-master-set>
+<#if security.hasEntityPermission("ORDERMGR", "_VIEW", session)>
+
+<#if orderPurchasePaymentSummaryList?has_content>
+        <fo:page-sequence master-reference="main">
+        <fo:flow flow-name="xsl-region-body" font-family="Helvetica">
+            <fo:block font-size="14pt">${uiLabelMap.OrderReportPurchasesByPaymentMethod}</fo:block>
+            <#if !showProductStore><fo:block font-size="10pt">${uiLabelMap.CommonFor} ${uiLabelMap.ProductProductStore}: ${parameters.productStoreId}</fo:block></#if>
+            <#if !showOriginFacility><fo:block font-size="10pt">${uiLabelMap.CommonFor} ${uiLabelMap.FormFieldTitle_originFacilityId}: ${parameters.originFacilityId}</fo:block></#if>
+            <#if !showTerminal><fo:block font-size="10pt">${uiLabelMap.CommonFor} ${uiLabelMap.FormFieldTitle_terminalId}: ${parameters.terminalId}</fo:block></#if>
+            <#if !showStatus><fo:block font-size="10pt">${uiLabelMap.CommonFor} ${uiLabelMap.FormFieldTitle_orderStatusId}: ${parameters.statusId}</fo:block></#if>
+            <#if parameters.fromOrderDate?has_content><fo:block font-size="10pt">${uiLabelMap.CommonFromDate}: ${parameters.fromOrderDate} (${uiLabelMap.OrderDate} &gt;= ${uiLabelMap.CommonFrom})</fo:block></#if>
+            <#if parameters.thruOrderDate?has_content><fo:block font-size="10pt">${uiLabelMap.CommonThruDate}: ${parameters.thruOrderDate} (${uiLabelMap.OrderDate} &lt; ${uiLabelMap.CommonFrom})</fo:block></#if>
+            <fo:block space-after.optimum="10pt" font-size="10pt">
+            <fo:table>
+                <#if showProductStore><fo:table-column column-width="50pt"/></#if>
+                <#if showOriginFacility><fo:table-column column-width="80pt"/></#if>
+                <#if showTerminal><fo:table-column column-width="50pt"/></#if>
+                <#if showStatus><fo:table-column column-width="110pt"/></#if>
+                <fo:table-column column-width="100pt"/>
+                <fo:table-column column-width="60pt"/>
+                <fo:table-header>
+                    <fo:table-row font-weight="bold">
+                        <#if showProductStore><fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.FormFieldTitle_productStoreId}</fo:block></fo:table-cell></#if>
+                        <#if showOriginFacility><fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.FormFieldTitle_facilityId}</fo:block></fo:table-cell></#if>
+                        <#if showTerminal><fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.FormFieldTitle_terminalId}</fo:block></fo:table-cell></#if>
+                        <#if showStatus><fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.CommonStatus}</fo:block></fo:table-cell></#if>
+                        <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.FormFieldTitle_paymentMethodId}</fo:block></fo:table-cell>
+                        <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.OrderAmount}</fo:block></fo:table-cell>
+                    </fo:table-row>
+                </fo:table-header>
+                <fo:table-body>
+                    <#assign rowColor = "white">
+                    <#list orderPurchasePaymentSummaryList as orderPurchasePaymentSummary>
+                        <fo:table-row>
+                            <#if showProductStore>
+                                <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                    <fo:block>${orderPurchasePaymentSummary.productStoreId!}</fo:block>
+                                </fo:table-cell>
+                            </#if>
+                            <#if showOriginFacility>
+                                <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                    <fo:block>${orderPurchasePaymentSummary.originFacilityId!}</fo:block>
+                                </fo:table-cell>
+                            </#if>
+                            <#if showTerminal>
+                                <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                    <fo:block>${orderPurchasePaymentSummary.terminalId!}</fo:block>
+                                </fo:table-cell>
+                            </#if>
+                            <#if showStatus>
+                                <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                    <fo:block>${orderPurchasePaymentSummary.statusId!}</fo:block>
+                                </fo:table-cell>
+                            </#if>
+                            <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                <fo:block>${orderPurchasePaymentSummary.get("description",locale)!}</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                <fo:block>${orderPurchasePaymentSummary.maxAmount!}</fo:block>
+                            </fo:table-cell>
+                        </fo:table-row>
+                        <#-- toggle the row color -->
+                        <#if rowColor == "white">
+                            <#assign rowColor = "#D4D0C8">
+                        <#else>
+                            <#assign rowColor = "white">
+                        </#if>
+                    </#list>
+                </fo:table-body>
+            </fo:table>
+            </fo:block>
+        </fo:flow>
+        </fo:page-sequence>
+<#else>
+    <fo:page-sequence master-reference="main">
+    <fo:flow flow-name="xsl-region-body" font-family="Helvetica">
+        <fo:block font-size="14pt">
+            ${uiLabelMap.OrderNoPurchasePaymentMethod}
+        </fo:block>
+    </fo:flow>
+    </fo:page-sequence>
+</#if>
+
+<#else>
+    <fo:block font-size="14pt">
+        ${uiLabelMap.OrderViewPermissionError}
+    </fo:block>
+</#if>
+
+</fo:root>
+</#escape>

Propchange: ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportPayment.fo.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportPayment.fo.ftl
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportPayment.fo.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportProduct.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportProduct.fo.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportProduct.fo.ftl (added)
+++ ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportProduct.fo.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,137 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#escape x as x?xml>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+<#-- do not display columns associated with values specified in the request, ie constraint values -->
+<#assign showProductStore = !parameters.productStoreId?has_content>
+<#assign showOriginFacility = !parameters.originFacilityId?has_content>
+<#assign showTerminal = !parameters.terminalId?has_content>
+<#assign showStatus = !parameters.statusId?has_content>
+
+<fo:layout-master-set>
+    <fo:simple-page-master master-name="main" page-height="11in" page-width="8.5in"
+            margin-top="0.5in" margin-bottom="1in" margin-left="1in" margin-right="1in">
+        <fo:region-body margin-top="1in"/>
+        <fo:region-before extent="1in"/>
+        <fo:region-after extent="1in"/>
+    </fo:simple-page-master>
+</fo:layout-master-set>
+<#if security.hasEntityPermission("ORDERMGR", "_VIEW", session)>
+
+<#if orderPurchaseProductSummaryList?has_content>
+        <fo:page-sequence master-reference="main">
+        <fo:flow flow-name="xsl-region-body" font-family="Helvetica">
+            <fo:block font-size="14pt">${uiLabelMap.OrderReportPurchasesByProduct}</fo:block>
+            <#if !showProductStore><fo:block font-size="10pt">${uiLabelMap.CommonFor} ${uiLabelMap.ProductProductStore}: ${parameters.productStoreId}</fo:block></#if>
+            <#if !showOriginFacility><fo:block font-size="10pt">${uiLabelMap.CommonFor} ${uiLabelMap.FormFieldTitle_originFacilityId}: ${parameters.originFacilityId}</fo:block></#if>
+            <#if !showTerminal><fo:block font-size="10pt">${uiLabelMap.CommonFor} ${uiLabelMap.FormFieldTitle_terminalId}: ${parameters.terminalId}</fo:block></#if>
+            <#if !showStatus><fo:block font-size="10pt">${uiLabelMap.CommonFor} ${uiLabelMap.CommonStatus}: ${parameters.statusId}</fo:block></#if>
+            <#if parameters.fromOrderDate?has_content><fo:block font-size="10pt">${uiLabelMap.CommonFromDate}: ${parameters.fromOrderDate} (${uiLabelMap.OrderDate} &gt;= ${uiLabelMap.CommonFrom})</fo:block></#if>
+            <#if parameters.thruOrderDate?has_content><fo:block font-size="10pt">${uiLabelMap.CommonThruDate}: ${parameters.thruOrderDate} (${uiLabelMap.OrderDate} &lt; ${uiLabelMap.CommonFrom})</fo:block></#if>
+            <fo:block space-after.optimum="10pt" font-size="10pt">
+            <fo:table>
+                <#if showProductStore><fo:table-column column-width="50pt"/></#if>
+                <#if showOriginFacility><fo:table-column column-width="50pt"/></#if>
+                <#if showTerminal><fo:table-column column-width="50pt"/></#if>
+                <#if showStatus><fo:table-column column-width="50pt"/></#if>
+                <fo:table-column column-width="80pt"/>
+                <fo:table-column column-width="120pt"/>
+                <fo:table-column column-width="40pt"/>
+                <fo:table-column column-width="40pt"/>
+                <fo:table-header>
+                    <fo:table-row font-weight="bold">
+                        <#if showProductStore><fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.FormFieldTitle_productStoreId}</fo:block></fo:table-cell></#if>
+                        <#if showOriginFacility><fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.FormFieldTitle_facilityId}</fo:block></fo:table-cell></#if>
+                        <#if showTerminal><fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.FormFieldTitle_terminalId}</fo:block></fo:table-cell></#if>
+                        <#if showStatus><fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.CommonStatus}</fo:block></fo:table-cell></#if>
+                        <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.FormFieldTitle_productId}</fo:block></fo:table-cell>
+                        <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductProductName}</fo:block></fo:table-cell>
+                        <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.OrderQty}</fo:block></fo:table-cell>
+                        <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.OrderQuantityCancelled}</fo:block></fo:table-cell>
+                    </fo:table-row>
+                </fo:table-header>
+                <fo:table-body>
+                    <#assign rowColor = "white">
+                    <#list orderPurchaseProductSummaryList as orderPurchaseProductSummary>
+                        <fo:table-row>
+                            <#if showProductStore>
+                                <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                    <fo:block>${orderPurchaseProductSummary.productStoreId!}</fo:block>
+                                </fo:table-cell>
+                            </#if>
+                            <#if showOriginFacility>
+                                <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                    <fo:block>${orderPurchaseProductSummary.originFacilityId!}</fo:block>
+                                </fo:table-cell>
+                            </#if>
+                            <#if showTerminal>
+                                <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                    <fo:block>${orderPurchaseProductSummary.terminalId!}</fo:block>
+                                </fo:table-cell>
+                            </#if>
+                            <#if showStatus>
+                                <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                    <fo:block>${orderPurchaseProductSummary.statusId!}</fo:block>
+                                </fo:table-cell>
+                            </#if>
+                            <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                <fo:block>${orderPurchaseProductSummary.productId!}</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                <fo:block>${orderPurchaseProductSummary.internalName!}</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                <fo:block>${orderPurchaseProductSummary.quantity!}</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                <fo:block>${orderPurchaseProductSummary.cancelQuantity!}</fo:block>
+                            </fo:table-cell>
+                        </fo:table-row>
+                        <#-- toggle the row color -->
+                        <#if rowColor == "white">
+                            <#assign rowColor = "#D4D0C8">
+                        <#else>
+                            <#assign rowColor = "white">
+                        </#if>
+                    </#list>
+                </fo:table-body>
+            </fo:table>
+            </fo:block>
+        </fo:flow>
+        </fo:page-sequence>
+<#else>
+    <fo:page-sequence master-reference="main">
+    <fo:flow flow-name="xsl-region-body" font-family="Helvetica">
+        <fo:block font-size="14pt">
+            ${uiLabelMap.OrderNoPurchaseProduct}
+        </fo:block>
+    </fo:flow>
+    </fo:page-sequence>
+</#if>
+
+<#else>
+    <fo:block font-size="14pt">
+        ${uiLabelMap.OrderViewPermissionError}
+    </fo:block>
+</#if>
+
+</fo:root>
+</#escape>

Propchange: ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportProduct.fo.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportProduct.fo.ftl
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/order/template/reports/OrderPurchaseReportProduct.fo.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/trunk/applications/order/template/reports/OrderReportPrepare.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/reports/OrderReportPrepare.groovy?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/reports/OrderReportPrepare.groovy (added)
+++ ofbiz/trunk/applications/order/template/reports/OrderReportPrepare.groovy Mon Mar 28 11:14:22 2016
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.sql.*;
+import org.ofbiz.entity.*;
+import org.ofbiz.entity.condition.*;
+import org.ofbiz.base.util.*;
+import org.ofbiz.content.report.*;
+
+delegator = request.getAttribute("delegator");
+
+fromDateStr = request.getParameter("fromDate");
+toDateStr = request.getParameter("toDate");
+
+fromDate = null;
+toDate = null;
+try {
+    if (fromDateStr) {
+        fromDate = Timestamp.valueOf(fromDateStr);
+    }
+    if (toDateStr) {
+        toDate = Timestamp.valueOf(toDateStr);
+    }
+} catch (Exception e) {
+    Debug.logError(e);
+}
+
+/* we'll have to work on getting this to work again, maybe with the ad-hoc view entity feature...
+groupName = request.getParameter("groupName");
+if (groupName.equals("product")) {
+    groupName = "order_item.product_id";
+    reportName = "orderitemreport.jasper";
+} else if (groupName.equals("orderStatus")) {
+    groupName = "status_item.description";
+    reportName = "orderreport.jasper";
+} else if (groupName.equals("itemStatus")) {
+    groupName = "item_status.description";
+    reportName = "orderitemreport.jasper";
+} else if (groupName.equals("adjustment")) {
+    groupName = "order_adjustment_type.description";
+    reportName = "orderitemreport.jasper";
+} else if (groupName.equals("ship")) {
+    groupName = "concat(concat(order_shipment_preference.carrier_party_id, ' - '), shipment_method_type.description)";
+    reportName = "orderreport.jasper";
+} else if (groupName.equals("payment")) {
+    groupName = "payment_method_type.description";
+    reportName = "orderreport.jasper";
+} else if (groupName.length() < 4) {
+    groupName = "status_item.description";
+    reportName = "orderreport.jasper";
+}
+
+sbSql.append( groupName +" as GroupName, ");
+sbSql.append(" order_item.unit_price * order_item.quantity as purchaseAmount, ");
+*/
+
+conditionList = [];
+if (fromDate) {
+    conditionList.add(EntityCondition.makeCondition("orderDate", EntityOperator.GREATER_THAN_EQUAL_TO, fromDate));
+}
+if (toDate) {
+    conditionList.add(EntityCondition.makeCondition("orderDate", EntityOperator.LESS_THAN_EQUAL_TO, toDate));
+}
+entityCondition = EntityCondition.makeCondition(conditionList, EntityOperator.AND);
+orderByList = ["orderTypeId", "orderStatus"];
+
+eli = delegator.find("OrderReportView", entityCondition, null, null, orderByList, null);
+jrDataSource = new JREntityListIteratorDataSource(eli);
+
+jrParameters = [:];
+jrParameters.dateRange = fromDateStr + " - " + toDateStr;
+
+request.setAttribute("jrDataSource", jrDataSource);
+request.setAttribute("jrParameters", jrParameters);
+
+return "success";

Propchange: ofbiz/trunk/applications/order/template/reports/OrderReportPrepare.groovy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/order/template/reports/OrderReportPrepare.groovy
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/order/template/reports/OrderReportPrepare.groovy
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl (added)
+++ ofbiz/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,104 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#escape x as x?xml>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+<#-- do not display columns associated with values specified in the request, ie constraint values -->
+<#assign showToParty = !parameters.toPartyId?has_content>
+<#assign showFromParty = !parameters.fromPartyId?has_content>
+
+<fo:layout-master-set>
+    <fo:simple-page-master master-name="main" page-height="11in" page-width="8.5in"
+            margin-top="0.5in" margin-bottom="1in" margin-left="1in" margin-right="1in">
+        <fo:region-body margin-top="1in"/>
+        <fo:region-before extent="1in"/>
+        <fo:region-after extent="1in"/>
+    </fo:simple-page-master>
+</fo:layout-master-set>
+<#if security.hasEntityPermission("ORDERMGR", "_PURCHASE_VIEW", session)>
+
+<#if productReportList?has_content>
+        <fo:page-sequence master-reference="main">
+        <fo:flow flow-name="xsl-region-body" font-family="Helvetica">
+            <fo:block font-size="14pt">${uiLabelMap.OrderReportPurchasesByOrganization}</fo:block>
+            <#if !showToParty><fo:block font-size="10pt">${uiLabelMap.CommonFor}: ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, toPartyId, false)}</fo:block></#if>
+            <#if !showFromParty><fo:block font-size="10pt">${uiLabelMap.CommonFrom}: ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, fromPartyId, false)}</fo:block></#if>
+            <fo:block font-size="10pt">${uiLabelMap.FormFieldTitle_orderStatusId}:
+                <#if parameters.orderStatusId?has_content>${parameters.orderStatusId}<#else>${uiLabelMap.CommonAny}</#if>
+            </fo:block>
+            <#if parameters.fromOrderDate?has_content><fo:block font-size="10pt">${uiLabelMap.CommonFromDate}: ${parameters.fromOrderDate} (${uiLabelMap.OrderDate} &gt;= ${uiLabelMap.CommonFrom})</fo:block></#if>
+            <#if parameters.thruOrderDate?has_content><fo:block font-size="10pt">${uiLabelMap.CommonThruDate}: ${parameters.thruOrderDate} (${uiLabelMap.OrderDate} &lt; ${uiLabelMap.CommonFrom})</fo:block></#if>
+            <fo:block space-after.optimum="10pt" font-size="10pt">
+            <fo:table>
+                <fo:table-column column-width="420pt"/>
+                <fo:table-column column-width="40pt"/>
+                <fo:table-column column-width="40pt"/>
+                <fo:table-header>
+                    <fo:table-row font-weight="bold">
+                        <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductProduct}</fo:block></fo:table-cell>
+                        <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.OrderQuantityPurchase}</fo:block></fo:table-cell>
+                        <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.OrderValuePurchase}</fo:block></fo:table-cell>
+                    </fo:table-row>
+                </fo:table-header>
+                <fo:table-body>
+                    <#assign rowColor = "white">
+                    <#list productReportList as productReport>
+                        <fo:table-row>
+                            <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                <fo:block>${productReport.internalName!} (${productReport.productId!})</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                <fo:block>${productReport.quantity!}</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                <fo:block>${productReport.unitPrice!}</fo:block>
+                            </fo:table-cell>
+                        </fo:table-row>
+                        <#-- toggle the row color -->
+                        <#if rowColor == "white">
+                            <#assign rowColor = "#D4D0C8">
+                        <#else>
+                            <#assign rowColor = "white">
+                        </#if>
+                    </#list>
+                </fo:table-body>
+            </fo:table>
+            </fo:block>
+        </fo:flow>
+        </fo:page-sequence>
+<#else>
+    <fo:page-sequence master-reference="main">
+    <fo:flow flow-name="xsl-region-body" font-family="Helvetica">
+        <fo:block font-size="14pt">
+            ${uiLabelMap.OrderNoOrderFound}.
+        </fo:block>
+    </fo:flow>
+    </fo:page-sequence>
+</#if>
+
+<#else>
+    <fo:block font-size="14pt">
+        ${uiLabelMap.OrderViewPermissionError}
+    </fo:block>
+</#if>
+
+</fo:root>
+
+</#escape>

Propchange: ofbiz/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/trunk/applications/order/template/reports/SalesByStoreReport.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/reports/SalesByStoreReport.fo.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/reports/SalesByStoreReport.fo.ftl (added)
+++ ofbiz/trunk/applications/order/template/reports/SalesByStoreReport.fo.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,117 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#escape x as x?xml>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+<#-- do not display columns associated with values specified in the request, ie constraint values -->
+<#assign showProductStore = !parameters.productStoreId?has_content>
+<#assign showToParty = !parameters.toPartyId?has_content>
+
+<fo:layout-master-set>
+    <fo:simple-page-master master-name="main" page-height="11in" page-width="8.5in"
+            margin-top="0.5in" margin-bottom="1in" margin-left="1in" margin-right="1in">
+        <fo:region-body margin-top="1in"/>
+        <fo:region-before extent="1in"/>
+        <fo:region-after extent="1in"/>
+    </fo:simple-page-master>
+</fo:layout-master-set>
+<#if security.hasEntityPermission("ORDERMGR", "_SALES_ENTRY", session)>
+
+<#if productReportList?has_content>
+        <fo:page-sequence master-reference="main">
+        <fo:flow flow-name="xsl-region-body" font-family="Helvetica">
+            <fo:block font-size="14pt">${uiLabelMap.OrderReportSalesByStore}</fo:block>
+            <#if !showProductStore><fo:block font-size="10pt">${uiLabelMap.CommonFor} ${uiLabelMap.ProductProductStore}: ${parameters.productStoreId} - ${productReportList.get(0).storeName!}</fo:block></#if>
+            <#if !showToParty><fo:block font-size="10pt">${uiLabelMap.PartyParty}: ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, toPartyId, false)}</fo:block></#if>
+            <fo:block font-size="10pt">${uiLabelMap.FormFieldTitle_orderStatusId}:
+                <#if parameters.orderStatusId?has_content>${parameters.orderStatusId}<#else>${uiLabelMap.CommonAny}</#if>
+            </fo:block>
+            <#if parameters.fromOrderDate?has_content><fo:block font-size="10pt">${uiLabelMap.CommonFromDate}: ${parameters.fromOrderDate} (${uiLabelMap.OrderDate} &gt;= ${uiLabelMap.CommonFrom})</fo:block></#if>
+            <#if parameters.thruOrderDate?has_content><fo:block font-size="10pt">${uiLabelMap.CommonThruDate}: ${parameters.thruOrderDate} (${uiLabelMap.OrderDate} &lt; ${uiLabelMap.CommonFrom})</fo:block></#if>
+            <fo:block space-after.optimum="10pt" font-size="10pt">
+            <fo:table>
+                <#if showProductStore>
+                    <fo:table-column column-width="60pt"/>
+                    <fo:table-column column-width="340pt"/>
+                <#else>
+                    <fo:table-column column-width="400pt"/>
+                </#if>
+                <fo:table-column column-width="40pt"/>
+                <fo:table-column column-width="40pt"/>
+                <fo:table-header>
+                    <fo:table-row font-weight="bold">
+                        <#if showProductStore><fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.FormFieldTitle_productStoreId}</fo:block></fo:table-cell></#if>
+                        <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductProduct}</fo:block></fo:table-cell>
+                        <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.OrderQuantitySold}</fo:block></fo:table-cell>
+                        <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.OrderValueSold}</fo:block></fo:table-cell>
+                    </fo:table-row>
+                </fo:table-header>
+                <fo:table-body>
+                    <#assign rowColor = "white">
+                    <#list productReportList as productReport>
+                      <#if productReport.quantityOrdered?? && (productReport.quantityOrdered > 0)>
+                        <fo:table-row>
+                            <#if showProductStore>
+                                <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                    <fo:block>${productReport.productStoreId!}</fo:block>
+                                </fo:table-cell>
+                            </#if>
+                            <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                <fo:block>${productReport.internalName?default("")} (${productReport.productId!})</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                <fo:block>${productReport.quantityOrdered!}</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell padding="2pt" background-color="${rowColor}">
+                                <fo:block>${productReport.unitPrice!}</fo:block>
+                            </fo:table-cell>
+                        </fo:table-row>
+                        <#-- toggle the row color -->
+                        <#if rowColor == "white">
+                            <#assign rowColor = "#D4D0C8">
+                        <#else>
+                            <#assign rowColor = "white">
+                        </#if>
+                      </#if>
+                    </#list>
+                </fo:table-body>
+            </fo:table>
+            </fo:block>
+        </fo:flow>
+        </fo:page-sequence>
+<#else>
+    <fo:page-sequence master-reference="main">
+    <fo:flow flow-name="xsl-region-body" font-family="Helvetica">
+        <fo:block font-size="14pt">
+            ${uiLabelMap.OrderNoOrderFound}.
+        </fo:block>
+    </fo:flow>
+    </fo:page-sequence>
+</#if>
+
+<#else>
+    <fo:block font-size="14pt">
+        ${uiLabelMap.OrderViewPermissionError}
+    </fo:block>
+</#if>
+
+</fo:root>
+
+</#escape>

Propchange: ofbiz/trunk/applications/order/template/reports/SalesByStoreReport.fo.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/order/template/reports/SalesByStoreReport.fo.ftl
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/order/template/reports/SalesByStoreReport.fo.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain