You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2011/01/06 08:37:46 UTC

svn commit: r1055774 [2/5] - in /ofbiz/trunk: applications/accounting/data/ applications/order/ applications/order/entitydef/ applications/order/script/org/ofbiz/order/olap/ applications/order/script/org/ofbiz/order/reports/ applications/order/serviced...

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesReport.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesReport.rptdesign?rev=1055774&r1=1055773&r2=1055774&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesReport.rptdesign (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesReport.rptdesign Thu Jan  6 07:37:45 2011
@@ -17,8 +17,8 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.15" id="1">
-    <property name="createdBy">Eclipse BIRT Designer Version 2.2.2.r222_v20071226 Build &lt;2.2.2.v20080226-1155></property>
+<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.20" id="1">
+    <property name="createdBy">Eclipse BIRT Designer Version 2.5.1.v20090903 Build &lt;2.5.1.v20090917-1447></property>
     <property name="units">in</property>
     <property name="comments">Copyright (c) 2007 &lt;&lt;Your Company Name here>></property>
     <html-property name="description">Creates a blank report with no predefined content.</html-property>
@@ -122,25 +122,69 @@ under the License.
     <property name="SaleOrder_DataCube.DateGroup.NewTabularHierarchy3.height">200</property>
     <text-property name="displayName">Blank Report</text-property>
     <property name="iconFile">/templates/blank_report.gif</property>
+    <property name="layoutPreference">auto layout</property>
     <parameters>
         <scalar-parameter name="fromDate" id="310">
             <property name="valueType">static</property>
+            <property name="isRequired">false</property>
             <property name="dataType">date</property>
+            <property name="distinct">true</property>
             <property name="paramType">simple</property>
-            <property name="isRequired">false</property>
             <property name="controlType">text-box</property>
-            <property name="distinct">true</property>
             <structure name="format">
                 <property name="category">Unformatted</property>
             </structure>
         </scalar-parameter>
         <scalar-parameter name="thruDate" id="311">
             <property name="valueType">static</property>
+            <property name="isRequired">false</property>
             <property name="dataType">date</property>
+            <property name="distinct">true</property>
+            <property name="paramType">simple</property>
+            <property name="controlType">text-box</property>
+            <structure name="format">
+                <property name="category">Unformatted</property>
+            </structure>
+        </scalar-parameter>
+        <scalar-parameter name="reportBy" id="2051">
+            <property name="valueType">static</property>
+            <property name="dataType">string</property>
+            <property name="distinct">true</property>
+            <property name="paramType">simple</property>
+            <property name="controlType">text-box</property>
+            <structure name="format">
+                <property name="category">Unformatted</property>
+            </structure>
+        </scalar-parameter>
+        <scalar-parameter name="thruWeek" id="2052">
+            <property name="valueType">static</property>
+            <property name="isRequired">false</property>
+            <property name="dataType">integer</property>
+            <property name="distinct">true</property>
             <property name="paramType">simple</property>
+            <property name="controlType">text-box</property>
+            <structure name="format">
+                <property name="category">Unformatted</property>
+            </structure>
+        </scalar-parameter>
+        <scalar-parameter name="thruMonth" id="2053">
+            <property name="valueType">static</property>
             <property name="isRequired">false</property>
+            <property name="dataType">integer</property>
+            <property name="distinct">true</property>
+            <property name="paramType">simple</property>
             <property name="controlType">text-box</property>
+            <structure name="format">
+                <property name="category">Unformatted</property>
+            </structure>
+        </scalar-parameter>
+        <scalar-parameter name="thisYear" id="2707">
+            <property name="valueType">static</property>
+            <property name="isRequired">false</property>
+            <property name="dataType">integer</property>
             <property name="distinct">true</property>
+            <property name="paramType">simple</property>
+            <property name="controlType">text-box</property>
             <structure name="format">
                 <property name="category">Unformatted</property>
             </structure>
@@ -154,260 +198,218 @@ under the License.
             <list-property name="resultSetHints">
                 <structure>
                     <property name="position">1</property>
-                    <property name="name">orderDateYearName</property>
+                    <property name="name">Brand</property>
                     <property name="dataType">string</property>
                 </structure>
                 <structure>
                     <property name="position">2</property>
-                    <property name="name">orderDateMonthOfYear</property>
+                    <property name="name">Pod</property>
                     <property name="dataType">string</property>
                 </structure>
                 <structure>
                     <property name="position">3</property>
-                    <property name="name">orderDateMonthName</property>
+                    <property name="name">Account</property>
                     <property name="dataType">string</property>
                 </structure>
                 <structure>
                     <property name="position">4</property>
-                    <property name="name">orderDateWeekOfYear</property>
+                    <property name="name">orderDateYearName</property>
                     <property name="dataType">string</property>
                 </structure>
                 <structure>
                     <property name="position">5</property>
-                    <property name="name">orderDateDayName</property>
+                    <property name="name">orderDateMonthOfYear</property>
                     <property name="dataType">string</property>
                 </structure>
                 <structure>
                     <property name="position">6</property>
-                    <property name="name">orderDateDescription</property>
+                    <property name="name">orderDateMonthName</property>
                     <property name="dataType">string</property>
                 </structure>
                 <structure>
                     <property name="position">7</property>
-                    <property name="name">quantity</property>
-                    <property name="dataType">integer</property>
+                    <property name="name">orderDateWeekOfYear</property>
+                    <property name="dataType">string</property>
                 </structure>
                 <structure>
                     <property name="position">8</property>
-                    <property name="name">GrossSales</property>
-                    <property name="dataType">decimal</property>
+                    <property name="name">orderDateDayName</property>
+                    <property name="dataType">string</property>
                 </structure>
                 <structure>
                     <property name="position">9</property>
-                    <property name="name">GrossMerchandizeSales</property>
-                    <property name="dataType">decimal</property>
+                    <property name="name">orderDateDescription</property>
+                    <property name="dataType">string</property>
                 </structure>
                 <structure>
                     <property name="position">10</property>
-                    <property name="name">GrossMerchandizeProfit</property>
-                    <property name="dataType">decimal</property>
+                    <property name="name">quantity</property>
+                    <property name="dataType">integer</property>
                 </structure>
                 <structure>
                     <property name="position">11</property>
-                    <property name="name">GrossShippingProfit</property>
-                    <property name="dataType">decimal</property>
+                    <property name="name">GS</property>
+                    <property name="dataType">integer</property>
                 </structure>
                 <structure>
                     <property name="position">12</property>
-                    <property name="name">GrossProfit</property>
-                    <property name="dataType">decimal</property>
+                    <property name="name">GMS</property>
+                    <property name="dataType">integer</property>
                 </structure>
                 <structure>
                     <property name="position">13</property>
-                    <property name="name">AverageMerchandizeProfit</property>
-                    <property name="dataType">decimal</property>
+                    <property name="name">GMP</property>
+                    <property name="dataType">integer</property>
                 </structure>
                 <structure>
                     <property name="position">14</property>
-                    <property name="name">AverageGrossProfit</property>
-                    <property name="dataType">decimal</property>
+                    <property name="name">GSP</property>
+                    <property name="dataType">integer</property>
                 </structure>
                 <structure>
                     <property name="position">15</property>
-                    <property name="name">AccountType</property>
-                    <property name="dataType">string</property>
-                </structure>
-                <structure>
-                    <property name="position">16</property>
-                    <property name="name">Pod</property>
-                    <property name="dataType">string</property>
-                </structure>
-                <structure>
-                    <property name="position">17</property>
-                    <property name="name">Account</property>
-                    <property name="dataType">string</property>
-                </structure>
-                <structure>
-                    <property name="position">18</property>
-                    <property name="name">SalesChannel</property>
-                    <property name="dataType">string</property>
+                    <property name="name">GP</property>
+                    <property name="dataType">integer</property>
                 </structure>
             </list-property>
             <list-property name="columnHints">
                 <structure>
-                    <property name="columnName">quantity</property>
-                    <property name="displayName">quantity</property>
-                </structure>
-                <structure>
-                    <property name="columnName">orderDateMonthName</property>
-                    <property name="displayName">orderDateMonthName</property>
-                </structure>
-                <structure>
-                    <property name="columnName">orderDateDayName</property>
-                    <property name="displayName">orderDateDayName</property>
-                </structure>
-                <structure>
-                    <property name="columnName">GrossSales</property>
-                    <property name="displayName">GS</property>
+                    <property name="columnName">Brand</property>
+                    <text-property name="displayName">Brand</text-property>
                 </structure>
                 <structure>
-                    <property name="columnName">GrossMerchandizeSales</property>
-                    <property name="displayName">GMS</property>
+                    <property name="columnName">Pod</property>
+                    <text-property name="displayName">Pod</text-property>
                 </structure>
                 <structure>
-                    <property name="columnName">GrossMerchandizeProfit</property>
-                    <property name="displayName">GMP</property>
+                    <property name="columnName">Account</property>
+                    <text-property name="displayName">Account</text-property>
                 </structure>
                 <structure>
-                    <property name="columnName">GrossShippingProfit</property>
-                    <property name="displayName">GSP</property>
+                    <property name="columnName">orderDateYearName</property>
+                    <text-property name="displayName">orderDateYearName</text-property>
                 </structure>
                 <structure>
-                    <property name="columnName">GrossProfit</property>
-                    <property name="displayName">GP</property>
+                    <property name="columnName">orderDateMonthOfYear</property>
+                    <text-property name="displayName">orderDateMonthOfYear</text-property>
                 </structure>
                 <structure>
-                    <property name="columnName">AverageMerchandizeProfit</property>
-                    <property name="displayName">AMP</property>
+                    <property name="columnName">orderDateMonthName</property>
+                    <text-property name="displayName">orderDateMonthName</text-property>
                 </structure>
                 <structure>
-                    <property name="columnName">AverageGrossProfit</property>
-                    <property name="displayName">AGP</property>
+                    <property name="columnName">orderDateWeekOfYear</property>
+                    <text-property name="displayName">orderDateWeekOfYear</text-property>
                 </structure>
                 <structure>
-                    <property name="columnName">orderDateWeekOfYear</property>
-                    <property name="displayName">orderDateWeekOfYear</property>
+                    <property name="columnName">orderDateDayName</property>
+                    <text-property name="displayName">orderDateDayName</text-property>
                 </structure>
                 <structure>
                     <property name="columnName">orderDateDescription</property>
-                    <property name="displayName">orderDateDescription</property>
+                    <text-property name="displayName">orderDateDescription</text-property>
                 </structure>
                 <structure>
-                    <property name="columnName">AccountType</property>
-                    <property name="displayName">AccountType</property>
+                    <property name="columnName">quantity</property>
+                    <text-property name="displayName">quantity</text-property>
                 </structure>
                 <structure>
-                    <property name="columnName">Pod</property>
-                    <property name="displayName">Pod</property>
+                    <property name="columnName">GS</property>
+                    <text-property name="displayName">GS</text-property>
                 </structure>
                 <structure>
-                    <property name="columnName">Account</property>
-                    <property name="displayName">Account</property>
+                    <property name="columnName">GMS</property>
+                    <text-property name="displayName">GMS</text-property>
                 </structure>
                 <structure>
-                    <property name="columnName">SalesChannel</property>
-                    <property name="displayName">SalesChannel</property>
+                    <property name="columnName">GMP</property>
+                    <text-property name="displayName">GMP</text-property>
                 </structure>
                 <structure>
-                    <property name="columnName">orderDateYearName</property>
-                    <property name="displayName">orderDateYearName</property>
+                    <property name="columnName">GSP</property>
+                    <text-property name="displayName">GSP</text-property>
                 </structure>
                 <structure>
-                    <property name="columnName">orderDateMonthOfYear</property>
-                    <property name="displayName">orderDateMonthOfYear</property>
+                    <property name="columnName">GP</property>
+                    <text-property name="displayName">GP</text-property>
                 </structure>
             </list-property>
             <structure name="cachedMetaData">
                 <list-property name="resultSet">
                     <structure>
                         <property name="position">1</property>
-                        <property name="name">orderDateYearName</property>
+                        <property name="name">Brand</property>
                         <property name="dataType">string</property>
                     </structure>
                     <structure>
                         <property name="position">2</property>
-                        <property name="name">orderDateMonthOfYear</property>
+                        <property name="name">Pod</property>
                         <property name="dataType">string</property>
                     </structure>
                     <structure>
                         <property name="position">3</property>
-                        <property name="name">orderDateMonthName</property>
+                        <property name="name">Account</property>
                         <property name="dataType">string</property>
                     </structure>
                     <structure>
                         <property name="position">4</property>
-                        <property name="name">orderDateWeekOfYear</property>
+                        <property name="name">orderDateYearName</property>
                         <property name="dataType">string</property>
                     </structure>
                     <structure>
                         <property name="position">5</property>
-                        <property name="name">orderDateDayName</property>
+                        <property name="name">orderDateMonthOfYear</property>
                         <property name="dataType">string</property>
                     </structure>
                     <structure>
                         <property name="position">6</property>
-                        <property name="name">orderDateDescription</property>
+                        <property name="name">orderDateMonthName</property>
                         <property name="dataType">string</property>
                     </structure>
                     <structure>
                         <property name="position">7</property>
-                        <property name="name">quantity</property>
-                        <property name="dataType">integer</property>
+                        <property name="name">orderDateWeekOfYear</property>
+                        <property name="dataType">string</property>
                     </structure>
                     <structure>
                         <property name="position">8</property>
-                        <property name="name">GrossSales</property>
-                        <property name="dataType">decimal</property>
+                        <property name="name">orderDateDayName</property>
+                        <property name="dataType">string</property>
                     </structure>
                     <structure>
                         <property name="position">9</property>
-                        <property name="name">GrossMerchandizeSales</property>
-                        <property name="dataType">decimal</property>
+                        <property name="name">orderDateDescription</property>
+                        <property name="dataType">string</property>
                     </structure>
                     <structure>
                         <property name="position">10</property>
-                        <property name="name">GrossMerchandizeProfit</property>
-                        <property name="dataType">decimal</property>
+                        <property name="name">quantity</property>
+                        <property name="dataType">integer</property>
                     </structure>
                     <structure>
                         <property name="position">11</property>
-                        <property name="name">GrossShippingProfit</property>
-                        <property name="dataType">decimal</property>
+                        <property name="name">GS</property>
+                        <property name="dataType">integer</property>
                     </structure>
                     <structure>
                         <property name="position">12</property>
-                        <property name="name">GrossProfit</property>
-                        <property name="dataType">decimal</property>
+                        <property name="name">GMS</property>
+                        <property name="dataType">integer</property>
                     </structure>
                     <structure>
                         <property name="position">13</property>
-                        <property name="name">AverageMerchandizeProfit</property>
-                        <property name="dataType">decimal</property>
+                        <property name="name">GMP</property>
+                        <property name="dataType">integer</property>
                     </structure>
                     <structure>
                         <property name="position">14</property>
-                        <property name="name">AverageGrossProfit</property>
-                        <property name="dataType">decimal</property>
+                        <property name="name">GSP</property>
+                        <property name="dataType">integer</property>
                     </structure>
                     <structure>
                         <property name="position">15</property>
-                        <property name="name">AccountType</property>
-                        <property name="dataType">string</property>
-                    </structure>
-                    <structure>
-                        <property name="position">16</property>
-                        <property name="name">Pod</property>
-                        <property name="dataType">string</property>
-                    </structure>
-                    <structure>
-                        <property name="position">17</property>
-                        <property name="name">Account</property>
-                        <property name="dataType">string</property>
-                    </structure>
-                    <structure>
-                        <property name="position">18</property>
-                        <property name="name">SalesChannel</property>
-                        <property name="dataType">string</property>
+                        <property name="name">GP</property>
+                        <property name="dataType">integer</property>
                     </structure>
                 </list-property>
             </structure>
@@ -422,11 +424,19 @@ classLoader = appContext.get(EngineConst
 starschemas = null;
 try 
 {
+    reportBy = params["reportBy"].value;
     fromDate = params["fromDate"].value;
     thruDate = params["thruDate"].value;
+    thruWeek = params["thruWeek"].value;
+    thruMonth = params["thruMonth"].value;
+    thisYear = params["thisYear"].value;
     methodContext = new MethodContext(appContext, classLoader, MethodContext.SERVICE);
+    methodContext.putEnv("reportBy", reportBy);
     methodContext.putEnv("fromDate", fromDate);
     methodContext.putEnv("thruDate", thruDate);
+    methodContext.putEnv("thruWeek", thruWeek);
+    methodContext.putEnv("thruMonth", thruMonth);
+    methodContext.putEnv("thisYear", thisYear);
     SimpleMethod.runSimpleMethod("component://order/script/org/ofbiz/order/reports/SalesReportEvent.xml", "getOrder", methodContext);
     starschemas = methodContext.getEnv("starschemas");
 } 
@@ -437,30 +447,6 @@ catch (e) 
 
 currentRow = 0;
 totalRows = 0;
-account_type1 = "B2C";
-account_type2 = "B2B";
-pod1 = "English Pod";
-pod2 = "Latin Pod";
-account_B2C_AU = "B2C-AU";
-account_B2C_CA = "B2C-CA";
-account_B2C_IE = "B2C-IE";
-account_B2C_SG = "B2C-SG";
-account_B2C_UK = "B2C-UK";
-account_B2C_US = "B2C-US";
-account_B2C_DE = "B2C-DE";
-account_B2C_ES = "B2C-ES";
-account_B2C_FR = "B2C-FR";
-account_B2C_IT = "B2C-IT";
-account_B2B_AU = "B2B-AU";
-account_B2B_CA = "B2B-CA";
-account_B2B_IE = "B2B-IE";
-account_B2B_SG = "B2B-SG";
-account_B2B_UK = "B2B-UK";
-account_B2B_US = "B2B-US";
-account_B2B_DE = "B2B-DE";
-account_B2B_ES = "B2B-ES";
-account_B2B_FR = "B2B-FR";
-account_B2B_IT = "B2B-IT";
 
 if (starschemas) 
 {
@@ -478,396 +464,32 @@ if (starschemas) 
     orderDateYearMonthDay = starschema.getString("orderDateYearMonthDay");
     orderDateMonthOfYear = starschema.getString("orderDateMonthOfYear");
     
-    quantity = starschema.getString("quantity");
-    GrossSales = starschema.getString("GrossSales");
-    GrossMerchandizeSales = starschema.getString("GrossMerchandizeSales");
-    GrossMerchandizeProfit = starschema.getString("GrossMerchandizeProfit");
-    GrossShippingProfit = starschema.getString("GrossShippingProfit");
-    GrossProfit = starschema.getString("GrossProfit");
+    brand = starschema.getString("brand");
+    pod = starschema.getString("pod");
+    account = starschema.getString("account");
     
-    salesChannelEnumId = starschema.getString("salesChannelEnumId");
-    saleChannel = starschema.getString("saleChannel");
+    quantity = starschema.getString("quantity");
+    GS = starschema.getString("GS");
+    GMS = starschema.getString("GMS");
+    GMP = starschema.getString("GMP");
+    GSP = starschema.getString("GSP");
+    GP = starschema.getString("GP");
     
-    if (salesChannelEnumId == "B2C_AU_SALES_CHANNEL")
-    {
-        row["AccountType"] = account_type1;
-        row["Pod"] = pod1;
-        row["Account"] = account_B2C_AU;
-        row["SalesChannel"] = salesChannelEnumId;
-        row["orderDateYearName"] = orderDateYearName;
-        row["orderDateMonthOfYear"] = orderDateMonthOfYear;
-        row["orderDateMonthName"] = orderDateMonthName;
-        row["orderDateWeekOfYear"] = orderDateWeekOfYear;
-        row["orderDateDayName"] = orderDateDayName;
-        row["orderDateDescription"] = orderDateDescription;
-        row["quantity"] = quantity;
-        row["GrossSales"] = GrossSales;
-        row["GrossMerchandizeSales"] = GrossMerchandizeSales;
-        row["GrossMerchandizeProfit"] = GrossMerchandizeProfit;
-        row["GrossShippingProfit"] = GrossShippingProfit;
-        row["GrossProfit"] = GrossProfit;
-    }
-    if (salesChannelEnumId == "B2C_CA_SALES_CHANNEL")
-    {
-        row["AccountType"] = account_type1;
-        row["Pod"] = pod1;
-        row["Account"] = account_B2C_CA;
-        row["SalesChannel"] = salesChannelEnumId;
-        row["orderDateYearName"] = orderDateYearName;
-        row["orderDateMonthOfYear"] = orderDateMonthOfYear;
-        row["orderDateMonthName"] = orderDateMonthName;
-        row["orderDateWeekOfYear"] = orderDateWeekOfYear;
-        row["orderDateDayName"] = orderDateDayName;
-        row["orderDateDescription"] = orderDateDescription;
-        row["quantity"] = quantity;
-        row["GrossSales"] = GrossSales;
-        row["GrossMerchandizeSales"] = GrossMerchandizeSales;
-        row["GrossMerchandizeProfit"] = GrossMerchandizeProfit;
-        row["GrossShippingProfit"] = GrossShippingProfit;
-        row["GrossProfit"] = GrossProfit;
-    }
-    if (salesChannelEnumId == "B2C_IE_SALES_CHANNEL")
-    {
-        row["AccountType"] = account_type1;
-        row["Pod"] = pod1;
-        row["Account"] = account_B2C_IE;
-        row["SalesChannel"] = salesChannelEnumId;
-        row["orderDateYearName"] = orderDateYearName;
-        row["orderDateMonthOfYear"] = orderDateMonthOfYear;
-        row["orderDateMonthName"] = orderDateMonthName;
-        row["orderDateWeekOfYear"] = orderDateWeekOfYear;
-        row["orderDateDayName"] = orderDateDayName;
-        row["orderDateDescription"] = orderDateDescription;
-        row["quantity"] = quantity;
-        row["GrossSales"] = GrossSales;
-        row["GrossMerchandizeSales"] = GrossMerchandizeSales;
-        row["GrossMerchandizeProfit"] = GrossMerchandizeProfit;
-        row["GrossShippingProfit"] = GrossShippingProfit;
-        row["GrossProfit"] = GrossProfit;
-    }
-    if (salesChannelEnumId == "B2C_SG_SALES_CHANNEL")
-    {
-        row["AccountType"] = account_type1;
-        row["Pod"] = pod1;
-        row["Account"] = account_B2C_SG;
-        row["SalesChannel"] = salesChannelEnumId;
-        row["orderDateYearName"] = orderDateYearName;
-        row["orderDateMonthOfYear"] = orderDateMonthOfYear;
-        row["orderDateMonthName"] = orderDateMonthName;
-        row["orderDateWeekOfYear"] = orderDateWeekOfYear;
-        row["orderDateDayName"] = orderDateDayName;
-        row["orderDateDescription"] = orderDateDescription;
-        row["quantity"] = quantity;
-        row["GrossSales"] = GrossSales;
-        row["GrossMerchandizeSales"] = GrossMerchandizeSales;
-        row["GrossMerchandizeProfit"] = GrossMerchandizeProfit;
-        row["GrossShippingProfit"] = GrossShippingProfit;
-        row["GrossProfit"] = GrossProfit;
-    }
-    if (salesChannelEnumId == "B2C_UK_SALES_CHANNEL")
-    {
-        row["AccountType"] = account_type1;
-        row["Pod"] = pod1;
-        row["Account"] = account_B2C_UK;
-        row["SalesChannel"] = salesChannelEnumId;
-        row["orderDateYearName"] = orderDateYearName;
-        row["orderDateMonthOfYear"] = orderDateMonthOfYear;
-        row["orderDateMonthName"] = orderDateMonthName;
-        row["orderDateWeekOfYear"] = orderDateWeekOfYear;
-        row["orderDateDayName"] = orderDateDayName;
-        row["orderDateDescription"] = orderDateDescription;
-        row["quantity"] = quantity;
-        row["GrossSales"] = GrossSales;
-        row["GrossMerchandizeSales"] = GrossMerchandizeSales;
-        row["GrossMerchandizeProfit"] = GrossMerchandizeProfit;
-        row["GrossShippingProfit"] = GrossShippingProfit;
-        row["GrossProfit"] = GrossProfit;
-    }
-    if (salesChannelEnumId == "B2C_US_SALES_CHANNEL")
-    {
-        row["AccountType"] = account_type1;
-        row["Pod"] = pod1;
-        row["Account"] = account_B2C_US;
-        row["SalesChannel"] = salesChannelEnumId;
-        row["orderDateYearName"] = orderDateYearName;
-        row["orderDateMonthOfYear"] = orderDateMonthOfYear;
-        row["orderDateMonthName"] = orderDateMonthName;
-        row["orderDateWeekOfYear"] = orderDateWeekOfYear;
-        row["orderDateDayName"] = orderDateDayName;
-        row["orderDateDescription"] = orderDateDescription;
-        row["quantity"] = quantity;
-        row["GrossSales"] = GrossSales;
-        row["GrossMerchandizeSales"] = GrossMerchandizeSales;
-        row["GrossMerchandizeProfit"] = GrossMerchandizeProfit;
-        row["GrossShippingProfit"] = GrossShippingProfit;
-        row["GrossProfit"] = GrossProfit;
-    }
-    if (salesChannelEnumId == "B2C_DE_SALES_CHANNEL")
-    {
-        row["AccountType"] = account_type1;
-        row["Pod"] = pod2;
-        row["Account"] = account_B2C_DE;
-        row["SalesChannel"] = salesChannelEnumId;
-        row["orderDateYearName"] = orderDateYearName;
-        row["orderDateMonthOfYear"] = orderDateMonthOfYear;
-        row["orderDateMonthName"] = orderDateMonthName;
-        row["orderDateWeekOfYear"] = orderDateWeekOfYear;
-        row["orderDateDayName"] = orderDateDayName;
-        row["orderDateDescription"] = orderDateDescription;
-        row["quantity"] = quantity;
-        row["GrossSales"] = GrossSales;
-        row["GrossMerchandizeSales"] = GrossMerchandizeSales;
-        row["GrossMerchandizeProfit"] = GrossMerchandizeProfit;
-        row["GrossShippingProfit"] = GrossShippingProfit;
-        row["GrossProfit"] = GrossProfit;
-    }
-    if (salesChannelEnumId == "B2C_ES_SALES_CHANNEL")
-    {
-        row["AccountType"] = account_type1;
-        row["Pod"] = pod2;
-        row["Account"] = account_B2C_ES;
-        row["SalesChannel"] = salesChannelEnumId;
-        row["orderDateYearName"] = orderDateYearName;
-        row["orderDateMonthOfYear"] = orderDateMonthOfYear;
-        row["orderDateMonthName"] = orderDateMonthName;
-        row["orderDateWeekOfYear"] = orderDateWeekOfYear;
-        row["orderDateDayName"] = orderDateDayName;
-        row["orderDateDescription"] = orderDateDescription;
-        row["quantity"] = quantity;
-        row["GrossSales"] = GrossSales;
-        row["GrossMerchandizeSales"] = GrossMerchandizeSales;
-        row["GrossMerchandizeProfit"] = GrossMerchandizeProfit;
-        row["GrossShippingProfit"] = GrossShippingProfit;
-        row["GrossProfit"] = GrossProfit;
-    }
-    if (salesChannelEnumId == "B2C_FR_SALES_CHANNEL")
-    {
-        row["AccountType"] = account_type1;
-        row["Pod"] = pod2;
-        row["Account"] = account_B2C_FR;
-        row["SalesChannel"] = salesChannelEnumId;
-        row["orderDateYearName"] = orderDateYearName;
-        row["orderDateMonthOfYear"] = orderDateMonthOfYear;
-        row["orderDateMonthName"] = orderDateMonthName;
-        row["orderDateWeekOfYear"] = orderDateWeekOfYear;
-        row["orderDateDayName"] = orderDateDayName;
-        row["orderDateDescription"] = orderDateDescription;
-        row["quantity"] = quantity;
-        row["GrossSales"] = GrossSales;
-        row["GrossMerchandizeSales"] = GrossMerchandizeSales;
-        row["GrossMerchandizeProfit"] = GrossMerchandizeProfit;
-        row["GrossShippingProfit"] = GrossShippingProfit;
-        row["GrossProfit"] = GrossProfit;
-    }
-    if (salesChannelEnumId == "B2C_IT_SALES_CHANNEL")
-    {
-        row["AccountType"] = account_type1;
-        row["Pod"] = pod2;
-        row["Account"] = account_B2C_IT;
-        row["SalesChannel"] = salesChannelEnumId;
-        row["orderDateYearName"] = orderDateYearName;
-        row["orderDateMonthOfYear"] = orderDateMonthOfYear;
-        row["orderDateMonthName"] = orderDateMonthName;
-        row["orderDateWeekOfYear"] = orderDateWeekOfYear;
-        row["orderDateDayName"] = orderDateDayName;
-        row["orderDateDescription"] = orderDateDescription;
-        row["quantity"] = quantity;
-        row["GrossSales"] = GrossSales;
-        row["GrossMerchandizeSales"] = GrossMerchandizeSales;
-        row["GrossMerchandizeProfit"] = GrossMerchandizeProfit;
-        row["GrossShippingProfit"] = GrossShippingProfit;
-        row["GrossProfit"] = GrossProfit;
-    }
-    if (salesChannelEnumId == "B2B_AU_SALES_CHANNEL")
-    {
-        row["AccountType"] = account_type2;
-        row["Pod"] = pod1;
-        row["Account"] = account_B2B_AU;
-        row["SalesChannel"] = salesChannelEnumId;
-        row["orderDateYearName"] = orderDateYearName;
-        row["orderDateMonthOfYear"] = orderDateMonthOfYear;
-        row["orderDateMonthName"] = orderDateMonthName;
-        row["orderDateWeekOfYear"] = orderDateWeekOfYear;
-        row["orderDateDayName"] = orderDateDayName;
-        row["orderDateDescription"] = orderDateDescription;
-        row["quantity"] = quantity;
-        row["GrossSales"] = GrossSales;
-        row["GrossMerchandizeSales"] = GrossMerchandizeSales;
-        row["GrossMerchandizeProfit"] = GrossMerchandizeProfit;
-        row["GrossShippingProfit"] = GrossShippingProfit;
-        row["GrossProfit"] = GrossProfit;
-    }
-    if (salesChannelEnumId == "B2B_CA_SALES_CHANNEL")
-    {
-        row["AccountType"] = account_type2;
-        row["Pod"] = pod1;
-        row["Account"] = account_B2B_CA;
-        row["SalesChannel"] = salesChannelEnumId;
-        row["orderDateYearName"] = orderDateYearName;
-        row["orderDateMonthOfYear"] = orderDateMonthOfYear;
-        row["orderDateMonthName"] = orderDateMonthName;
-        row["orderDateWeekOfYear"] = orderDateWeekOfYear;
-        row["orderDateDayName"] = orderDateDayName;
-        row["orderDateDescription"] = orderDateDescription;
-        row["quantity"] = quantity;
-        row["GrossSales"] = GrossSales;
-        row["GrossMerchandizeSales"] = GrossMerchandizeSales;
-        row["GrossMerchandizeProfit"] = GrossMerchandizeProfit;
-        row["GrossShippingProfit"] = GrossShippingProfit;
-        row["GrossProfit"] = GrossProfit;
-    }
-    if (salesChannelEnumId == "B2B_IE_SALES_CHANNEL")
-    {
-        row["AccountType"] = account_type2;
-        row["Pod"] = pod1;
-        row["Account"] = account_B2B_IE;
-        row["SalesChannel"] = salesChannelEnumId;
-        row["orderDateYearName"] = orderDateYearName;
-        row["orderDateMonthOfYear"] = orderDateMonthOfYear;
-        row["orderDateMonthName"] = orderDateMonthName;
-        row["orderDateWeekOfYear"] = orderDateWeekOfYear;
-        row["orderDateDayName"] = orderDateDayName;
-        row["orderDateDescription"] = orderDateDescription;
-        row["quantity"] = quantity;
-        row["GrossSales"] = GrossSales;
-        row["GrossMerchandizeSales"] = GrossMerchandizeSales;
-        row["GrossMerchandizeProfit"] = GrossMerchandizeProfit;
-        row["GrossShippingProfit"] = GrossShippingProfit;
-        row["GrossProfit"] = GrossProfit;
-    }
-    if (salesChannelEnumId == "B2B_SG_SALES_CHANNEL")
-    {
-        row["AccountType"] = account_type2;
-        row["Pod"] = pod1;
-        row["Account"] = account_B2B_SG;
-        row["SalesChannel"] = salesChannelEnumId;
-        row["orderDateYearName"] = orderDateYearName;
-        row["orderDateMonthOfYear"] = orderDateMonthOfYear;
-        row["orderDateMonthName"] = orderDateMonthName;
-        row["orderDateWeekOfYear"] = orderDateWeekOfYear;
-        row["orderDateDayName"] = orderDateDayName;
-        row["orderDateDescription"] = orderDateDescription;
-        row["quantity"] = quantity;
-        row["GrossSales"] = GrossSales;
-        row["GrossMerchandizeSales"] = GrossMerchandizeSales;
-        row["GrossMerchandizeProfit"] = GrossMerchandizeProfit;
-        row["GrossShippingProfit"] = GrossShippingProfit;
-        row["GrossProfit"] = GrossProfit;
-    }
-    if (salesChannelEnumId == "B2B_UK_SALES_CHANNEL")
-    {
-        row["AccountType"] = account_type2;
-        row["Pod"] = pod1;
-        row["Account"] = account_B2B_UK;
-        row["SalesChannel"] = salesChannelEnumId;
-        row["orderDateYearName"] = orderDateYearName;
-        row["orderDateMonthOfYear"] = orderDateMonthOfYear;
-        row["orderDateMonthName"] = orderDateMonthName;
-        row["orderDateWeekOfYear"] = orderDateWeekOfYear;
-        row["orderDateDayName"] = orderDateDayName;
-        row["orderDateDescription"] = orderDateDescription;
-        row["quantity"] = quantity;
-        row["GrossSales"] = GrossSales;
-        row["GrossMerchandizeSales"] = GrossMerchandizeSales;
-        row["GrossMerchandizeProfit"] = GrossMerchandizeProfit;
-        row["GrossShippingProfit"] = GrossShippingProfit;
-        row["GrossProfit"] = GrossProfit;
-    }
-    if (salesChannelEnumId == "B2B_US_SALES_CHANNEL")
-    {
-        row["AccountType"] = account_type2;
-        row["Pod"] = pod1;
-        row["Account"] = account_B2B_US;
-        row["SalesChannel"] = salesChannelEnumId;
-        row["orderDateYearName"] = orderDateYearName;
-        row["orderDateMonthOfYear"] = orderDateMonthOfYear;
-        row["orderDateMonthName"] = orderDateMonthName;
-        row["orderDateWeekOfYear"] = orderDateWeekOfYear;
-        row["orderDateDayName"] = orderDateDayName;
-        row["orderDateDescription"] = orderDateDescription;
-        row["quantity"] = quantity;
-        row["GrossSales"] = GrossSales;
-        row["GrossMerchandizeSales"] = GrossMerchandizeSales;
-        row["GrossMerchandizeProfit"] = GrossMerchandizeProfit;
-        row["GrossShippingProfit"] = GrossShippingProfit;
-        row["GrossProfit"] = GrossProfit;
-    }
-    if (salesChannelEnumId == "B2B_DE_SALES_CHANNEL")
-    {
-        row["AccountType"] = account_type2;
-        row["Pod"] = pod2;
-        row["Account"] = account_B2B_DE;
-        row["SalesChannel"] = salesChannelEnumId;
-        row["orderDateYearName"] = orderDateYearName;
-        row["orderDateMonthOfYear"] = orderDateMonthOfYear;
-        row["orderDateMonthName"] = orderDateMonthName;
-        row["orderDateWeekOfYear"] = orderDateWeekOfYear;
-        row["orderDateDayName"] = orderDateDayName;
-        row["orderDateDescription"] = orderDateDescription;
-        row["quantity"] = quantity;
-        row["GrossSales"] = GrossSales;
-        row["GrossMerchandizeSales"] = GrossMerchandizeSales;
-        row["GrossMerchandizeProfit"] = GrossMerchandizeProfit;
-        row["GrossShippingProfit"] = GrossShippingProfit;
-        row["GrossProfit"] = GrossProfit;
-    }
-    if (salesChannelEnumId == "B2B_ES_SALES_CHANNEL")
-    {
-        row["AccountType"] = account_type2;
-        row["Pod"] = pod2;
-        row["Account"] = account_B2B_ES;
-        row["SalesChannel"] = salesChannelEnumId;
-        row["orderDateYearName"] = orderDateYearName;
-        row["orderDateMonthOfYear"] = orderDateMonthOfYear;
-        row["orderDateMonthName"] = orderDateMonthName;
-        row["orderDateWeekOfYear"] = orderDateWeekOfYear;
-        row["orderDateDayName"] = orderDateDayName;
-        row["orderDateDescription"] = orderDateDescription;
-        row["quantity"] = quantity;
-        row["GrossSales"] = GrossSales;
-        row["GrossMerchandizeSales"] = GrossMerchandizeSales;
-        row["GrossMerchandizeProfit"] = GrossMerchandizeProfit;
-        row["GrossShippingProfit"] = GrossShippingProfit;
-        row["GrossProfit"] = GrossProfit;
-    }
-    if (salesChannelEnumId == "B2B_FR_SALES_CHANNEL")
-    {
-        row["AccountType"] = account_type2;
-        row["Pod"] = pod2;
-        row["Account"] = account_B2B_FR;
-        row["SalesChannel"] = salesChannelEnumId;
-        row["orderDateYearName"] = orderDateYearName;
-        row["orderDateMonthOfYear"] = orderDateMonthOfYear;
-        row["orderDateMonthName"] = orderDateMonthName;
-        row["orderDateWeekOfYear"] = orderDateWeekOfYear;
-        row["orderDateDayName"] = orderDateDayName;
-        row["orderDateDescription"] = orderDateDescription;
-        row["quantity"] = quantity;
-        row["GrossSales"] = GrossSales;
-        row["GrossMerchandizeSales"] = GrossMerchandizeSales;
-        row["GrossMerchandizeProfit"] = GrossMerchandizeProfit;
-        row["GrossShippingProfit"] = GrossShippingProfit;
-        row["GrossProfit"] = GrossProfit;
-    }
-    if (salesChannelEnumId == "B2B_IT_SALES_CHANNEL")
-    {
-        row["AccountType"] = account_type2;
-        row["Pod"] = pod2;
-        row["Account"] = account_B2B_IT;
-        row["SalesChannel"] = salesChannelEnumId;
-        row["orderDateYearName"] = orderDateYearName;
-        row["orderDateMonthOfYear"] = orderDateMonthOfYear;
-        row["orderDateMonthName"] = orderDateMonthName;
-        row["orderDateWeekOfYear"] = orderDateWeekOfYear;
-        row["orderDateDayName"] = orderDateDayName;
-        row["orderDateDescription"] = orderDateDescription;
-        row["quantity"] = quantity;
-        row["GrossSales"] = GrossSales;
-        row["GrossMerchandizeSales"] = GrossMerchandizeSales;
-        row["GrossMerchandizeProfit"] = GrossMerchandizeProfit;
-        row["GrossShippingProfit"] = GrossShippingProfit;
-        row["GrossProfit"] = GrossProfit;
-    }
+    row["Brand"] = brand;
+    row["Pod"] = pod;
+    row["Account"] = account;
+    row["orderDateYearName"] = orderDateYearName;
+    row["orderDateMonthOfYear"] = orderDateMonthOfYear;
+    row["orderDateMonthName"] = orderDateMonthName;
+    row["orderDateWeekOfYear"] = orderDateWeekOfYear;
+    row["orderDateDayName"] = orderDateDayName;
+    row["orderDateDescription"] = orderDateDescription;
+    row["quantity"] = quantity;
+    row["GS"] = GS;
+    row["GMS"] = GMS;
+    row["GMP"] = GMP;
+    row["GSP"] = GSP;
+    row["GP"] = GP;
     
     currentRow ++;
 }
@@ -877,7 +499,6 @@ return true;]]></method>
     </data-sets>
     <cubes>
         <tabular-cube name="BIC_DataCube" id="419">
