svn commit: r958351 - in /ofbiz/branches/release4.0: ./ applications/order/entitydef/entitymodel_view.xml applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl applications/order/widget/ordermgr/ReportScreens.xml mergefromtrunk.bat

Author: jleroux
Date: Sun Jun 27 08:44:37 2010
New Revision: 958351

URL: http://svn.apache.org/viewvc?rev=958351&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/release4.0/   (props changed)
    ofbiz/branches/release4.0/applications/order/entitydef/entitymodel_view.xml
    ofbiz/branches/release4.0/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl
    ofbiz/branches/release4.0/applications/order/widget/ordermgr/ReportScreens.xml
    ofbiz/branches/release4.0/mergefromtrunk.bat

Propchange: ofbiz/branches/release4.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 27 08:44:37 2010
@@ -1 +1 @@
-/ofbiz/trunk:536399,539836-539837,618970,627900,629279,674173,676162,676227,676246,679704,690644,705862,706035,706055,706067,706692,721839,721887,728935,737443,738870,741491,808792,814731,827730,890245,942884,943168,954956
+/ofbiz/trunk:536399,539836-539837,618970,627900,629279,674173,676162,676227,676246,679704,690644,705862,706035,706055,706067,706692,721839,721887,728935,737443,738870,741491,808792,814731,827730,890245,942884,943168,954956,958343

Modified: ofbiz/branches/release4.0/applications/order/entitydef/entitymodel_view.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/entitydef/entitymodel_view.xml?rev=958351&r1=958350&r2=958351&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/order/entitydef/entitymodel_view.xml (original)
+++ ofbiz/branches/release4.0/applications/order/entitydef/entitymodel_view.xml Sun Jun 27 08:44:37 2010
@@ -1069,7 +1069,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/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=958351&r1=958350&r2=958351&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 Sun Jun 27 08:44:37 2010
@@ -60,7 +60,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>
@@ -77,7 +76,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/release4.0/applications/order/widget/ordermgr/ReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/widget/ordermgr/ReportScreens.xml?rev=958351&r1=958350&r2=958351&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/order/widget/ordermgr/ReportScreens.xml (original)
+++ ofbiz/branches/release4.0/applications/order/widget/ordermgr/ReportScreens.xml Sun Jun 27 08:44:37 2010
@@ -166,7 +166,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"/>

Modified: ofbiz/branches/release4.0/mergefromtrunk.bat
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/mergefromtrunk.bat?rev=958351&r1=958350&r2=958351&view=diff
==============================================================================
--- ofbiz/branches/release4.0/mergefromtrunk.bat (original)
+++ ofbiz/branches/release4.0/mergefromtrunk.bat Sun Jun 27 08:44:37 2010
@@ -1,3 +1,4 @@
+echo off
 rem #####################################################################
 rem Licensed to the Apache Software Foundation (ASF) under one
 rem or more contributor license agreements.  See the NOTICE file
@@ -19,7 +20,6 @@ rem ####################################
 rem interactive DOS version of mergefromtrunk.sh.
 rem to use : launch and pass the trunk version number to merge in release
 
-echo off
 rem since we have now svn:mergeinfo changing root ("."), we need to update before merging
 svn up