svn commit: r958343 - in /ofbiz/trunk/applications/order: entitydef/entitymodel_view.xml webapp/ordermgr/reports/SalesByStoreReport.fo.ftl widget/ordermgr/ReportScreens.xml

Author: jleroux
Date: Sun Jun 27 07:42:46 2010
New Revision: 958343

URL: http://svn.apache.org/viewvc?rev=958343&view=rev
Log:
The Sales by Store Report was wrong has it did not use a complex alias for quantityOrdered (OrderItem.quantity - OrderItem.cancelQuantity) but only OrderItem.quantity. Thus canceled quantities were not taken into account.
A little drawback is that if there are 0 values sold this values show. But actually it's not a problem since it informs the user that all quantities ordered for this product has been canceled

Modified:
    ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl
    ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml

Modified: ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml?rev=958343&r1=958342&r2=958343&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml (original)
+++ ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml Sun Jun 27 07:42:46 2010
@@ -1160,7 +1160,12 @@ under the License.
       <alias entity-alias="OH" name="orderTypeId" group-by="false"/>
       <alias entity-alias="RL" name="partyId" group-by="false"/>
       <alias entity-alias="RL" name="roleTypeId" group-by="false"/>
-      <alias entity-alias="OI" name="quantity" function="sum"/>
+      <alias entity-alias="OI" name="quantityOrdered" function="sum">
+        <complex-alias operator="-">
+          <complex-alias-field entity-alias="OI" field="quantity" default-value="0"/>
+          <complex-alias-field entity-alias="OI" field="cancelQuantity" default-value="0"/>
+        </complex-alias>
+      </alias>
       <alias entity-alias="OI" name="unitPrice" function="sum"/>
       <view-link entity-alias="OH" rel-entity-alias="OI">
         <key-map field-name="orderId"/>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl?rev=958343&r1=958342&r2=958343&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl Sun Jun 27 07:42:46 2010
@@ -59,7 +59,6 @@ under the License.
                     <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>
@@ -76,7 +75,7 @@ under the License.
                                 <fo:block>${productReport.internalName?default("")} (${productReport.productId?if_exists})</fo:block>
                             </fo:table-cell>
                             <fo:table-cell padding="2pt" background-color="${rowColor}">
-                                <fo:block>${productReport.quantity?if_exists}</fo:block>
+                                <fo:block>${productReport.quantityOrdered?if_exists}</fo:block>
                             </fo:table-cell>
                             <fo:table-cell padding="2pt" background-color="${rowColor}">
                                 <fo:block>${productReport.unitPrice?if_exists}</fo:block>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml?rev=958343&r1=958342&r2=958343&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml Sun Jun 27 07:42:46 2010
@@ -226,7 +226,7 @@ under the License.
                     <select-field field-name="storeName"/>
                     <select-field field-name="productId"/>
                     <select-field field-name="internalName"/>
-                    <select-field field-name="quantity"/>
+                    <select-field field-name="quantityOrdered"/>
                     <select-field field-name="unitPrice"/>
                     <order-by field-name="storeName"/>
                     <order-by field-name="internalName"/>