-            <property name="defaultMeasureGroup">Summary Field1</property>
             <property name="dimensions">
                 <tabular-dimension name="Date" id="1473">
                     <property name="defaultHierarchy">NewTabularHierarchy</property>
@@ -912,20 +533,20 @@ return true;]]></method>
                         </tabular-hierarchy>
                     </property>
                 </tabular-dimension>
-                <tabular-dimension name="Account" id="1478">
+                <tabular-dimension name="Account" id="2036">
                     <property name="defaultHierarchy">NewTabularHierarchy1</property>
                     <property name="hierarchies">
-                        <tabular-hierarchy name="NewTabularHierarchy1" id="1479">
+                        <tabular-hierarchy name="NewTabularHierarchy1" id="2037">
                             <property name="levels">
-                                <tabular-level name="AccountType" id="1480">
+                                <tabular-level name="Brand" id="2038">
                                     <property name="dataType">string</property>
-                                    <property name="columnName">AccountType</property>
+                                    <property name="columnName">Brand</property>
                                 </tabular-level>
-                                <tabular-level name="Pod" id="1481">
+                                <tabular-level name="Pod" id="2039">
                                     <property name="dataType">string</property>
                                     <property name="columnName">Pod</property>
                                 </tabular-level>
-                                <tabular-level name="Account" id="1482">
+                                <tabular-level name="Account" id="2040">
                                     <property name="dataType">string</property>
                                     <property name="columnName">Account</property>
                                 </tabular-level>
