svn commit: r958520 - /ofbiz/branches/release4.0/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl

Author: jleroux
Date: Mon Jun 28 09:50:08 2010
New Revision: 958520

URL: http://svn.apache.org/viewvc?rev=958520&view=rev
Log:
"Applied fix from trunk for revision: 958514"  + re-added the missing line
------------------------------------------------------------------------
r958514 | jleroux | 2010-06-28 11:36:28 +0200 (lun. 28 juin 2010) | 1 ligne

Finally I thought that there are no good reasons to show canceled values: this amends r958343
------------------------------------------------------------------------

Modified:
    ofbiz/branches/release4.0/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl

Modified: ofbiz/branches/release4.0/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl?rev=958520&r1=958519&r2=958520&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl (original)
+++ ofbiz/branches/release4.0/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl Mon Jun 28 09:50:08 2010
@@ -45,6 +45,7 @@ under the License.
                 <#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>
+            <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.OrderQuantitySold}</fo:block></fo:table-cell>
             <#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>
@@ -66,6 +67,7 @@ under the License.
                 <fo:table-body>
                     <#assign rowColor = "white">
                     <#list productReportList as productReport>
+                      <#if productReport.quantityOrdered?exists && (productReport.quantityOrdered > 0)>
                         <fo:table-row>
                             <#if showProductStore>
                                 <fo:table-cell padding="2pt" background-color="${rowColor}">
@@ -87,8 +89,9 @@ under the License.
                             <#assign rowColor = "#D4D0C8">
                         <#else>
                             <#assign rowColor = "white">
-                        </#if>        
-                    </#list>          
+                        </#if>
+                      </#if>
+                    </#list>
                 </fo:table-body>
             </fo:table>
             </fo:block>