svn commit: r902719 [1/6] - in /ofbiz/trunk/applications/order: ./ data/ data/helpdata/ entitydef/ script/org/ofbiz/order/olap/ script/org/ofbiz/order/reports/ webapp/ordermgr/WEB-INF/ webapp/ordermgr/WEB-INF/actions/report/ webapp/ordermgr/WEB-INF/act...

[hansbak-2]

Author: hansbak
Date: Mon Jan 25 07:23:57 2010
New Revision: 902719

URL: http://svn.apache.org/viewvc?rev=902719&view=rev
Log:
New Order reports: (run 'init warehouse' in the BI component first and select B2C productstore to see the demo data)

- Net Before Overhead Report
Net Before Overhead Report is the profit calculation of paid-shipped orders and all the occurred fee excluding the overhead cost. They are grouped by Product Store Id.(Demo data for Net Before Overhead Report have in Product Store Id 'B2CStore')

- Product Demand Report
Product Demand Report is the report to show us which product sells good and which product doesn’t sell good or not selling at all in one account as well as for all accounts in last 4 weeks. They are grouped by Product Store Id.(Demo data for Product Demand Report have in Product Store Id 'B2CStore')

Added:
    ofbiz/trunk/applications/order/script/org/ofbiz/order/reports/NetBeforeOverheadDateEvent.xml
    ofbiz/trunk/applications/order/script/org/ofbiz/order/reports/NetBeforeOverheadEvent.xml
    ofbiz/trunk/applications/order/script/org/ofbiz/order/reports/NetBeforeOverheadMonthlyEvent.xml
    ofbiz/trunk/applications/order/script/org/ofbiz/order/reports/ProductDemandReportEvent.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/NetBeforeOverheadReport.groovy
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/ProductDemandReport.groovy
    ofbiz/trunk/applications/order/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign
    ofbiz/trunk/applications/order/webapp/ordermgr/reports/ProductDemandReport.rptdesign
Removed:
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/report/SalesReport.groovy
Modified:
    ofbiz/trunk/applications/order/data/OrderPortletData.xml
    ofbiz/trunk/applications/order/data/SalesOrderDemoData.xml
    ofbiz/trunk/applications/order/data/helpdata/HELP_ORDER_Report.xml
    ofbiz/trunk/applications/order/entitydef/entitymodel_olap.xml
    ofbiz/trunk/applications/order/ofbiz-component.xml
    ofbiz/trunk/applications/order/script/org/ofbiz/order/olap/FactServices.xml
    ofbiz/trunk/applications/order/script/org/ofbiz/order/reports/SalesReportEvent.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesReport.rptdesign
    ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml
    ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml

Modified: ofbiz/trunk/applications/order/data/OrderPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/OrderPortletData.xml?rev=902719&r1=902718&r2=902719&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/data/OrderPortletData.xml (original)
+++ ofbiz/trunk/applications/order/data/OrderPortletData.xml Mon Jan 25 07:23:57 2010
@@ -122,38 +122,30 @@
         screenLocation="component://order/widget/ordermgr/OrderViewScreens.xml"
         description="List Purchase Orders"/>
     <PortletPortletCategory portalPortletId="ListPurchaseOrders" portletCategoryId="ORDERMGR"/>
-
-    <PortalPortlet portalPortletId="SalesReport"
-        portletName="Sales Report"
-        screenName="SalesReport"
-        screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
-        description=""/>
-    <PortletPortletCategory portalPortletId="SalesReport" portletCategoryId="REPORT"/>
-    <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="SalesReport" portletSeqId="00001" columnSeqId="00002" sequenceNum="5"/>
     
-        <PortalPortlet portalPortletId="OrderByReferrer"
+    <PortalPortlet portalPortletId="OrderByReferrer"
         portletName="Sale Orders By Referrer Report"
         screenName="SaleOrdersByReferrerReport"
         screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
         description=""/>
     <PortletPortletCategory portalPortletId="OrderByReferrer" portletCategoryId="REPORT"/>
-    <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="OrderByReferrer" portletSeqId="00001" columnSeqId="00001" sequenceNum="6"/>
+    <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="OrderByReferrer" portletSeqId="00001" columnSeqId="00001" sequenceNum="5"/>
     
- <PortalPortlet portalPortletId="OrderByChannel"
+    <PortalPortlet portalPortletId="OrderByChannel"
         portletName="Sale Orders by Channel"
         screenName="SaleOrdersByChannelReport"
         screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
         description=""/>
     <PortletPortletCategory portalPortletId="OrderByChannel" portletCategoryId="REPORT"/>
-    <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="OrderByChannel" portletSeqId="00001" columnSeqId="00001" sequenceNum="7"/>
-
+    <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="OrderByChannel" portletSeqId="00001" columnSeqId="00001" sequenceNum="6"/>
+    
     <PortalPortlet portalPortletId="OrderDiscountCode"
         portletName="Orders with discount code"
         screenName="SaleOrderDiscountCodeReport"
         screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
         description=""/>
     <PortletPortletCategory portalPortletId="OrderDiscountCode" portletCategoryId="REPORT"/>
-    <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="OrderDiscountCode" portletSeqId="00001" columnSeqId="00001" sequenceNum="8"/>
+    <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="OrderDiscountCode" portletSeqId="00001" columnSeqId="00001" sequenceNum="7"/>
     
     <PortalPortlet portalPortletId="Last3MSalesReport"
         portletName="Last 3 Months Sales Report"
@@ -161,7 +153,7 @@
         screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
         description=""/>
     <PortletPortletCategory portalPortletId="Last3MSalesReport" portletCategoryId="REPORT"/>
-    <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="Last3MSalesReport" portletSeqId="00001" columnSeqId="00002" sequenceNum="9"/>
+    <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="Last3MSalesReport" portletSeqId="00001" columnSeqId="00002" sequenceNum="8"/>
     
     <PortalPortlet portalPortletId="CouponSalesReport"
         portletName="Coupon Sales Report"
@@ -169,5 +161,30 @@
         screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
         description=""/>
     <PortletPortletCategory portalPortletId="CouponSalesReport" portletCategoryId="REPORT"/>
-    <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="CouponSalesReport" portletSeqId="00001" columnSeqId="00002" sequenceNum="10"/>
+    <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="CouponSalesReport" portletSeqId="00001" columnSeqId="00002" sequenceNum="9"/>
+  
+    <PortalPortlet portalPortletId="SalesReport"
+        portletName="Sales Report"
+        screenName="SalesReport"
+        screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
+        description=""/>
+    <PortletPortletCategory portalPortletId="SalesReport" portletCategoryId="REPORT"/>
+    <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="SalesReport" portletSeqId="00001" columnSeqId="00002" sequenceNum="10"/>
+  
+    <PortalPortlet portalPortletId="NBO_Report"
+        portletName="Net Before Overhead Report"
+        screenName="NetBeforeOverheadReport"
+        screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
+        description=""/>
+    <PortletPortletCategory portalPortletId="NBO_Report" portletCategoryId="REPORT"/>
+    <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="NBO_Report" portletSeqId="00001" columnSeqId="00002" sequenceNum="11"/>
+
+    <PortalPortlet portalPortletId="PDR_Report"
+        portletName="Product Demand Report"
+        screenName="ProductDemandReport"
+        screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
+        description=""/>
+    <PortletPortletCategory portalPortletId="PDR_Report" portletCategoryId="REPORT"/>
+    <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="PDR_Report" portletSeqId="00001" columnSeqId="00002" sequenceNum="12"/>
+
 </entity-engine-xml>