@@ -935,42 +556,31 @@ return true;]]></method>
                 </tabular-dimension>
             </property>
             <property name="measureGroups">
-                <tabular-measure-group name="Summary Field1" id="435">
+                <tabular-measure-group name="Summary Field" id="2041">
                     <property name="measures">
-                        <tabular-measure name="quantity" id="436">
+                        <tabular-measure name="quantity" id="2042">
                             <expression name="measureExpression">dataSetRow["quantity"]</expression>
                             <property name="dataType">integer</property>
                         </tabular-measure>
-                        <tabular-measure name="GrossSales" id="437">
-                            <expression name="measureExpression">dataSetRow["GrossSales"]</expression>
-                            <property name="dataType">decimal</property>
-                        </tabular-measure>
-                        <tabular-measure name="GrossMerchandizeSales" id="438">
-                            <expression name="measureExpression">dataSetRow["GrossMerchandizeSales"]</expression>
-                            <property name="dataType">decimal</property>
-                        </tabular-measure>
-                        <tabular-measure name="GrossMerchandizeProfit" id="439">
-                            <expression name="measureExpression">dataSetRow["GrossMerchandizeProfit"]</expression>
-                            <property name="dataType">decimal</property>
+                        <tabular-measure name="GS" id="2398">
+                            <expression name="measureExpression">dataSetRow["GS"]</expression>
+                            <property name="dataType">integer</property>
                         </tabular-measure>
