You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2013/09/03 05:29:46 UTC
svn commit: r1519544 - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/ledger/
applications/order/entitydef/
applications/order/script/org/ofbiz/order/reports/
applications/order/servicedef/ specialpurpose/birt/webapp/ordermgr/repo...
Author: jleroux
Date: Tue Sep 3 03:29:45 2013
New Revision: 1519544
URL: http://svn.apache.org/r1519544
Log:
A patch from Parimal Gain for "Order Report Issue" https://issues.apache.org/jira/browse/OFBIZ-5297
Reports under Order component has following issues -
1. Following reports are not showing any records due some issue
a. Last three month sales report.
b. Sales report.
c. Sales Order discount code report.
d. Product demand report.
2. Inconsistency in opening the pdf report - some reports are opening in new tab window but some are in the same window.
Following are the checkpoint -
1) Order should be Approved
2) All Dimension table(CurrencyDimension, DateDimension, ProductDimension)should have record.
3) After approval of order, order record should be created in 'SalesOrderItemFact' table. These is the OLAP table used to display data in reports.
Description -
1) If dimension table doesn't have records then following services should execute from service engine -
a) loadAllProductsInProductDimension
b) loadCurrencyDimension
c) loadDateDimension
2) Calling service to create record in 'SalesOrderItemFact' is updated into patch. On commit operation of service 'changeOrderItemStatus' if order item is approved then 'loadSalesOrderFact' service called through SECAS.
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
ofbiz/trunk/applications/order/entitydef/entitymodel_olap.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/reports/ProductDemandReportEvent.xml
ofbiz/trunk/applications/order/servicedef/secas.xml
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/ProductDemandReport.rptdesign
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReport.rptdesign
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReportMonth.rptdesign
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReportWeek.rptdesign
ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml?rev=1519544&r1=1519543&r2=1519544&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml Tue Sep 3 03:29:45 2013
@@ -2905,7 +2905,7 @@ under the License.
<set field="inventoryValuation.totalInventoryCost" from-field="totalInventoryCost" type="BigDecimal"/>
<set field="inventoryValuation.productAverageCost" from-field="productAverageCost" type="BigDecimal"/>
<set field="inventoryValuation.currencyUomId" from-field="currencyUomId"/>
- <set field="inventoryValuationList[]" from-field="inventoryValuation"/>
+ <set field="inventoryValuationList" from-field="inventoryValuation" type="List"/>
<clear-field field="inventoryValuation"/>
</iterate>
<field-to-result field="inventoryValuationList"/>
Modified: ofbiz/trunk/applications/order/entitydef/entitymodel_olap.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/entitydef/entitymodel_olap.xml?rev=1519544&r1=1519543&r2=1519544&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/entitydef/entitymodel_olap.xml (original)
+++ ofbiz/trunk/applications/order/entitydef/entitymodel_olap.xml Tue Sep 3 03:29:45 2013
@@ -95,7 +95,11 @@ 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">
+ <description>Product promotion Code.</description>
+ </field>
+
<prim-key field="orderId"/>
<prim-key field="orderItemSeqId"/>
@@ -121,7 +125,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>
@@ -145,11 +149,14 @@ 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="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=1519544&r1=1519543&r2=1519544&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 Tue Sep 3 03:29:45 2013
@@ -23,10 +23,10 @@
<simple-method method-name="getOrder" short-description="Get Orders" login-required="false">
<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"/>
+ <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"/>
Modified: ofbiz/trunk/applications/order/servicedef/secas.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/secas.xml?rev=1519544&r1=1519543&r2=1519544&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/servicedef/secas.xml (original)
+++ ofbiz/trunk/applications/order/servicedef/secas.xml Tue Sep 3 03:29:45 2013
@@ -438,7 +438,7 @@ under the License.
<!-- fact entities -->
<!-- Load data into the SalesOrderItemFact olap entity when a sales order is set to ready -->
- <eca service="setOrderStatus" event="commit">
+ <eca service="changeOrderItemStatus" event="commit">
<condition field-name="statusId" operator="equals" value="ITEM_APPROVED"/>
<condition-field field-name="statusId" operator="not-equals" to-field-name="oldStatusId"/>
<action service="loadSalesOrderFact" mode="sync" run-as-user="system"/>
Modified: ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign?rev=1519544&r1=1519543&r2=1519544&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign Tue Sep 3 03:29:45 2013
@@ -18,7 +18,7 @@ specific language governing permissions
under the License.
-->
<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 <2.5.1.v20090917-1447></property>
+ <property name="createdBy">Eclipse BIRT Designer Version 3.7.2.v20120213 Build <3.7.2.v20120214-1408></property>
<property name="units">in</property>
<method name="initialize"><![CDATA[importPackage(Packages.org.ofbiz.base.util)
importPackage(Packages.javolution.util)
@@ -215,7 +215,7 @@ module = "Last3MonthsSalesReport.rptdesi
<method name="open"><![CDATA[salesOrderItemStarSchemas = null;
userLogin = null;
try {
- userLogin = delegator.findOne("UserLogin",UtilMisc.toMap("userLoginId","admin"), false);
+ userLogin = delegator.findByPrimaryKey("UserLogin",UtilMisc.toMap("userLoginId","admin"));
months = FastList.newInstance();
thisMonth = 0;
thisMonth = UtilDateTime.getMonth(UtilDateTime.nowTimestamp(), TimeZone.getDefault(), Locale.getDefault())+1;
@@ -227,40 +227,40 @@ try {
switch(month)
{
case 1:
- months.add(1);
+ months.add(UtilMisc.toLongObject(1));
break;
case 2:
- months.add(2);
+ months.add(UtilMisc.toLongObject(2));
break;
case 3:
- months.add(3);
+ months.add(UtilMisc.toLongObject(3));
break;
case 4:
- months.add(4);
+ months.add(UtilMisc.toLongObject(4));
break;
case 5:
- months.add(5);
+ months.add(UtilMisc.toLongObject(5));
break;
case 6:
- months.add(6);
+ months.add(UtilMisc.toLongObject(6));
break;
case 7:
- months.add(7);
+ months.add(UtilMisc.toLongObject(7));
break;
case 8:
- months.add(8);
+ months.add(UtilMisc.toLongObject(8));
break;
case 9:
- months.add(9);
+ months.add(UtilMisc.toLongObject(9));
break;
case 10:
- months.add(10);
+ months.add(UtilMisc.toLongObject(10));
break;
case 11:
- months.add(11);
+ months.add(UtilMisc.toLongObject(11));
break;
case 12:
- months.add(12);
+ months.add(UtilMisc.toLongObject(12));
break;
}
month = month - 1
@@ -268,7 +268,7 @@ try {
Debug.log("================ Last 3 Months Sale Order Report====="+months);
cond = FastList.newInstance();
cond.add(EntityCondition.makeCondition("orderDateMonthOfYear", EntityOperator.IN, months));
- cond.add(EntityCondition.makeCondition("orderDateYearName", EntityOperator.EQUALS, thisYear));
+ cond.add(EntityCondition.makeCondition("orderDateYearName", EntityOperator.EQUALS, UtilMisc.toLongObject(thisYear)));
salesOrderItemStarSchemas = delegator.findList("SalesOrderItemStarSchema", EntityCondition.makeCondition(cond, EntityOperator.AND), null, null, null, false);
} catch(e) {
Debug.logError(e,"");
@@ -298,13 +298,15 @@ price = 0;
internalName = "None";
input = FastMap.newInstance();
try {
- product = delegator.findOne("Product",UtilMisc.toMap("productId", salesOrderItemStarSchema.getString("productProductId")), false);
- input.put("product", product);
- input.put("userLogin", userLogin);
- result = dispatcher.runSync("calculateProductPrice", input);
- price = result.get("price");
- if(product.get("internalName")){
- internalName = product.get("internalName");
+ product = delegator.findByPrimaryKey("Product",UtilMisc.toMap("productId", salesOrderItemStarSchema.getString("productProductId")));
+ if(product!=null){
+ input.put("product", product);
+ input.put("userLogin", userLogin);
+ result = dispatcher.runSync("calculateProductPrice", input);
+ price = result.get("price");
+ if(product.get("internalName")){
+ internalName = product.get("internalName");
+ }
}
} catch (e) {
Debug.logError(e, module);
@@ -312,8 +314,8 @@ try {
row["orderId"] = salesOrderItemStarSchema.getString("orderId");
row["orderItemSeqId"] = salesOrderItemStarSchema.getString("orderItemSeqId");
-row["orderStatus"] = salesOrderItemStarSchema.getString("orderStatus");
-row["saleChannel"] = salesOrderItemStarSchema.getString("saleChannel");
+row["orderStatus"] = salesOrderItemStarSchema.getString("statusId");
+row["saleChannel"] = salesOrderItemStarSchema.getString("salesChannelEnumId");
row["quantity"] = salesOrderItemStarSchema.getString("quantity");
row["extGrossAmount"] = salesOrderItemStarSchema.getString("extGrossAmount");
row["orderDateDayOfMonth"] = salesOrderItemStarSchema.getString("orderDateDayOfMonth");
@@ -438,6 +440,7 @@ return true;]]></method>
</text>
<text id="367"/>
<extended-item extensionName="Crosstab" extensionVersion="2.5.0" id="282">
+ <property name="cube">DataCube</property>
<property name="measures">
<extended-item extensionName="MeasureView" id="301">
<property name="measure">orderItemSeqId</property>
@@ -724,7 +727,6 @@ return true;]]></method>
</property>
</extended-item>
</property>
- <property name="cube">DataCube</property>
<list-property name="boundDataColumns">
<structure>
<property name="name">productId</property>
@@ -831,4 +833,4 @@ return true;]]></method>
</list-property>
</extended-item>
</body>
-</report>
+</report>
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/ProductDemandReport.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/ProductDemandReport.rptdesign?rev=1519544&r1=1519543&r2=1519544&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/ProductDemandReport.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/ProductDemandReport.rptdesign Tue Sep 3 03:29:45 2013
@@ -18,42 +18,43 @@ specific language governing permissions
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 <2.2.2.v20080226-1155></property>
- <property name="units">in</property>
<property name="comments">Copyright (c) 2007 <<Your Company Name here>></property>
+ <property name="createdBy">Eclipse BIRT Designer Version 3.7.1.v20110905 Build <3.7.1.v20110913-1734></property>
<html-property name="description">Creates a blank report with no predefined content.</html-property>
+ <property name="units">in</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="productStoreId" id="680">
<property name="valueType">static</property>
+ <property name="isRequired">false</property>
<property name="dataType">string</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="Week" id="597">
<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="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="Year" id="679">
<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="isRequired">false</property>
<property name="controlType">text-box</property>
- <property name="distinct">true</property>
<structure name="format">
<property name="category">Unformatted</property>
</structure>
@@ -117,16 +118,6 @@ under the License.
</structure>
<structure>
<property name="position">11</property>
- <property name="name">GMP%</property>
- <property name="dataType">decimal</property>
- </structure>
- <structure>
- <property name="position">12</property>
- <property name="name">AGP</property>
- <property name="dataType">decimal</property>
- </structure>
- <structure>
- <property name="position">13</property>
<property name="name">Rank</property>
<property name="dataType">integer</property>
</structure>
@@ -134,55 +125,47 @@ under the License.
<list-property name="columnHints">
<structure>
<property name="columnName">Week</property>
- <property name="displayName">Week</property>
+ <text-property name="displayName">Week</text-property>
</structure>
<structure>
<property name="columnName">SKU</property>
- <property name="displayName">SKU</property>
+ <text-property name="displayName">SKU</text-property>
</structure>
<structure>
<property name="columnName">ProductName</property>
- <property name="displayName">ProductName</property>
+ <text-property name="displayName">ProductName</text-property>
</structure>
<structure>
<property name="columnName">QuantitySold</property>
- <property name="displayName">QuantitySold</property>
+ <text-property name="displayName">QuantitySold</text-property>
</structure>
<structure>
<property name="columnName">GS</property>
- <property name="displayName">GS</property>
+ <text-property name="displayName">GS</text-property>
</structure>
<structure>
<property name="columnName">GMS</property>
- <property name="displayName">GMS</property>
+ <text-property name="displayName">GMS</text-property>
</structure>
<structure>
<property name="columnName">GMP</property>
- <property name="displayName">GMP</property>
+ <text-property name="displayName">GMP</text-property>
</structure>
<structure>
<property name="columnName">GSP</property>
- <property name="displayName">GSP</property>
+ <text-property name="displayName">GSP</text-property>
</structure>
<structure>
<property name="columnName">GP</property>
- <property name="displayName">GP</property>
- </structure>
- <structure>
- <property name="columnName">GMP%</property>
- <property name="displayName">GMP%</property>
- </structure>
- <structure>
- <property name="columnName">AGP</property>
- <property name="displayName">AGP</property>
- </structure>
+ <text-property name="displayName">GP</text-property>
+ </structure>
<structure>
<property name="columnName">Rank</property>
- <property name="displayName">Rank</property>
+ <text-property name="displayName">Rank</text-property>
</structure>
<structure>
<property name="columnName">CategoryName</property>
- <property name="displayName">CategoryName</property>
+ <text-property name="displayName">CategoryName</text-property>
</structure>
</list-property>
<structure name="cachedMetaData">
@@ -239,16 +222,6 @@ under the License.
</structure>
<structure>
<property name="position">11</property>
- <property name="name">GMP%</property>
- <property name="dataType">decimal</property>
- </structure>
- <structure>
- <property name="position">12</property>
- <property name="name">AGP</property>
- <property name="dataType">decimal</property>
- </structure>
- <structure>
- <property name="position">13</property>
<property name="name">Rank</property>
<property name="dataType">integer</property>
</structure>
@@ -302,13 +275,14 @@ if (starschemas)
WeekOfYear = starschema.getString("orderDateWeekOfYear");
SKU = starschema.getString("productProductId");
ProductName = starschema.getString("productInternalName");
- CategoryName = starschema.getString("categoryName");
+ //CategoryName = starschema.getString("categoryName");
+ CategoryName = starschema.getString("productCategoryId");
QuantitySold = starschema.getString("quantity");
- GS = starschema.getString("GrossSales");
- GMS = starschema.getString("GrossMerchandizeSales");
- GMP = starschema.getString("GrossMerchandizeProfit");
- GSP = starschema.getString("GrossShippingProfit");
- GP = starschema.getString("GrossProfit");
+ GS = starschema.getString("GS");
+ GMS = starschema.getString("GMS");
+ GMP = starschema.getString("GMP");
+ GSP = starschema.getString("GSP");
+ GP = starschema.getString("GP");
salesChannelEnumId = starschema.getString("salesChannelEnumId");
@@ -331,7 +305,6 @@ return true;]]></method>
</data-sets>
<cubes>
<tabular-cube name="PDR Data Cube" id="599">
- <property name="defaultMeasureGroup">PDR Summary Field</property>
<property name="dimensions">
<tabular-dimension name="Weeks" id="600">
<property name="defaultHierarchy">NewTabularHierarchy</property>
@@ -387,10 +360,6 @@ return true;]]></method>
<expression name="measureExpression">dataSetRow["GP"]</expression>
<property name="dataType">decimal</property>
</tabular-measure>
- <tabular-measure name="GMP%" id="615">
- <expression name="measureExpression">dataSetRow["GMP"]/dataSetRow["GMS"]</expression>
- <property name="dataType">decimal</property>
- </tabular-measure>
<tabular-measure name="AGP" id="616">
<expression name="measureExpression">dataSetRow["GP"]/dataSetRow["QuantitySold"]</expression>
<property name="dataType">decimal</property>
@@ -459,20 +428,23 @@ return true;]]></method>
<property name="textAlign">center</property>
<text-property name="text">Product Demand Report</text-property>
</label>
- <extended-item extensionName="Crosstab" id="596">
+ <extended-item extensionName="Crosstab" extensionVersion="2.5.0" id="596">
+ <property name="cube">PDR Data Cube</property>
<property name="measures">
<extended-item extensionName="MeasureView" id="628">
<property name="measure">QuantitySold</property>
<property name="detail">
- <extended-item extensionName="CrosstabCell" id="629">
+ <extended-item extensionName="AggregationCell" id="682">
+ <property name="aggregationOnRow">Products/CategoryName</property>
+ <property name="aggregationOnColumn">Weeks/Week</property>
+ <property name="borderLeftStyle">solid</property>
+ <property name="borderLeftWidth">1px</property>
+ <property name="borderLeftColor">#000000</property>
<property name="content">
<data name="QuantitySold" id="631">
<property name="resultSetColumn">QuantitySold</property>
</data>
</property>
- <property name="borderLeftStyle">solid</property>
- <property name="borderLeftWidth">1px</property>
- <property name="borderLeftColor">#000000</property>
</extended-item>
</property>
<property name="aggregations">
@@ -504,12 +476,25 @@ return true;]]></method>
<property name="borderLeftWidth">1px</property>
<property name="borderLeftColor">#000000</property>
</extended-item>
+ <extended-item extensionName="CrosstabCell" id="683">
+ <property name="content">
+ <label id="684">
+ <property name="textAlign">center</property>
+ <text-property name="text">QuantitySold</text-property>
+ </label>
+ </property>
+ <property name="borderLeftStyle">solid</property>
+ <property name="borderLeftWidth">1px</property>
+ <property name="borderLeftColor">#000000</property>
+ </extended-item>
</property>
</extended-item>
<extended-item extensionName="MeasureView" id="633">
<property name="measure">GS</property>
<property name="detail">
- <extended-item extensionName="CrosstabCell" id="634">
+ <extended-item extensionName="AggregationCell" id="685">
+ <property name="aggregationOnRow">Products/CategoryName</property>
+ <property name="aggregationOnColumn">Weeks/Week</property>
<property name="content">
<data name="GS" id="636">
<property name="resultSetColumn">GS</property>
@@ -531,7 +516,9 @@ return true;]]></method>
<extended-item extensionName="MeasureView" id="638">
<property name="measure">GMP</property>
<property name="detail">
- <extended-item extensionName="CrosstabCell" id="639">
+ <extended-item extensionName="AggregationCell" id="686">
+ <property name="aggregationOnRow">Products/CategoryName</property>
+ <property name="aggregationOnColumn">Weeks/Week</property>
<property name="content">
<data name="GMP" id="641">
<property name="resultSetColumn">GMP</property>
@@ -562,12 +549,22 @@ return true;]]></method>
</label>
</property>
</extended-item>
+ <extended-item extensionName="CrosstabCell" id="687">
+ <property name="content">
+ <label id="688">
+ <property name="textAlign">center</property>
+ <text-property name="text">GMP</text-property>
+ </label>
+ </property>
+ </extended-item>
</property>
</extended-item>
<extended-item extensionName="MeasureView" id="643">
<property name="measure">GP</property>
<property name="detail">
- <extended-item extensionName="CrosstabCell" id="644">
+ <extended-item extensionName="AggregationCell" id="689">
+ <property name="aggregationOnRow">Products/CategoryName</property>
+ <property name="aggregationOnColumn">Weeks/Week</property>
<property name="content">
<data name="GP" id="646">
<structure name="numberFormat">
@@ -601,29 +598,11 @@ return true;]]></method>
</label>
</property>
</extended-item>
- </property>
- </extended-item>
- <extended-item extensionName="MeasureView" id="648">
- <property name="measure">GMP%</property>
- <property name="detail">
- <extended-item extensionName="CrosstabCell" id="649">
- <property name="content">
- <data name="GMP%" id="651">
- <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="header">
- <extended-item extensionName="CrosstabCell" id="650">
+ <extended-item extensionName="CrosstabCell" id="690">
<property name="content">
- <label id="652">
+ <label id="691">
<property name="textAlign">center</property>
- <text-property name="text">GMP%</text-property>
+ <text-property name="text">GP</text-property>
</label>
</property>
</extended-item>
@@ -632,7 +611,12 @@ return true;]]></method>
<extended-item extensionName="MeasureView" id="653">
<property name="measure">AGP</property>
<property name="detail">
- <extended-item extensionName="CrosstabCell" id="654">
+ <extended-item extensionName="AggregationCell" id="693">
+ <property name="aggregationOnRow">Products/CategoryName</property>
+ <property name="aggregationOnColumn">Weeks/Week</property>
+ <property name="borderRightStyle">solid</property>
+ <property name="borderRightWidth">1px</property>
+ <property name="borderRightColor">#000000</property>
<property name="content">
<data name="AGP" id="656">
<structure name="numberFormat">
@@ -642,9 +626,6 @@ return true;]]></method>
<property name="resultSetColumn">AGP</property>
</data>
</property>
- <property name="borderRightStyle">solid</property>
- <property name="borderRightWidth">1px</property>
- <property name="borderRightColor">#000000</property>
</extended-item>
</property>
<property name="aggregations">
@@ -676,6 +657,17 @@ return true;]]></method>
<property name="borderRightWidth">1px</property>
<property name="borderRightColor">#000000</property>
</extended-item>
+ <extended-item extensionName="CrosstabCell" id="694">
+ <property name="content">
+ <label id="695">
+ <property name="textAlign">center</property>
+ <text-property name="text">AGP</text-property>
+ </label>
+ </property>
+ <property name="borderRightStyle">solid</property>
+ <property name="borderRightWidth">1px</property>
+ <property name="borderRightColor">#000000</property>
+ </extended-item>
</property>
</extended-item>
</property>
@@ -779,7 +771,9 @@ return true;]]></method>
</property>
</extended-item>
</property>
- <property name="cube">PDR Data Cube</property>
+ <property name="header">
+ <extended-item extensionName="CrosstabCell" id="681"/>
+ </property>
<list-property name="boundDataColumns">
<structure>
<property name="name">Week</property>
@@ -812,11 +806,6 @@ return true;]]></method>
<property name="dataType">decimal</property>
</structure>
<structure>
- <property name="name">GMP%</property>
- <expression name="expression">measure["GMP%"]</expression>
- <property name="dataType">decimal</property>
- </structure>
- <structure>
<property name="name">AGP</property>
<expression name="expression">measure["AGP"]</expression>
<property name="dataType">decimal</property>
@@ -870,4 +859,4 @@ return true;]]></method>
</list-property>
</extended-item>
</body>
-</report>
+</report>
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReport.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReport.rptdesign?rev=1519544&r1=1519543&r2=1519544&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReport.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReport.rptdesign Tue Sep 3 03:29:45 2013
@@ -18,9 +18,8 @@ specific language governing permissions
under the License.
-->
<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 <2.5.1.v20090917-1447></property>
- <property name="units">in</property>
<property name="comments">Copyright (c) 2007 <<Your Company Name here>></property>
+ <property name="createdBy">Eclipse BIRT Designer Version 3.7.1.v20110905 Build <3.7.1.v20110913-1734></property>
<html-property name="description">Creates a blank report with no predefined content.</html-property>
<list-property name="userProperties">
<structure>
@@ -120,6 +119,7 @@ under the License.
<property name="SaleOrder_DataCube.Account.height">200</property>
<property name="SaleOrder_DataCube.DateGroup.NewTabularHierarchy3.width">150</property>
<property name="SaleOrder_DataCube.DateGroup.NewTabularHierarchy3.height">200</property>
+ <property name="units">in</property>
<text-property name="displayName">Blank Report</text-property>
<property name="iconFile">/templates/blank_report.gif</property>
<property name="layoutPreference">auto layout</property>
@@ -479,7 +479,7 @@ if (starschemas)
{
totalRows = starschemas.size();
}]]></method>
- <method name="fetch"><![CDATA[if (currentRow >= totalRows - 1) return false;
+ <method name="fetch"><![CDATA[if (currentRow > totalRows - 1) return false;
{
starschema = starschemas.get(currentRow);
orderDateDescription = starschema.getString("orderDateDescription");
@@ -704,6 +704,7 @@ return true;]]></method>
<text-property name="text">Sales Report Daily</text-property>
</label>
<extended-item extensionName="Crosstab" extensionVersion="2.5.0" id="2554">
+ <property name="cube">BIC_DataCube</property>
<property name="measures">
<extended-item extensionName="MeasureView" id="2748">
<property name="measure">countOrder</property>
@@ -1651,7 +1652,6 @@ return true;]]></method>
</property>
<property name="fontFamily">sans-serif</property>
<property name="backgroundColor">#FFFFFF</property>
- <property name="cube">BIC_DataCube</property>
<list-property name="boundDataColumns">
<structure>
<property name="name">quantity</property>
@@ -2004,7 +2004,7 @@ return true;]]></method>
<property name="name">GMP%</property>
<expression name="expression" type="javascript">if ((data["GMP_Account/Account_Date/orderDateDescription"] != null) && (data["GMS_Account/Account_Date/orderDateDescription"] != null))
{
- data["GMP_Account/Account_Date/orderDateDescription"]/data["GMS_Account/Account_Date/orderDateDescription"]
+ data["GMP_Account/Account_Date/orderDateDescription"]/data["GMS_Account/Account_Date/orderDateDescription"]
}</expression>
<property name="dataType">decimal</property>
</structure>
@@ -2012,15 +2012,15 @@ return true;]]></method>
<property name="name">GP%</property>
<expression name="expression" type="javascript">if ((data["GP_Account/Account_Date/orderDateDescription"] != null) && (data["GS_Account/Account_Date/orderDateDescription"] != null))
{
- data["GP_Account/Account_Date/orderDateDescription"]/data["GS_Account/Account_Date/orderDateDescription"]
+ data["GP_Account/Account_Date/orderDateDescription"]/data["GS_Account/Account_Date/orderDateDescription"]
}</expression>
<property name="dataType">decimal</property>
</structure>
<structure>
<property name="name">AMP</property>
- <expression name="expression" type="javascript">if ((data["GMP_Account/Account_Date/orderDateDescription"] != null) && (data["quantity_Account/Account_Date/orderDateDescription"] != null))
+ <expression name="expression" type="javascript">if ((data["GMP_Account/Account_Date/orderDateDescription"] != null) && (data["quantity_Account/Account_Date/orderDateDescription"] != null))
{
- data["GMP_Account/Account_Date/orderDateDescription"]/data["quantity_Account/Account_Date/orderDateDescription"]
+ data["GMP_Account/Account_Date/orderDateDescription"]/data["quantity_Account/Account_Date/orderDateDescription"]
}</expression>
<property name="dataType">float</property>
</structure>
@@ -2028,7 +2028,7 @@ return true;]]></method>
<property name="name">AGP</property>
<expression name="expression" type="javascript">if ((data["GP_Account/Account_Date/orderDateDescription"] != null) && (data["quantity_Account/Account_Date/orderDateDescription"] != null))
{
- data["GP_Account/Account_Date/orderDateDescription"]/data["quantity_Account/Account_Date/orderDateDescription"]
+ data["GP_Account/Account_Date/orderDateDescription"]/data["quantity_Account/Account_Date/orderDateDescription"]
}</expression>
<property name="dataType">float</property>
</structure>
@@ -2166,7 +2166,7 @@ return true;]]></method>
<property name="name">Pod_GMP%</property>
<expression name="expression" type="javascript">if ((data["GMP_Account/Pod_Date/orderDateDescription"] != null) && (data["GMS_Account/Pod_Date/orderDateDescription"] != null))
{
- data["GMP_Account/Pod_Date/orderDateDescription"]/data["GMS_Account/Pod_Date/orderDateDescription"]
+ data["GMP_Account/Pod_Date/orderDateDescription"]/data["GMS_Account/Pod_Date/orderDateDescription"]
}</expression>
<property name="dataType">decimal</property>
</structure>
@@ -2174,7 +2174,7 @@ return true;]]></method>
<property name="name">Brand_GMP%</property>
<expression name="expression" type="javascript">if ((data["GMP_Account/Brand_Date/orderDateDescription"] != null) && (data["GMS_Account/Brand_Date/orderDateDescription"] !=null))
{
- data["GMP_Account/Brand_Date/orderDateDescription"]/data["GMS_Account/Brand_Date/orderDateDescription"]
+ data["GMP_Account/Brand_Date/orderDateDescription"]/data["GMS_Account/Brand_Date/orderDateDescription"]
}</expression>
<property name="dataType">decimal</property>
</structure>
@@ -2182,15 +2182,15 @@ return true;]]></method>
<property name="name">Pod_GP%</property>
<expression name="expression" type="javascript">if ((data["GP_Account/Pod_Date/orderDateDescription"] != null) && (data["GS_Account/Pod_Date/orderDateDescription"] != null))
{
- data["GP_Account/Pod_Date/orderDateDescription"]/data["GS_Account/Pod_Date/orderDateDescription"]
+ data["GP_Account/Pod_Date/orderDateDescription"]/data["GS_Account/Pod_Date/orderDateDescription"]
}</expression>
<property name="dataType">decimal</property>
</structure>
<structure>
<property name="name">Brand_GP%</property>
- <expression name="expression" type="javascript">if ((data["GP_Account/Brand_Date/orderDateDescription"] != null) && (data["GS_Account/Brand_Date/orderDateDescription"] != null))
+ <expression name="expression" type="javascript">if ((data["GP_Account/Brand_Date/orderDateDescription"] != null) && (data["GS_Account/Brand_Date/orderDateDescription"] != null))
{
- data["GP_Account/Brand_Date/orderDateDescription"]/data["GS_Account/Brand_Date/orderDateDescription"]
+ data["GP_Account/Brand_Date/orderDateDescription"]/data["GS_Account/Brand_Date/orderDateDescription"]
}</expression>
<property name="dataType">decimal</property>
</structure>
@@ -2198,7 +2198,7 @@ return true;]]></method>
<property name="name">Pod_AMP</property>
<expression name="expression" type="javascript">if ((data["GMP_Account/Pod_Date/orderDateDescription"] != null) && (data["quantity_Account/Pod_Date/orderDateDescription"] != null))
{
- data["GMP_Account/Pod_Date/orderDateDescription"]/data["quantity_Account/Pod_Date/orderDateDescription"]
+ data["GMP_Account/Pod_Date/orderDateDescription"]/data["quantity_Account/Pod_Date/orderDateDescription"]
}</expression>
<property name="dataType">float</property>
</structure>
@@ -2206,7 +2206,7 @@ return true;]]></method>
<property name="name">Brand_AMP</property>
<expression name="expression" type="javascript">if ((data["GMP_Account/Brand_Date/orderDateDescription"] != null) && (data["quantity_Account/Brand_Date/orderDateDescription"] != null))
{
- data["GMP_Account/Brand_Date/orderDateDescription"]/data["quantity_Account/Brand_Date/orderDateDescription"]
+ data["GMP_Account/Brand_Date/orderDateDescription"]/data["quantity_Account/Brand_Date/orderDateDescription"]
}</expression>
<property name="dataType">float</property>
</structure>
@@ -2214,7 +2214,7 @@ return true;]]></method>
<property name="name">Pod_AGP</property>
<expression name="expression" type="javascript">if ((data["GP_Account/Pod_Date/orderDateDescription"] != null) && (data["quantity_Account/Pod_Date/orderDateDescription"] != null))
{
- data["GP_Account/Pod_Date/orderDateDescription"]/data["quantity_Account/Pod_Date/orderDateDescription"]
+ data["GP_Account/Pod_Date/orderDateDescription"]/data["quantity_Account/Pod_Date/orderDateDescription"]
}</expression>
<property name="dataType">float</property>
</structure>
@@ -2222,7 +2222,7 @@ return true;]]></method>
<property name="name">Brand_AGP</property>
<expression name="expression" type="javascript">if ((data["GP_Account/Brand_Date/orderDateDescription"] != null) && (data["quantity_Account/Brand_Date/orderDateDescription"] != null))
{
- data["GP_Account/Brand_Date/orderDateDescription"]/data["quantity_Account/Brand_Date/orderDateDescription"]
+ data["GP_Account/Brand_Date/orderDateDescription"]/data["quantity_Account/Brand_Date/orderDateDescription"]
}</expression>
<property name="dataType">float</property>
</structure>
@@ -2230,7 +2230,7 @@ return true;]]></method>
<property name="name">Grand_GMP%</property>
<expression name="expression" type="javascript">if ((data["GMP_Date/orderDateDescription"] != null) && (data["GMS_Date/orderDateDescription"] != null))
{
- data["GMP_Date/orderDateDescription"]/data["GMS_Date/orderDateDescription"]
+ data["GMP_Date/orderDateDescription"]/data["GMS_Date/orderDateDescription"]
}</expression>
<property name="dataType">decimal</property>
</structure>
@@ -2238,15 +2238,15 @@ return true;]]></method>
<property name="name">Grand_GP%</property>
<expression name="expression" type="javascript">if ((data["GP_Date/orderDateDescription"] != null) && (data["GS_Date/orderDateDescription"] != null))
{
- data["GP_Date/orderDateDescription"]/data["GS_Date/orderDateDescription"]
+ data["GP_Date/orderDateDescription"]/data["GS_Date/orderDateDescription"]
}</expression>
<property name="dataType">decimal</property>
</structure>
<structure>
<property name="name">Grand_AMP</property>
- <expression name="expression" type="javascript">if ((data["GMP_Date/orderDateDescription"] != null) && (data["quantity_Date/orderDateDescription"] != null))
+ <expression name="expression" type="javascript">if ((data["GMP_Date/orderDateDescription"] != null) && (data["quantity_Date/orderDateDescription"] != null))
{
- data["GMP_Date/orderDateDescription"]/data["quantity_Date/orderDateDescription"]
+ data["GMP_Date/orderDateDescription"]/data["quantity_Date/orderDateDescription"]
}</expression>
<property name="dataType">float</property>
</structure>
@@ -2254,7 +2254,7 @@ return true;]]></method>
<property name="name">Grand_AGP</property>
<expression name="expression" type="javascript">if ((data["GP_Date/orderDateDescription"] != null) && (data["quantity_Date/orderDateDescription"] != null))
{
- data["GP_Date/orderDateDescription"]/data["quantity_Date/orderDateDescription"]
+ data["GP_Date/orderDateDescription"]/data["quantity_Date/orderDateDescription"]
}</expression>
<property name="dataType">float</property>
</structure>
Modified: ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReportMonth.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReportMonth.rptdesign?rev=1519544&r1=1519543&r2=1519544&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReportMonth.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReportMonth.rptdesign Tue Sep 3 03:29:45 2013
@@ -18,9 +18,8 @@ specific language governing permissions
under the License.
-->
<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 <2.5.1.v20090917-1447></property>
- <property name="units">in</property>
<property name="comments">Copyright (c) 2007 <<Your Company Name here>></property>
+ <property name="createdBy">Eclipse BIRT Designer Version 3.7.1.v20110905 Build <3.7.1.v20110913-1734></property>
<html-property name="description">Creates a blank report with no predefined content.</html-property>
<list-property name="userProperties">
<structure>
@@ -120,6 +119,7 @@ under the License.
<property name="SaleOrder_DataCube.Account.height">200</property>
<property name="SaleOrder_DataCube.DateGroup.NewTabularHierarchy3.width">150</property>
<property name="SaleOrder_DataCube.DateGroup.NewTabularHierarchy3.height">200</property>
+ <property name="units">in</property>
<text-property name="displayName">Blank Report</text-property>
<property name="iconFile">/templates/blank_report.gif</property>
<property name="layoutPreference">auto layout</property>
@@ -437,7 +437,7 @@ if (starschemas)
{
totalRows = starschemas.size();
}]]></method>
- <method name="fetch"><![CDATA[if (currentRow >= totalRows - 1) return false;
+ <method name="fetch"><![CDATA[if (currentRow > totalRows - 1) return false;
{
starschema = starschemas.get(currentRow);
orderDateDescription = starschema.getString("orderDateDescription");
@@ -647,6 +647,7 @@ return true;]]></method>
<text-property name="text">Sales Report Monthly</text-property>
</label>
<extended-item extensionName="Crosstab" extensionVersion="2.5.0" id="2586">
+ <property name="cube">BIC_DataCube</property>
<property name="measures">
<extended-item extensionName="MeasureView" id="2737">
<property name="measure">countOrder</property>
@@ -1555,7 +1556,6 @@ return true;]]></method>
<extended-item extensionName="CrosstabCell" id="2587"/>
</property>
<property name="backgroundColor">#FFFFFF</property>
- <property name="cube">BIC_DataCube</property>
<list-property name="boundDataColumns">
<structure>
<property name="name">quantity</property>
@@ -1969,7 +1969,7 @@ return true;]]></method>
<property name="name">GMP%</property>
<expression name="expression" type="javascript">if ((data["GMP_Account/Account_Date/orderDateMonthName"] != null) && (data["GMS_Account/Account_Date/orderDateMonthName"] != null))
{
- data["GMP_Account/Account_Date/orderDateMonthName"]/data["GMS_Account/Account_Date/orderDateMonthName"]
+ data["GMP_Account/Account_Date/orderDateMonthName"]/data["GMS_Account/Account_Date/orderDateMonthName"]
}</expression>
<property name="dataType">decimal</property>
</structure>
@@ -1977,7 +1977,7 @@ return true;]]></method>
<property name="name">GP%</property>
<expression name="expression" type="javascript">if ((data["GP_Account/Account_Date/orderDateMonthName"] != null) && (data["GS_Account/Account_Date/orderDateMonthName"] != null))
{
- data["GP_Account/Account_Date/orderDateMonthName"]/data["GS_Account/Account_Date/orderDateMonthName"]
+ data["GP_Account/Account_Date/orderDateMonthName"]/data["GS_Account/Account_Date/orderDateMonthName"]
}</expression>
<property name="dataType">decimal</property>
</structure>
@@ -1985,7 +1985,7 @@ return true;]]></method>
<property name="name">AMP</property>
<expression name="expression" type="javascript">if ((data["GMP_Account/Account_Date/orderDateMonthName"] != null) && (data["quantity_Account/Account_Date/orderDateMonthName"] != null))
{
- data["GMP_Account/Account_Date/orderDateMonthName"]/data["quantity_Account/Account_Date/orderDateMonthName"]
+ data["GMP_Account/Account_Date/orderDateMonthName"]/data["quantity_Account/Account_Date/orderDateMonthName"]
}</expression>
<property name="dataType">float</property>
</structure>
@@ -1993,7 +1993,7 @@ return true;]]></method>
<property name="name">AGP</property>
<expression name="expression" type="javascript">if ((data["GP_Account/Account_Date/orderDateMonthName"] != null) && (data["quantity_Account/Account_Date/orderDateMonthName"] != null))
{
- data["GP_Account/Account_Date/orderDateMonthName"]/data["quantity_Account/Account_Date/orderDateMonthName"]
+ data["GP_Account/Account_Date/orderDateMonthName"]/data["quantity_Account/Account_Date/orderDateMonthName"]
}</expression>
<property name="dataType">float</property>
</structure>
@@ -2011,7 +2011,7 @@ return true;]]></method>
<property name="name">Pod_GMP%</property>
<expression name="expression" type="javascript">if ((data["GMP_Account/Pod_Date/orderDateMonthName"] != null) && (data["GMS_Account/Pod_Date/orderDateMonthName"] != null))
{
- data["GMP_Account/Pod_Date/orderDateMonthName"]/data["GMS_Account/Pod_Date/orderDateMonthName"]
+ data["GMP_Account/Pod_Date/orderDateMonthName"]/data["GMS_Account/Pod_Date/orderDateMonthName"]
}</expression>
<property name="dataType">decimal</property>
</structure>
@@ -2019,7 +2019,7 @@ return true;]]></method>
<property name="name">Brand_GMP%</property>
<expression name="expression" type="javascript">if ((data["GMP_Account/Brand_Date/orderDateMonthName"] != null) && (data["GMS_Account/Brand_Date/orderDateMonthName"] != null))
{
- data["GMP_Account/Brand_Date/orderDateMonthName"]/data["GMS_Account/Brand_Date/orderDateMonthName"]
+ data["GMP_Account/Brand_Date/orderDateMonthName"]/data["GMS_Account/Brand_Date/orderDateMonthName"]
}</expression>
<property name="dataType">decimal</property>
</structure>
@@ -2027,7 +2027,7 @@ return true;]]></method>
<property name="name">Grand_GMP%</property>
<expression name="expression" type="javascript">if ((data["GMP_Date/orderDateMonthName"] != null) && (data["GMS_Date/orderDateMonthName"] != null))
{
- data["GMP_Date/orderDateMonthName"]/data["GMS_Date/orderDateMonthName"]
+ data["GMP_Date/orderDateMonthName"]/data["GMS_Date/orderDateMonthName"]
}</expression>
<property name="dataType">decimal</property>
</structure>
@@ -2035,7 +2035,7 @@ return true;]]></method>
<property name="name">Pod_GP%</property>
<expression name="expression" type="javascript">if ((data["GP_Account/Pod_Date/orderDateMonthName"] != null) && (data["GS_Account/Pod_Date/orderDateMonthName"] != null))
{
- data["GP_Account/Pod_Date/orderDateMonthName"]/data["GS_Account/Pod_Date/orderDateMonthName"]
+ data["GP_Account/Pod_Date/orderDateMonthName"]/data["GS_Account/Pod_Date/orderDateMonthName"]
}</expression>
<property name="dataType">decimal</property>
</structure>
@@ -2043,7 +2043,7 @@ return true;]]></method>
<property name="name">Brand_GP%</property>
<expression name="expression" type="javascript">if ((data["GP_Account/Brand_Date/orderDateMonthName"] != null) && (data["GS_Account/Brand_Date/orderDateMonthName"] != null))
{
- data["GP_Account/Brand_Date/orderDateMonthName"]/data["GS_Account/Brand_Date/orderDateMonthName"]
+ data["GP_Account/Brand_Date/orderDateMonthName"]/data["GS_Account/Brand_Date/orderDateMonthName"]
}</expression>
<property name="dataType">decimal</property>
</structure>
@@ -2051,7 +2051,7 @@ return true;]]></method>
<property name="name">Grand_GP%</property>
<expression name="expression" type="javascript">if ((data["GP_Date/orderDateMonthName"] != null) && (data["GS_Date/orderDateMonthName"] != null))
{
- data["GP_Date/orderDateMonthName"]/data["GS_Date/orderDateMonthName"]
+ data["GP_Date/orderDateMonthName"]/data["GS_Date/orderDateMonthName"]
}</expression>
<property name="dataType">decimal</property>
</structure>
@@ -2059,7 +2059,7 @@ return true;]]></method>
<property name="name">Pod_AMP</property>
<expression name="expression" type="javascript">if ((data["GMP_Account/Pod_Date/orderDateMonthName"] != null) && (data["quantity_Account/Pod_Date/orderDateMonthName"] != null))
{
- data["GMP_Account/Pod_Date/orderDateMonthName"]/data["quantity_Account/Pod_Date/orderDateMonthName"]
+ data["GMP_Account/Pod_Date/orderDateMonthName"]/data["quantity_Account/Pod_Date/orderDateMonthName"]
}</expression>
<property name="dataType">float</property>
</structure>
@@ -2067,7 +2067,7 @@ return true;]]></method>
<property name="name">Brand_AMP</property>
<expression name="expression" type="javascript">if ((data["GMP_Account/Brand_Date/orderDateMonthName"] != null) && (data["quantity_Account/Brand_Date/orderDateMonthName"] != null))
{
- data["GMP_Account/Brand_Date/orderDateMonthName"]/data["quantity_Account/Brand_Date/orderDateMonthName"]
+ data["GMP_Account/Brand_Date/orderDateMonthName"]/data["quantity_Account/Brand_Date/orderDateMonthName"]
}</expression>
<property name="dataType">float</property>
</structure>
@@ -2075,7 +2075,7 @@ return true;]]></method>
<property name="name">Grand_AMP</property>
<expression name="expression" type="javascript">if ((data["GMP_Date/orderDateMonthName"] != null) && (data["quantity_Date/orderDateMonthName"] != null))
{
- data["GMP_Date/orderDateMonthName"]/data["quantity_Date/orderDateMonthName"]
+ data["GMP_Date/orderDateMonthName"]/data["quantity_Date/orderDateMonthName"]
}</expression>
<property name="dataType">float</property>
</structure>
@@ -2083,7 +2083,7 @@ return true;]]></method>
<property name="name">Pod_AGP</property>
<expression name="expression" type="javascript">if ((data["GP_Account/Pod_Date/orderDateMonthName"] != null) && (data["quantity_Account/Pod_Date/orderDateMonthName"] != null))
{
- data["GP_Account/Pod_Date/orderDateMonthName"]/data["quantity_Account/Pod_Date/orderDateMonthName"]
+ data["GP_Account/Pod_Date/orderDateMonthName"]/data["quantity_Account/Pod_Date/orderDateMonthName"]
}</expression>
<property name="dataType">float</property>
</structure>
@@ -2091,7 +2091,7 @@ return true;]]></method>
<property name="name">Brand_AGP</property>
<expression name="expression" type="javascript">if ((data["GP_Account/Brand_Date/orderDateMonthName"] != null) && (data["quantity_Account/Brand_Date/orderDateMonthName"] != null))
{
- data["GP_Account/Brand_Date/orderDateMonthName"]/data["quantity_Account/Brand_Date/orderDateMonthName"]
+ data["GP_Account/Brand_Date/orderDateMonthName"]/data["quantity_Account/Brand_Date/orderDateMonthName"]
}</expression>
<property name="dataType">float</property>
</structure>
@@ -2099,7 +2099,7 @@ return true;]]></method>
<property name="name">Grand_AGP</property>
<expression name="expression" type="javascript">if ((data["GP_Date/orderDateMonthName"] != null) && (data["quantity_Date/orderDateMonthName"] != null))
{
- data["GP_Date/orderDateMonthName"]/data["quantity_Date/orderDateMonthName"]
+ data["GP_Date/orderDateMonthName"]/data["quantity_Date/orderDateMonthName"]
}</expression>
<property name="dataType">float</property>
</structure>
Modified: ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReportWeek.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReportWeek.rptdesign?rev=1519544&r1=1519543&r2=1519544&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReportWeek.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReportWeek.rptdesign Tue Sep 3 03:29:45 2013
@@ -18,9 +18,8 @@ specific language governing permissions
under the License.
-->
<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 <2.5.1.v20090917-1447></property>
- <property name="units">in</property>
<property name="comments">Copyright (c) 2007 <<Your Company Name here>></property>
+ <property name="createdBy">Eclipse BIRT Designer Version 3.7.1.v20110905 Build <3.7.1.v20110913-1734></property>
<html-property name="description">Creates a blank report with no predefined content.</html-property>
<list-property name="userProperties">
<structure>
@@ -120,6 +119,7 @@ under the License.
<property name="SaleOrder_DataCube.Account.height">200</property>
<property name="SaleOrder_DataCube.DateGroup.NewTabularHierarchy3.width">150</property>
<property name="SaleOrder_DataCube.DateGroup.NewTabularHierarchy3.height">200</property>
+ <property name="units">in</property>
<text-property name="displayName">Blank Report</text-property>
<property name="iconFile">/templates/blank_report.gif</property>
<property name="layoutPreference">auto layout</property>
@@ -451,7 +451,7 @@ if (starschemas)
{
totalRows = starschemas.size();
}]]></method>
- <method name="fetch"><![CDATA[if (currentRow >= totalRows - 1) return false;
+ <method name="fetch"><![CDATA[if (currentRow > totalRows - 1) return false;
{
starschema = starschemas.get(currentRow);
orderDateDescription = starschema.getString("orderDateDescription");
@@ -666,6 +666,7 @@ return true;]]></method>
<text-property name="text">Sales Report Weekly</text-property>
</label>
<extended-item extensionName="Crosstab" extensionVersion="2.5.0" id="2621">
+ <property name="cube">BIC_DataCube</property>
<property name="measures">
<extended-item extensionName="MeasureView" id="2773">
<property name="measure">countOrder</property>
@@ -1595,7 +1596,6 @@ return true;]]></method>
</property>
<property name="fontFamily">sans-serif</property>
<property name="backgroundColor">#FFFFFF</property>
- <property name="cube">BIC_DataCube</property>
<list-property name="boundDataColumns">
<structure>
<property name="name">quantity</property>
@@ -2009,7 +2009,7 @@ return true;]]></method>
<property name="name">GMP%</property>
<expression name="expression" type="javascript">if ((data["GMP_Account/Account_Date/orderDateWeekOfYear"] != null) && (data["GMS_Account/Account_Date/orderDateWeekOfYear"] != null))
{
- data["GMP_Account/Account_Date/orderDateWeekOfYear"]/data["GMS_Account/Account_Date/orderDateWeekOfYear"]
+ data["GMP_Account/Account_Date/orderDateWeekOfYear"]/data["GMS_Account/Account_Date/orderDateWeekOfYear"]
}</expression>
<property name="dataType">decimal</property>
</structure>
@@ -2017,7 +2017,7 @@ return true;]]></method>
<property name="name">GP%</property>
<expression name="expression" type="javascript">if ((data["GP_Account/Account_Date/orderDateWeekOfYear"] != null) && (data["GS_Account/Account_Date/orderDateWeekOfYear"] != null))
{
- data["GP_Account/Account_Date/orderDateWeekOfYear"]/data["GS_Account/Account_Date/orderDateWeekOfYear"]
+ data["GP_Account/Account_Date/orderDateWeekOfYear"]/data["GS_Account/Account_Date/orderDateWeekOfYear"]
}</expression>
<property name="dataType">decimal</property>
</structure>
@@ -2025,7 +2025,7 @@ return true;]]></method>
<property name="name">AMP</property>
<expression name="expression" type="javascript">if ((data["GMP_Account/Account_Date/orderDateWeekOfYear"] != null) && (data["quantity_Account/Account_Date/orderDateWeekOfYear"] != null))
{
- data["GMP_Account/Account_Date/orderDateWeekOfYear"]/data["quantity_Account/Account_Date/orderDateWeekOfYear"]
+ data["GMP_Account/Account_Date/orderDateWeekOfYear"]/data["quantity_Account/Account_Date/orderDateWeekOfYear"]
}</expression>
<property name="dataType">float</property>
</structure>
@@ -2033,7 +2033,7 @@ return true;]]></method>
<property name="name">AGP</property>
<expression name="expression" type="javascript">if ((data["GP_Account/Account_Date/orderDateWeekOfYear"] != null) && (data["quantity_Account/Account_Date/orderDateWeekOfYear"] != null))
{
- data["GP_Account/Account_Date/orderDateWeekOfYear"]/data["quantity_Account/Account_Date/orderDateWeekOfYear"]
+ data["GP_Account/Account_Date/orderDateWeekOfYear"]/data["quantity_Account/Account_Date/orderDateWeekOfYear"]
}</expression>
<property name="dataType">float</property>
</structure>
@@ -2051,7 +2051,7 @@ return true;]]></method>
<property name="name">Pod_GMP%</property>
<expression name="expression" type="javascript">if ((data["GMP_Account/Pod_Date/orderDateWeekOfYear"] != null) && (data["GMS_Account/Pod_Date/orderDateWeekOfYear"] != null))
{
- data["GMP_Account/Pod_Date/orderDateWeekOfYear"]/data["GMS_Account/Pod_Date/orderDateWeekOfYear"]
+ data["GMP_Account/Pod_Date/orderDateWeekOfYear"]/data["GMS_Account/Pod_Date/orderDateWeekOfYear"]
}</expression>
<property name="dataType">decimal</property>
</structure>
@@ -2059,15 +2059,15 @@ return true;]]></method>
<property name="name">Brand_GMP%</property>
<expression name="expression" type="javascript">if ((data["GMP_Account/Brand_Date/orderDateWeekOfYear"] != null) && (data["GMS_Account/Brand_Date/orderDateWeekOfYear"] != null))
{
- data["GMP_Account/Brand_Date/orderDateWeekOfYear"]/data["GMS_Account/Brand_Date/orderDateWeekOfYear"]
+ data["GMP_Account/Brand_Date/orderDateWeekOfYear"]/data["GMS_Account/Brand_Date/orderDateWeekOfYear"]
}</expression>
<property name="dataType">decimal</property>
</structure>
<structure>
<property name="name">Pod_GP%</property>
- <expression name="expression" type="javascript">if ((data["GP_Account/Pod_Date/orderDateWeekOfYear"] != null) && (data["GS_Account/Pod_Date/orderDateWeekOfYear"] != null))
+ <expression name="expression" type="javascript">if ((data["GP_Account/Pod_Date/orderDateWeekOfYear"] != null) && (data["GS_Account/Pod_Date/orderDateWeekOfYear"] != null))
{
- data["GP_Account/Pod_Date/orderDateWeekOfYear"]/data["GS_Account/Pod_Date/orderDateWeekOfYear"]
+ data["GP_Account/Pod_Date/orderDateWeekOfYear"]/data["GS_Account/Pod_Date/orderDateWeekOfYear"]
}</expression>
<property name="dataType">decimal</property>
</structure>
@@ -2075,7 +2075,7 @@ return true;]]></method>
<property name="name">Brand_GP%</property>
<expression name="expression" type="javascript">if ((data["GP_Account/Brand_Date/orderDateWeekOfYear"] != null) && (data["GS_Account/Brand_Date/orderDateWeekOfYear"] != null))
{
- data["GP_Account/Brand_Date/orderDateWeekOfYear"]/data["GS_Account/Brand_Date/orderDateWeekOfYear"]
+ data["GP_Account/Brand_Date/orderDateWeekOfYear"]/data["GS_Account/Brand_Date/orderDateWeekOfYear"]
}</expression>
<property name="dataType">decimal</property>
</structure>
@@ -2083,7 +2083,7 @@ return true;]]></method>
<property name="name">Grand_GMP%</property>
<expression name="expression" type="javascript">if ((data["GMP_Date/orderDateWeekOfYear"] != null) && (data["GMS_Date/orderDateWeekOfYear"] != null))
{
- data["GMP_Date/orderDateWeekOfYear"]/data["GMS_Date/orderDateWeekOfYear"]
+ data["GMP_Date/orderDateWeekOfYear"]/data["GMS_Date/orderDateWeekOfYear"]
}</expression>
<property name="dataType">decimal</property>
</structure>
@@ -2091,7 +2091,7 @@ return true;]]></method>
<property name="name">Grand_GP%</property>
<expression name="expression" type="javascript">if ((data["GP_Date/orderDateWeekOfYear"] != null) && (data["GS_Date/orderDateWeekOfYear"] != null))
{
- data["GP_Date/orderDateWeekOfYear"]/data["GS_Date/orderDateWeekOfYear"]
+ data["GP_Date/orderDateWeekOfYear"]/data["GS_Date/orderDateWeekOfYear"]
}</expression>
<property name="dataType">decimal</property>
</structure>
@@ -2099,7 +2099,7 @@ return true;]]></method>
<property name="name">Pod_AMP</property>
<expression name="expression" type="javascript">if ((data["GMP_Account/Pod_Date/orderDateWeekOfYear"] != null) && (data["quantity_Account/Pod_Date/orderDateWeekOfYear"] != null))
{
- data["GMP_Account/Pod_Date/orderDateWeekOfYear"]/data["quantity_Account/Pod_Date/orderDateWeekOfYear"]
+ data["GMP_Account/Pod_Date/orderDateWeekOfYear"]/data["quantity_Account/Pod_Date/orderDateWeekOfYear"]
}</expression>
<property name="dataType">float</property>
</structure>
@@ -2107,7 +2107,7 @@ return true;]]></method>
<property name="name">Brand_AMP</property>
<expression name="expression" type="javascript">if ((data["GMP_Account/Brand_Date/orderDateWeekOfYear"] != null) && (data["quantity_Account/Brand_Date/orderDateWeekOfYear"] != null))
{
- data["GMP_Account/Brand_Date/orderDateWeekOfYear"]/data["quantity_Account/Brand_Date/orderDateWeekOfYear"]
+ data["GMP_Account/Brand_Date/orderDateWeekOfYear"]/data["quantity_Account/Brand_Date/orderDateWeekOfYear"]
}</expression>
<property name="dataType">float</property>
</structure>
@@ -2115,7 +2115,7 @@ return true;]]></method>
<property name="name">Grand_AMP</property>
<expression name="expression" type="javascript">if ((data["GMP_Date/orderDateWeekOfYear"] != null) && (data["quantity_Date/orderDateWeekOfYear"] != null))
{
- data["GMP_Date/orderDateWeekOfYear"]/data["quantity_Date/orderDateWeekOfYear"]
+ data["GMP_Date/orderDateWeekOfYear"]/data["quantity_Date/orderDateWeekOfYear"]
}</expression>
<property name="dataType">float</property>
</structure>
@@ -2123,7 +2123,7 @@ return true;]]></method>
<property name="name">Pod_AGP</property>
<expression name="expression" type="javascript">if ((data["GP_Account/Pod_Date/orderDateWeekOfYear"] != null) && (data["quantity_Account/Pod_Date/orderDateWeekOfYear"] != null))
{
- data["GP_Account/Pod_Date/orderDateWeekOfYear"]/data["quantity_Account/Pod_Date/orderDateWeekOfYear"]
+ data["GP_Account/Pod_Date/orderDateWeekOfYear"]/data["quantity_Account/Pod_Date/orderDateWeekOfYear"]
}</expression>
<property name="dataType">float</property>
</structure>
@@ -2131,7 +2131,7 @@ return true;]]></method>
<property name="name">Brand_AGP</property>
<expression name="expression" type="javascript">if ((data["GP_Account/Brand_Date/orderDateWeekOfYear"] != null) && (data["quantity_Account/Brand_Date/orderDateWeekOfYear"] != null))
{
- data["GP_Account/Brand_Date/orderDateWeekOfYear"]/data["quantity_Account/Brand_Date/orderDateWeekOfYear"]
+ data["GP_Account/Brand_Date/orderDateWeekOfYear"]/data["quantity_Account/Brand_Date/orderDateWeekOfYear"]
}</expression>
<property name="dataType">float</property>
</structure>
@@ -2139,7 +2139,7 @@ return true;]]></method>
<property name="name">Grand_AGP</property>
<expression name="expression" type="javascript">if ((data["GP_Date/orderDateWeekOfYear"] != null) && (data["quantity_Date/orderDateWeekOfYear"] != null))
{
- data["GP_Date/orderDateWeekOfYear"]/data["quantity_Date/orderDateWeekOfYear"]
+ data["GP_Date/orderDateWeekOfYear"]/data["quantity_Date/orderDateWeekOfYear"]
}</expression>
<property name="dataType">float</property>
</structure>
Modified: ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml?rev=1519544&r1=1519543&r2=1519544&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml Tue Sep 3 03:29:45 2013
@@ -24,7 +24,7 @@ under the License.
<!--New From-->
<form name="SalesReport" type="single" target="checkReportBy" title=""
- header-row-style="header-row" default-table-style="basic-table">
+ header-row-style="header-row" default-table-style="basic-table" target-window="_BLANK">
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time type="date"/></field>
<field name="reportBy" title="Report By">
<drop-down>
@@ -44,7 +44,7 @@ under the License.
</form>
<form name="NetBeforeOverheadReport" type="single" target="NetBeforeOverheadReport.pdf" title=""
- header-row-style="header-row" default-table-style="basic-table">
+ header-row-style="header-row" default-table-style="basic-table" target-window="_BLANK">
<field name="productStoreId">
<drop-down allow-empty="false">
<option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
@@ -57,7 +57,7 @@ under the License.
</form>
<form name="ProductDemandReport" type="single" target="ProductDemandReport.pdf" title=""
- header-row-style="header-row" default-table-style="basic-table">
+ header-row-style="header-row" default-table-style="basic-table" target-window="_BLANK">
<field name="productStoreId">
<drop-down allow-empty="false">
<option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>