svn commit: r958347 - in /ofbiz/branches/release10.04: ./ applications/order/entitydef/entitymodel_view.xml applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl applications/order/widget/ordermgr/ReportScreens.xml

Author: jleroux
Date: Sun Jun 27 07:52:13 2010
New Revision: 958347

URL: http://svn.apache.org/viewvc?rev=958347&view=rev
Log:
"Applied fix from trunk for revision: 958343"
------------------------------------------------------------------------
r958343 | jleroux | 2010-06-27 09:42:46 +0200 (dim. 27 juin 2010) | 2 lignes

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/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/order/entitydef/entitymodel_view.xml
    ofbiz/branches/release10.04/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl
    ofbiz/branches/release10.04/applications/order/widget/ordermgr/ReportScreens.xml

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 27 07:52:13 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,957221
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343

Modified: ofbiz/branches/release10.04/applications/order/entitydef/entitymodel_view.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/entitydef/entitymodel_view.xml?rev=958347&r1=958346&r2=958347&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/entitydef/entitymodel_view.xml (original)
+++ ofbiz/branches/release10.04/applications/order/entitydef/entitymodel_view.xml Sun Jun 27 07:52:13 2010
@@ -1128,7 +1128,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/branches/release10.04/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl?rev=958347&r1=958346&r2=958347&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl (original)
+++ ofbiz/branches/release10.04/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl Sun Jun 27 07:52:13 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/branches/release10.04/applications/order/widget/ordermgr/ReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/widget/ordermgr/ReportScreens.xml?rev=958347&r1=958346&r2=958347&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/widget/ordermgr/ReportScreens.xml (original)
+++ ofbiz/branches/release10.04/applications/order/widget/ordermgr/ReportScreens.xml Sun Jun 27 07:52:13 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"/>