-                        <tabular-measure name="GrossShippingProfit" id="440">
-                            <expression name="measureExpression">dataSetRow["GrossShippingProfit"]</expression>
-                            <property name="dataType">decimal</property>
+                        <tabular-measure name="GMS" id="2399">
+                            <expression name="measureExpression">dataSetRow["GMS"]</expression>
+                            <property name="dataType">integer</property>
                         </tabular-measure>
-                        <tabular-measure name="GrossProfit" id="441">
-                            <expression name="measureExpression">dataSetRow["GrossProfit"]</expression>
-                            <property name="dataType">decimal</property>
+                        <tabular-measure name="GMP" id="2400">
+                            <expression name="measureExpression">dataSetRow["GMP"]</expression>
+                            <property name="dataType">integer</property>
                         </tabular-measure>
-                        <tabular-measure name="AverageMerchandizeProfit" id="442">
-                            <property name="function">sum</property>
-                            <property name="isCalculated">false</property>
-                            <expression name="measureExpression">dataSetRow["GrossMerchandizeProfit"]/dataSetRow["quantity"]</expression>
-                            <property name="dataType">decimal</property>
+                        <tabular-measure name="GSP" id="2401">
+                            <expression name="measureExpression">dataSetRow["GSP"]</expression>
+                            <property name="dataType">integer</property>
                         </tabular-measure>
