svn commit: r1522670 - in /ofbiz/trunk/applications/order: entitydef/entitymodel_olap.xml script/org/ofbiz/order/reports/ProductDemandReportEvent.xml

Author: jleroux
Date: Thu Sep 12 17:24:00 2013
New Revision: 1522670

URL: http://svn.apache.org/r1522670
Log:
No functional changes: remove useless/confusing comments, replace tabs by spaces (from commit r1519544)

Modified:
    ofbiz/trunk/applications/order/entitydef/entitymodel_olap.xml
    ofbiz/trunk/applications/order/script/org/ofbiz/order/reports/ProductDemandReportEvent.xml

Modified: ofbiz/trunk/applications/order/entitydef/entitymodel_olap.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/entitydef/entitymodel_olap.xml?rev=1522670&r1=1522669&r2=1522670&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/entitydef/entitymodel_olap.xml (original)
+++ ofbiz/trunk/applications/order/entitydef/entitymodel_olap.xml Thu Sep 12 17:24:00 2013
@@ -95,11 +95,10 @@ under the License.
         <field name="countOrder" type="fixed-point">
             <description>Count of order.</description>
         </field>
- <!-- Promotion Code column Added  -->
- <field name="productPromoCode" type="id-ne">
+        <field name="productPromoCode" type="id-ne">
             <description>Product promotion Code.</description>
         </field>
-
+    
         <prim-key field="orderId"/>
         <prim-key field="orderItemSeqId"/>
 
@@ -125,7 +124,7 @@ under the License.
         <member-entity entity-alias="ODD" entity-name="DateDimension"/>
         <member-entity entity-alias="PD" entity-name="ProductDimension"/>
         <member-entity entity-alias="CD" entity-name="CurrencyDimension"/>
-
+
         <alias-all entity-alias="ODD" prefix="orderDate" group-by="true">
             <exclude field="dimensionId"/>
         </alias-all>
@@ -149,14 +148,12 @@ under the License.
             <exclude field="brand"/>
             <exclude field="pod"/>
             <exclude field="account"/>
-            <!-- Promotion Code column Added  -->
             <exclude field="productPromoCode"/>
         </alias-all>
         <alias entity-alias="SOIF" name="orderId" group-by="true">
             <description>Order id</description>
         </alias>
-        <!-- Promotion Code column Added  -->
- <alias entity-alias="SOIF" name="productPromoCode" group-by="true"/>
+        <alias entity-alias="SOIF" name="productPromoCode" group-by="true"/>
         <alias entity-alias="SOIF" name="orderItemSeqId" group-by="true"/>
         <alias entity-alias="SOIF" name="productCategoryId" group-by="true"/>
         <alias entity-alias="SOIF" name="productStoreId" group-by="true"/>

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/reports/ProductDemandReportEvent.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/reports/ProductDemandReportEvent.xml?rev=1522670&r1=1522669&r2=1522670&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/reports/ProductDemandReportEvent.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/reports/ProductDemandReportEvent.xml Thu Sep 12 17:24:00 2013
@@ -25,8 +25,6 @@
         <if-not-empty field="Week">
             <set field="year" from-field="Year" type="Integer"/>
             <set field="week1" from-field="Week" type="Integer"/>
-            <!-- <set field="year" value="2009" type="Integer"/>
-            <set field="week1" value="49" type="Integer"/> -->
             <calculate field="week2" type="Integer">
                 <calcop field="week1" operator="subtract">
                     <number value="1"/>