-                        <tabular-measure name="AverageGrossProfit" id="443">
-                            <property name="function">average</property>
-                            <expression name="measureExpression">dataSetRow["GrossProfit"]/dataSetRow["quantity"]</expression>
-                            <property name="dataType">decimal</property>
+                        <tabular-measure name="GP" id="2402">
+                            <expression name="measureExpression">dataSetRow["GP"]</expression>
+                            <property name="dataType">integer</property>
                         </tabular-measure>
                     </property>
                 </tabular-measure-group>
@@ -1041,6 +651,7 @@ return true;]]></method>
             <property name="rightMargin">0.25in</property>
             <page-footer>
                 <text id="3">
+                    <property name="fontFamily">sans-serif</property>
                     <property name="contentType">html</property>
                     <text-property name="content"><![CDATA[<value-of>new Date()</value-of>]]></text-property>
                 </text>
@@ -1049,667 +660,861 @@ return true;]]></method>
     </page-setup>
     <body>
         <label id="2018">
+            <property name="fontFamily">sans-serif</property>
             <property name="fontSize">xx-large</property>
             <property name="fontWeight">normal</property>
             <property name="paddingTop">1pt</property>
             <property name="paddingBottom">20pt</property>
             <property name="textAlign">center</property>
-            <text-property name="text">Sales Report</text-property>
+            <text-property name="text">Sales Report Daily</text-property>
         </label>
-        <extended-item extensionName="Crosstab" id="1483">
-            <property name="emptyCellValue">0</property>
+        <extended-item extensionName="Crosstab" extensionVersion="2.5.0" id="2554">
             <property name="measures">
-                <extended-item extensionName="MeasureView" id="1494">
+                <extended-item extensionName="MeasureView" id="2556">
                     <property name="measure">quantity</property>
                     <property name="detail">
-                        <extended-item extensionName="CrosstabCell" id="1495">
+                        <extended-item extensionName="AggregationCell" id="2557">
+                            <property name="aggregationOnRow">Account/Account</property>
+                            <property name="aggregationOnColumn">Date/orderDateDescription</property>
+                            <property name="fontFamily">sans-serif</property>
+                            <property name="backgroundColor">#FFEBCD</property>
+                            <property name="textAlign">center</property>
                             <property name="content">
-                                <data name="quantity" id="1497">
-                                    <property name="textAlign">left</property>
-                                    <property name="resultSetColumn">quantity</property>
+                                <data id="2558">
+                                    <structure name="numberFormat">
+                                        <property name="category">Fixed</property>
+                                        <property name="pattern">#,##0</property>
+                                    </structure>
+                                    <property name="resultSetColumn">quantity_Account/Account_Date/orderDateDescription</property>
                                 </data>
                             </property>
                         </extended-item>
                     </property>
                     <property name="aggregations">
-                        <extended-item extensionName="AggregationCell" id="1969">
-                            <property name="aggregationOnRow">Account/AccountType</property>
+                        <extended-item extensionName="AggregationCell" id="2638">
+                            <property name="aggregationOnRow">Account/Brand</property>
                             <property name="aggregationOnColumn">Date/orderDateDescription</property>
-                            <property name="backgroundColor">#BFBFBF</property>
+                            <property name="fontFamily">sans-serif</property>
+                            <property name="backgroundAttachment">scroll</property>
+                            <property name="backgroundColor">#87CEFA</property>
+                            <property name="textAlign">center</property>
                             <property name="content">
-                                <data id="1970">
-                                    <property name="fontWeight">normal</property>
-                                    <property name="resultSetColumn">quantity_Account/AccountType_Date/orderDateDescription</property>
+                                <data id="2639">
+                                    <structure name="numberFormat">
+                                        <property name="category">Fixed</property>
+                                        <property name="pattern">#,##0</property>
+                                    </structure>
+                                    <property name="resultSetColumn">quantity_Account/Brand_Date/orderDateDescription</property>
                                 </data>
                             </property>
                         </extended-item>
-                        <extended-item extensionName="AggregationCell" id="1985">
+                        <extended-item extensionName="AggregationCell" id="2656">
                             <property name="aggregationOnRow">Account/Pod</property>
                             <property name="aggregationOnColumn">Date/orderDateDescription</property>
-                            <property name="backgroundColor">#E5E5E5</property>
+                            <property name="fontFamily">sans-serif</property>
+                            <property name="backgroundColor">#B0C4DE</property>
+                            <property name="textAlign">center</property>
                             <property name="content">
-                                <data id="1986">
-                                    <property name="fontWeight">normal</property>
+                                <data id="2657">
+                                    <structure name="numberFormat">
+                                        <property name="category">Fixed</property>
+                                        <property name="pattern">#,##0</property>
+                                    </structure>
                                     <property name="resultSetColumn">quantity_Account/Pod_Date/orderDateDescription</property>
                                 </data>
                             </property>
                         </extended-item>
-                        <extended-item extensionName="AggregationCell" id="2001">
+                        <extended-item extensionName="AggregationCell" id="2674">
                             <property name="aggregationOnColumn">Date/orderDateDescription</property>
-                            <property name="backgroundColor">#7F7F7F</property>
+                            <property name="fontFamily">sans-serif</property>
+                            <property name="backgroundColor">#6495ED</property>
+                            <property name="textAlign">center</property>
                             <property name="content">
-                                <data id="2002">
-                                    <property name="fontWeight">normal</property>
+                                <data id="2675">
+                                    <structure name="numberFormat">
+                                        <property name="category">Fixed</property>
+                                        <property name="pattern">#,##0</property>
+                                    </structure>
                                     <property name="resultSetColumn">quantity_Date/orderDateDescription</property>
                                 </data>
                             </property>
                         </extended-item>
                     </property>
                     <property name="header">
-                        <extended-item extensionName="CrosstabCell" id="1496">
+                        <extended-item extensionName="CrosstabCell" id="2559">
                             <property name="content">
-                                <label id="1498">
-                                    <property name="fontWeight">bold</property>
-                                    <property name="textAlign">center</property>
+                                <label id="2560">
                                     <text-property name="text">Sold Qty</text-property>
                                 </label>
                             </property>
+                            <property name="fontFamily">sans-serif</property>
+                            <property name="fontSize">small</property>
+                            <property name="fontWeight">bold</property>
+                            <property name="backgroundColor">#ECE9D8</property>
+                            <property name="textAlign">center</property>
                         </extended-item>
                     </property>
                 </extended-item>
-                <extended-item extensionName="MeasureView" id="1499">
-                    <property name="measure">GrossSales</property>
+                <extended-item extensionName="MeasureView" id="2571">
+                    <property name="measure">GMP</property>
                     <property name="detail">
-                        <extended-item extensionName="CrosstabCell" id="1500">
+                        <extended-item extensionName="AggregationCell" id="2572">
+                            <property name="aggregationOnRow">Account/Account</property>
+                            <property name="aggregationOnColumn">Date/orderDateDescription</property>
+                            <property name="fontFamily">sans-serif</property>
+                            <property name="backgroundColor">#FFEBCD</property>
+                            <property name="textAlign">center</property>
                             <property name="content">
-                                <data name="GrossSales" id="1502">
-                                    <property name="textAlign">left</property>
-                                    <property name="resultSetColumn">GrossSales</property>
+                                <data id="2573">
+                                    <structure name="numberFormat">
+                                        <property name="category">Fixed</property>
+                                        <property name="pattern">#,##0</property>
+                                    </structure>
+                                    <property name="resultSetColumn">GMP_Account/Account_Date/orderDateDescription</property>
                                 </data>
                             </property>
                         </extended-item>
                     </property>
                     <property name="aggregations">
-                        <extended-item extensionName="AggregationCell" id="1971">
-                            <property name="aggregationOnRow">Account/AccountType</property>
+                        <extended-item extensionName="AggregationCell" id="2644">
+                            <property name="aggregationOnRow">Account/Brand</property>
                             <property name="aggregationOnColumn">Date/orderDateDescription</property>
-                            <property name="backgroundColor">#BFBFBF</property>
+                            <property name="fontFamily">sans-serif</property>
+                            <property name="backgroundAttachment">scroll</property>
+                            <property name="backgroundColor">#87CEFA</property>
+                            <property name="textAlign">center</property>
                             <property name="content">
-                                <data id="1972">
-                                    <property name="fontWeight">normal</property>
-                                    <property name="resultSetColumn">GrossSales_Account/AccountType_Date/orderDateDescription</property>
+                                <data id="2645">
+                                    <structure name="numberFormat">
+                                        <property name="category">Fixed</property>
+                                        <property name="pattern">#,##0</property>
+                                    </structure>
+                                    <property name="resultSetColumn">GMP_Account/Brand_Date/orderDateDescription</property>
                                 </data>
                             </property>
                         </extended-item>
-                        <extended-item extensionName="AggregationCell" id="1987">
+                        <extended-item extensionName="AggregationCell" id="2662">
                             <property name="aggregationOnRow">Account/Pod</property>
                             <property name="aggregationOnColumn">Date/orderDateDescription</property>
-                            <property name="backgroundColor">#E5E5E5</property>
+                            <property name="fontFamily">sans-serif</property>
+                            <property name="backgroundColor">#B0C4DE</property>
+                            <property name="textAlign">center</property>
                             <property name="content">
-                                <data id="1988">
-                                    <property name="fontWeight">normal</property>
-                                    <property name="resultSetColumn">GrossSales_Account/Pod_Date/orderDateDescription</property>
+                                <data id="2663">
+                                    <structure name="numberFormat">
+                                        <property name="category">Fixed</property>
+                                        <property name="pattern">#,##0</property>
+                                    </structure>
+                                    <property name="resultSetColumn">GMP_Account/Pod_Date/orderDateDescription</property>
                                 </data>
                             </property>
                         </extended-item>
-                        <extended-item extensionName="AggregationCell" id="2003">
+                        <extended-item extensionName="AggregationCell" id="2680">
                             <property name="aggregationOnColumn">Date/orderDateDescription</property>
-                            <property name="backgroundColor">#7F7F7F</property>
+                            <property name="fontFamily">sans-serif</property>
+                            <property name="backgroundColor">#6495ED</property>
+                            <property name="textAlign">center</property>
                             <property name="content">
-                                <data id="2004">
-                                    <property name="fontWeight">normal</property>
-                                    <property name="resultSetColumn">GrossSales_Date/orderDateDescription</property>
+                                <data id="2681">
+                                    <structure name="numberFormat">
+                                        <property name="category">Fixed</property>
+                                        <property name="pattern">#,##0</property>
+                                    </structure>
+                                    <property name="resultSetColumn">GMP_Date/orderDateDescription</property>
                                 </data>
                             </property>
                         </extended-item>
                     </property>
                     <property name="header">
-                        <extended-item extensionName="CrosstabCell" id="1501">
+                        <extended-item extensionName="CrosstabCell" id="2574">
                             <property name="content">
-                                <label id="1503">
-                                    <property name="fontWeight">bold</property>
-                                    <property name="textAlign">center</property>
-                                    <text-property name="text">GS</text-property>
+                                <label id="2575">
+                                    <text-property name="text">GMP$</text-property>
                                 </label>
                             </property>
+                            <property name="fontFamily">sans-serif</property>
+                            <property name="fontSize">small</property>
+                            <property name="fontWeight">bold</property>
+                            <property name="backgroundColor">#ECE9D8</property>
+                            <property name="textAlign">center</property>
                         </extended-item>
                     </property>
                 </extended-item>
-                <extended-item extensionName="MeasureView" id="1504">
-                    <property name="measure">GrossMerchandizeSales</property>
+                <extended-item extensionName="MeasureView" id="2576">
+                    <property name="measure">GSP</property>
                     <property name="detail">
-                        <extended-item extensionName="CrosstabCell" id="1505">
+                        <extended-item extensionName="AggregationCell" id="2577">
+                            <property name="aggregationOnRow">Account/Account</property>
+                            <property name="aggregationOnColumn">Date/orderDateDescription</property>
+                            <property name="fontFamily">sans-serif</property>
+                            <property name="backgroundColor">#FFEBCD</property>
+                            <property name="textAlign">center</property>
                             <property name="content">
-                                <data name="GrossMerchandizeSales" id="1507">
-                                    <property name="resultSetColumn">GrossMerchandizeSales</property>
+                                <data id="2578">
+                                    <structure name="numberFormat">
+                                        <property name="category">Fixed</property>
+                                        <property name="pattern">#,##0</property>
+                                    </structure>
+                                    <property name="resultSetColumn">GSP_Account/Account_Date/orderDateDescription</property>
                                 </data>
                             </property>
                         </extended-item>
                     </property>
                     <property name="aggregations">
-                        <extended-item extensionName="AggregationCell" id="1973">
-                            <property name="aggregationOnRow">Account/AccountType</property>
+                        <extended-item extensionName="AggregationCell" id="2646">
+                            <property name="aggregationOnRow">Account/Brand</property>
                             <property name="aggregationOnColumn">Date/orderDateDescription</property>
-                            <property name="backgroundColor">#BFBFBF</property>
+                            <property name="fontFamily">sans-serif</property>
+                            <property name="backgroundAttachment">scroll</property>
+                            <property name="backgroundColor">#87CEFA</property>
+                            <property name="textAlign">center</property>
                             <property name="content">
-                                <data id="1974">
-                                    <property name="fontWeight">normal</property>
-                                    <property name="resultSetColumn">GrossMerchandizeSales_Account/AccountType_Date/orderDateDescription</property>
+                                <data id="2647">
+                                    <structure name="numberFormat">
+                                        <property name="category">Fixed</property>
+                                        <property name="pattern">#,##0</property>
+                                    </structure>
+                                    <property name="resultSetColumn">GSP_Account/Brand_Date/orderDateDescription</property>
                                 </data>
                             </property>
                         </extended-item>
-                        <extended-item extensionName="AggregationCell" id="1989">
+                        <extended-item extensionName="AggregationCell" id="2664">
                             <property name="aggregationOnRow">Account/Pod</property>
                             <property name="aggregationOnColumn">Date/orderDateDescription</property>
-                            <property name="backgroundColor">#E5E5E5</property>
+                            <property name="fontFamily">sans-serif</property>
+                            <property name="backgroundColor">#B0C4DE</property>
+                            <property name="textAlign">center</property>
                             <property name="content">
-                                <data id="1990">
-                                    <property name="fontWeight">normal</property>
-                                    <property name="resultSetColumn">GrossMerchandizeSales_Account/Pod_Date/orderDateDescription</property>
+                                <data id="2665">
+                                    <structure name="numberFormat">
+                                        <property name="category">Fixed</property>
+                                        <property name="pattern">#,##0</property>
+                                    </structure>
+                                    <property name="resultSetColumn">GSP_Account/Pod_Date/orderDateDescription</property>
                                 </data>
                             </property>
                         </extended-item>
-                        <extended-item extensionName="AggregationCell" id="2005">
+                        <extended-item extensionName="AggregationCell" id="2682">
                             <property name="aggregationOnColumn">Date/orderDateDescription</property>
-                            <property name="backgroundColor">#7F7F7F</property>
+                            <property name="fontFamily">sans-serif</property>
+                            <property name="backgroundColor">#6495ED</property>
+                            <property name="textAlign">center</property>
                             <property name="content">
-                                <data id="2006">
-                                    <property name="fontWeight">normal</property>
-                                    <property name="resultSetColumn">GrossMerchandizeSales_Date/orderDateDescription</property>
+                                <data id="2683">
+                                    <structure name="numberFormat">
+                                        <property name="category">Fixed</property>
+                                        <property name="pattern">#,##0</property>
+                                    </structure>
+                                    <property name="resultSetColumn">GSP_Date/orderDateDescription</property>
                                 </data>
                             </property>
                         </extended-item>
                     </property>
                     <property name="header">
-                        <extended-item extensionName="CrosstabCell" id="1506">
+                        <extended-item extensionName="CrosstabCell" id="2579">
                             <property name="content">
-                                <label id="1508">
-                                    <property name="fontWeight">bold</property>
-                                    <property name="textAlign">center</property>
-                                    <text-property name="text">GMS</text-property>
+                                <label id="2580">
+                                    <text-property name="text">GSP$</text-property>
                                 </label>
                             </property>
+                            <property name="fontFamily">sans-serif</property>
+                            <property name="fontSize">small</property>
+                            <property name="fontWeight">bold</property>
+                            <property name="backgroundColor">#ECE9D8</property>
+                            <property name="textAlign">center</property>
                         </extended-item>
                     </property>
                 </extended-item>
-                <extended-item extensionName="MeasureView" id="1509">
-                    <property name="measure">GrossMerchandizeProfit</property>
+                <extended-item extensionName="MeasureView" id="2581">
+                    <property name="measure">GP</property>
                     <property name="detail">
-                        <extended-item extensionName="CrosstabCell" id="1510">
+                        <extended-item extensionName="AggregationCell" id="2582">
+                            <property name="aggregationOnRow">Account/Account</property>
+                            <property name="aggregationOnColumn">Date/orderDateDescription</property>
+                            <property name="fontFamily">sans-serif</property>
+                            <property name="backgroundColor">#FFEBCD</property>
+                            <property name="textAlign">center</property>
                             <property name="content">
-                                <data name="GrossMerchandizeProfit" id="1512">
-                                    <property name="resultSetColumn">GrossMerchandizeProfit</property>
+                                <data id="2583">
+                                    <structure name="numberFormat">
+                                        <property name="category">Fixed</property>
+                                        <property name="pattern">#,##0</property>
+                                    </structure>
+                                    <property name="resultSetColumn">GP_Account/Account_Date/orderDateDescription</property>
                                 </data>
                             </property>
                         </extended-item>
                     </property>
                     <property name="aggregations">
-                        <extended-item extensionName="AggregationCell" id="1975">
-                            <property name="aggregationOnRow">Account/AccountType</property>
+                        <extended-item extensionName="AggregationCell" id="2648">
+                            <property name="aggregationOnRow">Account/Brand</property>
                             <property name="aggregationOnColumn">Date/orderDateDescription</property>
-                            <property name="backgroundColor">#BFBFBF</property>
+                            <property name="fontFamily">sans-serif</property>
+                            <property name="backgroundAttachment">scroll</property>
+                            <property name="backgroundColor">#87CEFA</property>
+                            <property name="textAlign">center</property>
                             <property name="content">
-                                <data id="1976">
-                                    <property name="fontWeight">normal</property>
-                                    <property name="resultSetColumn">GrossMerchandizeProfit_Account/AccountType_Date/orderDateDescription</property>
+                                <data id="2649">
+                                    <structure name="numberFormat">
+                                        <property name="category">Fixed</property>
+                                        <property name="pattern">#,##0</property>
+                                    </structure>
+                                    <property name="resultSetColumn">GP_Account/Brand_Date/orderDateDescription</property>
                                 </data>
                             </property>
                         </extended-item>
-                        <extended-item extensionName="AggregationCell" id="1991">
+                        <extended-item extensionName="AggregationCell" id="2666">
                             <property name="aggregationOnRow">Account/Pod</property>
                             <property name="aggregationOnColumn">Date/orderDateDescription</property>
-                            <property name="backgroundColor">#E5E5E5</property>
+                            <property name="fontFamily">sans-serif</property>
+                            <property name="backgroundColor">#B0C4DE</property>
+                            <property name="textAlign">center</property>
                             <property name="content">
-                                <data id="1992">
-                                    <property name="fontWeight">normal</property>
-                                    <property name="resultSetColumn">GrossMerchandizeProfit_Account/Pod_Date/orderDateDescription</property>
+                                <data id="2667">
+                                    <structure name="numberFormat">
+                                        <property name="category">Fixed</property>
+                                        <property name="pattern">#,##0</property>
+                                    </structure>
+                                    <property name="resultSetColumn">GP_Account/Pod_Date/orderDateDescription</property>
                                 </data>
                             </property>
                         </extended-item>
-                        <extended-item extensionName="AggregationCell" id="2007">
+                        <extended-item extensionName="AggregationCell" id="2684">
                             <property name="aggregationOnColumn">Date/orderDateDescription</property>
-                            <property name="backgroundColor">#7F7F7F</property>
+                            <property name="fontFamily">sans-serif</property>
+                            <property name="backgroundColor">#6495ED</property>
+                            <property name="textAlign">center</property>
                             <property name="content">
-                                <data id="2008">
-                                    <property name="fontWeight">normal</property>
-                                    <property name="resultSetColumn">GrossMerchandizeProfit_Date/orderDateDescription</property>
+                                <data id="2685">
+                                    <structure name="numberFormat">
+                                        <property name="category">Fixed</property>
+                                        <property name="pattern">#,##0</property>
+                                    </structure>
+                                    <property name="resultSetColumn">GP_Date/orderDateDescription</property>
                                 </data>
                             </property>
                         </extended-item>
                     </property>
                     <property name="header">
-                        <extended-item extensionName="CrosstabCell" id="1511">
+                        <extended-item extensionName="CrosstabCell" id="2584">
                             <property name="content">
-                                <label id="1513">
-                                    <property name="fontWeight">bold</property>
-                                    <property name="textAlign">center</property>
-                                    <text-property name="text">GMP</text-property>
+                                <label id="2585">
+                                    <text-property name="text">GP$</text-property>
                                 </label>
                             </property>
+                            <property name="fontFamily">sans-serif</property>
+                            <property name="fontSize">small</property>
+                            <property name="fontWeight">bold</property>
+                            <property name="backgroundColor">#ECE9D8</property>
+                            <property name="textAlign">center</property>
                         </extended-item>
                     </property>
                 </extended-item>
-                <extended-item extensionName="MeasureView" id="1514">
-                    <property name="measure">GrossShippingProfit</property>
+                <extended-item extensionName="ComputedMeasureView" name="GMP%" id="2617">
                     <property name="detail">
-                        <extended-item extensionName="CrosstabCell" id="1515">
+                        <extended-item extensionName="AggregationCell" id="2618">
+                            <property name="aggregationOnRow">Account/Account</property>
+                            <property name="aggregationOnColumn">Date/orderDateDescription</property>
+                            <property name="fontFamily">sans-serif</property>
+                            <property name="backgroundColor">#FFEBCD</property>
+                            <property name="textAlign">center</property>
                             <property name="content">
-                                <data name="GrossShippingProfit" id="1517">
-                                    <property name="resultSetColumn">GrossShippingProfit</property>
+                                <data name="GMP%1" id="2621">
+                                    <structure name="numberFormat">
+                                        <property name="category">Percent</property>
+                                        <property name="pattern">#,##0%</property>
+                                    </structure>
+                                    <property name="resultSetColumn">GMP%</property>
                                 </data>
                             </property>
                         </extended-item>
                     </property>
                     <property name="aggregations">
-                        <extended-item extensionName="AggregationCell" id="1977">
-                            <property name="aggregationOnRow">Account/AccountType</property>
+                        <extended-item extensionName="AggregationCell" id="2650">
+                            <property name="aggregationOnRow">Account/Brand</property>
                             <property name="aggregationOnColumn">Date/orderDateDescription</property>
-                            <property name="backgroundColor">#BFBFBF</property>
+                            <property name="fontFamily">sans-serif</property>
+                            <property name="backgroundAttachment">scroll</property>
+                            <property name="backgroundColor">#87CEFA</property>
+                            <property name="textAlign">center</property>
                             <property name="content">
-                                <data id="1978">
-                                    <property name="fontWeight">normal</property>
-                                    <property name="resultSetColumn">GrossShippingProfit_Account/AccountType_Date/orderDateDescription</property>
+                                <data id="2695">
+                                    <structure name="numberFormat">
+                                        <property name="category">Percent</property>
+                                        <property name="pattern">#,##0%</property>
+                                    </structure>
+                                    <property name="resultSetColumn">Brand_GMP%</property>
                                 </data>
                             </property>
                         </extended-item>
-                        <extended-item extensionName="AggregationCell" id="1993">
+                        <extended-item extensionName="AggregationCell" id="2668">
                             <property name="aggregationOnRow">Account/Pod</property>
                             <property name="aggregationOnColumn">Date/orderDateDescription</property>
-                            <property name="backgroundColor">#E5E5E5</property>
+                            <property name="fontFamily">sans-serif</property>
+                            <property name="backgroundColor">#B0C4DE</property>
+                            <property name="textAlign">center</property>
                             <property name="content">
-                                <data id="1994">
-                                    <property name="fontWeight">normal</property>
-                                    <property name="resultSetColumn">GrossShippingProfit_Account/Pod_Date/orderDateDescription</property>
+                                <data id="2693">
+                                    <structure name="numberFormat">
+                                        <property name="category">Percent</property>
+                                        <property name="pattern">#,##0%</property>
+                                    </structure>
+                                    <property name="resultSetColumn">Pod_GMP%</property>
                                 </data>
                             </property>
                         </extended-item>
-                        <extended-item extensionName="AggregationCell" id="2009">
+                        <extended-item extensionName="AggregationCell" id="2686">
                             <property name="aggregationOnColumn">Date/orderDateDescription</property>
-                            <property name="backgroundColor">#7F7F7F</property>

[... 1908 lines stripped ...]